From 7483a4389fbe9f485cab845179586a9d0a5becf6 Mon Sep 17 00:00:00 2001
From: Charles Haley <>
Date: Tue, 4 May 2010 16:29:01 +0100
Subject: [PATCH] Play with main UI layout -- move restriction box

---
 src/calibre/gui2/main.ui | 122 ++++++++++++++++++---------------------
 1 file changed, 56 insertions(+), 66 deletions(-)

diff --git a/src/calibre/gui2/main.ui b/src/calibre/gui2/main.ui
index 8dcb0e6d75..c076bf6b03 100644
--- a/src/calibre/gui2/main.ui
+++ b/src/calibre/gui2/main.ui
@@ -157,6 +157,30 @@
       <property name="margin">
        <number>0</number>
       </property>
+      <item>
+       <widget class="QLabel" name="restriction_label">
+        <property name="text">
+         <string>&amp;Restrict to:</string>
+        </property>
+        <property name="buddy">
+         <cstring>search_restriction</cstring>
+        </property>
+       </widget>
+      </item>
+      <item>
+       <widget class="QComboBox" name="search_restriction">
+        <property name="toolTip">
+         <string>Books display will be restricted to those matching the selected saved search</string>
+        </property>
+       </widget>
+      </item>
+      <item>
+       <widget class="QLabel" name="search_count">
+        <property name="text">
+         <string>set in ui.py</string>
+        </property>
+       </widget>
+      </item>
       <item>
        <widget class="QToolButton" name="advanced_search_button">
         <property name="toolTip">
@@ -206,13 +230,6 @@
         </property>
        </widget>
       </item>
-      <item>
-       <widget class="QLabel" name="search_count">
-        <property name="text">
-         <string>set in ui.py</string>
-        </property>
-       </widget>
-      </item>
       <item>
        <widget class="QToolButton" name="clear_button">
         <property name="toolTip">
@@ -336,69 +353,42 @@
                 </widget>
                </item>
                <item>
-                <widget class="QCheckBox" name="popularity">
-                 <property name="text">
-                  <string>Sort by &amp;popularity</string>
+                <item>
+                 <widget class="QCheckBox" name="popularity">
+                  <property name="text">
+                   <string>Sort by &amp;popularity</string>
+                  </property>
+                 </widget>
+                </item>
+               </item>
+               <item>
+                <widget class="QComboBox" name="tag_match">
+                 <property name="currentIndex">
+                  <number>0</number>
                  </property>
+                 <item>
+                  <property name="text">
+                   <string>Match any</string>
+                  </property>
+                 </item>
+                 <item>
+                  <property name="text">
+                   <string>Match all</string>
+                  </property>
+                 </item>
                 </widget>
                </item>
                <item>
-                <layout class="QHBoxLayout" name="horizontalLayout_3">
-                 <item>
-                  <widget class="QComboBox" name="tag_match">
-                   <property name="currentIndex">
-                    <number>0</number>
-                   </property>
-                   <item>
-                    <property name="text">
-                     <string>Match any</string>
-                    </property>
-                   </item>
-                   <item>
-                    <property name="text">
-                     <string>Match all</string>
-                    </property>
-                   </item>
-                  </widget>
-                 </item>
-                 <item>
-                  <widget class="QPushButton" name="edit_categories">
-                   <property name="toolTip">
-                    <string>Create, edit, and delete user categories</string>
-                   </property>
-                   <property name="text">
-                    <string>Manage &amp;user categories</string>
-                   </property>
-                  </widget>
-                 </item>
-                </layout>
-               </item>
-               <item>
-                <layout class="QHBoxLayout" name="horizontalLayout_2" stretch="10,50">
-                 <item>
-                  <widget class="QLabel" name="restriction_label">
-                   <property name="text">
-                    <string>&amp;Restrict to:</string>
-                   </property>
-                   <property name="buddy">
-                    <cstring>search_restriction</cstring>
-                   </property>
-                  </widget>
-                 </item>
-                 <item>
-                  <widget class="QComboBox" name="search_restriction">
-                   <property name="sizePolicy">
-                    <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
-                     <horstretch>50</horstretch>
-                     <verstretch>0</verstretch>
-                    </sizepolicy>
-                   </property>
-                   <property name="toolTip">
-                    <string>Books display will be restricted to those matching the selected saved search</string>
-                   </property>
-                  </widget>
-                 </item>
-                </layout>
+                <item>
+                 <widget class="QPushButton" name="edit_categories">
+                  <property name="toolTip">
+                   <string>Create, edit, and delete user categories</string>
+                  </property>
+                  <property name="text">
+                   <string>Manage &amp;user categories</string>
+                  </property>
+                 </widget>
+                </item>
                </item>
               </layout>
              </widget>