From 6ad7a867ccc6a22090e55e694377b28676c1809c Mon Sep 17 00:00:00 2001 From: Andreas Preikschat Date: Sun, 8 Apr 2012 14:53:11 +0200 Subject: [PATCH] fixed bug 970436 ('Display if a single screen' always in effect) Fixes: https://launchpad.net/bugs/970436 --- openlp/core/ui/maindisplay.py | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/openlp/core/ui/maindisplay.py b/openlp/core/ui/maindisplay.py index ef6ded3fa..cf3598dbd 100644 --- a/openlp/core/ui/maindisplay.py +++ b/openlp/core/ui/maindisplay.py @@ -356,9 +356,11 @@ class MainDisplay(Display): else: # Single screen active if self.screens.display_count == 1: - # Only make visible if setting enabled + # Only make visible if setting enabled. if QtCore.QSettings().value(u'general/display on monitor', - QtCore.QVariant(True)).toBool(): + QtCore.QVariant(True)).toBool() or \ + QtCore.QSettings().value(u'general/override position', + QtCore.QVariant(False)).toBool(): self.setVisible(True) else: self.setVisible(True) @@ -429,9 +431,11 @@ class MainDisplay(Display): """ log.debug(u'hideDisplay mode = %d', mode) if self.screens.display_count == 1: - # Only make visible if setting enabled + # Only make visible if setting enabled. if not QtCore.QSettings().value(u'general/display on monitor', - QtCore.QVariant(True)).toBool(): + QtCore.QVariant(True)).toBool() and not \ + QtCore.QSettings().value(u'general/override position', + QtCore.QVariant(False)).toBool(): return if mode == HideMode.Screen: self.frame.evaluateJavaScript(u'show_blank("desktop");') @@ -454,9 +458,11 @@ class MainDisplay(Display): """ log.debug(u'showDisplay') if self.screens.display_count == 1: - # Only make visible if setting enabled + # Only make visible if setting enabled. if not QtCore.QSettings().value(u'general/display on monitor', - QtCore.QVariant(True)).toBool(): + QtCore.QVariant(True)).toBool() and not \ + QtCore.QSettings().value(u'general/override position', + QtCore.QVariant(False)).toBool(): return self.frame.evaluateJavaScript('show_blank("show");') if self.isHidden():