ttygroup/boartty
Code Issues Proposed changes

Standardize on 'focused' in text attrs

Browse Source 
Rather than 'selected' or 'reversed' which includes an assumption
about exactly how the text will be displayed.

Change-Id: I91606492494b2f7f7d5028be9e2e8782bb55c5a5
This commit is contained in:
James E. Blair 2014-05-05 11:18:04 -07:00
parent 6eebd81d86
commit 29e947f8d6
6 changed files with 37 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
gertty/app.py
View File

@ -27,24 +27,24 @@ from gertty import mywid
from gertty import sync from gertty import sync
from gertty.view import project_list as view_project_list from gertty.view import project_list as view_project_list
palette=[('reversed', 'default,standout', ''), palette=[('focused', 'default,standout', ''),
('header', 'white,bold', 'dark blue'), ('header', 'white,bold', 'dark blue'),
('error', 'light red', 'dark blue'), ('error', 'light red', 'dark blue'),
('table-header', 'white,bold', ''), ('table-header', 'white,bold', ''),
# Diff # Diff
('filename', 'light cyan', ''), ('filename', 'light cyan', ''),
('context-button', 'dark magenta', ''), ('context-button', 'dark magenta', ''),
('selected-context-button', 'light magenta', ''), ('focused-context-button', 'light magenta', ''),
('removed-line', 'dark red', ''), ('removed-line', 'dark red', ''),
('removed-word', 'light red', ''), ('removed-word', 'light red', ''),
('added-line', 'dark green', ''), ('added-line', 'dark green', ''),
('added-word', 'light green', ''), ('added-word', 'light green', ''),
('nonexistent', 'default', ''), ('nonexistent', 'default', ''),
('reversed-removed-line', 'dark red,standout', ''), ('focused-removed-line', 'dark red,standout', ''),
('reversed-removed-word', 'light red,standout', ''), ('focused-removed-word', 'light red,standout', ''),
('reversed-added-line', 'dark green,standout', ''), ('focused-added-line', 'dark green,standout', ''),
('reversed-added-word', 'light green,standout', ''), ('focused-added-word', 'light green,standout', ''),
('reversed-nonexistent', 'default,standout', ''), ('focused-nonexistent', 'default,standout', ''),
('draft-comment', 'default', 'dark gray'), ('draft-comment', 'default', 'dark gray'),
('comment', 'light gray', 'dark gray'), ('comment', 'light gray', 'dark gray'),
('comment-name', 'white', 'dark gray'), ('comment-name', 'white', 'dark gray'),
@ -55,26 +55,26 @@ palette=[('reversed', 'default,standout', ''),
('revision-commit', 'dark blue', ''), ('revision-commit', 'dark blue', ''),
('revision-comments', 'default', ''), ('revision-comments', 'default', ''),
('revision-drafts', 'dark red', ''), ('revision-drafts', 'dark red', ''),
('reversed-revision-name', 'light blue,standout', ''), ('focused-revision-name', 'light blue,standout', ''),
('reversed-revision-commit', 'dark blue,standout', ''), ('focused-revision-commit', 'dark blue,standout', ''),
('reversed-revision-comments', 'default,standout', ''), ('focused-revision-comments', 'default,standout', ''),
('reversed-revision-drafts', 'dark red,standout', ''), ('focused-revision-drafts', 'dark red,standout', ''),
('change-message-name', 'light blue', ''), ('change-message-name', 'light blue', ''),
('change-message-header', 'dark blue', ''), ('change-message-header', 'dark blue', ''),
('revision-button', 'dark magenta', ''), ('revision-button', 'dark magenta', ''),
('selected-revision-button', 'light magenta', ''), ('focused-revision-button', 'light magenta', ''),
# project list # project list
('unreviewed-project', 'white', ''), ('unreviewed-project', 'white', ''),
('subscribed-project', 'default', ''), ('subscribed-project', 'default', ''),
('unsubscribed-project', 'dark gray', ''), ('unsubscribed-project', 'dark gray', ''),
('reversed-unreviewed-project', 'white,standout', ''), ('focused-unreviewed-project', 'white,standout', ''),
('reversed-subscribed-project', 'default,standout', ''), ('focused-subscribed-project', 'default,standout', ''),
('reversed-unsubscribed-project', 'dark gray,standout', ''), ('focused-unsubscribed-project', 'dark gray,standout', ''),
# change list # change list
('unreviewed-change', 'default', ''), ('unreviewed-change', 'default', ''),
('reviewed-change', 'dark gray', ''), ('reviewed-change', 'dark gray', ''),
('reversed-unreviewed-change', 'default,standout', ''), ('focused-unreviewed-change', 'default,standout', ''),
('reversed-reviewed-change', 'dark gray,standout', ''), ('focused-reviewed-change', 'dark gray,standout', ''),
] ]
WELCOME_TEXT = """\ WELCOME_TEXT = """\

2
gertty/mywid.py
View File

@ -29,7 +29,7 @@ class TextButton(urwid.Button):
def __init__(self, text, on_press=None, user_data=None): def __init__(self, text, on_press=None, user_data=None):
super(TextButton, self).__init__('', on_press=on_press, user_data=user_data) super(TextButton, self).__init__('', on_press=on_press, user_data=user_data)
text = urwid.Text(text) 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): class FixedButton(urwid.Button):
def sizing(self): def sizing(self):

10
gertty/view/change.py
View File

@ -148,10 +148,10 @@ class ReviewButton(mywid.FixedButton):
class RevisionRow(urwid.WidgetWrap): class RevisionRow(urwid.WidgetWrap):
revision_focus_map = { revision_focus_map = {
'revision-name': 'reversed-revision-name', 'revision-name': 'focused-revision-name',
'revision-commit': 'reversed-revision-commit', 'revision-commit': 'focused-revision-commit',
'revision-comments': 'reversed-revision-comments', 'revision-comments': 'focused-revision-comments',
'revision-drafts': 'reversed-revision-drafts', 'revision-drafts': 'focused-revision-drafts',
} }
def __init__(self, app, change_view, repo, revision, expanded=False): def __init__(self, app, change_view, repo, revision, expanded=False):
@ -192,7 +192,7 @@ class RevisionRow(urwid.WidgetWrap):
table = urwid.Pile(rows) table = urwid.Pile(rows)
focus_map={'revision-button':'selected-revision-button'} focus_map={'revision-button': 'focused-revision-button'}
self.review_button = ReviewButton(self) self.review_button = ReviewButton(self)
buttons = [self.review_button, buttons = [self.review_button,
mywid.FixedButton(('revision-button', "Diff"), mywid.FixedButton(('revision-button', "Diff"),

6
gertty/view/change_list.py
View File

@ -18,9 +18,9 @@ from gertty import mywid
from gertty.view import change as view_change from gertty.view import change as view_change
class ChangeRow(urwid.Button): class ChangeRow(urwid.Button):
change_focus_map = {None: 'reversed', change_focus_map = {None: 'focused',
'unreviewed-change': 'reversed-unreviewed-change', 'unreviewed-change': 'focused-unreviewed-change',
'reviewed-change': 'reversed-reviewed-change', 'reviewed-change': 'focused-reviewed-change',
} }
def selectable(self): def selectable(self):

14
gertty/view/diff.py
View File

@ -94,12 +94,12 @@ class DiffLine(urwid.Button):
line_col = urwid.AttrMap(line_col, 'nonexistent') line_col = urwid.AttrMap(line_col, 'nonexistent')
columns += [(4, ln_col), line_col] columns += [(4, ln_col), line_col]
col = urwid.Columns(columns) col = urwid.Columns(columns)
map = {None: 'reversed', map = {None: 'focused',
'added-line': 'reversed-added-line', 'added-line': 'focused-added-line',
'added-word': 'reversed-added-word', 'added-word': 'focused-added-word',
'removed-line': 'reversed-removed-line', 'removed-line': 'focused-removed-line',
'removed-word': 'reversed-removed-word', 'removed-word': 'focused-removed-word',
'nonexistent': 'reversed-nonexistent', 'nonexistent': 'focused-nonexistent',
} }
self._w = urwid.AttrMap(col, None, focus_map=map) self._w = urwid.AttrMap(col, None, focus_map=map)
@ -108,7 +108,7 @@ class DiffContextButton(urwid.WidgetWrap):
return True return True
def __init__(self, view, diff, chunk): 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"), buttons = [mywid.FixedButton(('context-button', "Expand previous 10"),
on_press=self.prev), on_press=self.prev),
mywid.FixedButton(('context-button', mywid.FixedButton(('context-button',

8
gertty/view/project_list.py
View File

@ -19,10 +19,10 @@ from gertty import sync
from gertty.view import change_list as view_change_list from gertty.view import change_list as view_change_list
class ProjectRow(urwid.Button): class ProjectRow(urwid.Button):
project_focus_map = {None: 'reversed', project_focus_map = {None: 'focused',
'unreviewed-project': 'reversed-unreviewed-project', 'unreviewed-project': 'focused-unreviewed-project',
'subscribed-project': 'reversed-subscribed-project', 'subscribed-project': 'focused-subscribed-project',
'unsubscribed-project': 'reversed-unsubscribed-project', 'unsubscribed-project': 'focused-unsubscribed-project',
} }
def selectable(self): def selectable(self):