sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-04-14 00:07:35 -04:00
Code Issues Packages Projects Releases Wiki Activity

[pyqgis-console] reject changes in settings if they are not applied

Browse Source
This commit is contained in:
Salvatore Larosa 2013-09-17 00:11:27 +02:00
parent 959862c130
commit 2d728d7f4c
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
python/console/console.py
View File

@ -684,7 +684,6 @@ class PythonConsoleWidget(QWidget):
QgsContextHelp.run( "PythonConsole" )
def openSettings(self):
self.options.restoreSettings()
self.options.exec_()
def prefChanged(self):

6
python/console/console_settings.py
View File

@ -35,7 +35,7 @@ class optionsDialog(QDialog, Ui_SettingsDialogPythonConsole):
self.listPath = []
self.lineEdit.setReadOnly(True)
#self.restoreSettings()
self.restoreSettings()
self.initialCheck()
self.addAPIpath.setIcon(QIcon(":/images/themes/default/symbologyAdd.png"))
@ -210,6 +210,7 @@ class optionsDialog(QDialog, Ui_SettingsDialogPythonConsole):
self.lineEdit.setText(settings.value("pythonConsole/preparedAPIFile", "", type=str))
itemTable = settings.value("pythonConsole/userAPI", [])
if itemTable:
self.tableWidget.setRowCount(0)
for i in range(len(itemTable)):
self.tableWidget.insertRow(i)
self.tableWidget.setColumnCount(2)
@ -221,6 +222,8 @@ class optionsDialog(QDialog, Ui_SettingsDialogPythonConsole):
self.autoCompThreshold.setValue(settings.value("pythonConsole/autoCompThreshold", 2, type=int))
self.autoCompThresholdEditor.setValue(settings.value("pythonConsole/autoCompThresholdEditor", 2, type=int))
self.groupBoxAutoCompletionEditor.setChecked(settings.value("pythonConsole/autoCompleteEnabledEditor", True, type=bool))
self.groupBoxAutoCompletion.setChecked(settings.value("pythonConsole/autoCompleteEnabled", True, type=bool))
self.enableObjectInspector.setChecked(settings.value("pythonConsole/enableObjectInsp", False, type=bool))
self.autoCloseBracketEditor.setChecked(settings.value("pythonConsole/autoCloseBracketEditor", False, type=bool))
@ -285,4 +288,5 @@ class optionsDialog(QDialog, Ui_SettingsDialogPythonConsole):
# return obj.setButtonBackground()
def reject(self):
self.restoreSettings()
QDialog.reject(self)