X-Git-Url: https://git.armaanb.net/?a=blobdiff_plain;f=lightcards%2Fdisplay.py;h=af991ce4c9c64695fa1ecf9123212bf12bc6ade9;hb=826f5955d6591b2a59382623b06cb0d0c6654f67;hp=f5f5f6c57d0d4991d40e6a457879eab5642fa895;hpb=93cbdb7080c8fcbeea112dd4b6af888aa5103b91;p=lightcards.git

diff --git a/lightcards/display.py b/lightcards/display.py
index f5f5f6c..af991ce 100644
--- a/lightcards/display.py
+++ b/lightcards/display.py
@@ -61,32 +61,37 @@ class Quit:
 
 
 class Help:
-    def __init__(self, outer, mlines=21, mcols=52):
+    def __init__(self, outer, mlines=23, mcols=52):
         """Initialize help screen"""
         self.outer = outer
         (self.win, self.panel) = panel_create(mlines, mcols)
         self.panel.top()
         self.panel.hide()
 
+        def c(setting):
+            return str(list(self.outer.config[setting][:28])).replace("'", "")
+
         text = [
-            "Welcome to Lightcards. Here are the default",
-            "keybindings to get you started:",
+            "Welcome to Lightcards. Here are some keybindings",
+            "to get you started:",
             "",
-            "h, left          previous card",
-            "l, right         next card",
-            "j, k, up, down   flip card",
-            "i, /             star card",
-            "0, ^, home       go to the start of the deck",
-            "$, end           go to the end of the deck",
-            "H, ?             open this screen",
-            "m                open the control menu",
-            "1, 2, 3          switch views",
-            "q                quit",
+            f"{c('card_prev')}: previous card",
+            f"{c('card_next')}: next card",
+            f"{c('card_flip')}: flip card",
+            f"{c('card_star')}: star card",
+            f"{c('card_first')}: go to first card",
+            f"{c('card_last')}: go to last card",
+            f"{c('help_disp')}: open this help menu",
+            f"{c('menu_disp')}: open the control menu",
+            f"{c('view_one')}: switch to view one",
+            f"{c('view_two')}: switch to view two",
+            f"{c('view_three')}: switch to view three",
+            f"{c('quit_key')}: quit",
             "",
             "More information can be found in the man page, or",
             "by running `lightcards --help`.",
             "",
-            "Press [H], or [?] to go back.",
+            f"Press {c('help_disp')} to go back.",
         ]
 
         self.win.addstr(
@@ -105,7 +110,7 @@ class Help:
     def disp(self):
         """Display help screen"""
         (mlines, mcols) = self.outer.win.getmaxyx()
-        self.win.mvwin(int(mlines / 2) - 11, int(mcols / 2) - 25)
+        self.win.mvwin(int(mlines / 2) - 12, int(mcols / 2) - 25)
         self.panel.show()
 
         while True:
@@ -132,6 +137,7 @@ class Menu:
             curses.color_pair(1) + curses.A_BOLD,
         )
         self.win.hline(2, 1, curses.ACS_HLINE, mcols)
+        env = os.environ.get("EDITOR", "$EDITOR")[:15]
         text = [
             "[y]: reset stack to original state",
             "[a]: alphabetize stack",
@@ -140,8 +146,7 @@ class Menu:
             "[u]: unstar all",
             "[d]: star all",
             "[s]: update stack to include starred only",
-            "[e]: open the input file in $EDITOR",
-            "",
+            f"[e]: open the input file in {env}" "",
             "[r]: restart",
             "[m]: close menu",
         ]
@@ -151,6 +156,10 @@ class Menu:
 
         self.win.box()
 
+    def clear_msg(self):
+        for i in range(42):
+            self.win.addch(15, i + 1, " ")
+
     def menu_print(self, string, err=False):
         """Print messages on the menu screen"""
         if err:
@@ -189,6 +198,7 @@ class Menu:
                 shuffle(self.outer.stack)
                 self.menu_print("Stack shuffled!")
             elif key == "e":
+                progress.dump(self.outer.stack, runner.get_orig()[1])
                 curses.endwin()
                 os.system(f"$EDITOR {self.outer.input_file}"),
                 (self.outer.headers, self.outer.stack) = parse.parse_html(
@@ -220,8 +230,7 @@ class Menu:
         Display a menu offering multiple options on how to manipulate the deck
         and to continue
         """
-        for i in range(42):
-            self.win.addch(14, i + 1, " ")
+        self.clear_msg()
 
         (mlines, mcols) = self.outer.win.getmaxyx()
         self.win.mvwin(int(mlines / 2) - 8, int(mcols / 2) - 22)
@@ -244,9 +253,9 @@ class Display:
         self.win = stdscr
         curses.curs_set(0)  # Hide cursor
         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)
+        curses.init_pair(1, self.config["highlight_color"], -1)
+        curses.init_pair(2, self.config["error_color"], -1)
+        curses.init_pair(3, self.config["starred_color"], -1)
 
         self.main_panel = curses.panel.new_panel(self.win)
         self.menu_obj = Menu(self)
@@ -470,7 +479,7 @@ class Display:
         while True:
             self.check_size()
             key = self.win.getkey()
-            if key == "q":
+            if key == self.config["quit_key"]:
                 self.leave()
             elif key in self.config["card_prev"]:
                 self.obj.back()