Skip to content

Commit 2d728d7

Browse files
committedSep 16, 2013
[pyqgis-console] reject changes in settings if they are not applied
1 parent 959862c commit 2d728d7

File tree

2 files changed

+5
-2
lines changed

2 files changed

+5
-2
lines changed
 

‎python/console/console.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -684,7 +684,6 @@ def openHelp(self):
684684
QgsContextHelp.run( "PythonConsole" )
685685

686686
def openSettings(self):
687-
self.options.restoreSettings()
688687
self.options.exec_()
689688

690689
def prefChanged(self):

‎python/console/console_settings.py

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ def __init__(self, parent):
3535
self.listPath = []
3636
self.lineEdit.setReadOnly(True)
3737

38-
#self.restoreSettings()
38+
self.restoreSettings()
3939
self.initialCheck()
4040

4141
self.addAPIpath.setIcon(QIcon(":/images/themes/default/symbologyAdd.png"))
@@ -210,6 +210,7 @@ def restoreSettings(self):
210210
self.lineEdit.setText(settings.value("pythonConsole/preparedAPIFile", "", type=str))
211211
itemTable = settings.value("pythonConsole/userAPI", [])
212212
if itemTable:
213+
self.tableWidget.setRowCount(0)
213214
for i in range(len(itemTable)):
214215
self.tableWidget.insertRow(i)
215216
self.tableWidget.setColumnCount(2)
@@ -221,6 +222,8 @@ def restoreSettings(self):
221222

222223
self.autoCompThreshold.setValue(settings.value("pythonConsole/autoCompThreshold", 2, type=int))
223224
self.autoCompThresholdEditor.setValue(settings.value("pythonConsole/autoCompThresholdEditor", 2, type=int))
225+
self.groupBoxAutoCompletionEditor.setChecked(settings.value("pythonConsole/autoCompleteEnabledEditor", True, type=bool))
226+
self.groupBoxAutoCompletion.setChecked(settings.value("pythonConsole/autoCompleteEnabled", True, type=bool))
224227

225228
self.enableObjectInspector.setChecked(settings.value("pythonConsole/enableObjectInsp", False, type=bool))
226229
self.autoCloseBracketEditor.setChecked(settings.value("pythonConsole/autoCloseBracketEditor", False, type=bool))
@@ -285,4 +288,5 @@ def _resetFontColorEditor(self):
285288
# return obj.setButtonBackground()
286289

287290
def reject(self):
291+
self.restoreSettings()
288292
QDialog.reject(self)

0 commit comments

Comments
 (0)
Please sign in to comment.