[GRASS] use QWidget for module UI, fixes #5084

qgis · Dec 15, 2015 · 9972152 · 9972152
1 parent 9e8e868
commit 9972152
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 12 deletions.
diff --git a/src/plugins/grass/qgsgrassmodule.cpp b/src/plugins/grass/qgsgrassmodule.cpp
@@ -172,7 +172,7 @@ QProcessEnvironment QgsGrassModule::processEnvironment( bool direct )
 
 QgsGrassModule::QgsGrassModule( QgsGrassTools *tools, QString moduleName, QgisInterface *iface,
                                 bool direct, QWidget *parent, Qt::WindowFlags f )
-    : QDialog( parent, f )
+    : QWidget( parent, f )
     , QgsGrassModuleBase()
     , mOptions( 0 )
     , mSuccess( false )

diff --git a/src/plugins/grass/qgsgrassmodule.h b/src/plugins/grass/qgsgrassmodule.h
@@ -31,7 +31,7 @@ class QDomElement;
  *  \brief Interface to GRASS modules.
  *
  */
-class QgsGrassModule : public QDialog, private  Ui::QgsGrassModuleBase
+class QgsGrassModule : public QWidget, private  Ui::QgsGrassModuleBase
 {
     Q_OBJECT
 

diff --git a/src/plugins/grass/qgsgrassmodulebase.ui b/src/plugins/grass/qgsgrassmodulebase.ui
@@ -1,22 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
  <class>QgsGrassModuleBase</class>
- <widget class="QDialog" name="QgsGrassModuleBase">
+ <widget class="QWidget" name="QgsGrassModuleBase">
   <property name="geometry">
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>430</width>
-    <height>367</height>
+    <width>464</width>
+    <height>423</height>
    </rect>
   </property>
   <property name="windowTitle">
    <string>GRASS Module</string>
   </property>
   <layout class="QVBoxLayout" name="verticalLayout">
-   <property name="margin">
-    <number>0</number>
-   </property>
    <item>
     <layout class="QHBoxLayout" name="horizontalLayout">
      <property name="leftMargin">
@@ -73,7 +70,16 @@
        <string>Output</string>
       </attribute>
       <layout class="QVBoxLayout">
-       <property name="margin">
+       <property name="leftMargin">
+        <number>0</number>
+       </property>
+       <property name="topMargin">
+        <number>0</number>
+       </property>
+       <property name="rightMargin">
+        <number>0</number>
+       </property>
+       <property name="bottomMargin">
         <number>0</number>
        </property>
        <item>
@@ -85,8 +91,17 @@
       <attribute name="title">
        <string>Manual</string>
       </attribute>
-      <layout class="QVBoxLayout">
-       <property name="margin">
+      <layout class="QVBoxLayout" name="_2">
+       <property name="leftMargin">
+        <number>0</number>
+       </property>
+       <property name="topMargin">
+        <number>0</number>
+       </property>
+       <property name="rightMargin">
+        <number>0</number>
+       </property>
+       <property name="bottomMargin">
         <number>0</number>
        </property>
        <item>
@@ -174,7 +189,6 @@
    </item>
   </layout>
  </widget>
- <layoutdefault spacing="6" margin="11"/>
  <resources/>
  <connections/>
 </ui>