openlp-core team mailing list archive

[Tim Bentley <tim.bentley@xxxxxxxxx>]

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

Requested reviews:
  OpenLP Core (openlp-core)
Related bugs:
  Bug #742636 in OpenLP: "Leading spaces in song titles are stripped"
  https://bugs.launchpad.net/openlp/+bug/742636

For more details, see:
https://code.launchpad.net/~trb143/openlp/beta1/+merge/59579

Fix crash in video from MediaManager.
. 
-- 
https://code.launchpad.net/~trb143/openlp/beta1/+merge/59579
Your team OpenLP Core is requested to review the proposed merge of lp:~trb143/openlp/beta1 into lp:openlp.

=== modified file 'openlp.pyw'
--- openlp.pyw	2011-04-15 21:43:59 +0000
+++ openlp.pyw	2011-04-30 07:44:38 +0000
@@ -46,7 +46,7 @@
 from openlp.core.ui.exceptionform import ExceptionForm
 from openlp.core.ui import SplashScreen, ScreenList
 from openlp.core.utils import AppLocation, LanguageManager, VersionThread, \
-    get_application_version
+    get_application_version, DelayStartThread
 
 log = logging.getLogger()
 
@@ -130,6 +130,7 @@
             u'general/update check', QtCore.QVariant(True)).toBool()
         if update_check:
             VersionThread(self.mainWindow).start()
+        DelayStartThread(self.mainWindow).start()
         return self.exec_()
 
     def isAlreadyRunning(self):
@@ -250,4 +251,4 @@
     """
     Instantiate and run the application.
     """
-    main()
\ No newline at end of file
+    main()

=== modified file 'openlp/core/lib/renderer.py'
--- openlp/core/lib/renderer.py	2011-04-29 19:22:20 +0000
+++ openlp/core/lib/renderer.py	2011-04-30 07:44:38 +0000
@@ -71,7 +71,7 @@
         log.debug(u'Initilisation started')
         self.screens = screens
         self.image_manager = ImageManager()
-        self.display = MainDisplay(self, screens, False, False)
+        self.display = MainDisplay(self, screens, False)
         self.display.imageManager = self.image_manager
         self.theme_manager = theme_manager
         self.service_theme = u''

=== modified file 'openlp/core/ui/maindisplay.py'
--- openlp/core/ui/maindisplay.py	2011-04-29 16:27:27 +0000
+++ openlp/core/ui/maindisplay.py	2011-04-30 07:44:38 +0000
@@ -60,12 +60,11 @@
     """
     This is the display screen.
     """
-    def __init__(self, parent, screens, live, needsPhonon=True):
+    def __init__(self, parent, screens, live):
         DisplayWidget.__init__(self, live, parent=None)
         self.parent = parent
         self.screens = screens
         self.isLive = live
-        self.needsPhonon = needsPhonon
         self.alertTab = None
         self.hideMode = None
         self.videoHide = False

=== modified file 'openlp/core/utils/__init__.py'
--- openlp/core/utils/__init__.py	2011-04-29 19:22:20 +0000
+++ openlp/core/utils/__init__.py	2011-04-30 07:44:38 +0000
@@ -99,6 +99,19 @@
             local_version.get(u'revision') and \
             remote_version[u'revision'] > local_version[u'revision']:
             Receiver.send_message(u'openlp_version_check', u'%s' % version)
+
+
+class DelayStartThread(QtCore.QThread):
+    """
+    A special Qt thread class to build things after OpenLP has started
+    """
+    def __init__(self, parent):
+        QtCore.QThread.__init__(self, parent)
+
+    def run(self):
+        """
+        Run the thread.
+        """
         Receiver.send_message(u'openlp_phonon_creation')
 
 

=== modified file 'openlp/plugins/media/lib/mediaitem.py'
--- openlp/plugins/media/lib/mediaitem.py	2011-04-29 16:41:26 +0000
+++ openlp/plugins/media/lib/mediaitem.py	2011-04-30 07:44:38 +0000
@@ -215,6 +215,6 @@
             self.listView.addItem(item_name)
 
     def createPhonon(self):
+        log.debug(u'CreatePhonon')
         if not self.mediaObject:
             self.mediaObject = Phonon.MediaObject(self)
-