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:
  OpenLP Core (openlp-core)
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/159689

Hello,

- fixes bug #1170435 (We should not warn when verse order is empty)
-- 
https://code.launchpad.net/~googol/openlp/bug-1170435-2/+merge/159689
Your team OpenLP Core is requested to review the proposed merge of lp:~googol/openlp/bug-1170435-2 into lp:openlp/2.0.

=== 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-04-18 17:56:45 +0000
@@ -608,7 +608,7 @@
         for verse in verses:
             if not verse in order:
                 verses_not_used.append(verse)
-        self.warningLabel.setVisible(len(verses_not_used) > 0)
+        self.warningLabel.setVisible(len(verses_not_used) > 0 and bool(text))
 
     def __extractVerseOrder(self, verse_order):
         order = []