raoul/openlp
1
0
Fork 0
forked from openlp/openlp
Code Issues Pull Requests Projects Releases Wiki Activity

fixed bug 970436 ('Display if a single screen' always in effect)

Browse Source 
Fixes: https://launchpad.net/bugs/970436
This commit is contained in:
Andreas Preikschat 2012-04-08 14:53:11 +02:00
parent c0cae670ef
commit 6ad7a867cc
1 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
openlp/core/ui/maindisplay.py
View File

@ -356,9 +356,11 @@ class MainDisplay(Display):
else: else:
# Single screen active # Single screen active
if self.screens.display_count == 1: 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', 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) self.setVisible(True)
else: else:
self.setVisible(True) self.setVisible(True)
@ -429,9 +431,11 @@ class MainDisplay(Display):
""" """
log.debug(u'hideDisplay mode = %d', mode) log.debug(u'hideDisplay mode = %d', mode)
if self.screens.display_count == 1: 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', 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 return
if mode == HideMode.Screen: if mode == HideMode.Screen:
self.frame.evaluateJavaScript(u'show_blank("desktop");') self.frame.evaluateJavaScript(u'show_blank("desktop");')
@ -454,9 +458,11 @@ class MainDisplay(Display):
""" """
log.debug(u'showDisplay') log.debug(u'showDisplay')
if self.screens.display_count == 1: 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', 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 return
self.frame.evaluateJavaScript('show_blank("show");') self.frame.evaluateJavaScript('show_blank("show");')
if self.isHidden(): if self.isHidden():