From 70d75b0f80d10944a356be72f6a9406eedbfa6a7 Mon Sep 17 00:00:00 2001 From: Raoul Snyman Date: Fri, 13 Apr 2012 22:08:05 +0200 Subject: [PATCH 1/2] Removed an unused import. Changed the "Split" button to say "Optional Split" instead. --- openlp/core/lib/ui.py | 2 +- openlp/plugins/songs/forms/editversedialog.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/openlp/core/lib/ui.py b/openlp/core/lib/ui.py index 7f411f3dc..1117c01a0 100644 --- a/openlp/core/lib/ui.py +++ b/openlp/core/lib/ui.py @@ -124,7 +124,7 @@ class UiStrings(object): self.Settings = translate('OpenLP.Ui', 'Settings') self.SaveService = translate('OpenLP.Ui', 'Save 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 ' 'only if it does not fit on the screen as one slide.') self.StartTimeCode = unicode(translate('OpenLP.Ui', 'Start %s')) diff --git a/openlp/plugins/songs/forms/editversedialog.py b/openlp/plugins/songs/forms/editversedialog.py index 062d81d7f..fb5698c88 100644 --- a/openlp/plugins/songs/forms/editversedialog.py +++ b/openlp/plugins/songs/forms/editversedialog.py @@ -25,7 +25,7 @@ # 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.ui import create_button_box, UiStrings From 489f19cf39c216c3a076bf0b1c7a1a2aff2cee18 Mon Sep 17 00:00:00 2001 From: Raoul Snyman Date: Wed, 18 Apr 2012 23:55:44 +0200 Subject: [PATCH 2/2] Renamed all instances (i.e. comments) of 'virtual' to 'optional' --- openlp/core/lib/renderer.py | 10 +++++----- openlp/plugins/custom/forms/editcustomslideform.py | 2 +- openlp/plugins/songs/lib/xml.py | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/openlp/core/lib/renderer.py b/openlp/core/lib/renderer.py index 8da5967a1..585915bd5 100644 --- a/openlp/core/lib/renderer.py +++ b/openlp/core/lib/renderer.py @@ -236,18 +236,18 @@ class Renderer(object): # the first two slides (and neglect the last for now). if len(slides) == 3: html_text = expand_tags(u'\n'.join(slides[:2])) - # We check both slides to determine if the virtual break is - # needed (there is only one virtual break). + # We check both slides to determine if the optional break is + # needed (there is only one optional break). else: html_text = expand_tags(u'\n'.join(slides)) html_text = html_text.replace(u'\n', u'
') 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 [---]. text = text.replace(u'\n[---]', u'', 1) else: - # The first virtual slide fits, which means we have to - # render the first virtual slide. + # The first optional slide fits, which means we have to + # render the first optional slide. text_contains_break = u'[---]' in text if text_contains_break: try: diff --git a/openlp/plugins/custom/forms/editcustomslideform.py b/openlp/plugins/custom/forms/editcustomslideform.py index ad9f9391b..8f00058d9 100644 --- a/openlp/plugins/custom/forms/editcustomslideform.py +++ b/openlp/plugins/custom/forms/editcustomslideform.py @@ -77,7 +77,7 @@ class EditCustomSlideForm(QtGui.QDialog, Ui_CustomSlideEditDialog): def onSplitButtonClicked(self): """ - Adds a virtual split at cursor. + Adds an optional split at cursor. """ self.insertSingleLineTextAtCursor(u'[---]') self.slideTextEdit.setFocus() diff --git a/openlp/plugins/songs/lib/xml.py b/openlp/plugins/songs/lib/xml.py index abbc58bfc..88fd55789 100644 --- a/openlp/plugins/songs/lib/xml.py +++ b/openlp/plugins/songs/lib/xml.py @@ -697,7 +697,7 @@ class OpenLyrics(object): # Append text from "lines" element to verse text. text += self._process_verse_lines(lines, 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: text += u'\n[---]' verse_def = verse.get(u'name', u' ').lower()