mirror of
git://github.com/kovidgoyal/calibre.git
synced 2026-05-08 12:24:00 +02:00
Fix error when blanking the column box of a condition in a coloring rule
This commit is contained in:
parent
66f98e8ee2
commit
5ac8b6bdfa
1 changed files with 17 additions and 14 deletions
|
|
@ -159,21 +159,22 @@ def init_action_box(self):
|
|||
self.action_box.clear()
|
||||
self.action_box.addItem('', '')
|
||||
col = self.current_col
|
||||
m = self.fm[col]
|
||||
dt = m['datatype']
|
||||
if dt in self.action_map:
|
||||
actions = self.action_map[dt]
|
||||
else:
|
||||
if col == 'ondevice':
|
||||
k = 'ondevice'
|
||||
elif col == 'identifiers':
|
||||
k = 'identifiers'
|
||||
if col:
|
||||
m = self.fm[col]
|
||||
dt = m['datatype']
|
||||
if dt in self.action_map:
|
||||
actions = self.action_map[dt]
|
||||
else:
|
||||
k = 'multiple' if m['is_multiple'] else 'single'
|
||||
actions = self.action_map[k]
|
||||
if col == 'ondevice':
|
||||
k = 'ondevice'
|
||||
elif col == 'identifiers':
|
||||
k = 'identifiers'
|
||||
else:
|
||||
k = 'multiple' if m['is_multiple'] else 'single'
|
||||
actions = self.action_map[k]
|
||||
|
||||
for text, key in actions:
|
||||
self.action_box.addItem(text, key)
|
||||
for text, key in actions:
|
||||
self.action_box.addItem(text, key)
|
||||
self.action_box.setCurrentIndex(0)
|
||||
self.action_box.blockSignals(False)
|
||||
self.init_value_box()
|
||||
|
|
@ -184,10 +185,12 @@ def init_value_box(self):
|
|||
self.value_box.setInputMask('')
|
||||
self.value_box.setValidator(None)
|
||||
col = self.current_col
|
||||
if not col:
|
||||
return
|
||||
m = self.fm[col]
|
||||
dt = m['datatype']
|
||||
action = self.current_action
|
||||
if not col or not action:
|
||||
if not action:
|
||||
return
|
||||
tt = ''
|
||||
if col == 'identifiers':
|
||||
|
|
|
|||
Loading…
Reference in a new issue