Andreas Preikschat has proposed merging lp:~googol/openlp/bug-970436 into lp:openlp.
Requested reviews: OpenLP Core (openlp-core) Related bugs: Bug #970436 in OpenLP: ""Display if a single screen" always in effect" https://bugs.launchpad.net/openlp/+bug/970436 For more details, see: https://code.launchpad.net/~googol/openlp/bug-970436/+merge/101204 Hello, - fixed bug 970436 ('Display if a single screen' always in effect) -- https://code.launchpad.net/~googol/openlp/bug-970436/+merge/101204 Your team OpenLP Core is requested to review the proposed merge of lp:~googol/openlp/bug-970436 into lp:openlp.
=== modified file 'openlp/core/ui/maindisplay.py' --- openlp/core/ui/maindisplay.py 2012-03-06 19:37:27 +0000 +++ openlp/core/ui/maindisplay.py 2012-04-08 12:56:19 +0000 @@ -356,9 +356,11 @@ 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 @@ """ 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 @@ """ 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():
_______________________________________________ Mailing list: https://launchpad.net/~openlp-core Post to : openlp-core@lists.launchpad.net Unsubscribe : https://launchpad.net/~openlp-core More help : https://help.launchpad.net/ListHelp