Skip to content

Commit cc7eb27

Browse files
alexbruyalexbruy
committedMay 27, 2016
[processing] drop WebView dependency (follow up 38f6ace)
·
ltr-3_40archive/master_2
1 parent dd69a59 commit cc7eb27

23 files changed

+147
-222
lines changed
 

‎python/plugins/processing/algs/examplescripts/ProcessingExampleScriptsPlugin.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,10 +29,11 @@
2929

3030
from processing.core.Processing import Processing
3131

32+
3233
class ProcessingExampleScriptsPlugin:
3334

3435
def initGui(self):
3536
Processing.addScripts(os.path.join(os.path.dirname(__file__), "scripts"))
36-
37+
3738
def unload(self):
3839
Processing.removeScripts(os.path.join(os.path.dirname(__file__), "scripts"))

‎python/plugins/processing/algs/examplescripts/scripts/examplescript.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
##text=string
22

3-
print text
3+
print text

‎python/plugins/processing/algs/grass/GrassAlgorithmProvider.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,8 +55,8 @@ def initializeSettings(self):
5555
GrassUtils.grassPath(), valuetype=Setting.FOLDER))
5656
if isWindows():
5757
ProcessingConfig.addSetting(Setting(self.getDescription(),
58-
GrassUtils.GRASS_WIN_SHELL, self.tr('Msys folder'),
59-
GrassUtils.grassWinShell(), valuetype=Setting.FOLDER))
58+
GrassUtils.GRASS_WIN_SHELL, self.tr('Msys folder'),
59+
GrassUtils.grassWinShell(), valuetype=Setting.FOLDER))
6060
ProcessingConfig.addSetting(Setting(self.getDescription(),
6161
GrassUtils.GRASS_LOG_COMMANDS,
6262
self.tr('Log execution commands'), False))

‎python/plugins/processing/algs/otb/OTBUtils.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -161,7 +161,7 @@ def executeOtb(commands, progress, addToLog=True):
161161
os.putenv('ITK_AUTOLOAD_PATH', otbLibPath())
162162
fused_command = ''.join(['"%s" ' % re.sub(r'^"|"$', '', c) for c in commands])
163163
proc = subprocess.Popen(fused_command, shell=True, stdout=subprocess.PIPE, stdin=open(os.devnull), stderr=subprocess.STDOUT, universal_newlines=True).stdout
164-
if isMac(): #This trick avoids having an uninterrupted system call exception if OTB is not installed
164+
if isMac(): # This trick avoids having an uninterrupted system call exception if OTB is not installed
165165
time.sleep(1)
166166
for line in iter(proc.readline, ""):
167167
if "[*" in line:

‎python/plugins/processing/algs/qgis/QGISAlgorithmProvider.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -222,8 +222,8 @@ def __init__(self):
222222
from .ExecuteSQL import ExecuteSQL
223223
self.alglist.extend([ExecuteSQL()])
224224

225-
self.externalAlgs = [] #to store algs added by 3rd party plugins as scripts
226-
225+
self.externalAlgs = [] # to store algs added by 3rd party plugins as scripts
226+
227227
folder = os.path.join(os.path.dirname(__file__), 'scripts')
228228
scripts = ScriptUtils.loadFromFolder(folder)
229229
for script in scripts:

‎python/plugins/processing/algs/saga/SagaUtils.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@ def getSagaInstalledVersion(runSaga=False):
134134
stderr=subprocess.STDOUT,
135135
universal_newlines=True,
136136
).stdout
137-
if isMac(): #This trick avoids having an uninterrupted system call exception if SAGA is not installed
137+
if isMac(): # This trick avoids having an uninterrupted system call exception if SAGA is not installed
138138
time.sleep(1)
139139
try:
140140
lines = proc.readlines()

‎python/plugins/processing/core/Processing.py

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -64,11 +64,11 @@
6464
from processing.algs.taudem.TauDEMAlgorithmProvider import TauDEMAlgorithmProvider
6565
from processing.preconfigured.PreconfiguredAlgorithmProvider import PreconfiguredAlgorithmProvider
6666

67+
6768
class Processing:
6869

6970
providers = []
7071

71-
7272
# Same structure as algs in algList
7373
actions = {}
7474

@@ -134,8 +134,8 @@ def initialize():
134134
ProcessingConfig.initialize()
135135
ProcessingConfig.readSettings()
136136
RenderingStyles.loadStyles()
137-
138-
@staticmethod
137+
138+
@staticmethod
139139
def addScripts(folder):
140140
Processing.initialize()
141141
provider = Processing.getProviderFromName("qgis")
@@ -145,19 +145,17 @@ def addScripts(folder):
145145
script.allowEdit = False
146146
script._icon = provider._icon
147147
script.provider = provider
148-
provider.externalAlgs.extend(scripts)
148+
provider.externalAlgs.extend(scripts)
149149
Processing.reloadProvider("qgis")
150-
151-
150+
152151
@staticmethod
153152
def removeScripts(folder):
154153
provider = Processing.getProviderFromName("qgis")
155154
for alg in provider.externalAlgs[::-1]:
156155
path = os.path.dirname(alg.descriptionFile)
157156
if path == folder:
158-
provider.externalAlgs.remove(alg)
157+
provider.externalAlgs.remove(alg)
159158
Processing.reloadProvider("qgis")
160-
161159

162160
@staticmethod
163161
def updateAlgsList():

‎python/plugins/processing/core/alglist.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@
2727

2828
from qgis.PyQt.QtCore import QObject, pyqtSignal
2929

30+
3031
class AlgorithmList(QObject):
3132

3233
providerAdded = pyqtSignal(str)
@@ -76,4 +77,4 @@ def getAlgorithmFromFullName(self, name):
7677
if alg.name == name:
7778
return alg
7879

79-
algList = AlgorithmList()
80+
algList = AlgorithmList()

‎python/plugins/processing/core/defaultproviders.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@
2626
__revision__ = '$Format:%H$'
2727

2828

29-
3029
def loadDefaultProviders():
3130
# this is here just to "trigger" the above imports so providers are loaded
3231
# and can be found by the Processing.initialize() method

‎python/plugins/processing/gui/AlgorithmDialogBase.py

Lines changed: 22 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@
3131
from qgis.PyQt import uic
3232
from qgis.PyQt.QtCore import QCoreApplication, QSettings, QByteArray, QUrl
3333
from qgis.PyQt.QtWidgets import QApplication, QDialogButtonBox, QDesktopWidget
34+
from qgis.PyQt.QtNetwork import QNetworkRequest, QNetworkReply
3435

3536
from qgis.utils import iface
3637
from qgis.core import QgsNetworkAccessManager
@@ -63,9 +64,9 @@ def __init__(self, alg):
6364

6465
self.setWindowTitle(self.alg.displayName())
6566

66-
desktop = QDesktopWidget()
67-
if desktop.physicalDpiX() > 96:
68-
self.textHelp.setZoomFactor(desktop.physicalDpiX() / 96)
67+
#~ desktop = QDesktopWidget()
68+
#~ if desktop.physicalDpiX() > 96:
69+
#~ self.txtHelp.setZoomFactor(desktop.physicalDpiX() / 96)
6970

7071
algHelp = self.alg.shortHelp()
7172
if algHelp is None:
@@ -83,27 +84,39 @@ def __init__(self, alg):
8384

8485
def linkClicked(url):
8586
webbrowser.open(url.toString())
86-
self.textShortHelp.anchorClicked.connect(linkClicked)
8787

88-
self.textHelp.page().setNetworkAccessManager(QgsNetworkAccessManager.instance())
88+
self.textShortHelp.anchorClicked.connect(linkClicked)
8989

9090
isText, algHelp = self.alg.help()
9191
if algHelp is not None:
9292
algHelp = algHelp if isText else QUrl(algHelp)
9393
try:
9494
if isText:
95-
self.textHelp.setHtml(algHelp)
95+
self.txtHelp.setHtml(algHelp)
9696
else:
97-
self.textHelp.settings().clearMemoryCaches()
98-
self.textHelp.load(algHelp)
99-
except:
97+
html = self.tr('<p>Downloading algorithm help... Please wait.</p>')
98+
self.txtHelp.setHtml(html)
99+
rq = QNetworkRequest(algHelp)
100+
self.reply = QgsNetworkAccessManager.instance().get(rq)
101+
self.reply.finished.connect(self.requestFinished)
102+
except Exception, e:
100103
self.tabWidget.removeTab(2)
101104
else:
102105
self.tabWidget.removeTab(2)
103106

104107
self.showDebug = ProcessingConfig.getSetting(
105108
ProcessingConfig.SHOW_DEBUG_IN_DIALOG)
106109

110+
def requestFinished(self):
111+
"""Change the webview HTML content"""
112+
reply = self.sender()
113+
if reply.error() != QNetworkReply.NoError:
114+
html = self.tr('<h2>No help available for this algorithm</h2><p>{}</p>'.format(reply.errorString()))
115+
else:
116+
html = unicode(reply.readAll())
117+
reply.deleteLater()
118+
self.txtHelp.setHtml(html)
119+
107120
def closeEvent(self, evt):
108121
self.settings.setValue("/Processing/dialogBase", self.saveGeometry())
109122
super(AlgorithmDialogBase, self).closeEvent(evt)

‎python/plugins/processing/gui/DeleteScriptAction.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@
3535
from processing.script.ScriptAlgorithm import ScriptAlgorithm
3636
from processing.core.alglist import algList
3737

38+
3839
class DeleteScriptAction(ContextAction):
3940

4041
SCRIPT_PYTHON = 0

‎python/plugins/processing/gui/EditScriptAction.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@
3131
from processing.script.ScriptAlgorithm import ScriptAlgorithm
3232
from processing.core.alglist import algList
3333

34+
3435
class EditScriptAction(ContextAction):
3536

3637
SCRIPT_PYTHON = 0

‎python/plugins/processing/gui/GetScriptsAndModels.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -208,10 +208,10 @@ def treeLoaded(self, reply):
208208
self.tree.addTopLevelItem(self.notinstalledItem)
209209
self.tree.addTopLevelItem(self.uptodateItem)
210210

211-
self.webView.setHtml(self.HELP_TEXT)
211+
self.txtHelp.setHtml(self.HELP_TEXT)
212212

213213
def setHelp(self, reply, item):
214-
"""Change the webview HTML content"""
214+
"""Change the HTML content"""
215215
QApplication.restoreOverrideCursor()
216216
if reply.error() != QNetworkReply.NoError:
217217
html = self.tr('<h2>No detailed description available for this script</h2>')
@@ -223,14 +223,14 @@ def setHelp(self, reply, item):
223223
html += self.tr('<p><b>Created by:</b> %s') % getDescription(ALG_CREATOR, descriptions)
224224
html += self.tr('<p><b>Version:</b> %s') % getDescription(ALG_VERSION, descriptions)
225225
reply.deleteLater()
226-
self.webView.setHtml(html)
226+
self.txtHelp.setHtml(html)
227227

228228
def currentItemChanged(self, item, prev):
229229
if isinstance(item, TreeItem):
230230
url = self.urlBase + item.filename.replace(' ', '%20') + '.help'
231231
self.grabHTTP(url, self.setHelp, item)
232232
else:
233-
self.webView.setHtml(self.HELP_TEXT)
233+
self.txtHelp.setHtml(self.HELP_TEXT)
234234

235235
def getTreeBranchForState(self, filename, version):
236236
if not os.path.exists(os.path.join(self.folder, filename)):

‎python/plugins/processing/gui/HelpEditionDialog.py

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,6 @@
1616
* *
1717
***************************************************************************
1818
"""
19-
from processing.modeler.ModelerAlgorithm import ModelerAlgorithm
20-
2119

2220
__author__ = 'Victor Olaya'
2321
__date__ = 'August 2012'
@@ -34,6 +32,7 @@
3432
from qgis.PyQt.QtWidgets import QDialog, QTreeWidgetItem
3533

3634
from processing.core.ProcessingLog import ProcessingLog
35+
from processing.modeler.ModelerAlgorithm import ModelerAlgorithm
3736

3837
pluginPath = os.path.split(os.path.dirname(__file__))[0]
3938
WIDGET, BASE = uic.loadUiType(
@@ -138,7 +137,7 @@ def changeItem(self):
138137
self.updateHtmlView()
139138

140139
def updateHtmlView(self):
141-
self.webView.setHtml(self.getHtml())
140+
self.txtPreview.setHtml(self.getHtml())
142141

143142
def getDescription(self, name):
144143
if name in self.descriptions:

‎python/plugins/processing/gui/ResultsDialog.py

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@
2626
__revision__ = '$Format:%H$'
2727

2828
import os
29+
import codecs
2930

3031
from qgis.PyQt import uic
3132
from qgis.PyQt.QtCore import QUrl
@@ -53,7 +54,7 @@ def __init__(self):
5354
self.fillTree()
5455

5556
if self.lastUrl:
56-
self.webView.load(self.lastUrl)
57+
self.txtResults.setHtml(self.loadResults(self.lastUrl))
5758

5859
def fillTree(self):
5960
elements = ProcessingResults.getResults()
@@ -64,13 +65,17 @@ def fillTree(self):
6465
item = TreeResultItem(element)
6566
item.setIcon(0, self.keyIcon)
6667
self.tree.addTopLevelItem(item)
67-
self.lastUrl = QUrl(elements[-1].filename)
68+
self.lastUrl = elements[-1].filename
6869

6970
def changeResult(self):
7071
item = self.tree.currentItem()
7172
if isinstance(item, TreeResultItem):
72-
url = QUrl(item.filename)
73-
self.webView.load(url)
73+
self.txtResults.setHtml(self.loadResults(item.filename))
74+
75+
def loadResults(self, fileName):
76+
with codecs.open(fileName, encoding='utf-8') as f:
77+
content = f.read()
78+
return content
7479

7580

7681
class TreeResultItem(QTreeWidgetItem):

‎python/plugins/processing/modeler/DeleteModelAction.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@
3131
from processing.modeler.ModelerAlgorithm import ModelerAlgorithm
3232
from processing.core.alglist import algList
3333

34+
3435
class DeleteModelAction(ContextAction):
3536

3637
def __init__(self):

‎python/plugins/processing/modeler/EditModelAction.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@
3030
from processing.modeler.ModelerDialog import ModelerDialog
3131
from processing.core.alglist import algList
3232

33+
3334
class EditModelAction(ContextAction):
3435

3536
def __init__(self):

‎python/plugins/processing/modeler/ModelerParametersDialog.py

Lines changed: 35 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,13 @@
2626
__revision__ = '$Format:%H$'
2727

2828
from qgis.PyQt.QtCore import Qt, QUrl, QMetaObject
29-
from qgis.PyQt.QtWidgets import QDialog, QDialogButtonBox, QLabel, QLineEdit, QFrame, QPushButton, QSizePolicy, QVBoxLayout, QHBoxLayout, QTabWidget, QWidget, QScrollArea, QComboBox, QTableWidgetItem, QMessageBox
30-
from qgis.core import QgsWebView
29+
from qgis.PyQt.QtWidgets import (QDialog, QDialogButtonBox, QLabel, QLineEdit,
30+
QFrame, QPushButton, QSizePolicy, QVBoxLayout,
31+
QHBoxLayout, QTabWidget, QWidget, QScrollArea,
32+
QComboBox, QTableWidgetItem, QMessageBox)
33+
from qgis.PyQt.QtNetwork import QNetworkRequest, QNetworkReply
34+
35+
from qgis.core import QgsNetworkAccessManager
3136

3237
from processing.gui.CrsSelectionPanel import CrsSelectionPanel
3338
from processing.gui.MultipleInputPanel import MultipleInputPanel
@@ -194,34 +199,44 @@ def setupUi(self):
194199
self.scrollArea.setWidget(self.paramPanel)
195200
self.scrollArea.setWidgetResizable(True)
196201
self.tabWidget.addTab(self.scrollArea, self.tr('Parameters'))
197-
self.webView = QgsWebView()
202+
203+
self.txtHelp = QTextBrowser()
198204

199205
html = None
200206
url = None
201-
isText, help = self._alg.help()
202-
if help is not None:
203-
if isText:
204-
html = help
205-
else:
206-
url = QUrl(help)
207-
else:
208-
html = self.tr('<h2>Sorry, no help is available for this '
209-
'algorithm.</h2>')
210-
try:
211-
if html:
212-
self.webView.setHtml(html)
213-
elif url:
214-
self.webView.load(url)
215-
except:
216-
self.webView.setHtml(self.tr('<h2>Could not open help file :-( </h2>'))
217-
self.tabWidget.addTab(self.webView, 'Help')
207+
isText, algHelp = self._alg.help()
208+
if algHelp is not None:
209+
algHelp = algHelp if isText else QUrl(algHelp)
210+
try:
211+
if isText:
212+
self.txtHelp.setHtml(algHelp)
213+
else:
214+
html = self.tr('<p>Downloading algorithm help... Please wait.</p>')
215+
self.txtHelp.setHtml(html)
216+
self.reply = QgsNetworkAccessManager.instance().get(QNetworkRequest(algHelp))
217+
self.reply.finished.connect(self.requestFinished)
218+
except:
219+
self.txtHelp.setHtml(self.tr('<h2>No help available for this algorithm</h2>'))
220+
221+
self.tabWidget.addTab(self.txtHelp, 'Help')
222+
218223
self.verticalLayout2.addWidget(self.tabWidget)
219224
self.verticalLayout2.addWidget(self.buttonBox)
220225
self.setLayout(self.verticalLayout2)
221226
self.buttonBox.accepted.connect(self.okPressed)
222227
self.buttonBox.rejected.connect(self.cancelPressed)
223228
QMetaObject.connectSlotsByName(self)
224229

230+
def requestFinished(self):
231+
"""Change the webview HTML content"""
232+
reply = self.sender()
233+
if reply.error() != QNetworkReply.NoError:
234+
html = self.tr('<h2>No help available for this algorithm</h2><p>{}</p>'.format(reply.errorString()))
235+
else:
236+
html = unicode(reply.readAll())
237+
reply.deleteLater()
238+
self.txtHelp.setHtml(html)
239+
225240
def getAvailableDependencies(self):
226241
if self._algName is None:
227242
dependent = []

‎python/plugins/processing/preconfigured/DeletePreconfiguredAlgorithmAction.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@
3131
from processing.preconfigured.PreconfiguredAlgorithm import PreconfiguredAlgorithm
3232
from processing.core.alglist import algList
3333

34+
3435
class DeletePreconfiguredAlgorithmAction(ContextAction):
3536

3637
def __init__(self):

‎python/plugins/processing/ui/DlgAlgorithmBase.ui

Lines changed: 1 addition & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -47,9 +47,6 @@
4747
</property>
4848
<item>
4949
<widget class="QTextEdit" name="txtLog">
50-
<property name="frameShape">
51-
<enum>QFrame::NoFrame</enum>
52-
</property>
5350
<property name="readOnly">
5451
<bool>true</bool>
5552
</property>
@@ -69,13 +66,7 @@
6966
<number>0</number>
7067
</property>
7168
<item>
72-
<widget class="QgsWebView" name="textHelp">
73-
<property name="url">
74-
<url>
75-
<string>about:blank</string>
76-
</url>
77-
</property>
78-
</widget>
69+
<widget class="QTextBrowser" name="txtHelp"/>
7970
</item>
8071
</layout>
8172
</widget>
@@ -131,13 +122,6 @@
131122
</item>
132123
</layout>
133124
</widget>
134-
<customwidgets>
135-
<customwidget>
136-
<class>QgsWebView</class>
137-
<extends>QWidget</extends>
138-
<header>qgis.core</header>
139-
</customwidget>
140-
</customwidgets>
141125
<resources/>
142126
<connections>
143127
<connection>

‎python/plugins/processing/ui/DlgGetScriptsAndModels.ui

Lines changed: 48 additions & 101 deletions
Original file line numberDiff line numberDiff line change
@@ -6,32 +6,20 @@
66
<rect>
77
<x>0</x>
88
<y>0</y>
9-
<width>826</width>
10-
<height>520</height>
9+
<width>504</width>
10+
<height>523</height>
1111
</rect>
1212
</property>
1313
<property name="windowTitle">
1414
<string>Get scripts and models</string>
1515
</property>
16-
<layout class="QVBoxLayout" name="verticalLayout">
17-
<item>
16+
<layout class="QGridLayout" name="gridLayout">
17+
<item row="0" column="0" colspan="2">
1818
<widget class="QSplitter" name="splitter">
1919
<property name="orientation">
2020
<enum>Qt::Horizontal</enum>
2121
</property>
2222
<widget class="QTreeWidget" name="tree">
23-
<property name="minimumSize">
24-
<size>
25-
<width>350</width>
26-
<height>0</height>
27-
</size>
28-
</property>
29-
<property name="maximumSize">
30-
<size>
31-
<width>100000</width>
32-
<height>100000</height>
33-
</size>
34-
</property>
3523
<property name="selectionMode">
3624
<enum>QAbstractItemView::SingleSelection</enum>
3725
</property>
@@ -59,96 +47,55 @@
5947
</property>
6048
</column>
6149
</widget>
62-
<widget class="QFrame" name="frame">
63-
<property name="frameShape">
64-
<enum>QFrame::StyledPanel</enum>
65-
</property>
66-
<property name="frameShadow">
67-
<enum>QFrame::Sunken</enum>
68-
</property>
69-
<layout class="QHBoxLayout" name="horizontalLayout">
70-
<property name="spacing">
71-
<number>0</number>
72-
</property>
73-
<property name="margin">
74-
<number>0</number>
75-
</property>
76-
<item>
77-
<widget class="QgsWebView" name="webView">
78-
<property name="maximumSize">
79-
<size>
80-
<width>10000</width>
81-
<height>10000</height>
82-
</size>
83-
</property>
84-
<property name="url">
85-
<url>
86-
<string>about:blank</string>
87-
</url>
88-
</property>
89-
</widget>
90-
</item>
91-
</layout>
92-
</widget>
50+
<widget class="QTextEdit" name="txtHelp"/>
9351
</widget>
9452
</item>
95-
<item>
96-
<layout class="QHBoxLayout" name="horizontalLayout_2">
97-
<item>
98-
<widget class="QProgressBar" name="progressBar">
99-
<property name="sizePolicy">
100-
<sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
101-
<horstretch>0</horstretch>
102-
<verstretch>0</verstretch>
103-
</sizepolicy>
104-
</property>
105-
<property name="minimumSize">
106-
<size>
107-
<width>0</width>
108-
<height>0</height>
109-
</size>
110-
</property>
111-
<property name="value">
112-
<number>0</number>
113-
</property>
114-
<property name="invertedAppearance">
115-
<bool>false</bool>
116-
</property>
117-
</widget>
118-
</item>
119-
<item>
120-
<widget class="QDialogButtonBox" name="buttonBox">
121-
<property name="sizePolicy">
122-
<sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
123-
<horstretch>0</horstretch>
124-
<verstretch>0</verstretch>
125-
</sizepolicy>
126-
</property>
127-
<property name="maximumSize">
128-
<size>
129-
<width>200</width>
130-
<height>16777215</height>
131-
</size>
132-
</property>
133-
<property name="orientation">
134-
<enum>Qt::Horizontal</enum>
135-
</property>
136-
<property name="standardButtons">
137-
<set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
138-
</property>
139-
</widget>
140-
</item>
141-
</layout>
53+
<item row="1" column="0">
54+
<widget class="QProgressBar" name="progressBar">
55+
<property name="sizePolicy">
56+
<sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
57+
<horstretch>0</horstretch>
58+
<verstretch>0</verstretch>
59+
</sizepolicy>
60+
</property>
61+
<property name="minimumSize">
62+
<size>
63+
<width>0</width>
64+
<height>0</height>
65+
</size>
66+
</property>
67+
<property name="value">
68+
<number>0</number>
69+
</property>
70+
<property name="invertedAppearance">
71+
<bool>false</bool>
72+
</property>
73+
</widget>
74+
</item>
75+
<item row="1" column="1">
76+
<widget class="QDialogButtonBox" name="buttonBox">
77+
<property name="sizePolicy">
78+
<sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
79+
<horstretch>0</horstretch>
80+
<verstretch>0</verstretch>
81+
</sizepolicy>
82+
</property>
83+
<property name="maximumSize">
84+
<size>
85+
<width>200</width>
86+
<height>16777215</height>
87+
</size>
88+
</property>
89+
<property name="orientation">
90+
<enum>Qt::Horizontal</enum>
91+
</property>
92+
<property name="standardButtons">
93+
<set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
94+
</property>
95+
</widget>
14296
</item>
14397
</layout>
14498
</widget>
145-
<customwidgets>
146-
<customwidget>
147-
<class>QgsWebView</class>
148-
<extends>QWidget</extends>
149-
<header>qgis.core</header>
150-
</customwidget>
151-
</customwidgets>
15299
<resources/>
153100
<connections/>
154101
</ui>

‎python/plugins/processing/ui/DlgHelpEdition.ui

Lines changed: 3 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -20,18 +20,14 @@
2020
<property name="margin">
2121
<number>9</number>
2222
</property>
23+
<item>
24+
<widget class="QTextEdit" name="txtPreview"/>
25+
</item>
2326
<item>
2427
<widget class="QSplitter" name="splitter_2">
2528
<property name="orientation">
2629
<enum>Qt::Vertical</enum>
2730
</property>
28-
<widget class="QgsWebView" name="webView">
29-
<property name="url">
30-
<url>
31-
<string>about:blank</string>
32-
</url>
33-
</property>
34-
</widget>
3531
<widget class="QSplitter" name="splitter">
3632
<property name="orientation">
3733
<enum>Qt::Horizontal</enum>
@@ -110,13 +106,6 @@
110106
</item>
111107
</layout>
112108
</widget>
113-
<customwidgets>
114-
<customwidget>
115-
<class>QgsWebView</class>
116-
<extends>QWidget</extends>
117-
<header>qgis.core</header>
118-
</customwidget>
119-
</customwidgets>
120109
<resources/>
121110
<connections>
122111
<connection>

‎python/plugins/processing/ui/DlgResults.ui

Lines changed: 1 addition & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -14,24 +14,12 @@
1414
<string>Results</string>
1515
</property>
1616
<layout class="QVBoxLayout" name="verticalLayout">
17-
<property name="spacing">
18-
<number>6</number>
19-
</property>
20-
<property name="margin">
21-
<number>9</number>
22-
</property>
2317
<item>
2418
<widget class="QSplitter" name="splitter">
2519
<property name="orientation">
2620
<enum>Qt::Horizontal</enum>
2721
</property>
2822
<widget class="QTreeWidget" name="tree">
29-
<property name="minimumSize">
30-
<size>
31-
<width>0</width>
32-
<height>0</height>
33-
</size>
34-
</property>
3523
<attribute name="headerVisible">
3624
<bool>false</bool>
3725
</attribute>
@@ -41,19 +29,7 @@
4129
</property>
4230
</column>
4331
</widget>
44-
<widget class="QgsWebView" name="webView">
45-
<property name="minimumSize">
46-
<size>
47-
<width>0</width>
48-
<height>0</height>
49-
</size>
50-
</property>
51-
<property name="url">
52-
<url>
53-
<string>about:blank</string>
54-
</url>
55-
</property>
56-
</widget>
32+
<widget class="QTextEdit" name="txtResults"/>
5733
</widget>
5834
</item>
5935
<item>
@@ -68,13 +44,6 @@
6844
</item>
6945
</layout>
7046
</widget>
71-
<customwidgets>
72-
<customwidget>
73-
<class>QgsWebView</class>
74-
<extends>QWidget</extends>
75-
<header>qgis.core</header>
76-
</customwidget>
77-
</customwidgets>
7847
<resources/>
7948
<connections>
8049
<connection>

0 commit comments

Comments
 (0)
Please sign in to comment.