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

Moved cancel button call to advancedtab

Browse Source
This commit is contained in:
Stevan Pettit 2012-06-08 15:27:08 -04:00
parent de15cf85a3
commit b8cd0dc7b3
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
openlp/core/ui/advancedtab.py
View File

@ -590,6 +590,10 @@ class AdvancedTab(SettingsTab):
self.displayChanged = False
Receiver.send_message(u'slidecontroller_update_slide_limits')
def cancel(self):
# Dialogue was cancelled, remove any pending data path change.
self.onDataDirectoryCancelButtonClicked()
def serviceNameCheckBoxToggled(self, default_service_enabled):
self.serviceNameDay.setEnabled(default_service_enabled)
time_enabled = default_service_enabled and \

2
openlp/core/ui/settingsform.py
View File

@ -102,8 +102,6 @@ class SettingsForm(QtGui.QDialog, Ui_SettingsDialog):
"""
Process the form saving the settings
"""
# Dialogue was cancelled, remove any pending data path change.
self.advancedTab.onDataDirectoryCancelButtonClicked();
for tabIndex in range(self.stackedLayout.count()):
self.stackedLayout.widget(tabIndex).cancel()
return QtGui.QDialog.reject(self)