From f4c25ad53702f11a98dddf92dde01560c8e1e2a1 Mon Sep 17 00:00:00 2001
From: Leandro Melo <leandro.melo@nokia.com>
Date: Mon, 28 Feb 2011 12:59:49 +0100
Subject: [PATCH] Revert "More options dialog UI changes"

This reverts commit c5b57ea5f9927a0843d37c793788892a5131c1ee.
---
 .../actionmanager/commandmappings.ui          |  6 ----
 src/plugins/help/filtersettingspage.ui        | 12 -------
 src/plugins/help/generalsettingspage.ui       |  6 ----
 src/plugins/help/remotehelpfilter.ui          | 12 -------
 src/plugins/locator/directoryfilter.ui        | 34 +++++--------------
 src/plugins/locator/settingspage.ui           | 18 ----------
 src/plugins/macros/macrooptionswidget.ui      |  6 ----
 .../projectexplorer/toolchainoptionspage.ui   |  2 +-
 src/plugins/texteditor/fontsettingspage.ui    |  6 ----
 .../snippets/snippetssettingspage.ui          | 18 ----------
 10 files changed, 9 insertions(+), 111 deletions(-)

diff --git a/src/plugins/coreplugin/actionmanager/commandmappings.ui b/src/plugins/coreplugin/actionmanager/commandmappings.ui
index de2007ade92..cc8cadc3b00 100644
--- a/src/plugins/coreplugin/actionmanager/commandmappings.ui
+++ b/src/plugins/coreplugin/actionmanager/commandmappings.ui
@@ -59,12 +59,6 @@
        <layout class="QHBoxLayout">
         <item>
          <widget class="QToolButton" name="defaultButton">
-          <property name="sizePolicy">
-           <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
-            <horstretch>0</horstretch>
-            <verstretch>0</verstretch>
-           </sizepolicy>
-          </property>
           <property name="toolTip">
            <string>Reset all to default</string>
           </property>
diff --git a/src/plugins/help/filtersettingspage.ui b/src/plugins/help/filtersettingspage.ui
index c5d2113e957..6d1ded527d9 100644
--- a/src/plugins/help/filtersettingspage.ui
+++ b/src/plugins/help/filtersettingspage.ui
@@ -114,12 +114,6 @@ Add, modify, and remove document filters, which determine the documentation set
     <layout class="QHBoxLayout" name="horizontalLayout">
      <item>
       <widget class="QToolButton" name="filterAddButton">
-       <property name="sizePolicy">
-        <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
-         <horstretch>0</horstretch>
-         <verstretch>0</verstretch>
-        </sizepolicy>
-       </property>
        <property name="text">
         <string>Add</string>
        </property>
@@ -131,12 +125,6 @@ Add, modify, and remove document filters, which determine the documentation set
      </item>
      <item>
       <widget class="QToolButton" name="filterRemoveButton">
-       <property name="sizePolicy">
-        <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
-         <horstretch>0</horstretch>
-         <verstretch>0</verstretch>
-        </sizepolicy>
-       </property>
        <property name="text">
         <string>Remove</string>
        </property>
diff --git a/src/plugins/help/generalsettingspage.ui b/src/plugins/help/generalsettingspage.ui
index a5be86559c8..655c237bc09 100644
--- a/src/plugins/help/generalsettingspage.ui
+++ b/src/plugins/help/generalsettingspage.ui
@@ -265,12 +265,6 @@
         </item>
         <item>
          <widget class="QToolButton" name="defaultPageButton">
-          <property name="sizePolicy">
-           <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
-            <horstretch>0</horstretch>
-            <verstretch>0</verstretch>
-           </sizepolicy>
-          </property>
           <property name="toolTip">
            <string>Reset to default</string>
           </property>
diff --git a/src/plugins/help/remotehelpfilter.ui b/src/plugins/help/remotehelpfilter.ui
index 50951190484..910adc88867 100644
--- a/src/plugins/help/remotehelpfilter.ui
+++ b/src/plugins/help/remotehelpfilter.ui
@@ -66,12 +66,6 @@
       <layout class="QVBoxLayout" name="verticalLayout">
        <item>
         <widget class="QToolButton" name="add">
-         <property name="sizePolicy">
-          <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
-           <horstretch>0</horstretch>
-           <verstretch>0</verstretch>
-          </sizepolicy>
-         </property>
          <property name="minimumSize">
           <size>
            <width>21</width>
@@ -89,12 +83,6 @@
        </item>
        <item>
         <widget class="QToolButton" name="remove">
-         <property name="sizePolicy">
-          <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
-           <horstretch>0</horstretch>
-           <verstretch>0</verstretch>
-          </sizepolicy>
-         </property>
          <property name="minimumSize">
           <size>
            <width>21</width>
diff --git a/src/plugins/locator/directoryfilter.ui b/src/plugins/locator/directoryfilter.ui
index e70c580930f..74b117cfb00 100644
--- a/src/plugins/locator/directoryfilter.ui
+++ b/src/plugins/locator/directoryfilter.ui
@@ -6,13 +6,13 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>487</width>
-    <height>333</height>
+    <width>387</width>
+    <height>285</height>
    </rect>
   </property>
-  <layout class="QVBoxLayout" name="verticalLayout_3">
-   <item>
-    <layout class="QGridLayout" name="gridLayout">
+  <layout class="QGridLayout">
+   <item row="0" column="0">
+    <layout class="QGridLayout">
      <item row="0" column="0">
       <widget class="QLabel" name="label">
        <property name="text">
@@ -54,12 +54,6 @@
       <layout class="QVBoxLayout" name="verticalLayout">
        <item>
         <widget class="QToolButton" name="addButton">
-         <property name="sizePolicy">
-          <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
-           <horstretch>0</horstretch>
-           <verstretch>0</verstretch>
-          </sizepolicy>
-         </property>
          <property name="text">
           <string>Add</string>
          </property>
@@ -71,12 +65,6 @@
        </item>
        <item>
         <widget class="QToolButton" name="editButton">
-         <property name="sizePolicy">
-          <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
-           <horstretch>0</horstretch>
-           <verstretch>0</verstretch>
-          </sizepolicy>
-         </property>
          <property name="text">
           <string>Edit</string>
          </property>
@@ -88,12 +76,6 @@
        </item>
        <item>
         <widget class="QToolButton" name="removeButton">
-         <property name="sizePolicy">
-          <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
-           <horstretch>0</horstretch>
-           <verstretch>0</verstretch>
-          </sizepolicy>
-         </property>
          <property name="text">
           <string>Remove</string>
          </property>
@@ -159,7 +141,7 @@ To do this, you type this shortcut and a space in the Locator entry field, and t
        </property>
       </widget>
      </item>
-     <item row="3" column="2">
+     <item row="3" column="2" colspan="2">
       <widget class="QCheckBox" name="defaultFlag">
        <property name="sizePolicy">
         <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
@@ -177,7 +159,7 @@ To do this, you type this shortcut and a space in the Locator entry field, and t
      </item>
     </layout>
    </item>
-   <item>
+   <item row="1" column="0">
     <spacer>
      <property name="orientation">
       <enum>Qt::Vertical</enum>
@@ -190,7 +172,7 @@ To do this, you type this shortcut and a space in the Locator entry field, and t
      </property>
     </spacer>
    </item>
-   <item>
+   <item row="2" column="0">
     <widget class="QDialogButtonBox" name="buttonBox">
      <property name="standardButtons">
       <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
diff --git a/src/plugins/locator/settingspage.ui b/src/plugins/locator/settingspage.ui
index 61e44d145a4..32896efa6ed 100644
--- a/src/plugins/locator/settingspage.ui
+++ b/src/plugins/locator/settingspage.ui
@@ -25,12 +25,6 @@
     <layout class="QVBoxLayout">
      <item>
       <widget class="QToolButton" name="addButton">
-       <property name="sizePolicy">
-        <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
-         <horstretch>0</horstretch>
-         <verstretch>0</verstretch>
-        </sizepolicy>
-       </property>
        <property name="text">
         <string>Add</string>
        </property>
@@ -45,12 +39,6 @@
        <property name="enabled">
         <bool>false</bool>
        </property>
-       <property name="sizePolicy">
-        <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
-         <horstretch>0</horstretch>
-         <verstretch>0</verstretch>
-        </sizepolicy>
-       </property>
        <property name="text">
         <string>Edit</string>
        </property>
@@ -65,12 +53,6 @@
        <property name="enabled">
         <bool>false</bool>
        </property>
-       <property name="sizePolicy">
-        <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
-         <horstretch>0</horstretch>
-         <verstretch>0</verstretch>
-        </sizepolicy>
-       </property>
        <property name="text">
         <string>Remove</string>
        </property>
diff --git a/src/plugins/macros/macrooptionswidget.ui b/src/plugins/macros/macrooptionswidget.ui
index 80260a52a80..02e556a539f 100644
--- a/src/plugins/macros/macrooptionswidget.ui
+++ b/src/plugins/macros/macrooptionswidget.ui
@@ -62,12 +62,6 @@
         <property name="enabled">
          <bool>false</bool>
         </property>
-        <property name="sizePolicy">
-         <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
         <property name="minimumSize">
          <size>
           <width>21</width>
diff --git a/src/plugins/projectexplorer/toolchainoptionspage.ui b/src/plugins/projectexplorer/toolchainoptionspage.ui
index b539358c96b..823c1d11e06 100644
--- a/src/plugins/projectexplorer/toolchainoptionspage.ui
+++ b/src/plugins/projectexplorer/toolchainoptionspage.ui
@@ -34,7 +34,7 @@
        <item>
         <widget class="QToolButton" name="addButton">
          <property name="sizePolicy">
-          <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
+          <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
            <horstretch>0</horstretch>
            <verstretch>0</verstretch>
           </sizepolicy>
diff --git a/src/plugins/texteditor/fontsettingspage.ui b/src/plugins/texteditor/fontsettingspage.ui
index 3a96127bc71..c1d82eee29e 100644
--- a/src/plugins/texteditor/fontsettingspage.ui
+++ b/src/plugins/texteditor/fontsettingspage.ui
@@ -174,12 +174,6 @@
           <property name="enabled">
            <bool>false</bool>
           </property>
-          <property name="sizePolicy">
-           <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
-            <horstretch>0</horstretch>
-            <verstretch>0</verstretch>
-           </sizepolicy>
-          </property>
           <property name="toolTip">
            <string>Delete</string>
           </property>
diff --git a/src/plugins/texteditor/snippets/snippetssettingspage.ui b/src/plugins/texteditor/snippets/snippetssettingspage.ui
index d2c7c436452..b885093fd8d 100644
--- a/src/plugins/texteditor/snippets/snippetssettingspage.ui
+++ b/src/plugins/texteditor/snippets/snippetssettingspage.ui
@@ -72,12 +72,6 @@
         <layout class="QHBoxLayout" name="horizontalLayout_2">
          <item>
           <widget class="QToolButton" name="addButton">
-           <property name="sizePolicy">
-            <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
-             <horstretch>0</horstretch>
-             <verstretch>0</verstretch>
-            </sizepolicy>
-           </property>
            <property name="text">
             <string>Add</string>
            </property>
@@ -89,12 +83,6 @@
          </item>
          <item>
           <widget class="QToolButton" name="removeButton">
-           <property name="sizePolicy">
-            <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
-             <horstretch>0</horstretch>
-             <verstretch>0</verstretch>
-            </sizepolicy>
-           </property>
            <property name="text">
             <string>Remove</string>
            </property>
@@ -122,12 +110,6 @@
          </item>
          <item>
           <widget class="QToolButton" name="resetAllButton">
-           <property name="sizePolicy">
-            <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
-             <horstretch>0</horstretch>
-             <verstretch>0</verstretch>
-            </sizepolicy>
-           </property>
            <property name="toolTip">
             <string>Reset</string>
            </property>