From 7b85b9c7af640a448673b0aac1831b65cd34b013 Mon Sep 17 00:00:00 2001
From: Tim Bentley <tim.bentley@gmail.com>
Date: Sat, 24 Oct 2009 20:43:16 +0100
Subject: [PATCH] More Song editing fixes

---
 openlp-1to2-converter.py              | 8 +++++++-
 openlp/core/lib/eventreceiver.py      | 7 +++++++
 openlp/plugins/songs/lib/mediaitem.py | 2 +-
 3 files changed, 15 insertions(+), 2 deletions(-)
 mode change 100644 => 100755 openlp-1to2-converter.py

diff --git a/openlp-1to2-converter.py b/openlp-1to2-converter.py
old mode 100644
new mode 100755
index bccb44d31..8e73b1d3d
--- a/openlp-1to2-converter.py
+++ b/openlp-1to2-converter.py
@@ -25,7 +25,13 @@
 
 import sys
 import os
-import sqlite
+try:
+    import sqlite
+except:
+    try:
+        import pysqlite2
+    except:
+        print 'No Sqlite2 package available'
 import sqlite3
 import re
 from optparse import OptionParser
diff --git a/openlp/core/lib/eventreceiver.py b/openlp/core/lib/eventreceiver.py
index 923e228de..5ff4860ce 100644
--- a/openlp/core/lib/eventreceiver.py
+++ b/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')
diff --git a/openlp/plugins/songs/lib/mediaitem.py b/openlp/plugins/songs/lib/mediaitem.py
index 9f3bc5638..84fe3a506 100644
--- a/openlp/plugins/songs/lib/mediaitem.py
+++ b/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(