From 5c6f7da055892e5f7d65bc0485f02e8a9663b098 Mon Sep 17 00:00:00 2001 From: Philip Ridout Date: Sat, 24 Jul 2010 11:44:28 +0100 Subject: [PATCH 1/3] Hopefully a fix for bug #609442 --- openlp/core/ui/maindisplay.py | 2 -- 1 file changed, 2 deletions(-) diff --git a/openlp/core/ui/maindisplay.py b/openlp/core/ui/maindisplay.py index 6183c23c2..f25a1d48c 100644 --- a/openlp/core/ui/maindisplay.py +++ b/openlp/core/ui/maindisplay.py @@ -455,8 +455,6 @@ class MainDisplay(DisplayWidget): self.displayText.setPixmap(frame) else: self.displayText.setPixmap(QtGui.QPixmap.fromImage(frame)) - if not self.isVisible() and self.screens.display: - self.setVisible(True) class VideoDisplay(Phonon.VideoWidget): """ From 434475119872e069fa24ce7b2bff34fbde4588a9 Mon Sep 17 00:00:00 2001 From: Philip Ridout Date: Mon, 26 Jul 2010 21:14:11 +0100 Subject: [PATCH 2/3] self.screens.display, is always true, no matter which mode you use (single or dual screen) self.screens.current['primary'] is true, in single screen mode, or when the operator screen is also used as the main display! --- openlp/core/ui/maindisplay.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/openlp/core/ui/maindisplay.py b/openlp/core/ui/maindisplay.py index f25a1d48c..a8156aeec 100644 --- a/openlp/core/ui/maindisplay.py +++ b/openlp/core/ui/maindisplay.py @@ -455,6 +455,8 @@ class MainDisplay(DisplayWidget): self.displayText.setPixmap(frame) else: self.displayText.setPixmap(QtGui.QPixmap.fromImage(frame)) + if not self.isVisible() and self.screens.current['primary']: # self.screens.display + self.setVisible(True) class VideoDisplay(Phonon.VideoWidget): """ From 2b9bc517ae1a2ac716c63b2eb97a1a987e192b47 Mon Sep 17 00:00:00 2001 From: Philip Ridout Date: Tue, 27 Jul 2010 17:14:11 +0100 Subject: [PATCH 3/3] Removal of comment --- openlp/core/ui/maindisplay.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/openlp/core/ui/maindisplay.py b/openlp/core/ui/maindisplay.py index a8156aeec..3a0ef05c1 100644 --- a/openlp/core/ui/maindisplay.py +++ b/openlp/core/ui/maindisplay.py @@ -455,7 +455,7 @@ class MainDisplay(DisplayWidget): self.displayText.setPixmap(frame) else: self.displayText.setPixmap(QtGui.QPixmap.fromImage(frame)) - if not self.isVisible() and self.screens.current['primary']: # self.screens.display + if not self.isVisible() and self.screens.current['primary']: self.setVisible(True) class VideoDisplay(Phonon.VideoWidget):