From 81de9294600d9a86a59ee5b1a825787a37f32b45 Mon Sep 17 00:00:00 2001 From: Tim Bentley Date: Thu, 29 Oct 2009 15:57:58 +0000 Subject: [PATCH] Minor fixes --- openlp/core/lib/eventreceiver.py | 6 ++++-- openlp/core/ui/slidecontroller.py | 6 ++---- openlp/plugins/songs/lib/mediaitem.py | 4 +++- 3 files changed, 9 insertions(+), 7 deletions(-) diff --git a/openlp/core/lib/eventreceiver.py b/openlp/core/lib/eventreceiver.py index 46de0cbfc..f4b992890 100644 --- a/openlp/core/lib/eventreceiver.py +++ b/openlp/core/lib/eventreceiver.py @@ -53,6 +53,9 @@ class EventReceiver(QtCore.QObject): ``load_song_list`` Tells the the song plugin to reload the song list + ``load_custom_list`` + Tells the the custom plugin to reload the custom list + ``update_spin_delay`` Pushes out the Image loop delay @@ -100,8 +103,7 @@ class EventReceiver(QtCore.QObject): ``slidecontroller_change`` Informs the slidecontroller that a slide change has occurred - - ``remote_edite_clear`` + ``remote_edit_clear`` Informs all components that remote edit has been aborted. """ diff --git a/openlp/core/ui/slidecontroller.py b/openlp/core/ui/slidecontroller.py index 534b5986b..0715cda5d 100644 --- a/openlp/core/ui/slidecontroller.py +++ b/openlp/core/ui/slidecontroller.py @@ -276,19 +276,17 @@ class SlideController(QtGui.QWidget): """ Allows the live toolbar to be customised """ + self.Songbar.setVisible(False) + self.Toolbar.makeWidgetsInvisible(self.image_list) if item.service_item_type == ServiceType.Text: self.Toolbar.makeWidgetsInvisible(self.image_list) if item.name == u'Songs' and \ str_to_bool(self.songsconfig.get_config(u'display songbar', True)): self.Songbar.setVisible(True) - else: - self.Songbar.setVisible(False) elif item.service_item_type == ServiceType.Image: #Not sensible to allow loops with 1 frame if len(item.frames) > 1: self.Toolbar.makeWidgetsVisible(self.image_list) - else: - self.Toolbar.makeWidgetsInvisible(self.image_list) def enablePreviewToolBar(self, item): """ diff --git a/openlp/plugins/songs/lib/mediaitem.py b/openlp/plugins/songs/lib/mediaitem.py index 6df3d8c19..11ccb0763 100644 --- a/openlp/plugins/songs/lib/mediaitem.py +++ b/openlp/plugins/songs/lib/mediaitem.py @@ -281,7 +281,9 @@ class SongMediaItem(MediaManagerItem): item_id = (item.data(QtCore.Qt.UserRole)).toInt()[0] else: item_id = self.fromServiceManager - self.fromServiceManager = -1 + #if we are in preview mode do not reset the servicemanage id + if self.fromPreview != -1: + self.fromServiceManager = -1 song = self.parent.songmanager.get_song(item_id) service_item.theme = song.theme_name service_item.editEnabled = True