openlp-core team mailing list archive

[Raoul Snyman <raoul.snyman@xxxxxxxxxxxxxxxxxxxxxxxx>]

Raoul Snyman has proposed merging lp:~raoul-snyman/openlp/bug-803342 into lp:openlp.

Requested reviews:
  OpenLP Core (openlp-core)
Related bugs:
  Bug #803342 in OpenLP: "Cannot add two presentations to the service at once"
  https://bugs.launchpad.net/openlp/+bug/803342

For more details, see:
https://code.launchpad.net/~raoul-snyman/openlp/bug-803342/+merge/76268

Fixed bug #803342
-- 
https://code.launchpad.net/~raoul-snyman/openlp/bug-803342/+merge/76268
Your team OpenLP Core is requested to review the proposed merge of lp:~raoul-snyman/openlp/bug-803342 into lp:openlp.

=== modified file 'openlp/core/lib/__init__.py'
--- openlp/core/lib/__init__.py	2011-09-20 15:23:29 +0000
+++ openlp/core/lib/__init__.py	2011-09-20 17:58:24 +0000
@@ -144,7 +144,7 @@
     # convert to base64 encoding so does not get missed!
     return byte_array.toBase64()
 
-def resize_image(image_path, width, height, background):
+def resize_image(image_path, width, height, background=u'#000000'):
     """
     Resize an image to fit on the current screen.
 
@@ -159,6 +159,8 @@
 
     ``background``
         The background colour defaults to black.
+
+    DO NOT REMOVE THE DEFAULT BACKGROUND VALUE!
     """
     log.debug(u'resize_image - start')
     reader = QtGui.QImageReader(image_path)

=== modified file 'openlp/plugins/presentations/lib/mediaitem.py'
--- openlp/plugins/presentations/lib/mediaitem.py	2011-09-06 17:53:43 +0000
+++ openlp/plugins/presentations/lib/mediaitem.py	2011-09-20 17:58:24 +0000
@@ -56,6 +56,7 @@
         MediaManagerItem.__init__(self, parent, plugin, icon)
         self.message_listener = MessageListener(self)
         self.hasSearch = True
+        self.singleServiceItem = False
         QtCore.QObject.connect(Receiver.get_receiver(),
             QtCore.SIGNAL(u'mediaitem_presentation_rebuild'), self.rebuild)
         # Allow DnD from the desktop