From fd18503ef205dbc25df3aadcfa4e330a49d7922e Mon Sep 17 00:00:00 2001
From: Daniel Teske <daniel.teske@digia.com>
Date: Thu, 7 Aug 2014 15:24:10 +0200
Subject: [PATCH] Fix placement of Bypass hooks checkbox
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Make it aligned to other labels.

Task-number: QTCREATORBUG-7202
Change-Id: I333f34d93fba8c8b6cf461f8ab1d9c26eeda20e7
Reviewed-by: André Hartmann <aha_1980@gmx.de>
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
---
 src/plugins/git/gitsubmitpanel.ui | 29 ++++++++++++++++++++++++-----
 1 file changed, 24 insertions(+), 5 deletions(-)

diff --git a/src/plugins/git/gitsubmitpanel.ui b/src/plugins/git/gitsubmitpanel.ui
index 7bc4bb6963c..ce03c470763 100644
--- a/src/plugins/git/gitsubmitpanel.ui
+++ b/src/plugins/git/gitsubmitpanel.ui
@@ -7,11 +7,20 @@
     <x>0</x>
     <y>0</y>
     <width>364</width>
-    <height>178</height>
+    <height>198</height>
    </rect>
   </property>
   <layout class="QVBoxLayout" name="verticalLayout">
-   <property name="margin">
+   <property name="leftMargin">
+    <number>0</number>
+   </property>
+   <property name="topMargin">
+    <number>0</number>
+   </property>
+   <property name="rightMargin">
+    <number>0</number>
+   </property>
+   <property name="bottomMargin">
     <number>0</number>
    </property>
    <item>
@@ -142,10 +151,20 @@
         </property>
        </widget>
       </item>
-      <item row="2" column="0">
+      <item row="2" column="1">
        <widget class="QCheckBox" name="bypassHooksCheckBox">
         <property name="text">
-         <string>By&amp;pass hooks</string>
+         <string/>
+        </property>
+       </widget>
+      </item>
+      <item row="2" column="0">
+       <widget class="QLabel" name="label">
+        <property name="text">
+         <string>By&amp;pass hooks:</string>
+        </property>
+        <property name="buddy">
+         <cstring>bypassHooksCheckBox</cstring>
         </property>
        </widget>
       </item>
@@ -155,7 +174,7 @@
   </layout>
  </widget>
  <resources>
-  <include location="../projectexplorer/projectexplorer.qrc"/>
+  <include location="../coreplugin/core.qrc"/>
  </resources>
  <connections/>
 </ui>