Merge lp:~googol-deactivatedaccount/openlp/bug-1170435-2 into lp:openlp/2.0

[Andreas Preikschat]

Hello,

- fixes bug #1170435 (We should not warn when verse order is empty)

[Raoul Snyman (raoul-snyman)]

I disagree. We WILL have users who forget to set a verse order and then complain in the forums and log bugs about it.

If you want to do something like this, make it optional and turn the warning on by default.

review: Disapprove

[Tim Bentley (trb143)]

review: Approve

[Andreas Preikschat (googol-deactivatedaccount)]

> I disagree. We WILL have users who forget to set a verse order and then
> complain in the forums and log bugs about it.

Or the think that they must enter a verse order.

[Andreas Preikschat (googol-deactivatedaccount)]

The verse order is optional. If people forget to add it, then they will not see the warning. If we want that people do not forget we need a dialog. And as this is optional this is a no-go. We also do not have a warning that the alternate title is not set or whatever is not set.

[Raoul Snyman (raoul-snyman)]

Yes, but the alternate title has no effect on how their song is displayed.

Like I said, if people want to get rid of the warning, make an option. The majority of our users will need it turned on.

[Andreas Preikschat (googol-deactivatedaccount)]

> Like I said, if people want to get rid of the warning, make an option. The
> majority of our users will need it turned on.
I think an option is overkill. We could just use another text to display: "The verse order is empty" or something similar.

[Raoul Snyman (raoul-snyman)]

Yes, a different warning is fine.

[Tim Bentley (trb143)]

review: Approve

=== 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 = []