ttygroup/boartty
Code Issues Proposed changes

Add some keyboard shortcuts to the change screen

Browse Source 
Change-Id: I0f84d8b57d74329217795103b99c5205d38cc343
This commit is contained in:
James E. Blair 2014-05-05 11:06:36 -07:00
parent ac295192e0
commit 6eebd81d86
1 changed files with 20 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
gertty/view/change.py
View File

@ -193,7 +193,8 @@ class RevisionRow(urwid.WidgetWrap):
focus_map={'revision-button':'selected-revision-button'} focus_map={'revision-button':'selected-revision-button'}
buttons = [ReviewButton(self), self.review_button = ReviewButton(self)
buttons = [self.review_button,
mywid.FixedButton(('revision-button', "Diff"), mywid.FixedButton(('revision-button', "Diff"),
on_press=self.diff), on_press=self.diff),
mywid.FixedButton(('revision-button', "Checkout"), mywid.FixedButton(('revision-button', "Checkout"),
@ -247,7 +248,10 @@ class ChangeView(urwid.WidgetWrap):
help = mywid.GLOBAL_HELP + """ help = mywid.GLOBAL_HELP + """
This Screen This Screen
=========== ===========
<r> Toggle the reviewed flag for the current change. <R> Toggle the reviewed flag for the current change.
<c> Checkout the most recent revision.
<d> Show the diff of the mont recent revision.
<r> Leave a review for the most recent revision.
""" """
def __init__(self, app, change_key): def __init__(self, app, change_key):
@ -256,6 +260,7 @@ This Screen
self.change_key = change_key self.change_key = change_key
self.revision_rows = {} self.revision_rows = {}
self.message_rows = {} self.message_rows = {}
self.last_revision_key = None
self.change_id_label = urwid.Text(u'', wrap='clip') self.change_id_label = urwid.Text(u'', wrap='clip')
self.owner_label = urwid.Text(u'', wrap='clip') self.owner_label = urwid.Text(u'', wrap='clip')
self.project_label = urwid.Text(u'', wrap='clip') self.project_label = urwid.Text(u'', wrap='clip')
@ -354,6 +359,7 @@ This Screen
# keep track of the index separate from the loop. # keep track of the index separate from the loop.
listbox_index = self.listbox_patchset_start listbox_index = self.listbox_patchset_start
for revno, revision in enumerate(change.revisions): for revno, revision in enumerate(change.revisions):
self.last_revision_key = revision.key
row = self.revision_rows.get(revision.key) row = self.revision_rows.get(revision.key)
if not row: if not row:
row = RevisionRow(self.app, self, repo, revision, row = RevisionRow(self.app, self, repo, revision,
@ -383,10 +389,21 @@ This Screen
def keypress(self, size, key): def keypress(self, size, key):
r = super(ChangeView, self).keypress(size, key) r = super(ChangeView, self).keypress(size, key)
if r=='r': if r == 'R':
self.toggleReviewed() self.toggleReviewed()
self.refresh() self.refresh()
return None return None
if r == 'r':
row = self.revision_rows[self.last_revision_key]
row.review_button.openReview()
return None
if r == 'd':
row = self.revision_rows[self.last_revision_key]
row.diff(None)
return None
if r == 'c':
row = self.revision_rows[self.last_revision_key]
row.checkout(None)
return r return r
def diff(self, revision_key): def diff(self, revision_key):