More Song editing fixes

openlp-1to2-converter.py

@@ -25,7 +25,13 @@
 
 import sys
 import os
+try:
     import sqlite
+except:
+    try:
+        import pysqlite2
+    except:
+        print 'No Sqlite2 package available'
 import sqlite3
 import re
 from optparse import OptionParser

openlp/core/lib/eventreceiver.py

@@ -86,6 +86,13 @@ class EventReceiver(QtCore.QObject):
 
     ``config_updated``
         Informs components the config has changed
+
+    ``edit_song``
+        Requests the current song on the preview display be loaded for edit
+
+    ``preview_song``
+        Tells the song plugin the edit has finished and the song can be previewed
+        Only available if the edit was triggered by the Preview button.
     """
     global log
     log = logging.getLogger(u'EventReceiver')

openlp/plugins/songs/lib/mediaitem.py

@@ -125,7 +125,7 @@ class SongMediaItem(MediaManagerItem):
         QtCore.QObject.connect(Receiver.get_receiver(),
             QtCore.SIGNAL(u'edit_song'), self.onEventEditSong)
         QtCore.QObject.connect(Receiver.get_receiver(),
-            QtCore.SIGNAL(u'proview_song'), self.onPreviewClick)
+            QtCore.SIGNAL(u'preview_song'), self.onPreviewClick)
 
     def configUpdated(self):
         self.searchAsYouType = str_to_bool(