From b90169a1293da9de828bbc3a2d73702311a98aa1 Mon Sep 17 00:00:00 2001 From: Tim Bentley Date: Fri, 26 Mar 2010 21:04:50 +0000 Subject: [PATCH] Song editing improvements --- openlp/plugins/songs/forms/editverseform.py | 35 ++++++++++++++++----- 1 file changed, 28 insertions(+), 7 deletions(-) diff --git a/openlp/plugins/songs/forms/editverseform.py b/openlp/plugins/songs/forms/editverseform.py index 7fdea7e8f..f6ace12aa 100644 --- a/openlp/plugins/songs/forms/editverseform.py +++ b/openlp/plugins/songs/forms/editverseform.py @@ -54,25 +54,46 @@ class EditVerseForm(QtGui.QDialog, Ui_EditVerseDialog): QtCore.SIGNAL(u'activated(int)'), self.onVerseComboChanged) def onAddIntro(self): - self.VerseTextEdit.insertPlainText(u'---[Intro:1]---') + self.VerseTextEdit.insertPlainText(u'---[%s:1]---\n' + % self.trUtf8('Intro')) + self.VerseTextEdit.moveCursor(QtGui.QTextCursor.Down) + self.VerseTextEdit.setFocus() def onAddEnding(self): - self.VerseTextEdit.insertPlainText(u'---[Ending:1]---') + self.VerseTextEdit.insertPlainText(u'---[%s:1]---\n' + % self.trUtf8('Ending')) + self.VerseTextEdit.moveCursor(QtGui.QTextCursor.Down) + self.VerseTextEdit.setFocus() def onAddOther(self): - self.VerseTextEdit.insertPlainText(u'---[Other:1]---') + self.VerseTextEdit.insertPlainText(u'---[%s:1]---\n' + % self.trUtf8('Other')) + self.VerseTextEdit.moveCursor(QtGui.QTextCursor.Down) + self.VerseTextEdit.setFocus() def onAddPreChorus(self): - self.VerseTextEdit.insertPlainText(u'---[PreChorus:1]---') + self.VerseTextEdit.insertPlainText(u'---[%s:1]---\n' + % self.trUtf8('Pre-Chorus')) + self.VerseTextEdit.moveCursor(QtGui.QTextCursor.Down) + self.VerseTextEdit.setFocus() def onAddBridge(self): - self.VerseTextEdit.insertPlainText(u'---[Bridge:1]---') + self.VerseTextEdit.insertPlainText(u'---[%s:1]---\n' + % self.trUtf8('Bridge')) + self.VerseTextEdit.moveCursor(QtGui.QTextCursor.Down) + self.VerseTextEdit.setFocus() def onAddChorus(self): - self.VerseTextEdit.insertPlainText(u'---[Chorus:1]---') + self.VerseTextEdit.insertPlainText(u'---[%s:1]---\n' + % self.trUtf8('Chorus')) + self.VerseTextEdit.moveCursor(QtGui.QTextCursor.Down) + self.VerseTextEdit.setFocus() def onAddVerse(self): - self.VerseTextEdit.insertPlainText(u'---[Verse:1]---') + self.VerseTextEdit.insertPlainText(u'---[%s:1]---\n' + % self.trUtf8('Verse')) + self.VerseTextEdit.moveCursor(QtGui.QTextCursor.Down) + self.VerseTextEdit.setFocus() def setVerse(self, text, verseCount=0, single=False, tag=u'Verse:1'): posVerse = 0