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

Added warning message about missing song key

Browse Source
This commit is contained in:
STEPHANVS 2022-02-06 01:07:48 +01:00
parent 0bf49685b9
commit 20aa191337
No known key found for this signature in database
GPG Key ID: 4EFE47E471FD62A9
2 changed files with 34 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
openlp/plugins/songs/forms/editversedialog.py
View File

@ -69,7 +69,8 @@ class Ui_EditVerseDialog(object):
self.verse_type_layout.addStretch() self.verse_type_layout.addStretch()
self.dialog_layout.addLayout(self.verse_type_layout) self.dialog_layout.addLayout(self.verse_type_layout)
if Registry().get('settings').value('songs/enable chords'): if Registry().get('settings').value('songs/enable chords'):
self.transpose_layout = QtWidgets.QHBoxLayout() self.transpose_widget = QtWidgets.QWidget()
self.transpose_layout = QtWidgets.QHBoxLayout(self.transpose_widget)
self.transpose_layout.setObjectName('transpose_layout') self.transpose_layout.setObjectName('transpose_layout')
self.transpose_label = QtWidgets.QLabel(edit_verse_dialog) self.transpose_label = QtWidgets.QLabel(edit_verse_dialog)
self.transpose_label.setObjectName('transpose_label') self.transpose_label.setObjectName('transpose_label')
@ -82,7 +83,8 @@ class Ui_EditVerseDialog(object):
self.transpose_down_button.setIcon(UiIcons().arrow_down) self.transpose_down_button.setIcon(UiIcons().arrow_down)
self.transpose_down_button.setObjectName('transpose_down') self.transpose_down_button.setObjectName('transpose_down')
self.transpose_layout.addWidget(self.transpose_down_button) self.transpose_layout.addWidget(self.transpose_down_button)
self.dialog_layout.addLayout(self.transpose_layout) #self.dialog_layout.addLayout(self.transpose_layout)
self.dialog_layout.addWidget(self.transpose_widget)
self.button_box = create_button_box(edit_verse_dialog, 'button_box', ['cancel', 'ok']) self.button_box = create_button_box(edit_verse_dialog, 'button_box', ['cancel', 'ok'])
self.dialog_layout.addWidget(self.button_box) self.dialog_layout.addWidget(self.button_box)
self.retranslate_ui(edit_verse_dialog) self.retranslate_ui(edit_verse_dialog)

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

@ -21,6 +21,7 @@
import logging import logging
import re import re
from warnings import WarningMessage
from PyQt5 import QtCore, QtGui, QtWidgets from PyQt5 import QtCore, QtGui, QtWidgets
@ -116,14 +117,22 @@ class EditVerseForm(QtWidgets.QDialog, Ui_EditVerseDialog):
The cursor position has been changed The cursor position has been changed
""" """
self.update_suggested_verse_number() self.update_suggested_verse_number()
def on_transpose_up_button_clicked(self): def on_transpose_up_button_clicked(self):
""" """
The transpose up button clicked The transpose up button clicked
""" """
try: try:
lyrics_stripped = re.sub(r'\[---\]',"\n", re.sub(r'---\[.*?\]---', "\n", re.sub(r'\[--}{--\]', "\n",
self.verse_text_edit.toPlainText())))
transposed_lyrics = transpose_lyrics(self.verse_text_edit.toPlainText(), 1) transposed_lyrics = transpose_lyrics(self.verse_text_edit.toPlainText(), 1)
self.verse_text_edit.setPlainText(transposed_lyrics) self.verse_text_edit.setPlainText(transposed_lyrics)
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]'))
except KeyError as ke: except KeyError as ke:
# Transposing failed # Transposing failed
critical_error_message_box(title=translate('SongsPlugin.EditVerseForm', 'Transposing failed'), critical_error_message_box(title=translate('SongsPlugin.EditVerseForm', 'Transposing failed'),
@ -131,16 +140,26 @@ class EditVerseForm(QtWidgets.QDialog, Ui_EditVerseDialog):
'Transposing failed because of invalid chord:\n{err_msg}' 'Transposing failed because of invalid chord:\n{err_msg}'
.format(err_msg=ke))) .format(err_msg=ke)))
return return
self.verse_text_edit.setPlainText(transposed_lyrics)
self.verse_text_edit.setFocus() self.verse_text_edit.setFocus()
self.verse_text_edit.moveCursor(QtGui.QTextCursor.End) self.verse_text_edit.moveCursor(QtGui.QTextCursor.End)
def on_transpose_down_button_clicked(self): def on_transpose_down_button_clicked(self):
""" """
The transpose down button clicked The transpose down button clicked
""" """
try: try:
lyrics_stripped = re.sub(r'\[---\]',"\n", re.sub(r'---\[.*?\]---', "\n", re.sub(r'\[--}{--\]', "\n",
self.verse_text_edit.toPlainText())))
transposed_lyrics = transpose_lyrics(self.verse_text_edit.toPlainText(), -1) transposed_lyrics = transpose_lyrics(self.verse_text_edit.toPlainText(), -1)
self.verse_text_edit.setPlainText(transposed_lyrics) self.verse_text_edit.setPlainText(transposed_lyrics)
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]'))
except KeyError as ke: except KeyError as ke:
# Transposing failed # Transposing failed
critical_error_message_box(title=translate('SongsPlugin.EditVerseForm', 'Transposing failed'), critical_error_message_box(title=translate('SongsPlugin.EditVerseForm', 'Transposing failed'),
@ -197,12 +216,14 @@ class EditVerseForm(QtWidgets.QDialog, Ui_EditVerseDialog):
self.verse_type_combo_box.setCurrentIndex(verse_type_index) self.verse_type_combo_box.setCurrentIndex(verse_type_index)
self.verse_number_box.setValue(int(verse_number)) self.verse_number_box.setValue(int(verse_number))
self.insert_button.setVisible(False) self.insert_button.setVisible(False)
self.transpose_widget.setVisible(False)
else: else:
if not text: if not text:
text = '---[{tag}:1]---\n'.format(tag=VerseType.translated_names[VerseType.Verse]) text = '---[{tag}:1]---\n'.format(tag=VerseType.translated_names[VerseType.Verse])
self.verse_type_combo_box.setCurrentIndex(0) self.verse_type_combo_box.setCurrentIndex(0)
self.verse_number_box.setValue(1) self.verse_number_box.setValue(1)
self.insert_button.setVisible(True) self.insert_button.setVisible(True)
self.transpose_widget.setVisible(True)
self.verse_text_edit.setPlainText(text) self.verse_text_edit.setPlainText(text)
self.verse_text_edit.setFocus() self.verse_text_edit.setFocus()
self.verse_text_edit.moveCursor(QtGui.QTextCursor.End) self.verse_text_edit.moveCursor(QtGui.QTextCursor.End)
@ -233,6 +254,14 @@ 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: