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

Merge from trunk

Browse Source
This commit is contained in:
Charles Haley 2011-08-14 18:32:43 +01:00
commit 6b088aceda
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -53,6 +53,7 @@ def finalize(shortcuts, custom_keys_map={}): # {{{
if DEBUG: if DEBUG:
prints('Key %r for shortcut %s is already used by' prints('Key %r for shortcut %s is already used by'
' %s, ignoring'%(x, shortcut['name'], seen[x]['name'])) ' %s, ignoring'%(x, shortcut['name'], seen[x]['name']))
keys_map[unique_name] = ()
continue continue
seen[x] = shortcut seen[x] = shortcut
keys.append(ks) keys.append(ks)
@ -149,7 +150,7 @@ class ConfigModel(QAbstractItemModel, SearchQueryParser):
shortcut_map = {k:v.copy() for k, v in shortcut_map = {k:v.copy() for k, v in
self.keyboard.shortcuts.iteritems()} self.keyboard.shortcuts.iteritems()}
for un, s in shortcut_map.iteritems(): for un, s in shortcut_map.iteritems():
s['keys'] = tuple(self.keyboard.keys_map[un]) s['keys'] = tuple(self.keyboard.keys_map.get(un, ()))
s['unique_name'] = un s['unique_name'] = un
s['group'] = [g for g, names in self.keyboard.groups.iteritems() if un in s['group'] = [g for g, names in self.keyboard.groups.iteritems() if un in
names][0] names][0]