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

Small fixes

Browse Source
This commit is contained in:
Tomas Groth 2016-06-08 21:06:04 +02:00
parent fe8aa2a9e3
commit 805b7a83eb
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -103,6 +103,8 @@ class EditVerseForm(QtWidgets.QDialog, Ui_EditVerseDialog):
""" """
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)
self.verse_text_edit.setFocus()
self.verse_text_edit.moveCursor(QtGui.QTextCursor.End)
def on_transepose_down_button_clicked(self): def on_transepose_down_button_clicked(self):
""" """
@ -110,6 +112,8 @@ class EditVerseForm(QtWidgets.QDialog, Ui_EditVerseDialog):
""" """
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)
self.verse_text_edit.setFocus()
self.verse_text_edit.moveCursor(QtGui.QTextCursor.End)
def update_suggested_verse_number(self): def update_suggested_verse_number(self):
""" """

5
openlp/plugins/songs/lib/__init__.py
View File

@ -619,15 +619,10 @@ def transpose_chord(chord, transpose_value, notation):
notes_flat_notation['neo-latin'] = ['Do','Reb','Re','Mib','Fab','Fa','Solb','Sol','Lab','La','Sib','Si'] notes_flat_notation['neo-latin'] = ['Do','Reb','Re','Mib','Fab','Fa','Solb','Sol','Lab','La','Sib','Si']
chord_split = chord.replace('♭', 'b').split('/[\/\(\)]/') chord_split = chord.replace('♭', 'b').split('/[\/\(\)]/')
transposed_chord = '' transposed_chord = ''
note = ''
notenumber = -1
rest = ''
current_chord = ''
last_chord = '' last_chord = ''
notes_sharp = notes_sharp_notation[notation] notes_sharp = notes_sharp_notation[notation]
notes_flat = notes_flat_notation[notation] notes_flat = notes_flat_notation[notation]
notes_preferred = ['b','#','#','#','#','#','#','#','#','#','#','#'] notes_preferred = ['b','#','#','#','#','#','#','#','#','#','#','#']
chord_notes = []
for i in range(0, len(chord_split)): for i in range(0, len(chord_split)):
if i > 0: if i > 0:
transposed_chord += '/' transposed_chord += '/'