openlp-core team mailing list archive
-
openlp-core team
-
Mailing list archive
-
Message #02761
[Merge] lp:~trb143/openlp/bugfixes into lp:openlp
Tim Bentley has proposed merging lp:~trb143/openlp/bugfixes into lp:openlp.
Requested reviews:
Raoul Snyman (raoul-snyman): mistyped comments
Missing code from previous merge
--
https://code.launchpad.net/~trb143/openlp/bugfixes/+merge/30886
Your team OpenLP Core is subscribed to branch lp:openlp.
=== modified file 'openlp/core/ui/generaltab.py'
--- openlp/core/ui/generaltab.py 2010-07-25 08:21:02 +0000
+++ openlp/core/ui/generaltab.py 2010-07-25 08:44:50 +0000
@@ -447,8 +447,13 @@
self.screens.set_current_display(self.monitorNumber)
Receiver.send_message(u'config_screen_changed')
Receiver.send_message(u'config_updated')
+ # On save update the screens as well
+ self.postSetUp()
def postSetUp(self):
+ """
+ Reset screens after initial definition
+ """
self.screens.override[u'size'] = QtCore.QRect(
int(self.customXValueEdit.text()),
int(self.customYValueEdit.text()),
@@ -461,6 +466,9 @@
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)
=== modified file 'openlp/core/ui/maindisplay.py'
--- openlp/core/ui/maindisplay.py 2010-07-24 22:10:47 +0000
+++ openlp/core/ui/maindisplay.py 2010-07-25 08:44:50 +0000
@@ -360,7 +360,7 @@
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.
Follow ups