X-Git-Url: https://git.armaanb.net/?a=blobdiff_plain;f=lightcards%2Fdisplay.py;h=e91fed1a302db23d1626464d44c869df0c0194b9;hb=1dacbc89d337361486116644a0ea9b3e1a76bac6;hp=8023ff37338fe273f00345cafe0591696fb189b8;hpb=dd109cb4a1b49f920e36e5732417c4a3d5582821;p=lightcards.git

diff --git a/lightcards/display.py b/lightcards/display.py
index 8023ff3..e91fed1 100644
--- a/lightcards/display.py
+++ b/lightcards/display.py
@@ -9,7 +9,7 @@ import sys
 import textwrap
 import time
 
-from . import runner, progress, parse, config
+from . import runner, progress, parse
 
 
 def panel_create(x, y):
@@ -50,14 +50,14 @@ class Quit:
         (mlines, mcols) = self.outer.win.getmaxyx()
         self.win.mvwin(int(mlines / 2) - 3, int(mcols / 2) - 10)
         self.panel.show()
-
-        while True:
-            key = self.win.getkey()
-            if key == "y":
-                break
-            elif key == "n":
-                self.panel.hide()
-                self.outer.get_key()
+        if self.outer.config["confirm_quit"]:
+            while True:
+                key = self.win.getkey()
+                if key == "y":
+                    break
+                elif key == "n":
+                    self.panel.hide()
+                    self.outer.get_key()
 
 
 class Help:
@@ -132,6 +132,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 +141,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 +151,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 +193,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 +225,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)
@@ -231,22 +235,22 @@ class Menu:
 
 
 class Display:
-    def __init__(self, stack, headers, obj, view, args):
+    def __init__(self, stack, headers, obj, view, args, conf):
         self.stack = stack
         self.headers = headers
         self.obj = obj
         self.view = view
         self.input_file = args.inp[0]
-        self.config = config.read_file(args.config)
+        self.config = conf
 
     def run(self, stdscr):
         """Set important options that require stdscr before starting"""
         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)
@@ -351,10 +355,11 @@ class Display:
                 - 1
             )
         ):
-            # TODO: Use the variying width unicode block characters to make a
-            # super accurate bar
             self.win.addch(
-                height + 1, i + len(progress), "»", curses.color_pair(1)
+                height + 1,
+                i + len(progress),
+                self.config["progress_char"],
+                curses.color_pair(1),
             )
 
     def wrap_width(self):
@@ -477,7 +482,8 @@ class Display:
                 self.disp_card()
             elif key in self.config["card_next"]:
                 if self.obj.index + 1 == len(self.stack):
-                    self.menu_obj.disp()
+                    if self.config["show_menu_at_end"]:
+                        self.menu_obj.disp()
                 else:
                     self.obj.forward(self.stack)
                     self.current_card().side = 0