From c43c8c9da71c9469b2184d7ea804e901930b355b Mon Sep 17 00:00:00 2001
From: Thomas Hartmann <Thomas.Hartmann@nokia.com>
Date: Tue, 20 Jul 2010 10:20:59 +0200
Subject: [PATCH] QmlDesigner: context pane changing left margin

---
 .../easingpane/easingcontextpane.ui           | 13 ++++++-
 .../propertyeditor/contextpanetext.ui         | 15 ++++++--
 .../propertyeditor/contextpanewidgetimage.ui  | 37 ++++++++++++++++---
 .../contextpanewidgetrectangle.ui             | 17 +++++++--
 4 files changed, 67 insertions(+), 15 deletions(-)

diff --git a/src/plugins/qmldesigner/components/easingpane/easingcontextpane.ui b/src/plugins/qmldesigner/components/easingpane/easingcontextpane.ui
index a01395e9c84..6e531e5719f 100644
--- a/src/plugins/qmldesigner/components/easingpane/easingcontextpane.ui
+++ b/src/plugins/qmldesigner/components/easingpane/easingcontextpane.ui
@@ -6,7 +6,7 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>260</width>
+    <width>244</width>
     <height>165</height>
    </rect>
   </property>
@@ -14,7 +14,16 @@
    <string>Dialog</string>
   </property>
   <layout class="QGridLayout" name="gridLayout">
-   <property name="margin">
+   <property name="leftMargin">
+    <number>0</number>
+   </property>
+   <property name="topMargin">
+    <number>3</number>
+   </property>
+   <property name="rightMargin">
+    <number>3</number>
+   </property>
+   <property name="bottomMargin">
     <number>3</number>
    </property>
    <property name="spacing">
diff --git a/src/plugins/qmldesigner/components/propertyeditor/contextpanetext.ui b/src/plugins/qmldesigner/components/propertyeditor/contextpanetext.ui
index 6e29f8ab040..b89aa10c987 100644
--- a/src/plugins/qmldesigner/components/propertyeditor/contextpanetext.ui
+++ b/src/plugins/qmldesigner/components/propertyeditor/contextpanetext.ui
@@ -14,15 +14,24 @@
    <string>Text</string>
   </property>
   <layout class="QGridLayout" name="gridLayout">
+   <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>4</number>
    </property>
    <property name="verticalSpacing">
     <number>2</number>
    </property>
-   <property name="margin">
-    <number>2</number>
-   </property>
    <item row="0" column="0" colspan="4">
     <widget class="QFontComboBox" name="fontComboBox">
      <property name="maximumSize">
diff --git a/src/plugins/qmldesigner/components/propertyeditor/contextpanewidgetimage.ui b/src/plugins/qmldesigner/components/propertyeditor/contextpanewidgetimage.ui
index 03371371268..9df6ad5c557 100644
--- a/src/plugins/qmldesigner/components/propertyeditor/contextpanewidgetimage.ui
+++ b/src/plugins/qmldesigner/components/propertyeditor/contextpanewidgetimage.ui
@@ -6,23 +6,32 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>290</width>
-    <height>84</height>
+    <width>282</width>
+    <height>93</height>
    </rect>
   </property>
   <property name="windowTitle">
    <string>Form</string>
   </property>
   <layout class="QGridLayout" name="gridLayout">
+   <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>6</number>
+    <number>4</number>
    </property>
    <property name="verticalSpacing">
     <number>0</number>
    </property>
-   <property name="margin">
-    <number>4</number>
-   </property>
    <item row="0" column="1" colspan="3">
     <widget class="FileWidget" name="fileWidget">
      <property name="sizePolicy">
@@ -254,6 +263,22 @@
      </property>
     </widget>
    </item>
+   <item row="3" column="0">
+    <widget class="QLabel" name="sizeLabel">
+     <property name="font">
+      <font>
+       <weight>75</weight>
+       <bold>true</bold>
+      </font>
+     </property>
+     <property name="text">
+      <string>10 x 10</string>
+     </property>
+     <property name="alignment">
+      <set>Qt::AlignCenter</set>
+     </property>
+    </widget>
+   </item>
   </layout>
  </widget>
  <customwidgets>
diff --git a/src/plugins/qmldesigner/components/propertyeditor/contextpanewidgetrectangle.ui b/src/plugins/qmldesigner/components/propertyeditor/contextpanewidgetrectangle.ui
index 4344d9e4906..882a4ddc6b8 100644
--- a/src/plugins/qmldesigner/components/propertyeditor/contextpanewidgetrectangle.ui
+++ b/src/plugins/qmldesigner/components/propertyeditor/contextpanewidgetrectangle.ui
@@ -6,7 +6,7 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>255</width>
+    <width>241</width>
     <height>120</height>
    </rect>
   </property>
@@ -14,15 +14,24 @@
    <string>Form</string>
   </property>
   <layout class="QGridLayout" name="gridLayout">
+   <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>4</number>
    </property>
    <property name="verticalSpacing">
     <number>2</number>
    </property>
-   <property name="margin">
-    <number>2</number>
-   </property>
    <item row="0" column="0">
     <widget class="QLabel" name="gradientLabel">
      <property name="font">
-- 
GitLab