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

...

Browse Source
This commit is contained in:
Kovid Goyal 2014-11-28 23:35:34 +05:30
parent b6d78b69c7
commit bd7bba7fae
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -54,11 +54,6 @@ def finalize(shortcuts, custom_keys_map={}): # {{{
''' '''
seen, keys_map = {}, {} seen, keys_map = {}, {}
for unique_name, shortcut in shortcuts.iteritems(): for unique_name, shortcut in shortcuts.iteritems():
ac = shortcut['action']
if ac is None or sip.isdeleted(ac):
if ac is not None and DEBUG:
prints('Shortcut %r has a deleted action' % unique_name)
continue
custom_keys = custom_keys_map.get(unique_name, None) custom_keys = custom_keys_map.get(unique_name, None)
if custom_keys is None: if custom_keys is None:
candidates = shortcut['default_keys'] candidates = shortcut['default_keys']
@ -81,6 +76,11 @@ def finalize(shortcuts, custom_keys_map={}): # {{{
keys = tuple(keys) keys = tuple(keys)
keys_map[unique_name] = keys keys_map[unique_name] = keys
ac = shortcut['action']
if ac is None or sip.isdeleted(ac):
if ac is not None and DEBUG:
prints('Shortcut %r has a deleted action' % unique_name)
continue
ac.setShortcuts(list(keys)) ac.setShortcuts(list(keys))
return keys_map return keys_map