Make menus more logical

[lightcards.git] / lightcards / display.py

diff --git a/lightcards/display.py b/lightcards/display.py
index 133b7194d5d31a91f1ca36543077df66d87ad9fe..58a9055004760f1c13d640ea85465d3ba84b313a 100644 (file)
--- a/lightcards/display.py
+++ b/lightcards/display.py
@@ -21,9 +21,10 @@ class Display:
         self.win = stdscr
         (mlines, mcols) = self.win.getmaxyx()
         curses.curs_set(0)  # Hide cursor
-        curses.init_pair(1, curses.COLOR_CYAN, 0)
-        curses.init_pair(2, curses.COLOR_RED, 0)
-        curses.init_pair(3, curses.COLOR_YELLOW, 0)
+        curses.use_default_colors()  # Allow transparency
+        curses.init_pair(1, curses.COLOR_CYAN, -1)
+        curses.init_pair(2, curses.COLOR_RED, -1)
+        curses.init_pair(3, curses.COLOR_YELLOW, -1)
 
         (self.main_win, self.main_panel) = self.panel_create(mlines, mcols)
         self.menu_init()
@@ -48,7 +49,7 @@ class Display:
         if self.obj.getIdx() + 1 == len(self.stack):
             self.obj.setIdx(0)
 
-        progress.dump(self.stack, runner.get_orig())
+        progress.dump(self.stack, runner.get_orig()[1])
         sys.exit(0)
 
     def ntotal(self):
@@ -67,7 +68,7 @@ class Display:
             percent = "100"
         else:
             percent = str(
-                round(self.obj.getIdx() / len(self.stack) * 100)
+                round(self.obj.getIdx() / (len(self.stack) - 1) * 100)
             ).zfill(2)
 
         # Print yellow if starred
@@ -81,11 +82,11 @@ class Display:
         bar_middle = self.current_card().printStar()
         bar_end = (
             f"] [{len(self.ntotal())}/{str(len(self.stack))} starred] "
-            + f"[{percent}% ("
-            + str(self.obj.getIdx() + 1).zfill(len(str(len(self.stack))))
-            + f"/{str(len(self.stack))})] ["
-            + f"{self.headers[self.current_card().getSide()]} ("
-            + f"{str(int(self.current_card().getSide()) + 1)})] "
+            f"[{percent}% ("
+            f"{str(self.obj.getIdx()).zfill(len(str(len(self.stack))))}"
+            f"/{str(len(self.stack))})] ["
+            f"{self.headers[self.current_card().getSide()]} ("
+            f"{str(int(self.current_card().getSide()) + 1)})]"
         )
 
         # Put it all togethor
@@ -116,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!")
@@ -172,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
@@ -195,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()
@@ -309,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):
@@ -325,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()