raoul/openlp
1
0
Fork 0
forked from openlp/openlp
Code Issues Pull Requests Projects Releases Wiki Activity

Consolidate song key check/warning message

Browse Source
This commit is contained in:
STEPHANVS 2022-02-14 14:44:08 +01:00
parent f75e8dddb4
commit c80d8fbcfb
No known key found for this signature in database
GPG Key ID: 4EFE47E471FD62A9
2 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
openlp/plugins/songs/forms/editsongform.py
View File

@ -245,14 +245,25 @@ class EditSongForm(QtWidgets.QDialog, Ui_EditSongDialog, RegistryProperties):
# Validate tags (lp#1199639) # Validate tags (lp#1199639)
misplaced_tags = [] misplaced_tags = []
verse_tags = [] verse_tags = []
chords = []
for i in range(self.verse_list_widget.rowCount()): for i in range(self.verse_list_widget.rowCount()):
item = self.verse_list_widget.item(i, 0) item = self.verse_list_widget.item(i, 0)
tags = self.find_tags.findall(item.text()) tags = self.find_tags.findall(item.text())
stripped_text = re.sub(r'\[---\]', "\n", re.sub(r'\[--}{--\]', "\n", item.text()))
r = re.compile('\[(.*?)\]')
for match in r.finditer(stripped_text):
chords += match[1]
field = item.data(QtCore.Qt.UserRole) field = item.data(QtCore.Qt.UserRole)
verse_tags.append(field) verse_tags.append(field)
if not self._validate_tags(tags): if not self._validate_tags(tags):
misplaced_tags.append('{field1} {field2}'.format(field1=VerseType.translated_name(field[0]), misplaced_tags.append('{field1} {field2}'.format(field1=VerseType.translated_name(field[0]),
field2=field[1:])) field2=field[1:]))
if Registry().get('settings').value('songs/enable chords') and not chords[0].startswith("="):
QtWidgets.QMessageBox.warning(self, translate('SongsPlugin.EditVerseForm', 'Song key warning'),
translate('SongsPlugin.EditVerseForm',
'No song key is present or song key is not the first '
'chord.\nFor optimal chord experience, please, include a '
'song key before any chord. Ex.: [=G]'))
if misplaced_tags: if misplaced_tags:
critical_error_message_box( critical_error_message_box(
message=translate('SongsPlugin.EditSongForm', message=translate('SongsPlugin.EditSongForm',

10
openlp/plugins/songs/forms/editverseform.py
View File

@ -250,16 +250,6 @@ class EditVerseForm(QtWidgets.QDialog, Ui_EditVerseDialog):
""" """
if Registry().get('settings').value('songs/enable chords'): if Registry().get('settings').value('songs/enable chords'):
try: try:
lyrics_stripped = re.sub(r'\[---\]', "\n",
re.sub(r'---\[.*?\]---', "\n",
re.sub(r'\[--}{--\]', "\n",
self.verse_text_edit.toPlainText())))
if not re.search(r'\[(.*?)\]', lyrics_stripped)[1].startswith("="):
QtWidgets.QMessageBox.warning(self, translate('SongsPlugin.EditVerseForm', 'Song key warning'),
translate('SongsPlugin.EditVerseForm',
'No song key is present or song key is not the first '
'chord.\nFor optimal chord experience, please, include a '
'song key before any chord. Ex.: [=G]'))
transpose_lyrics(self.verse_text_edit.toPlainText(), 0) transpose_lyrics(self.verse_text_edit.toPlainText(), 0)
super(EditVerseForm, self).accept() super(EditVerseForm, self).accept()
except KeyError as ke: except KeyError as ke: