[QGIS Commit] r11974 - trunk/qgis/src/ui
svn_qgis at osgeo.org
svn_qgis at osgeo.org
Sat Nov 7 14:20:13 EST 2009
Author: timlinux
Date: 2009-11-07 14:20:13 -0500 (Sat, 07 Nov 2009)
New Revision: 11974
Modified:
trunk/qgis/src/ui/qgscomposerbase.ui
trunk/qgis/src/ui/qgscomposeritemwidgetbase.ui
trunk/qgis/src/ui/qgscomposerlabelwidgetbase.ui
trunk/qgis/src/ui/qgscompositionbase.ui
trunk/qgis/src/ui/qgscompositionwidgetbase.ui
Log:
Further ui cleanups for map composer
Modified: trunk/qgis/src/ui/qgscomposerbase.ui
===================================================================
--- trunk/qgis/src/ui/qgscomposerbase.ui 2009-11-07 19:16:42 UTC (rev 11973)
+++ trunk/qgis/src/ui/qgscomposerbase.ui 2009-11-07 19:20:13 UTC (rev 11974)
@@ -60,7 +60,7 @@
</size>
</property>
<property name="currentIndex">
- <number>1</number>
+ <number>0</number>
</property>
<widget class="QWidget" name="tab">
<attribute name="title">
@@ -445,9 +445,9 @@
</action>
</widget>
<tabstops>
+ <tabstop>buttonBox</tabstop>
+ <tabstop>mCompositionNameComboBox</tabstop>
<tabstop>mOptionsTabWidget</tabstop>
- <tabstop>mCompositionNameComboBox</tabstop>
- <tabstop>mSplitter</tabstop>
</tabstops>
<resources/>
<connections>
Modified: trunk/qgis/src/ui/qgscomposeritemwidgetbase.ui
===================================================================
--- trunk/qgis/src/ui/qgscomposeritemwidgetbase.ui 2009-11-07 19:16:42 UTC (rev 11973)
+++ trunk/qgis/src/ui/qgscomposeritemwidgetbase.ui 2009-11-07 19:20:13 UTC (rev 11974)
@@ -28,6 +28,9 @@
<property name="text">
<string>Color</string>
</property>
+ <property name="wordWrap">
+ <bool>true</bool>
+ </property>
<property name="buddy">
<cstring>mFrameColorButton</cstring>
</property>
@@ -52,6 +55,9 @@
<property name="text">
<string>Opacity</string>
</property>
+ <property name="wordWrap">
+ <bool>true</bool>
+ </property>
<property name="buddy">
<cstring>mOpacitySlider</cstring>
</property>
@@ -72,6 +78,9 @@
<property name="text">
<string>Outline width</string>
</property>
+ <property name="wordWrap">
+ <bool>true</bool>
+ </property>
<property name="buddy">
<cstring>mOutlineWidthSpinBox</cstring>
</property>
@@ -94,6 +103,19 @@
</property>
</widget>
</item>
+ <item row="9" 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>
Modified: trunk/qgis/src/ui/qgscomposerlabelwidgetbase.ui
===================================================================
--- trunk/qgis/src/ui/qgscomposerlabelwidgetbase.ui 2009-11-07 19:16:42 UTC (rev 11973)
+++ trunk/qgis/src/ui/qgscomposerlabelwidgetbase.ui 2009-11-07 19:20:13 UTC (rev 11974)
@@ -1,60 +1,64 @@
-<ui version="4.0" >
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
<class>QgsComposerLabelWidgetBase</class>
- <widget class="QWidget" name="QgsComposerLabelWidgetBase" >
- <property name="geometry" >
+ <widget class="QWidget" name="QgsComposerLabelWidgetBase">
+ <property name="geometry">
<rect>
<x>0</x>
<y>0</y>
<width>217</width>
- <height>274</height>
+ <height>302</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>Label Options</string>
</property>
- <layout class="QGridLayout" >
- <item row="0" column="0" colspan="2" >
- <widget class="QTextEdit" name="mTextEdit" >
- <property name="lineWrapMode" >
+ <layout class="QGridLayout" name="gridLayout">
+ <property name="margin">
+ <number>0</number>
+ </property>
+ <item row="0" column="0">
+ <widget class="QTextEdit" name="mTextEdit">
+ <property name="lineWrapMode">
<enum>QTextEdit::NoWrap</enum>
</property>
</widget>
</item>
- <item row="1" column="0" colspan="2" >
- <widget class="QPushButton" name="mFontButton" >
- <property name="sizePolicy" >
- <sizepolicy vsizetype="Fixed" hsizetype="Preferred" >
+ <item row="1" 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" >
+ <property name="text">
<string>Font</string>
</property>
</widget>
</item>
- <item row="2" column="0" >
- <widget class="QLabel" name="mMarginTextLabel" >
- <property name="text" >
+ <item row="2" column="0">
+ <widget class="QLabel" name="mMarginTextLabel">
+ <property name="text">
<string>Margin (mm)</string>
</property>
- <property name="buddy" >
+ <property name="buddy">
<cstring>mMarginDoubleSpinBox</cstring>
</property>
</widget>
</item>
- <item row="2" column="1" >
- <widget class="QDoubleSpinBox" name="mMarginDoubleSpinBox" />
+ <item row="3" column="0">
+ <widget class="QDoubleSpinBox" name="mMarginDoubleSpinBox"/>
</item>
</layout>
</widget>
- <layoutdefault spacing="6" margin="11" />
+ <layoutdefault spacing="6" margin="11"/>
<tabstops>
<tabstop>mTextEdit</tabstop>
<tabstop>mFontButton</tabstop>
Modified: trunk/qgis/src/ui/qgscompositionbase.ui
===================================================================
--- trunk/qgis/src/ui/qgscompositionbase.ui 2009-11-07 19:16:42 UTC (rev 11973)
+++ trunk/qgis/src/ui/qgscompositionbase.ui 2009-11-07 19:20:13 UTC (rev 11974)
@@ -1,213 +1,199 @@
-<ui version="4.0" >
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
<class>QgsCompositionBase</class>
- <widget class="QWidget" name="QgsCompositionBase" >
- <property name="geometry" >
+ <widget class="QWidget" name="QgsCompositionBase">
+ <property name="geometry">
<rect>
<x>0</x>
<y>0</y>
<width>243</width>
- <height>422</height>
+ <height>354</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>Composition</string>
</property>
- <layout class="QGridLayout" >
- <property name="leftMargin" >
- <number>9</number>
+ <layout class="QGridLayout">
+ <property name="margin">
+ <number>0</number>
</property>
- <property name="topMargin" >
- <number>9</number>
- </property>
- <property name="rightMargin" >
- <number>9</number>
- </property>
- <property name="bottomMargin" >
- <number>9</number>
- </property>
- <property name="horizontalSpacing" >
+ <property name="spacing">
<number>6</number>
</property>
- <property name="verticalSpacing" >
- <number>6</number>
- </property>
- <item row="0" column="0" colspan="2" >
- <widget class="QGroupBox" name="groupBox" >
- <property name="title" >
+ <item row="0" column="0" colspan="2">
+ <widget class="QGroupBox" name="groupBox">
+ <property name="title">
<string>Paper</string>
</property>
- <layout class="QGridLayout" >
- <property name="leftMargin" >
- <number>9</number>
+ <layout class="QGridLayout" name="gridLayout">
+ <property name="margin">
+ <number>0</number>
</property>
- <property name="topMargin" >
- <number>9</number>
- </property>
- <property name="rightMargin" >
- <number>9</number>
- </property>
- <property name="bottomMargin" >
- <number>9</number>
- </property>
- <property name="horizontalSpacing" >
- <number>6</number>
- </property>
- <property name="verticalSpacing" >
- <number>6</number>
- </property>
- <item row="4" column="1" >
- <widget class="QComboBox" name="mPaperOrientationComboBox" >
- <property name="enabled" >
- <bool>true</bool>
- </property>
- <property name="sizePolicy" >
- <sizepolicy vsizetype="Fixed" hsizetype="Expanding" >
+ <item row="0" column="0">
+ <widget class="QLabel" name="textLabel3">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
- </widget>
- </item>
- <item row="3" column="1" >
- <widget class="QLineEdit" name="mPaperHeightLineEdit" />
- </item>
- <item row="2" column="1" >
- <widget class="QLineEdit" name="mPaperWidthLineEdit" />
- </item>
- <item row="1" column="1" >
- <widget class="QComboBox" name="mPaperUnitsComboBox" >
- <property name="enabled" >
- <bool>false</bool>
+ <property name="text">
+ <string>Size</string>
</property>
- <property name="sizePolicy" >
- <sizepolicy vsizetype="Fixed" hsizetype="Expanding" >
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
+ <property name="wordWrap">
+ <bool>true</bool>
</property>
+ <property name="buddy">
+ <cstring>mPaperSizeComboBox</cstring>
+ </property>
</widget>
</item>
- <item row="0" column="1" >
- <widget class="QComboBox" name="mPaperSizeComboBox" >
- <property name="enabled" >
+ <item row="1" column="0" colspan="2">
+ <widget class="QComboBox" name="mPaperSizeComboBox">
+ <property name="enabled">
<bool>true</bool>
</property>
- <property name="sizePolicy" >
- <sizepolicy vsizetype="Fixed" hsizetype="Expanding" >
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
</widget>
</item>
- <item row="4" column="0" >
- <widget class="QLabel" name="textLabel7" >
- <property name="sizePolicy" >
- <sizepolicy vsizetype="Preferred" hsizetype="Preferred" >
+ <item row="2" column="0">
+ <widget class="QLabel" name="textLabel5">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="text" >
- <string>Orientation</string>
+ <property name="text">
+ <string>Units</string>
</property>
- <property name="buddy" >
- <cstring>mPaperOrientationComboBox</cstring>
+ <property name="wordWrap">
+ <bool>true</bool>
</property>
+ <property name="buddy">
+ <cstring>mPaperUnitsComboBox</cstring>
+ </property>
</widget>
</item>
- <item row="3" column="0" >
- <widget class="QLabel" name="textLabel6" >
- <property name="sizePolicy" >
- <sizepolicy vsizetype="Preferred" hsizetype="Preferred" >
+ <item row="3" column="0" colspan="2">
+ <widget class="QComboBox" name="mPaperUnitsComboBox">
+ <property name="enabled">
+ <bool>false</bool>
+ </property>
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="text" >
- <string>Height</string>
- </property>
- <property name="buddy" >
- <cstring>mPaperHeightLineEdit</cstring>
- </property>
</widget>
</item>
- <item row="2" column="0" >
- <widget class="QLabel" name="textLabel4" >
- <property name="sizePolicy" >
- <sizepolicy vsizetype="Preferred" hsizetype="Preferred" >
+ <item row="4" column="0">
+ <widget class="QLabel" name="textLabel4">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="text" >
+ <property name="text">
<string>Width</string>
</property>
- <property name="buddy" >
+ <property name="wordWrap">
+ <bool>true</bool>
+ </property>
+ <property name="buddy">
<cstring>mPaperWidthLineEdit</cstring>
</property>
</widget>
</item>
- <item row="1" column="0" >
- <widget class="QLabel" name="textLabel5" >
- <property name="sizePolicy" >
- <sizepolicy vsizetype="Preferred" hsizetype="Preferred" >
+ <item row="5" column="0" colspan="2">
+ <widget class="QLineEdit" name="mPaperWidthLineEdit"/>
+ </item>
+ <item row="6" column="0" colspan="2">
+ <widget class="QLabel" name="textLabel6">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="text" >
- <string>Units</string>
+ <property name="text">
+ <string>Height</string>
</property>
- <property name="buddy" >
- <cstring>mPaperUnitsComboBox</cstring>
+ <property name="wordWrap">
+ <bool>true</bool>
</property>
+ <property name="buddy">
+ <cstring>mPaperHeightLineEdit</cstring>
+ </property>
</widget>
</item>
- <item row="0" column="0" >
- <widget class="QLabel" name="textLabel3" >
- <property name="sizePolicy" >
- <sizepolicy vsizetype="Preferred" hsizetype="Preferred" >
+ <item row="7" column="0" colspan="2">
+ <widget class="QLineEdit" name="mPaperHeightLineEdit"/>
+ </item>
+ <item row="8" column="0" colspan="2">
+ <widget class="QLabel" name="textLabel7">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="text" >
- <string>Size</string>
+ <property name="text">
+ <string>Orientation</string>
</property>
- <property name="buddy" >
- <cstring>mPaperSizeComboBox</cstring>
+ <property name="wordWrap">
+ <bool>true</bool>
</property>
+ <property name="buddy">
+ <cstring>mPaperOrientationComboBox</cstring>
+ </property>
</widget>
</item>
+ <item row="9" column="0" colspan="2">
+ <widget class="QComboBox" name="mPaperOrientationComboBox">
+ <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="10" column="1">
+ <spacer name="verticalSpacer">
+ <property name="orientation">
+ <enum>Qt::Vertical</enum>
+ </property>
+ <property name="sizeHint" stdset="0">
+ <size>
+ <width>20</width>
+ <height>50</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
</layout>
</widget>
</item>
- <item rowspan="2" row="1" column="0" colspan="2" >
- <spacer>
- <property name="orientation" >
- <enum>Qt::Vertical</enum>
- </property>
- <property name="sizeType" >
- <enum>QSizePolicy::Expanding</enum>
- </property>
- <property name="sizeHint" >
- <size>
- <width>223</width>
- <height>41</height>
- </size>
- </property>
- </spacer>
- </item>
</layout>
</widget>
- <layoutdefault spacing="6" margin="11" />
+ <layoutdefault spacing="6" margin="11"/>
<resources/>
<connections/>
</ui>
Modified: trunk/qgis/src/ui/qgscompositionwidgetbase.ui
===================================================================
--- trunk/qgis/src/ui/qgscompositionwidgetbase.ui 2009-11-07 19:16:42 UTC (rev 11973)
+++ trunk/qgis/src/ui/qgscompositionwidgetbase.ui 2009-11-07 19:20:13 UTC (rev 11974)
@@ -6,8 +6,8 @@
<rect>
<x>0</x>
<y>0</y>
- <width>284</width>
- <height>530</height>
+ <width>514</width>
+ <height>535</height>
</rect>
</property>
<property name="sizePolicy">
@@ -19,277 +19,323 @@
<property name="windowTitle">
<string>Composition</string>
</property>
- <layout class="QGridLayout">
- <item row="0" column="0" colspan="2">
- <widget class="QGroupBox" name="groupBox">
- <property name="maximumSize">
- <size>
- <width>999</width>
- <height>300</height>
- </size>
+ <layout class="QGridLayout" name="gridLayout_4">
+ <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="title">
- <string>Paper</string>
- </property>
- <layout class="QGridLayout">
- <property name="margin">
- <number>9</number>
+ <widget class="QWidget" name="scrollAreaWidgetContents">
+ <property name="geometry">
+ <rect>
+ <x>0</x>
+ <y>-290</y>
+ <width>491</width>
+ <height>823</height>
+ </rect>
</property>
- <property name="spacing">
- <number>6</number>
- </property>
- <item row="4" column="1">
- <widget class="QComboBox" name="mPaperOrientationComboBox">
- <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="3" column="1">
- <widget class="QLineEdit" name="mPaperHeightLineEdit"/>
- </item>
- <item row="2" column="1">
- <widget class="QLineEdit" name="mPaperWidthLineEdit"/>
- </item>
- <item row="1" column="1">
- <widget class="QComboBox" name="mPaperUnitsComboBox">
- <property name="enabled">
- <bool>false</bool>
- </property>
- <property name="sizePolicy">
- <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- </widget>
- </item>
- <item row="0" column="1">
- <widget class="QComboBox" name="mPaperSizeComboBox">
- <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="4" column="0">
- <widget class="QLabel" name="textLabel7">
- <property name="sizePolicy">
- <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- <property name="text">
- <string>Orientation</string>
- </property>
- <property name="buddy">
- <cstring>mPaperOrientationComboBox</cstring>
- </property>
- </widget>
- </item>
- <item row="3" column="0">
- <widget class="QLabel" name="textLabel6">
- <property name="sizePolicy">
- <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- <property name="text">
- <string>Height</string>
- </property>
- <property name="buddy">
- <cstring>mPaperHeightLineEdit</cstring>
- </property>
- </widget>
- </item>
- <item row="2" column="0">
- <widget class="QLabel" name="textLabel4">
- <property name="sizePolicy">
- <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- <property name="text">
- <string>Width</string>
- </property>
- <property name="buddy">
- <cstring>mPaperWidthLineEdit</cstring>
- </property>
- </widget>
- </item>
- <item row="1" column="0">
- <widget class="QLabel" name="textLabel5">
- <property name="sizePolicy">
- <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- <property name="text">
- <string>Units</string>
- </property>
- <property name="buddy">
- <cstring>mPaperUnitsComboBox</cstring>
- </property>
- </widget>
- </item>
- <item row="0" column="0">
- <widget class="QLabel" name="textLabel3">
- <property name="sizePolicy">
- <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- <property name="text">
- <string>Size</string>
- </property>
- <property name="buddy">
- <cstring>mPaperSizeComboBox</cstring>
- </property>
- </widget>
- </item>
- </layout>
+ <layout class="QGridLayout" name="gridLayout_3">
+ <item row="0" column="0">
+ <widget class="QGroupBox" name="groupBox">
+ <property name="title">
+ <string>Paper and quality</string>
+ </property>
+ <layout class="QGridLayout" name="gridLayout">
+ <item row="0" column="0">
+ <widget class="QLabel" name="textLabel3">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="text">
+ <string>Size</string>
+ </property>
+ <property name="wordWrap">
+ <bool>true</bool>
+ </property>
+ <property name="buddy">
+ <cstring>mPaperSizeComboBox</cstring>
+ </property>
+ </widget>
+ </item>
+ <item row="1" column="0">
+ <widget class="QComboBox" name="mPaperSizeComboBox">
+ <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="2" column="0">
+ <widget class="QLabel" name="textLabel5">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="text">
+ <string>Units</string>
+ </property>
+ <property name="wordWrap">
+ <bool>true</bool>
+ </property>
+ <property name="buddy">
+ <cstring>mPaperUnitsComboBox</cstring>
+ </property>
+ </widget>
+ </item>
+ <item row="3" column="0">
+ <widget class="QComboBox" name="mPaperUnitsComboBox">
+ <property name="enabled">
+ <bool>false</bool>
+ </property>
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ </widget>
+ </item>
+ <item row="4" column="0">
+ <widget class="QLabel" name="textLabel4">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
+ <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>mPaperWidthLineEdit</cstring>
+ </property>
+ </widget>
+ </item>
+ <item row="5" column="0">
+ <widget class="QLineEdit" name="mPaperWidthLineEdit"/>
+ </item>
+ <item row="6" column="0">
+ <widget class="QLabel" name="textLabel6">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
+ <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>mPaperHeightLineEdit</cstring>
+ </property>
+ </widget>
+ </item>
+ <item row="7" column="0">
+ <widget class="QLineEdit" name="mPaperHeightLineEdit"/>
+ </item>
+ <item row="8" column="0">
+ <widget class="QLabel" name="textLabel7">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="text">
+ <string>Orientation</string>
+ </property>
+ <property name="wordWrap">
+ <bool>true</bool>
+ </property>
+ <property name="buddy">
+ <cstring>mPaperOrientationComboBox</cstring>
+ </property>
+ </widget>
+ </item>
+ <item row="9" column="0">
+ <widget class="QComboBox" name="mPaperOrientationComboBox">
+ <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="10" column="0">
+ <widget class="QLabel" name="mResolutionLabel">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="text">
+ <string>Print quality (dpi)</string>
+ </property>
+ <property name="wordWrap">
+ <bool>true</bool>
+ </property>
+ <property name="buddy">
+ <cstring>mResolutionLineEdit</cstring>
+ </property>
+ </widget>
+ </item>
+ <item row="11" column="0">
+ <widget class="QLineEdit" name="mResolutionLineEdit"/>
+ </item>
+ <item row="12" column="0">
+ <widget class="QCheckBox" name="mPrintAsRasterCheckBox">
+ <property name="text">
+ <string>Print as raster</string>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </widget>
+ </item>
+ <item row="1" column="0">
+ <widget class="QGroupBox" name="mSnapGroupBox">
+ <property name="title">
+ <string>Snapping</string>
+ </property>
+ <layout class="QGridLayout" name="gridLayout_2">
+ <item row="0" column="0">
+ <widget class="QCheckBox" name="mSnapToGridCheckBox">
+ <property name="text">
+ <string>Snap to grid</string>
+ </property>
+ </widget>
+ </item>
+ <item row="1" column="0">
+ <widget class="QLabel" name="mResolutionLabel_2">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="text">
+ <string>Grid resolution</string>
+ </property>
+ <property name="wordWrap">
+ <bool>true</bool>
+ </property>
+ </widget>
+ </item>
+ <item row="2" column="0">
+ <widget class="QDoubleSpinBox" name="mResolutionSpinBox"/>
+ </item>
+ <item row="3" column="0">
+ <widget class="QLabel" name="mXOffsetLabel">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="text">
+ <string>Offset x</string>
+ </property>
+ <property name="wordWrap">
+ <bool>true</bool>
+ </property>
+ </widget>
+ </item>
+ <item row="4" column="0">
+ <widget class="QDoubleSpinBox" name="mOffsetXSpinBox"/>
+ </item>
+ <item row="5" column="0">
+ <widget class="QLabel" name="mYOffsetLabel">
+ <property name="text">
+ <string>Offset y</string>
+ </property>
+ <property name="wordWrap">
+ <bool>true</bool>
+ </property>
+ </widget>
+ </item>
+ <item row="6" column="0">
+ <widget class="QDoubleSpinBox" name="mOffsetYSpinBox"/>
+ </item>
+ <item row="7" column="0">
+ <widget class="QLabel" name="mPenWidthLabel">
+ <property name="text">
+ <string>Pen width</string>
+ </property>
+ <property name="wordWrap">
+ <bool>true</bool>
+ </property>
+ </widget>
+ </item>
+ <item row="8" column="0">
+ <widget class="QDoubleSpinBox" name="mPenWidthSpinBox"/>
+ </item>
+ <item row="9" column="0">
+ <widget class="QLabel" name="mGridColorLabel">
+ <property name="text">
+ <string>Grid color</string>
+ </property>
+ <property name="wordWrap">
+ <bool>true</bool>
+ </property>
+ </widget>
+ </item>
+ <item row="10" column="0">
+ <widget class="QgsColorButton" name="mGridColorButton">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="text">
+ <string/>
+ </property>
+ </widget>
+ </item>
+ <item row="11" column="0">
+ <widget class="QLabel" name="mGridStyleLabel">
+ <property name="text">
+ <string>Grid style</string>
+ </property>
+ <property name="wordWrap">
+ <bool>true</bool>
+ </property>
+ </widget>
+ </item>
+ <item row="12" column="0">
+ <widget class="QComboBox" name="mGridStyleComboBox"/>
+ </item>
+ </layout>
+ </widget>
+ </item>
+ </layout>
+ </widget>
</widget>
</item>
- <item row="1" column="0" colspan="2">
- <widget class="QGroupBox" name="mSnapGroupBox">
- <property name="title">
- <string>Snapping</string>
- </property>
- <layout class="QGridLayout">
- <item row="0" column="0" colspan="2">
- <widget class="QCheckBox" name="mSnapToGridCheckBox">
- <property name="text">
- <string>Snap to grid</string>
- </property>
- </widget>
- </item>
- <item row="1" column="0" colspan="2">
- <widget class="QLabel" name="mResolutionLabel_2">
- <property name="sizePolicy">
- <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- <property name="text">
- <string>Grid resolution</string>
- </property>
- </widget>
- </item>
- <item row="1" column="2">
- <widget class="QDoubleSpinBox" name="mResolutionSpinBox"/>
- </item>
- <item row="2" column="0" colspan="2">
- <widget class="QLabel" name="mXOffsetLabel">
- <property name="sizePolicy">
- <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- <property name="text">
- <string>Offset x</string>
- </property>
- </widget>
- </item>
- <item row="2" column="2">
- <widget class="QDoubleSpinBox" name="mOffsetXSpinBox"/>
- </item>
- <item row="3" column="0" colspan="2">
- <widget class="QLabel" name="mYOffsetLabel">
- <property name="text">
- <string>Offset y</string>
- </property>
- </widget>
- </item>
- <item row="3" column="2">
- <widget class="QDoubleSpinBox" name="mOffsetYSpinBox"/>
- </item>
- <item row="4" column="0">
- <widget class="QLabel" name="mPenWidthLabel">
- <property name="text">
- <string>Pen width</string>
- </property>
- </widget>
- </item>
- <item row="4" column="2">
- <widget class="QDoubleSpinBox" name="mPenWidthSpinBox"/>
- </item>
- <item row="5" column="0">
- <widget class="QLabel" name="mGridColorLabel">
- <property name="text">
- <string>Grid color</string>
- </property>
- </widget>
- </item>
- <item row="5" column="2">
- <widget class="QgsColorButton" name="mGridColorButton">
- <property name="sizePolicy">
- <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- <property name="text">
- <string/>
- </property>
- </widget>
- </item>
- <item row="6" column="0">
- <widget class="QLabel" name="mGridStyleLabel">
- <property name="text">
- <string>Grid style</string>
- </property>
- </widget>
- </item>
- <item row="6" column="1" colspan="2">
- <widget class="QComboBox" name="mGridStyleComboBox"/>
- </item>
- </layout>
- </widget>
- </item>
- <item row="2" column="0">
- <widget class="QLabel" name="mResolutionLabel">
- <property name="sizePolicy">
- <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- <property name="text">
- <string>Print quality (dpi)</string>
- </property>
- <property name="buddy">
- <cstring>mResolutionLineEdit</cstring>
- </property>
- </widget>
- </item>
- <item row="2" column="1">
- <widget class="QLineEdit" name="mResolutionLineEdit"/>
- </item>
- <item row="3" column="0">
- <widget class="QCheckBox" name="mPrintAsRasterCheckBox">
- <property name="text">
- <string>Print as raster</string>
- </property>
- </widget>
- </item>
</layout>
</widget>
<layoutdefault spacing="6" margin="11"/>
@@ -300,6 +346,23 @@
<header>qgscolorbutton.h</header>
</customwidget>
</customwidgets>
+ <tabstops>
+ <tabstop>scrollArea</tabstop>
+ <tabstop>mPaperSizeComboBox</tabstop>
+ <tabstop>mPaperUnitsComboBox</tabstop>
+ <tabstop>mPaperWidthLineEdit</tabstop>
+ <tabstop>mPaperHeightLineEdit</tabstop>
+ <tabstop>mPaperOrientationComboBox</tabstop>
+ <tabstop>mResolutionLineEdit</tabstop>
+ <tabstop>mPrintAsRasterCheckBox</tabstop>
+ <tabstop>mSnapToGridCheckBox</tabstop>
+ <tabstop>mResolutionSpinBox</tabstop>
+ <tabstop>mOffsetXSpinBox</tabstop>
+ <tabstop>mOffsetYSpinBox</tabstop>
+ <tabstop>mPenWidthSpinBox</tabstop>
+ <tabstop>mGridColorButton</tabstop>
+ <tabstop>mGridStyleComboBox</tabstop>
+ </tabstops>
<resources/>
<connections/>
</ui>
More information about the QGIS-commit
mailing list