Skip to content

Commit

Permalink
python console: workaround for PyQt 4.11 problem
Browse files Browse the repository at this point in the history
  • Loading branch information
jef-n committed Jun 17, 2014
1 parent 28d6249 commit 3f62330
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 10 deletions.
15 changes: 5 additions & 10 deletions python/console/console.py
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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)
Expand Down Expand Up @@ -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)
Expand Down
3 changes: 3 additions & 0 deletions python/console/console_settings.ui
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down

0 comments on commit 3f62330

Please sign in to comment.