'+_('Selection of items in multiple columns is not supported. '
+ 'The selection will be cleared')+'
',
+ show=True)
+ sm = self.table.selectionModel()
+ self.table.blockSignals(True)
+ sm.clear()
+ self.table.blockSignals(False)
+
+ def check_for_deleted_items(self, show_error=False):
+ for col_zero_item in (self.table.item(item.row(), 0) for item in self.table.selectedItems()):
+ if col_zero_item.is_deleted:
+ if show_error:
+ error_dialog(self, _('Selection contains deleted items'),
+ '
'+_('The selection contains deleted items. You '
+ 'must undelete them before editing.')+'
',
+ show=True)
+ return True
+ return False
+
def rename_tag(self):
+ if self.table.currentColumn() != 0:
+ return
item = self.table.item(self.table.currentRow(), 0)
self._rename_tag(item)
@@ -611,14 +654,13 @@ class TagListEditor(QDialog, Ui_TagListEditor):
error_dialog(self, _('No item selected'),
_('You must select one item from the list of available items.')).exec()
return
- for col_zero_item in self.table.selectedItems():
- if col_zero_item.is_deleted:
- if not question_dialog(self, _('Undelete items?'),
- '
'+_('Items must be undeleted to continue. Do you want '
- 'to do this?')+'
'):
- return
+ if self.check_for_deleted_items():
+ if not question_dialog(self, _('Undelete items?'),
+ '
'+_('Items must be undeleted to continue. Do you want '
+ 'to do this?')+'
'):
+ return
self.table.blockSignals(True)
- for col_zero_item in self.table.selectedItems():
+ for col_zero_item in (self.table.item(item.row(), 0) for item in self.table.selectedItems()):
# undelete any deleted items
if col_zero_item.is_deleted:
col_zero_item.set_is_deleted(False)
@@ -631,14 +673,25 @@ class TagListEditor(QDialog, Ui_TagListEditor):
def delete_pressed(self):
if self.table.currentColumn() == 0:
self.delete_tags()
+ return
+ if not confirm(
+ '
'+_('Are you sure you want to delete the selected links? '
+ 'There is no undo.')+'
',
+ 'tag_list_editor_link_delete'):
+ return
+ for item in self.table.selectedItems():
+ item.setText('')
def delete_tags(self):
+ # This check works because we ensure that the selection is in only one column
+ if self.table.currentItem().column() != 0:
+ return
+ # We know the selected items are in column zero
deletes = self.table.selectedItems()
if not deletes:
error_dialog(self, _('No items selected'),
_('You must select at least one item from the list.')).exec()
return
-
to_del = []
for item in deletes:
if not item.is_deleted:
@@ -657,39 +710,31 @@ class TagListEditor(QDialog, Ui_TagListEditor):
id_ = int(item.data(Qt.ItemDataRole.UserRole))
self.to_delete.add(id_)
item.set_is_deleted(True)
- orig = self.table.item(item.row(), 2)
+ row = item.row()
+ orig = self.table.item(row, 2)
orig.setData(Qt.ItemDataRole.DisplayRole, item.initial_text())
+ link = self.table.item(row, 3)
+ link.setFlags(link.flags() & ~(Qt.ItemFlag.ItemIsSelectable|Qt.ItemFlag.ItemIsEditable))
+ link.setIcon(QIcon.ic('trash.png'))
self.table.blockSignals(False)
if row >= self.table.rowCount():
row = self.table.rowCount() - 1
if row >= 0:
self.table.scrollToItem(self.table.item(row, 0))
- def do_sort(self, section):
- (self.do_sort_by_name, self.do_sort_by_count, self.do_sort_by_was, self.do_sort_by_link)[section]()
-
- def do_sort_by_name(self):
- self.name_order = 1 - self.name_order
- self.last_sorted_by = 'name'
- self.table.sortByColumn(0, Qt.SortOrder(self.name_order))
-
- def do_sort_by_count(self):
- self.count_order = 1 - self.count_order
- self.last_sorted_by = 'count'
- self.table.sortByColumn(1, Qt.SortOrder(self.count_order))
-
- def do_sort_by_was(self):
- self.was_order = 1 - self.was_order
- self.last_sorted_by = 'count'
- self.table.sortByColumn(2, Qt.SortOrder(self.was_order))
-
- def do_sort_by_link(self):
- self.link_order = 1 - self.link_order
- self.last_sorted_by = 'link'
- self.table.sortByColumn(3, Qt.SortOrder(self.link_order))
+ def record_sort(self, section):
+ # Note what sort was done so we can redo it when the table is rebuilt
+ sort_name = self.sort_names[section]
+ sort_order_attr = sort_name + '_order'
+ setattr(self, sort_order_attr, 1 - getattr(self, sort_order_attr))
+ self.last_sorted_by = sort_name
def accepted(self):
- self.links = {self.table.item(r, 0).text():self.table.item(r, 3).text() for r in range(self.table.rowCount())}
+ # We don't bother with cleaning out the deleted links because the db
+ # interface ignores links for values that don't exist. The caller must
+ # process deletes and renames first so the names are correct.
+ self.links = {self.table.item(r, 0).text():self.table.item(r, 3).text()
+ for r in range(self.table.rowCount())}
self.save_geometry()
def rejected(self):
diff --git a/src/calibre/gui2/preferences/search.py b/src/calibre/gui2/preferences/search.py
index 9ee4eec543..e0ef773698 100644
--- a/src/calibre/gui2/preferences/search.py
+++ b/src/calibre/gui2/preferences/search.py
@@ -55,26 +55,28 @@ class ConfigWidget(ConfigWidgetBase, Ui_Form):
"grouped search term in the drop-down box, enter the list of columns "
"to search in the value box, then push the Save button. "
"
Note: Search terms are forced to lower case; MySearch "
- "and mysearch are the same term."
- "
You can have your grouped search term show up as User categories in " - " the Tag browser. Just add the grouped search term names to the Make User " - "categories from box. You can add multiple terms separated by commas. " - "The new User category will be automatically " - "populated with all the items in the categories included in the grouped " - "search term.
Automatic User categories permit you to see easily "
- "all the category items that "
+ "and mysearch are the same term. Search terms cannot be "
+ "hierarchical. Periods are not allowed in the term name."
+ "
Grouped search terms can show as User categories in the Tag browser " + "by adding the grouped search term names to the 'Make User " + "categories from' box. Multiple terms are separated by commas. " + "These 'automatic user categories' will be populated with items " + "from the categories included in the grouped search term. " + "
Automatic user categories permit you to see all the category items that "
"are in the columns contained in the grouped search term. Using the above "
- "allseries example, the automatically-generated User category "
- "will contain all the series mentioned in series, "
+ "allseries example, the automatic user category "
+ "will contain all the series names in series, "
"#myseries, and #myseries2. This "
"can be useful to check for duplicates, to find which column contains "
"a particular item, or to have hierarchical categories (categories "
- "that contain categories)."))
+ "that contain categories). "
+ "
Note: values from non-category columns such as comments won't appear " + "in automatic user categories. ")) self.gst = db.prefs.get('grouped_search_terms', {}).copy() self.orig_gst_keys = list(self.gst.keys()) fm = db.new_api.field_metadata - categories = [x[0] for x in find_categories(fm) if fm[x[0]]['search_terms']] + categories = [x for x in fm.keys() if not x.startswith('@') and fm[x]['search_terms']] self.gst_value.update_items_cache(categories) QTimer.singleShot(0, self.fill_gst_box) diff --git a/src/calibre/gui2/tag_browser/ui.py b/src/calibre/gui2/tag_browser/ui.py index 58fc3ce890..4b2e61fbfa 100644 --- a/src/calibre/gui2/tag_browser/ui.py +++ b/src/calibre/gui2/tag_browser/ui.py @@ -306,7 +306,7 @@ class TagBrowserMixin: # {{{ db.new_api.remove_items(category, to_delete) db.new_api.rename_items(category, to_rename, change_index=False) - # Must do this at the end so renames are accounted for + # Must do this at the end so renames and deletes are accounted for db.new_api.set_link_map(category, d.links) # Clean up the library view