From 1abe898c8a0c509083c00a537072aaf1e0ca128e Mon Sep 17 00:00:00 2001
From: Tobias Hunger <tobias.hunger@nokia.com>
Date: Fri, 19 Mar 2010 17:15:16 +0100
Subject: [PATCH] Improve alignment of items

---
 src/plugins/coreplugin/generalsettings.ui | 198 ++++++++++------------
 1 file changed, 91 insertions(+), 107 deletions(-)

diff --git a/src/plugins/coreplugin/generalsettings.ui b/src/plugins/coreplugin/generalsettings.ui
index cf87dcd8497..18d9dd2d0be 100644
--- a/src/plugins/coreplugin/generalsettings.ui
+++ b/src/plugins/coreplugin/generalsettings.ui
@@ -10,7 +10,7 @@
     <height>319</height>
    </rect>
   </property>
-  <layout class="QVBoxLayout" name="verticalLayout_3">
+  <layout class="QVBoxLayout" name="verticalLayout">
    <item>
     <widget class="QGroupBox" name="groupBox_2">
      <property name="title">
@@ -28,7 +28,7 @@
        </widget>
       </item>
       <item row="0" column="1">
-       <layout class="QHBoxLayout" name="colorHorizontalLayout">
+       <layout class="QHBoxLayout" name="horizontalLayout">
         <item>
          <widget class="Utils::QtColorButton" name="colorButton">
           <property name="sizePolicy">
@@ -69,7 +69,7 @@
           </property>
           <property name="sizeHint" stdset="0">
            <size>
-            <width>40</width>
+            <width>285</width>
             <height>20</height>
            </size>
           </property>
@@ -110,7 +110,7 @@
           </property>
           <property name="sizeHint" stdset="0">
            <size>
-            <width>40</width>
+            <width>285</width>
             <height>20</height>
            </size>
           </property>
@@ -126,110 +126,94 @@
      <property name="title">
       <string>System</string>
      </property>
-     <layout class="QVBoxLayout" name="verticalLayout_2">
-      <item>
-       <layout class="QGridLayout" name="gridLayout">
-        <item row="0" column="0">
-         <widget class="QLabel" name="terminalLabel">
-          <property name="text">
-           <string>Terminal:</string>
-          </property>
-         </widget>
-        </item>
-        <item row="0" column="1">
-         <layout class="QHBoxLayout" name="terminalHorizontalLayout">
-          <item>
-           <widget class="QLineEdit" name="terminalEdit"/>
-          </item>
-          <item>
-           <widget class="QToolButton" name="resetTerminalButton">
-            <property name="toolTip">
-             <string>Reset to default</string>
-            </property>
-            <property name="text">
-             <string>R</string>
-            </property>
-            <property name="icon">
-             <iconset resource="core.qrc">
-              <normaloff>:/core/images/reset.png</normaloff>:/core/images/reset.png</iconset>
-            </property>
-           </widget>
-          </item>
-         </layout>
-        </item>
-        <item row="1" column="0">
-         <widget class="QLabel" name="editorLabel">
-          <property name="text">
-           <string>External editor:</string>
-          </property>
-         </widget>
-        </item>
-        <item row="1" column="1">
-         <layout class="QHBoxLayout" name="editorHorizontalLayout">
-          <item>
-           <widget class="QLineEdit" name="externalEditorEdit"/>
-          </item>
-          <item>
-           <widget class="QToolButton" name="resetEditorButton">
-            <property name="toolTip">
-             <string>Reset to default</string>
-            </property>
-            <property name="text">
-             <string>R</string>
-            </property>
-            <property name="icon">
-             <iconset resource="core.qrc">
-              <normaloff>:/core/images/reset.png</normaloff>:/core/images/reset.png</iconset>
-            </property>
-           </widget>
-          </item>
-          <item>
-           <widget class="QToolButton" name="helpExternalEditorButton">
-            <property name="text">
-             <string>?</string>
-            </property>
-           </widget>
-          </item>
-         </layout>
-        </item>
-        <item row="2" column="0">
-         <widget class="QLabel" name="externalFileBrowserLabel">
-          <property name="text">
-           <string>External file browser:</string>
-          </property>
-         </widget>
-        </item>
-        <item row="2" column="1">
-         <layout class="QHBoxLayout" name="horizontalLayout">
-          <item>
-           <widget class="QLineEdit" name="externalFileBrowserEdit"/>
-          </item>
-          <item>
-           <widget class="QToolButton" name="resetFileBrowserButton">
-            <property name="toolTip">
-             <string>Reset to default</string>
-            </property>
-            <property name="text">
-             <string>R</string>
-            </property>
-            <property name="icon">
-             <iconset resource="core.qrc">
-              <normaloff>:/core/images/reset.png</normaloff>:/core/images/reset.png</iconset>
-            </property>
-           </widget>
-          </item>
-          <item>
-           <widget class="QToolButton" name="helpExternalFileBrowserButton">
-            <property name="text">
-             <string>?</string>
-            </property>
-           </widget>
-          </item>
-         </layout>
-        </item>
-       </layout>
+     <layout class="QGridLayout" name="gridLayout">
+      <item row="0" column="0">
+       <widget class="QLabel" name="terminalLabel">
+        <property name="text">
+         <string>Terminal:</string>
+        </property>
+       </widget>
+      </item>
+      <item row="0" column="1">
+       <widget class="QLineEdit" name="terminalEdit"/>
+      </item>
+      <item row="0" column="2">
+       <widget class="QToolButton" name="resetTerminalButton">
+        <property name="toolTip">
+         <string>Reset to default</string>
+        </property>
+        <property name="text">
+         <string>R</string>
+        </property>
+        <property name="icon">
+         <iconset resource="core.qrc">
+          <normaloff>:/core/images/reset.png</normaloff>:/core/images/reset.png</iconset>
+        </property>
+       </widget>
+      </item>
+      <item row="1" column="0">
+       <widget class="QLabel" name="editorLabel">
+        <property name="text">
+         <string>External editor:</string>
+        </property>
+       </widget>
+      </item>
+      <item row="1" column="1">
+       <widget class="QLineEdit" name="externalEditorEdit"/>
+      </item>
+      <item row="1" column="2">
+       <widget class="QToolButton" name="resetEditorButton">
+        <property name="toolTip">
+         <string>Reset to default</string>
+        </property>
+        <property name="text">
+         <string>R</string>
+        </property>
+        <property name="icon">
+         <iconset resource="core.qrc">
+          <normaloff>:/core/images/reset.png</normaloff>:/core/images/reset.png</iconset>
+        </property>
+       </widget>
+      </item>
+      <item row="1" column="3">
+       <widget class="QToolButton" name="helpExternalEditorButton">
+        <property name="text">
+         <string>?</string>
+        </property>
+       </widget>
+      </item>
+      <item row="2" column="0">
+       <widget class="QLabel" name="externalFileBrowserLabel">
+        <property name="text">
+         <string>External file browser:</string>
+        </property>
+       </widget>
+      </item>
+      <item row="2" column="1">
+       <widget class="QLineEdit" name="externalFileBrowserEdit"/>
+      </item>
+      <item row="2" column="2">
+       <widget class="QToolButton" name="resetFileBrowserButton">
+        <property name="toolTip">
+         <string>Reset to default</string>
+        </property>
+        <property name="text">
+         <string>R</string>
+        </property>
+        <property name="icon">
+         <iconset resource="core.qrc">
+          <normaloff>:/core/images/reset.png</normaloff>:/core/images/reset.png</iconset>
+        </property>
+       </widget>
+      </item>
+      <item row="2" column="3">
+       <widget class="QToolButton" name="helpExternalFileBrowserButton">
+        <property name="text">
+         <string>?</string>
+        </property>
+       </widget>
       </item>
-      <item>
+      <item row="3" column="0" colspan="4">
        <layout class="QHBoxLayout" name="horizontalLayout_2">
         <item>
          <widget class="QLabel" name="modifiedLabel">
-- 
GitLab