openlp-core team mailing list archive

[Arjan Schrijver <arjan@xxxxxxxxxx>]

Arjan Schrijver has proposed merging lp:~arjan-i/openlp/image_background_fix_2.0 into lp:openlp/2.0.

Requested reviews:
  Tim Bentley (trb143)
Related bugs:
  Bug #1098167 in OpenLP: "Images always get black background when loaded from saved service file"
  https://bugs.launchpad.net/openlp/+bug/1098167

For more details, see:
https://code.launchpad.net/~arjan-i/openlp/image_background_fix_2.0/+merge/143415

When a saved service file is loaded, images always get a black background instead of the configured background. This patch fixes that, although I'm not sure if it fits within the coding standards.

As requested, the background color setting is now retrieved outside of the loop.

Line spacing is also fixed now.
-- 
https://code.launchpad.net/~arjan-i/openlp/image_background_fix_2.0/+merge/143415
Your team OpenLP Core is subscribed to branch lp:openlp/2.0.

=== modified file 'openlp/core/lib/serviceitem.py'
--- openlp/core/lib/serviceitem.py	2012-12-30 19:41:24 +0000
+++ openlp/core/lib/serviceitem.py	2013-01-15 22:00:33 +0000
@@ -37,8 +37,11 @@
 import os
 import uuid
 
+from PyQt4 import QtCore, QtGui
+
 from openlp.core.lib import build_icon, clean_tags, expand_tags, translate, \
     ImageSource
+from openlp.core.lib.settings import Settings
 
 log = logging.getLogger(__name__)
 
@@ -334,9 +337,12 @@
             for slide in serviceitem[u'serviceitem'][u'data']:
                 self._raw_frames.append(slide)
         elif self.service_item_type == ServiceItemType.Image:
+            settingsSection = serviceitem[u'serviceitem'][u'header'][u'name']
+            background = QtGui.QColor(Settings().value(settingsSection
+                + u'/background color', QtCore.QVariant(u'#000000')))
             for text_image in serviceitem[u'serviceitem'][u'data']:
                 filename = os.path.join(path, text_image)
-                self.add_from_image(filename, text_image)
+                self.add_from_image(filename, text_image, background)
         elif self.service_item_type == ServiceItemType.Command:
             for text_image in serviceitem[u'serviceitem'][u'data']:
                 filename = os.path.join(path, text_image[u'title'])