raoul/openlp
1
0
Fork 0
forked from openlp/openlp
Code Issues Pull Requests Projects Releases Wiki Activity

Improve saving and loading of service files.

Browse Source
This commit is contained in:
Tomas Groth 2018-10-28 22:16:00 +01:00
parent 4d8661b669
commit b45de5a7dd
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
openlp/core/lib/serviceitem.py
View File

@ -354,7 +354,11 @@ class ServiceItem(RegistryProperties):
} }
service_data = [] service_data = []
if self.service_item_type == ServiceItemType.Text: if self.service_item_type == ServiceItemType.Text:
service_data = [slide for slide in self.slides] for slide in self.slides:
data_slide = deepcopy(slide)
data_slide['raw_slide'] = data_slide.pop('text')
data_slide['verseTag'] = data_slide.pop('verse')
service_data.append(data_slide)
elif self.service_item_type == ServiceItemType.Image: elif self.service_item_type == ServiceItemType.Image:
if lite_save: if lite_save:
for slide in self.slides: for slide in self.slides:
@ -574,9 +578,9 @@ class ServiceItem(RegistryProperties):
except IndexError: except IndexError:
return '' return ''
if self.is_image() or self.is_capable(ItemCapabilities.IsOptical): if self.is_image() or self.is_capable(ItemCapabilities.IsOptical):
path_from = frame['path'] path_from = frame['filename']
else: else:
path_from = os.path.join(frame['path'], frame['title']) path_from = os.path.join(frame['filename'], frame['title'])
return path_from return path_from
def remove_frame(self, frame): def remove_frame(self, frame):