forked from openlp/openlp
added second warning
This commit is contained in:
parent
fd48e98598
commit
1b7d5f2f0e
@ -283,7 +283,6 @@ class Ui_EditSongDialog(object):
|
||||
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 @@ class Ui_EditSongDialog(object):
|
||||
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):
|
||||
"""
|
||||
|
@ -349,6 +349,8 @@ class EditSongForm(QtGui.QDialog, Ui_EditSongDialog):
|
||||
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 @@ class EditSongForm(QtGui.QDialog, Ui_EditSongDialog):
|
||||
for verse in verses:
|
||||
if not verse in order:
|
||||
verses_not_used.append(verse)
|
||||
self.warningLabel.setVisible(len(verses_not_used) > 0 and bool(text))
|
||||
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 = []
|
||||
|
Loading…
Reference in New Issue
Block a user