Skip to content

Commit

Permalink
main.view: Avoid ambiguosly overloaded shortcut
Browse files Browse the repository at this point in the history
Alt+D is the "Diffstat" shortcut but it was also being used to
trigger the "Diff" entry on the main menu.

Remove the main menu shortcut so that the "Diffstat" action
does not conflict with it.

Closes #159

Reported-by: Rustam Safin <rustiksnegovik@gmail.com>
Signed-off-by: David Aguilar <davvid@gmail.com>
  • Loading branch information
davvid committed Jan 22, 2013
1 parent a165192 commit 2ea5ca5
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 1 deletion.
2 changes: 1 addition & 1 deletion cola/main/view.py
Expand Up @@ -338,7 +338,7 @@ def __init__(self, model, parent):
self.menubar.addAction(self.actions_menu.menuAction())

# Diff Menu
self.diff_menu = create_menu('&Diff', self.menubar)
self.diff_menu = create_menu('Diff', self.menubar)
self.diff_menu.addAction(self.menu_branch_diff)
self.diff_menu.addAction(self.menu_diff_expression)
self.diff_menu.addAction(self.menu_branch_compare)
Expand Down
6 changes: 6 additions & 0 deletions share/doc/git-cola/relnotes.rst
Expand Up @@ -7,6 +7,12 @@ Usability, bells and whistles

http://github.com/git-cola/git-cola/issues/145

Fixes
-----
* Fixed the Alt+D Diffstat shortcut.

http://github.com/git-cola/git-cola/issues/159

Fixes
-----
* Better error handling when cloning repositories.
Expand Down
1 change: 1 addition & 0 deletions share/doc/git-cola/thanks.rst
Expand Up @@ -33,6 +33,7 @@ Thanks
* Michael Homer
* Omega Weapon
* Paolo G. Giarrusso
* Rustam Safin
* Stefan Naewe
* Steffen Prohaska
* Ugo Riboni
Expand Down

0 comments on commit 2ea5ca5

Please sign in to comment.