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

pipeline fixes

Browse Source
This commit is contained in:
STEPHANVS 2022-02-06 01:37:30 +01:00
parent 3175824ac5
commit 93ed31e54d
No known key found for this signature in database
GPG Key ID: 4EFE47E471FD62A9
2 changed files with 16 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -83,7 +83,6 @@ 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.addWidget(self.transpose_widget) 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)

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

@ -21,7 +21,6 @@
import logging import logging
import re import re
from warnings import WarningMessage
from PyQt5 import QtCore, QtGui, QtWidgets from PyQt5 import QtCore, QtGui, QtWidgets
@ -117,22 +116,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", lyrics_stripped = re.sub(r'\[---\]', "\n", re.sub(r'---\[.*?\]---', "\n", re.sub(r'\[--}{--\]', "\n",
self.verse_text_edit.toPlainText()))) 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("="): if not re.search(r'\[(.*?)\]', lyrics_stripped)[1].startswith("="):
QtWidgets.QMessageBox.warning(self, translate('SongsPlugin.EditVerseForm', 'Song key warning'), QtWidgets.QMessageBox.warning(self, translate('SongsPlugin.EditVerseForm', 'Song key warning'),
translate('SongsPlugin.EditVerseForm', translate('SongsPlugin.EditVerseForm',
'No song key is present or song key is not the first ' 'No song key is present or song key is not the first '
'chord.\nFor optimal chord experience, please, include a ' 'chord.\nFor optimal chord experience, please, include a '
'song key before any chord. Ex.: [=G]')) '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'),
@ -144,22 +143,21 @@ class EditVerseForm(QtWidgets.QDialog, Ui_EditVerseDialog):
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", lyrics_stripped = re.sub(r'\[---\]', "\n", re.sub(r'---\[.*?\]---', "\n", re.sub(r'\[--}{--\]', "\n",
self.verse_text_edit.toPlainText()))) 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("="): if not re.search(r'\[(.*?)\]', lyrics_stripped)[1].startswith("="):
QtWidgets.QMessageBox.warning(self, translate('SongsPlugin.EditVerseForm', 'Song key warning'), QtWidgets.QMessageBox.warning(self, translate('SongsPlugin.EditVerseForm', 'Song key warning'),
translate('SongsPlugin.EditVerseForm', translate('SongsPlugin.EditVerseForm',
'No song key is present or song key is not the first ' 'No song key is present or song key is not the first '
'chord.\nFor optimal chord experience, please, include a ' 'chord.\nFor optimal chord experience, please, include a '
'song key before any chord. Ex.: [=G]')) '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'),
@ -254,11 +252,13 @@ 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", lyrics_stripped = re.sub(r'\[---\]', "\n",
self.verse_text_edit.toPlainText()))) re.sub(r'---\[.*?\]---', "\n",
re.sub(r'\[--}{--\]', "\n",
self.verse_text_edit.toPlainText())))
if not re.search(r'\[(.*?)\]', lyrics_stripped)[1].startswith("="): if not re.search(r'\[(.*?)\]', lyrics_stripped)[1].startswith("="):
QtWidgets.QMessageBox.warning(self, translate('SongsPlugin.EditVerseForm', 'Song key warning'), QtWidgets.QMessageBox.warning(self, translate('SongsPlugin.EditVerseForm', 'Song key warning'),
translate('SongsPlugin.EditVerseForm', translate('SongsPlugin.EditVerseForm',
'No song key is present or song key is not the first ' 'No song key is present or song key is not the first '
'chord.\nFor optimal chord experience, please, include a ' 'chord.\nFor optimal chord experience, please, include a '
'song key before any chord. Ex.: [=G]')) 'song key before any chord. Ex.: [=G]'))