From ffe57344336b46b890d8d84f56f6d600d7ecb394 Mon Sep 17 00:00:00 2001 From: rr- Date: Sun, 13 Jan 2019 18:06:27 +0100 Subject: [PATCH] ui: default to curses user interface --- pqcli/__main__.py | 2 +- pqcli/ui/curses/__init__.py | 4 ++-- pqcli/ui/urwid/__init__.py | 8 ++++---- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/pqcli/__main__.py b/pqcli/__main__.py index fb3233c..9638aef 100644 --- a/pqcli/__main__.py +++ b/pqcli/__main__.py @@ -15,7 +15,7 @@ def parse_args() -> argparse.Namespace: parser = argparse.ArgumentParser(prog="pqcli") group = parser.add_mutually_exclusive_group() - group.set_defaults(ui=UrwidUserInterface) + group.set_defaults(ui=CursesUserInterface) group.add_argument( "--basic", dest="ui", diff --git a/pqcli/ui/curses/__init__.py b/pqcli/ui/curses/__init__.py index 3be57c8..a57f19a 100644 --- a/pqcli/ui/curses/__init__.py +++ b/pqcli/ui/curses/__init__.py @@ -53,8 +53,8 @@ class CursesUserInterface(BaseUserInterface): curses.use_default_colors() curses.init_pair(COLOR_LOGO, 10, -1) curses.init_pair(COLOR_FOCUSED, -1, 8) - curses.init_pair(COLOR_SCROLLBAR_THUMB, -1, 0) - curses.init_pair(COLOR_SCROLLBAR_TRACK, -1, -1) + curses.init_pair(COLOR_SCROLLBAR_THUMB, -1, 7) + curses.init_pair(COLOR_SCROLLBAR_TRACK, -1, 0) curses.init_pair(COLOR_PROGRESSBAR, 0, 9) def signal_handler(sig: T.Any, frame: T.Any) -> None: diff --git a/pqcli/ui/urwid/__init__.py b/pqcli/ui/urwid/__init__.py index 448f634..fa19c21 100644 --- a/pqcli/ui/urwid/__init__.py +++ b/pqcli/ui/urwid/__init__.py @@ -16,16 +16,16 @@ SAVE_FREQ = 60.0 PALETTE_COLORS: T.List[T.Tuple[str, ...]] = [ ("logo", "light green", ""), ("button", "", ""), - ("button-focus", "light red", "black"), + ("button-focus", "", "dark gray"), ("linebox", "", ""), - ("linebox-focus", "light red", "black"), + ("linebox-focus", "", "dark gray"), ("linebox-content", "", ""), ("linebox-content-focus", "", ""), ("progressbar-normal", "", "", "standout"), ("progressbar-done", "black", "light red"), ("progressbar-smooth", "light red", ""), - ("scrollbar", "light gray", "black"), - ("scrollbar-focus", "light red", "black"), + ("scrollbar", "dark gray", "black"), + ("scrollbar-focus", "dark gray", "black"), ("scrollable", "", ""), ("scrollable-focus", "", ""), ]