From 6751aa41b1fff255e2dcccf0d4e76e7bf5911742 Mon Sep 17 00:00:00 2001
From: Jon Tibble <meths@btinternet.com>
Date: Thu, 3 Feb 2011 03:50:04 +0000
Subject: [PATCH] Stop reloading songs all the time

---
 openlp/core/lib/plugin.py             | 2 +-
 openlp/core/ui/servicemanager.py      | 7 ++++---
 openlp/plugins/songs/lib/mediaitem.py | 3 +--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/openlp/core/lib/plugin.py b/openlp/core/lib/plugin.py
index 8b12004d3..fb31006b5 100644
--- a/openlp/core/lib/plugin.py
+++ b/openlp/core/lib/plugin.py
@@ -118,7 +118,7 @@ class Plugin(QtCore.QObject):
 
             class MyPlugin(Plugin):
                 def __init__(self):
-                    Plugin.__init(self, u'MyPlugin', u'0.1')
+                    Plugin.__init__(self, u'MyPlugin', u'0.1')
 
         ``name``
             Defaults to *None*. The name of the plugin.
diff --git a/openlp/core/ui/servicemanager.py b/openlp/core/ui/servicemanager.py
index ace678c75..4d36f4aec 100644
--- a/openlp/core/ui/servicemanager.py
+++ b/openlp/core/ui/servicemanager.py
@@ -506,6 +506,8 @@ class ServiceManager(QtGui.QWidget):
                 if filePath.endswith(u'osd'):
                     p_file = filePath
             if 'p_file' in locals():
+                Receiver.send_message(u'cursor_busy')
+                Receiver.send_message(u'openlp_process_events')
                 fileTo = open(p_file, u'r')
                 items = cPickle.load(fileTo)
                 fileTo.close()
@@ -520,6 +522,7 @@ class ServiceManager(QtGui.QWidget):
                         Receiver.send_message(u'%s_service_load' %
                             serviceItem.name.lower(), serviceItem)
                 delete_file(p_file)
+                Receiver.send_message(u'cursor_normal')
             else:
                 critical_error_message_box(
                     message=translate('OpenLP.ServiceManager',
@@ -536,9 +539,7 @@ class ServiceManager(QtGui.QWidget):
         self.mainwindow.addRecentFile(fileName)
         self.setModified(False)
         QtCore.QSettings(). \
-            setValue(u'service/last file',QtCore.QVariant(fileName))
-        # Refresh Plugin lists
-        Receiver.send_message(u'plugin_list_refresh')
+            setValue(u'service/last file', QtCore.QVariant(fileName))
 
     def loadLastFile(self):
         """
diff --git a/openlp/plugins/songs/lib/mediaitem.py b/openlp/plugins/songs/lib/mediaitem.py
index a62471c2d..95337b29f 100644
--- a/openlp/plugins/songs/lib/mediaitem.py
+++ b/openlp/plugins/songs/lib/mediaitem.py
@@ -95,8 +95,6 @@ class SongMediaItem(MediaManagerItem):
         self.searchLayout.addLayout(self.searchButtonLayout)
         self.pageLayout.addWidget(self.searchWidget)
         # Signals and slots
-        QtCore.QObject.connect(Receiver.get_receiver(),
-            QtCore.SIGNAL(u'plugin_list_refresh'), self.onSearchTextButtonClick)
         QtCore.QObject.connect(self.searchTextEdit,
             QtCore.SIGNAL(u'returnPressed()'), self.onSearchTextButtonClick)
         QtCore.QObject.connect(self.searchTextButton,
@@ -433,6 +431,7 @@ class SongMediaItem(MediaManagerItem):
             if add_song:
                 if self.addSongFromService:
                     editId = self.openLyrics.xml_to_song(item.xml_version)
+                    self.onSearchTextButtonClick()
             # Update service with correct song id.
             if editId:
                 Receiver.send_message(u'service_item_update',