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

Preferences->Keyboard: Fix unable to use Alt+A and Alt+S as custom shortcuts. Fixes #1576721 [Can't set Alt+A or Alt+S as custom keyboard shortcuts](https://bugs.launchpad.net/calibre/+bug/1576721)

Browse Source
This commit is contained in:
Kovid Goyal 2016-04-30 08:26:13 +05:30
parent 22af52874f
commit 56dc4e6431
1 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/calibre/gui2/keyboard.py
View File

@ -379,7 +379,7 @@ class Editor(QFrame): # {{{
l.addWidget(self.header, 0, 0, 1, 2) l.addWidget(self.header, 0, 0, 1, 2)
self.use_default = QRadioButton('') self.use_default = QRadioButton('')
self.use_custom = QRadioButton(_('Custom')) self.use_custom = QRadioButton(_('&Custom'))
l.addWidget(self.use_default, 1, 0, 1, 3) l.addWidget(self.use_default, 1, 0, 1, 3)
l.addWidget(self.use_custom, 2, 0, 1, 3) l.addWidget(self.use_custom, 2, 0, 1, 3)
self.use_custom.toggled.connect(self.custom_toggled) self.use_custom.toggled.connect(self.custom_toggled)
@ -393,7 +393,7 @@ class Editor(QFrame): # {{{
setattr(self, 'label%d'%which, la) setattr(self, 'label%d'%which, la)
button = QPushButton(_('None'), self) button = QPushButton(_('None'), self)
button.clicked.connect(partial(self.capture_clicked, which=which)) button.clicked.connect(partial(self.capture_clicked, which=which))
button.keyPressEvent = partial(self.key_press_event, which=which) button.installEventFilter(self)
setattr(self, 'button%d'%which, button) setattr(self, 'button%d'%which, button)
clear = QToolButton(self) clear = QToolButton(self)
clear.setIcon(QIcon(I('clear_left.png'))) clear.setIcon(QIcon(I('clear_left.png')))
@ -427,7 +427,7 @@ class Editor(QFrame): # {{{
if not current: if not current:
current = _('None') current = _('None')
self.use_default.setText(_('Default: %(deflt)s [Currently not conflicting: %(curr)s]')% self.use_default.setText(_('&Default: %(deflt)s [Currently not conflicting: %(curr)s]')%
dict(deflt=default, curr=current)) dict(deflt=default, curr=current))
if shortcut['set_to_default']: if shortcut['set_to_default']:
@ -454,6 +454,17 @@ class Editor(QFrame): # {{{
button = getattr(self, 'button%d'%which) button = getattr(self, 'button%d'%which)
button.setText(_('None')) button.setText(_('None'))
def eventFilter(self, obj, event):
if self.capture and obj in (self.button1, self.button2):
t = event.type()
if t == event.ShortcutOverride:
event.accept()
return True
if t == event.KeyPress:
self.key_press_event(event, 1 if obj is self.button1 else 2)
return True
return QFrame.eventFilter(self, obj, event)
def key_press_event(self, ev, which=0): def key_press_event(self, ev, which=0):
if self.capture == 0: if self.capture == 0:
return QWidget.keyPressEvent(self, ev) return QWidget.keyPressEvent(self, ev)