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

Changed the 'Split' button to say 'Optional Split' instead.

Browse Source 
bzr-revno: 1945
This commit is contained in:
Raoul Snyman 2012-04-20 21:32:34 +02:00
commit 7d5d7d7116
5 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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:

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

@ -124,7 +124,7 @@ class UiStrings(object):
self.Settings = translate('OpenLP.Ui', 'Settings') self.Settings = translate('OpenLP.Ui', 'Settings')
self.SaveService = translate('OpenLP.Ui', 'Save Service') self.SaveService = translate('OpenLP.Ui', 'Save Service')
self.Service = translate('OpenLP.Ui', 'Service') self.Service = translate('OpenLP.Ui', 'Service')
self.Split = translate('OpenLP.Ui', '&Split') self.Split = translate('OpenLP.Ui', 'Optional &Split')
self.SplitToolTip = translate('OpenLP.Ui', 'Split a slide into two ' self.SplitToolTip = translate('OpenLP.Ui', 'Split a slide into two '
'only if it does not fit on the screen as one slide.') 'only if it does not fit on the screen as one slide.')
self.StartTimeCode = unicode(translate('OpenLP.Ui', 'Start %s')) self.StartTimeCode = unicode(translate('OpenLP.Ui', 'Start %s'))

2
openlp/plugins/custom/forms/editcustomslideform.py
View File

@ -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()

2
openlp/plugins/songs/forms/editversedialog.py
View File

@ -25,7 +25,7 @@
# Temple Place, Suite 330, Boston, MA 02111-1307 USA # # Temple Place, Suite 330, Boston, MA 02111-1307 USA #
############################################################################### ###############################################################################
from PyQt4 import QtCore, QtGui from PyQt4 import QtGui
from openlp.core.lib import build_icon, translate, SpellTextEdit from openlp.core.lib import build_icon, translate, SpellTextEdit
from openlp.core.lib.ui import create_button_box, UiStrings from openlp.core.lib.ui import create_button_box, UiStrings

2
openlp/plugins/songs/lib/xml.py
View File

@ -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()