openlp-core team mailing list archive

[Tim Bentley <tim.bentley@xxxxxxxxx>]

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

    Requested reviews:
    OpenLP Core (openlp-core)


Fix issues from last merge so theme editing and image display now work
-- 
https://code.launchpad.net/~trb143/openlp/songediting/+merge/15499
Your team OpenLP Core is subscribed to branch lp:openlp.

=== modified file 'openlp/core/lib/rendermanager.py'
--- openlp/core/lib/rendermanager.py	2009-11-30 20:29:26 +0000
+++ openlp/core/lib/rendermanager.py	2009-12-01 17:05:29 +0000
@@ -206,7 +206,7 @@
         footer.append(u'Public Domain')
         footer.append(u'CCLI 123456')
         formatted = self.renderer.format_slide(verse, False)
-        return self.renderer.generate_frame_from_lines(formatted[0], footer)
+        return self.renderer.generate_frame_from_lines(formatted[0], footer)[u'main']
 
     def format_slide(self, words):
         """

=== modified file 'openlp/core/lib/serviceitem.py'
--- openlp/core/lib/serviceitem.py	2009-11-30 20:29:26 +0000
+++ openlp/core/lib/serviceitem.py	2009-12-01 17:05:29 +0000
@@ -293,7 +293,7 @@
         if self.service_item_type == ServiceItemType.Text:
             return self.render_individual(row)
         else:
-            return self._raw_frames[row][u'image']
+            return {u'main':self._raw_frames[row][u'image'], u'trans':None}
 
     def get_frame_title(self, row=0):
         """

=== modified file 'openlp/core/ui/maindisplay.py'
--- openlp/core/ui/maindisplay.py	2009-11-30 20:34:45 +0000
+++ openlp/core/ui/maindisplay.py	2009-12-01 17:05:29 +0000
@@ -198,7 +198,7 @@
             self.displayAlert()
         elif not self.displayBlank:
             if transition:
-                if self.hasTransition:
+                if self.hasTransition and self.frame[u'trans'] is not None:
                     self.display.setPixmap(QtGui.QPixmap.fromImage(self.frame[u'trans']))
                     self.repaint()
                     self.display.setPixmap(QtGui.QPixmap.fromImage(frame[u'trans']))