From 479bd7015a83f2aa4611ee28be1b9d23395ca2d3 Mon Sep 17 00:00:00 2001
From: Martin Baeuml <baeuml@gmail.com>
Date: Mon, 26 Sep 2011 18:05:00 +0200
Subject: [PATCH] put statusbar progress bar to gui object

The problem here is that statusBar().removeWidget() not really removes
the widget from the statusbar, but only hides it (see documentation).
Therefore we need it makes more sense to keep a common statusbar
progressbar, and pass it to the background loader.  To activate it
one has to call both addWidget and show according to the documentation.
---
 sloth/gui/labeltool.py | 21 ++++++++++++---------
 1 file changed, 12 insertions(+), 9 deletions(-)

diff --git a/sloth/gui/labeltool.py b/sloth/gui/labeltool.py
index e8c3b8a..f43600b 100755
--- a/sloth/gui/labeltool.py
+++ b/sloth/gui/labeltool.py
@@ -25,16 +25,16 @@ LOG=logging.getLogger(__name__)
 class BackgroundLoader(QObject):
     finished = pyqtSignal()
 
-    def __init__(self, model, statusbar):
+    def __init__(self, model, statusbar, progress):
         QObject.__init__(self)
         self._max_levels = 3
         self._model = model
         self._statusbar = statusbar
         self._message_displayed = False
-        self.progress = QProgressBar()
-        self.progress.setMinimum(0)
-        self.progress.setMaximum(1000 * self._max_levels)
-        self.progress.setMaximumWidth(150)
+        self._progress = progress
+        self._progress.setMinimum(0)
+        self._progress.setMaximum(1000 * self._max_levels)
+        self._progress.setMaximumWidth(150)
 
         self._level = 1
         self._iterator = self._model.iterator(maxlevels=self._level)
@@ -54,7 +54,7 @@ class BackgroundLoader(QObject):
                     item = next(self._iterator)
                 self._next_rows += item.rowCount()
                 self._pos += 1
-                self.progress.setValue(int((float(self._pos) / float(self._rows) + self._level - 1) * 1000))
+                self._progress.setValue(int((float(self._pos) / float(self._rows) + self._level - 1) * 1000))
             except StopIteration:
                 self._level += 1
                 self._iterator = self._model.iterator(maxlevels=self._level)
@@ -97,11 +97,12 @@ class MainWindow(QMainWindow):
 
     def startBackgroundLoading(self):
         self.stopBackgroundLoading(forced=True)
-        self.loader = BackgroundLoader(self.labeltool.model(), self.statusBar())
+        self.loader = BackgroundLoader(self.labeltool.model(), self.statusBar(), self.sb_progress)
         self.idletimer.timeout.connect(self.loader.load)
         self.loader.finished.connect(self.stopBackgroundLoading)
+        self.statusBar().addWidget(self.sb_progress)
+        self.sb_progress.show()
         self.idletimer.start()
-        self.statusBar().addWidget(self.loader.progress)
 
     def stopBackgroundLoading(self, forced=False):
         if not forced:
@@ -109,7 +110,7 @@ class MainWindow(QMainWindow):
         self.idletimer.stop()
         if self.loader is not None:
             self.idletimer.timeout.disconnect()
-            self.statusBar().removeWidget(self.loader.progress)
+            self.statusBar().removeWidget(self.sb_progress)
             self.loader = None
 
     def onAnnotationsLoaded(self):
@@ -243,6 +244,8 @@ class MainWindow(QMainWindow):
         self.view.scaleChanged.connect(self.onScaleChanged)
         self.onScaleChanged(self.view.getScale())
 
+        self.sb_progress = QProgressBar()
+
         # View menu
         self.ui.menu_Views.addAction(self.ui.dockProperties.toggleViewAction())
         self.ui.menu_Views.addAction(self.ui.dockAnnotations.toggleViewAction())