From 974ef34cd815dc427ab851f8d11d30013d4b6e30 Mon Sep 17 00:00:00 2001
From: David Aguilar <davvid@gmail.com>
Date: Wed, 28 Mar 2012 02:05:43 -0700
Subject: [PATCH] widgets: Use the common shorcuts defined in widgets.defs

Signed-off-by: David Aguilar <davvid@gmail.com>
---
 cola/classic/view.py      |  6 +++---
 cola/widgets/commitmsg.py |  2 +-
 cola/widgets/status.py    | 16 +++++++++++-----
 3 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/cola/classic/view.py b/cola/classic/view.py
index bb4c4c41..4648dcf1 100644
--- a/cola/classic/view.py
+++ b/cola/classic/view.py
@@ -80,7 +80,7 @@ class RepoTreeView(standard.TreeView):
                 self._create_action('Stage Selected',
                                     'Stage selected path(s) for commit.',
                                     self.stage_selected,
-                                    'Ctrl+S')
+                                    defs.stage_shortcut)
         self.action_unstage =\
                 self._create_action('Unstage Selected',
                                     'Remove selected path(s) from '
@@ -97,7 +97,7 @@ class RepoTreeView(standard.TreeView):
                 self._create_action('View Diff...',
                                     'Launch git-difftool on the current path.',
                                     self.difftool,
-                                    'Ctrl+D')
+                                    defs.difftool_shortcut)
         self.action_difftool_predecessor =\
                 self._create_action('Diff Against Predecessor...',
                                     'Launch git-difftool against previous versions.',
@@ -112,7 +112,7 @@ class RepoTreeView(standard.TreeView):
                 self._create_action('Launch Editor',
                                     'Edit selected path(s).',
                                     self.editor,
-                                    'Ctrl+E')
+                                    defs.editor_shortcut)
 
     def size_columns(self):
         """Set the column widths."""
diff --git a/cola/widgets/commitmsg.py b/cola/widgets/commitmsg.py
index 68fe7335..03929936 100644
--- a/cola/widgets/commitmsg.py
+++ b/cola/widgets/commitmsg.py
@@ -51,7 +51,7 @@ class CommitMessageEditor(QtGui.QWidget):
         # Amend checkbox
         self.signoff_action = self.actions_menu.addAction(tr('Sign Off'))
         self.signoff_action.setToolTip('Sign off on this commit')
-        self.signoff_action.setShortcut('Ctrl+i')
+        self.signoff_action.setShortcut('Ctrl+I')
 
         self.commit_action = self.actions_menu.addAction(tr('Commit@@verb'))
         self.commit_action.setToolTip(tr('Commit staged changes'))
diff --git a/cola/widgets/status.py b/cola/widgets/status.py
index 0835a664..cef84f35 100644
--- a/cola/widgets/status.py
+++ b/cola/widgets/status.py
@@ -10,6 +10,7 @@ from cola import signals
 from cola import qtutils
 from cola.compat import set
 from cola.qtutils import SLOT
+from cola.widgets import defs
 from cola.models.selection import State
 
 
@@ -77,13 +78,18 @@ class StatusTreeWidget(QtGui.QTreeWidget):
         self.expanded_items = set()
 
         self.process_selection = qtutils.add_action(self,
-                'Process Selection', self._process_selection, 'Ctrl+S')
+                'Process Selection', self._process_selection,
+                defs.stage_shortcut)
 
         self.launch_difftool = qtutils.add_action(self,
-                'Process Selection', self._launch_difftool, 'Ctrl+D')
-
-        self.launch_difftool = qtutils.add_action(self,
-                'Launch Editor', self._launch_editor, 'Ctrl+E')
+                'Launch Diff Tool', self._launch_difftool,
+                defs.difftool_shortcut)
+        self.launch_difftool.setIcon(qtutils.icon('git.svg'))
+
+        self.launch_editor = qtutils.add_action(self,
+                'Launch Editor', self._launch_editor,
+                defs.editor_shortcut)
+        self.launch_editor.setIcon(qtutils.open_file_icon())
 
         self.up = qtutils.add_action(self, 'Move Up', self.move_up, 'K')
         self.down = qtutils.add_action(self, 'Move Down', self.move_down, 'J')
-- 
2.11.4.GIT