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

Single monitor and usability fixes

Browse Source
This commit is contained in:
Jon Tibble 2009-11-03 00:04:41 +00:00
parent d0145bd1e4
commit 066cfcc830
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
openlp/core/lib/mediamanageritem.py
View File

@ -373,6 +373,10 @@ class MediaManagerItem(QtGui.QWidget):
self.parent.live_controller.addServiceItem(service_item) self.parent.live_controller.addServiceItem(service_item)
def onAddClick(self): def onAddClick(self):
if not self.ListView.SelectedIndexes():
QtGui.QMessageBox.Information(self,
self.trUtf8(u'No items selected...'),
self.trUTf8(u'You must select one or more items'))
log.debug(self.PluginNameShort + u' Add Requested') log.debug(self.PluginNameShort + u' Add Requested')
service_item = self.buildServiceItem() service_item = self.buildServiceItem()
if service_item is not None: if service_item is not None:

6
openlp/core/ui/maindisplay.py
View File

@ -94,15 +94,15 @@ class MainDisplay(DisplayLabel):
self.layout.setObjectName(u'layout') self.layout.setObjectName(u'layout')
self.mediaObject = Phonon.MediaObject(self) self.mediaObject = Phonon.MediaObject(self)
self.video = Phonon.VideoWidget() self.video = Phonon.VideoWidget()
self.video.setVisible(False)
self.audio = Phonon.AudioOutput(Phonon.VideoCategory, self.mediaObject) self.audio = Phonon.AudioOutput(Phonon.VideoCategory, self.mediaObject)
self.video.setFullScreen(True)
Phonon.createPath(self.mediaObject, self.video) Phonon.createPath(self.mediaObject, self.video)
Phonon.createPath(self.mediaObject, self.audio) Phonon.createPath(self.mediaObject, self.audio)
self.layout.insertWidget(0, self.video) self.layout.insertWidget(0, self.video)
self.display = QtGui.QLabel(self) self.display = QtGui.QLabel(self)
self.display.setScaledContents(True) self.display.setScaledContents(True)
self.layout.insertWidget(0, self.display) self.layout.insertWidget(0, self.display)
self.primary = False self.primary = True
self.displayBlank = False self.displayBlank = False
self.blankFrame = None self.blankFrame = None
self.frame = None self.frame = None
@ -272,6 +272,7 @@ class MainDisplay(DisplayLabel):
self.firstTime = True self.firstTime = True
self.mediaLoaded = True self.mediaLoaded = True
self.display.hide() self.display.hide()
self.video.setFullScreen(True)
self.mediaObject.play() self.mediaObject.play()
if self.primary: if self.primary:
self.setVisible(True) self.setVisible(True)
@ -292,4 +293,5 @@ class MainDisplay(DisplayLabel):
self.mediaObject.stop() self.mediaObject.stop()
self.mediaObject.clearQueue() self.mediaObject.clearQueue()
self.mediaLoaded = False self.mediaLoaded = False
self.video.setVisible(False)
self.display.show() self.display.show()