[pyqgis-console] small fix for autocompletion bracket, also sets to False the default setting

slarosa · slarosa · commit c2310fdbdbf0 · 2013-08-27T13:21:53.000+02:00
diff --git a/python/console/console_editor.py b/python/console/console_editor.py
@@ -650,7 +650,7 @@ def syntaxCheck(self, filename=None, fromContextMenu=True):
             return True
 
     def keyPressEvent(self, e):
-        if self.settings.value("pythonConsole/autoCloseBracketEditor", True, type=bool):
+        if self.settings.value("pythonConsole/autoCloseBracketEditor", False, type=bool):
             startLine, _, endLine, endPos = self.getSelection()
             t = unicode(e.text())
             ## Close bracket automatically
@@ -674,7 +674,7 @@ def keyPressEvent(self, e):
                     self.insert(self.closing[i])
             ## FIXES #8392 (automatically removes the redundant char
             ## when autoclosing brackets option is enabled)
-            if t in self.closing:
+            if t in [')', ']', '}']:
                 l, pos = self.getCursorPosition()
                 txt = self.text(l)
                 try:
diff --git a/python/console/console_sci.py b/python/console/console_sci.py
@@ -410,7 +410,7 @@ def keyPressEvent(self, e):
             self.showNext()
         ## TODO: press event for auto-completion file directory
         else:
-            if self.settings.value("pythonConsole/autoCloseBracket", True, type=bool):
+            if self.settings.value("pythonConsole/autoCloseBracket", False, type=bool):
                 t = unicode(e.text())
                 ## Close bracket automatically
                 if t in self.opening:
@@ -425,7 +425,7 @@ def keyPressEvent(self, e):
                         self.insert(self.closing[i])
                 ## FIXES #8392 (automatically removes the redundant char
                 ## when autoclosing brackets option is enabled)
-                if t in self.closing:
+                if t in [')', ']', '}']:
                     l, pos = self.getCursorPosition()
                     txt = self.text(l)
                     try:
diff --git a/python/console/console_settings.py b/python/console/console_settings.py
@@ -201,8 +201,8 @@ def restoreSettings(self):
         self.autoCompThresholdEditor.setValue(settings.value("pythonConsole/autoCompThresholdEditor", 2, type=int))
 
         self.enableObjectInspector.setChecked(settings.value("pythonConsole/enableObjectInsp", False, type=bool))
-        self.autoCloseBracketEditor.setChecked(settings.value("pythonConsole/autoCloseBracketEditor", True, type=bool))
-        self.autoCloseBracket.setChecked(settings.value("pythonConsole/autoCloseBracket", True, type=bool))
+        self.autoCloseBracketEditor.setChecked(settings.value("pythonConsole/autoCloseBracketEditor", False, type=bool))
+        self.autoCloseBracket.setChecked(settings.value("pythonConsole/autoCloseBracket", False, type=bool))
 
         if settings.value("pythonConsole/autoCompleteSource") == 'fromDoc':
             self.autoCompFromDoc.setChecked(True)
