From c5b57ea5f9927a0843d37c793788892a5131c1ee Mon Sep 17 00:00:00 2001
From: Leandro Melo <leandro.melo@nokia.com>
Date: Fri, 25 Feb 2011 17:00:06 +0100
Subject: [PATCH] More options dialog UI changes
Continuing 561f87fcb9d58aaccbccd424417e71b79798ff6b
---
.../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, 111 insertions(+), 9 deletions(-)
diff --git a/src/plugins/coreplugin/actionmanager/commandmappings.ui b/src/plugins/coreplugin/actionmanager/commandmappings.ui
index cc8cadc3b00..de2007ade92 100644
--- a/src/plugins/coreplugin/actionmanager/commandmappings.ui
+++ b/src/plugins/coreplugin/actionmanager/commandmappings.ui
@@ -59,6 +59,12 @@
<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 6d1ded527d9..c5d2113e957 100644
--- a/src/plugins/help/filtersettingspage.ui
+++ b/src/plugins/help/filtersettingspage.ui
@@ -114,6 +114,12 @@ 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>
@@ -125,6 +131,12 @@ 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 655c237bc09..a5be86559c8 100644
--- a/src/plugins/help/generalsettingspage.ui
+++ b/src/plugins/help/generalsettingspage.ui
@@ -265,6 +265,12 @@
</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 910adc88867..50951190484 100644
--- a/src/plugins/help/remotehelpfilter.ui
+++ b/src/plugins/help/remotehelpfilter.ui
@@ -66,6 +66,12 @@
<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>
@@ -83,6 +89,12 @@
</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 74b117cfb00..e70c580930f 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>387</width>
- <height>285</height>
+ <width>487</width>
+ <height>333</height>
</rect>
</property>
- <layout class="QGridLayout">
- <item row="0" column="0">
- <layout class="QGridLayout">
+ <layout class="QVBoxLayout" name="verticalLayout_3">
+ <item>
+ <layout class="QGridLayout" name="gridLayout">
<item row="0" column="0">
<widget class="QLabel" name="label">
<property name="text">
@@ -54,6 +54,12 @@
<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>
@@ -65,6 +71,12 @@
</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>
@@ -76,6 +88,12 @@
</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>
@@ -141,7 +159,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" colspan="2">
+ <item row="3" column="2">
<widget class="QCheckBox" name="defaultFlag">
<property name="sizePolicy">
<sizepolicy hsizetype="Minimum" vsizetype="Fixed">
@@ -159,7 +177,7 @@ To do this, you type this shortcut and a space in the Locator entry field, and t
</item>
</layout>
</item>
- <item row="1" column="0">
+ <item>
<spacer>
<property name="orientation">
<enum>Qt::Vertical</enum>
@@ -172,7 +190,7 @@ To do this, you type this shortcut and a space in the Locator entry field, and t
</property>
</spacer>
</item>
- <item row="2" column="0">
+ <item>
<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 32896efa6ed..61e44d145a4 100644
--- a/src/plugins/locator/settingspage.ui
+++ b/src/plugins/locator/settingspage.ui
@@ -25,6 +25,12 @@
<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>
@@ -39,6 +45,12 @@
<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>
@@ -53,6 +65,12 @@
<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 02e556a539f..80260a52a80 100644
--- a/src/plugins/macros/macrooptionswidget.ui
+++ b/src/plugins/macros/macrooptionswidget.ui
@@ -62,6 +62,12 @@
<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 823c1d11e06..b539358c96b 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="Fixed">
+ <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
diff --git a/src/plugins/texteditor/fontsettingspage.ui b/src/plugins/texteditor/fontsettingspage.ui
index c1d82eee29e..3a96127bc71 100644
--- a/src/plugins/texteditor/fontsettingspage.ui
+++ b/src/plugins/texteditor/fontsettingspage.ui
@@ -174,6 +174,12 @@
<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 b885093fd8d..d2c7c436452 100644
--- a/src/plugins/texteditor/snippets/snippetssettingspage.ui
+++ b/src/plugins/texteditor/snippets/snippetssettingspage.ui
@@ -72,6 +72,12 @@
<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>
@@ -83,6 +89,12 @@
</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>
@@ -110,6 +122,12 @@
</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>
--
GitLab