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

More song tagging changes

Browse Source
This commit is contained in:
Tim Bentley 2009-11-23 17:28:21 +00:00
parent 50aa143446
commit 5e2beba4ea
2 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -322,10 +322,12 @@ class EditSongForm(QtGui.QDialog, Ui_EditSongDialog):
item = self.VerseListWidget.currentItem() item = self.VerseListWidget.currentItem()
if item: if item:
tempText = item.text() tempText = item.text()
verseId = unicode((item.data(QtCore.Qt.UserRole)).toString()[0]) verseId = unicode((item.data(QtCore.Qt.UserRole)).toString())
self.verse_form.setVerse(tempText, True, verseId) self.verse_form.setVerse(tempText, True, verseId)
self.verse_form.exec_() self.verse_form.exec_()
afterText = self.verse_form.getVerse() afterText, verse, subVerse = self.verse_form.getVerse()
data = u'%s%s' %(verse , subVerse)
item.setData(QtCore.Qt.UserRole, QtCore.QVariant(data))
item.setText(afterText) item.setText(afterText)
#number of lines has change #number of lines has change
if len(tempText.split(u'\n')) != len(afterText.split(u'\n')): if len(tempText.split(u'\n')) != len(afterText.split(u'\n')):

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

@ -30,13 +30,21 @@ class EditVerseForm(QtGui.QDialog, Ui_EditVerseDialog):
""" """
This is the form that is used to edit the verses of the song. This is the form that is used to edit the verses of the song.
""" """
def __init__(self, parent=None): def __init__(self, parent=None):
""" """
Constructor Constructor
""" """
QtGui.QDialog.__init__(self, parent) QtGui.QDialog.__init__(self, parent)
self.setupUi(self) self.setupUi(self)
QtCore.QObject.connect(self.VerseListComboBox,
QtCore.SIGNAL(u'activated(int)'), self.onVerseListComboBoxChanged)
def onVerseListComboBoxChanged(self, value):
if unicode(self.VerseListComboBox.currentText()).isdigit():
self.SubVerseListComboBox.setEnabled(True)
else:
self.SubVerseListComboBox.setCurrentIndex(0)
self.SubVerseListComboBox.setEnabled(False)
def setVerse(self, text, single=False, id=0): def setVerse(self, text, single=False, id=0):
posVerse = 0 posVerse = 0
@ -65,4 +73,6 @@ class EditVerseForm(QtGui.QDialog, Ui_EditVerseDialog):
self.VerseTextEdit.setFocus(QtCore.Qt.OtherFocusReason) self.VerseTextEdit.setFocus(QtCore.Qt.OtherFocusReason)
def getVerse(self): def getVerse(self):
return self.VerseTextEdit.toPlainText() return self.VerseTextEdit.toPlainText(), \
unicode(self.VerseListComboBox.currentText()), \
unicode(self.SubVerseListComboBox.currentText())