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

Add shortcut_name parameter to create_action() as well

Browse Source
This commit is contained in:
Kovid Goyal 2011-08-27 11:46:30 -06:00
parent f429ab2730
commit e07df7d583
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -120,7 +120,7 @@ class InterfaceAction(QObject):
bn = self.interface_action_base_plugin.name bn = self.interface_action_base_plugin.name
return u'Interface Action: %s (%s)'%(bn, self.name) return u'Interface Action: %s (%s)'%(bn, self.name)
def create_action(self, spec=None, attr='qaction'): def create_action(self, spec=None, attr='qaction', shortcut_name=None):
if spec is None: if spec is None:
spec = self.action_spec spec = self.action_spec
text, icon, tooltip, shortcut = spec text, icon, tooltip, shortcut = spec
@ -146,8 +146,10 @@ class InterfaceAction(QObject):
if shortcut is not None: if shortcut is not None:
keys = ((shortcut,) if isinstance(shortcut, basestring) else keys = ((shortcut,) if isinstance(shortcut, basestring) else
tuple(shortcut)) tuple(shortcut))
if shortcut_name is None and spec[0]:
shortcut_name = unicode(spec[0])
if spec[0] and not (attr=='qaction' and self.popup_type == if shortcut_name and not (attr=='qaction' and self.popup_type ==
QToolButton.InstantPopup): QToolButton.InstantPopup):
try: try:
self.gui.keyboard.register_shortcut(self.unique_name + ' - ' + attr, self.gui.keyboard.register_shortcut(self.unique_name + ' - ' + attr,