Skip to content

Commit 9972152

Browse files
committed
[GRASS] use QWidget for module UI, fixes #5084
1 parent 9e8e868 commit 9972152

File tree

3 files changed

+26
-12
lines changed

3 files changed

+26
-12
lines changed

src/plugins/grass/qgsgrassmodule.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -172,7 +172,7 @@ QProcessEnvironment QgsGrassModule::processEnvironment( bool direct )
172172

173173
QgsGrassModule::QgsGrassModule( QgsGrassTools *tools, QString moduleName, QgisInterface *iface,
174174
bool direct, QWidget *parent, Qt::WindowFlags f )
175-
: QDialog( parent, f )
175+
: QWidget( parent, f )
176176
, QgsGrassModuleBase()
177177
, mOptions( 0 )
178178
, mSuccess( false )

src/plugins/grass/qgsgrassmodule.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ class QDomElement;
3131
* \brief Interface to GRASS modules.
3232
*
3333
*/
34-
class QgsGrassModule : public QDialog, private Ui::QgsGrassModuleBase
34+
class QgsGrassModule : public QWidget, private Ui::QgsGrassModuleBase
3535
{
3636
Q_OBJECT
3737

src/plugins/grass/qgsgrassmodulebase.ui

+24-10
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,19 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<ui version="4.0">
33
<class>QgsGrassModuleBase</class>
4-
<widget class="QDialog" name="QgsGrassModuleBase">
4+
<widget class="QWidget" name="QgsGrassModuleBase">
55
<property name="geometry">
66
<rect>
77
<x>0</x>
88
<y>0</y>
9-
<width>430</width>
10-
<height>367</height>
9+
<width>464</width>
10+
<height>423</height>
1111
</rect>
1212
</property>
1313
<property name="windowTitle">
1414
<string>GRASS Module</string>
1515
</property>
1616
<layout class="QVBoxLayout" name="verticalLayout">
17-
<property name="margin">
18-
<number>0</number>
19-
</property>
2017
<item>
2118
<layout class="QHBoxLayout" name="horizontalLayout">
2219
<property name="leftMargin">
@@ -73,7 +70,16 @@
7370
<string>Output</string>
7471
</attribute>
7572
<layout class="QVBoxLayout">
76-
<property name="margin">
73+
<property name="leftMargin">
74+
<number>0</number>
75+
</property>
76+
<property name="topMargin">
77+
<number>0</number>
78+
</property>
79+
<property name="rightMargin">
80+
<number>0</number>
81+
</property>
82+
<property name="bottomMargin">
7783
<number>0</number>
7884
</property>
7985
<item>
@@ -85,8 +91,17 @@
8591
<attribute name="title">
8692
<string>Manual</string>
8793
</attribute>
88-
<layout class="QVBoxLayout">
89-
<property name="margin">
94+
<layout class="QVBoxLayout" name="_2">
95+
<property name="leftMargin">
96+
<number>0</number>
97+
</property>
98+
<property name="topMargin">
99+
<number>0</number>
100+
</property>
101+
<property name="rightMargin">
102+
<number>0</number>
103+
</property>
104+
<property name="bottomMargin">
90105
<number>0</number>
91106
</property>
92107
<item>
@@ -174,7 +189,6 @@
174189
</item>
175190
</layout>
176191
</widget>
177-
<layoutdefault spacing="6" margin="11"/>
178192
<resources/>
179193
<connections/>
180194
</ui>

0 commit comments

Comments
 (0)