From 8751433da8b957495bcb6efdf99dd1ffd4b904d7 Mon Sep 17 00:00:00 2001
From: Tim Bentley <tim.bentley@gmail.com>
Date: Sun, 1 Nov 2009 21:02:31 +0000
Subject: [PATCH] Fixes from last few merges

---
 openlp/core/ui/maindisplay.py              |  8 +++++++
 openlp/plugins/media/lib/mediaitem.py      | 26 ----------------------
 openlp/plugins/songs/forms/editsongform.py |  2 +-
 3 files changed, 9 insertions(+), 27 deletions(-)

diff --git a/openlp/core/ui/maindisplay.py b/openlp/core/ui/maindisplay.py
index e59f399b4..6759edebf 100644
--- a/openlp/core/ui/maindisplay.py
+++ b/openlp/core/ui/maindisplay.py
@@ -35,6 +35,10 @@ class DisplayLabel(QtGui.QWidget):
     Customised version of QTableWidget which can respond to keyboard
     events.
     """
+    global log
+    log = logging.getLogger(u'MainDisplay')
+    log.info(u'MainDisplay loaded')
+
     def __init__(self, parent=None, name=None):
         QQtGui.QWidget.__init__(self, parent)
         self.parent = parent
@@ -245,6 +249,7 @@ class MainDisplay(DisplayLabel):
             self.timer_id = 0
 
     def onMediaQueue(self, message):
+        log.debug(u'Queue new media message %s' % message)
         self.display.close()
         file = os.path.join(message[1], message[2])
         if self.firstTime:
@@ -255,14 +260,17 @@ class MainDisplay(DisplayLabel):
         self.onMediaPlay()
 
     def onMediaPlay(self):
+        log.debug(u'Play the new media')
         self.display.hide()
         self.mediaObject.play()
         self.setVisible(True)
 
     def onMediaPaws(self):
+        log.debug(u'Pause the new media')
         self.mediaObject.pause()
 
     def onMediaFinish(self):
+        log.debug(u'Finish playing media')
         self.setVisible(False)
         self.mediaObject.stop()
         self.mediaObject.clearQueue()
diff --git a/openlp/plugins/media/lib/mediaitem.py b/openlp/plugins/media/lib/mediaitem.py
index 2a98f78b7..0a62225aa 100644
--- a/openlp/plugins/media/lib/mediaitem.py
+++ b/openlp/plugins/media/lib/mediaitem.py
@@ -88,35 +88,9 @@ class MediaMediaItem(MediaManagerItem):
             filename = unicode((bitem.data(QtCore.Qt.UserRole)).toString())
             frame = u':/media/media_video.png'
             (path, name) = os.path.split(filename)
-            #service_item.add_from_image(path, name, frame)
-            print path
-            print name
             service_item.add_from_command(path, name, frame)
         return True
 
-#    def onPreviewClick(self):
-#        log.debug(u'Media Preview Button pressed')
-#        items = self.ListView.selectedIndexes()
-#        for item in items:
-#            baseItem = self.ListView.item(item.row())
-#            itemText = unicode(baseItem.data(QtCore.Qt.UserRole).toString())
-#            print itemText
-#
-#    def onLiveClick(self):
-#        log.debug(u'Media Live Button pressed')
-#        items = self.ListView.selectedIndexes()
-#        if len(items) > 0:
-#            firstPass = True
-#            for item in items:
-#                baseItem = self.ListView.item(item.row())
-#                filename = unicode(baseItem.data(QtCore.Qt.UserRole).toString())
-#                if firstPass:
-#                    self.MainDisplay.queueMedia(filename, firstPass)
-#                    firstPass = False
-#                else:
-#                    self.MainDisplay.queueMedia(filename, firstPass)
-#        self.MainDisplay.playMedia()
-
     def initialise(self):
         self.ListView.setSelectionMode(
             QtGui.QAbstractItemView.ExtendedSelection)
diff --git a/openlp/plugins/songs/forms/editsongform.py b/openlp/plugins/songs/forms/editsongform.py
index 4bcecf457..7522477b2 100644
--- a/openlp/plugins/songs/forms/editsongform.py
+++ b/openlp/plugins/songs/forms/editsongform.py
@@ -469,7 +469,7 @@ class EditSongForm(QtGui.QDialog, Ui_EditSongDialog):
         log.debug(u'processTitle')
         self.song.search_title = self.song.search_title.replace(u'\'', u'')
         self.song.search_title = self.song.search_title.replace(u'\"', u'')
-        self.song.search_title = self.song.search_title.replace(u'\`', u'')
+        self.song.search_title = self.song.search_title.replace(u'`', u'')
         self.song.search_title = self.song.search_title.replace(u',', u'')
         self.song.search_title = self.song.search_title.replace(u';', u'')
         self.song.search_title = self.song.search_title.replace(u':', u'')