More changes to cursors

openlp/core/lib/eventreceiver.py

@@ -220,6 +220,21 @@ class EventReceiver(QtCore.QObject):
         Waits for openlp to do something "interesting" and sends a
         remotes_poll_response signal when it does
 
+    ``openlp_critical_message``
+        Displays a standalong Critical Message
+
+    ``openlp_error_message``
+        Displays a standalong Error Message
+
+    ``openlp_information_message``
+        Displays a standalong Information Message
+
+    ``cursor_busy``
+        Makes the cursor got to a busy form
+
+    ``cursor_normal``
+        Resets the cursor to default
+
     """
     def __init__(self):
         """
@@ -278,4 +293,4 @@ class Receiver(object):
         """
         Get the global ``eventreceiver`` instance.
         """
-        return Receiver.eventreceiver
+        return Receiver.eventreceiver

openlp/core/ui/mainwindow.py

@@ -1013,7 +1013,7 @@ class MainWindow(QtGui.QMainWindow, Ui_MainWindow):
                     QtCore.QFileInfo(filename).fileName()), self)
                 action.setData(QtCore.QVariant(filename))
                 self.connect(action, QtCore.SIGNAL(u'triggered()'),
-                    self.ServiceManagerContents.loadService)
+                    self.ServiceManagerContents.loadFile)
                 self.FileMenu.addAction(action)
         self.FileMenu.addSeparator()
         self.FileMenu.addAction(self.FileMenuActions[-1])

openlp/core/ui/servicemanager.py

@@ -787,7 +787,6 @@ class ServiceManager(QtGui.QWidget):
         ``serviceItemCount``
             The number of items in the service.
         """
-        Receiver.send_message(u'cursor_busy')
         # Correct order of items in array
         count = 1
         for item in self.serviceItems:
@@ -831,7 +830,6 @@ class ServiceManager(QtGui.QWidget):
                     self.serviceManagerList.setCurrentItem(treewidgetitem1)
                     item[u'expanded'] = temp
             treewidgetitem.setExpanded(item[u'expanded'])
-        Receiver.send_message(u'cursor_normal')
 
     def validateItem(self, serviceItem):
         """
@@ -885,6 +883,7 @@ class ServiceManager(QtGui.QWidget):
         Rebuild the service list as things have changed and a
         repaint is the easiest way to do this.
         """
+        Receiver.send_message(u'cursor_busy')
         log.debug(u'regenerateServiceItems')
         # force reset of renderer as theme data has changed
         self.parent.renderManager.themedata = None
@@ -899,6 +898,7 @@ class ServiceManager(QtGui.QWidget):
             # Set to False as items may have changed rendering
             # does not impact the saved song so True may also be valid
             self.setModified(True)
+        Receiver.send_message(u'cursor_normal')
 
     def serviceItemUpdate(self, message):
         """