[QGIS Commit] r11797 - trunk/qgis/src/ui
svn_qgis at osgeo.org
svn_qgis at osgeo.org
Mon Oct 12 10:06:38 EDT 2009
Author: mhugent
Date: 2009-10-12 10:06:38 -0400 (Mon, 12 Oct 2009)
New Revision: 11797
Modified:
trunk/qgis/src/ui/qgscomposermapwidgetbase.ui
Log:
Composer grid map widget is a dock widget now
Modified: trunk/qgis/src/ui/qgscomposermapwidgetbase.ui
===================================================================
--- trunk/qgis/src/ui/qgscomposermapwidgetbase.ui 2009-10-12 13:16:02 UTC (rev 11796)
+++ trunk/qgis/src/ui/qgscomposermapwidgetbase.ui 2009-10-12 14:06:38 UTC (rev 11797)
@@ -6,8 +6,8 @@
<rect>
<x>0</x>
<y>0</y>
- <width>466</width>
- <height>649</height>
+ <width>472</width>
+ <height>657</height>
</rect>
</property>
<property name="sizePolicy">
@@ -255,162 +255,170 @@
</widget>
</item>
<item row="6" column="0">
- <widget class="QGroupBox" name="mGridGroupBox">
- <property name="title">
+ <widget class="QDockWidget" name="mGridDockWidget">
+ <property name="floating">
+ <bool>true</bool>
+ </property>
+ <property name="features">
+ <set>QDockWidget::DockWidgetFloatable|QDockWidget::DockWidgetMovable</set>
+ </property>
+ <property name="windowTitle">
<string>Grid</string>
</property>
- <layout class="QGridLayout" name="gridLayout">
- <item row="0" column="0">
- <widget class="QCheckBox" name="mGridCheckBox">
- <property name="text">
- <string>Show grid</string>
- </property>
- </widget>
- </item>
- <item row="1" column="0">
- <widget class="QLabel" name="mGridTypeLabel">
- <property name="text">
- <string>Grid type:</string>
- </property>
- </widget>
- </item>
- <item row="1" column="1" colspan="2">
- <widget class="QComboBox" name="mGridTypeComboBox"/>
- </item>
- <item row="2" column="0">
- <widget class="QLabel" name="mIntervalXLabel">
- <property name="text">
- <string>Interval X:</string>
- </property>
- </widget>
- </item>
- <item row="2" column="1" colspan="2">
- <widget class="QDoubleSpinBox" name="mIntervalXSpinBox">
- <property name="maximum">
- <double>999999.000000000000000</double>
- </property>
- </widget>
- </item>
- <item row="2" column="3">
- <widget class="QLabel" name="mIntervalYLabel">
- <property name="text">
- <string>Interval Y:</string>
- </property>
- </widget>
- </item>
- <item row="2" column="4">
- <widget class="QDoubleSpinBox" name="mIntervalYSpinBox">
- <property name="maximum">
- <double>9999999.000000000000000</double>
- </property>
- </widget>
- </item>
- <item row="3" column="0">
- <widget class="QLabel" name="mOffsetXLabel">
- <property name="text">
- <string>Offset X:</string>
- </property>
- </widget>
- </item>
- <item row="3" column="1" colspan="2">
- <widget class="QDoubleSpinBox" name="mOffsetXSpinBox">
- <property name="maximum">
- <double>9999999.000000000000000</double>
- </property>
- </widget>
- </item>
- <item row="3" column="3">
- <widget class="QLabel" name="mOffsetYLabel">
- <property name="text">
- <string>Offset Y:</string>
- </property>
- </widget>
- </item>
- <item row="3" column="4">
- <widget class="QDoubleSpinBox" name="mOffsetYSpinBox">
- <property name="maximum">
- <double>9999999.000000000000000</double>
- </property>
- </widget>
- </item>
- <item row="4" column="0">
- <widget class="QLabel" name="mLineWidthLabel">
- <property name="text">
- <string>Line width:</string>
- </property>
- </widget>
- </item>
- <item row="4" column="1" colspan="2">
- <widget class="QDoubleSpinBox" name="mLineWidthSpinBox"/>
- </item>
- <item row="4" column="3">
- <widget class="QLabel" name="mLineColorLabel">
- <property name="text">
- <string>Line color:</string>
- </property>
- </widget>
- </item>
- <item row="4" column="4">
- <widget class="QgsColorButton" name="mLineColorButton">
- <property name="sizePolicy">
- <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- <property name="text">
- <string/>
- </property>
- </widget>
- </item>
- <item row="5" column="0" colspan="2">
- <widget class="QCheckBox" name="mDrawAnnotationCheckBox">
- <property name="text">
- <string>Draw annotation</string>
- </property>
- </widget>
- </item>
- <item row="6" column="0" colspan="2">
- <widget class="QLabel" name="mAnnotationPositionLabel">
- <property name="text">
- <string>Annotation position:</string>
- </property>
- </widget>
- </item>
- <item row="6" column="2">
- <widget class="QComboBox" name="mAnnotationPositionComboBox"/>
- </item>
- <item row="6" column="3">
- <widget class="QLabel" name="mAnnotationDirectionLabel">
- <property name="frameShape">
- <enum>QFrame::NoFrame</enum>
- </property>
- <property name="text">
- <string>Annotation direction:</string>
- </property>
- </widget>
- </item>
- <item row="6" column="4">
- <widget class="QComboBox" name="mAnnotationDirectionComboBox"/>
- </item>
- <item row="7" column="0" colspan="2">
- <widget class="QLabel" name="mDistanceToFrameLabel">
- <property name="text">
- <string>Distance to map frame:</string>
- </property>
- </widget>
- </item>
- <item row="7" column="2">
- <widget class="QDoubleSpinBox" name="mDistanceToMapFrameSpinBox"/>
- </item>
- <item row="7" column="4">
- <widget class="QPushButton" name="mAnnotationFontButton">
- <property name="text">
- <string>Font...</string>
- </property>
- </widget>
- </item>
- </layout>
+ <widget class="QWidget" name="dockWidgetContents">
+ <layout class="QGridLayout" name="gridLayout">
+ <item row="0" column="0">
+ <widget class="QCheckBox" name="mGridCheckBox">
+ <property name="text">
+ <string>Show grid</string>
+ </property>
+ </widget>
+ </item>
+ <item row="1" column="0">
+ <widget class="QLabel" name="mGridTypeLabel">
+ <property name="text">
+ <string>Grid type:</string>
+ </property>
+ </widget>
+ </item>
+ <item row="1" column="1" colspan="3">
+ <widget class="QComboBox" name="mGridTypeComboBox"/>
+ </item>
+ <item row="2" column="0">
+ <widget class="QLabel" name="mIntervalXLabel">
+ <property name="text">
+ <string>Interval X:</string>
+ </property>
+ </widget>
+ </item>
+ <item row="2" column="1" colspan="3">
+ <widget class="QDoubleSpinBox" name="mIntervalXSpinBox">
+ <property name="maximum">
+ <double>999999.000000000000000</double>
+ </property>
+ </widget>
+ </item>
+ <item row="2" column="5">
+ <widget class="QLabel" name="mIntervalYLabel">
+ <property name="text">
+ <string>Interval Y:</string>
+ </property>
+ </widget>
+ </item>
+ <item row="2" column="6">
+ <widget class="QDoubleSpinBox" name="mIntervalYSpinBox">
+ <property name="maximum">
+ <double>9999999.000000000000000</double>
+ </property>
+ </widget>
+ </item>
+ <item row="3" column="0">
+ <widget class="QLabel" name="mOffsetXLabel">
+ <property name="text">
+ <string>Offset X:</string>
+ </property>
+ </widget>
+ </item>
+ <item row="3" column="1" colspan="3">
+ <widget class="QDoubleSpinBox" name="mOffsetXSpinBox">
+ <property name="maximum">
+ <double>9999999.000000000000000</double>
+ </property>
+ </widget>
+ </item>
+ <item row="3" column="5">
+ <widget class="QLabel" name="mOffsetYLabel">
+ <property name="text">
+ <string>Offset Y:</string>
+ </property>
+ </widget>
+ </item>
+ <item row="3" column="6">
+ <widget class="QDoubleSpinBox" name="mOffsetYSpinBox">
+ <property name="maximum">
+ <double>9999999.000000000000000</double>
+ </property>
+ </widget>
+ </item>
+ <item row="4" column="0">
+ <widget class="QLabel" name="mLineWidthLabel">
+ <property name="text">
+ <string>Line width:</string>
+ </property>
+ </widget>
+ </item>
+ <item row="4" column="1" colspan="3">
+ <widget class="QDoubleSpinBox" name="mLineWidthSpinBox"/>
+ </item>
+ <item row="4" column="4" colspan="2">
+ <widget class="QLabel" name="mLineColorLabel">
+ <property name="text">
+ <string>Line color:</string>
+ </property>
+ </widget>
+ </item>
+ <item row="4" column="6">
+ <widget class="QgsColorButton" name="mLineColorButton">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="text">
+ <string/>
+ </property>
+ </widget>
+ </item>
+ <item row="5" column="0" colspan="2">
+ <widget class="QCheckBox" name="mDrawAnnotationCheckBox">
+ <property name="text">
+ <string>Draw annotation</string>
+ </property>
+ </widget>
+ </item>
+ <item row="6" column="0" colspan="2">
+ <widget class="QLabel" name="mAnnotationPositionLabel">
+ <property name="text">
+ <string>Annotation position:</string>
+ </property>
+ </widget>
+ </item>
+ <item row="6" column="2" colspan="2">
+ <widget class="QComboBox" name="mAnnotationPositionComboBox"/>
+ </item>
+ <item row="6" column="5">
+ <widget class="QLabel" name="mAnnotationDirectionLabel">
+ <property name="frameShape">
+ <enum>QFrame::NoFrame</enum>
+ </property>
+ <property name="text">
+ <string>Annotation direction:</string>
+ </property>
+ </widget>
+ </item>
+ <item row="6" column="6">
+ <widget class="QComboBox" name="mAnnotationDirectionComboBox"/>
+ </item>
+ <item row="7" column="0" colspan="3">
+ <widget class="QLabel" name="mDistanceToFrameLabel">
+ <property name="text">
+ <string>Distance to map frame:</string>
+ </property>
+ </widget>
+ </item>
+ <item row="7" column="3" colspan="2">
+ <widget class="QDoubleSpinBox" name="mDistanceToMapFrameSpinBox"/>
+ </item>
+ <item row="7" column="6">
+ <widget class="QPushButton" name="mAnnotationFontButton">
+ <property name="text">
+ <string>Font...</string>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </widget>
</widget>
</item>
<item row="7" column="0">
More information about the QGIS-commit
mailing list