This commit is contained in:
Kovid Goyal 2011-01-06 12:46:34 -07:00
parent 4f3424ab72
commit 9cc4d3e0ea
2 changed files with 3 additions and 3 deletions

View File

@ -183,6 +183,7 @@ class Widget(QWidget):
def set_value(self, g, val): def set_value(self, g, val):
from calibre.gui2.convert.xpath_wizard import XPathEdit from calibre.gui2.convert.xpath_wizard import XPathEdit
from calibre.gui2.convert.regex_builder import RegexEdit from calibre.gui2.convert.regex_builder import RegexEdit
from calibre.gui2.widgets import EncodingComboBox
if self.set_value_handler(g, val): if self.set_value_handler(g, val):
return return
if isinstance(g, (QSpinBox, QDoubleSpinBox)): if isinstance(g, (QSpinBox, QDoubleSpinBox)):
@ -201,6 +202,8 @@ class Widget(QWidget):
g.setCheckState(Qt.Checked if bool(val) else Qt.Unchecked) g.setCheckState(Qt.Checked if bool(val) else Qt.Unchecked)
elif isinstance(g, (XPathEdit, RegexEdit)): elif isinstance(g, (XPathEdit, RegexEdit)):
g.edit.setText(val if val else '') g.edit.setText(val if val else '')
elif isinstance(g, EncodingComboBox):
g.setEditText(val if val else '')
else: else:
raise Exception('Can\'t set value %s in %s'%(repr(val), raise Exception('Can\'t set value %s in %s'%(repr(val),
unicode(g.objectName()))) unicode(g.objectName())))

View File

@ -56,9 +56,6 @@ class LookAndFeelWidget(Widget, Ui_Form):
g.setCurrentIndex(i) g.setCurrentIndex(i)
break break
return True return True
if g is self.opt_input_encoding:
g.setEditText(val if val else '')
return True
def font_key_wizard(self): def font_key_wizard(self):
from calibre.gui2.convert.font_key import FontKeyChooser from calibre.gui2.convert.font_key import FontKeyChooser