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 2012-12-23 16:02:18 +05:30
commit 28639d8f43
1 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/calibre/gui2/preferences/coloring.py
View File

@ -106,8 +106,8 @@ class ConditionEditor(QWidget): # {{{
self.column_box.addItem('', '') self.column_box.addItem('', '')
for key in sorted( for key in sorted(
conditionable_columns(fm), conditionable_columns(fm),
key=sort_key): key=lambda(key): sort_key(fm[key]['name'])):
self.column_box.addItem(key, key) self.column_box.addItem(fm[key]['name'], key)
self.column_box.setCurrentIndex(0) self.column_box.setCurrentIndex(0)
self.column_box.currentIndexChanged.connect(self.init_action_box) self.column_box.currentIndexChanged.connect(self.init_action_box)
@ -314,7 +314,8 @@ class RuleEditor(QDialog): # {{{
b.setSizeAdjustPolicy(b.AdjustToMinimumContentsLengthWithIcon) b.setSizeAdjustPolicy(b.AdjustToMinimumContentsLengthWithIcon)
b.setMinimumContentsLength(15) b.setMinimumContentsLength(15)
for key in sorted(displayable_columns(fm), key=sort_key): for key in sorted(displayable_columns(fm),
key=lambda(k): sort_key(fm[k]['name']) if k != color_row_key else 0):
name = all_columns_string if key == color_row_key else fm[key]['name'] name = all_columns_string if key == color_row_key else fm[key]['name']
if name: if name:
self.column_box.addItem(name, key) self.column_box.addItem(name, key)
@ -427,9 +428,11 @@ class RulesModel(QAbstractListModel): # {{{
col, rule = self.rules[row] col, rule = self.rules[row]
except: except:
return None return None
if col == color_row_key:
col = all_columns_string
if role == Qt.DisplayRole: if role == Qt.DisplayRole:
if col == color_row_key:
col = all_columns_string
else:
col = self.fm[col]['name']
return self.rule_to_html(col, rule) return self.rule_to_html(col, rule)
if role == Qt.UserRole: if role == Qt.UserRole:
return (col, rule) return (col, rule)
@ -486,6 +489,7 @@ class RulesModel(QAbstractListModel): # {{{
def condition_to_html(self, condition): def condition_to_html(self, condition):
c, a, v = condition c, a, v = condition
c = self.fm[c]['name']
action_name = a action_name = a
for actions in ConditionEditor.ACTION_MAP.itervalues(): for actions in ConditionEditor.ACTION_MAP.itervalues():
for trans, ac in actions: for trans, ac in actions:
@ -569,9 +573,9 @@ class EditRules(QWidget): # {{{
self.changed.emit() self.changed.emit()
def add_rule(self): def add_rule(self):
d = RuleEditor(self.model.fm) d = RuleEditor(self.model.fm)
d.add_blank_condition() d.add_blank_condition()
self._add_rule(d) self._add_rule(d)
def add_advanced(self): def add_advanced(self):
td = TemplateDialog(self, '', mi=self.mi, fm=self.fm, color_field='') td = TemplateDialog(self, '', mi=self.mi, fm=self.fm, color_field='')