From 2d728d7f4c33bc58289df5fe2b704d2645df9a21 Mon Sep 17 00:00:00 2001 From: Salvatore Larosa Date: Tue, 17 Sep 2013 00:11:27 +0200 Subject: [PATCH] [pyqgis-console] reject changes in settings if they are not applied --- python/console/console.py | 1 - python/console/console_settings.py | 6 +++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/python/console/console.py b/python/console/console.py index 7eb9e669f5f6..cd59ef378b12 100644 --- a/python/console/console.py +++ b/python/console/console.py @@ -684,7 +684,6 @@ def openHelp(self): QgsContextHelp.run( "PythonConsole" ) def openSettings(self): - self.options.restoreSettings() self.options.exec_() def prefChanged(self): diff --git a/python/console/console_settings.py b/python/console/console_settings.py index 7a745ffbbfa0..39af7e637a85 100644 --- a/python/console/console_settings.py +++ b/python/console/console_settings.py @@ -35,7 +35,7 @@ def __init__(self, parent): 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 @@ def restoreSettings(self): 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 @@ def restoreSettings(self): 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 @@ def _resetFontColorEditor(self): # return obj.setButtonBackground() def reject(self): + self.restoreSettings() QDialog.reject(self)