Skip to content

Commit f68b688

Browse files
brushtylerbrushtyler
committedOct 30, 2012
Merge pull request #308 from slarosa/master
Add UI file for help - PyQGIS Console
·
ltr-3_40Before-merge-new_vector_api
2 parents 234709d + 10178d7 commit f68b688

File tree

5 files changed

+121
-52
lines changed

5 files changed

+121
-52
lines changed
 

‎python/console.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -348,7 +348,7 @@ def saveScriptFile(self):
348348
sF.close()
349349

350350
def openHelp(self):
351-
dlg = HelpDialog()
351+
dlg = HelpDialog(self)
352352
dlg.exec_()
353353

354354
def openSettings(self):

‎python/console_help.py

Lines changed: 8 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -23,38 +23,22 @@
2323
# This will get replaced with a git SHA1 when you do a git archive
2424
__revision__ = '$Format:%H$'
2525

26-
from PyQt4 import QtCore, QtGui, QtWebKit
26+
from PyQt4.QtWebKit import *
2727
from PyQt4.QtCore import *
2828
from PyQt4.QtGui import *
29+
from ui_console_help import Ui_Help
2930
from qgis.core import QgsApplication
3031
import os
3132

32-
class HelpDialog(QtGui.QDialog):
33-
34-
def __init__(self):
35-
QtGui.QDialog.__init__(self)
33+
class HelpDialog(QDialog, Ui_Help):
34+
def __init__(self, parent):
35+
QDialog.__init__(self, parent)
3636
self.setModal(True)
37-
self.setupUi()
37+
self.setupUi(self)
3838

39-
def setupUi(self):
40-
self.setMaximumSize(500, 300)
41-
self.webView = QtWebKit.QWebView()
4239
self.setWindowTitle(QCoreApplication.translate("PythonConsole","Help Python Console"))
43-
self.verticalLayout= QtGui.QVBoxLayout()
44-
self.verticalLayout.setSpacing(2)
45-
self.verticalLayout.setMargin(0)
46-
self.verticalLayout.addWidget(self.webView)
47-
self.closeButton = QtGui.QPushButton()
48-
self.closeButton.setText("Close")
49-
self.closeButton.setMaximumWidth(150)
50-
self.horizontalLayout= QtGui.QHBoxLayout()
51-
self.horizontalLayout.setSpacing(2)
52-
self.horizontalLayout.setMargin(0)
53-
self.horizontalLayout.addStretch(1000)
54-
self.horizontalLayout.addWidget(self.closeButton)
55-
QObject.connect(self.closeButton, QtCore.SIGNAL("clicked()"), self.closeWindow)
56-
self.verticalLayout.addLayout(self.horizontalLayout)
57-
self.setLayout(self.verticalLayout)
40+
self.setMaximumSize(500, 300)
41+
5842
qgisDataDir = QgsApplication.pkgDataPath()
5943
listFile = os.listdir(qgisDataDir + "/python/console_help/i18n")
6044
localeFullName = QSettings().value( "locale/userLocale", QVariant( "" ) ).toString()
@@ -70,6 +54,3 @@ def setupUi(self):
7054

7155
url = QtCore.QUrl(filename)
7256
self.webView.load(url)
73-
74-
def closeWindow(self):
75-
self.close()

‎python/console_help.ui

Lines changed: 98 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,98 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<ui version="4.0">
3+
<class>Help</class>
4+
<widget class="QDialog" name="Help">
5+
<property name="geometry">
6+
<rect>
7+
<x>0</x>
8+
<y>0</y>
9+
<width>519</width>
10+
<height>328</height>
11+
</rect>
12+
</property>
13+
<property name="windowTitle">
14+
<string>Dialog</string>
15+
</property>
16+
<property name="sizeGripEnabled">
17+
<bool>false</bool>
18+
</property>
19+
<layout class="QGridLayout" name="gridLayout">
20+
<property name="leftMargin">
21+
<number>2</number>
22+
</property>
23+
<property name="topMargin">
24+
<number>2</number>
25+
</property>
26+
<property name="rightMargin">
27+
<number>2</number>
28+
</property>
29+
<property name="bottomMargin">
30+
<number>4</number>
31+
</property>
32+
<property name="horizontalSpacing">
33+
<number>6</number>
34+
</property>
35+
<item row="0" column="0">
36+
<widget class="QWebView" name="webView">
37+
<property name="url">
38+
<url>
39+
<string>about:blank</string>
40+
</url>
41+
</property>
42+
</widget>
43+
</item>
44+
<item row="1" column="0">
45+
<widget class="QDialogButtonBox" name="buttonBox">
46+
<property name="orientation">
47+
<enum>Qt::Horizontal</enum>
48+
</property>
49+
<property name="standardButtons">
50+
<set>QDialogButtonBox::Close</set>
51+
</property>
52+
</widget>
53+
</item>
54+
</layout>
55+
</widget>
56+
<customwidgets>
57+
<customwidget>
58+
<class>QWebView</class>
59+
<extends>QWidget</extends>
60+
<header>QtWebKit/QWebView</header>
61+
</customwidget>
62+
</customwidgets>
63+
<resources/>
64+
<connections>
65+
<connection>
66+
<sender>buttonBox</sender>
67+
<signal>accepted()</signal>
68+
<receiver>Help</receiver>
69+
<slot>accept()</slot>
70+
<hints>
71+
<hint type="sourcelabel">
72+
<x>248</x>
73+
<y>254</y>
74+
</hint>
75+
<hint type="destinationlabel">
76+
<x>157</x>
77+
<y>274</y>
78+
</hint>
79+
</hints>
80+
</connection>
81+
<connection>
82+
<sender>buttonBox</sender>
83+
<signal>rejected()</signal>
84+
<receiver>Help</receiver>
85+
<slot>reject()</slot>
86+
<hints>
87+
<hint type="sourcelabel">
88+
<x>316</x>
89+
<y>260</y>
90+
</hint>
91+
<hint type="destinationlabel">
92+
<x>286</x>
93+
<y>274</y>
94+
</hint>
95+
</hints>
96+
</connection>
97+
</connections>
98+
</ui>

‎python/console_sci.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@
2828

2929
import sys
3030
import os
31-
import traceback
3231
import code
3332

3433
_init_commands = ["from qgis.core import *", "import qgis.utils"]

‎python/console_settings.ui

Lines changed: 14 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@
8686
</property>
8787
</spacer>
8888
</item>
89-
<item row="2" column="0">
89+
<item row="3" column="0">
9090
<layout class="QHBoxLayout" name="horizontalLayout_2">
9191
<item>
9292
<widget class="QLabel" name="label_2">
@@ -107,17 +107,7 @@
107107
</item>
108108
</layout>
109109
</item>
110-
<item row="3" column="0">
111-
<widget class="QCheckBox" name="preloadAPI">
112-
<property name="text">
113-
<string>Use preloaded API file</string>
114-
</property>
115-
<property name="checked">
116-
<bool>true</bool>
117-
</property>
118-
</widget>
119-
</item>
120-
<item row="4" column="0">
110+
<item row="5" column="0">
121111
<layout class="QGridLayout" name="gridLayout">
122112
<item row="0" column="0">
123113
<widget class="QTableWidget" name="tableWidget">
@@ -219,7 +209,7 @@
219209
</item>
220210
</layout>
221211
</item>
222-
<item row="5" column="0">
212+
<item row="6" column="0">
223213
<widget class="QDialogButtonBox" name="buttonBox">
224214
<property name="orientation">
225215
<enum>Qt::Horizontal</enum>
@@ -229,19 +219,20 @@
229219
</property>
230220
</widget>
231221
</item>
222+
<item row="2" column="0">
223+
<widget class="QCheckBox" name="preloadAPI">
224+
<property name="text">
225+
<string>Use preloaded API file</string>
226+
</property>
227+
<property name="checked">
228+
<bool>true</bool>
229+
</property>
230+
</widget>
231+
</item>
232232
</layout>
233233
<zorder>buttonBox</zorder>
234-
<zorder>layoutWidget</zorder>
235-
<zorder>layoutWidget_2</zorder>
236-
<zorder>layoutWidget_3</zorder>
237-
<zorder>label</zorder>
238-
<zorder>fontComboBox</zorder>
239-
<zorder>label_3</zorder>
240-
<zorder>fontComboBox</zorder>
241-
<zorder>label</zorder>
242-
<zorder>label_3</zorder>
243-
<zorder>preloadAPI</zorder>
244234
<zorder>verticalSpacer_2</zorder>
235+
<zorder>preloadAPI</zorder>
245236
</widget>
246237
<resources/>
247238
<connections>

0 commit comments

Comments
 (0)
Please sign in to comment.