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

macOS: Fix some keyboard shortcuts not working. Fixes #1698545 [Keyboard shortucts not working in Calibre 3.0](https://bugs.launchpad.net/calibre/+bug/1698545)

Browse Source 
Apparently in Qt 5.6 global menubar actions also conflict with Qt
shortcuts. So only display them and dont actually clone them.
This commit is contained in:
Kovid Goyal 2017-06-18 22:36:08 +05:30
parent 90b16ef410
commit c7a98a0efc
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/calibre/gui2/bars.py
View File

@ -313,7 +313,9 @@ if isosx:
self.setChecked(self.clone.isChecked()) self.setChecked(self.clone.isChecked())
self.setIcon(self.clone.icon()) self.setIcon(self.clone.icon())
if self.clone_shortcuts: if self.clone_shortcuts:
self.setShortcuts(self.clone.shortcuts()) sc = self.clone.shortcut()
if sc and not sc.isEmpty():
self.setText(self.text() + '\t' + sc.toString(sc.NativeText))
if self.clone.menu() is None: if self.clone.menu() is None:
if not self.is_top_level: if not self.is_top_level:
self.setMenu(None) self.setMenu(None)