"""Grab keypresses on the menu screen"""
while True:
key = self.win.getkey()
- if key in ["r", "q", "m"]:
+ if key in ["r", "m"]:
self.menu_panel.hide()
self.panel_up()
- if key in ["q", "m"]:
- if len(self.stack) == self.obj.getIdx() + 1:
- self.leave()
- elif len(self.stack) < self.obj.getIdx() + 1:
- self.obj.setIdx(0)
self.get_key()
+ elif key == "q":
+ self.leave()
elif key == "y":
self.stack = runner.get_orig()[1]
self.menu_print("Stack reset!")
self.obj.setIdx(0)
self.get_key()
- def menu_init(self, quit=True):
+ def menu_init(self):
"""Initialize the menu with content"""
(self.menu_win, self.menu_panel) = self.panel_create(17, 44)
self.menu_panel.top()
self.menu_panel.hide()
- # TODO: fix this
- quit_text = "[q]: back"
- if quit:
- quit_text = "[q]: quit"
self.menu_win.addstr(
1, 1, "LIGHTCARDS MENU", curses.color_pair(1) + curses.A_BOLD
"[u]: unstar all",
"[d]: star all",
"[s]: update stack to include starred only",
+ "",
+ "[r]: restart",
+ "[m]: close menu",
]
for t in enumerate(text):
self.menu_win.addstr(t[0] + 3, 1, t[1])
- self.menu_win.addstr(len(text) + 4, 1, "[r]: restart")
- self.menu_win.addstr(len(text) + 5, 1, quit_text)
self.menu_win.box()
self.panel_up()
"More information can be found in the man page, or",
"by running `lightcards --help`.",
"",
- "Press [q], [H], or [?] to go back.",
+ "Press [H], or [?] to go back.",
]
for t in enumerate(text):
self.help_panel.show()
while True:
key = self.help_win.getkey()
- if key in ["q", "H", "?"]:
+ if key == "q":
+ self.leave()
+ elif key in ["H", "?"]:
self.help_panel.hide()
self.get_key()