openlp-core team mailing list archive

[Tim Bentley <tim.bentley@xxxxxxxxx>]

Tim Bentley has proposed merging lp:~trb143/openlp/fixes into lp:openlp.

    Requested reviews:
    Raoul Snyman (raoul-snyman)


Fixes from last merge
-- 
https://code.launchpad.net/~trb143/openlp/fixes/+merge/14308
Your team OpenLP Core is subscribed to branch lp:openlp.

=== modified file 'openlp/core/resources.py'
--- openlp/core/resources.py	2009-11-01 19:22:51 +0000
+++ openlp/core/resources.py	2009-11-02 17:30:22 +0000
@@ -1,11 +1,26 @@
 # -*- coding: utf-8 -*-
+# vim: autoindent shiftwidth=4 expandtab textwidth=80 tabstop=4 softtabstop=4
 
-# Resource object code
-#
-# Created: Sun Nov 1 18:56:53 2009
-#      by: The Resource Compiler for PyQt (Qt v4.5.2)
-#
-# WARNING! All changes made in this file will be lost!
+###############################################################################
+# OpenLP - Open Source Lyrics Projection                                      #
+# --------------------------------------------------------------------------- #
+# Copyright (c) 2008-2009 Raoul Snyman                                        #
+# Portions copyright (c) 2008-2009 Martin Thompson, Tim Bentley, Carsten      #
+# Tinggaard, Jon Tibble, Jonathan Corwin, Maikel Stuivenberg, Scott Guerrieri #
+# --------------------------------------------------------------------------- #
+# This program is free software; you can redistribute it and/or modify it     #
+# under the terms of the GNU General Public License as published by the Free  #
+# Software Foundation; version 2 of the License.                              #
+#                                                                             #
+# This program is distributed in the hope that it will be useful, but WITHOUT #
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or       #
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for    #
+# more details.                                                               #
+#                                                                             #
+# You should have received a copy of the GNU General Public License along     #
+# with this program; if not, write to the Free Software Foundation, Inc., 59  #
+# Temple Place, Suite 330, Boston, MA 02111-1307 USA                          #
+###############################################################################
 
 from PyQt4 import QtCore
 

=== modified file 'openlp/core/ui/maindisplay.py'
--- openlp/core/ui/maindisplay.py	2009-11-02 01:03:27 +0000
+++ openlp/core/ui/maindisplay.py	2009-11-02 17:30:22 +0000
@@ -35,6 +35,10 @@
     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
@@ -250,6 +254,8 @@
             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:
             self.mediaObject.setCurrentSource(Phonon.MediaSource(file))
@@ -259,6 +265,7 @@
         self.onMediaPlay()
 
     def onMediaPlay(self):
+        log.debug(u'Play the new media')
         if not self.mediaLoaded and not self.displayBlank:
             self.blankDisplay()
         self.firstTime = True
@@ -268,6 +275,7 @@
         self.setVisible(True)
 
     def onMediaPaws(self):
+        log.debug(u'Pause the new media')
         self.mediaObject.pause()
 
     def onMediaStop(self):
@@ -275,6 +283,11 @@
         self.display.show()
 
     def onMediaFinish(self):
+<<<<<<< TREE
+        log.debug(u'Finish playing media')
+        self.setVisible(False)
+=======
+>>>>>>> MERGE-SOURCE
         self.mediaObject.stop()
         self.mediaObject.clearQueue()
         self.mediaLoaded = False

=== modified file 'openlp/plugins/media/lib/mediaitem.py'
--- openlp/plugins/media/lib/mediaitem.py	2009-11-01 23:15:19 +0000
+++ openlp/plugins/media/lib/mediaitem.py	2009-11-02 17:30:22 +0000
@@ -85,35 +85,9 @@
             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)

=== modified file 'openlp/plugins/songs/forms/editsongform.py'
--- openlp/plugins/songs/forms/editsongform.py	2009-10-31 20:27:08 +0000
+++ openlp/plugins/songs/forms/editsongform.py	2009-11-02 17:30:22 +0000
@@ -469,7 +469,7 @@
         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'')