Make our options dialog a bit more uniform

In terms of buttons, layouts, aesthetics in general.

src/plugins/coreplugin/actionmanager/commandmappings.ui

@@ -58,10 +58,17 @@
       <item>
        <layout class="QHBoxLayout">
         <item>
-         <widget class="QPushButton" name="defaultButton">
+         <widget class="QToolButton" name="defaultButton">
+          <property name="toolTip">
+           <string>Reset all to default</string>
+          </property>
           <property name="text">
            <string>Defaults</string>
           </property>
+          <property name="icon">
+           <iconset resource="../core.qrc">
+            <normaloff>:/core/images/reset.png</normaloff>:/core/images/reset.png</iconset>
+          </property>
          </widget>
         </item>
         <item>
@@ -129,7 +136,7 @@
            </size>
           </property>
           <property name="toolTip">
-           <string>Reset</string>
+           <string>Reset to default</string>
           </property>
           <property name="text">
            <string/>
@@ -161,11 +168,6 @@
   </layout>
  </widget>
  <customwidgets>
-  <customwidget>
-   <class>Utils::FancyLineEdit</class>
-   <extends>QLineEdit</extends>
-   <header location="global">utils/fancylineedit.h</header>
-  </customwidget>
   <customwidget>
    <class>Utils::FilterLineEdit</class>
    <extends>QLineEdit</extends>

src/plugins/coreplugin/core.qrc

@@ -66,5 +66,8 @@
         <file>images/category_vcs.png</file>
         <file>images/category_qml.png</file>
         <file>images/filtericon.png</file>
+        <file>images/plus-16.png</file>
+        <file>images/minus-16.png</file>
+        <file>images/edit.png</file>
     </qresource>
 </RCC>

src/plugins/coreplugin/coreconstants.h

@@ -217,8 +217,9 @@ const char * const G_WINDOW_OTHER        = "QtCreator.Group.Window.Other";
 const char * const G_HELP_HELP           = "QtCreator.Group.Help.Help";
 const char * const G_HELP_ABOUT          = "QtCreator.Group.Help.About";
 
-const char * const ICON_MINUS            = ":/core/images/minus.png";
+const char * const ICON_MINUS            = ":/core/images/minus-16.png";
-const char * const ICON_PLUS             = ":/core/images/plus.png";
+const char * const ICON_PLUS             = ":/core/images/plus-16.png";
+const char * const ICON_EDIT             = ":/core/images/edit.png";
 const char * const ICON_NEWFILE          = ":/core/images/filenew.png";
 const char * const ICON_OPENFILE         = ":/core/images/fileopen.png";
 const char * const ICON_SAVEFILE         = ":/core/images/filesave.png";

src/plugins/cpaster/codepastersettings.cpp

@@ -97,10 +97,8 @@ QWidget *CodePasterSettingsPage::createPage(QWidget *parent)
     connect(lineEdit, SIGNAL(textChanged(QString)), this, SLOT(serverChanged(QString)));
     formLayout->addRow(tr("Server:"), lineEdit);
     outerLayout->addLayout(formLayout);
-    outerLayout->addSpacerItem(new QSpacerItem(0, 30, QSizePolicy::Ignored, QSizePolicy::Fixed));
+    QLabel *noteLabel = new QLabel(tr("<i>Note: Specify the host name for the CodePaster service "
-
+                                      "without any protocol prepended (e.g. codepaster.mycompany.com).</i>"));
-    QLabel *noteLabel = new QLabel(tr("Note: Specify the host name for the CodePaster service "
-                                      "without any protocol prepended (e.g. codepaster.mycompany.com)."));
     noteLabel->setWordWrap(true);
     outerLayout->addWidget(noteLabel);
 

src/plugins/cpaster/fileshareprotocolsettingswidget.ui

@@ -2,11 +2,32 @@
 <ui version="4.0">
  <class>CodePaster::FileShareProtocolSettingsWidget</class>
  <widget class="QWidget" name="CodePaster::FileShareProtocolSettingsWidget">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>403</width>
+    <height>122</height>
+   </rect>
+  </property>
   <property name="windowTitle">
    <string>Form</string>
   </property>
   <layout class="QFormLayout" name="formLayout">
-   <item row="1" column="0">
+   <property name="fieldGrowthPolicy">
+    <enum>QFormLayout::AllNonFixedFieldsGrow</enum>
+   </property>
+   <item row="0" column="0" colspan="2">
+    <widget class="QLabel" name="helpLabel">
+     <property name="text">
+      <string>The fileshare-based paster protocol allows for sharing code snippets using simple files on a shared network drive. Files are never deleted.</string>
+     </property>
+     <property name="wordWrap">
+      <bool>true</bool>
+     </property>
+    </widget>
+   </item>
+   <item row="2" column="0">
     <widget class="QLabel" name="pathLabel">
      <property name="text">
       <string>&amp;Path:</string>
@@ -16,10 +37,10 @@
      </property>
     </widget>
    </item>
-   <item row="1" column="1">
+   <item row="2" column="1">
-    <widget class="Utils::PathChooser" name="pathChooser"/>
+    <widget class="Utils::PathChooser" name="pathChooser" native="true"/>
    </item>
-   <item row="2" column="0">
+   <item row="3" column="0">
     <widget class="QLabel" name="displayCountLabel">
      <property name="text">
       <string>&amp;Display:</string>
@@ -29,7 +50,7 @@
      </property>
     </widget>
    </item>
-   <item row="2" column="1">
+   <item row="3" column="1">
     <widget class="QSpinBox" name="displayCountSpinBox">
      <property name="suffix">
       <string>entries</string>
@@ -45,15 +66,18 @@
      </property>
     </widget>
    </item>
-   <item row="0" column="0" colspan="2">
+   <item row="1" column="0">
-    <widget class="QLabel" name="helpLabel">
+    <spacer name="verticalSpacer">
-     <property name="text">
+     <property name="orientation">
-      <string>The fileshare-based paster protocol allows for sharing code snippets using simple files on a shared network drive. Files are never deleted.</string>
+      <enum>Qt::Vertical</enum>
      </property>
-     <property name="wordWrap">
+     <property name="sizeHint" stdset="0">
-      <bool>true</bool>
+      <size>
+       <width>20</width>
+       <height>5</height>
+      </size>
      </property>
-    </widget>
+    </spacer>
    </item>
   </layout>
  </widget>
@@ -62,6 +86,11 @@
    <class>Utils::PathChooser</class>
    <extends>QWidget</extends>
    <header location="global">utils/pathchooser.h</header>
+   <container>1</container>
+   <slots>
+    <signal>editingFinished()</signal>
+    <signal>browsingFinished()</signal>
+   </slots>
   </customwidget>
  </customwidgets>
  <resources/>

src/plugins/cpaster/pastebindotcomsettings.ui

@@ -15,22 +15,12 @@
   </property>
   <layout class="QVBoxLayout" name="verticalLayout_2">
    <item>
-    <layout class="QFormLayout" name="formLayout">
+    <widget class="QLabel" name="label">
-     <property name="fieldGrowthPolicy">
-      <enum>QFormLayout::ExpandingFieldsGrow</enum>
-     </property>
-     <item row="0" column="1">
-      <widget class="QLineEdit" name="lineEdit"/>
-     </item>
-     <item row="0" column="0">
-      <widget class="QLabel" name="serverPrefix">
      <property name="text">
-        <string>Server prefix:</string>
+      <string>&lt;a href=&quot;http://pastebin.com&quot;&gt;pastebin.com&lt;/a&gt; allows to send posts to custom subdomains (eg. creator.pastebin.com). Fill in the desired prefix.</string>
      </property>
     </widget>
    </item>
-    </layout>
-   </item>
    <item>
     <spacer name="explanatoryTextSpacer">
      <property name="orientation">
@@ -42,17 +32,32 @@
      <property name="sizeHint" stdset="0">
       <size>
        <width>0</width>
-       <height>30</height>
+       <height>5</height>
       </size>
      </property>
     </spacer>
    </item>
+   <item>
+    <layout class="QFormLayout" name="formLayout">
+     <property name="fieldGrowthPolicy">
+      <enum>QFormLayout::ExpandingFieldsGrow</enum>
+     </property>
+     <item row="0" column="0">
+      <widget class="QLabel" name="serverPrefix">
+       <property name="text">
+        <string>Server prefix:</string>
+       </property>
+      </widget>
+     </item>
+     <item row="0" column="1">
+      <widget class="QLineEdit" name="lineEdit"/>
+     </item>
+    </layout>
+   </item>
    <item>
     <widget class="QLabel" name="explanatoryTextLabel">
      <property name="text">
-      <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;
+      <string>&lt;i&gt;Note: The plugin will use this for posting as well as fetching.&lt;/i&gt;</string>
-&lt;p&gt;&lt;a href=&quot;http://pastebin.com&quot;&gt;pastebin.com&lt;/a&gt; allows to send posts to custom subdomains (eg. creator.pastebin.com). Fill in the desired prefix.&lt;/p&gt;
-&lt;p&gt;Note that the plugin will use this for posting as well as fetching.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
      </property>
      <property name="textFormat">
       <enum>Qt::AutoText</enum>

src/plugins/cpptools/cppfilesettingspage.cpp

@@ -37,6 +37,7 @@
 
 #include <coreplugin/icore.h>
 #include <coreplugin/editormanager/editormanager.h>
+#include <coreplugin/coreconstants.h>
 #include <coreplugin/mimedatabase.h>
 #include <cppeditor/cppeditorconstants.h>
 
@@ -52,6 +53,7 @@
 #include <QtCore/QTextCodec>
 #include <QtCore/QTextStream>
 
+#include <QtGui/QIcon>
 #include <QtGui/QFileDialog>
 #include <QtGui/QMessageBox>
 
@@ -247,6 +249,7 @@ CppFileSettingsWidget::CppFileSettingsWidget(QWidget *parent) :
             m_ui->headerSuffixComboBox->addItem(suffix);
     m_ui->licenseTemplatePathChooser->setExpectedKind(Utils::PathChooser::File);
     m_ui->licenseTemplatePathChooser->addButton(tr("Edit..."), this, SLOT(slotEdit()));
+    m_ui->licenseTemplatePathChooser->buttonAtIndex(1)->setIcon(QIcon(Core::Constants::ICON_EDIT));
 }
 
 CppFileSettingsWidget::~CppFileSettingsWidget()

src/plugins/debugger/dumperoptionpage.ui

@@ -10,13 +10,15 @@
     <height>303</height>
    </rect>
   </property>
-  <layout class="QVBoxLayout" name="verticalLayout_3">
+  <layout class="QVBoxLayout" name="verticalLayout_2">
    <item>
     <widget class="QLabel" name="label">
      <property name="text">
-      <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;
+      <string>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
-&lt;p&gt;The debugging helper is only used to produce a nice display of objects of certain types like QString or std::map in the &amp;quot;Locals and Watchers&amp;quot; view.&lt;/p&gt;
+&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-&lt;p&gt; It is not strictly necessary for debugging with Qt Creator. &lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+p, li { white-space: pre-wrap; }
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;&quot;&gt;
+&lt;p style=&quot; margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;The debugging helper is only used to produce a nice display of objects of certain types like QString or std::map in the &amp;quot;Locals and Watchers&amp;quot; view. It is not strictly necessary for debugging with Qt Creator. &lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
      </property>
      <property name="textFormat">
       <enum>Qt::AutoText</enum>
@@ -26,6 +28,22 @@
      </property>
     </widget>
    </item>
+   <item>
+    <spacer name="verticalSpacer_2">
+     <property name="orientation">
+      <enum>Qt::Vertical</enum>
+     </property>
+     <property name="sizeType">
+      <enum>QSizePolicy::Fixed</enum>
+     </property>
+     <property name="sizeHint" stdset="0">
+      <size>
+       <width>20</width>
+       <height>5</height>
+      </size>
+     </property>
+    </spacer>
+   </item>
    <item>
     <widget class="QGroupBox" name="debuggingHelperGroupBox">
      <property name="title">

src/plugins/help/docsettingspage.ui

@@ -39,17 +39,25 @@
          <number>0</number>
         </property>
         <item>
-         <widget class="QPushButton" name="addButton">
+         <widget class="QToolButton" name="addButton">
           <property name="text">
            <string>Add...</string>
           </property>
+          <property name="icon">
+           <iconset resource="../coreplugin/core.qrc">
+            <normaloff>:/core/images/plus-16.png</normaloff>:/core/images/plus-16.png</iconset>
+          </property>
          </widget>
         </item>
         <item>
-         <widget class="QPushButton" name="removeButton">
+         <widget class="QToolButton" name="removeButton">
           <property name="text">
            <string>Remove</string>
           </property>
+          <property name="icon">
+           <iconset resource="../coreplugin/core.qrc">
+            <normaloff>:/core/images/minus-16.png</normaloff>:/core/images/minus-16.png</iconset>
+          </property>
          </widget>
         </item>
         <item>
@@ -72,6 +80,8 @@
    </item>
   </layout>
  </widget>
- <resources/>
+ <resources>
+  <include location="../coreplugin/core.qrc"/>
+ </resources>
  <connections/>
 </ui>

src/plugins/help/filtersettingspage.ui

@@ -113,17 +113,25 @@ Add, modify, and remove document filters, which determine the documentation set
    <item>
     <layout class="QHBoxLayout" name="horizontalLayout">
      <item>
-      <widget class="QPushButton" name="filterAddButton">
+      <widget class="QToolButton" name="filterAddButton">
        <property name="text">
         <string>Add</string>
        </property>
+       <property name="icon">
+        <iconset resource="../coreplugin/core.qrc">
+         <normaloff>:/core/images/plus-16.png</normaloff>:/core/images/plus-16.png</iconset>
+       </property>
       </widget>
      </item>
      <item>
-      <widget class="QPushButton" name="filterRemoveButton">
+      <widget class="QToolButton" name="filterRemoveButton">
        <property name="text">
         <string>Remove</string>
        </property>
+       <property name="icon">
+        <iconset resource="../coreplugin/core.qrc">
+         <normaloff>:/core/images/minus-16.png</normaloff>:/core/images/minus-16.png</iconset>
+       </property>
       </widget>
      </item>
      <item>
@@ -143,6 +151,8 @@ Add, modify, and remove document filters, which determine the documentation set
    </item>
   </layout>
  </widget>
- <resources/>
+ <resources>
+  <include location="../coreplugin/core.qrc"/>
+ </resources>
  <connections/>
 </ui>

src/plugins/help/generalsettingspage.ui

@@ -264,9 +264,16 @@
          </widget>
         </item>
         <item>
-         <widget class="QPushButton" name="defaultPageButton">
+         <widget class="QToolButton" name="defaultPageButton">
+          <property name="toolTip">
+           <string>Reset to default</string>
+          </property>
           <property name="text">
-           <string>Restore to Default</string>
+           <string>Reset to Default</string>
+          </property>
+          <property name="icon">
+           <iconset resource="../coreplugin/core.qrc">
+            <normaloff>:/core/images/reset.png</normaloff>:/core/images/reset.png</iconset>
           </property>
          </widget>
         </item>
@@ -393,6 +400,8 @@
    </item>
   </layout>
  </widget>
- <resources/>
+ <resources>
+  <include location="../coreplugin/core.qrc"/>
+ </resources>
  <connections/>
 </ui>

src/plugins/help/remotehelpfilter.ui

@@ -75,6 +75,10 @@
          <property name="text">
           <string>+</string>
          </property>
+         <property name="icon">
+          <iconset resource="../coreplugin/core.qrc">
+           <normaloff>:/core/images/plus-16.png</normaloff>:/core/images/plus-16.png</iconset>
+         </property>
         </widget>
        </item>
        <item>
@@ -88,6 +92,10 @@
          <property name="text">
           <string>-</string>
          </property>
+         <property name="icon">
+          <iconset resource="../coreplugin/core.qrc">
+           <normaloff>:/core/images/minus-16.png</normaloff>:/core/images/minus-16.png</iconset>
+         </property>
         </widget>
        </item>
        <item>
@@ -119,7 +127,9 @@
    </item>
   </layout>
  </widget>
- <resources/>
+ <resources>
+  <include location="../coreplugin/core.qrc"/>
+ </resources>
  <connections>
   <connection>
    <sender>buttonBox</sender>

src/plugins/locator/directoryfilter.ui

@@ -6,8 +6,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>393</width>
+    <width>387</width>
-    <height>275</height>
+    <height>285</height>
    </rect>
   </property>
   <layout class="QGridLayout">
@@ -23,6 +23,83 @@
      <item row="0" column="1" colspan="3">
       <widget class="QLineEdit" name="nameEdit"/>
      </item>
+     <item row="1" column="0">
+      <layout class="QVBoxLayout" name="verticalLayout_2">
+       <item>
+        <widget class="QLabel" name="label_2">
+         <property name="text">
+          <string>Directories:</string>
+         </property>
+        </widget>
+       </item>
+       <item>
+        <spacer name="verticalSpacer">
+         <property name="orientation">
+          <enum>Qt::Vertical</enum>
+         </property>
+         <property name="sizeHint" stdset="0">
+          <size>
+           <width>20</width>
+           <height>40</height>
+          </size>
+         </property>
+        </spacer>
+       </item>
+      </layout>
+     </item>
+     <item row="1" column="1" colspan="2">
+      <widget class="QListWidget" name="directoryList"/>
+     </item>
+     <item row="1" column="3">
+      <layout class="QVBoxLayout" name="verticalLayout">
+       <item>
+        <widget class="QToolButton" name="addButton">
+         <property name="text">
+          <string>Add</string>
+         </property>
+         <property name="icon">
+          <iconset resource="../coreplugin/core.qrc">
+           <normaloff>:/core/images/plus-16.png</normaloff>:/core/images/plus-16.png</iconset>
+         </property>
+        </widget>
+       </item>
+       <item>
+        <widget class="QToolButton" name="editButton">
+         <property name="text">
+          <string>Edit</string>
+         </property>
+         <property name="icon">
+          <iconset resource="../coreplugin/core.qrc">
+           <normaloff>:/core/images/edit.png</normaloff>:/core/images/edit.png</iconset>
+         </property>
+        </widget>
+       </item>
+       <item>
+        <widget class="QToolButton" name="removeButton">
+         <property name="text">
+          <string>Remove</string>
+         </property>
+         <property name="icon">
+          <iconset resource="../coreplugin/core.qrc">
+           <normaloff>:/core/images/minus-16.png</normaloff>:/core/images/minus-16.png</iconset>
+         </property>
+        </widget>
+       </item>
+       <item>
+        <spacer name="verticalSpacer_2">
+         <property name="orientation">
+          <enum>Qt::Vertical</enum>
+         </property>
+         <property name="sizeHint" stdset="0">
+          <size>
+           <width>20</width>
+           <height>40</height>
+          </size>
+         </property>
+        </spacer>
+       </item>
+      </layout>
+     </item>
      <item row="2" column="0">
       <widget class="QLabel" name="label_3">
        <property name="text">
@@ -80,58 +157,6 @@ To do this, you type this shortcut and a space in the Locator entry field, and t
        </property>
       </widget>
      </item>
-     <item row="1" column="3">
-      <layout class="QVBoxLayout" name="verticalLayout">
-       <item>
-        <widget class="QPushButton" name="addButton">
-         <property name="text">
-          <string>Add...</string>
-         </property>
-        </widget>
-       </item>
-       <item>
-        <widget class="QPushButton" name="editButton">
-         <property name="text">
-          <string>Edit...</string>
-         </property>
-        </widget>
-       </item>
-       <item>
-        <widget class="QPushButton" name="removeButton">
-         <property name="text">
-          <string>Remove</string>
-         </property>
-        </widget>
-       </item>
-      </layout>
-     </item>
-     <item row="1" column="0">
-      <layout class="QVBoxLayout" name="verticalLayout_2">
-       <item>
-        <widget class="QLabel" name="label_2">
-         <property name="text">
-          <string>Directories:</string>
-         </property>
-        </widget>
-       </item>
-       <item>
-        <spacer name="verticalSpacer">
-         <property name="orientation">
-          <enum>Qt::Vertical</enum>
-         </property>
-         <property name="sizeHint" stdset="0">
-          <size>
-           <width>20</width>
-           <height>40</height>
-          </size>
-         </property>
-        </spacer>
-       </item>
-      </layout>
-     </item>
-     <item row="1" column="1" colspan="2">
-      <widget class="QListWidget" name="directoryList"/>
-     </item>
     </layout>
    </item>
    <item row="1" column="0">
@@ -156,7 +181,9 @@ To do this, you type this shortcut and a space in the Locator entry field, and t
    </item>
   </layout>
  </widget>
- <resources/>
+ <resources>
+  <include location="../coreplugin/core.qrc"/>
+ </resources>
  <connections>
   <connection>
    <sender>buttonBox</sender>

src/plugins/locator/settingspage.ui

@@ -24,29 +24,41 @@
    <item row="0" column="1">
     <layout class="QVBoxLayout">
      <item>
-      <widget class="QPushButton" name="addButton">
+      <widget class="QToolButton" name="addButton">
        <property name="text">
         <string>Add</string>
        </property>
+       <property name="icon">
+        <iconset resource="../coreplugin/core.qrc">
+         <normaloff>:/core/images/plus-16.png</normaloff>:/core/images/plus-16.png</iconset>
+       </property>
       </widget>
      </item>
      <item>
-      <widget class="QPushButton" name="removeButton">
+      <widget class="QToolButton" name="editButton">
+       <property name="enabled">
+        <bool>false</bool>
+       </property>
+       <property name="text">
+        <string>Edit</string>
+       </property>
+       <property name="icon">
+        <iconset resource="../coreplugin/core.qrc">
+         <normaloff>:/core/images/edit.png</normaloff>:/core/images/edit.png</iconset>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QToolButton" name="removeButton">
        <property name="enabled">
         <bool>false</bool>
        </property>
        <property name="text">
         <string>Remove</string>
        </property>
-      </widget>
+       <property name="icon">
-     </item>
+        <iconset resource="../coreplugin/core.qrc">
-     <item>
+         <normaloff>:/core/images/minus-16.png</normaloff>:/core/images/minus-16.png</iconset>
-      <widget class="QPushButton" name="editButton">
-       <property name="enabled">
-        <bool>false</bool>
-       </property>
-       <property name="text">
-        <string>Edit</string>
        </property>
       </widget>
      </item>
@@ -113,6 +125,8 @@
    </item>
   </layout>
  </widget>
- <resources/>
+ <resources>
+  <include location="../coreplugin/core.qrc"/>
+ </resources>
  <connections/>
 </ui>

src/plugins/projectexplorer/toolchainoptionspage.ui

@@ -50,7 +50,7 @@
          </property>
          <property name="icon">
           <iconset resource="../coreplugin/core.qrc">
-           <normaloff>:/core/images/plus.png</normaloff>:/core/images/plus.png</iconset>
+           <normaloff>:/core/images/plus-16.png</normaloff>:/core/images/plus-16.png</iconset>
          </property>
          <property name="popupMode">
           <enum>QToolButton::InstantPopup</enum>
@@ -76,7 +76,7 @@
          </property>
          <property name="icon">
           <iconset resource="../coreplugin/core.qrc">
-           <normaloff>:/core/images/minus.png</normaloff>:/core/images/minus.png</iconset>
+           <normaloff>:/core/images/minus-16.png</normaloff>:/core/images/minus-16.png</iconset>
          </property>
         </widget>
        </item>

src/plugins/qmldesigner/settingspage.ui

@@ -6,68 +6,30 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>433</width>
+    <width>435</width>
-    <height>428</height>
+    <height>240</height>
    </rect>
   </property>
   <property name="windowTitle">
    <string>Form</string>
   </property>
-  <layout class="QGridLayout" name="gridLayout">
+  <layout class="QVBoxLayout" name="verticalLayout">
-   <item row="0" column="0">
+   <item>
     <widget class="QGroupBox" name="groupBox_3">
      <property name="title">
       <string>Snapping</string>
      </property>
-     <layout class="QGridLayout" name="gridLayout_6">
+     <layout class="QHBoxLayout" name="horizontalLayout">
-      <property name="margin">
+      <item>
-       <number>9</number>
+       <layout class="QGridLayout" name="gridLayout">
-      </property>
-      <item row="0" column="0">
-       <layout class="QGridLayout" name="gridLayout_4">
-        <property name="leftMargin">
-         <number>0</number>
-        </property>
-        <property name="topMargin">
-         <number>2</number>
-        </property>
-        <property name="rightMargin">
-         <number>2</number>
-        </property>
-        <property name="bottomMargin">
-         <number>2</number>
-        </property>
-        <property name="horizontalSpacing">
-         <number>20</number>
-        </property>
-        <item row="0" column="1">
-         <widget class="QLabel" name="itemSpacingLabel">
-          <property name="text">
-           <string>Item spacing</string>
-          </property>
-         </widget>
-        </item>
-        <item row="2" column="1">
-         <widget class="QSpinBox" name="spinItemSpacing">
-          <property name="sizePolicy">
-           <sizepolicy hsizetype="Maximum" vsizetype="Fixed">
-            <horstretch>0</horstretch>
-            <verstretch>0</verstretch>
-           </sizepolicy>
-          </property>
-          <property name="maximum">
-           <number>50</number>
-          </property>
-         </widget>
-        </item>
         <item row="0" column="0">
          <widget class="QLabel" name="snapMarginLabel">
           <property name="text">
-           <string>Snap margin</string>
+           <string>Snap margin:</string>
           </property>
          </widget>
         </item>
-        <item row="2" column="0">
+        <item row="0" column="1">
          <widget class="QSpinBox" name="spinSnapMargin">
           <property name="sizePolicy">
            <sizepolicy hsizetype="Maximum" vsizetype="Fixed">
@@ -80,16 +42,36 @@
           </property>
          </widget>
         </item>
+        <item row="1" column="0">
+         <widget class="QLabel" name="itemSpacingLabel">
+          <property name="text">
+           <string>Item spacing:</string>
+          </property>
+         </widget>
+        </item>
+        <item row="1" column="1">
+         <widget class="QSpinBox" name="spinItemSpacing">
+          <property name="sizePolicy">
+           <sizepolicy hsizetype="Maximum" vsizetype="Fixed">
+            <horstretch>0</horstretch>
+            <verstretch>0</verstretch>
+           </sizepolicy>
+          </property>
+          <property name="maximum">
+           <number>50</number>
+          </property>
+         </widget>
+        </item>
        </layout>
       </item>
-      <item row="0" column="1">
+      <item>
        <spacer name="horizontalSpacer">
         <property name="orientation">
          <enum>Qt::Horizontal</enum>
         </property>
         <property name="sizeHint" stdset="0">
          <size>
-          <width>40</width>
+          <width>273</width>
           <height>20</height>
          </size>
         </property>
@@ -98,7 +80,7 @@
      </layout>
     </widget>
    </item>
-   <item row="1" column="0">
+   <item>
     <spacer name="verticalSpacer">
      <property name="orientation">
       <enum>Qt::Vertical</enum>

src/plugins/qmljseditor/quicktoolbarsettingspage.ui

@@ -19,14 +19,7 @@
      <property name="title">
       <string>Qt Quick Toolbars</string>
      </property>
-     <layout class="QHBoxLayout" name="horizontalLayout">
+     <layout class="QVBoxLayout" name="verticalLayout">
-      <item>
-       <widget class="QCheckBox" name="textEditHelperCheckBox">
-        <property name="text">
-         <string>Always show Qt Quick Toolbar</string>
-        </property>
-       </widget>
-      </item>
       <item>
        <widget class="QCheckBox" name="textEditHelperCheckBoxPin">
         <property name="toolTip">
@@ -37,6 +30,13 @@
         </property>
        </widget>
       </item>
+      <item>
+       <widget class="QCheckBox" name="textEditHelperCheckBox">
+        <property name="text">
+         <string>Always show Qt Quick Toolbar</string>
+        </property>
+       </widget>
+      </item>
      </layout>
     </widget>
    </item>

src/plugins/qt4projectmanager/qt-maemo/maemodeviceconfigurationssettingswidget.ui

@@ -13,9 +13,9 @@
   <property name="windowTitle">
    <string>Maemo Device Configurations</string>
   </property>
-  <layout class="QHBoxLayout" name="horizontalLayout">
-   <item>
   <layout class="QVBoxLayout" name="verticalLayout_3">
+   <item>
+    <layout class="QHBoxLayout" name="horizontalLayout">
      <item>
       <layout class="QFormLayout" name="formLayout">
        <property name="fieldGrowthPolicy">
@@ -46,6 +46,53 @@
        </item>
       </layout>
      </item>
+     <item>
+      <widget class="QToolButton" name="addConfigButton">
+       <property name="sizePolicy">
+        <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+         <horstretch>0</horstretch>
+         <verstretch>0</verstretch>
+        </sizepolicy>
+       </property>
+       <property name="focusPolicy">
+        <enum>Qt::StrongFocus</enum>
+       </property>
+       <property name="text">
+        <string>&amp;Add</string>
+       </property>
+       <property name="icon">
+        <iconset resource="../../coreplugin/core.qrc">
+         <normaloff>:/core/images/plus-16.png</normaloff>:/core/images/plus-16.png</iconset>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QToolButton" name="removeConfigButton">
+       <property name="enabled">
+        <bool>false</bool>
+       </property>
+       <property name="sizePolicy">
+        <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+         <horstretch>0</horstretch>
+         <verstretch>0</verstretch>
+        </sizepolicy>
+       </property>
+       <property name="focusPolicy">
+        <enum>Qt::StrongFocus</enum>
+       </property>
+       <property name="text">
+        <string>&amp;Remove</string>
+       </property>
+       <property name="icon">
+        <iconset resource="../../coreplugin/core.qrc">
+         <normaloff>:/core/images/minus-16.png</normaloff>:/core/images/minus-16.png</iconset>
+       </property>
+      </widget>
+     </item>
+    </layout>
+   </item>
+   <item>
+    <layout class="QHBoxLayout" name="horizontalLayout_2">
      <item>
       <widget class="QFrame" name="frame">
        <property name="frameShape">
@@ -55,6 +102,9 @@
         <enum>QFrame::Raised</enum>
        </property>
        <layout class="QVBoxLayout" name="verticalLayout_2">
+        <property name="topMargin">
+         <number>0</number>
+        </property>
         <item>
          <widget class="QWidget" name="detailsWidget" native="true">
           <property name="enabled">
@@ -67,6 +117,9 @@
            </sizepolicy>
           </property>
           <layout class="QFormLayout" name="formLayout_2">
+           <property name="topMargin">
+            <number>0</number>
+           </property>
            <item row="0" column="0">
             <widget class="QLabel" name="deviceNameLabel">
              <property name="text">
@@ -360,33 +413,8 @@
        </layout>
       </widget>
      </item>
-    </layout>
-   </item>
      <item>
       <layout class="QVBoxLayout" name="verticalLayout">
-     <item>
-      <widget class="QPushButton" name="addConfigButton">
-       <property name="focusPolicy">
-        <enum>Qt::StrongFocus</enum>
-       </property>
-       <property name="text">
-        <string>&amp;Add</string>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <widget class="QPushButton" name="removeConfigButton">
-       <property name="enabled">
-        <bool>false</bool>
-       </property>
-       <property name="focusPolicy">
-        <enum>Qt::StrongFocus</enum>
-       </property>
-       <property name="text">
-        <string>&amp;Remove</string>
-       </property>
-      </widget>
-     </item>
        <item>
         <widget class="QPushButton" name="testConfigButton">
          <property name="enabled">
@@ -480,6 +508,8 @@
       </layout>
      </item>
     </layout>
+   </item>
+  </layout>
  </widget>
  <customwidgets>
   <customwidget>
@@ -493,7 +523,9 @@
    </slots>
   </customwidget>
  </customwidgets>
- <resources/>
+ <resources>
+  <include location="../../coreplugin/core.qrc"/>
+ </resources>
  <connections>
   <connection>
    <sender>hostLineEdit</sender>
@@ -543,38 +575,6 @@
     </hint>
    </hints>
   </connection>
-  <connection>
-   <sender>addConfigButton</sender>
-   <signal>clicked()</signal>
-   <receiver>MaemoDeviceConfigurationsSettingsWidget</receiver>
-   <slot>addConfig()</slot>
-   <hints>
-    <hint type="sourcelabel">
-     <x>465</x>
-     <y>27</y>
-    </hint>
-    <hint type="destinationlabel">
-     <x>516</x>
-     <y>118</y>
-    </hint>
-   </hints>
-  </connection>
-  <connection>
-   <sender>removeConfigButton</sender>
-   <signal>clicked()</signal>
-   <receiver>MaemoDeviceConfigurationsSettingsWidget</receiver>
-   <slot>deleteConfig()</slot>
-   <hints>
-    <hint type="sourcelabel">
-     <x>473</x>
-     <y>61</y>
-    </hint>
-    <hint type="destinationlabel">
-     <x>513</x>
-     <y>101</y>
-    </hint>
-   </hints>
-  </connection>
   <connection>
    <sender>passwordButton</sender>
    <signal>toggled(bool)</signal>

src/plugins/texteditor/fontsettingspage.ui

@@ -170,13 +170,20 @@
          </widget>
         </item>
         <item>
-         <widget class="QPushButton" name="deleteButton">
+         <widget class="QToolButton" name="deleteButton">
           <property name="enabled">
            <bool>false</bool>
           </property>
+          <property name="toolTip">
+           <string>Delete</string>
+          </property>
           <property name="text">
            <string>Delete</string>
           </property>
+          <property name="icon">
+           <iconset resource="../coreplugin/core.qrc">
+            <normaloff>:/core/images/minus-16.png</normaloff>:/core/images/minus-16.png</iconset>
+          </property>
          </widget>
         </item>
        </layout>
@@ -204,6 +211,8 @@
    <container>1</container>
   </customwidget>
  </customwidgets>
- <resources/>
+ <resources>
+  <include location="../coreplugin/core.qrc"/>
+ </resources>
  <connections/>
 </ui>

src/plugins/texteditor/generichighlighter/highlightersettingspage.ui

@@ -40,6 +40,22 @@
      </property>
     </widget>
    </item>
+   <item>
+    <spacer name="verticalSpacer_2">
+     <property name="orientation">
+      <enum>Qt::Vertical</enum>
+     </property>
+     <property name="sizeType">
+      <enum>QSizePolicy::Fixed</enum>
+     </property>
+     <property name="sizeHint" stdset="0">
+      <size>
+       <width>20</width>
+       <height>5</height>
+      </size>
+     </property>
+    </spacer>
+   </item>
    <item>
     <widget class="QGroupBox" name="definitionFilesGroupBox">
      <property name="title">

src/plugins/texteditor/snippets/snippetssettingspage.ui

@@ -6,8 +6,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>684</width>
+    <width>618</width>
-    <height>554</height>
+    <height>413</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -42,7 +42,7 @@
     </layout>
    </item>
    <item>
-    <layout class="QHBoxLayout" name="horizontalLayout_2">
+    <layout class="QHBoxLayout" name="horizontalLayout_3">
      <item>
       <layout class="QVBoxLayout" name="verticalLayout">
        <item>
@@ -65,22 +65,73 @@
      </item>
      <item>
       <layout class="QVBoxLayout" name="verticalLayout_2">
+       <property name="sizeConstraint">
+        <enum>QLayout::SetMaximumSize</enum>
+       </property>
        <item>
-        <widget class="QPushButton" name="addButton">
+        <layout class="QHBoxLayout" name="horizontalLayout_2">
+         <item>
+          <widget class="QToolButton" name="addButton">
            <property name="text">
             <string>Add</string>
            </property>
-        </widget>
+           <property name="icon">
-       </item>
+            <iconset resource="../../coreplugin/core.qrc">
-       <item>
+             <normaloff>:/core/images/plus-16.png</normaloff>:/core/images/plus-16.png</iconset>
-        <widget class="QPushButton" name="removeButton">
-         <property name="text">
-          <string>Remove</string>
            </property>
           </widget>
          </item>
+         <item>
+          <widget class="QToolButton" name="removeButton">
+           <property name="text">
+            <string>Remove</string>
+           </property>
+           <property name="icon">
+            <iconset resource="../../coreplugin/core.qrc">
+             <normaloff>:/core/images/minus-16.png</normaloff>:/core/images/minus-16.png</iconset>
+           </property>
+          </widget>
+         </item>
+         <item>
+          <spacer name="horizontalSpacer_2">
+           <property name="orientation">
+            <enum>Qt::Horizontal</enum>
+           </property>
+           <property name="sizeType">
+            <enum>QSizePolicy::Preferred</enum>
+           </property>
+           <property name="sizeHint" stdset="0">
+            <size>
+             <width>60</width>
+             <height>20</height>
+            </size>
+           </property>
+          </spacer>
+         </item>
+         <item>
+          <widget class="QToolButton" name="resetAllButton">
+           <property name="toolTip">
+            <string>Reset</string>
+           </property>
+           <property name="text">
+            <string>Reset All</string>
+           </property>
+           <property name="icon">
+            <iconset resource="../../coreplugin/core.qrc">
+             <normaloff>:/core/images/reset.png</normaloff>:/core/images/reset.png</iconset>
+           </property>
+          </widget>
+         </item>
+        </layout>
+       </item>
        <item>
         <widget class="QPushButton" name="revertButton">
+         <property name="sizePolicy">
+          <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
+           <horstretch>0</horstretch>
+           <verstretch>0</verstretch>
+          </sizepolicy>
+         </property>
          <property name="text">
           <string>Revert Built-in</string>
          </property>
@@ -88,18 +139,17 @@
        </item>
        <item>
         <widget class="QPushButton" name="restoreRemovedButton">
+         <property name="sizePolicy">
+          <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
+           <horstretch>0</horstretch>
+           <verstretch>0</verstretch>
+          </sizepolicy>
+         </property>
          <property name="text">
           <string>Restore Removed Built-ins</string>
          </property>
         </widget>
        </item>
-       <item>
-        <widget class="QPushButton" name="resetAllButton">
-         <property name="text">
-          <string>Reset All</string>
-         </property>
-        </widget>
-       </item>
        <item>
         <spacer name="verticalSpacer">
          <property name="orientation">
@@ -125,6 +175,8 @@
   <tabstop>removeButton</tabstop>
   <tabstop>snippetsTable</tabstop>
  </tabstops>
- <resources/>
+ <resources>
+  <include location="../../coreplugin/core.qrc"/>
+ </resources>
  <connections/>
 </ui>