From c7a98a0efcea532f79504c844da8674818eeb674 Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Sun, 18 Jun 2017 22:36:08 +0530 Subject: [PATCH] macOS: Fix some keyboard shortcuts not working. Fixes #1698545 [Keyboard shortucts not working in Calibre 3.0](https://bugs.launchpad.net/calibre/+bug/1698545) Apparently in Qt 5.6 global menubar actions also conflict with Qt shortcuts. So only display them and dont actually clone them. --- src/calibre/gui2/bars.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/calibre/gui2/bars.py b/src/calibre/gui2/bars.py index 72c19ad4b0..b1b0a3fb17 100644 --- a/src/calibre/gui2/bars.py +++ b/src/calibre/gui2/bars.py @@ -313,7 +313,9 @@ if isosx: self.setChecked(self.clone.isChecked()) self.setIcon(self.clone.icon()) 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 not self.is_top_level: self.setMenu(None)