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

More fixes

Browse Source
This commit is contained in:
Tim Bentley 2010-06-25 21:44:13 +01:00
parent 4be942efe3
commit 780e45891c
2 changed files with 18 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -195,6 +195,7 @@ class MainDisplay(DisplayWidget):
self.setVisible(False) self.setVisible(False)
self.primary = True self.primary = True
def setupScene(self): def setupScene(self):
self.scene = QtGui.QGraphicsScene(self) self.scene = QtGui.QGraphicsScene(self)
self.scene.setSceneRect(0,0,self.size().width(), self.size().height()) self.scene.setSceneRect(0,0,self.size().width(), self.size().height())
@ -232,7 +233,8 @@ class MainDisplay(DisplayWidget):
if self.primary: if self.primary:
self.setVisible(False) self.setVisible(False)
else: else:
self.showFullScreen() self.setVisible(True)
#self.showFullScreen()
def hideDisplayForVideo(self): def hideDisplayForVideo(self):
""" """
@ -307,7 +309,6 @@ class MainDisplay(DisplayWidget):
Image frame to be rendered Image frame to be rendered
""" """
log.debug(u'frameView %d' % display) log.debug(u'frameView %d' % display)
print "display ", display
if display: if display:
if transition: if transition:
if self.frame is not None: if self.frame is not None:
@ -332,7 +333,7 @@ class MainDisplay(DisplayWidget):
self.display_frame = frame self.display_frame = frame
if not self.isVisible() and self.screens.display: if not self.isVisible() and self.screens.display:
self.setVisible(True) self.setVisible(True)
self.showFullScreen() #self.showFullScreen()
else: else:
self.storeText = QtGui.QPixmap.fromImage(frame[u'main']) self.storeText = QtGui.QPixmap.fromImage(frame[u'main'])
@ -367,10 +368,10 @@ class VideoDisplay(Phonon.VideoWidget):
Phonon.createPath(self.mediaObject, self.audioObject) Phonon.createPath(self.mediaObject, self.audioObject)
flags = QtCore.Qt.FramelessWindowHint | QtCore.Qt.Dialog flags = QtCore.Qt.FramelessWindowHint | QtCore.Qt.Dialog
# # WindowsStaysOnBottomHint is not available in QT4.4 # # WindowsStaysOnBottomHint is not available in QT4.4
# try: try:
# flags = flags | QtCore.Qt.WindowStaysOnBottomHint flags = flags | QtCore.Qt.WindowStaysOnBottomHint
# except AttributeError: except AttributeError:
# pass pass
self.setWindowFlags(flags) self.setWindowFlags(flags)
QtCore.QObject.connect(Receiver.get_receiver(), QtCore.QObject.connect(Receiver.get_receiver(),

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

@ -253,6 +253,16 @@ class SlideController(QtGui.QWidget):
translate('SlideController', 'Start playing media'), translate('SlideController', 'Start playing media'),
self.onMediaStop) self.onMediaStop)
if self.isLive: if self.isLive:
self.button = QtGui.QToolButton(self.Toolbar)
self.Toolbar.addToolbarWidget(u'Hide Menu', self.button)
self.button.setText(translate('SlideController', 'Hide'))
self.menu = QtGui.QMenu(self.button)
blank_screen = QtGui.QAction(QtGui.QIcon( u':/slides/slide_blank.png'), u'Blank Screen', self.button)
theme_screen = QtGui.QAction(QtGui.QIcon(u':/slides/slide_theme.png'), u'Blank to Theme', self.button)
desktop_screen = QtGui.QAction(QtGui.QIcon(u':/slides/slide_desktop.png'), u'Show Desktop', self.button)
self.menu.addAction(blank_screen)
self.menu.addAction(theme_screen)
self.menu.addAction(desktop_screen)
self.blankButton = self.Mediabar.addToolbarButton( self.blankButton = self.Mediabar.addToolbarButton(
u'Blank Screen', u':/slides/slide_blank.png', u'Blank Screen', u':/slides/slide_blank.png',
translate('SlideController', 'Blank Screen'), translate('SlideController', 'Blank Screen'),