Skip to content

Commit fdc0a3f

Browse files
authored
Merge pull request #3800 from nirvn/processing_modeler_panels
[processing] upgrade modeler to make use of qgsdockwidgets
2 parents ac721d3 + a6ebe83 commit fdc0a3f

File tree

2 files changed

+280
-105
lines changed

2 files changed

+280
-105
lines changed

python/plugins/processing/modeler/ModelerDialog.py

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232

3333
from qgis.PyQt import uic
3434
from qgis.PyQt.QtCore import Qt, QRectF, QMimeData, QPoint, QPointF, QSettings, QByteArray, QSize, pyqtSignal
35-
from qgis.PyQt.QtWidgets import QGraphicsView, QTreeWidget, QMessageBox, QFileDialog, QTreeWidgetItem, QSizePolicy
35+
from qgis.PyQt.QtWidgets import QGraphicsView, QTreeWidget, QMessageBox, QFileDialog, QTreeWidgetItem, QSizePolicy, QMainWindow
3636
from qgis.PyQt.QtGui import QIcon, QImage, QPainter
3737
from qgis.core import QgsApplication
3838
from qgis.gui import QgsMessageBar
@@ -67,6 +67,17 @@ def __init__(self, alg=None):
6767
self.bar.setSizePolicy(QSizePolicy.Minimum, QSizePolicy.Fixed)
6868
self.centralWidget().layout().insertWidget(0, self.bar)
6969

70+
try:
71+
self.setDockOptions(self.dockOptions() | QMainWindow.GroupedDragging)
72+
except:
73+
pass
74+
75+
self.addDockWidget(Qt.LeftDockWidgetArea, self.propertiesDock)
76+
self.addDockWidget(Qt.LeftDockWidgetArea, self.inputsDock)
77+
self.addDockWidget(Qt.LeftDockWidgetArea, self.algorithmsDock)
78+
self.tabifyDockWidget(self.inputsDock, self.algorithmsDock)
79+
self.inputsDock.raise_()
80+
7081
self.zoom = 1
7182

7283
self.setWindowFlags(Qt.WindowMinimizeButtonHint |
@@ -76,9 +87,7 @@ def __init__(self, alg=None):
7687
settings = QSettings()
7788
self.restoreState(settings.value("/Processing/stateModeler", QByteArray()))
7889
self.restoreGeometry(settings.value("/Processing/geometryModeler", QByteArray()))
79-
self.splitter.restoreState(settings.value("/Processing/stateModelerSplitter", QByteArray()))
8090

81-
self.tabWidget.setCurrentIndex(0)
8291
self.scene = ModelerScene(self)
8392
self.scene.setSceneRect(QRectF(0, 0, self.CANVAS_SIZE, self.CANVAS_SIZE))
8493

@@ -231,7 +240,6 @@ def closeEvent(self, evt):
231240
settings = QSettings()
232241
settings.setValue("/Processing/stateModeler", self.saveState())
233242
settings.setValue("/Processing/geometryModeler", self.saveGeometry())
234-
settings.setValue("/Processing/stateModelerSplitter", self.splitter.saveState())
235243

236244
if self.hasChanged:
237245
ret = QMessageBox.question(

0 commit comments

Comments
 (0)