[QGIS Commit] r11993 - in trunk/qgis/src: app/composer ui
svn_qgis at osgeo.org
svn_qgis at osgeo.org
Sat Nov 7 18:41:52 EST 2009
Author: timlinux
Date: 2009-11-07 18:41:52 -0500 (Sat, 07 Nov 2009)
New Revision: 11993
Modified:
trunk/qgis/src/app/composer/qgscomposerscalebarwidget.cpp
trunk/qgis/src/ui/qgscomposerpicturewidgetbase.ui
trunk/qgis/src/ui/qgscomposerscalebarwidgetbase.ui
Log:
ui cleanups for composer (vertical orientation for props pages)
Modified: trunk/qgis/src/app/composer/qgscomposerscalebarwidget.cpp
===================================================================
--- trunk/qgis/src/app/composer/qgscomposerscalebarwidget.cpp 2009-11-07 23:33:41 UTC (rev 11992)
+++ trunk/qgis/src/app/composer/qgscomposerscalebarwidget.cpp 2009-11-07 23:41:52 UTC (rev 11993)
@@ -28,7 +28,7 @@
//add widget for general composer item properties
QgsComposerItemWidget* itemPropertiesWidget = new QgsComposerItemWidget( this, scaleBar );
- gridLayout->addWidget( itemPropertiesWidget, 14, 0, 1, 5 );
+ gridLayout->addWidget( itemPropertiesWidget );
blockMemberSignals( true );
mStyleComboBox->insertItem( 0, tr( "Single Box" ) );
Modified: trunk/qgis/src/ui/qgscomposerpicturewidgetbase.ui
===================================================================
--- trunk/qgis/src/ui/qgscomposerpicturewidgetbase.ui 2009-11-07 23:33:41 UTC (rev 11992)
+++ trunk/qgis/src/ui/qgscomposerpicturewidgetbase.ui 2009-11-07 23:41:52 UTC (rev 11993)
@@ -6,12 +6,12 @@
<rect>
<x>0</x>
<y>0</y>
- <width>299</width>
- <height>613</height>
+ <width>347</width>
+ <height>540</height>
</rect>
</property>
<property name="sizePolicy">
- <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
+ <sizepolicy hsizetype="Minimum" vsizetype="Expanding">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
@@ -19,217 +19,252 @@
<property name="windowTitle">
<string>Picture Options</string>
</property>
- <layout class="QGridLayout" name="gridLayout">
- <item row="0" column="0" colspan="2">
- <widget class="QGroupBox" name="mSearchDirectoriesGroupBox">
- <property name="sizePolicy">
- <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- <property name="title">
- <string>Search directories</string>
- </property>
- <layout class="QGridLayout">
- <item row="0" column="0" colspan="3">
- <widget class="QComboBox" name="mSearchDirectoriesComboBox">
- <property name="sizePolicy">
- <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- </widget>
- </item>
- <item row="1" column="0">
- <spacer>
- <property name="orientation">
- <enum>Qt::Horizontal</enum>
- </property>
- <property name="sizeHint" stdset="0">
- <size>
- <width>101</width>
- <height>20</height>
- </size>
- </property>
- </spacer>
- </item>
- <item row="1" column="1">
- <widget class="QPushButton" name="mAddDirectoryButton">
- <property name="text">
- <string>Add...</string>
- </property>
- </widget>
- </item>
- <item row="1" column="2">
- <widget class="QPushButton" name="mRemoveDirectoryButton">
- <property name="text">
- <string>Remove</string>
- </property>
- </widget>
- </item>
- </layout>
- </widget>
- </item>
- <item row="1" column="0" colspan="2">
- <widget class="QGroupBox" name="mPreviewGroupBox">
- <property name="sizePolicy">
- <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- <property name="title">
- <string>Preview</string>
- </property>
- <layout class="QGridLayout">
- <item row="0" column="0">
- <widget class="QListWidget" name="mPreviewListWidget">
- <property name="showDropIndicator" stdset="0">
- <bool>false</bool>
- </property>
- <property name="dragDropMode">
- <enum>QAbstractItemView::DragDrop</enum>
- </property>
- <property name="movement">
- <enum>QListView::Free</enum>
- </property>
- <property name="flow">
- <enum>QListView::LeftToRight</enum>
- </property>
- <property name="isWrapping" stdset="0">
- <bool>true</bool>
- </property>
- <property name="gridSize">
- <size>
- <width>30</width>
- <height>30</height>
- </size>
- </property>
- <property name="viewMode">
- <enum>QListView::IconMode</enum>
- </property>
- <property name="wordWrap">
- <bool>true</bool>
- </property>
- </widget>
- </item>
- </layout>
- </widget>
- </item>
- <item row="2" column="0" colspan="2">
- <layout class="QHBoxLayout" name="horizontalLayout">
- <item>
- <widget class="QLabel" name="label">
- <property name="text">
- <string>Load</string>
- </property>
- <property name="buddy">
- <cstring>mPictureLineEdit</cstring>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QLineEdit" name="mPictureLineEdit"/>
- </item>
- <item>
- <widget class="QPushButton" name="mPictureBrowseButton">
- <property name="sizePolicy">
- <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- <property name="maximumSize">
- <size>
- <width>150</width>
- <height>32767</height>
- </size>
- </property>
- <property name="text">
- <string>...</string>
- </property>
- </widget>
- </item>
- </layout>
- </item>
- <item row="3" column="0">
- <widget class="QLabel" name="textLabel3">
- <property name="sizePolicy">
- <sizepolicy hsizetype="Minimum" vsizetype="Preferred">
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- <property name="text">
- <string>Width</string>
- </property>
- <property name="wordWrap">
+ <layout class="QGridLayout" name="gridLayout_3">
+ <property name="margin">
+ <number>0</number>
+ </property>
+ <item row="0" column="0">
+ <widget class="QScrollArea" name="scrollArea">
+ <property name="widgetResizable">
<bool>true</bool>
</property>
- <property name="buddy">
- <cstring>mWidthLineEdit</cstring>
- </property>
+ <widget class="QWidget" name="scrollAreaWidgetContents">
+ <property name="geometry">
+ <rect>
+ <x>0</x>
+ <y>0</y>
+ <width>324</width>
+ <height>679</height>
+ </rect>
+ </property>
+ <layout class="QGridLayout" name="gridLayout_2">
+ <item row="0" column="0">
+ <widget class="QGroupBox" name="mSearchDirectoriesGroupBox">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="title">
+ <string>Search directories</string>
+ </property>
+ <layout class="QGridLayout">
+ <item row="0" column="0" colspan="3">
+ <widget class="QComboBox" name="mSearchDirectoriesComboBox">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ </widget>
+ </item>
+ <item row="1" column="0">
+ <spacer>
+ <property name="orientation">
+ <enum>Qt::Horizontal</enum>
+ </property>
+ <property name="sizeHint" stdset="0">
+ <size>
+ <width>101</width>
+ <height>20</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
+ <item row="1" column="1">
+ <widget class="QPushButton" name="mAddDirectoryButton">
+ <property name="text">
+ <string>Add...</string>
+ </property>
+ </widget>
+ </item>
+ <item row="1" column="2">
+ <widget class="QPushButton" name="mRemoveDirectoryButton">
+ <property name="text">
+ <string>Remove</string>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </widget>
+ </item>
+ <item row="1" column="0">
+ <widget class="QGroupBox" name="mPreviewGroupBox">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="title">
+ <string>Preview</string>
+ </property>
+ <layout class="QGridLayout">
+ <item row="0" column="0">
+ <widget class="QListWidget" name="mPreviewListWidget">
+ <property name="showDropIndicator" stdset="0">
+ <bool>false</bool>
+ </property>
+ <property name="dragDropMode">
+ <enum>QAbstractItemView::DragDrop</enum>
+ </property>
+ <property name="movement">
+ <enum>QListView::Free</enum>
+ </property>
+ <property name="flow">
+ <enum>QListView::LeftToRight</enum>
+ </property>
+ <property name="isWrapping" stdset="0">
+ <bool>true</bool>
+ </property>
+ <property name="gridSize">
+ <size>
+ <width>30</width>
+ <height>30</height>
+ </size>
+ </property>
+ <property name="viewMode">
+ <enum>QListView::IconMode</enum>
+ </property>
+ <property name="wordWrap">
+ <bool>true</bool>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </widget>
+ </item>
+ <item row="2" column="0">
+ <widget class="QGroupBox" name="groupBox">
+ <property name="title">
+ <string>Options</string>
+ </property>
+ <layout class="QGridLayout" name="gridLayout">
+ <item row="0" column="0">
+ <widget class="QLabel" name="label">
+ <property name="text">
+ <string>Load</string>
+ </property>
+ <property name="buddy">
+ <cstring>mPictureLineEdit</cstring>
+ </property>
+ </widget>
+ </item>
+ <item row="1" column="0">
+ <layout class="QHBoxLayout" name="horizontalLayout_2">
+ <item>
+ <widget class="QLineEdit" name="mPictureLineEdit"/>
+ </item>
+ <item>
+ <widget class="QPushButton" name="mPictureBrowseButton">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="maximumSize">
+ <size>
+ <width>150</width>
+ <height>32767</height>
+ </size>
+ </property>
+ <property name="text">
+ <string>...</string>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </item>
+ <item row="2" column="0">
+ <widget class="QLabel" name="textLabel3">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Minimum" vsizetype="Preferred">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="text">
+ <string>Width</string>
+ </property>
+ <property name="wordWrap">
+ <bool>true</bool>
+ </property>
+ <property name="buddy">
+ <cstring>mWidthLineEdit</cstring>
+ </property>
+ </widget>
+ </item>
+ <item row="3" column="0">
+ <widget class="QLineEdit" name="mWidthLineEdit"/>
+ </item>
+ <item row="4" column="0">
+ <widget class="QLabel" name="textLabel4">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Minimum" vsizetype="Preferred">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="text">
+ <string>Height</string>
+ </property>
+ <property name="wordWrap">
+ <bool>true</bool>
+ </property>
+ <property name="buddy">
+ <cstring>mHeightLineEdit</cstring>
+ </property>
+ </widget>
+ </item>
+ <item row="5" column="0">
+ <layout class="QHBoxLayout" name="horizontalLayout">
+ <item>
+ <widget class="QLineEdit" name="mHeightLineEdit"/>
+ </item>
+ </layout>
+ </item>
+ <item row="6" column="0">
+ <widget class="QLabel" name="mRotationLabel">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Minimum" vsizetype="Preferred">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="text">
+ <string>Rotation</string>
+ </property>
+ <property name="wordWrap">
+ <bool>true</bool>
+ </property>
+ <property name="buddy">
+ <cstring>mRotationSpinBox</cstring>
+ </property>
+ </widget>
+ </item>
+ <item row="7" column="0">
+ <widget class="QDoubleSpinBox" name="mRotationSpinBox"/>
+ </item>
+ <item row="8" column="0">
+ <widget class="QCheckBox" name="mRotationFromComposerMapCheckBox">
+ <property name="text">
+ <string>Take rotation from composer map</string>
+ </property>
+ </widget>
+ </item>
+ <item row="9" column="0">
+ <widget class="QComboBox" name="mComposerMapComboBox"/>
+ </item>
+ </layout>
+ </widget>
+ </item>
+ </layout>
+ </widget>
</widget>
</item>
- <item row="3" column="1">
- <widget class="QLineEdit" name="mWidthLineEdit"/>
- </item>
- <item row="4" column="0">
- <widget class="QLabel" name="textLabel4">
- <property name="sizePolicy">
- <sizepolicy hsizetype="Minimum" vsizetype="Preferred">
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- <property name="text">
- <string>Height</string>
- </property>
- <property name="wordWrap">
- <bool>true</bool>
- </property>
- <property name="buddy">
- <cstring>mHeightLineEdit</cstring>
- </property>
- </widget>
- </item>
- <item row="4" column="1">
- <widget class="QLineEdit" name="mHeightLineEdit"/>
- </item>
- <item row="5" column="0">
- <widget class="QLabel" name="mRotationLabel">
- <property name="sizePolicy">
- <sizepolicy hsizetype="Minimum" vsizetype="Preferred">
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- <property name="text">
- <string>Rotation</string>
- </property>
- <property name="wordWrap">
- <bool>true</bool>
- </property>
- <property name="buddy">
- <cstring>mRotationSpinBox</cstring>
- </property>
- </widget>
- </item>
- <item row="5" column="1">
- <widget class="QDoubleSpinBox" name="mRotationSpinBox"/>
- </item>
- <item row="6" column="0" colspan="2">
- <widget class="QCheckBox" name="mRotationFromComposerMapCheckBox">
- <property name="text">
- <string>Take rotation from composer map</string>
- </property>
- </widget>
- </item>
- <item row="7" column="0" colspan="2">
- <widget class="QComboBox" name="mComposerMapComboBox"/>
- </item>
</layout>
</widget>
<layoutdefault spacing="6" margin="11"/>
@@ -243,6 +278,9 @@
<tabstop>mWidthLineEdit</tabstop>
<tabstop>mHeightLineEdit</tabstop>
<tabstop>mRotationSpinBox</tabstop>
+ <tabstop>mRotationFromComposerMapCheckBox</tabstop>
+ <tabstop>mComposerMapComboBox</tabstop>
+ <tabstop>scrollArea</tabstop>
</tabstops>
<resources/>
<connections/>
Modified: trunk/qgis/src/ui/qgscomposerscalebarwidgetbase.ui
===================================================================
--- trunk/qgis/src/ui/qgscomposerscalebarwidgetbase.ui 2009-11-07 23:33:41 UTC (rev 11992)
+++ trunk/qgis/src/ui/qgscomposerscalebarwidgetbase.ui 2009-11-07 23:41:52 UTC (rev 11993)
@@ -1,252 +1,276 @@
-<ui version="4.0" >
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
<class>QgsComposerScaleBarWidgetBase</class>
- <widget class="QWidget" name="QgsComposerScaleBarWidgetBase" >
- <property name="geometry" >
+ <widget class="QWidget" name="QgsComposerScaleBarWidgetBase">
+ <property name="geometry">
<rect>
<x>0</x>
<y>0</y>
- <width>561</width>
- <height>228</height>
+ <width>212</width>
+ <height>537</height>
</rect>
</property>
- <property name="sizePolicy" >
- <sizepolicy vsizetype="Expanding" hsizetype="Expanding" >
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="windowTitle" >
+ <property name="windowTitle">
<string>Barscale Options</string>
</property>
- <layout class="QGridLayout" >
- <item row="0" column="0" >
- <widget class="QLabel" name="mSegmentSizeLabel" >
- <property name="text" >
- <string>Segment size (map units)</string>
- </property>
- <property name="wordWrap" >
+ <layout class="QGridLayout" name="gridLayout_2">
+ <property name="margin">
+ <number>0</number>
+ </property>
+ <item row="0" column="0">
+ <widget class="QScrollArea" name="scrollArea">
+ <property name="widgetResizable">
<bool>true</bool>
</property>
- <property name="buddy" >
- <cstring>mSegmentSizeSpinBox</cstring>
- </property>
+ <widget class="QWidget" name="scrollAreaWidgetContents">
+ <property name="geometry">
+ <rect>
+ <x>0</x>
+ <y>-179</y>
+ <width>189</width>
+ <height>714</height>
+ </rect>
+ </property>
+ <layout class="QGridLayout" name="gridLayout">
+ <item row="0" column="0">
+ <widget class="QLabel" name="mSegmentSizeLabel">
+ <property name="text">
+ <string>Segment size (map units)</string>
+ </property>
+ <property name="wordWrap">
+ <bool>true</bool>
+ </property>
+ <property name="buddy">
+ <cstring>mSegmentSizeSpinBox</cstring>
+ </property>
+ </widget>
+ </item>
+ <item row="1" column="0">
+ <widget class="QDoubleSpinBox" name="mSegmentSizeSpinBox">
+ <property name="decimals">
+ <number>4</number>
+ </property>
+ <property name="maximum">
+ <double>9999999999999.000000000000000</double>
+ </property>
+ </widget>
+ </item>
+ <item row="2" 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>
+ <property name="buddy">
+ <cstring>mMapUnitsPerBarUnitSpinBox</cstring>
+ </property>
+ </widget>
+ </item>
+ <item row="3" column="0">
+ <widget class="QDoubleSpinBox" name="mMapUnitsPerBarUnitSpinBox">
+ <property name="maximum">
+ <double>9999999999999.000000000000000</double>
+ </property>
+ </widget>
+ </item>
+ <item row="4" column="0">
+ <widget class="QLabel" name="mNumbereOfSegmentsLabel">
+ <property name="text">
+ <string>Number of 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>
+ </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">
+ <widget class="QLabel" name="mStyleLabel">
+ <property name="text">
+ <string>Style</string>
+ </property>
+ <property name="buddy">
+ <cstring>mStyleComboBox</cstring>
+ </property>
+ </widget>
+ </item>
+ <item row="9" column="0">
+ <widget class="QComboBox" name="mStyleComboBox"/>
+ </item>
+ <item row="10" column="0">
+ <widget class="QLabel" name="mMapLabel">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="text">
+ <string>Map</string>
+ </property>
+ <property name="wordWrap">
+ <bool>true</bool>
+ </property>
+ <property name="buddy">
+ <cstring>mMapComboBox</cstring>
+ </property>
+ </widget>
+ </item>
+ <item row="11" column="0">
+ <widget class="QComboBox" name="mMapComboBox">
+ <property name="enabled">
+ <bool>true</bool>
+ </property>
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ </widget>
+ </item>
+ <item row="12" column="0">
+ <widget class="QLabel" name="mHeightLabel">
+ <property name="text">
+ <string>Height (mm)</string>
+ </property>
+ <property name="buddy">
+ <cstring>mHeightSpinBox</cstring>
+ </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">
+ <widget class="QDoubleSpinBox" name="mLineWidthSpinBox">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="minimum">
+ <double>0.010000000000000</double>
+ </property>
+ <property name="singleStep">
+ <double>0.100000000000000</double>
+ </property>
+ <property name="value">
+ <double>0.200000000000000</double>
+ </property>
+ </widget>
+ </item>
+ <item row="16" column="0">
+ <widget class="QLabel" name="mLabelBarSpaceLabel">
+ <property name="text">
+ <string>Label space</string>
+ </property>
+ <property name="buddy">
+ <cstring>mLabelBarSpaceSpinBox</cstring>
+ </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>
+ </property>
+ <property name="buddy">
+ <cstring>mBoxSizeSpinBox</cstring>
+ </property>
+ </widget>
+ </item>
+ <item row="19" column="0">
+ <widget class="QDoubleSpinBox" name="mBoxSizeSpinBox"/>
+ </item>
+ <item row="20" 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="21" column="0">
+ <widget class="QLineEdit" name="mUnitLabelLineEdit"/>
+ </item>
+ <item row="22" column="0">
+ <widget class="QPushButton" name="mFontButton">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="text">
+ <string>Font...</string>
+ </property>
+ </widget>
+ </item>
+ <item row="23" column="0">
+ <widget class="QPushButton" name="mColorPushButton">
+ <property name="text">
+ <string>Color...</string>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </widget>
</widget>
</item>
- <item row="0" column="1" >
- <widget class="QDoubleSpinBox" name="mSegmentSizeSpinBox" >
- <property name="decimals" >
- <number>4</number>
- </property>
- <property name="maximum" >
- <double>9999999999999.000000000000000</double>
- </property>
- </widget>
- </item>
- <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>
- <property name="buddy" >
- <cstring>mMapUnitsPerBarUnitSpinBox</cstring>
- </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>
- </property>
- <property name="wordWrap" >
- <bool>true</bool>
- </property>
- <property name="buddy" >
- <cstring>mNumberOfSegmentsSpinBox</cstring>
- </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>
- <property name="buddy" >
- <cstring>mSegmentsLeftSpinBox</cstring>
- </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>
- <property name="buddy" >
- <cstring>mStyleComboBox</cstring>
- </property>
- </widget>
- </item>
- <item row="2" column="1" >
- <widget class="QComboBox" name="mStyleComboBox" />
- </item>
- <item row="2" column="2" >
- <widget class="QLabel" name="mMapLabel" >
- <property name="sizePolicy" >
- <sizepolicy vsizetype="Fixed" hsizetype="Expanding" >
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- <property name="text" >
- <string>Map</string>
- </property>
- <property name="wordWrap" >
- <bool>true</bool>
- </property>
- <property name="buddy" >
- <cstring>mMapComboBox</cstring>
- </property>
- </widget>
- </item>
- <item row="2" column="4" >
- <widget class="QComboBox" name="mMapComboBox" >
- <property name="enabled" >
- <bool>true</bool>
- </property>
- <property name="sizePolicy" >
- <sizepolicy vsizetype="Fixed" hsizetype="Expanding" >
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- </widget>
- </item>
- <item row="3" column="0" >
- <widget class="QLabel" name="mHeightLabel" >
- <property name="text" >
- <string>Height (mm)</string>
- </property>
- <property name="buddy" >
- <cstring>mHeightSpinBox</cstring>
- </property>
- </widget>
- </item>
- <item row="3" column="1" >
- <widget class="QSpinBox" name="mHeightSpinBox" />
- </item>
- <item row="3" column="2" colspan="2" >
- <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="3" column="4" >
- <widget class="QDoubleSpinBox" name="mLineWidthSpinBox" >
- <property name="sizePolicy" >
- <sizepolicy vsizetype="Fixed" hsizetype="Expanding" >
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- <property name="minimum" >
- <double>0.010000000000000</double>
- </property>
- <property name="singleStep" >
- <double>0.100000000000000</double>
- </property>
- <property name="value" >
- <double>0.200000000000000</double>
- </property>
- </widget>
- </item>
- <item row="4" column="0" >
- <widget class="QLabel" name="mLabelBarSpaceLabel" >
- <property name="text" >
- <string>Label space</string>
- </property>
- <property name="buddy" >
- <cstring>mLabelBarSpaceSpinBox</cstring>
- </property>
- </widget>
- </item>
- <item row="4" column="1" >
- <widget class="QDoubleSpinBox" name="mLabelBarSpaceSpinBox" />
- </item>
- <item row="4" column="2" colspan="2" >
- <widget class="QLabel" name="mBoxSpaceLabel" >
- <property name="text" >
- <string>Box space</string>
- </property>
- <property name="buddy" >
- <cstring>mBoxSizeSpinBox</cstring>
- </property>
- </widget>
- </item>
- <item row="4" column="4" >
- <widget class="QDoubleSpinBox" name="mBoxSizeSpinBox" />
- </item>
- <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" >
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- <property name="text" >
- <string>Font...</string>
- </property>
- </widget>
- </item>
- <item row="5" column="3" colspan="2" >
- <widget class="QPushButton" name="mColorPushButton" >
- <property name="text" >
- <string>Color...</string>
- </property>
- </widget>
- </item>
</layout>
</widget>
- <layoutdefault spacing="6" margin="11" />
+ <layoutdefault spacing="6" margin="11"/>
<tabstops>
+ <tabstop>scrollArea</tabstop>
<tabstop>mSegmentSizeSpinBox</tabstop>
<tabstop>mMapUnitsPerBarUnitSpinBox</tabstop>
<tabstop>mNumberOfSegmentsSpinBox</tabstop>
More information about the QGIS-commit
mailing list