From f6e7d13bee6f51a0357d5443def68d7737ce7e65 Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Sun, 10 Mar 2024 10:05:59 +0530 Subject: [PATCH] Fix #2056623 [[Enhancement] Move the Show options closer to the search field in the Manage items window](https://bugs.launchpad.net/calibre/+bug/2056623) --- src/calibre/gui2/dialogs/tag_list_editor.py | 5 +- src/calibre/gui2/dialogs/tag_list_editor.ui | 558 +++++++++++--------- 2 files changed, 321 insertions(+), 242 deletions(-) diff --git a/src/calibre/gui2/dialogs/tag_list_editor.py b/src/calibre/gui2/dialogs/tag_list_editor.py index 05e108b498..afb6390b1e 100644 --- a/src/calibre/gui2/dialogs/tag_list_editor.py +++ b/src/calibre/gui2/dialogs/tag_list_editor.py @@ -336,7 +336,6 @@ class TagListEditor(QDialog, Ui_TagListEditor): from calibre.gui2.ui import get_gui self.supports_notes = bool(category and get_gui().current_db.new_api.field_supports_notes(category)) - self.verticalLayout_2.setAlignment(Qt.AlignmentFlag.AlignCenter) self.search_box.setMinimumContentsLength(25) if category is not None: item_map = get_gui().current_db.new_api.get_item_name_map(category) @@ -620,10 +619,10 @@ class TagListEditor(QDialog, Ui_TagListEditor): # something in this class, but replacing the table fixes it. if self.table is not None: self.save_geometry() - self.gridlayout.removeWidget(self.table) + self.central_layout.removeWidget(self.table) sip.delete(self.table) self.table = TleTableWidget(self) - self.gridlayout.addWidget(self.table, 2, 1, 1, 4) + self.central_layout.addWidget(self.table) self.table.setAlternatingRowColors(True) self.table.setSelectionMode(QAbstractItemView.ExtendedSelection) diff --git a/src/calibre/gui2/dialogs/tag_list_editor.ui b/src/calibre/gui2/dialogs/tag_list_editor.ui index cafbd25869..5fabb9fa94 100644 --- a/src/calibre/gui2/dialogs/tag_list_editor.ui +++ b/src/calibre/gui2/dialogs/tag_list_editor.ui @@ -6,7 +6,7 @@ 0 0 - 676 + 688 335 @@ -17,275 +17,355 @@ :/images/chapters.png:/images/chapters.png - - - - - &Search for: - - - search_box - - - - - - - - 200 - 0 - - - - Search for an item in the first column - - - true - - - - - - - Find items containing the search string - - - S&earch - - - - :/images/search.png:/images/search.png - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - + + + - - - Show &all items + + + QFormLayout::ExpandingFieldsGrow - + + + + &Search for: + + + search_box + + + + + + + + 0 + 0 + + + + + 0 + + + 0 + + + 0 + + + 0 + + + + + + 200 + 0 + + + + Search for an item in the first column + + + true + + + + + + + + 0 + 0 + + + + Find items containing the search string + + + S&earch + + + + :/images/search.png:/images/search.png + + + + + + + + + + &Filter by: + + + filter_box + + + + + + + + 0 + 0 + + + + + 0 + + + 0 + + + 0 + + + 0 + + + + + + 200 + 0 + + + + Filter items using the text in this box + + + true + + + + + + + + 0 + 0 + + + + Show only items containing this text + + + F&ilter + + + + :/images/filter.png:/images/filter.png + + + + + + + - - - <p>Show items only if they appear in the + + + + + Show &all items + + + + + + + <p>Show items only if they appear in the current Virtual library. Edits already done may be hidden but will not be forgotten. </p><p> Note that this box affects only what is displayed. Changes will affect all books in your library even if this box is checked.</p> - - - Only show items in the current &Virtual library - - - - - - - <p>Show items only if they appear in the + + + Only show items in the current &Virtual library + + + + + + + <p>Show items only if they appear in the currently selected books. Edits already done may be hidden but will not be forgotten. </p><p> Note that this box affects only what is displayed. Changes will affect all books in your library even if this box is checked.</p> - - - O&nly show items in the currently selected books - - + + + O&nly show items in the currently selected books + + + + - - - - &Filter by: - - - filter_box - - - - - - - - 200 - 0 - - - - Filter items using the text in this box - - - true - - - - - - - Show only items containing this text - - - F&ilter - - - - :/images/filter.png:/images/filter.png - - - - - + + - - - Qt::Vertical - - - - 20 - 40 - - - - - - - - <p>Delete selected items from the database. + + + + + Qt::Vertical + + + + 20 + 40 + + + + + + + + <p>Delete selected items from the database. This will unapply the items from all books and then remove them from the database. This button's shortcut is Ctrl+D</p> - - - ... - - - - :/images/trash.png:/images/trash.png - - - - 32 - 32 - - - - Ctrl+D - - - - - - - Qt::Vertical - - - - 20 - 40 - - - - - - - - <p>Edit the currently selected cell. If a tag is edited then it is renamed + + + ... + + + + :/images/trash.png:/images/trash.png + + + + 32 + 32 + + + + Ctrl+D + + + + + + + Qt::Vertical + + + + 20 + 40 + + + + + + + + <p>Edit the currently selected cell. If a tag is edited then it is renamed in every book where it is used. Double-clicking and pressing the edit key also work. This button's shortcut is Ctrl+E</p> - - - ... - - - - :/images/edit_input.png:/images/edit_input.png - - - - 32 - 32 - - - - Ctrl+E - - - - - - - Qt::Vertical - - - - 20 - 40 - - - - - - - - <p>Undo all deletes or edits on the selected lines. + + + ... + + + + :/images/edit_input.png:/images/edit_input.png + + + + 32 + 32 + + + + Ctrl+E + + + + + + + Qt::Vertical + + + + 20 + 40 + + + + + + + + <p>Undo all deletes or edits on the selected lines. This button's shortcut is Ctrl+U</p> - - - ... - - - - :/images/edit-undo.png:/images/edit-undo.png - - - - 32 - 32 - - - - Ctrl+U - - + + + ... + + + + :/images/edit-undo.png:/images/edit-undo.png + + + + 32 + 32 + + + + Ctrl+U + + + + + + + Qt::Vertical + + + + 20 + 40 + + + + + - - - Qt::Vertical - - - - 20 - 40 - - - + + + + 0 + + + 0 + + + 0 + + + 0 + + + - + QDialogButtonBox::Cancel|QDialogButtonBox::Ok