From b42220d98caabf22092c1235e3b5164177dd5271 Mon Sep 17 00:00:00 2001
From: brushtyler <brushtyler@c8812cc2-4d05-0410-92ff-de0c093fc19c>
Date: Fri, 11 Jun 2010 09:14:32 +0000
Subject: [PATCH] replaced all QFormLayouts with QGridLayouts

git-svn-id: http://svn.osgeo.org/qgis/trunk@13703 c8812cc2-4d05-0410-92ff-de0c093fc19c
---
 python/plugins/GdalTools/tools/dialogBase.ui  |  11 +-
 .../plugins/GdalTools/tools/optionsTable.ui   |   6 +
 .../plugins/GdalTools/tools/widgetBuildVRT.ui |  21 ++-
 .../plugins/GdalTools/tools/widgetClipper.ui  |   7 +-
 .../plugins/GdalTools/tools/widgetContour.ui  | 125 ++++++++++--------
 .../plugins/GdalTools/tools/widgetConvert.ui  |   4 +-
 python/plugins/GdalTools/tools/widgetGrid.ui  |  91 +++++++------
 python/plugins/GdalTools/tools/widgetMerge.ui |   7 +-
 .../GdalTools/tools/widgetNearBlack.ui        |  21 ++-
 .../plugins/GdalTools/tools/widgetOverview.ui |   4 +-
 .../GdalTools/tools/widgetPolygonize.ui       |  18 +--
 .../GdalTools/tools/widgetProjection.ui       |  18 +--
 .../GdalTools/tools/widgetProximity.ui        |   4 +-
 .../GdalTools/tools/widgetRasterize.ui        |  24 ++--
 python/plugins/GdalTools/tools/widgetSieve.ui |  32 ++---
 .../GdalTools/tools/widgetTranslate.ui        |  41 +++---
 python/plugins/GdalTools/tools/widgetWarp.ui  |  24 ++--
 17 files changed, 234 insertions(+), 224 deletions(-)

diff --git a/python/plugins/GdalTools/tools/dialogBase.ui b/python/plugins/GdalTools/tools/dialogBase.ui
index 03df52be088..b85dc896c26 100644
--- a/python/plugins/GdalTools/tools/dialogBase.ui
+++ b/python/plugins/GdalTools/tools/dialogBase.ui
@@ -7,7 +7,7 @@
     <x>0</x>
     <y>0</y>
     <width>285</width>
-    <height>179</height>
+    <height>170</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -19,6 +19,9 @@
      <property name="sizeConstraint">
       <enum>QLayout::SetNoConstraint</enum>
      </property>
+     <property name="margin">
+      <number>0</number>
+     </property>
     </layout>
    </item>
    <item>
@@ -30,12 +33,6 @@
    </item>
    <item>
     <widget class="QTextEdit" name="textEditCommand">
-     <property name="sizePolicy">
-      <sizepolicy hsizetype="Expanding" vsizetype="Maximum">
-       <horstretch>0</horstretch>
-       <verstretch>0</verstretch>
-      </sizepolicy>
-     </property>
      <property name="minimumSize">
       <size>
        <width>0</width>
diff --git a/python/plugins/GdalTools/tools/optionsTable.ui b/python/plugins/GdalTools/tools/optionsTable.ui
index 9b4c3955bef..8fe033d594f 100644
--- a/python/plugins/GdalTools/tools/optionsTable.ui
+++ b/python/plugins/GdalTools/tools/optionsTable.ui
@@ -34,6 +34,12 @@
           <height>0</height>
          </size>
         </property>
+        <attribute name="horizontalHeaderMinimumSectionSize">
+         <number>30</number>
+        </attribute>
+        <attribute name="horizontalHeaderStretchLastSection">
+         <bool>true</bool>
+        </attribute>
         <column>
          <property name="text">
           <string>Name</string>
diff --git a/python/plugins/GdalTools/tools/widgetBuildVRT.ui b/python/plugins/GdalTools/tools/widgetBuildVRT.ui
index 85ef50eeee0..a0c4d72a19d 100644
--- a/python/plugins/GdalTools/tools/widgetBuildVRT.ui
+++ b/python/plugins/GdalTools/tools/widgetBuildVRT.ui
@@ -11,7 +11,7 @@
    </rect>
   </property>
   <property name="sizePolicy">
-   <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
+   <sizepolicy hsizetype="Expanding" vsizetype="Preferred">
     <horstretch>0</horstretch>
     <verstretch>0</verstretch>
    </sizepolicy>
@@ -21,13 +21,10 @@
   </property>
   <layout class="QVBoxLayout" name="verticalLayout">
    <item>
-    <layout class="QFormLayout" name="formLayout">
+    <layout class="QGridLayout" name="gridLayout">
      <property name="sizeConstraint">
       <enum>QLayout::SetNoConstraint</enum>
      </property>
-     <property name="fieldGrowthPolicy">
-      <enum>QFormLayout::AllNonFixedFieldsGrow</enum>
-     </property>
      <item row="0" column="0">
       <widget class="QLabel" name="label">
        <property name="text">
@@ -90,6 +87,13 @@
        </item>
       </layout>
      </item>
+     <item row="2" column="0">
+      <widget class="QCheckBox" name="resolutionCheck">
+       <property name="text">
+        <string>&amp;Resolution:</string>
+       </property>
+      </widget>
+     </item>
      <item row="2" column="1">
       <widget class="QComboBox" name="resolutionComboBox">
        <property name="sizePolicy">
@@ -118,13 +122,6 @@
        </item>
       </widget>
      </item>
-     <item row="2" column="0">
-      <widget class="QCheckBox" name="resolutionCheck">
-       <property name="text">
-        <string>&amp;Resolution:</string>
-       </property>
-      </widget>
-     </item>
      <item row="3" column="0">
       <widget class="QCheckBox" name="srcNoDataCheck">
        <property name="text">
diff --git a/python/plugins/GdalTools/tools/widgetClipper.ui b/python/plugins/GdalTools/tools/widgetClipper.ui
index 3fcce27baef..1e8b4e0460b 100644
--- a/python/plugins/GdalTools/tools/widgetClipper.ui
+++ b/python/plugins/GdalTools/tools/widgetClipper.ui
@@ -11,7 +11,7 @@
    </rect>
   </property>
   <property name="sizePolicy">
-   <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
+   <sizepolicy hsizetype="Expanding" vsizetype="Preferred">
     <horstretch>0</horstretch>
     <verstretch>0</verstretch>
    </sizepolicy>
@@ -21,10 +21,7 @@
   </property>
   <layout class="QVBoxLayout" name="verticalLayout_4">
    <item>
-    <layout class="QFormLayout" name="formLayout">
-     <property name="fieldGrowthPolicy">
-      <enum>QFormLayout::AllNonFixedFieldsGrow</enum>
-     </property>
+    <layout class="QGridLayout" name="gridLayout">
      <item row="0" column="0">
       <widget class="QLabel" name="label_2">
        <property name="text">
diff --git a/python/plugins/GdalTools/tools/widgetContour.ui b/python/plugins/GdalTools/tools/widgetContour.ui
index 2c16afee6cc..2802e5791fc 100644
--- a/python/plugins/GdalTools/tools/widgetContour.ui
+++ b/python/plugins/GdalTools/tools/widgetContour.ui
@@ -6,12 +6,12 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>522</width>
-    <height>174</height>
+    <width>520</width>
+    <height>172</height>
    </rect>
   </property>
   <property name="sizePolicy">
-   <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
+   <sizepolicy hsizetype="Expanding" vsizetype="Preferred">
     <horstretch>0</horstretch>
     <verstretch>0</verstretch>
    </sizepolicy>
@@ -19,12 +19,9 @@
   <property name="windowTitle">
    <string>Contour</string>
   </property>
-  <layout class="QVBoxLayout" name="verticalLayout_2">
+  <layout class="QVBoxLayout" name="verticalLayout_3">
    <item>
-    <layout class="QFormLayout" name="formLayout">
-     <property name="fieldGrowthPolicy">
-      <enum>QFormLayout::AllNonFixedFieldsGrow</enum>
-     </property>
+    <layout class="QGridLayout" name="gridLayout">
      <item row="0" column="0">
       <widget class="QLabel" name="label">
        <property name="text">
@@ -93,56 +90,6 @@
        </item>
       </layout>
      </item>
-     <item row="3" column="0">
-      <layout class="QVBoxLayout" name="verticalLayout">
-       <item>
-        <widget class="QCheckBox" name="attributeCheck">
-         <property name="text">
-          <string>&amp;Attribute name:</string>
-         </property>
-        </widget>
-       </item>
-       <item>
-        <layout class="QHBoxLayout" name="horizontalLayout">
-         <item>
-          <spacer name="horizontalSpacer">
-           <property name="orientation">
-            <enum>Qt::Horizontal</enum>
-           </property>
-           <property name="sizeType">
-            <enum>QSizePolicy::Fixed</enum>
-           </property>
-           <property name="sizeHint" stdset="0">
-            <size>
-             <width>10</width>
-             <height>10</height>
-            </size>
-           </property>
-          </spacer>
-         </item>
-         <item>
-          <widget class="QLabel" name="label_5">
-           <property name="font">
-            <font>
-             <pointsize>8</pointsize>
-            </font>
-           </property>
-           <property name="text">
-            <string>If not provided, no elevation attribute is attached.</string>
-           </property>
-          </widget>
-         </item>
-        </layout>
-       </item>
-      </layout>
-     </item>
-     <item row="3" column="1">
-      <widget class="QLineEdit" name="attributeEdit">
-       <property name="text">
-        <string>ELEV</string>
-       </property>
-      </widget>
-     </item>
      <item row="2" column="0">
       <widget class="QLabel" name="label_3">
        <property name="text">
@@ -166,6 +113,68 @@
        </property>
       </widget>
      </item>
+     <item row="3" column="0">
+      <layout class="QVBoxLayout" name="verticalLayout">
+       <property name="sizeConstraint">
+        <enum>QLayout::SetFixedSize</enum>
+       </property>
+       <item>
+        <widget class="QCheckBox" name="attributeCheck">
+         <property name="text">
+          <string>&amp;Attribute name:</string>
+         </property>
+        </widget>
+       </item>
+       <item>
+        <widget class="QLabel" name="label_5">
+         <property name="sizePolicy">
+          <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
+           <horstretch>0</horstretch>
+           <verstretch>0</verstretch>
+          </sizepolicy>
+         </property>
+         <property name="font">
+          <font>
+           <pointsize>8</pointsize>
+          </font>
+         </property>
+         <property name="text">
+          <string>If not provided, no elevation attribute is attached.</string>
+         </property>
+         <property name="indent">
+          <number>16</number>
+         </property>
+        </widget>
+       </item>
+      </layout>
+     </item>
+     <item row="3" column="1">
+      <layout class="QVBoxLayout" name="verticalLayout_2">
+       <item>
+        <widget class="QLineEdit" name="attributeEdit">
+         <property name="text">
+          <string>ELEV</string>
+         </property>
+        </widget>
+       </item>
+       <item>
+        <spacer name="verticalSpacer">
+         <property name="orientation">
+          <enum>Qt::Vertical</enum>
+         </property>
+         <property name="sizeType">
+          <enum>QSizePolicy::Minimum</enum>
+         </property>
+         <property name="sizeHint" stdset="0">
+          <size>
+           <width>20</width>
+           <height>0</height>
+          </size>
+         </property>
+        </spacer>
+       </item>
+      </layout>
+     </item>
     </layout>
    </item>
   </layout>
diff --git a/python/plugins/GdalTools/tools/widgetConvert.ui b/python/plugins/GdalTools/tools/widgetConvert.ui
index ba8e39214b1..305801eb523 100644
--- a/python/plugins/GdalTools/tools/widgetConvert.ui
+++ b/python/plugins/GdalTools/tools/widgetConvert.ui
@@ -11,7 +11,7 @@
    </rect>
   </property>
   <property name="sizePolicy">
-   <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
+   <sizepolicy hsizetype="Expanding" vsizetype="Preferred">
     <horstretch>0</horstretch>
     <verstretch>0</verstretch>
    </sizepolicy>
@@ -28,7 +28,7 @@
     </widget>
    </item>
    <item>
-    <layout class="QFormLayout" name="formLayout">
+    <layout class="QGridLayout" name="gridLayout">
      <item row="0" column="0">
       <widget class="QLabel" name="label">
        <property name="text">
diff --git a/python/plugins/GdalTools/tools/widgetGrid.ui b/python/plugins/GdalTools/tools/widgetGrid.ui
index e11b36d0684..ae59bb88f60 100644
--- a/python/plugins/GdalTools/tools/widgetGrid.ui
+++ b/python/plugins/GdalTools/tools/widgetGrid.ui
@@ -11,7 +11,7 @@
    </rect>
   </property>
   <property name="sizePolicy">
-   <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
+   <sizepolicy hsizetype="Expanding" vsizetype="Preferred">
     <horstretch>0</horstretch>
     <verstretch>0</verstretch>
    </sizepolicy>
@@ -21,7 +21,7 @@
   </property>
   <layout class="QVBoxLayout" name="verticalLayout">
    <item>
-    <layout class="QFormLayout" name="formLayout_5">
+    <layout class="QGridLayout" name="gridLayout">
      <item row="0" column="0">
       <widget class="QLabel" name="label">
        <property name="text">
@@ -134,23 +134,13 @@
     </layout>
    </item>
    <item>
-    <layout class="QHBoxLayout" name="horizontalLayout_4">
-     <item>
-      <spacer name="horizontalSpacer">
-       <property name="orientation">
-        <enum>Qt::Horizontal</enum>
-       </property>
-       <property name="sizeType">
-        <enum>QSizePolicy::Fixed</enum>
-       </property>
-       <property name="sizeHint" stdset="0">
-        <size>
-         <width>20</width>
-         <height>20</height>
-        </size>
-       </property>
-      </spacer>
-     </item>
+    <layout class="QVBoxLayout" name="verticalLayout_2">
+     <property name="leftMargin">
+      <number>20</number>
+     </property>
+     <property name="rightMargin">
+      <number>20</number>
+     </property>
      <item>
       <widget class="QStackedWidget" name="stackedWidget">
        <property name="frameShape">
@@ -160,7 +150,7 @@
         <number>0</number>
        </property>
        <widget class="QWidget" name="page">
-        <layout class="QFormLayout" name="formLayout_2">
+        <layout class="QGridLayout" name="gridLayout_3">
          <item row="0" column="0">
           <widget class="QLabel" name="label_3">
            <property name="text">
@@ -291,7 +281,7 @@
         </layout>
        </widget>
        <widget class="QWidget" name="page_2">
-        <layout class="QFormLayout" name="formLayout_4">
+        <layout class="QGridLayout" name="gridLayout_4">
          <item row="0" column="0">
           <widget class="QLabel" name="label_21">
            <property name="text">
@@ -374,10 +364,23 @@
            </property>
           </widget>
          </item>
+         <item row="5" column="0">
+          <spacer name="verticalSpacer">
+           <property name="orientation">
+            <enum>Qt::Vertical</enum>
+           </property>
+           <property name="sizeHint" stdset="0">
+            <size>
+             <width>20</width>
+             <height>0</height>
+            </size>
+           </property>
+          </spacer>
+         </item>
         </layout>
        </widget>
        <widget class="QWidget" name="page_5">
-        <layout class="QFormLayout" name="formLayout_3">
+        <layout class="QGridLayout" name="gridLayout_5">
          <item row="0" column="0">
           <widget class="QLabel" name="label_26">
            <property name="text">
@@ -446,10 +449,23 @@
            </property>
           </widget>
          </item>
+         <item row="4" column="0">
+          <spacer name="verticalSpacer_2">
+           <property name="orientation">
+            <enum>Qt::Vertical</enum>
+           </property>
+           <property name="sizeHint" stdset="0">
+            <size>
+             <width>20</width>
+             <height>0</height>
+            </size>
+           </property>
+          </spacer>
+         </item>
         </layout>
        </widget>
        <widget class="QWidget" name="page_6">
-        <layout class="QFormLayout" name="formLayout">
+        <layout class="QGridLayout" name="gridLayout_6">
          <item row="0" column="0">
           <widget class="QLabel" name="label_25">
            <property name="text">
@@ -558,26 +574,23 @@
            </property>
           </widget>
          </item>
+         <item row="6" column="0">
+          <spacer name="verticalSpacer_3">
+           <property name="orientation">
+            <enum>Qt::Vertical</enum>
+           </property>
+           <property name="sizeHint" stdset="0">
+            <size>
+             <width>20</width>
+             <height>0</height>
+            </size>
+           </property>
+          </spacer>
+         </item>
         </layout>
        </widget>
       </widget>
      </item>
-     <item>
-      <spacer name="horizontalSpacer_2">
-       <property name="orientation">
-        <enum>Qt::Horizontal</enum>
-       </property>
-       <property name="sizeType">
-        <enum>QSizePolicy::Fixed</enum>
-       </property>
-       <property name="sizeHint" stdset="0">
-        <size>
-         <width>20</width>
-         <height>20</height>
-        </size>
-       </property>
-      </spacer>
-     </item>
     </layout>
    </item>
   </layout>
diff --git a/python/plugins/GdalTools/tools/widgetMerge.ui b/python/plugins/GdalTools/tools/widgetMerge.ui
index 9cae403a85f..addaff51dac 100644
--- a/python/plugins/GdalTools/tools/widgetMerge.ui
+++ b/python/plugins/GdalTools/tools/widgetMerge.ui
@@ -11,7 +11,7 @@
    </rect>
   </property>
   <property name="sizePolicy">
-   <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
+   <sizepolicy hsizetype="Expanding" vsizetype="Preferred">
     <horstretch>0</horstretch>
     <verstretch>0</verstretch>
    </sizepolicy>
@@ -21,10 +21,7 @@
   </property>
   <layout class="QVBoxLayout" name="verticalLayout">
    <item>
-    <layout class="QFormLayout" name="formLayout">
-     <property name="fieldGrowthPolicy">
-      <enum>QFormLayout::AllNonFixedFieldsGrow</enum>
-     </property>
+    <layout class="QGridLayout" name="gridLayout">
      <item row="0" column="0">
       <widget class="QLabel" name="label">
        <property name="text">
diff --git a/python/plugins/GdalTools/tools/widgetNearBlack.ui b/python/plugins/GdalTools/tools/widgetNearBlack.ui
index 6b769ce7e5e..ec4e697ecc1 100644
--- a/python/plugins/GdalTools/tools/widgetNearBlack.ui
+++ b/python/plugins/GdalTools/tools/widgetNearBlack.ui
@@ -11,7 +11,7 @@
    </rect>
   </property>
   <property name="sizePolicy">
-   <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
+   <sizepolicy hsizetype="Expanding" vsizetype="Preferred">
     <horstretch>0</horstretch>
     <verstretch>0</verstretch>
    </sizepolicy>
@@ -21,10 +21,7 @@
   </property>
   <layout class="QVBoxLayout" name="verticalLayout">
    <item>
-    <layout class="QFormLayout" name="formLayout">
-     <property name="fieldGrowthPolicy">
-      <enum>QFormLayout::AllNonFixedFieldsGrow</enum>
-     </property>
+    <layout class="QGridLayout" name="gridLayout">
      <item row="0" column="0">
       <widget class="QLabel" name="label">
        <property name="text">
@@ -93,13 +90,6 @@
        </item>
       </layout>
      </item>
-     <item row="2" column="1">
-      <widget class="QSpinBox" name="nearSpin">
-       <property name="maximum">
-        <number>255</number>
-       </property>
-      </widget>
-     </item>
      <item row="2" column="0">
       <widget class="QCheckBox" name="nearCheck">
        <property name="text">
@@ -107,6 +97,13 @@
        </property>
       </widget>
      </item>
+     <item row="2" column="1">
+      <widget class="QSpinBox" name="nearSpin">
+       <property name="maximum">
+        <number>255</number>
+       </property>
+      </widget>
+     </item>
     </layout>
    </item>
    <item>
diff --git a/python/plugins/GdalTools/tools/widgetOverview.ui b/python/plugins/GdalTools/tools/widgetOverview.ui
index 0376c35c6b7..a8dcf738b83 100644
--- a/python/plugins/GdalTools/tools/widgetOverview.ui
+++ b/python/plugins/GdalTools/tools/widgetOverview.ui
@@ -11,7 +11,7 @@
    </rect>
   </property>
   <property name="sizePolicy">
-   <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
+   <sizepolicy hsizetype="Expanding" vsizetype="Preferred">
     <horstretch>0</horstretch>
     <verstretch>0</verstretch>
    </sizepolicy>
@@ -28,7 +28,7 @@
     </widget>
    </item>
    <item>
-    <layout class="QFormLayout" name="formLayout">
+    <layout class="QGridLayout" name="gridLayout">
      <item row="0" column="0">
       <widget class="QLabel" name="label">
        <property name="text">
diff --git a/python/plugins/GdalTools/tools/widgetPolygonize.ui b/python/plugins/GdalTools/tools/widgetPolygonize.ui
index 4c2a18993ab..4cffb375075 100644
--- a/python/plugins/GdalTools/tools/widgetPolygonize.ui
+++ b/python/plugins/GdalTools/tools/widgetPolygonize.ui
@@ -11,7 +11,7 @@
    </rect>
   </property>
   <property name="sizePolicy">
-   <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
+   <sizepolicy hsizetype="Expanding" vsizetype="Preferred">
     <horstretch>0</horstretch>
     <verstretch>0</verstretch>
    </sizepolicy>
@@ -21,7 +21,7 @@
   </property>
   <layout class="QVBoxLayout" name="verticalLayout">
    <item>
-    <layout class="QFormLayout" name="formLayout">
+    <layout class="QGridLayout" name="gridLayout">
      <item row="0" column="0">
       <widget class="QLabel" name="label">
        <property name="text">
@@ -90,13 +90,6 @@
        </item>
       </layout>
      </item>
-     <item row="2" column="1">
-      <widget class="QLineEdit" name="fieldEdit">
-       <property name="text">
-        <string>DN</string>
-       </property>
-      </widget>
-     </item>
      <item row="2" column="0">
       <widget class="QCheckBox" name="fieldCheck">
        <property name="text">
@@ -104,6 +97,13 @@
        </property>
       </widget>
      </item>
+     <item row="2" column="1">
+      <widget class="QLineEdit" name="fieldEdit">
+       <property name="text">
+        <string>DN</string>
+       </property>
+      </widget>
+     </item>
     </layout>
    </item>
   </layout>
diff --git a/python/plugins/GdalTools/tools/widgetProjection.ui b/python/plugins/GdalTools/tools/widgetProjection.ui
index f4ea565bcbc..d45d22addde 100644
--- a/python/plugins/GdalTools/tools/widgetProjection.ui
+++ b/python/plugins/GdalTools/tools/widgetProjection.ui
@@ -11,7 +11,7 @@
    </rect>
   </property>
   <property name="sizePolicy">
-   <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
+   <sizepolicy hsizetype="Expanding" vsizetype="Preferred">
     <horstretch>0</horstretch>
     <verstretch>0</verstretch>
    </sizepolicy>
@@ -35,7 +35,7 @@
     </widget>
    </item>
    <item>
-    <layout class="QFormLayout" name="formLayout">
+    <layout class="QGridLayout" name="gridLayout">
      <item row="0" column="0">
       <widget class="QLabel" name="label">
        <property name="text">
@@ -67,6 +67,13 @@
        </item>
       </layout>
      </item>
+     <item row="1" column="1">
+      <widget class="QCheckBox" name="recurseCheck">
+       <property name="text">
+        <string>Recurse subdirectories</string>
+       </property>
+      </widget>
+     </item>
      <item row="2" column="0">
       <widget class="QLabel" name="label_2">
        <property name="text">
@@ -100,13 +107,6 @@
        </property>
       </widget>
      </item>
-     <item row="1" column="1">
-      <widget class="QCheckBox" name="recurseCheck">
-       <property name="text">
-        <string>Recurse subdirectories</string>
-       </property>
-      </widget>
-     </item>
     </layout>
    </item>
    <item>
diff --git a/python/plugins/GdalTools/tools/widgetProximity.ui b/python/plugins/GdalTools/tools/widgetProximity.ui
index f0daa5a87db..64fc35c84df 100644
--- a/python/plugins/GdalTools/tools/widgetProximity.ui
+++ b/python/plugins/GdalTools/tools/widgetProximity.ui
@@ -11,7 +11,7 @@
    </rect>
   </property>
   <property name="sizePolicy">
-   <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
+   <sizepolicy hsizetype="Expanding" vsizetype="Preferred">
     <horstretch>0</horstretch>
     <verstretch>0</verstretch>
    </sizepolicy>
@@ -21,7 +21,7 @@
   </property>
   <layout class="QVBoxLayout" name="verticalLayout">
    <item>
-    <layout class="QFormLayout" name="formLayout">
+    <layout class="QGridLayout" name="gridLayout">
      <item row="0" column="0">
       <widget class="QLabel" name="label">
        <property name="text">
diff --git a/python/plugins/GdalTools/tools/widgetRasterize.ui b/python/plugins/GdalTools/tools/widgetRasterize.ui
index cc1bc3c0423..75a3024f360 100644
--- a/python/plugins/GdalTools/tools/widgetRasterize.ui
+++ b/python/plugins/GdalTools/tools/widgetRasterize.ui
@@ -11,7 +11,7 @@
    </rect>
   </property>
   <property name="sizePolicy">
-   <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
+   <sizepolicy hsizetype="Expanding" vsizetype="Preferred">
     <horstretch>0</horstretch>
     <verstretch>0</verstretch>
    </sizepolicy>
@@ -21,7 +21,7 @@
   </property>
   <layout class="QVBoxLayout" name="verticalLayout">
    <item>
-    <layout class="QFormLayout" name="formLayout">
+    <layout class="QGridLayout" name="gridLayout">
      <item row="0" column="0">
       <widget class="QLabel" name="label">
        <property name="text">
@@ -59,6 +59,16 @@
        </item>
       </layout>
      </item>
+     <item row="1" column="0">
+      <widget class="QLabel" name="label_3">
+       <property name="text">
+        <string>&amp;Attribute field:</string>
+       </property>
+       <property name="buddy">
+        <cstring>attributeComboBox</cstring>
+       </property>
+      </widget>
+     </item>
      <item row="1" column="1">
       <widget class="QComboBox" name="attributeComboBox">
        <property name="sizePolicy">
@@ -100,16 +110,6 @@
        </item>
       </layout>
      </item>
-     <item row="1" column="0">
-      <widget class="QLabel" name="label_3">
-       <property name="text">
-        <string>&amp;Attribute field:</string>
-       </property>
-       <property name="buddy">
-        <cstring>attributeComboBox</cstring>
-       </property>
-      </widget>
-     </item>
     </layout>
    </item>
   </layout>
diff --git a/python/plugins/GdalTools/tools/widgetSieve.ui b/python/plugins/GdalTools/tools/widgetSieve.ui
index 57dff4a120d..57baf2f72ed 100644
--- a/python/plugins/GdalTools/tools/widgetSieve.ui
+++ b/python/plugins/GdalTools/tools/widgetSieve.ui
@@ -11,7 +11,7 @@
    </rect>
   </property>
   <property name="sizePolicy">
-   <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
+   <sizepolicy hsizetype="Expanding" vsizetype="Preferred">
     <horstretch>0</horstretch>
     <verstretch>0</verstretch>
    </sizepolicy>
@@ -21,7 +21,7 @@
   </property>
   <layout class="QVBoxLayout" name="verticalLayout">
    <item>
-    <layout class="QFormLayout" name="formLayout">
+    <layout class="QGridLayout" name="gridLayout">
      <item row="0" column="0">
       <widget class="QLabel" name="label">
        <property name="text">
@@ -90,6 +90,13 @@
        </item>
       </layout>
      </item>
+     <item row="2" column="0">
+      <widget class="QCheckBox" name="thresholdCheck">
+       <property name="text">
+        <string>&amp;Threshold:</string>
+       </property>
+      </widget>
+     </item>
      <item row="2" column="1">
       <widget class="QSpinBox" name="thresholdSpin">
        <property name="maximum">
@@ -97,6 +104,13 @@
        </property>
       </widget>
      </item>
+     <item row="3" column="0">
+      <widget class="QCheckBox" name="connectionsCheck">
+       <property name="text">
+        <string>&amp;Pixel connections:</string>
+       </property>
+      </widget>
+     </item>
      <item row="3" column="1">
       <widget class="QComboBox" name="connectionsCombo">
        <item>
@@ -111,20 +125,6 @@
        </item>
       </widget>
      </item>
-     <item row="2" column="0">
-      <widget class="QCheckBox" name="thresholdCheck">
-       <property name="text">
-        <string>&amp;Threshold:</string>
-       </property>
-      </widget>
-     </item>
-     <item row="3" column="0">
-      <widget class="QCheckBox" name="connectionsCheck">
-       <property name="text">
-        <string>&amp;Pixel connections:</string>
-       </property>
-      </widget>
-     </item>
     </layout>
    </item>
   </layout>
diff --git a/python/plugins/GdalTools/tools/widgetTranslate.ui b/python/plugins/GdalTools/tools/widgetTranslate.ui
index dd83afd537f..658dd1f7778 100644
--- a/python/plugins/GdalTools/tools/widgetTranslate.ui
+++ b/python/plugins/GdalTools/tools/widgetTranslate.ui
@@ -11,7 +11,7 @@
    </rect>
   </property>
   <property name="sizePolicy">
-   <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
+   <sizepolicy hsizetype="Expanding" vsizetype="Preferred">
     <horstretch>0</horstretch>
     <verstretch>0</verstretch>
    </sizepolicy>
@@ -28,10 +28,7 @@
     </widget>
    </item>
    <item>
-    <layout class="QFormLayout" name="formLayout">
-     <property name="fieldGrowthPolicy">
-      <enum>QFormLayout::ExpandingFieldsGrow</enum>
-     </property>
+    <layout class="QGridLayout" name="gridLayout">
      <item row="0" column="0">
       <widget class="QLabel" name="label_3">
        <property name="text">
@@ -100,6 +97,23 @@
        </item>
       </layout>
      </item>
+     <item row="2" column="0">
+      <widget class="QLabel" name="formatLabel">
+       <property name="text">
+        <string>Output format</string>
+       </property>
+      </widget>
+     </item>
+     <item row="2" column="1">
+      <widget class="QComboBox" name="formatCombo">
+       <property name="sizePolicy">
+        <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
+         <horstretch>0</horstretch>
+         <verstretch>0</verstretch>
+        </sizepolicy>
+       </property>
+      </widget>
+     </item>
      <item row="3" column="0">
       <widget class="QCheckBox" name="targetSRSCheck">
        <property name="text">
@@ -128,23 +142,6 @@
        </item>
       </layout>
      </item>
-     <item row="2" column="1">
-      <widget class="QComboBox" name="formatCombo">
-       <property name="sizePolicy">
-        <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
-         <horstretch>0</horstretch>
-         <verstretch>0</verstretch>
-        </sizepolicy>
-       </property>
-      </widget>
-     </item>
-     <item row="2" column="0">
-      <widget class="QLabel" name="formatLabel">
-       <property name="text">
-        <string>Output format</string>
-       </property>
-      </widget>
-     </item>
     </layout>
    </item>
    <item>
diff --git a/python/plugins/GdalTools/tools/widgetWarp.ui b/python/plugins/GdalTools/tools/widgetWarp.ui
index 93c563c55c1..93c74dfc629 100644
--- a/python/plugins/GdalTools/tools/widgetWarp.ui
+++ b/python/plugins/GdalTools/tools/widgetWarp.ui
@@ -11,7 +11,7 @@
    </rect>
   </property>
   <property name="sizePolicy">
-   <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
+   <sizepolicy hsizetype="Expanding" vsizetype="Preferred">
     <horstretch>0</horstretch>
     <verstretch>0</verstretch>
    </sizepolicy>
@@ -28,7 +28,7 @@
     </widget>
    </item>
    <item>
-    <layout class="QFormLayout" name="formLayout">
+    <layout class="QGridLayout" name="gridLayout_2">
      <item row="0" column="0">
       <widget class="QLabel" name="label">
        <property name="text">
@@ -189,6 +189,16 @@
        </item>
       </widget>
      </item>
+     <item row="5" column="0">
+      <widget class="QCheckBox" name="noDataCheck">
+       <property name="text">
+        <string>Set no data value</string>
+       </property>
+      </widget>
+     </item>
+     <item row="5" column="1">
+      <widget class="QLineEdit" name="noDataEdit"/>
+     </item>
      <item row="6" column="0">
       <widget class="QCheckBox" name="cacheCheck">
        <property name="text">
@@ -209,16 +219,6 @@
        </property>
       </widget>
      </item>
-     <item row="5" column="0">
-      <widget class="QCheckBox" name="noDataCheck">
-       <property name="text">
-        <string>Set no data value</string>
-       </property>
-      </widget>
-     </item>
-     <item row="5" column="1">
-      <widget class="QLineEdit" name="noDataEdit"/>
-     </item>
     </layout>
    </item>
    <item>