From 6466898e1a9676e0bd83d1e062b3142d921fd7c3 Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Wed, 1 Aug 2012 23:55:00 +0530 Subject: [PATCH 1/2] Fix #1031863 (Exception in Bulk conversion) --- src/calibre/customize/conversion.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/calibre/customize/conversion.py b/src/calibre/customize/conversion.py index 50bceb4def..fe0d563206 100644 --- a/src/calibre/customize/conversion.py +++ b/src/calibre/customize/conversion.py @@ -257,7 +257,7 @@ class InputFormatPlugin(Plugin): pass def gui_configuration_widget(self, parent, get_option_by_name, - get_option_help, db, book_id): + get_option_help, db, book_id=None): ''' Called to create the widget used for configuring this plugin in the calibre GUI. The widget must be an instance of the PluginWidget class. @@ -351,7 +351,7 @@ class OutputFormatPlugin(Plugin): pass def gui_configuration_widget(self, parent, get_option_by_name, - get_option_help, db, book_id): + get_option_help, db, book_id=None): ''' Called to create the widget used for configuring this plugin in the calibre GUI. The widget must be an instance of the PluginWidget class. From 3aa643425e8e24a3bbf02cc2c0290b9b2527190e Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Thu, 2 Aug 2012 11:04:45 +0530 Subject: [PATCH 2/2] ... --- src/calibre/gui2/dialogs/smartdevice.py | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/calibre/gui2/dialogs/smartdevice.py b/src/calibre/gui2/dialogs/smartdevice.py index d62011b9fe..35e6bdf3a0 100644 --- a/src/calibre/gui2/dialogs/smartdevice.py +++ b/src/calibre/gui2/dialogs/smartdevice.py @@ -40,10 +40,8 @@ class SmartdeviceDialog(QDialog, Ui_Dialog): self.resize(self.sizeHint()) def toggle_password(self, state): - if state == Qt.Unchecked: - self.password_box.setEchoMode(QLineEdit.Password) - else: - self.password_box.setEchoMode(QLineEdit.Normal) + self.password_box.setEchoMode(QLineEdit.Password if state == + Qt.Unchecked else QLineEdit.Normal) def accept(self): self.device_manager.set_option('smartdevice', 'password',