Merge pull request #116 from stsewd/refactor-lists

TUI: refactor list widgets
pythonecuador · Nov 21, 2020 · 713fbeb · 713fbeb
2 parents 4688d0a + 25494ca
commit 713fbeb
Show file tree

Hide file tree

Showing 8 changed files with 442 additions and 95 deletions.
diff --git a/lira/tui/__init__.py b/lira/tui/__init__.py
@@ -21,7 +21,7 @@ def __init__(self):
         self.status = StatusBar(self)
 
         self.menu = SidebarMenu(self)
-        self.menu.push(BooksList(self))
+        self.menu.reset(BooksList(self))
 
         self.container = HSplit(
             [
@@ -52,24 +52,17 @@ def __init__(self):
     def get_key_bindings(self):
         keys = KeyBindings()
 
-        @keys.add("tab")
-        @keys.add("down")
+        @keys.add(Keys.Tab)
         def _(event):
             focus_next(event)
 
-        @keys.add("s-tab")
-        @keys.add("up")
+        @keys.add(Keys.BackTab)
         def _(event):
             focus_previous(event)
 
-        @keys.add(Keys.Backspace)
+        @keys.add(Keys.ControlC)
+        @keys.add(Keys.ControlQ)
         def _(event):
-            self.menu.pop()
-
-        @keys.add("c-c")
-        @keys.add("c-q")
-        def _(event):
-            """Pressing Ctrl-Q or Ctrl-C will exit the user interface."""
             exit_app()
 
         return keys

diff --git a/lira/tui/themes.py b/lira/tui/themes.py
@@ -2,12 +2,15 @@
 
 themes = {
     "default": {
+        # Basic elements
         "text": "#fff",
         "strong": "#fff bold",
         "literal": "#fff",
         "emphasis": "#fff italic",
         "title": "#fff bold",
         "separator": "#aaa",
+        # Widgets
+        "list-item.focused": "bg:#0055aa #ffffff",
     }
 }