openlp-core team mailing list archive

[rimach <crichter@xxxxxx>]

rimach has proposed merging lp:~crichter/openlp/approved into lp:openlp.

Requested reviews:
  OpenLP Core (openlp-core)


as discussed, here only the changes for blank button delivered.
-- 
https://code.launchpad.net/~crichter/openlp/approved/+merge/21758
Your team OpenLP Core is subscribed to branch lp:openlp.

=== modified file 'openlp/core/ui/maindisplay.py'
--- openlp/core/ui/maindisplay.py	2010-03-14 17:05:50 +0000
+++ openlp/core/ui/maindisplay.py	2010-03-19 23:07:18 +0000
@@ -226,6 +226,7 @@
         ``frame``
             Image frame to be rendered
         """
+        log.debug(u'frameView %d' % (self.displayBlank))
         if not self.displayBlank:
             if transition:
                 if self.frame is not None:
@@ -248,14 +249,22 @@
             if not self.isVisible():
                 self.setVisible(True)
                 self.showFullScreen()
+        else:
+            self.waitingFrame = frame
+            self.waitingFrameTrans = transition
 
     def blankDisplay(self, blanked=True):
+        log.debug(u'Blank main Display %d' % blanked)
         if blanked:
             self.displayBlank = True
             self.display_text.setPixmap(QtGui.QPixmap.fromImage(self.blankFrame))
+            self.waitingFrame = None
+            self.waitingFrameTrans = False
         else:
             self.displayBlank = False
-            if self.display_frame:
+            if self.waitingFrame:
+                self.frameView(self.waitingFrame, self.waitingFrameTrans)
+            elif self.display_frame:
                 self.frameView(self.display_frame)
 
     def onMediaQueue(self, message):

=== modified file 'openlp/core/ui/slidecontroller.py'
--- openlp/core/ui/slidecontroller.py	2010-03-13 15:11:31 +0000
+++ openlp/core/ui/slidecontroller.py	2010-03-19 23:07:18 +0000
@@ -524,6 +524,7 @@
         """
         Handle the blank screen button
         """
+        log.debug(u'onBlankDisplay %d' % force)
         if force:
             self.blankButton.setChecked(True)
         self.blankScreen(self.blankButton.isChecked())
@@ -540,6 +541,8 @@
                     Receiver.send_message(u'%s_blank'% self.serviceItem.name.lower())
                 else:
                     Receiver.send_message(u'%s_unblank'% self.serviceItem.name.lower())
+            else:
+                self.parent.mainDisplay.blankDisplay(blanked)
         else:
             self.parent.mainDisplay.blankDisplay(blanked)