Make menus more logical

diff --git a/lightcards/display.py b/lightcards/display.py
index a37f28c3a93840c68a06828234135e1b5fd55222..58a9055004760f1c13d640ea85465d3ba84b313a 100644 (file)
--- a/lightcards/display.py
+++ b/lightcards/display.py
@@ -117,15 +117,12 @@ class Display:
         """Grab keypresses on the menu screen"""
         while True:
             key = self.win.getkey()
-            if key in ["r", "q", "m"]:
+            if key in ["r", "m"]:
                 self.menu_panel.hide()
                 self.panel_up()
-            if key in ["q", "m"]:
-                if len(self.stack) == self.obj.getIdx() + 1:
-                    self.leave()
-                elif len(self.stack) < self.obj.getIdx() + 1:
-                    self.obj.setIdx(0)
                 self.get_key()
+            elif key == "q":
+                self.leave()
             elif key == "y":
                 self.stack = runner.get_orig()[1]
                 self.menu_print("Stack reset!")
@@ -173,15 +170,11 @@ class Display:
                 self.obj.setIdx(0)
                 self.get_key()
 
-    def menu_init(self, quit=True):
+    def menu_init(self):
         """Initialize the menu with content"""
         (self.menu_win, self.menu_panel) = self.panel_create(17, 44)
         self.menu_panel.top()
         self.menu_panel.hide()
-        # TODO: fix this
-        quit_text = "[q]: back"
-        if quit:
-            quit_text = "[q]: quit"
 
         self.menu_win.addstr(
             1, 1, "LIGHTCARDS MENU", curses.color_pair(1) + curses.A_BOLD
@@ -196,12 +189,13 @@ class Display:
             "[u]: unstar all",
             "[d]: star all",
             "[s]: update stack to include starred only",
+            "",
+            "[r]: restart",
+            "[m]: close menu",
         ]
 
         for t in enumerate(text):
             self.menu_win.addstr(t[0] + 3, 1, t[1])
-        self.menu_win.addstr(len(text) + 4, 1, "[r]: restart")
-        self.menu_win.addstr(len(text) + 5, 1, quit_text)
 
         self.menu_win.box()
         self.panel_up()
@@ -310,7 +304,7 @@ class Display:
             "More information can be found in the man page, or",
             "by running `lightcards --help`.",
             "",
-            "Press [q], [H], or [?] to go back.",
+            "Press [H], or [?] to go back.",
         ]
 
         for t in enumerate(text):
@@ -326,7 +320,9 @@ class Display:
         self.help_panel.show()
         while True:
             key = self.help_win.getkey()
-            if key in ["q", "H", "?"]:
+            if key == "q":
+                self.leave()
+            elif key in ["H", "?"]:
                 self.help_panel.hide()
                 self.get_key()