From f83d52621ad0bd2b77574e6159982af722cf6db8 Mon Sep 17 00:00:00 2001
From: Tim Bentley <tim.bentley@gmail.com>
Date: Fri, 29 Apr 2011 08:40:19 +0100
Subject: [PATCH] Fixes

---
 openlp/core/ui/mainwindow.py     | 24 ++++++++++++------------
 openlp/core/ui/servicemanager.py |  2 +-
 openlp/core/utils/__init__.py    | 13 -------------
 3 files changed, 13 insertions(+), 26 deletions(-)

diff --git a/openlp/core/ui/mainwindow.py b/openlp/core/ui/mainwindow.py
index 672fa9c44..311aa7ec0 100644
--- a/openlp/core/ui/mainwindow.py
+++ b/openlp/core/ui/mainwindow.py
@@ -38,7 +38,7 @@ from openlp.core.ui import AboutForm, SettingsForm, ServiceManager, \
     ThemeManager, SlideController, PluginForm, MediaDockManager, \
     ShortcutListForm, DisplayTagForm
 from openlp.core.utils import AppLocation, add_actions, LanguageManager, \
-    get_application_version, LoadSleepThread
+    get_application_version
 from openlp.core.utils.actions import ActionList, CategoryOrder
 
 log = logging.getLogger(__name__)
@@ -128,7 +128,7 @@ class Ui_MainWindow(object):
         self.loadProgressBar = QtGui.QProgressBar(self.statusBar)
         self.loadProgressBar.setObjectName(u'loadProgressBar')
         self.statusBar.addPermanentWidget(self.loadProgressBar)
-        self.statusBar.removeWidget(self.loadProgressBar)
+        self.loadProgressBar.hide()
         self.loadProgressBar.setValue(0)
         self.defaultThemeLabel = QtGui.QLabel(self.statusBar)
         self.defaultThemeLabel.setObjectName(u'defaultThemeLabel')
@@ -549,9 +549,9 @@ class MainWindow(QtGui.QMainWindow, Ui_MainWindow):
         QtCore.QObject.connect(Receiver.get_receiver(),
             QtCore.SIGNAL(u'openlp_information_message'),
             self.onInformationMessage)
-        QtCore.QObject.connect(Receiver.get_receiver(),
-            QtCore.SIGNAL(u'mainwindow_remove_progress'),
-            self.removeProgressBar)
+#        QtCore.QObject.connect(Receiver.get_receiver(),
+#            QtCore.SIGNAL(u'mainwindow_remove_progress'),
+#            self.removeProgressBar)
         # warning cyclic dependency
         # renderer needs to call ThemeManager and
         # ThemeManager needs to call Renderer
@@ -1021,7 +1021,6 @@ class MainWindow(QtGui.QMainWindow, Ui_MainWindow):
         """
         Make Progress bar visible and set size
         """
-        self.statusBar.addWidget(self.loadProgressBar)
         self.loadProgressBar.show()
         self.loadProgressBar.setMaximum(size)
         self.loadProgressBar.setValue(0)
@@ -1029,20 +1028,21 @@ class MainWindow(QtGui.QMainWindow, Ui_MainWindow):
 
     def incrementProgressBar(self):
         """
-        Increase the Progress Bar Value by 1
+        Increase the Progress Bar value by 1
         """
         self.loadProgressBar.setValue(self.loadProgressBar.value() + 1)
         Receiver.send_message(u'openlp_process_events')
 
     def finishedProgressBar(self):
         """
-        Trigger it's removal after 1 second
+        Trigger it's removal after 2.5 second
         """
-        LoadSleepThread(self).start()
+        self.timer_id = self.startTimer(2500)
 
-    def removeProgressBar(self):
+    def timerEvent(self, event):
         """
         Remove the Progress bar from view.
         """
-        self.statusBar.removeWidget(self.loadProgressBar)
-        Receiver.send_message(u'openlp_process_events')
+        if event.timerId() == self.timer_id:
+            self.loadProgressBar.hide()
+            Receiver.send_message(u'openlp_process_events')
diff --git a/openlp/core/ui/servicemanager.py b/openlp/core/ui/servicemanager.py
index 24cf5c936..9ad527826 100644
--- a/openlp/core/ui/servicemanager.py
+++ b/openlp/core/ui/servicemanager.py
@@ -461,7 +461,7 @@ class ServiceManager(QtGui.QWidget):
         write_list = []
         total_size = 0
         Receiver.send_message(u'cursor_busy')
-        # Number if items + 1 to zip it
+        # Number of items + 1 to zip it
         self.mainwindow.displayProgressBar(len(self.serviceItems) + 1)
         for item in self.serviceItems:
             self.mainwindow.incrementProgressBar()
diff --git a/openlp/core/utils/__init__.py b/openlp/core/utils/__init__.py
index fa1ebf68a..1bc7037ae 100644
--- a/openlp/core/utils/__init__.py
+++ b/openlp/core/utils/__init__.py
@@ -100,19 +100,6 @@ class VersionThread(QtCore.QThread):
             remote_version[u'revision'] > local_version[u'revision']:
             Receiver.send_message(u'openlp_version_check', u'%s' % version)
 
-class LoadSleepThread(QtCore.QThread):
-    """
-    A special Qt thread class sleep then remove the load progress bar
-    """
-    def __init__(self, parent):
-        QtCore.QThread.__init__(self, parent)
-
-    def run(self):
-        """
-        Run the thread.
-        """
-        time.sleep(1)
-        Receiver.send_message(u'mainwindow_remove_progress')
 
 class AppLocation(object):
     """