From 761f30ec003d51a0b338f88f66d70a1ab97bea15 Mon Sep 17 00:00:00 2001 From: M2j Date: Sun, 6 Jun 2010 21:56:41 +0200 Subject: [PATCH 1/4] fix: set editverseform comboBox only for valid verse names --- openlp/plugins/songs/forms/editverseform.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/openlp/plugins/songs/forms/editverseform.py b/openlp/plugins/songs/forms/editverseform.py index eb74cfd84..9033267cd 100644 --- a/openlp/plugins/songs/forms/editverseform.py +++ b/openlp/plugins/songs/forms/editverseform.py @@ -103,8 +103,10 @@ class EditVerseForm(QtGui.QDialog, Ui_EditVerseDialog): 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)): From 69608de08c6f60b00ec0dc75000505375b2cc00d Mon Sep 17 00:00:00 2001 From: M2j Date: Mon, 7 Jun 2010 01:23:29 +0200 Subject: [PATCH 2/4] fix: bug introduced in 833 --- openlp/plugins/songs/lib/mediaitem.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/openlp/plugins/songs/lib/mediaitem.py b/openlp/plugins/songs/lib/mediaitem.py index 25b8a7d8d..f400d865d 100644 --- a/openlp/plugins/songs/lib/mediaitem.py +++ b/openlp/plugins/songs/lib/mediaitem.py @@ -198,8 +198,8 @@ class SongMediaItem(MediaManagerItem): 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) From 9bb7343092bd32c52ce9ebdb6be9fdb33e59b5fa Mon Sep 17 00:00:00 2001 From: Jon Tibble Date: Mon, 7 Jun 2010 00:24:45 +0100 Subject: [PATCH 3/4] Fix incorrect exception --- openlp/core/lib/toolbar.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/openlp/core/lib/toolbar.py b/openlp/core/lib/toolbar.py index 12916097e..799852908 100644 --- a/openlp/core/lib/toolbar.py +++ b/openlp/core/lib/toolbar.py @@ -120,7 +120,7 @@ class OpenLPToolbar(QtGui.QToolBar): try: if self.icons[title]: return self.icons[title] - except NameError: + except KeyError: log.exception(u'getIconFromTitle - no icon for %s' % title) return QtGui.QIcon() From d7a84fb5920847069334303bdb84bfcd3117b7d3 Mon Sep 17 00:00:00 2001 From: M2j Date: Mon, 7 Jun 2010 01:40:24 +0200 Subject: [PATCH 4/4] derive captable image formats from Qt --- openlp/plugins/images/lib/mediaitem.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/openlp/plugins/images/lib/mediaitem.py b/openlp/plugins/images/lib/mediaitem.py index e432e5c61..081671fa9 100644 --- a/openlp/plugins/images/lib/mediaitem.py +++ b/openlp/plugins/images/lib/mediaitem.py @@ -60,8 +60,11 @@ class ImageMediaItem(MediaManagerItem): 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)