openlp-core team mailing list archive

[Tim Bentley <tim.bentley@xxxxxxxxx>]

Tim Bentley has proposed merging lp:~trb143/openlp/bugfixes into lp:openlp.

Requested reviews:
  OpenLP Core (openlp-core)


Missing code from previous merge 
-- 
https://code.launchpad.net/~trb143/openlp/bugfixes/+merge/30860
Your team OpenLP Core is requested to review the proposed merge of lp:~trb143/openlp/bugfixes into lp:openlp.

=== modified file 'openlp/core/ui/generaltab.py'
--- openlp/core/ui/generaltab.py	2010-07-20 20:43:42 +0000
+++ openlp/core/ui/generaltab.py	2010-07-24 19:31:03 +0000
@@ -442,8 +442,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 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 @@
             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-19 07:54:22 +0000
+++ openlp/core/ui/maindisplay.py	2010-07-24 19:31:03 +0000
@@ -359,7 +359,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.