Merge from trunk

openlp/core/ui/slidecontroller.py

@@ -444,7 +444,7 @@ class SlideController(QtGui.QWidget):
                     tag = None
                     #If verse handle verse number else tag only
                     if bits[0] == self.trUtf8('Verse'):
-                        tag = u'%s%s' % (bits[0][0], bits[1][0] )
+                        tag = u'%s%s' % (bits[0][0], bits[1][0:] )
                     else:
                         tag = bits[0]
                     try:

openlp/plugins/presentations/lib/mediaitem.py

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

openlp/plugins/songs/forms/editsongform.py

@@ -316,13 +316,13 @@ class EditSongForm(QtGui.QDialog, Ui_EditSongDialog):
 
     def onVerseAddButtonClicked(self):
         self.verse_form.setVerse(u'', self.VerseListWidget.count() + 1, True)
-        self.verse_form.exec_()
-        afterText, verse, subVerse = self.verse_form.getVerse()
-        data = u'%s:%s' %(verse, subVerse)
-        item = QtGui.QListWidgetItem(afterText)
-        item.setData(QtCore.Qt.UserRole, QtCore.QVariant(data))
-        item.setText(afterText)
-        self.VerseListWidget.addItem(item)
+        if self.verse_form.exec_():
+            afterText, verse, subVerse = self.verse_form.getVerse()
+            data = u'%s:%s' %(verse, subVerse)
+            item = QtGui.QListWidgetItem(afterText)
+            item.setData(QtCore.Qt.UserRole, QtCore.QVariant(data))
+            item.setText(afterText)
+            self.VerseListWidget.addItem(item)
 
     def onVerseEditButtonClicked(self):
         item = self.VerseListWidget.currentItem()
@@ -331,25 +331,25 @@ class EditSongForm(QtGui.QDialog, Ui_EditSongDialog):
             verseId = unicode((item.data(QtCore.Qt.UserRole)).toString())
             self.verse_form.setVerse(tempText, \
                 self.VerseListWidget.count(), True, verseId)
-            self.verse_form.exec_()
-            afterText, verse, subVerse = self.verse_form.getVerse()
-            data = u'%s:%s' %(verse, subVerse)
-            item.setData(QtCore.Qt.UserRole, QtCore.QVariant(data))
-            item.setText(afterText)
-            #number of lines has change so repaint the list moving the data
-            if len(tempText.split(u'\n')) != len(afterText.split(u'\n')):
-                tempList = {}
-                tempId = {}
-                for row in range(0, self.VerseListWidget.count()):
-                    tempList[row] = self.VerseListWidget.item(row).text()
-                    tempId[row] = self.VerseListWidget.item(row).\
-                        data(QtCore.Qt.UserRole)
-                self.VerseListWidget.clear()
-                for row in range (0, len(tempList)):
-                    item = QtGui.QListWidgetItem(tempList[row])
-                    item.setData(QtCore.Qt.UserRole, tempId[row])
-                    self.VerseListWidget.addItem(item)
-                self.VerseListWidget.repaint()
+            if self.verse_form.exec_():
+                afterText, verse, subVerse = self.verse_form.getVerse()
+                data = u'%s:%s' %(verse, subVerse)
+                item.setData(QtCore.Qt.UserRole, QtCore.QVariant(data))
+                item.setText(afterText)
+                #number of lines has change so repaint the list moving the data
+                if len(tempText.split(u'\n')) != len(afterText.split(u'\n')):
+                    tempList = {}
+                    tempId = {}
+                    for row in range(0, self.VerseListWidget.count()):
+                        tempList[row] = self.VerseListWidget.item(row).text()
+                        tempId[row] = self.VerseListWidget.item(row).\
+                            data(QtCore.Qt.UserRole)
+                    self.VerseListWidget.clear()
+                    for row in range (0, len(tempList)):
+                        item = QtGui.QListWidgetItem(tempList[row])
+                        item.setData(QtCore.Qt.UserRole, tempId[row])
+                        self.VerseListWidget.addItem(item)
+                    self.VerseListWidget.repaint()
         self.VerseEditButton.setEnabled(False)
         self.VerseDeleteButton.setEnabled(False)
 
@@ -410,7 +410,7 @@ class EditSongForm(QtGui.QDialog, Ui_EditSongDialog):
             self.AuthorsListView.setFocus()
         #split the verse list by space and mark lower case for testing
         for verse in unicode(self.VerseOrderEdit.text()).lower().split(u' '):
-            if len(verse) == 2:
+            if len(verse) > 1:
                 if verse[0:1] == u'v' and verse[1:].isdigit():
                     pass
                 else:
@@ -533,4 +533,4 @@ class EditSongForm(QtGui.QDialog, Ui_EditSongDialog):
         self.song.search_title = self.song.search_title.replace(u'{', u'')
         self.song.search_title = self.song.search_title.replace(u'}', u'')
         self.song.search_title = self.song.search_title.replace(u'?', u'')
-        self.song.search_title = unicode(self.song.search_title)
+        self.song.search_title = unicode(self.song.search_title)

openlp/plugins/songs/lib/mediaitem.py

@@ -310,7 +310,7 @@ class SongMediaItem(MediaManagerItem):
                     for verse in verseList:
                         if verse[1]:
                             if verse[0][u'type'] == "Verse":
-                                if verse[0][u'label'][0] == order[1:]:
+                                if verse[0][u'label'] == order[1:]:
                                     verseTag = u'%s:%s' % \
                                         (verse[0][u'type'], verse[0][u'label'])
                                     service_item.add_from_text\

version.txt

@@ -1 +1 @@
-1.9.0-701
+1.9.0-703