X-Git-Url: https://git.armaanb.net/?a=blobdiff_plain;f=lightcards%2Fdisplay.py;h=2b4a51fa868a0e6acc388ead17f7c0bd551fe18d;hb=eab52aa7f3cc154f25e578dc66de522259eacbd2;hp=049a0167ef847afa526f06f25994a852716212ac;hpb=6324d97077fd9afd0d97de8eb0d0641c1598b461;p=lightcards.git diff --git a/lightcards/display.py b/lightcards/display.py index 049a016..2b4a51f 100644 --- a/lightcards/display.py +++ b/lightcards/display.py @@ -50,7 +50,7 @@ class Quit: (mlines, mcols) = self.outer.win.getmaxyx() self.win.mvwin(int(mlines / 2) - 3, int(mcols / 2) - 10) self.panel.show() - if self.outer.config["confirm_quit"]: + if self.outer.config["quit_confirmation"]: while True: key = self.win.getkey() if key == "y": @@ -60,33 +60,44 @@ class Quit: self.outer.get_key() -class Help: - def __init__(self, outer, mlines=21, 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 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 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( @@ -97,33 +108,31 @@ class Help: ) self.win.hline(2, 1, curses.ACS_HLINE, mcols) - for t in enumerate(text): - self.win.addstr(t[0] + 3, 1, t[1]) + for i, content in enumerate(text, 3): + self.win.addstr(i, 1, content) self.win.box() 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: 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, @@ -132,22 +141,23 @@ 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", - "[z]: shuffle stack", - "[t]: reverse stack order", - "[u]: unstar all", - "[d]: star all", - "[s]: update stack to include starred only", - "[e]: open the input file in $EDITOR", + 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}", "", - "[r]: restart", - "[m]: close menu", + f"{c('menu_restart')}: restart", + f"{c('menu_disp')}: close menu", ] - for t in enumerate(text): - self.win.addstr(t[0] + 3, 1, t[1]) + for i, content in enumerate(text, 3): + self.win.addstr(i, 1, content) self.win.box() @@ -169,38 +179,42 @@ 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": - progress.dump(self.outer.stack, runner.get_orig()[1]) + elif key in self.outer.config["menu_open_file"]: + self.outer.dump() curses.endwin() os.system(f"$EDITOR {self.outer.input_file}"), (self.outer.headers, self.outer.stack) = parse.parse_html( 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 @@ -216,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() @@ -277,13 +291,17 @@ class Display: else: self.disp_card() + def dump(self): + if self.config["cache"]: + progress.dump(self.stack, runner.get_orig()[1]) + def leave(self): """Pickle stack and confirm before quitting""" self.quit_obj.disp() if self.obj.index + 1 == len(self.stack): self.obj.index = 0 - progress.dump(self.stack, runner.get_orig()[1]) + self.dump() sys.exit(0) def nstarred(self): @@ -474,7 +492,7 @@ class Display: while True: self.check_size() key = self.win.getkey() - if key == "q": + if key in self.config["quit_key"]: self.leave() elif key in self.config["card_prev"]: self.obj.back()