Add menu keybindings to config

diff --git a/config.py b/config.py
index 6cd69a3784cad2f3e0d4d0ecba28cae9e068602d..ee974b041c0d46a11200fa4d8882322f533aa873 100644 (file)
--- a/config.py
+++ b/config.py
@@ -35,6 +35,15 @@ card_last = ["$", "KEY_END"]
 help_disp = ["H", "?"]
 
 menu_disp = "m"
+menu_reset = "y"
+menu_alphabetize = "a"
+menu_shuffle = "z"
+menu_reverse = "t"
+menu_unstar = "u"
+menu_star = "d"
+menu_stars_only = "s"
+menu_open_file = "e"
+menu_restart = "r"
 
 view_one = "1"
 view_two = "2"

diff --git a/lightcards/display.py b/lightcards/display.py
index af991ce4c9c64695fa1ecf9123212bf12bc6ade9..8f739e64865629d28cdf28baac35944b134a2409 100644 (file)
--- a/lightcards/display.py
+++ b/lightcards/display.py
@@ -60,16 +60,22 @@ class Quit:
                     self.outer.get_key()
 
 
-class Help:
-    def __init__(self, outer, mlines=23, mcols=52):
-        """Initialize help screen"""
+class Panel:
+    def __init__(self, outer, mlines, mcols):
         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("'", "")
+    def config_get(self, setting, cut=28):
+        return str(list(self.outer.config[setting][:cut])).replace("'", "")
+
+
+class Help(Panel):
+    def __init__(self, outer, mlines=23, mcols=52):
+        """Initialize help screen"""
+        super().__init__(outer, mlines, mcols)
+        c = self.config_get
 
         text = [
             "Welcome to Lightcards. Here are some keybindings",
@@ -115,20 +121,18 @@ class Help:
 
         while True:
             key = self.win.getkey()
-            if key == "q":
+            if key in self.outer.config["quit_key"]:
                 self.outer.leave()
-            elif key in ["H", "?"]:
+            elif key in self.outer.config["help_disp"]:
                 self.panel.hide()
                 self.outer.get_key()
 
 
-class Menu:
+class Menu(Panel):
     def __init__(self, outer, mlines=17, mcols=44):
         """Initialize the menu with content"""
-        self.outer = outer
-        (self.win, self.panel) = panel_create(mlines, mcols)
-        self.panel.top()
-        self.panel.hide()
+        super().__init__(outer, mlines, mcols)
+        c = self.config_get
 
         self.win.addstr(
             1,
@@ -139,16 +143,17 @@ class Menu:
         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",
-            "[z]: shuffle stack",
-            "[t]: reverse stack order",
-            "[u]: unstar all",
-            "[d]: star all",
-            "[s]: update stack to include starred only",
-            f"[e]: open the input file in {env}" "",
-            "[r]: restart",
-            "[m]: close menu",
+            f"{c('menu_reset')}: reset stack to original state",
+            f"{c('menu_alphabetize')}: alphabetize stack",
+            f"{c('menu_shuffle')}: shuffle stack",
+            f"{c('menu_reverse')}: reverse stack order",
+            f"{c('menu_unstar')}: unstar all",
+            f"{c('menu_star')}: star all",
+            f"{c('menu_stars_only')}: update stack to include starred only",
+            f"{c('menu_open_file')}: open the input file in {env}",
+            "",
+            f"{c('menu_restart')}: restart",
+            f"{c('menu_disp')}: close menu",
         ]
 
         for t in enumerate(text):
@@ -174,30 +179,34 @@ class Menu:
         """Grab keypresses on the menu screen"""
         while True:
             key = self.win.getkey()
-            if key in ["r", "m"]:
+            if (
+                key
+                in self.outer.config["menu_disp"]
+                + self.outer.config["menu_restart"]
+            ):
                 self.panel.hide()
                 self.outer.get_key()
-            elif key == "q":
+            elif key in self.outer.config["quit_key"]:
                 self.outer.leave()
-            elif key == "y":
+            elif key in self.outer.config["menu_reset"]:
                 self.outer.stack = runner.get_orig()[1]
                 self.menu_print("Stack reset!")
-            elif key == "a":
+            elif key in self.outer.config["menu_alphabetize"]:
                 self.outer.stack.sort(key=lambda x: x.front)
                 self.menu_print("Stack alphabetized!")
-            elif key == "u":
+            elif key in self.outer.config["menu_unstar"]:
                 [x.unStar() for x in self.outer.stack]
                 self.menu_print("All unstarred!")
-            elif key == "d":
+            elif key in self.outer.config["menu_star"]:
                 [x.star() for x in self.outer.stack]
                 self.menu_print("All starred!")
-            elif key == "t":
+            elif key in self.outer.config["menu_reverse"]:
                 self.outer.stack.reverse()
                 self.menu_print("Stack reversed!")
-            elif key == "z":
+            elif key in self.outer.config["menu_shuffle"]:
                 shuffle(self.outer.stack)
                 self.menu_print("Stack shuffled!")
-            elif key == "e":
+            elif key in self.outer.config["menu_open_file"]:
                 progress.dump(self.outer.stack, runner.get_orig()[1])
                 curses.endwin()
                 os.system(f"$EDITOR {self.outer.input_file}"),
@@ -205,7 +214,7 @@ class Menu:
                     parse.md2html(self.outer.input_file)
                 )
                 self.outer.get_key()
-            elif key == "s":
+            elif key in self.outer.config["menu_stars_only"]:
                 # Check if there are any starred cards before proceeding, and
                 # if not, don't allow to proceed and show an error message
                 cont = False
@@ -221,7 +230,7 @@ class Menu:
                     self.menu_print("Stars only!")
                 else:
                     self.menu_print("ERR: None are starred!", err=True)
-            elif key == "r":
+            elif key in self.outer.config["menu_restart"]:
                 self.outer.obj.index = 0
                 self.outer.get_key()
 
@@ -479,7 +488,7 @@ class Display:
         while True:
             self.check_size()
             key = self.win.getkey()
-            if key == self.config["quit_key"]:
+            if key in self.config["quit_key"]:
                 self.leave()
             elif key in self.config["card_prev"]:
                 self.obj.back()