openlp-core team mailing list archive

[Tim Bentley <tim.bentley@xxxxxxxxx>]

Tim Bentley has proposed merging lp:~trb143/openlp/bug-778537 into lp:openlp.

Requested reviews:
  Raoul Snyman (raoul-snyman)
Related bugs:
  Bug #778537 in OpenLP: "Setting Dialogs do not show propper values"
  https://bugs.launchpad.net/openlp/+bug/778537

For more details, see:
https://code.launchpad.net/~trb143/openlp/bug-778537/+merge/61029

Reset dialogs on Cancel and minor cleanups
-- 
https://code.launchpad.net/~trb143/openlp/bug-778537/+merge/61029
Your team OpenLP Core is subscribed to branch lp:openlp.

=== modified file 'openlp/core/lib/settingstab.py'
--- openlp/core/lib/settingstab.py	2011-04-13 19:12:47 +0000
+++ openlp/core/lib/settingstab.py	2011-05-15 16:41:15 +0000
@@ -50,7 +50,6 @@
         self.setupUi()
         self.retranslateUi()
         self.initialise()
-        self.preLoad()
         self.load()
 
     def setupUi(self):
@@ -86,12 +85,6 @@
         left_width = max(left_width, self.leftColumn.minimumSizeHint().width())
         self.leftColumn.setFixedWidth(left_width)
 
-    def preLoad(self):
-        """
-        Setup the tab's interface.
-        """
-        pass
-
     def retranslateUi(self):
         """
         Setup the interface translation strings.
@@ -118,9 +111,9 @@
 
     def cancel(self):
         """
-        Reset any settings
+        Reset any settings if cancel pressed
         """
-        pass
+        self.load()
 
     def postSetUp(self, postUpdate=False):
         """

=== modified file 'openlp/core/ui/displaytagform.py'
--- openlp/core/ui/displaytagform.py	2011-05-08 05:42:48 +0000
+++ openlp/core/ui/displaytagform.py	2011-05-15 16:41:15 +0000
@@ -47,7 +47,7 @@
         """
         QtGui.QDialog.__init__(self, parent)
         self.setupUi(self)
-        self.preLoad()
+        self._loadDisplayTags()
         QtCore.QObject.connect(self.tagTableWidget,
             QtCore.SIGNAL(u'clicked(QModelIndex)'), self.onRowSelected)
         QtCore.QObject.connect(self.defaultPushButton,
@@ -66,12 +66,12 @@
         Load Display and set field state.
         """
         # Create initial copy from master
-        self.preLoad()
+        self._loadDisplayTags()
         self._resetTable()
         self.selected = -1
         return QtGui.QDialog.exec_(self)
 
-    def preLoad(self):
+    def _loadDisplayTags(self):
         """
         Load the Tags from store so can be used in the system or used to
         update the display. If Cancel was selected this is needed to reset the