diff --git a/gertty/app.py b/gertty/app.py index 5cc5eb8..42d1920 100644 --- a/gertty/app.py +++ b/gertty/app.py @@ -27,24 +27,24 @@ from gertty import mywid from gertty import sync from gertty.view import project_list as view_project_list -palette=[('reversed', 'default,standout', ''), +palette=[('focused', 'default,standout', ''), ('header', 'white,bold', 'dark blue'), ('error', 'light red', 'dark blue'), ('table-header', 'white,bold', ''), # Diff ('filename', 'light cyan', ''), ('context-button', 'dark magenta', ''), - ('selected-context-button', 'light magenta', ''), + ('focused-context-button', 'light magenta', ''), ('removed-line', 'dark red', ''), ('removed-word', 'light red', ''), ('added-line', 'dark green', ''), ('added-word', 'light green', ''), ('nonexistent', 'default', ''), - ('reversed-removed-line', 'dark red,standout', ''), - ('reversed-removed-word', 'light red,standout', ''), - ('reversed-added-line', 'dark green,standout', ''), - ('reversed-added-word', 'light green,standout', ''), - ('reversed-nonexistent', 'default,standout', ''), + ('focused-removed-line', 'dark red,standout', ''), + ('focused-removed-word', 'light red,standout', ''), + ('focused-added-line', 'dark green,standout', ''), + ('focused-added-word', 'light green,standout', ''), + ('focused-nonexistent', 'default,standout', ''), ('draft-comment', 'default', 'dark gray'), ('comment', 'light gray', 'dark gray'), ('comment-name', 'white', 'dark gray'), @@ -55,26 +55,26 @@ palette=[('reversed', 'default,standout', ''), ('revision-commit', 'dark blue', ''), ('revision-comments', 'default', ''), ('revision-drafts', 'dark red', ''), - ('reversed-revision-name', 'light blue,standout', ''), - ('reversed-revision-commit', 'dark blue,standout', ''), - ('reversed-revision-comments', 'default,standout', ''), - ('reversed-revision-drafts', 'dark red,standout', ''), + ('focused-revision-name', 'light blue,standout', ''), + ('focused-revision-commit', 'dark blue,standout', ''), + ('focused-revision-comments', 'default,standout', ''), + ('focused-revision-drafts', 'dark red,standout', ''), ('change-message-name', 'light blue', ''), ('change-message-header', 'dark blue', ''), ('revision-button', 'dark magenta', ''), - ('selected-revision-button', 'light magenta', ''), + ('focused-revision-button', 'light magenta', ''), # project list ('unreviewed-project', 'white', ''), ('subscribed-project', 'default', ''), ('unsubscribed-project', 'dark gray', ''), - ('reversed-unreviewed-project', 'white,standout', ''), - ('reversed-subscribed-project', 'default,standout', ''), - ('reversed-unsubscribed-project', 'dark gray,standout', ''), + ('focused-unreviewed-project', 'white,standout', ''), + ('focused-subscribed-project', 'default,standout', ''), + ('focused-unsubscribed-project', 'dark gray,standout', ''), # change list ('unreviewed-change', 'default', ''), ('reviewed-change', 'dark gray', ''), - ('reversed-unreviewed-change', 'default,standout', ''), - ('reversed-reviewed-change', 'dark gray,standout', ''), + ('focused-unreviewed-change', 'default,standout', ''), + ('focused-reviewed-change', 'dark gray,standout', ''), ] WELCOME_TEXT = """\ diff --git a/gertty/mywid.py b/gertty/mywid.py index a715b77..7b8492e 100644 --- a/gertty/mywid.py +++ b/gertty/mywid.py @@ -29,7 +29,7 @@ class TextButton(urwid.Button): def __init__(self, text, on_press=None, user_data=None): super(TextButton, self).__init__('', on_press=on_press, user_data=user_data) text = urwid.Text(text) - self._w = urwid.AttrMap(text, None, focus_map='reversed') + self._w = urwid.AttrMap(text, None, focus_map='focused') class FixedButton(urwid.Button): def sizing(self): diff --git a/gertty/view/change.py b/gertty/view/change.py index 751128f..f669b99 100644 --- a/gertty/view/change.py +++ b/gertty/view/change.py @@ -148,10 +148,10 @@ class ReviewButton(mywid.FixedButton): class RevisionRow(urwid.WidgetWrap): revision_focus_map = { - 'revision-name': 'reversed-revision-name', - 'revision-commit': 'reversed-revision-commit', - 'revision-comments': 'reversed-revision-comments', - 'revision-drafts': 'reversed-revision-drafts', + 'revision-name': 'focused-revision-name', + 'revision-commit': 'focused-revision-commit', + 'revision-comments': 'focused-revision-comments', + 'revision-drafts': 'focused-revision-drafts', } def __init__(self, app, change_view, repo, revision, expanded=False): @@ -192,7 +192,7 @@ class RevisionRow(urwid.WidgetWrap): table = urwid.Pile(rows) - focus_map={'revision-button':'selected-revision-button'} + focus_map={'revision-button': 'focused-revision-button'} self.review_button = ReviewButton(self) buttons = [self.review_button, mywid.FixedButton(('revision-button', "Diff"), diff --git a/gertty/view/change_list.py b/gertty/view/change_list.py index 3ec1282..fae6223 100644 --- a/gertty/view/change_list.py +++ b/gertty/view/change_list.py @@ -18,9 +18,9 @@ from gertty import mywid from gertty.view import change as view_change class ChangeRow(urwid.Button): - change_focus_map = {None: 'reversed', - 'unreviewed-change': 'reversed-unreviewed-change', - 'reviewed-change': 'reversed-reviewed-change', + change_focus_map = {None: 'focused', + 'unreviewed-change': 'focused-unreviewed-change', + 'reviewed-change': 'focused-reviewed-change', } def selectable(self): diff --git a/gertty/view/diff.py b/gertty/view/diff.py index 830a25a..dc919a7 100644 --- a/gertty/view/diff.py +++ b/gertty/view/diff.py @@ -94,12 +94,12 @@ class DiffLine(urwid.Button): line_col = urwid.AttrMap(line_col, 'nonexistent') columns += [(4, ln_col), line_col] col = urwid.Columns(columns) - map = {None: 'reversed', - 'added-line': 'reversed-added-line', - 'added-word': 'reversed-added-word', - 'removed-line': 'reversed-removed-line', - 'removed-word': 'reversed-removed-word', - 'nonexistent': 'reversed-nonexistent', + map = {None: 'focused', + 'added-line': 'focused-added-line', + 'added-word': 'focused-added-word', + 'removed-line': 'focused-removed-line', + 'removed-word': 'focused-removed-word', + 'nonexistent': 'focused-nonexistent', } self._w = urwid.AttrMap(col, None, focus_map=map) @@ -108,7 +108,7 @@ class DiffContextButton(urwid.WidgetWrap): return True def __init__(self, view, diff, chunk): - focus_map={'context-button':'selected-context-button'} + focus_map={'context-button':'focused-context-button'} buttons = [mywid.FixedButton(('context-button', "Expand previous 10"), on_press=self.prev), mywid.FixedButton(('context-button', diff --git a/gertty/view/project_list.py b/gertty/view/project_list.py index 42fbc45..de668a1 100644 --- a/gertty/view/project_list.py +++ b/gertty/view/project_list.py @@ -19,10 +19,10 @@ from gertty import sync from gertty.view import change_list as view_change_list class ProjectRow(urwid.Button): - project_focus_map = {None: 'reversed', - 'unreviewed-project': 'reversed-unreviewed-project', - 'subscribed-project': 'reversed-subscribed-project', - 'unsubscribed-project': 'reversed-unsubscribed-project', + project_focus_map = {None: 'focused', + 'unreviewed-project': 'focused-unreviewed-project', + 'subscribed-project': 'focused-subscribed-project', + 'unsubscribed-project': 'focused-unsubscribed-project', } def selectable(self):