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

Linux: Fix regression on Unity that prevented some keyboard shortcuts from working because of the global menu bar. Fixes #1390901 [Book Merge via Keyboard Shortcut Not Working](https://bugs.launchpad.net/calibre/+bug/1390901)

Browse Source
This commit is contained in:
Kovid Goyal 2014-11-09 18:50:42 +05:30
parent 07858d843a
commit feb269da46
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/calibre/gui2/actions/__init__.py
View File

@ -258,10 +258,10 @@ class InterfaceAction(QObject):
self.gui.keyboard.register_shortcut(unique_name, self.gui.keyboard.register_shortcut(unique_name,
shortcut_name, default_keys=keys, shortcut_name, default_keys=keys,
action=ac, description=description, group=self.action_spec[0]) action=ac, description=description, group=self.action_spec[0])
if isosx: # In Qt 5 keyboard shortcuts dont work unless the
# In Qt 5 keyboard shortcuts dont work unless the # action is explicitly added to the main window and on OSX and
# action is explicitly added to the main window # Unity since the menu might be exported, the shortcuts wont work
self.gui.addAction(ac) self.gui.addAction(ac)
if triggered is not None: if triggered is not None:
ac.triggered.connect(triggered) ac.triggered.connect(triggered)
return ac return ac