diff --git a/src/calibre/gui2/convert/debug.py b/src/calibre/gui2/convert/debug.py index 3eeed1e966..4dabbba6b2 100644 --- a/src/calibre/gui2/convert/debug.py +++ b/src/calibre/gui2/convert/debug.py @@ -25,8 +25,8 @@ class DebugWidget(Widget, Ui_Form): ) self.db, self.book_id = db, book_id self.initialize_options(get_option, get_help, db, book_id) - self.button_debug_dir.clicked[()].connect(self.set_debug_dir) - self.button_clear.clicked[()].connect(self.clear_debug_dir) + self.button_debug_dir.clicked.connect(self.set_debug_dir) + self.button_clear.clicked.connect(self.clear_debug_dir) def clear_debug_dir(self): self.opt_debug_pipeline.setText('') diff --git a/src/calibre/gui2/convert/font_key.py b/src/calibre/gui2/convert/font_key.py index c3b67e0a1f..a39d6e9ded 100644 --- a/src/calibre/gui2/convert/font_key.py +++ b/src/calibre/gui2/convert/font_key.py @@ -19,7 +19,7 @@ class FontKeyChooser(QDialog, Ui_Dialog): self.default_font_key = font_key self.default_base_font_size = base_font_size self.buttonBox.clicked.connect(self.button_clicked) - self.button_use_default.clicked[()].connect(self.use_default) + self.button_use_default.clicked.connect(self.use_default) for x in ('input_base_font_size', 'input_font_size', 'output_base_font_size'): diff --git a/src/calibre/gui2/convert/look_and_feel.py b/src/calibre/gui2/convert/look_and_feel.py index 7630cdb9c9..2b1b64354e 100644 --- a/src/calibre/gui2/convert/look_and_feel.py +++ b/src/calibre/gui2/convert/look_and_feel.py @@ -52,7 +52,7 @@ class LookAndFeelWidget(Widget, Ui_Form): self.initialize_options(get_option, get_help, db, book_id) self.opt_disable_font_rescaling.toggle() self.opt_disable_font_rescaling.toggle() - self.button_font_key.clicked[()].connect(self.font_key_wizard) + self.button_font_key.clicked.connect(self.font_key_wizard) self.opt_remove_paragraph_spacing.toggle() self.opt_remove_paragraph_spacing.toggle() self.opt_smarten_punctuation.stateChanged.connect( diff --git a/src/calibre/gui2/convert/metadata.py b/src/calibre/gui2/convert/metadata.py index 7ff7bc5384..6e8316f2e5 100644 --- a/src/calibre/gui2/convert/metadata.py +++ b/src/calibre/gui2/convert/metadata.py @@ -59,7 +59,7 @@ class MetadataWidget(Widget, Ui_Form): if self.db is not None: self.initialize_metadata_options() self.initialize_options(get_option, get_help, db, book_id) - self.cover_button.clicked[()].connect(self.select_cover) + self.cover_button.clicked.connect(self.select_cover) self.comment.hide_toolbars() self.cover.cover_changed.connect(self.change_cover) diff --git a/src/calibre/gui2/convert/single.py b/src/calibre/gui2/convert/single.py index 7873a7b77b..90fc990a38 100644 --- a/src/calibre/gui2/convert/single.py +++ b/src/calibre/gui2/convert/single.py @@ -157,7 +157,7 @@ class Config(ResizableDialog, Ui_Dialog): self.groups.entered[(QModelIndex)].connect(self.show_group_help) rb = self.buttonBox.button(self.buttonBox.RestoreDefaults) rb.setText(_('Restore &Defaults')) - rb.clicked[()].connect(self.restore_defaults) + rb.clicked.connect(self.restore_defaults) self.groups.setMouseTracking(True) geom = gprefs.get('convert_single_dialog_geom', None) if geom: diff --git a/src/calibre/gui2/convert/xpath_wizard.py b/src/calibre/gui2/convert/xpath_wizard.py index 8ae83f8187..76c9c64015 100644 --- a/src/calibre/gui2/convert/xpath_wizard.py +++ b/src/calibre/gui2/convert/xpath_wizard.py @@ -63,7 +63,7 @@ class XPathEdit(QWidget, Ui_Edit): def __init__(self, parent=None): QWidget.__init__(self, parent) self.setupUi(self) - self.button.clicked[()].connect(self.wizard) + self.button.clicked.connect(self.wizard) def wizard(self): wiz = Wizard(self) diff --git a/src/calibre/gui2/dialogs/saved_search_editor.py b/src/calibre/gui2/dialogs/saved_search_editor.py index 5a5de62771..fa23c1cae7 100644 --- a/src/calibre/gui2/dialogs/saved_search_editor.py +++ b/src/calibre/gui2/dialogs/saved_search_editor.py @@ -19,9 +19,9 @@ class SavedSearchEditor(QDialog, Ui_SavedSearchEditor): Ui_SavedSearchEditor.__init__(self) self.setupUi(self) - self.add_search_button.clicked[()].connect(self.add_search) + self.add_search_button.clicked.connect(self.add_search) self.search_name_box.currentIndexChanged[(int)].connect(self.current_index_changed) - self.delete_search_button.clicked[()].connect(self.del_search) + self.delete_search_button.clicked.connect(self.del_search) self.rename_button.clicked.connect(self.rename_search) self.current_search_name = None diff --git a/src/calibre/gui2/dialogs/tag_editor.py b/src/calibre/gui2/dialogs/tag_editor.py index 8a8edf042a..eb68cf978f 100644 --- a/src/calibre/gui2/dialogs/tag_editor.py +++ b/src/calibre/gui2/dialogs/tag_editor.py @@ -50,10 +50,10 @@ class TagEditor(QDialog, Ui_TagEditor): if tag not in tags: self.available_tags.addItem(tag) - self.apply_button.clicked[()].connect(self.apply_tags) - self.unapply_button.clicked[()].connect(self.unapply_tags) - self.add_tag_button.clicked[()].connect(self.add_tag) - self.delete_button.clicked[()].connect(self.delete_tags) + self.apply_button.clicked.connect(lambda: self.apply_tags()) + self.unapply_button.clicked.connect(lambda: self.unapply_tags()) + self.add_tag_button.clicked.connect(self.add_tag) + self.delete_button.clicked.connect(lambda: self.delete_tags()) self.add_tag_input.returnPressed[()].connect(self.add_tag) # add the handlers for the filter input clear buttons for x in ('available', 'applied'): diff --git a/src/calibre/gui2/dialogs/user_profiles.py b/src/calibre/gui2/dialogs/user_profiles.py index 56ed09256d..d5ed0bd2bc 100644 --- a/src/calibre/gui2/dialogs/user_profiles.py +++ b/src/calibre/gui2/dialogs/user_profiles.py @@ -113,13 +113,13 @@ class UserProfiles(ResizableDialog, Ui_Dialog): self.remove_feed_button.clicked[(bool)].connect(self.added_feeds.remove_selected_items) self.remove_profile_button.clicked[(bool)].connect(self.remove_selected_items) self.add_feed_button.clicked[(bool)].connect(self.add_feed) - self.load_button.clicked[()].connect(self.load) - self.opml_button.clicked[()].connect(self.opml_import) - self.builtin_recipe_button.clicked[()].connect(self.add_builtin_recipe) - self.share_button.clicked[()].connect(self.share) + self.load_button.clicked.connect(self.load) + self.opml_button.clicked.connect(self.opml_import) + self.builtin_recipe_button.clicked.connect(self.add_builtin_recipe) + self.share_button.clicked.connect(self.share) self.show_recipe_files_button.clicked.connect(self.show_recipe_files) - self.down_button.clicked[()].connect(self.down) - self.up_button.clicked[()].connect(self.up) + self.down_button.clicked.connect(self.down) + self.up_button.clicked.connect(self.up) self.add_profile_button.clicked[(bool)].connect(self.add_profile) self.feed_url.returnPressed[()].connect(self.add_feed) self.feed_title.returnPressed[()].connect(self.add_feed) diff --git a/src/calibre/gui2/widgets.py b/src/calibre/gui2/widgets.py index d10c033212..cbee6f71dc 100644 --- a/src/calibre/gui2/widgets.py +++ b/src/calibre/gui2/widgets.py @@ -65,7 +65,7 @@ class FilenamePattern(QWidget, Ui_Form): # {{{ QWidget.__init__(self, parent) self.setupUi(self) - self.test_button.clicked[()].connect(self.do_test) + self.test_button.clicked.connect(self.do_test) self.re.lineEdit().returnPressed[()].connect(self.do_test) self.filename.returnPressed[()].connect(self.do_test) self.re.lineEdit().textChanged.connect(lambda x: self.changed_signal.emit()) diff --git a/src/calibre/gui2/wizard/__init__.py b/src/calibre/gui2/wizard/__init__.py index adcffa39ff..c529e9a8b9 100644 --- a/src/calibre/gui2/wizard/__init__.py +++ b/src/calibre/gui2/wizard/__init__.py @@ -680,7 +680,7 @@ class LibraryPage(QWizardPage, LibraryUI): QWizardPage.__init__(self) self.setupUi(self) self.registerField('library_location', self.location) - self.button_change.clicked[()].connect(self.change) + self.button_change.clicked.connect(self.change) self.init_languages() self.language.currentIndexChanged[int].connect(self.change_language) self.location.textChanged.connect(self.location_text_changed)