From efdc2bcb0d84dc755042ddcd1220c7a28c79fff7 Mon Sep 17 00:00:00 2001 From: Jonathan Corwin Date: Thu, 22 Jul 2010 08:32:55 +0100 Subject: [PATCH] Presentations no longer startup blanked --- openlp/core/ui/slidecontroller.py | 10 +++++----- openlp/plugins/presentations/lib/mediaitem.py | 11 +++++++++++ 2 files changed, 16 insertions(+), 5 deletions(-) diff --git a/openlp/core/ui/slidecontroller.py b/openlp/core/ui/slidecontroller.py index 70ec3ac6e..4791df129 100644 --- a/openlp/core/ui/slidecontroller.py +++ b/openlp/core/ui/slidecontroller.py @@ -532,12 +532,12 @@ class SlideController(QtGui.QWidget): self.onMediaStop() if serviceItem.is_media(): self.onMediaStart(serviceItem) -# if self.isLive: -# blanked = self.blankButton.isChecked() -# else: -# blanked = False + if self.isLive: + blanked = self.BlankScreen.isChecked() + else: + blanked = False Receiver.send_message(u'%s_start' % serviceItem.name.lower(), - [serviceItem, self.isLive, True, slideno]) + [serviceItem, self.isLive, blanked, slideno]) self.slideList = {} width = self.parent.ControlSplitter.sizes()[self.split] #Set pointing cursor when we have somthing to point at diff --git a/openlp/plugins/presentations/lib/mediaitem.py b/openlp/plugins/presentations/lib/mediaitem.py index 9d83d4c57..33d4d2ab2 100644 --- a/openlp/plugins/presentations/lib/mediaitem.py +++ b/openlp/plugins/presentations/lib/mediaitem.py @@ -81,6 +81,9 @@ class PresentationMediaItem(MediaManagerItem): self.buildFileMaskString() def buildFileMaskString(self): + """ + Build the list of file extensions to be used in the Open file dialog + """ fileType = u'' for controller in self.controllers: if self.controllers[controller].enabled(): @@ -139,10 +142,18 @@ class PresentationMediaItem(MediaManagerItem): self.populateDisplayTypes() def rebuild(self): + """ + Rebuild the tab in the media manager when changes are made in + the settings + """ self.populateDisplayTypes() self.buildFileMaskString() def populateDisplayTypes(self): + """ + Load the combobox with the enabled presentation controllers, + allowing user to select a specific app if settings allow + """ self.DisplayTypeComboBox.clear() for item in self.controllers: #load the drop down selection