From 6b881e312fa0097b0a03af1c78976095c73cbd10 Mon Sep 17 00:00:00 2001 From: Andreas Preikschat Date: Sun, 16 Jun 2013 19:28:44 +0200 Subject: [PATCH] added second error message --- openlp/plugins/songs/forms/editsongdialog.py | 7 ++++--- openlp/plugins/songs/forms/editsongform.py | 9 ++++++++- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/openlp/plugins/songs/forms/editsongdialog.py b/openlp/plugins/songs/forms/editsongdialog.py index 4bf2c91d9..19dad3eae 100644 --- a/openlp/plugins/songs/forms/editsongdialog.py +++ b/openlp/plugins/songs/forms/editsongdialog.py @@ -275,7 +275,6 @@ class Ui_EditSongDialog(object): self.bottom_layout.setObjectName(u'bottom_layout') self.warning_label = QtGui.QLabel(edit_song_dialog) self.warning_label.setObjectName(u'warning_label') - self.warning_label.setVisible(False) self.bottom_layout.addWidget(self.warning_label) self.button_box = create_button_box(edit_song_dialog, u'button_box', [u'cancel', u'save']) self.bottom_layout.addWidget(self.button_box) @@ -323,8 +322,10 @@ class Ui_EditSongDialog(object): self.from_media_button.setText(translate('SongsPlugin.EditSongForm', 'Add &Media')) self.audio_remove_button.setText(translate('SongsPlugin.EditSongForm', '&Remove')) self.audio_remove_all_button.setText(translate('SongsPlugin.EditSongForm', 'Remove &All')) - self.warning_label.setText( - translate('SongsPlugin.EditSongForm', 'Warning: Not all of the verses are in use.')) + self.not_all_verses_used_warning = \ + translate('SongsPlugin.EditSongForm', 'Warning: Not all of the verses are in use.') + self.no_verse_order_entered_warning = \ + translate('SongsPlugin.EditSongForm', 'Warning: You have not entered a verse order.') def create_combo_box(parent, name): diff --git a/openlp/plugins/songs/forms/editsongform.py b/openlp/plugins/songs/forms/editsongform.py index 81cfce2fd..79d6bdd76 100644 --- a/openlp/plugins/songs/forms/editsongform.py +++ b/openlp/plugins/songs/forms/editsongform.py @@ -456,6 +456,8 @@ class EditSongForm(QtGui.QDialog, Ui_EditSongDialog): self.title_edit.setFocus() # Hide or show the preview button. self.preview_button.setVisible(preview) + # Check if all verse tags are used. + self.on_verse_order_text_changed(self.verse_order_edit.text()) def tag_rows(self): """ @@ -697,7 +699,12 @@ class EditSongForm(QtGui.QDialog, Ui_EditSongDialog): for verse in verses: if not verse in order: verses_not_used.append(verse) - self.warning_label.setVisible(len(verses_not_used) > 0 and bool(text)) + label_text = u'' + if not self.verse_order_edit.text(): + label_text = self.no_verse_order_entered_warning + elif verses_not_used: + label_text = self.not_all_verses_used_warning + self.warning_label.setText(label_text) def on_copyright_insert_button_triggered(self): text = self.copyright_edit.text()