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

pep8

Browse Source
This commit is contained in:
Kovid Goyal 2013-10-12 13:32:45 +05:30
parent b777803473
commit a7c8672233
1 changed files with 16 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -127,7 +127,7 @@ class Manager(QObject): # {{{
'map', {}).iteritems()} 'map', {}).iteritems()}
self.keys_map = finalize(self.shortcuts, custom_keys_map=custom_keys_map) self.keys_map = finalize(self.shortcuts, custom_keys_map=custom_keys_map)
#import pprint #import pprint
#pprint.pprint(self.keys_map) # pprint.pprint(self.keys_map)
def replace_action(self, unique_name, new_action): def replace_action(self, unique_name, new_action):
''' '''
@ -255,7 +255,8 @@ class ConfigModel(QAbstractItemModel, SearchQueryParser):
kmap = {} kmap = {}
for node in self.all_shortcuts: for node in self.all_shortcuts:
sc = node.data sc = node.data
if sc['set_to_default']: continue if sc['set_to_default']:
continue
keys = [unicode(k.toString(k.PortableText)) for k in sc['keys']] keys = [unicode(k.toString(k.PortableText)) for k in sc['keys']]
kmap[sc['unique_name']] = keys kmap[sc['unique_name']] = keys
self.keyboard.config['map'] = kmap self.keyboard.config['map'] = kmap
@ -403,10 +404,12 @@ class Editor(QFrame): # {{{
self.current_keys = list(shortcut['keys']) self.current_keys = list(shortcut['keys'])
default = ', '.join([unicode(k.toString(k.NativeText)) for k in default = ', '.join([unicode(k.toString(k.NativeText)) for k in
self.default_keys]) self.default_keys])
if not default: default = _('None') if not default:
default = _('None')
current = ', '.join([unicode(k.toString(k.NativeText)) for k in current = ', '.join([unicode(k.toString(k.NativeText)) for k in
self.current_keys]) self.current_keys])
if not current: current = _('None') if not current:
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))
@ -461,7 +464,8 @@ class Editor(QFrame): # {{{
def dup_check(self, sequence): def dup_check(self, sequence):
for sc in self.all_shortcuts: for sc in self.all_shortcuts:
if sc is self.shortcut: continue if sc is self.shortcut:
continue
for k in sc['keys']: for k in sc['keys']:
if k == sequence: if k == sequence:
return sc['name'] return sc['name']
@ -555,7 +559,8 @@ class Delegate(QStyledItemDelegate): # {{{
ckey = QKeySequence(ckey, QKeySequence.PortableText) ckey = QKeySequence(ckey, QKeySequence.PortableText)
matched = False matched = False
for s in editor.all_shortcuts: for s in editor.all_shortcuts:
if s is editor.shortcut: continue if s is editor.shortcut:
continue
for k in s['keys']: for k in s['keys']:
if k == ckey: if k == ckey:
matched = True matched = True