[QGIS Commit] r9201 - in trunk/qgis/src: app/composer ui
svn_qgis at osgeo.org
svn_qgis at osgeo.org
Thu Aug 28 10:43:41 EDT 2008
Author: mhugent
Date: 2008-08-28 10:43:41 -0400 (Thu, 28 Aug 2008)
New Revision: 9201
Modified:
trunk/qgis/src/app/composer/qgscomposerscalebarwidget.cpp
trunk/qgis/src/ui/qgscomposerscalebarwidgetbase.ui
Log:
rearranged composer scalebar widget to have less height
Modified: trunk/qgis/src/app/composer/qgscomposerscalebarwidget.cpp
===================================================================
--- trunk/qgis/src/app/composer/qgscomposerscalebarwidget.cpp 2008-08-28 13:58:22 UTC (rev 9200)
+++ trunk/qgis/src/app/composer/qgscomposerscalebarwidget.cpp 2008-08-28 14:43:41 UTC (rev 9201)
@@ -28,7 +28,7 @@
//add widget for general composer item properties
QgsComposerItemWidget* itemPropertiesWidget = new QgsComposerItemWidget( this, scaleBar );
- gridLayout->addWidget( itemPropertiesWidget, 14, 0, 1, 3 );
+ gridLayout->addWidget( itemPropertiesWidget, 14, 0, 1, 5 );
blockMemberSignals( true );
mStyleComboBox->insertItem( 0, tr( "Single Box" ) );
Modified: trunk/qgis/src/ui/qgscomposerscalebarwidgetbase.ui
===================================================================
--- trunk/qgis/src/ui/qgscomposerscalebarwidgetbase.ui 2008-08-28 13:58:22 UTC (rev 9200)
+++ trunk/qgis/src/ui/qgscomposerscalebarwidgetbase.ui 2008-08-28 14:43:41 UTC (rev 9201)
@@ -5,8 +5,8 @@
<rect>
<x>0</x>
<y>0</y>
- <width>367</width>
- <height>476</height>
+ <width>561</width>
+ <height>228</height>
</rect>
</property>
<property name="sizePolicy" >
@@ -29,7 +29,7 @@
</property>
</widget>
</item>
- <item row="0" column="2" >
+ <item row="0" column="1" >
<widget class="QDoubleSpinBox" name="mSegmentSizeSpinBox" >
<property name="decimals" >
<number>4</number>
@@ -39,7 +39,24 @@
</property>
</widget>
</item>
- <item row="1" column="0" colspan="2" >
+ <item row="0" column="2" colspan="2" >
+ <widget class="QLabel" name="mMapUnitsPerBarUnitLabel" >
+ <property name="text" >
+ <string>Map units per bar unit:</string>
+ </property>
+ <property name="wordWrap" >
+ <bool>true</bool>
+ </property>
+ </widget>
+ </item>
+ <item row="0" column="4" >
+ <widget class="QDoubleSpinBox" name="mMapUnitsPerBarUnitSpinBox" >
+ <property name="maximum" >
+ <double>9999999999999.000000000000000</double>
+ </property>
+ </widget>
+ </item>
+ <item row="1" column="0" >
<widget class="QLabel" name="mNumbereOfSegmentsLabel" >
<property name="text" >
<string>Number of segments:</string>
@@ -49,63 +66,30 @@
</property>
</widget>
</item>
- <item row="1" column="2" >
+ <item row="1" column="1" >
<widget class="QSpinBox" name="mNumberOfSegmentsSpinBox" />
</item>
- <item row="2" column="0" colspan="2" >
+ <item row="1" column="2" colspan="2" >
<widget class="QLabel" name="mSegmentsLeftLabel" >
<property name="text" >
<string>Segments left:</string>
</property>
</widget>
</item>
- <item row="2" column="2" >
+ <item row="1" column="4" >
<widget class="QSpinBox" name="mSegmentsLeftSpinBox" />
</item>
- <item row="3" column="0" >
+ <item row="2" column="0" >
<widget class="QLabel" name="mStyleLabel" >
<property name="text" >
<string>Style:</string>
</property>
</widget>
</item>
- <item row="3" column="2" >
+ <item row="2" column="1" >
<widget class="QComboBox" name="mStyleComboBox" />
</item>
- <item row="4" column="0" >
- <widget class="QLabel" name="mUnitLabelLabel" >
- <property name="text" >
- <string>Unit label:</string>
- </property>
- <property name="wordWrap" >
- <bool>true</bool>
- </property>
- <property name="buddy" >
- <cstring>mUnitLabelLineEdit</cstring>
- </property>
- </widget>
- </item>
- <item row="4" column="2" >
- <widget class="QLineEdit" name="mUnitLabelLineEdit" />
- </item>
- <item row="5" column="0" >
- <widget class="QLabel" name="mMapUnitsPerBarUnitLabel" >
- <property name="text" >
- <string>Map units per bar unit:</string>
- </property>
- <property name="wordWrap" >
- <bool>true</bool>
- </property>
- </widget>
- </item>
- <item row="5" column="2" >
- <widget class="QDoubleSpinBox" name="mMapUnitsPerBarUnitSpinBox" >
- <property name="maximum" >
- <double>9999999999999.000000000000000</double>
- </property>
- </widget>
- </item>
- <item row="6" column="0" >
+ <item row="2" column="2" >
<widget class="QLabel" name="mMapLabel" >
<property name="sizePolicy" >
<sizepolicy vsizetype="Fixed" hsizetype="Expanding" >
@@ -124,7 +108,7 @@
</property>
</widget>
</item>
- <item row="6" column="2" >
+ <item row="2" column="4" >
<widget class="QComboBox" name="mMapComboBox" >
<property name="enabled" >
<bool>true</bool>
@@ -137,17 +121,17 @@
</property>
</widget>
</item>
- <item row="7" column="0" >
+ <item row="3" column="0" >
<widget class="QLabel" name="mHeightLabel" >
<property name="text" >
<string>Height (mm):</string>
</property>
</widget>
</item>
- <item row="7" column="2" >
+ <item row="3" column="1" >
<widget class="QSpinBox" name="mHeightSpinBox" />
</item>
- <item row="8" column="0" >
+ <item row="3" column="2" colspan="2" >
<widget class="QLabel" name="mLineWidthLabel" >
<property name="text" >
<string>Line width:</string>
@@ -160,7 +144,7 @@
</property>
</widget>
</item>
- <item row="8" column="2" >
+ <item row="3" column="4" >
<widget class="QDoubleSpinBox" name="mLineWidthSpinBox" >
<property name="sizePolicy" >
<sizepolicy vsizetype="Fixed" hsizetype="Expanding" >
@@ -179,27 +163,43 @@
</property>
</widget>
</item>
- <item row="9" column="0" >
+ <item row="4" column="0" >
<widget class="QLabel" name="mLabelBarSpaceLabel" >
<property name="text" >
<string>Label space:</string>
</property>
</widget>
</item>
- <item row="9" column="2" >
+ <item row="4" column="1" >
<widget class="QDoubleSpinBox" name="mLabelBarSpaceSpinBox" />
</item>
- <item row="10" column="0" >
+ <item row="4" column="2" colspan="2" >
<widget class="QLabel" name="mBoxSpaceLabel" >
<property name="text" >
<string>Box space:</string>
</property>
</widget>
</item>
- <item row="10" column="2" >
+ <item row="4" column="4" >
<widget class="QDoubleSpinBox" name="mBoxSizeSpinBox" />
</item>
- <item row="11" column="0" >
+ <item row="5" column="0" >
+ <widget class="QLabel" name="mUnitLabelLabel" >
+ <property name="text" >
+ <string>Unit label:</string>
+ </property>
+ <property name="wordWrap" >
+ <bool>true</bool>
+ </property>
+ <property name="buddy" >
+ <cstring>mUnitLabelLineEdit</cstring>
+ </property>
+ </widget>
+ </item>
+ <item row="5" column="1" >
+ <widget class="QLineEdit" name="mUnitLabelLineEdit" />
+ </item>
+ <item row="5" column="2" >
<widget class="QPushButton" name="mFontButton" >
<property name="sizePolicy" >
<sizepolicy vsizetype="Fixed" hsizetype="Preferred" >
@@ -212,26 +212,13 @@
</property>
</widget>
</item>
- <item row="11" column="2" >
+ <item row="5" column="3" colspan="2" >
<widget class="QPushButton" name="mColorPushButton" >
<property name="text" >
<string>Color...</string>
</property>
</widget>
</item>
- <item row="12" column="1" >
- <spacer>
- <property name="orientation" >
- <enum>Qt::Vertical</enum>
- </property>
- <property name="sizeHint" >
- <size>
- <width>20</width>
- <height>16</height>
- </size>
- </property>
- </spacer>
- </item>
</layout>
</widget>
<layoutdefault spacing="6" margin="11" />
More information about the QGIS-commit
mailing list