From 09c241fce4eaa1581a82e6d5cdf949fa39b73972 Mon Sep 17 00:00:00 2001 From: Charles Haley <> Date: Thu, 7 Feb 2013 22:14:52 +0100 Subject: [PATCH] Fix regression in advanced color rules --- src/calibre/gui2/dialogs/template_dialog.py | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/calibre/gui2/dialogs/template_dialog.py b/src/calibre/gui2/dialogs/template_dialog.py index fc8a528830..c51ead8373 100644 --- a/src/calibre/gui2/dialogs/template_dialog.py +++ b/src/calibre/gui2/dialogs/template_dialog.py @@ -197,7 +197,8 @@ class TemplateHighlighter(QSyntaxHighlighter): class TemplateDialog(QDialog, Ui_TemplateDialog): - def __init__(self, parent, text, mi=None, fm=None, color_field=None): + def __init__(self, parent, text, mi=None, fm=None, color_field=None, + rule_kind='color'): QDialog.__init__(self, parent) Ui_TemplateDialog.__init__(self) self.setupUi(self) @@ -264,7 +265,8 @@ class TemplateDialog(QDialog, Ui_TemplateDialog): self.function.setCurrentIndex(0) self.function.currentIndexChanged[str].connect(self.function_changed) self.textbox_changed() - self.rule = (None, '') + self.rule = (rule_kind, None, '') + self.rule_kind = rule_kind tt = _('Template language tutorial') self.template_tutorial.setText( @@ -323,5 +325,5 @@ class TemplateDialog(QDialog, Ui_TemplateDialog): _('The template box cannot be empty'), show=True) return - self.rule = (unicode(self.colored_field.currentText()), txt) + self.rule = (self.rule_kind, unicode(self.colored_field.currentText()), txt) QDialog.accept(self)