Cutlery/calibre
1
0
Fork 0
mirror of https://github.com/kovidgoyal/calibre.git synced 2025-07-09 03:04:10 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/cbhaley/calibre

Browse Source
This commit is contained in:
Kovid Goyal 2017-06-19 17:51:22 +05:30
commit 1d3c4f31a0
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/calibre/gui2/widgets.py
View File

@ -970,9 +970,8 @@ class LayoutButton(QToolButton):
def update_shortcut(self, action_toggle=None): def update_shortcut(self, action_toggle=None):
action_toggle = action_toggle or getattr(self, 'action_toggle', None) action_toggle = action_toggle or getattr(self, 'action_toggle', None)
if action_toggle: if action_toggle:
sc = action_toggle.shortcut() sc = ', '.join(sc.toString(sc.NativeText)
if sc: for sc in action_toggle.shortcuts())
sc = sc.toString(sc.NativeText)
self.shortcut = sc or '' self.shortcut = sc or ''
self.update_text() self.update_text()