openlp-core team mailing list archive

[Andreas Preikschat <andreaspreikschat@xxxxxxxxxx>]

Andreas Preikschat has proposed merging lp:~googol/openlp/bug-1170435-2 into lp:openlp/2.0.

Requested reviews:
  Raoul Snyman (raoul-snyman): response to comment
  Tim Bentley (trb143)
Related bugs:
  Bug #1170435 in OpenLP: "We should not warn when verse order is empty"
  https://bugs.launchpad.net/openlp/+bug/1170435

For more details, see:
https://code.launchpad.net/~googol/openlp/bug-1170435-2/+merge/169697

Hello,

- fixes bug #1170435 (We should not warn when verse order is empty)
-- 
https://code.launchpad.net/~googol/openlp/bug-1170435-2/+merge/169697
Your team OpenLP Core is subscribed to branch lp:openlp/2.0.

=== modified file 'openlp/plugins/songs/forms/editsongdialog.py'
--- openlp/plugins/songs/forms/editsongdialog.py	2012-12-30 19:41:24 +0000
+++ openlp/plugins/songs/forms/editsongdialog.py	2013-06-16 17:22:28 +0000
@@ -283,7 +283,6 @@
         self.bottomLayout.setObjectName(u'bottomLayout')
         self.warningLabel = QtGui.QLabel(editSongDialog)
         self.warningLabel.setObjectName(u'warningLabel')
-        self.warningLabel.setVisible(False)
         self.bottomLayout.addWidget(self.warningLabel)
         self.buttonBox = create_button_box(editSongDialog, u'buttonBox',
             [u'cancel', u'save'])
@@ -355,9 +354,10 @@
             translate('SongsPlugin.EditSongForm', '&Remove'))
         self.audioRemoveAllButton.setText(
             translate('SongsPlugin.EditSongForm', 'Remove &All'))
-        self.warningLabel.setText(
-            translate('SongsPlugin.EditSongForm', '<strong>Warning:</strong>'
-                ' Not all of the verses are in use.'))
+        self.notAlllVersesUsed = translate('SongsPlugin.EditSongForm', '<strong>Warning:</strong>'
+                ' Not all of the verses are in use.')
+        self.noVerseOrder = translate('SongsPlugin.EditSongForm', '<strong>Warning:</strong>'
+                ' You have not entered a verse order.')
 
 def editSongDialogComboBox(parent, name):
     """

=== modified file 'openlp/plugins/songs/forms/editsongform.py'
--- openlp/plugins/songs/forms/editsongform.py	2013-03-04 20:49:55 +0000
+++ openlp/plugins/songs/forms/editsongform.py	2013-06-16 17:22:28 +0000
@@ -349,6 +349,8 @@
         self.titleEdit.setFocus(QtCore.Qt.OtherFocusReason)
         # Hide or show the preview button.
         self.previewButton.setVisible(preview)
+        # Check if all verse tags are used.
+        self.onVerseOrderTextChanged(self.verseOrderEdit.text())
 
     def tagRows(self):
         """
@@ -608,7 +610,12 @@
         for verse in verses:
             if not verse in order:
                 verses_not_used.append(verse)
-        self.warningLabel.setVisible(len(verses_not_used) > 0)
+        label_text = u''
+        if not self.verseOrderEdit.text():
+            label_text = self.noVerseOrder
+        elif verses_not_used:
+            label_text = self.notAlllVersesUsed
+        self.warningLabel.setText(label_text)
 
     def __extractVerseOrder(self, verse_order):
         order = []