From a2f5a7d0ff2cb48de97a2ec02c220dd738c385e2 Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Thu, 26 Jul 2018 15:01:08 +0530 Subject: [PATCH] more lambda slots --- src/calibre/gui2/actions/device.py | 15 +++++---------- src/calibre/gui2/tag_browser/ui.py | 2 +- 2 files changed, 6 insertions(+), 11 deletions(-) diff --git a/src/calibre/gui2/actions/device.py b/src/calibre/gui2/actions/device.py index d039897f7b..e14aac2e70 100644 --- a/src/calibre/gui2/actions/device.py +++ b/src/calibre/gui2/actions/device.py @@ -5,8 +5,6 @@ __license__ = 'GPL v3' __copyright__ = '2010, Kovid Goyal ' __docformat__ = 'restructuredtext en' -from functools import partial - from PyQt5.Qt import QIcon, QMenu, QTimer, QToolButton, pyqtSignal from calibre.gui2 import info_dialog, question_dialog @@ -34,20 +32,18 @@ class ShareConnMenu(QMenu): # {{{ self.ip_text = '' mitem = self.addAction(QIcon(I('devices/folder.png')), _('Connect to folder')) mitem.setEnabled(True) - mitem.triggered.connect(lambda x : self.connect_to_folder.emit()) + connect_lambda(mitem.triggered, self, lambda self: self.connect_to_folder.emit()) self.connect_to_folder_action = mitem self.addSeparator() self.toggle_server_action = \ self.addAction(QIcon(I('network-server.png')), _('Start Content server')) - self.toggle_server_action.triggered.connect(lambda x: - self.toggle_server.emit()) + connect_lambda(self.toggle_server_action.triggered, self, lambda self: self.toggle_server.emit()) self.control_smartdevice_action = \ self.addAction(QIcon(I('dot_red.png')), self.DEVICE_MSGS[0]) - self.control_smartdevice_action.triggered.connect(lambda x: - self.control_smartdevice.emit()) + connect_lambda(self.control_smartdevice_action.triggered, self, lambda self: self.control_smartdevice.emit()) self.addSeparator() self.email_actions = [] @@ -185,9 +181,8 @@ class ConnectShareAction(InterfaceAction): self.share_conn_menu.aboutToShow.connect(self.set_smartdevice_action_state) self.share_conn_menu.toggle_server.connect(self.toggle_content_server) self.share_conn_menu.control_smartdevice.connect(self.control_smartdevice) - self.share_conn_menu.config_email.connect(partial( - self.gui.iactions['Preferences'].do_config, - initial_plugin=('Sharing', 'Email'))) + connect_lambda(self.share_conn_menu.config_email, self, lambda self: + self.gui.iactions['Preferences'].do_config(initial_plugin=('Sharing', 'Email'), close_after_initial=True)) self.qaction.setMenu(self.share_conn_menu) self.share_conn_menu.connect_to_folder.connect(self.gui.connect_to_folder) diff --git a/src/calibre/gui2/tag_browser/ui.py b/src/calibre/gui2/tag_browser/ui.py index 2ff16b362a..37fcd55923 100644 --- a/src/calibre/gui2/tag_browser/ui.py +++ b/src/calibre/gui2/tag_browser/ui.py @@ -508,7 +508,7 @@ class TagBrowserWidget(QFrame): # {{{ parent.keyboard.register_shortcut('tag browser collapse all', _('Collapse all'), default_keys=(), action=ac, group=_('Tag browser')) - ac.triggered.connect(lambda : self.tags_view.collapseAll()) + connect_lambda(ac.triggered, self, lambda self: self.tags_view.collapseAll()) ac = QAction(parent) parent.addAction(ac)