sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-10-08 00:05:09 -04:00
Code Issues Packages Projects Releases Wiki Activity

rearranged composer scalebar widget to have less height

Browse Source 
git-svn-id: http://svn.osgeo.org/qgis/trunk@9201 c8812cc2-4d05-0410-92ff-de0c093fc19c
This commit is contained in:
mhugent 2008-08-28 14:43:41 +00:00
parent f03667b506
commit 9cd3ca94aa
2 changed files with 67 additions and 80 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/app/composer/qgscomposerscalebarwidget.cpp
View File

@ -28,7 +28,7 @@ QgsComposerScaleBarWidget::QgsComposerScaleBarWidget( QgsComposerScaleBar* scale
//add widget for general composer item properties //add widget for general composer item properties
QgsComposerItemWidget* itemPropertiesWidget = new QgsComposerItemWidget( this, scaleBar ); QgsComposerItemWidget* itemPropertiesWidget = new QgsComposerItemWidget( this, scaleBar );
gridLayout->addWidget( itemPropertiesWidget, 14, 0, 1, 3 ); gridLayout->addWidget( itemPropertiesWidget, 14, 0, 1, 5 );
blockMemberSignals( true ); blockMemberSignals( true );
mStyleComboBox->insertItem( 0, tr( "Single Box" ) ); mStyleComboBox->insertItem( 0, tr( "Single Box" ) );

145
src/ui/qgscomposerscalebarwidgetbase.ui
View File

@ -5,8 +5,8 @@
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>367</width> <width>561</width>
<height>476</height> <height>228</height>
</rect> </rect>
</property> </property>
<property name="sizePolicy" > <property name="sizePolicy" >
@ -29,7 +29,7 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="0" column="2" > <item row="0" column="1" >
<widget class="QDoubleSpinBox" name="mSegmentSizeSpinBox" > <widget class="QDoubleSpinBox" name="mSegmentSizeSpinBox" >
<property name="decimals" > <property name="decimals" >
<number>4</number> <number>4</number>
@ -39,56 +39,7 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="1" column="0" colspan="2" > <item row="0" column="2" colspan="2" >
<widget class="QLabel" name="mNumbereOfSegmentsLabel" >
<property name="text" >
<string>Number of segments:</string>
</property>
<property name="wordWrap" >
<bool>true</bool>
</property>
</widget>
</item>
<item row="1" column="2" >
<widget class="QSpinBox" name="mNumberOfSegmentsSpinBox" />
</item>
<item row="2" column="0" colspan="2" >
<widget class="QLabel" name="mSegmentsLeftLabel" >
<property name="text" >
<string>Segments left:</string>
</property>
</widget>
</item>
<item row="2" column="2" >
<widget class="QSpinBox" name="mSegmentsLeftSpinBox" />
</item>
<item row="3" column="0" >
<widget class="QLabel" name="mStyleLabel" >
<property name="text" >
<string>Style:</string>
</property>
</widget>
</item>
<item row="3" column="2" >
<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" > <widget class="QLabel" name="mMapUnitsPerBarUnitLabel" >
<property name="text" > <property name="text" >
<string>Map units per bar unit:</string> <string>Map units per bar unit:</string>
@ -98,14 +49,47 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="5" column="2" > <item row="0" column="4" >
<widget class="QDoubleSpinBox" name="mMapUnitsPerBarUnitSpinBox" > <widget class="QDoubleSpinBox" name="mMapUnitsPerBarUnitSpinBox" >
<property name="maximum" > <property name="maximum" >
<double>9999999999999.000000000000000</double> <double>9999999999999.000000000000000</double>
</property> </property>
</widget> </widget>
</item> </item>
<item row="6" column="0" > <item row="1" column="0" >
<widget class="QLabel" name="mNumbereOfSegmentsLabel" >
<property name="text" >
<string>Number of segments:</string>
</property>
<property name="wordWrap" >
<bool>true</bool>
</property>
</widget>
</item>
<item row="1" column="1" >
<widget class="QSpinBox" name="mNumberOfSegmentsSpinBox" />
</item>
<item row="1" column="2" colspan="2" >
<widget class="QLabel" name="mSegmentsLeftLabel" >
<property name="text" >
<string>Segments left:</string>
</property>
</widget>
</item>
<item row="1" column="4" >
<widget class="QSpinBox" name="mSegmentsLeftSpinBox" />
</item>
<item row="2" column="0" >
<widget class="QLabel" name="mStyleLabel" >
<property name="text" >
<string>Style:</string>
</property>
</widget>
</item>
<item row="2" column="1" >
<widget class="QComboBox" name="mStyleComboBox" />
</item>
<item row="2" column="2" >
<widget class="QLabel" name="mMapLabel" > <widget class="QLabel" name="mMapLabel" >
<property name="sizePolicy" > <property name="sizePolicy" >
<sizepolicy vsizetype="Fixed" hsizetype="Expanding" > <sizepolicy vsizetype="Fixed" hsizetype="Expanding" >
@ -124,7 +108,7 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="6" column="2" > <item row="2" column="4" >
<widget class="QComboBox" name="mMapComboBox" > <widget class="QComboBox" name="mMapComboBox" >
<property name="enabled" > <property name="enabled" >
<bool>true</bool> <bool>true</bool>
@ -137,17 +121,17 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="7" column="0" > <item row="3" column="0" >
<widget class="QLabel" name="mHeightLabel" > <widget class="QLabel" name="mHeightLabel" >
<property name="text" > <property name="text" >
<string>Height (mm):</string> <string>Height (mm):</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="7" column="2" > <item row="3" column="1" >
<widget class="QSpinBox" name="mHeightSpinBox" /> <widget class="QSpinBox" name="mHeightSpinBox" />
</item> </item>
<item row="8" column="0" > <item row="3" column="2" colspan="2" >
<widget class="QLabel" name="mLineWidthLabel" > <widget class="QLabel" name="mLineWidthLabel" >
<property name="text" > <property name="text" >
<string>Line width:</string> <string>Line width:</string>
@ -160,7 +144,7 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="8" column="2" > <item row="3" column="4" >
<widget class="QDoubleSpinBox" name="mLineWidthSpinBox" > <widget class="QDoubleSpinBox" name="mLineWidthSpinBox" >
<property name="sizePolicy" > <property name="sizePolicy" >
<sizepolicy vsizetype="Fixed" hsizetype="Expanding" > <sizepolicy vsizetype="Fixed" hsizetype="Expanding" >
@ -179,27 +163,43 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="9" column="0" > <item row="4" column="0" >
<widget class="QLabel" name="mLabelBarSpaceLabel" > <widget class="QLabel" name="mLabelBarSpaceLabel" >
<property name="text" > <property name="text" >
<string>Label space:</string> <string>Label space:</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="9" column="2" > <item row="4" column="1" >
<widget class="QDoubleSpinBox" name="mLabelBarSpaceSpinBox" /> <widget class="QDoubleSpinBox" name="mLabelBarSpaceSpinBox" />
</item> </item>
<item row="10" column="0" > <item row="4" column="2" colspan="2" >
<widget class="QLabel" name="mBoxSpaceLabel" > <widget class="QLabel" name="mBoxSpaceLabel" >
<property name="text" > <property name="text" >
<string>Box space:</string> <string>Box space:</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="10" column="2" > <item row="4" column="4" >
<widget class="QDoubleSpinBox" name="mBoxSizeSpinBox" /> <widget class="QDoubleSpinBox" name="mBoxSizeSpinBox" />
</item> </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" > <widget class="QPushButton" name="mFontButton" >
<property name="sizePolicy" > <property name="sizePolicy" >
<sizepolicy vsizetype="Fixed" hsizetype="Preferred" > <sizepolicy vsizetype="Fixed" hsizetype="Preferred" >
@ -212,26 +212,13 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="11" column="2" > <item row="5" column="3" colspan="2" >
<widget class="QPushButton" name="mColorPushButton" > <widget class="QPushButton" name="mColorPushButton" >
<property name="text" > <property name="text" >
<string>Color...</string> <string>Color...</string>
</property> </property>
</widget> </widget>
</item> </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> </layout>
</widget> </widget>
<layoutdefault spacing="6" margin="11" /> <layoutdefault spacing="6" margin="11" />