raoul/openlp
1
0
Fork 0
forked from openlp/openlp
Code Issues Pull Requests Projects Releases Wiki Activity

Add dialog reset on cancelled exit of Settings.

Browse Source 
Remove PreLoad() is no longer needed.
Rename preLoad is displayTags to say what it means.

Fixes: https://launchpad.net/bugs/778537
This commit is contained in:
Tim Bentley 2011-05-15 16:52:20 +01:00
parent 0854919976
commit 0786f2059e
2 changed files with 5 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
openlp/core/lib/settingstab.py
View File

@ -50,7 +50,6 @@ class SettingsTab(QtGui.QWidget):
self.setupUi() self.setupUi()
self.retranslateUi() self.retranslateUi()
self.initialise() self.initialise()
self.preLoad()
self.load() self.load()
def setupUi(self): def setupUi(self):
@ -86,12 +85,6 @@ class SettingsTab(QtGui.QWidget):
left_width = max(left_width, self.leftColumn.minimumSizeHint().width()) left_width = max(left_width, self.leftColumn.minimumSizeHint().width())
self.leftColumn.setFixedWidth(left_width) self.leftColumn.setFixedWidth(left_width)
def preLoad(self):
"""
Setup the tab's interface.
"""
pass
def retranslateUi(self): def retranslateUi(self):
""" """
Setup the interface translation strings. Setup the interface translation strings.
@ -118,9 +111,9 @@ class SettingsTab(QtGui.QWidget):
def cancel(self): def cancel(self):
""" """
Reset any settings Reset any settings if cance pressed
""" """
pass self.load()
def postSetUp(self, postUpdate=False): def postSetUp(self, postUpdate=False):
""" """

6
openlp/core/ui/displaytagform.py
View File

@ -47,7 +47,7 @@ class DisplayTagForm(QtGui.QDialog, Ui_DisplayTagDialog):
""" """
QtGui.QDialog.__init__(self, parent) QtGui.QDialog.__init__(self, parent)
self.setupUi(self) self.setupUi(self)
self.preLoad() self._loadDisplayTags()
QtCore.QObject.connect(self.tagTableWidget, QtCore.QObject.connect(self.tagTableWidget,
QtCore.SIGNAL(u'clicked(QModelIndex)'), self.onRowSelected) QtCore.SIGNAL(u'clicked(QModelIndex)'), self.onRowSelected)
QtCore.QObject.connect(self.defaultPushButton, QtCore.QObject.connect(self.defaultPushButton,
@ -66,12 +66,12 @@ class DisplayTagForm(QtGui.QDialog, Ui_DisplayTagDialog):
Load Display and set field state. Load Display and set field state.
""" """
# Create initial copy from master # Create initial copy from master
self.preLoad() self._loadDisplayTags()
self._resetTable() self._resetTable()
self.selected = -1 self.selected = -1
return QtGui.QDialog.exec_(self) 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 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 update the display. If Cancel was selected this is needed to reset the