From 9a519f2ff07c72d9ad7e623514b7a9be5c24f778 Mon Sep 17 00:00:00 2001 From: Tim Bentley Date: Sat, 24 Jul 2010 20:27:25 +0100 Subject: [PATCH 1/2] Fix missing code from previous merge --- openlp/core/ui/generaltab.py | 8 ++++++++ openlp/core/ui/maindisplay.py | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/openlp/core/ui/generaltab.py b/openlp/core/ui/generaltab.py index 1392992d3..5947bc260 100644 --- a/openlp/core/ui/generaltab.py +++ b/openlp/core/ui/generaltab.py @@ -442,8 +442,13 @@ class GeneralTab(SettingsTab): self.screens.set_current_display(self.monitorNumber) Receiver.send_message(u'config_screen_changed') Receiver.send_message(u'config_updated') + # On save update the strings as well + self.postSetUp() def postSetUp(self): + """ + Set Strings after initial definition + """ self.screens.override[u'size'] = QtCore.QRect( int(self.customXValueEdit.text()), int(self.customYValueEdit.text()), @@ -456,6 +461,9 @@ class GeneralTab(SettingsTab): self.screens.reset_current_display() def onOverrideCheckBoxToggled(self, checked): + """ + Toggle screen state depending on check box state + """ self.customXValueEdit.setEnabled(checked) self.customYValueEdit.setEnabled(checked) self.customHeightValueEdit.setEnabled(checked) diff --git a/openlp/core/ui/maindisplay.py b/openlp/core/ui/maindisplay.py index 6183c23c2..8e221d62b 100644 --- a/openlp/core/ui/maindisplay.py +++ b/openlp/core/ui/maindisplay.py @@ -359,7 +359,7 @@ class MainDisplay(DisplayWidget): if mode != HideMode.Screen and self.isHidden(): self.setVisible(True) - def showDisplay(self, message=u''): + def showDisplay(self): """ Show the stored layers so the screen reappears as it was originally. From 8a96d7f87ffc47a55715fde2efbb475017b2cc4d Mon Sep 17 00:00:00 2001 From: Tim Bentley Date: Sun, 25 Jul 2010 07:14:45 +0100 Subject: [PATCH 2/2] Fix word uage --- openlp/core/ui/generaltab.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/openlp/core/ui/generaltab.py b/openlp/core/ui/generaltab.py index 11e9e4b96..52bcab554 100644 --- a/openlp/core/ui/generaltab.py +++ b/openlp/core/ui/generaltab.py @@ -446,12 +446,12 @@ class GeneralTab(SettingsTab): self.screens.set_current_display(self.monitorNumber) Receiver.send_message(u'config_screen_changed') Receiver.send_message(u'config_updated') - # On save update the strings as well + # On save update the screens as well self.postSetUp() def postSetUp(self): """ - Set Strings after initial definition + Reset screens after initial definition """ self.screens.override[u'size'] = QtCore.QRect( int(self.customXValueEdit.text()),