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

Fix Presentation file filter

Browse Source 
Fix Cancel for song verse editor

bzr-revno: 702
This commit is contained in:
Tim Bentley 2010-02-09 12:00:38 +00:00
commit 326ad6b7ff
3 changed files with 29 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
openlp/plugins/presentations/lib/mediaitem.py
View File

@ -68,7 +68,7 @@ class PresentationMediaItem(MediaManagerItem):
if self.controllers[controller].enabled: if self.controllers[controller].enabled:
for type in self.controllers[controller].supports: for type in self.controllers[controller].supports:
if fileType.find(type) == -1: if fileType.find(type) == -1:
fileType += type + u' ' fileType += u'*%s ' % type
self.OnNewFileMasks = self.trUtf8('Presentations (%s)' % fileType) self.OnNewFileMasks = self.trUtf8('Presentations (%s)' % fileType)
def requiredIcons(self): def requiredIcons(self):

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

@ -316,7 +316,7 @@ class EditSongForm(QtGui.QDialog, Ui_EditSongDialog):
def onVerseAddButtonClicked(self): def onVerseAddButtonClicked(self):
self.verse_form.setVerse(u'', self.VerseListWidget.count() + 1, True) self.verse_form.setVerse(u'', self.VerseListWidget.count() + 1, True)
self.verse_form.exec_() if self.verse_form.exec_():
afterText, verse, subVerse = self.verse_form.getVerse() afterText, verse, subVerse = self.verse_form.getVerse()
data = u'%s:%s' %(verse, subVerse) data = u'%s:%s' %(verse, subVerse)
item = QtGui.QListWidgetItem(afterText) item = QtGui.QListWidgetItem(afterText)
@ -331,7 +331,7 @@ class EditSongForm(QtGui.QDialog, Ui_EditSongDialog):
verseId = unicode((item.data(QtCore.Qt.UserRole)).toString()) verseId = unicode((item.data(QtCore.Qt.UserRole)).toString())
self.verse_form.setVerse(tempText, \ self.verse_form.setVerse(tempText, \
self.VerseListWidget.count(), True, verseId) self.VerseListWidget.count(), True, verseId)
self.verse_form.exec_() if self.verse_form.exec_():
afterText, verse, subVerse = self.verse_form.getVerse() afterText, verse, subVerse = self.verse_form.getVerse()
data = u'%s:%s' %(verse, subVerse) data = u'%s:%s' %(verse, subVerse)
item.setData(QtCore.Qt.UserRole, QtCore.QVariant(data)) item.setData(QtCore.Qt.UserRole, QtCore.QVariant(data))

2
version.txt
View File

@ -1 +1 @@
1.9.0-701 1.9.0-702