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

Merge from trunk

Browse Source
This commit is contained in:
Charles Haley 2012-08-02 09:35:51 +02:00
commit 8d2a2cf22e
2 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/calibre/customize/conversion.py
View File

@ -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.

6
src/calibre/gui2/dialogs/smartdevice.py
View File

@ -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',