forked from openlp/openlp
Renamed all instances (i.e. comments) of 'virtual' to 'optional'
This commit is contained in:
parent
70d75b0f80
commit
489f19cf39
@ -236,18 +236,18 @@ class Renderer(object):
|
|||||||
# the first two slides (and neglect the last for now).
|
# the first two slides (and neglect the last for now).
|
||||||
if len(slides) == 3:
|
if len(slides) == 3:
|
||||||
html_text = expand_tags(u'\n'.join(slides[:2]))
|
html_text = expand_tags(u'\n'.join(slides[:2]))
|
||||||
# We check both slides to determine if the virtual break is
|
# We check both slides to determine if the optional break is
|
||||||
# needed (there is only one virtual break).
|
# needed (there is only one optional break).
|
||||||
else:
|
else:
|
||||||
html_text = expand_tags(u'\n'.join(slides))
|
html_text = expand_tags(u'\n'.join(slides))
|
||||||
html_text = html_text.replace(u'\n', u'<br>')
|
html_text = html_text.replace(u'\n', u'<br>')
|
||||||
if self._text_fits_on_slide(html_text):
|
if self._text_fits_on_slide(html_text):
|
||||||
# The first two virtual slides fit (as a whole) on one
|
# The first two optional slides fit (as a whole) on one
|
||||||
# slide. Replace the first occurrence of [---].
|
# slide. Replace the first occurrence of [---].
|
||||||
text = text.replace(u'\n[---]', u'', 1)
|
text = text.replace(u'\n[---]', u'', 1)
|
||||||
else:
|
else:
|
||||||
# The first virtual slide fits, which means we have to
|
# The first optional slide fits, which means we have to
|
||||||
# render the first virtual slide.
|
# render the first optional slide.
|
||||||
text_contains_break = u'[---]' in text
|
text_contains_break = u'[---]' in text
|
||||||
if text_contains_break:
|
if text_contains_break:
|
||||||
try:
|
try:
|
||||||
|
@ -77,7 +77,7 @@ class EditCustomSlideForm(QtGui.QDialog, Ui_CustomSlideEditDialog):
|
|||||||
|
|
||||||
def onSplitButtonClicked(self):
|
def onSplitButtonClicked(self):
|
||||||
"""
|
"""
|
||||||
Adds a virtual split at cursor.
|
Adds an optional split at cursor.
|
||||||
"""
|
"""
|
||||||
self.insertSingleLineTextAtCursor(u'[---]')
|
self.insertSingleLineTextAtCursor(u'[---]')
|
||||||
self.slideTextEdit.setFocus()
|
self.slideTextEdit.setFocus()
|
||||||
|
@ -697,7 +697,7 @@ class OpenLyrics(object):
|
|||||||
# Append text from "lines" element to verse text.
|
# Append text from "lines" element to verse text.
|
||||||
text += self._process_verse_lines(lines,
|
text += self._process_verse_lines(lines,
|
||||||
version=song_xml.get(u'version'))
|
version=song_xml.get(u'version'))
|
||||||
# Add a virtual split to the verse text.
|
# Add an optional split to the verse text.
|
||||||
if lines.get(u'break') is not None:
|
if lines.get(u'break') is not None:
|
||||||
text += u'\n[---]'
|
text += u'\n[---]'
|
||||||
verse_def = verse.get(u'name', u' ').lower()
|
verse_def = verse.get(u'name', u' ').lower()
|
||||||
|
Loading…
Reference in New Issue
Block a user