raoul/openlp
1
0
Fork 0
forked from openlp/openlp
Code Issues Pull Requests Projects Releases Wiki Activity

Presentations no longer blanked when go live, if display not blank

Browse Source 
bzr-revno: 961
This commit is contained in:
Jonathan Corwin 2010-07-22 20:57:46 +01:00
commit 178e29b1f3
2 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
openlp/core/ui/slidecontroller.py
View File

@ -532,12 +532,12 @@ class SlideController(QtGui.QWidget):
self.onMediaStop() self.onMediaStop()
if serviceItem.is_media(): if serviceItem.is_media():
self.onMediaStart(serviceItem) self.onMediaStart(serviceItem)
# if self.isLive: if self.isLive:
# blanked = self.blankButton.isChecked() blanked = self.BlankScreen.isChecked()
# else: else:
# blanked = False blanked = False
Receiver.send_message(u'%s_start' % serviceItem.name.lower(), Receiver.send_message(u'%s_start' % serviceItem.name.lower(),
[serviceItem, self.isLive, True, slideno]) [serviceItem, self.isLive, blanked, slideno])
self.slideList = {} self.slideList = {}
width = self.parent.ControlSplitter.sizes()[self.split] width = self.parent.ControlSplitter.sizes()[self.split]
#Set pointing cursor when we have somthing to point at #Set pointing cursor when we have somthing to point at

11
openlp/plugins/presentations/lib/mediaitem.py
View File

@ -81,6 +81,9 @@ class PresentationMediaItem(MediaManagerItem):
self.buildFileMaskString() self.buildFileMaskString()
def buildFileMaskString(self): def buildFileMaskString(self):
"""
Build the list of file extensions to be used in the Open file dialog
"""
fileType = u'' fileType = u''
for controller in self.controllers: for controller in self.controllers:
if self.controllers[controller].enabled(): if self.controllers[controller].enabled():
@ -139,10 +142,18 @@ class PresentationMediaItem(MediaManagerItem):
self.populateDisplayTypes() self.populateDisplayTypes()
def rebuild(self): def rebuild(self):
"""
Rebuild the tab in the media manager when changes are made in
the settings
"""
self.populateDisplayTypes() self.populateDisplayTypes()
self.buildFileMaskString() self.buildFileMaskString()
def populateDisplayTypes(self): def populateDisplayTypes(self):
"""
Load the combobox with the enabled presentation controllers,
allowing user to select a specific app if settings allow
"""
self.DisplayTypeComboBox.clear() self.DisplayTypeComboBox.clear()
for item in self.controllers: for item in self.controllers:
#load the drop down selection #load the drop down selection