python console: workaround for PyQt 4.11 problem

Author: jef-n

python/console/console.py

@@ -96,8 +96,6 @@ def __init__(self, parent=None):
 
         self.settings = QSettings()
 
-        self.options = optionsDialog(self)
-
         self.shell = ShellScintilla(self)
         self.setFocusProxy(self.shell)
         self.shellOut = ShellOutputScintilla(self)
@@ -534,8 +532,6 @@ def __init__(self, parent=None):
         self.saveFileButton.triggered.connect(self.saveScriptFile)
         self.saveAsFileButton.triggered.connect(self.saveAsScriptFile)
         self.helpButton.triggered.connect(self.openHelp)
-        self.connect(self.options.buttonBox, SIGNAL("accepted()"),
-                     self.prefChanged)
         self.connect(self.listClassMethod, SIGNAL('itemClicked(QTreeWidgetItem*, int)'),
                      self.onClickGoToLine)
         self.lineEditFind.returnPressed.connect(self._findText)
@@ -681,12 +677,11 @@ def openHelp(self):
         QgsContextHelp.run( "PythonConsole" )
 
     def openSettings(self):
-        self.options.exec_()
-
-    def prefChanged(self):
-        self.shell.refreshSettingsShell()
-        self.shellOut.refreshSettingsOutput()
-        self.tabEditorWidget.refreshSettingsEditor()
+        options = optionsDialog(self)
+        if options.exec_():
+            self.shell.refreshSettingsShell()
+            self.shellOut.refreshSettingsOutput()
+            self.tabEditorWidget.refreshSettingsEditor()
 
     def callWidgetMessageBar(self, text):
         self.shellOut.widgetMessageBar(iface, text)

python/console/console_settings.ui

@@ -180,6 +180,9 @@
               <property name="gridStyle">
                <enum>Qt::SolidLine</enum>
               </property>
+              <property name="columnCount">
+               <number>2</number>
+              </property>
               <property name="rowCount">
                <number>0</number>
               </property>