From 5b9229777d197ec2b4e2f1cb54e0cfd4c46b36ff Mon Sep 17 00:00:00 2001 From: Tim Bentley Date: Sun, 4 Apr 2010 14:16:01 +0100 Subject: [PATCH] fixes --- openlp/core/ui/servicemanager.py | 3 ++- openlp/plugins/songs/forms/editverseform.py | 12 ++++++------ 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/openlp/core/ui/servicemanager.py b/openlp/core/ui/servicemanager.py index d7acbdf4f..2b6de7d3b 100644 --- a/openlp/core/ui/servicemanager.py +++ b/openlp/core/ui/servicemanager.py @@ -235,7 +235,8 @@ class ServiceManager(QtGui.QWidget): self.notesAction.setVisible(False) if serviceItem[u'service_item'].is_capable(ItemCapabilities.AllowsEdit): self.editAction.setVisible(True) - if serviceItem[u'service_item'].is_capable(ItemCapabilities.AllowsMaintain): + if serviceItem[u'service_item'].\ + is_capable(ItemCapabilities.AllowsMaintain): self.maintainAction.setVisible(True) if item.parent() is None: self.notesAction.setVisible(True) diff --git a/openlp/plugins/songs/forms/editverseform.py b/openlp/plugins/songs/forms/editverseform.py index 326946bc4..b2e3f35b9 100644 --- a/openlp/plugins/songs/forms/editverseform.py +++ b/openlp/plugins/songs/forms/editverseform.py @@ -59,27 +59,27 @@ class EditVerseForm(QtGui.QDialog, Ui_EditVerseDialog): def onAddIntro(self): self.startNewLine() - self.VerseTextEdit.insertPlainText(u'---[Intro:1]---\n') + self.VerseTextEdit.insertPlainText(u'---[Intro]---\n') self.VerseTextEdit.setFocus() def onAddEnding(self): self.startNewLine() - self.VerseTextEdit.insertPlainText(u'---[Ending:1]---\n') + self.VerseTextEdit.insertPlainText(u'---[Ending]---\n') self.VerseTextEdit.setFocus() def onAddOther(self): self.startNewLine() - self.VerseTextEdit.insertPlainText(u'---[Other:1]---\n') + self.VerseTextEdit.insertPlainText(u'---[Other]---\n') self.VerseTextEdit.setFocus() def onAddPreChorus(self): self.startNewLine() - self.VerseTextEdit.insertPlainText(u'---[Pre-Chorus:1]---\n') + self.VerseTextEdit.insertPlainText(u'---[Pre-Chorus]---\n') self.VerseTextEdit.setFocus() def onAddBridge(self): self.startNewLine() - self.VerseTextEdit.insertPlainText(u'---[Bridge:1]---\n') + self.VerseTextEdit.insertPlainText(u'---[Bridge]---\n') self.VerseTextEdit.setFocus() def onAddChorus(self): @@ -148,7 +148,7 @@ class EditVerseForm(QtGui.QDialog, Ui_EditVerseDialog): def getVerseAll(self): text = self.VerseTextEdit.toPlainText() if not text.startsWith(u'---['): - text = u'---[%s:1]---\n%s' % (self.trUtf8('Verse'), text) + text = u'---[Verse:1]---\n%s' % text return text def onVerseComboChanged(self, id):