From 45f96abcc93826512aaa0ffed84a733d2f4214c1 Mon Sep 17 00:00:00 2001
From: Christian Geier <christian.geier@justadd.ai>
Date: Fri, 16 Jun 2023 22:50:58 +0200
Subject: [PATCH] ikhal: prettier help/keybindings pane

---
 khal/ui/base.py   | 24 ++++++++++++++----------
 khal/ui/colors.py |  2 ++
 2 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/khal/ui/base.py b/khal/ui/base.py
index 067935bcf..f9f32f4e8 100644
--- a/khal/ui/base.py
+++ b/khal/ui/base.py
@@ -26,6 +26,7 @@
 import logging
 import threading
 import time
+from typing import Callable, List, Optional, Tuple, Union
 
 import urwid
 
@@ -77,16 +78,20 @@ def dialog(self, text, buttons):
         overlay = urwid.Overlay(content, self, 'center', ('relative', 70), ('relative', 70), None)
         self.window.open(overlay)
 
-    def scrollable_dialog(self, text, buttons=None, title="Press `ESC` to close this window"):
+    def scrollable_dialog(self,
+                          text: Union[str, List[urwid.Text]],
+                          buttons: Optional[List[Tuple[str, Callable]]]=None,
+                          title="Press `ESC` to close this window",
+                          ) -> None:
         """Open a scrollable dialog box.
 
         :param text: Text to appear as the body of the Dialog box
-        :type text: str
-        :param buttons: list of tuples of button labels and functions to call
-            when the button is pressed
-        :type buttons: list(str, callable)
+        :param buttons: button labels and functions to call when the button is pressed
         """
-        body = urwid.ListBox([urwid.Text(line) for line in text.splitlines()])
+        if isinstance(text, str):
+            body = urwid.ListBox([urwid.Text(line) for line in text.splitlines()])
+        else:
+            body = urwid.ListBox(text)
         if buttons:
             buttons = NColumns(
                 [urwid.Button(label, on_press=func) for label, func in buttons],
@@ -115,12 +120,11 @@ def keypress(self, size, key):
 
     def show_keybindings(self):
         lines = []
-        lines.append('  Command              Keys')
-        lines.append('  =======              ====')
+        lines.append(urwid.AttrMap(urwid.Text('  Command              Keys'), 'alt header'))
         for command, keys in self._conf['keybindings'].items():
-            lines.append(f'  {command:20} {keys}')
+            lines.append(urwid.Text(f'  {command:20} {", ".join(keys)}'))
         self.scrollable_dialog(
-            '\n'.join(lines),
+            lines,
             title="Press `ESC` to close this window, arrows to scroll",
         )
 
diff --git a/khal/ui/colors.py b/khal/ui/colors.py
index dcd91659e..372314be4 100644
--- a/khal/ui/colors.py
+++ b/khal/ui/colors.py
@@ -24,6 +24,7 @@
     ('header', 'white', 'black'),
     ('footer', 'white', 'black'),
     ('line header', 'black', 'white', 'bold'),
+    ('alt header', 'white', '', 'bold'),
     ('bright', 'dark blue', 'white', ('bold', 'standout')),
     ('list', 'black', 'white'),
     ('list focused', 'white', 'light blue', 'bold'),
@@ -59,6 +60,7 @@
     ('header', 'black', 'white'),
     ('footer', 'black', 'white'),
     ('line header', 'black', 'white', 'bold'),
+    ('alt header', 'black', '', 'bold'),
     ('bright', 'dark blue', 'white', ('bold', 'standout')),
     ('list', 'black', 'white'),
     ('list focused', 'white', 'light blue', 'bold'),