From 0786f2059ea783a03087e90e5e9c286569e5a9ab Mon Sep 17 00:00:00 2001
From: Tim Bentley <tim.bentley@gmail.com>
Date: Sun, 15 May 2011 16:52:20 +0100
Subject: [PATCH 1/2] Add dialog reset on cancelled exit of Settings. Remove
 PreLoad() is no longer needed. Rename preLoad is displayTags to say what it
 means.

Fixes: https://launchpad.net/bugs/778537
---
 openlp/core/lib/settingstab.py   | 11 ++---------
 openlp/core/ui/displaytagform.py |  6 +++---
 2 files changed, 5 insertions(+), 12 deletions(-)

diff --git a/openlp/core/lib/settingstab.py b/openlp/core/lib/settingstab.py
index e1396d984..42823a701 100644
--- a/openlp/core/lib/settingstab.py
+++ b/openlp/core/lib/settingstab.py
@@ -50,7 +50,6 @@ class SettingsTab(QtGui.QWidget):
         self.setupUi()
         self.retranslateUi()
         self.initialise()
-        self.preLoad()
         self.load()
 
     def setupUi(self):
@@ -86,12 +85,6 @@ class SettingsTab(QtGui.QWidget):
         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 @@ class SettingsTab(QtGui.QWidget):
 
     def cancel(self):
         """
-        Reset any settings
+        Reset any settings if cance pressed
         """
-        pass
+        self.load()
 
     def postSetUp(self, postUpdate=False):
         """
diff --git a/openlp/core/ui/displaytagform.py b/openlp/core/ui/displaytagform.py
index b8169b9be..c439fc116 100644
--- a/openlp/core/ui/displaytagform.py
+++ b/openlp/core/ui/displaytagform.py
@@ -47,7 +47,7 @@ class DisplayTagForm(QtGui.QDialog, Ui_DisplayTagDialog):
         """
         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 @@ class DisplayTagForm(QtGui.QDialog, Ui_DisplayTagDialog):
         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

From 9fc67eba68be99ee447e876961819713dee58ff8 Mon Sep 17 00:00:00 2001
From: Tim Bentley <tim.bentley@gmail.com>
Date: Sun, 15 May 2011 17:36:34 +0100
Subject: [PATCH 2/2] Spelling

---
 openlp/core/lib/settingstab.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/openlp/core/lib/settingstab.py b/openlp/core/lib/settingstab.py
index 42823a701..53fd37ed9 100644
--- a/openlp/core/lib/settingstab.py
+++ b/openlp/core/lib/settingstab.py
@@ -111,7 +111,7 @@ class SettingsTab(QtGui.QWidget):
 
     def cancel(self):
         """
-        Reset any settings if cance pressed
+        Reset any settings if cancel pressed
         """
         self.load()