More work on lambda slots

This commit is contained in:
Kovid Goyal 2018-07-26 13:14:39 +05:30
parent c1c0d43624
commit b6f63e8221
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
4 changed files with 8 additions and 6 deletions

View File

@ -81,9 +81,9 @@ class AddAction(InterfaceAction):
arm = self.add_archive_menu = self.add_menu.addMenu(_('Add an empty file to selected book records')) arm = self.add_archive_menu = self.add_menu.addMenu(_('Add an empty file to selected book records'))
from calibre.ebooks.oeb.polish.create import valid_empty_formats from calibre.ebooks.oeb.polish.create import valid_empty_formats
for fmt in sorted(valid_empty_formats): for fmt in sorted(valid_empty_formats):
connect_lambda(self.create_menu_action( ac = self.create_menu_action(arm, 'add-empty-' + fmt, _('Add empty {}').format(fmt.upper()))
arm, 'add-empty-' + fmt, _('Add empty {}').format(fmt.upper())).triggered, ac.setObjectName(fmt)
self, lambda self: self.add_empty_format(fmt)) connect_lambda(ac.triggered, self, lambda self: self.add_empty_format(self.gui.sender().objectName()))
self.add_menu.addSeparator() self.add_menu.addSeparator()
ma('add-config', _('Control the adding of books'), ma('add-config', _('Control the adding of books'),
triggered=self.add_config) triggered=self.add_config)

View File

@ -115,7 +115,7 @@ class ChooseMerge(Dialog):
l.addWidget(ans) l.addWidget(ans)
prefs_key = ans.prefs_key = 'choose-merge-cb-' + name prefs_key = ans.prefs_key = 'choose-merge-cb-' + name
ans.setChecked(gprefs.get(prefs_key, True)) ans.setChecked(gprefs.get(prefs_key, True))
connect_lambda(ans.stateChanged, self, lambda self, state: self.state_changed(ans, state), type=Qt.QueuedConnection) connect_lambda(ans.stateChanged, self, lambda self, state: self.state_changed(getattr(self, name), state), type=Qt.QueuedConnection)
if tt: if tt:
ans.setToolTip(tt) ans.setToolTip(tt)
setattr(self, name, ans) setattr(self, name, ans)

View File

@ -76,7 +76,9 @@ class TagEditor(QDialog, Ui_TagEditor):
# Restore the focus to the last input box used (typed into) # Restore the focus to the last input box used (typed into)
for x in ('add_tag_input', 'available_filter_input', 'applied_filter_input'): for x in ('add_tag_input', 'available_filter_input', 'applied_filter_input'):
connect_lambda(getattr(self, x).textChanged, self, lambda self: self.edit_box_changed(x)) ibox = getattr(self, x)
ibox.setObjectName(x)
connect_lambda(ibox.textChanged, self, lambda self: self.edit_box_changed(self.sender().objectName()))
getattr(self, gprefs.get('tag_editor_last_filter', 'add_tag_input')).setFocus() getattr(self, gprefs.get('tag_editor_last_filter', 'add_tag_input')).setFocus()
if islinux: if islinux:

View File

@ -575,7 +575,7 @@ class RuleEditor(QDialog): # {{{
m.clear() m.clear()
for name in self.icon_file_names: for name in self.icon_file_names:
ac = m.addAction(QIcon(os.path.join(self.icon_folder, name)), name) ac = m.addAction(QIcon(os.path.join(self.icon_folder, name)), name)
connect_lambda(ac.triggered, self, lambda self: self.remove_image(name)) connect_lambda(ac.triggered, self, lambda self: self.remove_image(self.sender().text()))
def remove_image(self, name): def remove_image(self, name):
try: try: