[QGIS Commit] r14703 - in trunk/qgis/src: app ui
svn_qgis at osgeo.org
svn_qgis at osgeo.org
Wed Nov 17 15:40:23 EST 2010
Author: timlinux
Date: 2010-11-17 12:40:23 -0800 (Wed, 17 Nov 2010)
New Revision: 14703
Modified:
trunk/qgis/src/app/qgisapp.cpp
trunk/qgis/src/ui/qgslabelingguibase.ui
Log:
Put label icon on label toolbar. Some cleanups for labelling ui
Modified: trunk/qgis/src/app/qgisapp.cpp
===================================================================
--- trunk/qgis/src/app/qgisapp.cpp 2010-11-17 20:00:40 UTC (rev 14702)
+++ trunk/qgis/src/app/qgisapp.cpp 2010-11-17 20:40:23 UTC (rev 14703)
@@ -1823,7 +1823,6 @@
mAttributesToolBar->addAction( mActionMapTips );
mAttributesToolBar->addAction( mActionShowBookmarks );
mAttributesToolBar->addAction( mActionNewBookmark );
- mAttributesToolBar->addAction( mActionLabeling );
// Annotation tools
bt = new QToolButton();
@@ -1871,6 +1870,7 @@
mLabelToolBar = addToolBar( tr( "Label" ) );
mLabelToolBar->setIconSize( myIconSize );
mLabelToolBar->setObjectName( "Label" );
+ mLabelToolBar->addAction( mActionLabeling );
mLabelToolBar->addAction( mActionMoveLabel );
mLabelToolBar->addAction( mActionRotateLabel );
mLabelToolBar->addAction( mActionChangeLabelProperties );
Modified: trunk/qgis/src/ui/qgslabelingguibase.ui
===================================================================
--- trunk/qgis/src/ui/qgslabelingguibase.ui 2010-11-17 20:00:40 UTC (rev 14702)
+++ trunk/qgis/src/ui/qgslabelingguibase.ui 2010-11-17 20:40:23 UTC (rev 14703)
@@ -76,7 +76,7 @@
<item>
<widget class="QgsLabelPreview" name="lblFontPreview">
<property name="sizePolicy">
- <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
+ <sizepolicy hsizetype="Expanding" vsizetype="MinimumExpanding">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
@@ -140,78 +140,29 @@
</widget>
</item>
<item row="0" column="1">
- <layout class="QHBoxLayout" name="horizontalLayout_15">
- <item>
- <widget class="QLabel" name="lblFontName">
- <property name="sizePolicy">
- <sizepolicy hsizetype="Expanding" vsizetype="Preferred">
- <horstretch>1</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- <property name="text">
- <string>TextLabel</string>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QToolButton" name="btnChangeFont">
- <property name="text">
- <string>...</string>
- </property>
- </widget>
- </item>
- <item>
- <spacer name="horizontalSpacer_6">
- <property name="orientation">
- <enum>Qt::Horizontal</enum>
- </property>
- <property name="sizeHint" stdset="0">
- <size>
- <width>999</width>
- <height>20</height>
- </size>
- </property>
- </spacer>
- </item>
- </layout>
+ <widget class="QLabel" name="lblFontName">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Minimum" vsizetype="Preferred">
+ <horstretch>1</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="text">
+ <string>TextLabel</string>
+ </property>
+ <property name="alignment">
+ <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+ </property>
+ </widget>
</item>
- <item row="1" column="0">
- <widget class="QLabel" name="mFontSizeLabel">
+ <item row="0" column="2">
+ <widget class="QToolButton" name="btnChangeFont">
<property name="text">
- <string>Font size</string>
+ <string>...</string>
</property>
</widget>
</item>
- <item row="1" column="1">
- <layout class="QHBoxLayout" name="horizontalLayout">
- <item>
- <widget class="QDoubleSpinBox" name="mFontSizeSpinBox">
- <property name="decimals">
- <number>4</number>
- </property>
- <property name="maximum">
- <double>999999999.000000000000000</double>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QComboBox" name="mFontSizeUnitComboBox">
- <item>
- <property name="text">
- <string>In points</string>
- </property>
- </item>
- <item>
- <property name="text">
- <string>In map units</string>
- </property>
- </item>
- </widget>
- </item>
- </layout>
- </item>
- <item row="2" column="0">
+ <item row="0" column="3">
<widget class="QLabel" name="label_29">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Preferred">
@@ -227,39 +178,72 @@
</property>
</widget>
</item>
- <item row="2" column="1">
- <layout class="QHBoxLayout" name="horizontalLayout_16">
+ <item row="0" column="4">
+ <widget class="QgsColorButton" name="btnTextColor">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="minimumSize">
+ <size>
+ <width>32</width>
+ <height>0</height>
+ </size>
+ </property>
+ <property name="text">
+ <string/>
+ </property>
+ </widget>
+ </item>
+ <item row="0" column="5">
+ <widget class="QLabel" name="mFontSizeLabel">
+ <property name="text">
+ <string>Size</string>
+ </property>
+ </widget>
+ </item>
+ <item row="0" column="6">
+ <widget class="QDoubleSpinBox" name="mFontSizeSpinBox">
+ <property name="decimals">
+ <number>4</number>
+ </property>
+ <property name="maximum">
+ <double>999999999.000000000000000</double>
+ </property>
+ </widget>
+ </item>
+ <item row="0" column="7">
+ <widget class="QComboBox" name="mFontSizeUnitComboBox">
<item>
- <widget class="QgsColorButton" name="btnTextColor">
- <property name="sizePolicy">
- <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- <property name="text">
- <string/>
- </property>
- </widget>
+ <property name="text">
+ <string>In points</string>
+ </property>
</item>
<item>
- <spacer name="horizontalSpacer_7">
- <property name="orientation">
- <enum>Qt::Horizontal</enum>
- </property>
- <property name="sizeType">
- <enum>QSizePolicy::Preferred</enum>
- </property>
- <property name="sizeHint" stdset="0">
- <size>
- <width>142</width>
- <height>20</height>
- </size>
- </property>
- </spacer>
+ <property name="text">
+ <string>In map units</string>
+ </property>
</item>
- </layout>
+ </widget>
</item>
+ <item row="0" column="8">
+ <spacer name="horizontalSpacer">
+ <property name="orientation">
+ <enum>Qt::Horizontal</enum>
+ </property>
+ <property name="sizeType">
+ <enum>QSizePolicy::Maximum</enum>
+ </property>
+ <property name="sizeHint" stdset="0">
+ <size>
+ <width>40</width>
+ <height>20</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
</layout>
</widget>
</item>
@@ -273,49 +257,64 @@
</property>
<layout class="QGridLayout" name="gridLayout_5">
<item row="0" column="0">
- <layout class="QHBoxLayout" name="horizontalLayout_17">
- <item>
- <widget class="QLabel" name="label_31">
- <property name="text">
- <string>Size</string>
- </property>
- <property name="alignment">
- <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QDoubleSpinBox" name="spinBufferSize">
- <property name="suffix">
- <string> mm</string>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QLabel" name="label_32">
- <property name="text">
- <string>Color</string>
- </property>
- <property name="alignment">
- <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QgsColorButton" name="btnBufferColor">
- <property name="sizePolicy">
- <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- <property name="text">
- <string>...</string>
- </property>
- </widget>
- </item>
- </layout>
+ <widget class="QLabel" name="label_31">
+ <property name="text">
+ <string>Size</string>
+ </property>
+ <property name="alignment">
+ <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+ </property>
+ </widget>
</item>
+ <item row="0" column="1">
+ <widget class="QDoubleSpinBox" name="spinBufferSize">
+ <property name="minimumSize">
+ <size>
+ <width>93</width>
+ <height>0</height>
+ </size>
+ </property>
+ <property name="suffix">
+ <string> mm</string>
+ </property>
+ </widget>
+ </item>
+ <item row="0" column="2">
+ <widget class="QLabel" name="label_32">
+ <property name="text">
+ <string>Color</string>
+ </property>
+ <property name="alignment">
+ <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+ </property>
+ </widget>
+ </item>
+ <item row="0" column="3">
+ <widget class="QgsColorButton" name="btnBufferColor">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="text">
+ <string>...</string>
+ </property>
+ </widget>
+ </item>
+ <item row="0" column="4">
+ <spacer name="horizontalSpacer_2">
+ <property name="orientation">
+ <enum>Qt::Horizontal</enum>
+ </property>
+ <property name="sizeHint" stdset="0">
+ <size>
+ <width>428</width>
+ <height>20</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
</layout>
</widget>
</item>
@@ -328,10 +327,10 @@
<bool>true</bool>
</property>
<layout class="QGridLayout" name="gridLayout_10">
- <item row="1" column="1">
- <widget class="QSpinBox" name="spinScaleMax">
+ <item row="0" column="0">
+ <widget class="QSpinBox" name="spinScaleMin">
<property name="prefix">
- <string>Maximum </string>
+ <string>Minimum </string>
</property>
<property name="minimum">
<number>1</number>
@@ -339,15 +338,12 @@
<property name="maximum">
<number>10000000</number>
</property>
- <property name="value">
- <number>10000000</number>
- </property>
</widget>
</item>
- <item row="1" column="0">
- <widget class="QSpinBox" name="spinScaleMin">
+ <item row="0" column="1">
+ <widget class="QSpinBox" name="spinScaleMax">
<property name="prefix">
- <string>Minimum </string>
+ <string>Maximum </string>
</property>
<property name="minimum">
<number>1</number>
@@ -355,8 +351,24 @@
<property name="maximum">
<number>10000000</number>
</property>
+ <property name="value">
+ <number>10000000</number>
+ </property>
</widget>
</item>
+ <item row="0" column="2">
+ <spacer name="horizontalSpacer_3">
+ <property name="orientation">
+ <enum>Qt::Horizontal</enum>
+ </property>
+ <property name="sizeHint" stdset="0">
+ <size>
+ <width>307</width>
+ <height>20</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
</layout>
</widget>
</item>
@@ -381,7 +393,7 @@
<rect>
<x>0</x>
<y>0</y>
- <width>486</width>
+ <width>640</width>
<height>483</height>
</rect>
</property>
@@ -815,7 +827,7 @@
<rect>
<x>0</x>
<y>0</y>
- <width>274</width>
+ <width>640</width>
<height>615</height>
</rect>
</property>
More information about the QGIS-commit
mailing list