From f4d87127a63a11634f77fc8888a441817a6fe9f3 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Sat, 13 Apr 2024 13:46:49 +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)

---
 .../gui2/dialogs/edit_authors_dialog.ui       | 117 +++++++++---------
 1 file changed, 58 insertions(+), 59 deletions(-)

diff --git a/src/calibre/gui2/dialogs/edit_authors_dialog.ui b/src/calibre/gui2/dialogs/edit_authors_dialog.ui
index ea1dd36d35..5746456f99 100644
--- a/src/calibre/gui2/dialogs/edit_authors_dialog.ui
+++ b/src/calibre/gui2/dialogs/edit_authors_dialog.ui
@@ -20,10 +20,33 @@
    <string>Manage authors</string>
   </property>
   <layout class="QVBoxLayout" name="verticalLayout">
-   <item >
-    <layout class="QGridLayout" name="">
+   <item>
+    <layout class="QGridLayout">
+     <item row="1" column="1">
+      <widget class="HistoryLineEdit" name="filter_box">
+       <property name="sizePolicy">
+        <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
+         <horstretch>0</horstretch>
+         <verstretch>0</verstretch>
+        </sizepolicy>
+       </property>
+       <property name="minimumSize">
+        <size>
+         <width>200</width>
+         <height>0</height>
+        </size>
+       </property>
+       <property name="toolTip">
+        <string>&lt;p&gt;Only show authors that contain the text in this box.
+          The match ignores case.&lt;/p&gt;</string>
+       </property>
+       <property name="clearButtonEnabled" stdset="0">
+        <bool>true</bool>
+       </property>
+      </widget>
+     </item>
      <item row="0" column="0">
-      <widget class="QLabel">
+      <widget class="QLabel" name="label">
        <property name="text">
         <string>&amp;Search for:</string>
        </property>
@@ -34,17 +57,40 @@
      </item>
      <item row="0" column="1">
       <widget class="HistoryLineEdit" name="find_box">
+       <property name="sizePolicy">
+        <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
+         <horstretch>0</horstretch>
+         <verstretch>0</verstretch>
+        </sizepolicy>
+       </property>
        <property name="minimumSize">
         <size>
          <width>200</width>
          <height>0</height>
         </size>
        </property>
-       <property name="clearButtonEnabled">
+       <property name="clearButtonEnabled" stdset="0">
         <bool>true</bool>
        </property>
       </widget>
      </item>
+     <item row="1" column="0">
+      <widget class="QLabel" name="label">
+       <property name="text">
+        <string>Filter &amp;by:</string>
+       </property>
+       <property name="buddy">
+        <cstring>filter_box</cstring>
+       </property>
+      </widget>
+     </item>
+     <item row="1" column="2">
+      <widget class="QPushButton" name="filter_button">
+       <property name="text">
+        <string>Fi&amp;lter</string>
+       </property>
+      </widget>
+     </item>
      <item row="0" column="2">
       <widget class="QPushButton" name="find_button">
        <property name="text">
@@ -52,20 +98,7 @@
        </property>
       </widget>
      </item>
-     <item row="0" column="3">
-      <spacer>
-       <property name="orientation">
-        <enum>Qt::Horizontal</enum>
-       </property>
-       <property name="sizeHint" stdset="0">
-        <size>
-         <width>40</width>
-         <height>20</height>
-        </size>
-       </property>
-      </spacer>
-     </item>
-     <item row="0" column="4" rowspan="2">
+     <item row="0" column="3" rowspan="2">
       <layout class="QVBoxLayout" name="show_button_layout">
        <item>
         <widget class="QRadioButton" name="apply_all_checkbox">
@@ -108,40 +141,6 @@
        </item>
       </layout>
      </item>
-     <item row="1" column="0">
-      <widget class="QLabel">
-       <property name="text">
-        <string>Filter &amp;by:</string>
-       </property>
-       <property name="buddy">
-        <cstring>filter_box</cstring>
-       </property>
-      </widget>
-     </item>
-     <item row="1" column="1">
-      <widget class="HistoryLineEdit" name="filter_box">
-       <property name="minimumSize">
-        <size>
-         <width>200</width>
-         <height>0</height>
-        </size>
-       </property>
-       <property name="toolTip">
-        <string>&lt;p&gt;Only show authors that contain the text in this box.
-          The match ignores case.&lt;/p&gt;</string>
-       </property>
-       <property name="clearButtonEnabled">
-        <bool>true</bool>
-       </property>
-      </widget>
-     </item>
-     <item row="1" column="2">
-      <widget class="QPushButton" name="filter_button">
-       <property name="text">
-        <string>Fi&amp;lter</string>
-       </property>
-      </widget>
-     </item>
     </layout>
    </item>
    <item>
@@ -217,6 +216,13 @@ after changing Preferences-&gt;Advanced-&gt;Tweaks-&gt;Author sort name algorith
    </item>
   </layout>
  </widget>
+ <customwidgets>
+  <customwidget>
+   <class>HistoryLineEdit</class>
+   <extends>QComboBox</extends>
+   <header>calibre/gui2/widgets.h</header>
+  </customwidget>
+ </customwidgets>
  <resources/>
  <connections>
   <connection>
@@ -252,11 +258,4 @@ after changing Preferences-&gt;Advanced-&gt;Tweaks-&gt;Author sort name algorith
    </hints>
   </connection>
  </connections>
- <customwidgets>
-  <customwidget>
-   <class>HistoryLineEdit</class>
-   <extends>QComboBox</extends>
-   <header>calibre/gui2/widgets.h</header>
-  </customwidget>
- </customwidgets>
 </ui>