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 #2056623 [[Enhancement] Move the Show options closer to the search field in the Manage items window](https://bugs.launchpad.net/calibre/+bug/2056623)

Browse Source
This commit is contained in:
Kovid Goyal 2024-03-10 10:05:59 +05:30
parent 2aec8675cd
commit f6e7d13bee
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
2 changed files with 321 additions and 242 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/calibre/gui2/dialogs/tag_list_editor.py
View File

@ -336,7 +336,6 @@ class TagListEditor(QDialog, Ui_TagListEditor):
from calibre.gui2.ui import get_gui from calibre.gui2.ui import get_gui
self.supports_notes = bool(category and get_gui().current_db.new_api.field_supports_notes(category)) 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) self.search_box.setMinimumContentsLength(25)
if category is not None: if category is not None:
item_map = get_gui().current_db.new_api.get_item_name_map(category) 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. # something in this class, but replacing the table fixes it.
if self.table is not None: if self.table is not None:
self.save_geometry() self.save_geometry()
self.gridlayout.removeWidget(self.table) self.central_layout.removeWidget(self.table)
sip.delete(self.table) sip.delete(self.table)
self.table = TleTableWidget(self) 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.setAlternatingRowColors(True)
self.table.setSelectionMode(QAbstractItemView.ExtendedSelection) self.table.setSelectionMode(QAbstractItemView.ExtendedSelection)

186
src/calibre/gui2/dialogs/tag_list_editor.ui
View File

@ -6,7 +6,7 @@
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>676</width> <width>688</width>
<height>335</height> <height>335</height>
</rect> </rect>
</property> </property>
@ -17,7 +17,14 @@
<iconset resource="../../../../resources/images.qrc"> <iconset resource="../../../../resources/images.qrc">
<normaloff>:/images/chapters.png</normaloff>:/images/chapters.png</iconset> <normaloff>:/images/chapters.png</normaloff>:/images/chapters.png</iconset>
</property> </property>
<layout class="QGridLayout"> <layout class="QVBoxLayout" name="verticalLayout">
<item>
<layout class="QHBoxLayout" name="horizontalLayout_3">
<item>
<layout class="QFormLayout" name="formLayout">
<property name="fieldGrowthPolicy">
<enum>QFormLayout::ExpandingFieldsGrow</enum>
</property>
<item row="0" column="0"> <item row="0" column="0">
<widget class="QLabel" name="label"> <widget class="QLabel" name="label">
<property name="text"> <property name="text">
@ -29,6 +36,27 @@
</widget> </widget>
</item> </item>
<item row="0" column="1"> <item row="0" column="1">
<widget class="QWidget" name="widget" native="true">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<layout class="QHBoxLayout" name="horizontalLayout">
<property name="leftMargin">
<number>0</number>
</property>
<property name="topMargin">
<number>0</number>
</property>
<property name="rightMargin">
<number>0</number>
</property>
<property name="bottomMargin">
<number>0</number>
</property>
<item>
<widget class="HistoryLineEdit" name="search_box"> <widget class="HistoryLineEdit" name="search_box">
<property name="minimumSize"> <property name="minimumSize">
<size> <size>
@ -44,8 +72,14 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="0" column="2"> <item>
<widget class="QPushButton" name="search_button"> <widget class="QPushButton" name="search_button">
<property name="sizePolicy">
<sizepolicy hsizetype="Fixed" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="toolTip"> <property name="toolTip">
<string>Find items containing the search string</string> <string>Find items containing the search string</string>
</property> </property>
@ -58,20 +92,82 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="0" column="3"> </layout>
<spacer> </widget>
<property name="orientation"> </item>
<enum>Qt::Horizontal</enum> <item row="1" column="0">
<widget class="QLabel" name="label">
<property name="text">
<string>&amp;Filter by:</string>
</property> </property>
<property name="sizeHint" stdset="0"> <property name="buddy">
<cstring>filter_box</cstring>
</property>
</widget>
</item>
<item row="1" column="1">
<widget class="QWidget" name="widget_2" native="true">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<layout class="QHBoxLayout" name="horizontalLayout_2">
<property name="leftMargin">
<number>0</number>
</property>
<property name="topMargin">
<number>0</number>
</property>
<property name="rightMargin">
<number>0</number>
</property>
<property name="bottomMargin">
<number>0</number>
</property>
<item>
<widget class="HistoryLineEdit" name="filter_box">
<property name="minimumSize">
<size> <size>
<width>40</width> <width>200</width>
<height>20</height> <height>0</height>
</size> </size>
</property> </property>
</spacer> <property name="toolTip">
<string>Filter items using the text in this box</string>
</property>
<property name="clearButtonEnabled">
<bool>true</bool>
</property>
</widget>
</item> </item>
<item row="0" column="4" rowspan="2"> <item>
<widget class="QPushButton" name="filter_button">
<property name="sizePolicy">
<sizepolicy hsizetype="Fixed" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="toolTip">
<string>Show only items containing this text</string>
</property>
<property name="text">
<string>F&amp;ilter</string>
</property>
<property name="icon">
<iconset resource="../../../../resources/images.qrc">
<normaloff>:/images/filter.png</normaloff>:/images/filter.png</iconset>
</property>
</widget>
</item>
</layout>
</widget>
</item>
</layout>
</item>
<item>
<layout class="QVBoxLayout" name="show_button_layout"> <layout class="QVBoxLayout" name="show_button_layout">
<item> <item>
<widget class="QRadioButton" name="apply_all_checkbox"> <widget class="QRadioButton" name="apply_all_checkbox">
@ -114,47 +210,11 @@
</item> </item>
</layout> </layout>
</item> </item>
<item row="1" column="0"> </layout>
<widget class="QLabel" name="label">
<property name="text">
<string>&amp;Filter by:</string>
</property>
<property name="buddy">
<cstring>filter_box</cstring>
</property>
</widget>
</item> </item>
<item row="1" column="1"> <item>
<widget class="HistoryLineEdit" name="filter_box"> <layout class="QHBoxLayout" name="horizontalLayout_4">
<property name="minimumSize"> <item>
<size>
<width>200</width>
<height>0</height>
</size>
</property>
<property name="toolTip">
<string>Filter items using the text in this box</string>
</property>
<property name="clearButtonEnabled">
<bool>true</bool>
</property>
</widget>
</item>
<item row="1" column="2">
<widget class="QPushButton" name="filter_button">
<property name="toolTip">
<string>Show only items containing this text</string>
</property>
<property name="text">
<string>F&amp;ilter</string>
</property>
<property name="icon">
<iconset resource="../../../../resources/images.qrc">
<normaloff>:/images/filter.png</normaloff>:/images/filter.png</iconset>
</property>
</widget>
</item>
<item row="2" column="0">
<layout class="QVBoxLayout" name="verticalLayout_2"> <layout class="QVBoxLayout" name="verticalLayout_2">
<item> <item>
<spacer name="verticalSpacer_3"> <spacer name="verticalSpacer_3">
@ -285,7 +345,27 @@
</item> </item>
</layout> </layout>
</item> </item>
<item row="3" column="0" colspan="5"> <item>
<widget class="QWidget" name="widget_3" native="true">
<layout class="QVBoxLayout" name="central_layout">
<property name="leftMargin">
<number>0</number>
</property>
<property name="topMargin">
<number>0</number>
</property>
<property name="rightMargin">
<number>0</number>
</property>
<property name="bottomMargin">
<number>0</number>
</property>
</layout>
</widget>
</item>
</layout>
</item>
<item>
<widget class="QDialogButtonBox" name="buttonBox"> <widget class="QDialogButtonBox" name="buttonBox">
<property name="standardButtons"> <property name="standardButtons">
<set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set> <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>