diff --git a/aqt/browser.py b/aqt/browser.py index dc887ac22..eb5f7ce48 100644 --- a/aqt/browser.py +++ b/aqt/browser.py @@ -387,6 +387,7 @@ class Browser(QMainWindow): c(self.tagCut3, SIGNAL("activated()"), self.onMark) # add-on hook runHook('browser.setupMenus', self) + self.mw.maybeHideAccelerators(self) def updateFont(self): self.form.tableView.verticalHeader().setDefaultSectionSize( diff --git a/aqt/main.py b/aqt/main.py index 6527def9a..fe9cb967e 100644 --- a/aqt/main.py +++ b/aqt/main.py @@ -983,20 +983,25 @@ will be lost. Continue?""")) ws.setFontSize(QWebSettings.DefaultFontSize, self.fontHeight) def setupSystemSpecific(self): + self.hideMenuAccels = False if isMac: qt_mac_set_menubar_icons(False) # mac users expect a minimize option self.minimizeShortcut = QShortcut("Ctrl+M", self) self.connect(self.minimizeShortcut, SIGNAL("activated()"), self.onMacMinimize) - self.hideAccelerators() + self.hideMenuAccels = True + self.maybeHideAccelerators() self.hideStatusTips() elif isWin: # make sure ctypes is bundled from ctypes import windll, wintypes - def hideAccelerators(self): - for action in self.findChildren(QAction): + def maybeHideAccelerators(self, tgt=None): + if not self.hideMenuAccels: + return + tgt = tgt or self + for action in tgt.findChildren(QAction): txt = unicode(action.text()) m = re.match("^(.+)\(&.+\)(.+)?", txt) if m: