openlp-core team mailing list archive

[Raoul Snyman <raoul.snyman@xxxxxxxxxxxxxxxxxxxxxxxx>]

Raoul Snyman has proposed merging lp:~raoul-snyman/openlp/rename-split into lp:openlp.

Requested reviews:
  Andreas Preikschat (googol)
  Tim Bentley (trb143)

For more details, see:
https://code.launchpad.net/~raoul-snyman/openlp/rename-split/+merge/102634

Changed the "Split" button to say "Optional Split" instead.
-- 
https://code.launchpad.net/~raoul-snyman/openlp/rename-split/+merge/102634
Your team OpenLP Core is subscribed to branch lp:openlp.

=== modified file 'openlp/core/lib/renderer.py'
--- openlp/core/lib/renderer.py	2012-03-21 22:27:04 +0000
+++ openlp/core/lib/renderer.py	2012-04-19 06:31:21 +0000
@@ -236,18 +236,18 @@
                     # 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'<br>')
                     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:

=== modified file 'openlp/core/lib/ui.py'
--- openlp/core/lib/ui.py	2012-04-04 07:26:51 +0000
+++ openlp/core/lib/ui.py	2012-04-19 06:31:21 +0000
@@ -124,7 +124,7 @@
         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'))

=== modified file 'openlp/plugins/custom/forms/editcustomslideform.py'
--- openlp/plugins/custom/forms/editcustomslideform.py	2012-04-03 17:59:34 +0000
+++ openlp/plugins/custom/forms/editcustomslideform.py	2012-04-19 06:31:21 +0000
@@ -77,7 +77,7 @@
 
     def onSplitButtonClicked(self):
         """
-        Adds a virtual split at cursor.
+        Adds an optional split at cursor.
         """
         self.insertSingleLineTextAtCursor(u'[---]')
         self.slideTextEdit.setFocus()

=== modified file 'openlp/plugins/songs/forms/editversedialog.py'
--- openlp/plugins/songs/forms/editversedialog.py	2012-04-01 22:44:09 +0000
+++ openlp/plugins/songs/forms/editversedialog.py	2012-04-19 06:31:21 +0000
@@ -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

=== modified file 'openlp/plugins/songs/lib/xml.py'
--- openlp/plugins/songs/lib/xml.py	2012-03-11 16:03:18 +0000
+++ openlp/plugins/songs/lib/xml.py	2012-04-19 06:31:21 +0000
@@ -697,7 +697,7 @@
                 # 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()