Cutlery/calibre
1
0
Fork 0
mirror of https://github.com/kovidgoyal/calibre.git synced 2025-08-11 09:13:57 -04:00
Code Issues Packages Projects Releases Wiki Activity

more lambda slots

Browse Source
This commit is contained in:
Kovid Goyal 2018-07-26 15:01:08 +05:30
parent e144144b51
commit a2f5a7d0ff
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
2 changed files with 6 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/calibre/gui2/actions/device.py
View File

@ -5,8 +5,6 @@ __license__ = 'GPL v3'
__copyright__ = '2010, Kovid Goyal <kovid@kovidgoyal.net>' __copyright__ = '2010, Kovid Goyal <kovid@kovidgoyal.net>'
__docformat__ = 'restructuredtext en' __docformat__ = 'restructuredtext en'
from functools import partial
from PyQt5.Qt import QIcon, QMenu, QTimer, QToolButton, pyqtSignal from PyQt5.Qt import QIcon, QMenu, QTimer, QToolButton, pyqtSignal
from calibre.gui2 import info_dialog, question_dialog from calibre.gui2 import info_dialog, question_dialog
@ -34,20 +32,18 @@ class ShareConnMenu(QMenu): # {{{
self.ip_text = '' self.ip_text = ''
mitem = self.addAction(QIcon(I('devices/folder.png')), _('Connect to folder')) mitem = self.addAction(QIcon(I('devices/folder.png')), _('Connect to folder'))
mitem.setEnabled(True) 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.connect_to_folder_action = mitem
self.addSeparator() self.addSeparator()
self.toggle_server_action = \ self.toggle_server_action = \
self.addAction(QIcon(I('network-server.png')), self.addAction(QIcon(I('network-server.png')),
_('Start Content server')) _('Start Content server'))
self.toggle_server_action.triggered.connect(lambda x: connect_lambda(self.toggle_server_action.triggered, self, lambda self: self.toggle_server.emit())
self.toggle_server.emit())
self.control_smartdevice_action = \ self.control_smartdevice_action = \
self.addAction(QIcon(I('dot_red.png')), self.addAction(QIcon(I('dot_red.png')),
self.DEVICE_MSGS[0]) self.DEVICE_MSGS[0])
self.control_smartdevice_action.triggered.connect(lambda x: connect_lambda(self.control_smartdevice_action.triggered, self, lambda self: self.control_smartdevice.emit())
self.control_smartdevice.emit())
self.addSeparator() self.addSeparator()
self.email_actions = [] 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.aboutToShow.connect(self.set_smartdevice_action_state)
self.share_conn_menu.toggle_server.connect(self.toggle_content_server) 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.control_smartdevice.connect(self.control_smartdevice)
self.share_conn_menu.config_email.connect(partial( connect_lambda(self.share_conn_menu.config_email, self, lambda self:
self.gui.iactions['Preferences'].do_config, self.gui.iactions['Preferences'].do_config(initial_plugin=('Sharing', 'Email'), close_after_initial=True))
initial_plugin=('Sharing', 'Email')))
self.qaction.setMenu(self.share_conn_menu) self.qaction.setMenu(self.share_conn_menu)
self.share_conn_menu.connect_to_folder.connect(self.gui.connect_to_folder) self.share_conn_menu.connect_to_folder.connect(self.gui.connect_to_folder)

2
src/calibre/gui2/tag_browser/ui.py
View File

@ -508,7 +508,7 @@ class TagBrowserWidget(QFrame): # {{{
parent.keyboard.register_shortcut('tag browser collapse all', parent.keyboard.register_shortcut('tag browser collapse all',
_('Collapse all'), default_keys=(), _('Collapse all'), default_keys=(),
action=ac, group=_('Tag browser')) 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) ac = QAction(parent)
parent.addAction(ac) parent.addAction(ac)