Skip to content

Commit

Permalink
Merge pull request #330 from slarosa/master
Browse files Browse the repository at this point in the history
minor fix for python console
  • Loading branch information
brushtyler committed Nov 16, 2012
2 parents 845edd9 + 01775ce commit 2ddc753
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 5 deletions.
Binary file modified images/console/iconHideToolConsole.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
7 changes: 4 additions & 3 deletions python/console/console.py
Expand Up @@ -91,6 +91,7 @@ def __init__(self, parent=None):
#self.widgetEditors = QWidget()

self.options = optionsDialog(self)
self.helpDlg = HelpDialog(self)

self.splitter = QSplitter(self)
self.splitter.setOrientation(Qt.Vertical)
Expand Down Expand Up @@ -355,9 +356,9 @@ def saveScriptFile(self):
sF.close()

def openHelp(self):
dlg = HelpDialog()
dlg.exec_()

self.helpDlg.show()
self.helpDlg.activateWindow()
def openSettings(self):
#options = optionsDialog()
self.options.exec_()
Expand Down
3 changes: 1 addition & 2 deletions python/console/console_help.py
Expand Up @@ -30,11 +30,10 @@
import os

class HelpDialog(QDialog, Ui_Help):
def __init__(self, parent=None):
def __init__(self, parent):
QDialog.__init__(self, parent)
self.setupUi(self)

self.setWindowModality(Qt.WindowModal)
self.setWindowTitle(QCoreApplication.translate("PythonConsole","Help Python Console"))
self.setMaximumSize(530, 300)

Expand Down

0 comments on commit 2ddc753

Please sign in to comment.