From 4610ea2e7209640f1d7667cf46cd4bd6b6a9c43f Mon Sep 17 00:00:00 2001
From: John Schember <john@nachtimwald.com>
Date: Sat, 21 May 2011 18:58:30 -0400
Subject: [PATCH] Store: Enchance search dialog.

---
 src/calibre/gui2/store/search/search.py |  10 +-
 src/calibre/gui2/store/search/search.ui | 169 +++++++++++++++---------
 2 files changed, 108 insertions(+), 71 deletions(-)

diff --git a/src/calibre/gui2/store/search/search.py b/src/calibre/gui2/store/search/search.py
index 906ba0b4ff..e76f15c58e 100644
--- a/src/calibre/gui2/store/search/search.py
+++ b/src/calibre/gui2/store/search/search.py
@@ -54,15 +54,15 @@ class SearchDialog(QDialog, Ui_Dialog):
         # can disable searching specific stores on a
         # per search basis.
         stores_check_widget = QWidget()
-        stores_group_layout = QVBoxLayout()
-        stores_check_widget.setLayout(stores_group_layout)
+        store_list_layout = QVBoxLayout()
+        stores_check_widget.setLayout(store_list_layout)
         for x in sorted(self.store_plugins.keys(), key=lambda x: x.lower()):
             cbox = QCheckBox(x)
             cbox.setChecked(False)
-            stores_group_layout.addWidget(cbox)
+            store_list_layout.addWidget(cbox)
             setattr(self, 'store_check_' + x, cbox)
-        stores_group_layout.addStretch()
-        self.stores_group.setWidget(stores_check_widget)
+        store_list_layout.addStretch()
+        self.store_list.setWidget(stores_check_widget)
 
         # Set the search query
         self.search_edit.setText(query)
diff --git a/src/calibre/gui2/store/search/search.ui b/src/calibre/gui2/store/search/search.ui
index 8dd423baec..42f91de735 100644
--- a/src/calibre/gui2/store/search/search.ui
+++ b/src/calibre/gui2/store/search/search.ui
@@ -6,8 +6,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>937</width>
-    <height>669</height>
+    <width>584</width>
+    <height>533</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -20,7 +20,7 @@
   <property name="sizeGripEnabled">
    <bool>true</bool>
   </property>
-  <layout class="QVBoxLayout" name="verticalLayout">
+  <layout class="QVBoxLayout" name="verticalLayout_5">
    <item>
     <layout class="QHBoxLayout" name="top_layout">
      <item>
@@ -66,8 +66,14 @@
        <string>Stores</string>
       </property>
       <layout class="QVBoxLayout" name="verticalLayout_2">
+       <property name="spacing">
+        <number>0</number>
+       </property>
+       <property name="margin">
+        <number>0</number>
+       </property>
        <item>
-        <widget class="QScrollArea" name="stores_group">
+        <widget class="QScrollArea" name="store_list">
          <property name="widgetResizable">
           <bool>true</bool>
          </property>
@@ -76,15 +82,18 @@
            <rect>
             <x>0</x>
             <y>0</y>
-            <width>215</width>
-            <height>93</height>
+            <width>207</width>
+            <height>130</height>
            </rect>
           </property>
          </widget>
         </widget>
        </item>
        <item>
-        <layout class="QHBoxLayout" name="horizontalLayout_3">
+        <layout class="QVBoxLayout" name="verticalLayout">
+         <property name="spacing">
+          <number>0</number>
+         </property>
          <item>
           <widget class="QPushButton" name="select_all_stores">
            <property name="text">
@@ -108,76 +117,104 @@
          </item>
         </layout>
        </item>
+      </layout>
+     </widget>
+     <widget class="QWidget" name="verticalLayoutWidget">
+      <layout class="QVBoxLayout" name="verticalLayout_4">
        <item>
-        <widget class="QCheckBox" name="open_external">
-         <property name="toolTip">
-          <string>Open a selected book in the system's web browser</string>
+        <widget class="ResultsView" name="results_view">
+         <property name="sizePolicy">
+          <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
+           <horstretch>1</horstretch>
+           <verstretch>0</verstretch>
+          </sizepolicy>
          </property>
-         <property name="text">
-          <string>Open in &amp;external browser</string>
+         <property name="minimumSize">
+          <size>
+           <width>0</width>
+           <height>0</height>
+          </size>
+         </property>
+         <property name="alternatingRowColors">
+          <bool>true</bool>
+         </property>
+         <property name="iconSize">
+          <size>
+           <width>32</width>
+           <height>32</height>
+          </size>
+         </property>
+         <property name="rootIsDecorated">
+          <bool>false</bool>
+         </property>
+         <property name="uniformRowHeights">
+          <bool>false</bool>
+         </property>
+         <property name="itemsExpandable">
+          <bool>false</bool>
+         </property>
+         <property name="sortingEnabled">
+          <bool>true</bool>
+         </property>
+         <property name="expandsOnDoubleClick">
+          <bool>false</bool>
          </property>
         </widget>
        </item>
+       <item>
+        <layout class="QHBoxLayout" name="horizontalLayout">
+         <item>
+          <widget class="QPushButton" name="configure">
+           <property name="text">
+            <string>Configure</string>
+           </property>
+          </widget>
+         </item>
+         <item>
+          <widget class="QCheckBox" name="open_external">
+           <property name="toolTip">
+            <string>Open a selected book in the system's web browser</string>
+           </property>
+           <property name="text">
+            <string>Open in &amp;external browser</string>
+           </property>
+          </widget>
+         </item>
+         <item>
+          <spacer name="horizontalSpacer_2">
+           <property name="orientation">
+            <enum>Qt::Horizontal</enum>
+           </property>
+           <property name="sizeHint" stdset="0">
+            <size>
+             <width>40</width>
+             <height>20</height>
+            </size>
+           </property>
+          </spacer>
+         </item>
+        </layout>
+       </item>
       </layout>
      </widget>
-     <widget class="QSplitter" name="splitter_2">
-      <property name="sizePolicy">
-       <sizepolicy hsizetype="Expanding" vsizetype="Preferred">
-        <horstretch>2</horstretch>
-        <verstretch>0</verstretch>
-       </sizepolicy>
-      </property>
-      <property name="orientation">
-       <enum>Qt::Horizontal</enum>
-      </property>
-      <widget class="QSplitter" name="splitter">
-       <property name="orientation">
-        <enum>Qt::Horizontal</enum>
-       </property>
-       <widget class="ResultsView" name="results_view">
-        <property name="sizePolicy">
-         <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
-          <horstretch>1</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-        <property name="minimumSize">
-         <size>
-          <width>0</width>
-          <height>0</height>
-         </size>
-        </property>
-        <property name="alternatingRowColors">
-         <bool>true</bool>
-        </property>
-        <property name="iconSize">
-         <size>
-          <width>32</width>
-          <height>32</height>
-         </size>
-        </property>
-        <property name="rootIsDecorated">
-         <bool>false</bool>
-        </property>
-        <property name="uniformRowHeights">
-         <bool>false</bool>
-        </property>
-        <property name="itemsExpandable">
-         <bool>false</bool>
-        </property>
-        <property name="sortingEnabled">
-         <bool>true</bool>
-        </property>
-        <property name="expandsOnDoubleClick">
-         <bool>false</bool>
-        </property>
-       </widget>
-      </widget>
-     </widget>
     </widget>
    </item>
    <item>
     <layout class="QHBoxLayout" name="bottom_layout">
+     <item>
+      <widget class="QLabel" name="label_2">
+       <property name="text">
+        <string>Books:</string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QLabel" name="book_count">
+       <property name="text">
+        <string>0</string>
+       </property>
+      </widget>
+     </item>
      <item>
       <spacer name="horizontalSpacer">
        <property name="orientation">