X-Git-Url: https://git.armaanb.net/?a=blobdiff_plain;f=lightcards%2Fdisplay.py;h=0e1c01c7c35a0886cb3722d3e153d879177ab517;hb=7ab4e5b02bfe00a70bc60e18dc5076f74ad0b5aa;hp=9baa267a8d7936a19fd57a7542173a97ead3887b;hpb=eedd164f1afe39b28c7dc543189ab5f56a1e2d4a;p=lightcards.git diff --git a/lightcards/display.py b/lightcards/display.py index 9baa267..0e1c01c 100644 --- a/lightcards/display.py +++ b/lightcards/display.py @@ -19,6 +19,13 @@ def panel_create(x, y): return (win, panel) +class CursesError(BaseException): + def __init__(self, message="lightcards: Curses error!"): + self.message = message + print(self.message) + sys.exit(3) + + class Help: def __init__(self, outer, mlines=21, mcols=52): """Initialize help screen""" @@ -40,7 +47,7 @@ class Help: "H, ? open this screen", "e open the input file in $EDITOR", "m open the control menu", - "1, 2 switch views", + "1, 2, 3 switch views", "", "More information can be found in the man page, or", "by running `lightcards --help`.", @@ -64,7 +71,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) - 10, int(mcols / 2) - 25) self.panel.show() while True: @@ -77,7 +84,7 @@ class Help: class Menu: - def __init__(self, outer, mlines=17, mcols=44): + def __init__(self, outer, mlines=16, mcols=44): """Initialize the menu with content""" self.outer = outer (self.win, self.panel) = panel_create(mlines, mcols) @@ -95,7 +102,6 @@ class Menu: "[y]: reset stack to original state", "[a]: alphabetize stack", "[z]: shuffle stack", - "[f]: flip all cards in stack", "[t]: reverse stack order", "[u]: unstar all", "[d]: star all", @@ -117,7 +123,7 @@ class Menu: else: color = curses.color_pair(1) - self.win.addstr(15, 1, string, color) + self.win.addstr(14, 1, string, color) self.menu_grab() def menu_grab(self): @@ -147,14 +153,6 @@ class Menu: elif key == "z": shuffle(self.outer.stack) self.menu_print("Stack shuffled!") - elif key == "f": - for x in self.outer.stack: - x.front, x.back = x.back, x.front - (self.outer.headers[0], self.outer.headers[1]) = ( - self.outer.headers[1], - self.outer.headers[0], - ) - self.menu_print("Cards flipped!") elif key == "s": # Check if there are any starred cards before proceeding, and # if not, don't allow to proceed and show an error message @@ -181,21 +179,21 @@ class Menu: and to continue """ for i in range(42): - self.win.addch(15, i + 1, " ") + self.win.addch(14, i + 1, " ") (mlines, mcols) = self.outer.win.getmaxyx() - self.win.mvwin(int(mlines / 2) - 9, int(mcols / 2) - 21) + self.win.mvwin(int(mlines / 2) - 8, int(mcols / 2) - 22) self.panel.show() self.menu_grab() class Display: - def __init__(self, stack, headers, obj): + def __init__(self, stack, headers, obj, view): self.stack = stack self.headers = headers self.obj = obj - self.view = 1 + self.view = view def run(self, stdscr): """Set important options that require stdscr before starting""" @@ -273,9 +271,9 @@ class Display: f"{str(self.obj.index).zfill(len(str(len(self.stack))))}" f"/{str(len(self.stack))})]" ) - if self.view == 1: + if self.view != 3: bar_end += ( - f" [{self.headers[self.current_card().side]} (" + f" [{self.get_side()} (" f"{str(int(self.current_card().side) + 1)})]" ) bar_end += f" [View {str(self.view)}]" @@ -298,13 +296,19 @@ class Display: wrap_width = 80 return wrap_width + def get_side(self): + if self.obj.side == 0: + return self.headers[self.current_card().side] + else: + return self.headers[self.current_card().get_reverse()] + def disp_card(self): (_, mcols) = self.win.getmaxyx() self.main_panel.bottom() self.win.clear() num_done = str(self.obj.index + 1).zfill(len(str(len(self.stack)))) - if self.view == 1: + if self.view in [1, 2]: """ Display the contents of the card. Shows a header, a horizontal line, and the contents of the current @@ -312,15 +316,20 @@ class Display: """ # If on the back of the card, show the content of the front side in # the header + if self.view == 1: + self.obj.side = 0 + elif self.view == 2: + self.obj.side = 1 + if self.current_card().side == 0: - top = num_done + " | " + self.headers[self.current_card().side] + top = num_done + " | " + self.get_side() else: top = ( num_done + " | " - + self.headers[self.current_card().side] + + self.get_side() + ' | "' - + str(self.current_card().front) + + str(self.current_card().get()[self.obj.get_reverse()]) + '"' ) @@ -336,12 +345,12 @@ class Display: 2, 0, textwrap.fill( - self.current_card().get(), + self.current_card().get()[self.obj.side], width=self.wrap_width(), ), ) - elif self.view == 2: + elif self.view == 3: """ Display the contents of the card with both the front and back sides. """ @@ -404,7 +413,7 @@ class Display: self.obj.forward(self.stack) self.current_card().side = 0 self.disp_card() - elif key in ["j", "k", "KEY_UP", "KEY_DOWN"] and self.view == 1: + elif key in ["j", "k", "KEY_UP", "KEY_DOWN"] and self.view != 3: self.current_card().flip() self.disp_card() elif key in ["i", "/"]: @@ -425,7 +434,7 @@ class Display: elif key == "e": (self.headers, self.stack) = runner.reparse() self.get_key() - elif key in ["1", "2"]: + elif key in ["1", "2", "3"]: self.view = int(key) def disp_sidebar(self): @@ -443,7 +452,7 @@ class Display: nstarred = self.nstarred() for i, card in enumerate(nstarred): - term = card.front + term = card.get()[self.obj.side] if len(term) > 18: term = term[:18] + "…"