openlp-core team mailing list archive

[mmj <meinert@xxxxxx>]

mmj has proposed merging lp:~m2j/openlp/work into lp:openlp.

Requested reviews:
  OpenLP Core (openlp-core)


Fix the author search again (you can't replace strings in QString with a %).
-- 
https://code.launchpad.net/~m2j/openlp/work/+merge/26895
Your team OpenLP Core is requested to review the proposed merge of lp:~m2j/openlp/work into lp:openlp.

=== modified file 'openlp/plugins/images/lib/mediaitem.py'
--- openlp/plugins/images/lib/mediaitem.py	2010-05-29 19:50:50 +0000
+++ openlp/plugins/images/lib/mediaitem.py	2010-06-06 23:46:22 +0000
@@ -60,8 +60,11 @@
 
     def retranslateUi(self):
         self.OnNewPrompt = self.trUtf8('Select Image(s)')
-        self.OnNewFileMasks = self.trUtf8(
-            'Images (*.jpg *.jpeg *.gif *.png *.bmp);; All files (*)')
+        file_formats = u''
+        for file_format in QtGui.QImageReader.supportedImageFormats():
+            file_formats += u'*.%s ' % file_format
+        self.OnNewFileMasks = unicode(
+            self.trUtf8('Images (%s);; All files (*)')) % file_formats
 
     def requiredIcons(self):
         MediaManagerItem.requiredIcons(self)

=== modified file 'openlp/plugins/songs/forms/editverseform.py'
--- openlp/plugins/songs/forms/editverseform.py	2010-06-06 07:28:07 +0000
+++ openlp/plugins/songs/forms/editverseform.py	2010-06-06 23:46:22 +0000
@@ -103,8 +103,10 @@
         if match:
             verse_type = match.group(1)
             verse_number = int(match.group(2))
-            self.VerseTypeComboBox.setCurrentIndex(VerseType.from_string(verse_type))
-            self.VerseNumberBox.setValue(verse_number)
+            verse_type_index = VerseType.from_string(verse_type)
+            if verse_type_index:
+                self.VerseTypeComboBox.setCurrentIndex(verse_type_index)
+                self.VerseNumberBox.setValue(verse_number)
 
     def setVerse(self, text, single=False,
         tag=u'%s:1' % VerseType.to_string(VerseType.Verse)):

=== modified file 'openlp/plugins/songs/lib/mediaitem.py'
--- openlp/plugins/songs/lib/mediaitem.py	2010-06-06 16:25:39 +0000
+++ openlp/plugins/songs/lib/mediaitem.py	2010-06-06 23:46:22 +0000
@@ -198,8 +198,8 @@
         self.ListView.clear()
         for author in searchresults:
             for song in author.songs:
-                song_detail = unicode(self.trUtf8('%s (%s)') %
-                    (author.display_name, song.title))
+                song_detail = unicode(self.trUtf8('%s (%s)')) % \
+                    (author.display_name, song.title)
                 song_name = QtGui.QListWidgetItem(song_detail)
                 song_name.setData(QtCore.Qt.UserRole, QtCore.QVariant(song.id))
                 self.ListView.addItem(song_name)