forked from openlp/openlp
spacing cleanups
This commit is contained in:
parent
82b8df98be
commit
ab12f73a21
@ -262,17 +262,16 @@ class MainDisplay(DisplayWidget):
|
||||
self.firstTime = False
|
||||
else:
|
||||
self.mediaObject.enqueue(Phonon.MediaSource(file))
|
||||
self.onMediaPlay(message[3])
|
||||
self.onMediaPlay()
|
||||
|
||||
def onMediaPlay(self, live=True):
|
||||
log.debug(u'Play the new media, Live %s', live)
|
||||
def onMediaPlay(self):
|
||||
log.debug(u'Play the new media, Live ')
|
||||
if not self.mediaLoaded and not self.displayBlank:
|
||||
self.blankDisplay()
|
||||
self.firstTime = True
|
||||
self.mediaLoaded = True
|
||||
if live:
|
||||
self.display.hide()
|
||||
self.video.setFullScreen(True)
|
||||
self.display.hide()
|
||||
self.video.setFullScreen(True)
|
||||
self.mediaObject.play()
|
||||
if self.primary:
|
||||
self.setVisible(True)
|
||||
|
@ -230,7 +230,6 @@ class SlideController(QtGui.QWidget):
|
||||
self.grid = QtGui.QGridLayout(self.PreviewFrame)
|
||||
self.grid.setMargin(8)
|
||||
self.grid.setObjectName(u'grid')
|
||||
|
||||
self.SlideLayout = QtGui.QVBoxLayout()
|
||||
self.SlideLayout.setSpacing(0)
|
||||
self.SlideLayout.setMargin(0)
|
||||
@ -242,7 +241,6 @@ class SlideController(QtGui.QWidget):
|
||||
Phonon.createPath(self.mediaObject, self.video)
|
||||
Phonon.createPath(self.mediaObject, self.audio)
|
||||
self.SlideLayout.insertWidget(0, self.video)
|
||||
|
||||
# Actual preview screen
|
||||
self.SlidePreview = QtGui.QLabel(self)
|
||||
sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Fixed,
|
||||
@ -260,9 +258,6 @@ class SlideController(QtGui.QWidget):
|
||||
self.SlidePreview.setScaledContents(True)
|
||||
self.SlidePreview.setObjectName(u'SlidePreview')
|
||||
self.SlideLayout.insertWidget(0, self.SlidePreview)
|
||||
|
||||
|
||||
|
||||
self.grid.addLayout(self.SlideLayout, 0, 0, 1, 1)
|
||||
# Signals
|
||||
QtCore.QObject.connect(self.PreviewListWidget,
|
||||
|
Loading…
Reference in New Issue
Block a user