forked from openlp/openlp
Make sure images use the configured background/border color when loaded from a saved service file
This commit is contained in:
parent
0377c8ad26
commit
8b01158856
@ -36,9 +36,11 @@ import datetime
|
|||||||
import logging
|
import logging
|
||||||
import os
|
import os
|
||||||
import uuid
|
import uuid
|
||||||
|
from PyQt4 import QtCore, QtGui
|
||||||
|
|
||||||
from openlp.core.lib import build_icon, clean_tags, expand_tags, translate, \
|
from openlp.core.lib import build_icon, clean_tags, expand_tags, translate, \
|
||||||
ImageSource
|
ImageSource
|
||||||
|
from openlp.core.lib.settings import Settings
|
||||||
|
|
||||||
log = logging.getLogger(__name__)
|
log = logging.getLogger(__name__)
|
||||||
|
|
||||||
@ -335,8 +337,11 @@ class ServiceItem(object):
|
|||||||
self._raw_frames.append(slide)
|
self._raw_frames.append(slide)
|
||||||
elif self.service_item_type == ServiceItemType.Image:
|
elif self.service_item_type == ServiceItemType.Image:
|
||||||
for text_image in serviceitem[u'serviceitem'][u'data']:
|
for text_image in serviceitem[u'serviceitem'][u'data']:
|
||||||
|
settingsSection = serviceitem[u'serviceitem'][u'header'][u'name']
|
||||||
|
background = QtGui.QColor(Settings().value(settingsSection
|
||||||
|
+ u'/background color', QtCore.QVariant(u'#000000')))
|
||||||
filename = os.path.join(path, text_image)
|
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:
|
elif self.service_item_type == ServiceItemType.Command:
|
||||||
for text_image in serviceitem[u'serviceitem'][u'data']:
|
for text_image in serviceitem[u'serviceitem'][u'data']:
|
||||||
filename = os.path.join(path, text_image[u'title'])
|
filename = os.path.join(path, text_image[u'title'])
|
||||||
|
Loading…
Reference in New Issue
Block a user