r16140 by jghali - modification of position and shape widget in order to get better visual consistency between the two widgets

[scribus-commit]

Author: jghali
Date: Tue Dec 21 23:12:19 2010
New Revision: 16140

URL: http://scribus.info/websvn/listing.php?repname=Scribus&sc=1&rev=16140
Log:
modification of position and shape widget in order to get better visual consistency between the two widgets

Modified:
    branches/ScribusOIF/scribus/ui/propertywidget_posbase.ui
    branches/ScribusOIF/scribus/ui/propertywidget_shapebase.ui

Modified: branches/ScribusOIF/scribus/ui/propertywidget_posbase.ui
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=16140&path=/branches/ScribusOIF/scribus/ui/propertywidget_posbase.ui
==============================================================================
--- branches/ScribusOIF/scribus/ui/propertywidget_posbase.ui (original)
+++ branches/ScribusOIF/scribus/ui/propertywidget_posbase.ui Tue Dec 21 23:12:19 2010
@@ -161,27 +161,6 @@
      </property>
     </widget>
    </item>
-   <item row="0" column="5" rowspan="2">
-    <widget class="Line" name="line">
-     <property name="orientation">
-      <enum>Qt::Vertical</enum>
-     </property>
-    </widget>
-   </item>
-   <item row="0" column="6">
-    <widget class="QToolButton" name="doLock">
-     <property name="text">
-      <string/>
-     </property>
-    </widget>
-   </item>
-   <item row="1" column="6">
-    <widget class="QToolButton" name="noResize">
-     <property name="text">
-      <string/>
-     </property>
-    </widget>
-   </item>
    <item row="3" column="1" colspan="3">
     <layout class="QGridLayout" name="gridLayout_2">
      <property name="spacing">
@@ -223,13 +202,6 @@
      </item>
      <item row="1" column="2">
       <widget class="QToolButton" name="doUngroup">
-       <property name="text">
-        <string/>
-       </property>
-      </widget>
-     </item>
-     <item row="0" column="4">
-      <widget class="QToolButton" name="noPrint">
        <property name="text">
         <string/>
        </property>
@@ -267,6 +239,27 @@
          <width>48</width>
          <height>48</height>
         </size>
+       </property>
+      </widget>
+     </item>
+     <item row="1" column="4">
+      <widget class="QToolButton" name="noPrint">
+       <property name="text">
+        <string/>
+       </property>
+      </widget>
+     </item>
+     <item row="0" column="4">
+      <widget class="QToolButton" name="doLock">
+       <property name="text">
+        <string/>
+       </property>
+      </widget>
+     </item>
+     <item row="0" column="5">
+      <widget class="QToolButton" name="noResize">
+       <property name="text">
+        <string/>
        </property>
       </widget>
      </item>

Modified: branches/ScribusOIF/scribus/ui/propertywidget_shapebase.ui
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=16140&path=/branches/ScribusOIF/scribus/ui/propertywidget_shapebase.ui
==============================================================================
--- branches/ScribusOIF/scribus/ui/propertywidget_shapebase.ui (original)
+++ branches/ScribusOIF/scribus/ui/propertywidget_shapebase.ui Tue Dec 21 23:12:19 2010
@@ -7,7 +7,7 @@
     <x>0</x>
     <y>0</y>
     <width>280</width>
-    <height>130</height>
+    <height>129</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -26,28 +26,28 @@
    <property name="spacing">
     <number>4</number>
    </property>
-   <item row="2" column="0">
+   <item row="2" column="1">
     <widget class="QLabel" name="textFlowLabel">
      <property name="text">
-      <string>Text Flow Around Frame</string>
-     </property>
-    </widget>
-   </item>
-   <item row="1" column="0">
+      <string>Text Wrap</string>
+     </property>
+    </widget>
+   </item>
+   <item row="1" column="1">
     <widget class="QLabel" name="roundRectLabel">
      <property name="text">
       <string>Round Corners</string>
      </property>
     </widget>
    </item>
-   <item row="3" column="0">
+   <item row="3" column="1">
     <widget class="QLabel" name="fillRuleLabel">
      <property name="text">
       <string>Fill Rule</string>
      </property>
     </widget>
    </item>
-   <item row="3" column="1" colspan="5">
+   <item row="3" column="2" colspan="5">
     <layout class="QHBoxLayout" name="horizontalLayout">
      <property name="spacing">
       <number>4</number>
@@ -68,7 +68,7 @@
      </item>
     </layout>
    </item>
-   <item row="1" column="1" colspan="3">
+   <item row="1" column="2" colspan="5">
     <widget class="ScrSpinBox" name="roundRect">
      <property name="sizePolicy">
       <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
@@ -78,7 +78,7 @@
      </property>
     </widget>
    </item>
-   <item row="2" column="1">
+   <item row="2" column="2">
     <widget class="QToolButton" name="textFlowDisabled">
      <property name="text">
       <string/>
@@ -94,7 +94,7 @@
      </attribute>
     </widget>
    </item>
-   <item row="2" column="2">
+   <item row="2" column="3">
     <widget class="QToolButton" name="textFlowUsesFrameShape">
      <property name="text">
       <string/>
@@ -110,7 +110,7 @@
      </attribute>
     </widget>
    </item>
-   <item row="2" column="3">
+   <item row="2" column="4">
     <widget class="QToolButton" name="textFlowUsesBoundingBox">
      <property name="text">
       <string/>
@@ -126,7 +126,7 @@
      </attribute>
     </widget>
    </item>
-   <item row="2" column="4">
+   <item row="2" column="5">
     <widget class="QToolButton" name="textFlowUsesContourLine">
      <property name="text">
       <string/>
@@ -142,7 +142,7 @@
      </attribute>
     </widget>
    </item>
-   <item row="2" column="5">
+   <item row="2" column="6">
     <widget class="QToolButton" name="textFlowUsesImageClipping">
      <property name="text">
       <string/>
@@ -158,14 +158,7 @@
      </attribute>
     </widget>
    </item>
-   <item row="1" column="5">
-    <widget class="Autoforms" name="customShape">
-     <property name="text">
-      <string/>
-     </property>
-    </widget>
-   </item>
-   <item row="5" column="0" colspan="6">
+   <item row="5" column="1" colspan="6">
     <widget class="QToolButton" name="editShape">
      <property name="sizePolicy">
       <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
@@ -175,6 +168,13 @@
      </property>
      <property name="text">
       <string>Edit...</string>
+     </property>
+    </widget>
+   </item>
+   <item row="1" column="0">
+    <widget class="Autoforms" name="customShape">
+     <property name="text">
+      <string/>
      </property>
     </widget>
    </item>