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

Fix #1025628 (Prepopulate the "Name" field when saving changes to a named "search/replace" on "Edit Meta information" window)

Browse Source
This commit is contained in:
Kovid Goyal 2012-07-17 20:16:02 +05:30
commit d4b059217a
2 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/calibre/gui2/dialogs/metadata_bulk.py
View File

@ -527,7 +527,8 @@ class MetadataBulkDialog(ResizableDialog, Ui_MetadataBulkDialog):
self.queries = JSONConfig("search_replace_queries") self.queries = JSONConfig("search_replace_queries")
self.query_field.addItem("") self.query_field.addItem("")
self.query_field.addItems(sorted([q for q in self.queries], key=sort_key)) self.query_field_values = sorted([q for q in self.queries], key=sort_key)
self.query_field.addItems(self.query_field_values)
self.query_field.currentIndexChanged[str].connect(self.s_r_query_change) self.query_field.currentIndexChanged[str].connect(self.s_r_query_change)
self.query_field.setCurrentIndex(0) self.query_field.setCurrentIndex(0)
self.search_field.setCurrentIndex(0) self.search_field.setCurrentIndex(0)
@ -1030,11 +1031,16 @@ class MetadataBulkDialog(ResizableDialog, Ui_MetadataBulkDialog):
self.queries.commit() self.queries.commit()
def s_r_save_query(self, *args): def s_r_save_query(self, *args):
name, ok = QInputDialog.getText(self, _('Save search/replace'), dex = self.query_field_values.index(self.saved_search_name)
_('Search/replace name:')) name = ''
if not ok: while not name:
return name, ok = QInputDialog.getItem(self, _('Save search/replace'),
_('Search/replace name:'), self.query_field_values, dex, True)
if not ok:
return
if not name:
error_dialog(self, _("Save search/replace"),
_("You must provide a name."), show=True)
new = True new = True
name = unicode(name) name = unicode(name)
if name in self.queries.keys(): if name in self.queries.keys():
@ -1069,7 +1075,8 @@ class MetadataBulkDialog(ResizableDialog, Ui_MetadataBulkDialog):
self.query_field.blockSignals(True) self.query_field.blockSignals(True)
self.query_field.clear() self.query_field.clear()
self.query_field.addItem('') self.query_field.addItem('')
self.query_field.addItems(sorted([q for q in self.queries], key=sort_key)) self.query_field_values = sorted([q for q in self.queries], key=sort_key)
self.query_field.addItems(self.query_field_values)
self.query_field.blockSignals(False) self.query_field.blockSignals(False)
self.query_field.setCurrentIndex(self.query_field.findText(name)) self.query_field.setCurrentIndex(self.query_field.findText(name))
@ -1081,6 +1088,7 @@ class MetadataBulkDialog(ResizableDialog, Ui_MetadataBulkDialog):
if item is None: if item is None:
self.s_r_reset_query_fields() self.s_r_reset_query_fields()
return return
self.saved_search_name = item_name
def set_text(attr, key): def set_text(attr, key):
try: try:

2
src/calibre/gui2/dialogs/metadata_bulk.ui
View File

@ -667,7 +667,7 @@ Future conversion of these books will use the default settings.</string>
<string>Load searc&amp;h/replace:</string> <string>Load searc&amp;h/replace:</string>
</property> </property>
<property name="buddy"> <property name="buddy">
<cstring>search_field</cstring> <cstring>query_field</cstring>
</property> </property>
</widget> </widget>
</item> </item>