From aa95055eb06c307f571db035af13a60b5dc293d8 Mon Sep 17 00:00:00 2001
From: Tobias Hunger <tobias.hunger@nokia.com>
Date: Tue, 18 Oct 2011 11:31:06 +0000
Subject: [PATCH] Git: Update settigspage

Task-number: QTCREATORBUG-6308
Change-Id: Ie791cee6f132a4aab345d6c9b3cde56053476e8d
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
---
 src/plugins/git/settingspage.ui | 72 +++++++++++++++------------------
 1 file changed, 32 insertions(+), 40 deletions(-)

diff --git a/src/plugins/git/settingspage.ui b/src/plugins/git/settingspage.ui
index 80b81020a9e..08b98fa2a34 100644
--- a/src/plugins/git/settingspage.ui
+++ b/src/plugins/git/settingspage.ui
@@ -17,57 +17,49 @@
       <bool>true</bool>
      </property>
      <property name="title">
-      <string>Environment Variables</string>
+      <string>Customize Environment:</string>
      </property>
      <property name="checkable">
       <bool>true</bool>
      </property>
-     <layout class="QVBoxLayout" name="verticalLayout_2">
-      <item>
-       <layout class="QHBoxLayout" name="horizontalLayout">
-        <item>
-         <widget class="QLabel" name="pathlabel">
-          <property name="text">
-           <string>PATH:</string>
-          </property>
-         </widget>
-        </item>
-        <item>
-         <widget class="QLineEdit" name="pathLineEdit"/>
-        </item>
-        <item>
-         <widget class="QPushButton" name="adoptButton">
-          <property name="text">
-           <string>From System</string>
-          </property>
-         </widget>
-        </item>
-       </layout>
+     <layout class="QGridLayout" name="gridLayout_2">
+      <item row="0" column="0">
+       <widget class="QLabel" name="pathlabel">
+        <property name="text">
+         <string>PATH:</string>
+        </property>
+       </widget>
       </item>
-      <item>
+      <item row="0" column="1">
+       <widget class="QLineEdit" name="pathLineEdit"/>
+      </item>
+      <item row="0" column="2">
+       <widget class="QPushButton" name="adoptButton">
+        <property name="text">
+         <string>From System</string>
+        </property>
+       </widget>
+      </item>
+      <item row="1" column="0" colspan="3">
        <widget class="QCheckBox" name="winHomeCheckBox">
         <property name="text">
          <string>Set &quot;HOME&quot; environment variable</string>
         </property>
        </widget>
       </item>
-      <item>
-       <layout class="QHBoxLayout" name="noteHorizontalLayout">
-        <item>
-         <widget class="QLabel" name="noteLabel">
-          <property name="text">
-           <string>&lt;b&gt;Note:&lt;/b&gt;</string>
-          </property>
-         </widget>
-        </item>
-        <item>
-         <widget class="QLabel" name="noteFieldlabel">
-          <property name="text">
-           <string>Git needs to find Perl in the environment as well.</string>
-          </property>
-         </widget>
-        </item>
-       </layout>
+      <item row="2" column="0">
+       <widget class="QLabel" name="noteLabel">
+        <property name="text">
+         <string>&lt;b&gt;Note:&lt;/b&gt;</string>
+        </property>
+       </widget>
+      </item>
+      <item row="2" column="1" colspan="2">
+       <widget class="QLabel" name="noteFieldlabel">
+        <property name="text">
+         <string>Git needs to find Perl in the environment.</string>
+        </property>
+       </widget>
       </item>
      </layout>
     </widget>