openlp-core team mailing list archive

[Tim Bentley <tim.bentley@xxxxxxxxx>]

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

Requested reviews:
  OpenLP Core (openlp-core)
Related bugs:
  #637547 Editing a song in a loaded service file crashes
  https://bugs.launchpad.net/bugs/637547
  #637886 Replacing live video background with nothing live causes crash
  https://bugs.launchpad.net/bugs/637886
  #642778 enchant.DictNotFoundError: Dictionary for language 'ja_JP' could not be found
  https://bugs.launchpad.net/bugs/642778
  #661965 Preview/Going Live of video fails in build 1093
  https://bugs.launchpad.net/bugs/661965


Path Optimization and bug fix
-- 
https://code.launchpad.net/~trb143/openlp/bugfixes1/+merge/38644
Your team OpenLP Core is requested to review the proposed merge of lp:~trb143/openlp/bugfixes1 into lp:openlp.

=== modified file 'openlp/core/ui/maindisplay.py'
--- openlp/core/ui/maindisplay.py	2010-10-15 15:33:06 +0000
+++ openlp/core/ui/maindisplay.py	2010-10-17 07:31:05 +0000
@@ -231,8 +231,9 @@
             The Image to be displayed can be QImage or QPixmap
         """
         log.debug(u'image to display')
-        image = resize_image(image, self.screen[u'size'].width(),
-            self.screen[u'size'].height())
+        if not isinstance(image, QtGui.QImage):
+            image = resize_image(image, self.screen[u'size'].width(),
+                self.screen[u'size'].height())
         self.resetVideo()
         self.displayImage(image)
         # show screen

=== modified file 'openlp/core/ui/slidecontroller.py'
--- openlp/core/ui/slidecontroller.py	2010-10-15 16:37:02 +0000
+++ openlp/core/ui/slidecontroller.py	2010-10-17 07:31:05 +0000
@@ -585,7 +585,13 @@
                 label = QtGui.QLabel()
                 label.setMargin(4)
                 label.setScaledContents(True)
-                label.setPixmap(QtGui.QPixmap.fromImage(frame[u'image']))
+                if isinstance(frame[u'image'], QtGui.QImage):
+                    label.setPixmap(QtGui.QPixmap.fromImage(frame[u'image']))
+                else:
+                    pixmap = resize_image(frame[u'image'],
+                        self.parent.RenderManager.width,
+                        self.parent.RenderManager.height)
+                    label.setPixmap(QtGui.QPixmap.fromImage(pixmap))
                 self.PreviewListWidget.setCellWidget(framenumber, 0, label)
                 slideHeight = width * self.parent.RenderManager.screen_ratio
                 row += 1