[QGIS Commit] r12069 - trunk/qgis/src/ui

svn_qgis at osgeo.org svn_qgis at osgeo.org
Tue Nov 10 09:42:43 EST 2009


Author: timlinux
Date: 2009-11-10 09:42:42 -0500 (Tue, 10 Nov 2009)
New Revision: 12069

Modified:
   trunk/qgis/src/ui/qgscomposerbase.ui
   trunk/qgis/src/ui/qgscomposermapwidgetbase.ui
   trunk/qgis/src/ui/qgscomposerscalebarwidgetbase.ui
Log:
UI cleanups

Modified: trunk/qgis/src/ui/qgscomposerbase.ui
===================================================================
--- trunk/qgis/src/ui/qgscomposerbase.ui	2009-11-10 14:09:36 UTC (rev 12068)
+++ trunk/qgis/src/ui/qgscomposerbase.ui	2009-11-10 14:42:42 UTC (rev 12069)
@@ -21,7 +21,7 @@
     <bool>true</bool>
    </property>
    <layout class="QGridLayout">
-    <item row="0" column="0">
+    <item row="1" column="0">
      <widget class="QSplitter" name="mSplitter">
       <property name="mouseTracking">
        <bool>true</bool>
@@ -133,13 +133,6 @@
       </widget>
      </widget>
     </item>
-    <item row="1" column="0">
-     <widget class="QDialogButtonBox" name="buttonBox">
-      <property name="standardButtons">
-       <set>QDialogButtonBox::Help</set>
-      </property>
-     </widget>
-    </item>
    </layout>
   </widget>
   <widget class="QToolBar" name="toolBar">
@@ -445,27 +438,9 @@
   </action>
  </widget>
  <tabstops>
-  <tabstop>buttonBox</tabstop>
   <tabstop>mCompositionNameComboBox</tabstop>
   <tabstop>mOptionsTabWidget</tabstop>
  </tabstops>
  <resources/>
- <connections>
-  <connection>
-   <sender>buttonBox</sender>
-   <signal>rejected()</signal>
-   <receiver>QgsComposerBase</receiver>
-   <slot>close()</slot>
-   <hints>
-    <hint type="sourcelabel">
-     <x>612</x>
-     <y>583</y>
-    </hint>
-    <hint type="destinationlabel">
-     <x>735</x>
-     <y>567</y>
-    </hint>
-   </hints>
-  </connection>
- </connections>
+ <connections/>
 </ui>

Modified: trunk/qgis/src/ui/qgscomposermapwidgetbase.ui
===================================================================
--- trunk/qgis/src/ui/qgscomposermapwidgetbase.ui	2009-11-10 14:09:36 UTC (rev 12068)
+++ trunk/qgis/src/ui/qgscomposermapwidgetbase.ui	2009-11-10 14:42:42 UTC (rev 12069)
@@ -26,13 +26,13 @@
    <item row="0" column="0">
     <widget class="QToolBox" name="toolBox">
      <property name="currentIndex">
-      <number>0</number>
+      <number>1</number>
      </property>
      <widget class="QWidget" name="page">
       <property name="geometry">
        <rect>
         <x>0</x>
-        <y>0</y>
+        <y>-68</y>
         <width>386</width>
         <height>419</height>
        </rect>
@@ -172,6 +172,19 @@
             </item>
            </layout>
           </item>
+          <item row="10" column="0">
+           <spacer name="verticalSpacer">
+            <property name="orientation">
+             <enum>Qt::Vertical</enum>
+            </property>
+            <property name="sizeHint" stdset="0">
+             <size>
+              <width>20</width>
+              <height>40</height>
+             </size>
+            </property>
+           </spacer>
+          </item>
          </layout>
         </widget>
        </item>
@@ -182,8 +195,8 @@
        <rect>
         <x>0</x>
         <y>0</y>
-        <width>404</width>
-        <height>351</height>
+        <width>386</width>
+        <height>352</height>
        </rect>
       </property>
       <attribute name="label">
@@ -279,9 +292,30 @@
          </layout>
         </widget>
        </item>
+       <item row="1" column="0">
+        <spacer name="verticalSpacer_3">
+         <property name="orientation">
+          <enum>Qt::Vertical</enum>
+         </property>
+         <property name="sizeHint" stdset="0">
+          <size>
+           <width>20</width>
+           <height>40</height>
+          </size>
+         </property>
+        </spacer>
+       </item>
       </layout>
      </widget>
      <widget class="QWidget" name="page_3">
+      <property name="geometry">
+       <rect>
+        <x>0</x>
+        <y>-448</y>
+        <width>386</width>
+        <height>805</height>
+       </rect>
+      </property>
       <attribute name="label">
        <string>Grid</string>
       </attribute>
@@ -556,6 +590,19 @@
             </property>
            </widget>
           </item>
+          <item row="37" column="0">
+           <spacer name="verticalSpacer_2">
+            <property name="orientation">
+             <enum>Qt::Vertical</enum>
+            </property>
+            <property name="sizeHint" stdset="0">
+             <size>
+              <width>20</width>
+              <height>40</height>
+             </size>
+            </property>
+           </spacer>
+          </item>
          </layout>
         </widget>
        </item>

Modified: trunk/qgis/src/ui/qgscomposerscalebarwidgetbase.ui
===================================================================
--- trunk/qgis/src/ui/qgscomposerscalebarwidgetbase.ui	2009-11-10 14:09:36 UTC (rev 12068)
+++ trunk/qgis/src/ui/qgscomposerscalebarwidgetbase.ui	2009-11-10 14:42:42 UTC (rev 12069)
@@ -34,7 +34,7 @@
         <x>0</x>
         <y>0</y>
         <width>307</width>
-        <height>714</height>
+        <height>616</height>
        </rect>
       </property>
       <attribute name="label">
@@ -85,35 +85,20 @@
         </widget>
        </item>
        <item row="4" column="0">
-        <widget class="QLabel" name="mNumbereOfSegmentsLabel">
-         <property name="text">
-          <string>Number of segments</string>
+        <widget class="QSpinBox" name="mNumberOfSegmentsSpinBox">
+         <property name="suffix">
+          <string> Right segments</string>
          </property>
-         <property name="wordWrap">
-          <bool>true</bool>
-         </property>
-         <property name="buddy">
-          <cstring>mNumberOfSegmentsSpinBox</cstring>
-         </property>
         </widget>
        </item>
        <item row="5" column="0">
-        <widget class="QSpinBox" name="mNumberOfSegmentsSpinBox"/>
-       </item>
-       <item row="6" column="0">
-        <widget class="QLabel" name="mSegmentsLeftLabel">
-         <property name="text">
-          <string>Segments left</string>
+        <widget class="QSpinBox" name="mSegmentsLeftSpinBox">
+         <property name="suffix">
+          <string> Left segments</string>
          </property>
-         <property name="buddy">
-          <cstring>mSegmentsLeftSpinBox</cstring>
-         </property>
         </widget>
        </item>
-       <item row="7" column="0">
-        <widget class="QSpinBox" name="mSegmentsLeftSpinBox"/>
-       </item>
-       <item row="8" column="0">
+       <item row="6" column="0">
         <widget class="QLabel" name="mStyleLabel">
          <property name="text">
           <string>Style</string>
@@ -123,10 +108,10 @@
          </property>
         </widget>
        </item>
-       <item row="9" column="0">
+       <item row="7" column="0">
         <widget class="QComboBox" name="mStyleComboBox"/>
        </item>
-       <item row="10" column="0">
+       <item row="8" column="0">
         <widget class="QLabel" name="mMapLabel">
          <property name="sizePolicy">
           <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
@@ -145,7 +130,7 @@
          </property>
         </widget>
        </item>
-       <item row="11" column="0">
+       <item row="9" column="0">
         <widget class="QComboBox" name="mMapComboBox">
          <property name="enabled">
           <bool>true</bool>
@@ -158,33 +143,17 @@
          </property>
         </widget>
        </item>
-       <item row="12" column="0">
-        <widget class="QLabel" name="mHeightLabel">
-         <property name="text">
-          <string>Height (mm)</string>
+       <item row="10" column="0">
+        <widget class="QSpinBox" name="mHeightSpinBox">
+         <property name="suffix">
+          <string> mm</string>
          </property>
-         <property name="buddy">
-          <cstring>mHeightSpinBox</cstring>
+         <property name="prefix">
+          <string>Height </string>
          </property>
         </widget>
        </item>
-       <item row="13" column="0">
-        <widget class="QSpinBox" name="mHeightSpinBox"/>
-       </item>
-       <item row="14" column="0">
-        <widget class="QLabel" name="mLineWidthLabel">
-         <property name="text">
-          <string>Line width</string>
-         </property>
-         <property name="wordWrap">
-          <bool>true</bool>
-         </property>
-         <property name="buddy">
-          <cstring>mLineWidthSpinBox</cstring>
-         </property>
-        </widget>
-       </item>
-       <item row="15" column="0">
+       <item row="11" column="0">
         <widget class="QDoubleSpinBox" name="mLineWidthSpinBox">
          <property name="sizePolicy">
           <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
@@ -192,6 +161,12 @@
            <verstretch>0</verstretch>
           </sizepolicy>
          </property>
+         <property name="prefix">
+          <string>Line width </string>
+         </property>
+         <property name="suffix">
+          <string> mm</string>
+         </property>
          <property name="minimum">
           <double>0.010000000000000</double>
          </property>
@@ -203,33 +178,27 @@
          </property>
         </widget>
        </item>
-       <item row="16" column="0">
-        <widget class="QLabel" name="mLabelBarSpaceLabel">
-         <property name="text">
-          <string>Label space</string>
+       <item row="12" column="0">
+        <widget class="QDoubleSpinBox" name="mLabelBarSpaceSpinBox">
+         <property name="prefix">
+          <string>Label space </string>
          </property>
-         <property name="buddy">
-          <cstring>mLabelBarSpaceSpinBox</cstring>
+         <property name="suffix">
+          <string> mm</string>
          </property>
         </widget>
        </item>
-       <item row="17" column="0">
-        <widget class="QDoubleSpinBox" name="mLabelBarSpaceSpinBox"/>
-       </item>
-       <item row="18" column="0">
-        <widget class="QLabel" name="mBoxSpaceLabel">
-         <property name="text">
-          <string>Box space</string>
+       <item row="13" column="0">
+        <widget class="QDoubleSpinBox" name="mBoxSizeSpinBox">
+         <property name="prefix">
+          <string>Box space </string>
          </property>
-         <property name="buddy">
-          <cstring>mBoxSizeSpinBox</cstring>
+         <property name="suffix">
+          <string> mm</string>
          </property>
         </widget>
        </item>
-       <item row="19" column="0">
-        <widget class="QDoubleSpinBox" name="mBoxSizeSpinBox"/>
-       </item>
-       <item row="20" column="0">
+       <item row="14" column="0">
         <widget class="QLabel" name="mUnitLabelLabel">
          <property name="text">
           <string>Unit label</string>
@@ -242,10 +211,10 @@
          </property>
         </widget>
        </item>
-       <item row="21" column="0">
+       <item row="15" column="0">
         <widget class="QLineEdit" name="mUnitLabelLineEdit"/>
        </item>
-       <item row="22" column="0">
+       <item row="16" column="0">
         <widget class="QPushButton" name="mFontButton">
          <property name="sizePolicy">
           <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
@@ -258,13 +227,26 @@
          </property>
         </widget>
        </item>
-       <item row="23" column="0">
+       <item row="17" column="0">
         <widget class="QPushButton" name="mColorPushButton">
          <property name="text">
           <string>Color...</string>
          </property>
         </widget>
        </item>
+       <item row="18" column="0">
+        <spacer name="verticalSpacer">
+         <property name="orientation">
+          <enum>Qt::Vertical</enum>
+         </property>
+         <property name="sizeHint" stdset="0">
+          <size>
+           <width>20</width>
+           <height>40</height>
+          </size>
+         </property>
+        </spacer>
+       </item>
       </layout>
      </widget>
     </widget>



More information about the QGIS-commit mailing list