From 2e6c06ad1f202b23f8f8cae66fd361a54780c8ab Mon Sep 17 00:00:00 2001 From: Tim Bentley Date: Thu, 26 Aug 2010 17:08:26 +0100 Subject: [PATCH] Screen switching now works --- openlp/core/ui/generaltab.py | 5 ++--- openlp/core/ui/maindisplay.py | 6 ++---- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/openlp/core/ui/generaltab.py b/openlp/core/ui/generaltab.py index 504c6d82d..bc050b6f9 100644 --- a/openlp/core/ui/generaltab.py +++ b/openlp/core/ui/generaltab.py @@ -474,10 +474,9 @@ class GeneralTab(SettingsTab): else: self.screens.reset_current_display() # Order is important so be careful if you change - if self.overrideChanged: + if self.overrideChanged or postUpdate: Receiver.send_message(u'config_screen_changed') - if postUpdate: - Receiver.send_message(u'config_updated') + Receiver.send_message(u'config_updated') self.overrideChanged = False def onOverrideCheckBoxToggled(self, checked): diff --git a/openlp/core/ui/maindisplay.py b/openlp/core/ui/maindisplay.py index 148d60780..7533b085e 100644 --- a/openlp/core/ui/maindisplay.py +++ b/openlp/core/ui/maindisplay.py @@ -104,10 +104,8 @@ class MainDisplay(DisplayWidget): QtCore.SIGNAL(u'maindisplay_show'), self.showDisplay) def setup(self): - log.debug(u'Setup %s %s for %s ' % (self.isLive, - self.screens, self.screens.monitor_number)) - print (u'Setup %s %s for %s ' % (self.isLive, - self.screens, self.screens.monitor_number)) + log.debug(u'Setup live = %s for %s ' % (self.isLive, + self.screens.monitor_number)) self.screen = self.screens.current self.setVisible(False) self.setGeometry(self.screen[u'size'])