From 939909fdd808000a7b2e6486f8bec48e57b1bf09 Mon Sep 17 00:00:00 2001 From: Tim Bentley Date: Sun, 29 Nov 2009 21:03:24 +0000 Subject: [PATCH 1/4] Remove Timer from transitions not needed Add Code to use the Verse Order to expand songs --- openlp/core/ui/maindisplay.py | 3 --- openlp/plugins/songs/forms/editsongform.py | 2 +- openlp/plugins/songs/lib/mediaitem.py | 22 ++++++++++++++++++---- 3 files changed, 19 insertions(+), 8 deletions(-) diff --git a/openlp/core/ui/maindisplay.py b/openlp/core/ui/maindisplay.py index b7f5f31b6..4ba0f938a 100644 --- a/openlp/core/ui/maindisplay.py +++ b/openlp/core/ui/maindisplay.py @@ -198,13 +198,10 @@ class MainDisplay(DisplayWidget): elif not self.displayBlank: if transition: if self.hasTransition: - delay = 0.01 self.display.setPixmap(QtGui.QPixmap.fromImage(self.frame[u'trans'])) self.repaint() - time.sleep(delay) self.display.setPixmap(QtGui.QPixmap.fromImage(frame[u'trans'])) self.repaint() - time.sleep(delay) self.hasTransition = True self.display.setPixmap(QtGui.QPixmap.fromImage(frame[u'main'])) self.repaint() diff --git a/openlp/plugins/songs/forms/editsongform.py b/openlp/plugins/songs/forms/editsongform.py index 178531bed..b7103fd61 100644 --- a/openlp/plugins/songs/forms/editsongform.py +++ b/openlp/plugins/songs/forms/editsongform.py @@ -226,7 +226,7 @@ class EditSongForm(QtGui.QDialog, Ui_EditSongDialog): verses = self.song.lyrics.split(u'\n\n') for count, verse in enumerate(verses): item = QtGui.QListWidgetItem(verse) - variant = u'Verse:%s' % count + 1 + variant = u'Verse:%s' % unicode(count + 1) item.setData(QtCore.Qt.UserRole, QtCore.QVariant(variant)) self.VerseListWidget.addItem(item) # clear the results diff --git a/openlp/plugins/songs/lib/mediaitem.py b/openlp/plugins/songs/lib/mediaitem.py index 080b6ae35..04dae39fc 100644 --- a/openlp/plugins/songs/lib/mediaitem.py +++ b/openlp/plugins/songs/lib/mediaitem.py @@ -293,10 +293,24 @@ class SongMediaItem(MediaManagerItem): if song.lyrics.startswith(u' -1: + verseTag = u'%s:%s' % \ + (verse[0][u'type'], verse[0][u'label']) + service_item.add_from_text\ + (verse[1][:30], verse[1], verseTag) + else: + if verse[0][u'type'].find(order) > -1: + verseTag = u'%s:%s' % \ + (verse[0][u'type'], verse[0][u'label']) + service_item.add_from_text\ + (verse[1][:30], verse[1], verseTag) else: verses = song.lyrics.split(u'\n\n') for slide in verses: From 6380cc5126e33f31dd9434af1ffa44c5a58cc66e Mon Sep 17 00:00:00 2001 From: Tim Bentley Date: Mon, 30 Nov 2009 18:22:43 +0000 Subject: [PATCH 2/4] Fix up song verse expansion to handle no verse order Fix bug in slide controller when no slide and button is pressed --- openlp/core/ui/slidecontroller.py | 6 ++--- openlp/plugins/songs/lib/mediaitem.py | 33 ++++++++++++++------------- 2 files changed, 20 insertions(+), 19 deletions(-) diff --git a/openlp/core/ui/slidecontroller.py b/openlp/core/ui/slidecontroller.py index def8c7175..99d4de5d5 100644 --- a/openlp/core/ui/slidecontroller.py +++ b/openlp/core/ui/slidecontroller.py @@ -556,7 +556,7 @@ class SlideController(QtGui.QWidget): """ Go to the next slide. """ - if self.serviceItem.is_command(): + if self.serviceItem and self.serviceItem.is_command(): Receiver.send_message(u'%s_next'% self.serviceItem.name.lower()) self.updatePreview() else: @@ -570,7 +570,7 @@ class SlideController(QtGui.QWidget): """ Go to the previous slide. """ - if self.serviceItem.is_command(): + if self.serviceItem and self.serviceItem.is_command(): Receiver.send_message( u'%s_previous'% self.serviceItem.name.lower()) self.updatePreview() @@ -585,7 +585,7 @@ class SlideController(QtGui.QWidget): """ Go to the last slide. """ - if self.serviceItem.is_command(): + if self.serviceItem and self.serviceItem.is_command(): Receiver.send_message(u'%s_last'% self.serviceItem.name.lower()) self.updatePreview() else: diff --git a/openlp/plugins/songs/lib/mediaitem.py b/openlp/plugins/songs/lib/mediaitem.py index 04dae39fc..2cbbfbcdc 100644 --- a/openlp/plugins/songs/lib/mediaitem.py +++ b/openlp/plugins/songs/lib/mediaitem.py @@ -293,24 +293,25 @@ class SongMediaItem(MediaManagerItem): if song.lyrics.startswith(u' -1: - verseTag = u'%s:%s' % \ - (verse[0][u'type'], verse[0][u'label']) - service_item.add_from_text\ - (verse[1][:30], verse[1], verseTag) - else: - if verse[0][u'type'].find(order) > -1: - verseTag = u'%s:%s' % \ - (verse[0][u'type'], verse[0][u'label']) - service_item.add_from_text\ - (verse[1][:30], verse[1], verseTag) + verse[0][u'label'][0] == order[0]: + verseTag = u'%s:%s' % \ + (verse[0][u'type'], verse[0][u'label']) + service_item.add_from_text\ + (verse[1][:30], verse[1], verseTag) + else: + if verse[0][u'type'][0] == order[0]: + verseTag = u'%s:%s' % \ + (verse[0][u'type'], verse[0][u'label']) + service_item.add_from_text\ + (verse[1][:30], verse[1], verseTag) else: verses = song.lyrics.split(u'\n\n') for slide in verses: From 9f80c5a7421b06b501f9233af2e60f6103c2b997 Mon Sep 17 00:00:00 2001 From: Tim Bentley Date: Mon, 30 Nov 2009 19:51:29 +0000 Subject: [PATCH 3/4] Fix problem with slide controller soften the renderer transition --- openlp/core/lib/renderer.py | 2 +- openlp/core/ui/slidecontroller.py | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/openlp/core/lib/renderer.py b/openlp/core/lib/renderer.py index d41fc988b..fc7a852e7 100644 --- a/openlp/core/lib/renderer.py +++ b/openlp/core/lib/renderer.py @@ -577,7 +577,7 @@ class Renderer(object): painter = QtGui.QPainter() painter.begin(self._frameOp) painter.setRenderHint(QtGui.QPainter.Antialiasing); - painter.setOpacity(0.5) + painter.setOpacity(0.7) painter.setFont(font) if color is None: if footer: diff --git a/openlp/core/ui/slidecontroller.py b/openlp/core/ui/slidecontroller.py index 99d4de5d5..def8c7175 100644 --- a/openlp/core/ui/slidecontroller.py +++ b/openlp/core/ui/slidecontroller.py @@ -556,7 +556,7 @@ class SlideController(QtGui.QWidget): """ Go to the next slide. """ - if self.serviceItem and self.serviceItem.is_command(): + if self.serviceItem.is_command(): Receiver.send_message(u'%s_next'% self.serviceItem.name.lower()) self.updatePreview() else: @@ -570,7 +570,7 @@ class SlideController(QtGui.QWidget): """ Go to the previous slide. """ - if self.serviceItem and self.serviceItem.is_command(): + if self.serviceItem.is_command(): Receiver.send_message( u'%s_previous'% self.serviceItem.name.lower()) self.updatePreview() @@ -585,7 +585,7 @@ class SlideController(QtGui.QWidget): """ Go to the last slide. """ - if self.serviceItem and self.serviceItem.is_command(): + if self.serviceItem.is_command(): Receiver.send_message(u'%s_last'% self.serviceItem.name.lower()) self.updatePreview() else: From d81f65fcc98058721b974d521521319df4c3f363 Mon Sep 17 00:00:00 2001 From: Tim Bentley Date: Mon, 30 Nov 2009 20:04:16 +0000 Subject: [PATCH 4/4] Cannot type bzr-revno: 681 --- version.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version.txt b/version.txt index 5c1a24345..0fd32ed4f 100644 --- a/version.txt +++ b/version.txt @@ -1 +1 @@ -1.9.0-670 +1.9.0-681