forked from openlp/openlp
Presentations no longer blanked when go live, if display not blank
bzr-revno: 961
This commit is contained in:
commit
178e29b1f3
@ -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
|
||||
|
@ -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
|
||||
|
Loading…
Reference in New Issue
Block a user