[Lldb-commits] [PATCH] D122997: do not show the help window on first gui startup

[Luboš Luňák via Phabricator via lldb-commits]

llunak created this revision.
llunak added a reviewer: clayborg.
llunak added a project: LLDB.
Herald added a subscriber: JDevlieghere.
Herald added a project: All.
llunak requested review of this revision.
Herald added a subscriber: lldb-commits.

It's rather annoying if it's there after every startup, and that 'Help (F6 <https://reviews.llvm.org/F6>)' at the top should be enough to help people who don't know.


Repository:
  rG LLVM Github Monorepo

https://reviews.llvm.org/D122997

Files:
  lldb/source/Core/IOHandlerCursesGUI.cpp
  lldb/test/API/commands/gui/basic/TestGuiBasic.py
  lldb/test/API/commands/gui/basicdebug/TestGuiBasicDebug.py
  lldb/test/API/commands/gui/breakpoints/TestGuiBreakpoints.py
  lldb/test/API/commands/gui/viewlarge/TestGuiViewLarge.py


Index: lldb/test/API/commands/gui/viewlarge/TestGuiViewLarge.py
===================================================================
--- lldb/test/API/commands/gui/viewlarge/TestGuiViewLarge.py
+++ lldb/test/API/commands/gui/viewlarge/TestGuiViewLarge.py
@@ -31,9 +31,8 @@
         right_key = chr(27)+'OC'
         ctrl_l = chr(12)
 
-        # Start the GUI and close the welcome window.
+        # Start the GUI.
         self.child.sendline("gui")
-        self.child.send(escape_key)
 
         # Check the sources window.
         self.child.expect_exact("Sources")
Index: lldb/test/API/commands/gui/breakpoints/TestGuiBreakpoints.py
===================================================================
--- lldb/test/API/commands/gui/breakpoints/TestGuiBreakpoints.py
+++ lldb/test/API/commands/gui/breakpoints/TestGuiBreakpoints.py
@@ -29,9 +29,8 @@
         escape_key = chr(27).encode()
         down_key = chr(27)+'OB' # for vt100 terminal (lldbexpect sets TERM=vt100)
 
-        # Start the GUI and close the welcome window.
+        # Start the GUI.
         self.child.sendline("gui")
-        self.child.send(escape_key)
         self.child.expect_exact("Sources") # wait for gui
 
         # Go to next line, set a breakpoint.
Index: lldb/test/API/commands/gui/basicdebug/TestGuiBasicDebug.py
===================================================================
--- lldb/test/API/commands/gui/basicdebug/TestGuiBasicDebug.py
+++ lldb/test/API/commands/gui/basicdebug/TestGuiBasicDebug.py
@@ -25,10 +25,8 @@
 
         escape_key = chr(27).encode()
 
-        # Start the GUI and close the welcome window.
+        # Start the GUI.
         self.child.sendline("gui")
-        self.child.expect("Welcome to the LLDB curses GUI.")
-        self.child.send(escape_key)
 
         # Simulate a simple debugging session.
         self.child.send("s") # step
Index: lldb/test/API/commands/gui/basic/TestGuiBasic.py
===================================================================
--- lldb/test/API/commands/gui/basic/TestGuiBasic.py
+++ lldb/test/API/commands/gui/basic/TestGuiBasic.py
@@ -26,18 +26,9 @@
 
         escape_key = chr(27).encode()
 
-        # Start the GUI for the first time and check for the welcome window.
+        # Start the GUI.
         self.child.sendline("gui")
-        self.child.expect_exact("Welcome to the LLDB curses GUI.")
 
-        # Press escape to quit the welcome screen
-        self.child.send(escape_key)
-        # Press escape again to quit the gui
-        self.child.send(escape_key)
-        self.expect_prompt()
-
-        # Start the GUI a second time, this time we should have the normal GUI.
-        self.child.sendline("gui")
         # Check for GUI elements in the menu bar.
         self.child.expect_exact("Target")
         self.child.expect_exact("Process")
Index: lldb/source/Core/IOHandlerCursesGUI.cpp
===================================================================
--- lldb/source/Core/IOHandlerCursesGUI.cpp
+++ lldb/source/Core/IOHandlerCursesGUI.cpp
@@ -7665,14 +7665,6 @@
     status_window_sp->SetDelegate(
         WindowDelegateSP(new StatusBarWindowDelegate(m_debugger)));
 
-    // Show the main help window once the first time the curses GUI is
-    // launched
-    static bool g_showed_help = false;
-    if (!g_showed_help) {
-      g_showed_help = true;
-      main_window_sp->CreateHelpSubwindow();
-    }
-
     // All colors with black background.
     init_pair(1, COLOR_BLACK, COLOR_BLACK);
     init_pair(2, COLOR_RED, COLOR_BLACK);


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D122997.420058.patch
Type: text/x-patch
Size: 3528 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/lldb-commits/attachments/20220403/b3939113/attachment-0001.bin>