forked from openlp/openlp
fix bugs
This commit is contained in:
parent
9610be5cd0
commit
a3b1a599b2
@ -359,7 +359,7 @@ class ServiceItem(object):
|
|||||||
with them or None when the saved service is lite and the original file paths need to be preserved.
|
with them or None when the saved service is lite and the original file paths need to be preserved.
|
||||||
"""
|
"""
|
||||||
log.debug('set_from_service called with path %s' % path)
|
log.debug('set_from_service called with path %s' % path)
|
||||||
header = service_item['service_item']['header']
|
header = service_item['serviceitem']['header']
|
||||||
self.title = header['title']
|
self.title = header['title']
|
||||||
self.name = header['name']
|
self.name = header['name']
|
||||||
self.service_item_type = header['type']
|
self.service_item_type = header['type']
|
||||||
@ -395,21 +395,21 @@ class ServiceItem(object):
|
|||||||
self.background_audio.append(os.path.join(path, filename))
|
self.background_audio.append(os.path.join(path, filename))
|
||||||
self.theme_overwritten = header.get('theme_overwritten', False)
|
self.theme_overwritten = header.get('theme_overwritten', False)
|
||||||
if self.service_item_type == ServiceItemType.Text:
|
if self.service_item_type == ServiceItemType.Text:
|
||||||
for slide in service_item['service_item']['data']:
|
for slide in service_item['serviceitem']['data']:
|
||||||
self._raw_frames.append(slide)
|
self._raw_frames.append(slide)
|
||||||
elif self.service_item_type == ServiceItemType.Image:
|
elif self.service_item_type == ServiceItemType.Image:
|
||||||
settings_section = service_item['service_item']['header']['name']
|
settings_section = service_item['serviceitem']['header']['name']
|
||||||
background = QtGui.QColor(Settings().value(settings_section + '/background color'))
|
background = QtGui.QColor(Settings().value(settings_section + '/background color'))
|
||||||
if path:
|
if path:
|
||||||
self.has_original_files = False
|
self.has_original_files = False
|
||||||
for text_image in service_item['service_item']['data']:
|
for text_image in service_item['serviceitem']['data']:
|
||||||
filename = os.path.join(path, text_image)
|
filename = os.path.join(path, text_image)
|
||||||
self.add_from_image(filename, text_image, background)
|
self.add_from_image(filename, text_image, background)
|
||||||
else:
|
else:
|
||||||
for text_image in service_item['service_item']['data']:
|
for text_image in service_item['serviceitem']['data']:
|
||||||
self.add_from_image(text_image['path'], text_image['title'], background)
|
self.add_from_image(text_image['path'], text_image['title'], background)
|
||||||
elif self.service_item_type == ServiceItemType.Command:
|
elif self.service_item_type == ServiceItemType.Command:
|
||||||
for text_image in service_item['service_item']['data']:
|
for text_image in service_item['serviceitem']['data']:
|
||||||
if not self.title:
|
if not self.title:
|
||||||
self.title = text_image['title']
|
self.title = text_image['title']
|
||||||
if path:
|
if path:
|
||||||
|
Loading…
Reference in New Issue
Block a user