From f64e279767b3c93002d5d742baabcb0300e4630b Mon Sep 17 00:00:00 2001
From: John Schember <john@nachtimwald.com>
Date: Wed, 2 Mar 2011 20:07:41 -0500
Subject: [PATCH] Add progress indicator to search dialog.

---
 src/calibre/gui2/store/search.py | 8 ++++++++
 src/calibre/gui2/store/search.ui | 2 +-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/src/calibre/gui2/store/search.py b/src/calibre/gui2/store/search.py
index 0155600d2d..a80201d1e4 100644
--- a/src/calibre/gui2/store/search.py
+++ b/src/calibre/gui2/store/search.py
@@ -17,6 +17,7 @@ from PyQt4.Qt import Qt, QAbstractItemModel, QDialog, QTimer, QVariant, \
 
 from calibre import browser
 from calibre.gui2 import NONE
+from calibre.gui2.progress_indicator import ProgressIndicator
 from calibre.gui2.store.search_ui import Ui_Dialog
 from calibre.utils.config import DynamicConfig
 from calibre.utils.icu import sort_key
@@ -56,6 +57,10 @@ class SearchDialog(QDialog, Ui_Dialog):
             stores_group_layout.addWidget(cbox)
             setattr(self, 'store_check_' + x, cbox)
         stores_group_layout.addStretch()
+        
+        # Create and add the progress indicator
+        self.pi = ProgressIndicator(self, 24)
+        self.bottom_layout.insertWidget(0, self.pi)
 
         self.search.clicked.connect(self.do_search)
         self.checker.timeout.connect(self.get_results)
@@ -109,6 +114,7 @@ class SearchDialog(QDialog, Ui_Dialog):
             self.hang_check = 0
             self.checker.start(100)
             self.search_pool.start_threads()
+            self.pi.startAnimation()
     
     def save_state(self):
         self.config['store_search_geometry'] = self.saveGeometry()
@@ -151,10 +157,12 @@ class SearchDialog(QDialog, Ui_Dialog):
         if self.hang_check >= HANG_TIME:
             self.search_pool.abort()
             self.checker.stop()
+            self.pi.stopAnimation()
         else:
             # Stop the checker if not threads are running.
             if not self.search_pool.threads_running() and not self.search_pool.has_tasks():
                 self.checker.stop()
+                self.pi.stopAnimation()
         
         while self.search_pool.has_results():
             res = self.search_pool.get_result()
diff --git a/src/calibre/gui2/store/search.ui b/src/calibre/gui2/store/search.ui
index 5c4b1a5c15..16fc0c4deb 100644
--- a/src/calibre/gui2/store/search.ui
+++ b/src/calibre/gui2/store/search.ui
@@ -149,7 +149,7 @@
     </widget>
    </item>
    <item>
-    <layout class="QHBoxLayout" name="horizontalLayout">
+    <layout class="QHBoxLayout" name="bottom_layout">
      <item>
       <spacer name="horizontalSpacer">
        <property name="orientation">