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

Fix non-song text items not updating the display (missing verse tags, essentially)

Browse Source
This commit is contained in:
Raoul Snyman 2018-04-11 09:37:28 -07:00
parent b521b9aeba
commit 1f9d00f47c
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -35,7 +35,7 @@ from openlp.core.common import md5_hash
from openlp.core.common.applocation import AppLocation from openlp.core.common.applocation import AppLocation
from openlp.core.common.i18n import translate from openlp.core.common.i18n import translate
from openlp.core.common.mixins import RegistryProperties from openlp.core.common.mixins import RegistryProperties
from openlp.core.common.path import Path, path_to_str from openlp.core.common.path import Path
from openlp.core.common.settings import Settings from openlp.core.common.settings import Settings
# from openlp.core.display.render import remove_tags, render_tags, render_chords # from openlp.core.display.render import remove_tags, render_tags, render_chords
from openlp.core.lib import ImageSource, build_icon from openlp.core.lib import ImageSource, build_icon
@ -321,6 +321,9 @@ class ServiceItem(RegistryProperties):
""" """
if verse_tag: if verse_tag:
verse_tag = verse_tag.upper() verse_tag = verse_tag.upper()
else:
# For items that don't have a verse tag, autoincrement the slide numbers
verse_tag = str(len(self.slides))
self.service_item_type = ServiceItemType.Text self.service_item_type = ServiceItemType.Text
title = text[:30].split('\n')[0] title = text[:30].split('\n')[0]
self.slides.append({'title': title, 'text': text, 'verse': verse_tag}) self.slides.append({'title': title, 'text': text, 'verse': verse_tag})

2
openlp/core/ui/slidecontroller.py
View File

@ -1174,8 +1174,6 @@ class SlideController(QtWidgets.QWidget, LogMixin, RegistryProperties):
self.slide_preview.setPixmap(self.slide_image) self.slide_preview.setPixmap(self.slide_image)
else: else:
self.preview_display.go_to_slide(self.selected_row) self.preview_display.go_to_slide(self.selected_row)
for display in self.displays:
display.go_to_slide(self.selected_row)
self.slide_count += 1 self.slide_count += 1
def grab_maindisplay(self): def grab_maindisplay(self):