From 780e45891c778a8c675fcd426f1dd0818f2ba1a8 Mon Sep 17 00:00:00 2001
From: Tim Bentley <tim.bentley@gmail.com>
Date: Fri, 25 Jun 2010 21:44:13 +0100
Subject: [PATCH] More fixes

---
 openlp/core/ui/maindisplay.py     | 15 ++++++++-------
 openlp/core/ui/slidecontroller.py | 10 ++++++++++
 2 files changed, 18 insertions(+), 7 deletions(-)

diff --git a/openlp/core/ui/maindisplay.py b/openlp/core/ui/maindisplay.py
index 267de9bf8..0196732fe 100644
--- a/openlp/core/ui/maindisplay.py
+++ b/openlp/core/ui/maindisplay.py
@@ -195,6 +195,7 @@ class MainDisplay(DisplayWidget):
             self.setVisible(False)
             self.primary = True
 
+
     def setupScene(self):
         self.scene = QtGui.QGraphicsScene(self)
         self.scene.setSceneRect(0,0,self.size().width(), self.size().height())
@@ -232,7 +233,8 @@ class MainDisplay(DisplayWidget):
         if self.primary:
             self.setVisible(False)
         else:
-            self.showFullScreen()
+            self.setVisible(True)
+            #self.showFullScreen()
 
     def hideDisplayForVideo(self):
         """
@@ -307,7 +309,6 @@ class MainDisplay(DisplayWidget):
             Image frame to be rendered
         """
         log.debug(u'frameView %d' % display)
-        print "display ", display
         if display:
             if transition:
                 if self.frame is not None:
@@ -332,7 +333,7 @@ class MainDisplay(DisplayWidget):
                 self.display_frame = frame
             if not self.isVisible() and self.screens.display:
                 self.setVisible(True)
-                self.showFullScreen()
+                #self.showFullScreen()
         else:
             self.storeText = QtGui.QPixmap.fromImage(frame[u'main'])
 
@@ -367,10 +368,10 @@ class VideoDisplay(Phonon.VideoWidget):
         Phonon.createPath(self.mediaObject, self.audioObject)
         flags = QtCore.Qt.FramelessWindowHint | QtCore.Qt.Dialog
 #        # WindowsStaysOnBottomHint is not available in QT4.4
-#        try:
-#            flags = flags | QtCore.Qt.WindowStaysOnBottomHint
-#        except AttributeError:
-#            pass
+        try:
+            flags = flags | QtCore.Qt.WindowStaysOnBottomHint
+        except AttributeError:
+            pass
         self.setWindowFlags(flags)
 
         QtCore.QObject.connect(Receiver.get_receiver(),
diff --git a/openlp/core/ui/slidecontroller.py b/openlp/core/ui/slidecontroller.py
index 66cd70f73..c1757c2f8 100644
--- a/openlp/core/ui/slidecontroller.py
+++ b/openlp/core/ui/slidecontroller.py
@@ -253,6 +253,16 @@ class SlideController(QtGui.QWidget):
             translate('SlideController', 'Start playing media'),
             self.onMediaStop)
         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(
                 u'Blank Screen', u':/slides/slide_blank.png',
                 translate('SlideController', 'Blank Screen'),