← Back to team overview

openlp-core team mailing list archive

[Merge] lp:~meths/openlp/trivialfixes into lp:openlp

 

Jon Tibble has proposed merging lp:~meths/openlp/trivialfixes into lp:openlp.

Requested reviews:
  OpenLP Core (openlp-core)


Fix last commit - thanks Tim for finding the flaw.
-- 
https://code.launchpad.net/~meths/openlp/trivialfixes/+merge/31489
Your team OpenLP Core is requested to review the proposed merge of lp:~meths/openlp/trivialfixes into lp:openlp.
=== modified file 'openlp/core/ui/generaltab.py'
--- openlp/core/ui/generaltab.py	2010-07-31 21:58:56 +0000
+++ openlp/core/ui/generaltab.py	2010-08-01 15:01:03 +0000
@@ -38,7 +38,8 @@
         """
         self.screens = screens
         self.monitorNumber = 0
-        self.overrideChanged = False
+        # Set to True to allow PostSetup to work on application start up
+        self.overrideChanged = True
         SettingsTab.__init__(self, u'General')
 
     def preLoad(self):
@@ -414,7 +415,6 @@
         self.customYValueEdit.setEnabled(self.overrideCheckBox.isChecked())
         self.customHeightValueEdit.setEnabled(self.overrideCheckBox.isChecked())
         self.customWidthValueEdit.setEnabled(self.overrideCheckBox.isChecked())
-        self.overrideChanged = False
 
     def save(self):
         """
@@ -458,7 +458,7 @@
             QtCore.QVariant(self.overrideCheckBox.isChecked()))
         settings.endGroup()
         self.screens.display = self.displayOnMonitorCheck.isChecked()
-        #Monitor Number has changed.
+        # Monitor Number has changed.
         if self.screens.monitor_number != self.monitorNumber:
             self.screens.monitor_number = self.monitorNumber
             self.screens.set_current_display(self.monitorNumber)


Follow ups