diff --git a/src/calibre/gui2/actions/copy_to_library.py b/src/calibre/gui2/actions/copy_to_library.py index ff264b00f9..a6801b2198 100644 --- a/src/calibre/gui2/actions/copy_to_library.py +++ b/src/calibre/gui2/actions/copy_to_library.py @@ -298,7 +298,10 @@ class ChooseLibrary(Dialog): # {{{ v.addWidget(sa) sa.setChecked(bool(gprefs.get('copy_to_library_choose_library_sort_alphabetically', True))) sa.stateChanged.connect(self.resort) - sa.stateChanged.connect(lambda: gprefs.set('copy_to_library_choose_library_sort_alphabetically', bool(self.sort_alphabetically.isChecked()))) + + connect_lambda(sa.stateChanged, self, lambda self: + gprefs.set('copy_to_library_choose_library_sort_alphabetically', + bool(self.sort_alphabetically.isChecked()))) la = self.la = QLabel(_('Library &path:')) v.addWidget(la) le = self.le = QLineEdit(self) diff --git a/src/calibre/gui2/actions/mark_books.py b/src/calibre/gui2/actions/mark_books.py index 90946d6203..3de994a6bd 100644 --- a/src/calibre/gui2/actions/mark_books.py +++ b/src/calibre/gui2/actions/mark_books.py @@ -61,14 +61,14 @@ class MarkBooksAction(InterfaceAction): a.triggered.connect(self.clear_all_marked) m.addSeparator() self.mark_author_action = a = ma('mark-author', _('Mark all books by selected author(s)'), icon='plus.png') - a.triggered.connect(partial(self.mark_field, 'authors', True)) + connect_lambda(a.triggered, self, lambda self: self.mark_field('authors', True)) self.mark_series_action = a = ma('mark-series', _('Mark all books in the selected series'), icon='plus.png') - a.triggered.connect(partial(self.mark_field, 'series', True)) + connect_lambda(a.triggered, self, lambda self: self.mark_field('series', True)) m.addSeparator() self.unmark_author_action = a = ma('unmark-author', _('Clear all books by selected author(s)'), icon='minus.png') - a.triggered.connect(partial(self.mark_field, 'authors', False)) + connect_lambda(a.triggered, self, lambda self: self.mark_field('authors', False)) self.unmark_series_action = a = ma('unmark-series', _('Clear all books in the selected series'), icon='minus.png') - a.triggered.connect(partial(self.mark_field, 'series', False)) + connect_lambda(a.triggered, self, lambda self: self.mark_field('series', False)) def gui_layout_complete(self): for x in self.gui.bars_manager.main_bars + self.gui.bars_manager.child_bars: @@ -138,4 +138,3 @@ class MarkBooksAction(InterfaceAction): else: mids.pop(book_id, None) db.data.set_marked_ids(mids) - diff --git a/src/calibre/gui2/tweak_book/diff/main.py b/src/calibre/gui2/tweak_book/diff/main.py index 7549b9e48a..6b872327c0 100644 --- a/src/calibre/gui2/tweak_book/diff/main.py +++ b/src/calibre/gui2/tweak_book/diff/main.py @@ -239,14 +239,14 @@ class Diff(Dialog): r = l.rowCount() self.bp = b = QToolButton(self) b.setIcon(QIcon(I('back.png'))) - b.clicked.connect(partial(self.view.next_change, -1)) + connect_lambda(b.clicked, self, lambda self: self.view.next_change(-1)) b.setToolTip(_('Go to previous change') + ' [p]') b.setText(_('&Previous change')), b.setToolButtonStyle(Qt.ToolButtonTextBesideIcon) l.addWidget(b, r, 0) self.bn = b = QToolButton(self) b.setIcon(QIcon(I('forward.png'))) - b.clicked.connect(partial(self.view.next_change, 1)) + connect_lambda(b.clicked, self, lambda self: self.view.next_change(1)) b.setToolTip(_('Go to next change') + ' [n]') b.setText(_('&Next change')), b.setToolButtonStyle(Qt.ToolButtonTextBesideIcon) l.addWidget(b, r, 1) @@ -255,16 +255,16 @@ class Diff(Dialog): s.initialize('diff_search_history') l.addWidget(s, r, 2) s.setPlaceholderText(_('Search for text')) - s.returnPressed.connect(partial(self.do_search, False)) + connect_lambda(s.returnPressed, self, lambda self: self.do_search(False)) self.sbn = b = QToolButton(self) b.setIcon(QIcon(I('arrow-down.png'))) - b.clicked.connect(partial(self.do_search, False)) + connect_lambda(b.clicked, self, lambda self: self.do_search(False)) b.setToolTip(_('Find next match')) b.setText(_('Next &match')), b.setToolButtonStyle(Qt.ToolButtonTextBesideIcon) l.addWidget(b, r, 3) self.sbp = b = QToolButton(self) b.setIcon(QIcon(I('arrow-up.png'))) - b.clicked.connect(partial(self.do_search, True)) + connect_lambda(b.clicked, self, lambda self: self.do_search(True)) b.setToolTip(_('Find previous match')) b.setText(_('P&revious match')), b.setToolButtonStyle(Qt.ToolButtonTextBesideIcon) l.addWidget(b, r, 4)