[QGIS Commit] r13616 - in trunk/qgis/src: app ui

[svn_qgis at osgeo.org]

Author: mhugent
Date: 2010-06-01 03:13:51 -0400 (Tue, 01 Jun 2010)
New Revision: 13616

Modified:
   trunk/qgis/src/app/qgslabelinggui.cpp
   trunk/qgis/src/ui/qgslabelingguibase.ui
Log:
Small enhancements for labeling dialog: disable minimum size ui for points, add pt to font name and set two decimal places for distance spin boxes

Modified: trunk/qgis/src/app/qgslabelinggui.cpp
===================================================================
--- trunk/qgis/src/app/qgslabelinggui.cpp	2010-05-31 22:08:58 UTC (rev 13615)
+++ trunk/qgis/src/app/qgslabelinggui.cpp	2010-06-01 07:13:51 UTC (rev 13616)
@@ -61,6 +61,8 @@
   }
 
   chkMergeLines->setEnabled( layer->geometryType() == QGis::Line );
+  label_19->setEnabled( layer->geometryType() != QGis::Point );
+  mMinSizeSpinBox->setEnabled( layer->geometryType() != QGis::Point );
 
   populateFieldNames();
 
@@ -266,7 +268,7 @@
 
 void QgsLabelingGui::updateFont( QFont font )
 {
-  lblFontName->setText( QString( "%1, %2" ).arg( font.family() ).arg( font.pointSize() ) );
+  lblFontName->setText( QString( "%1, %2 %3" ).arg( font.family() ).arg( font.pointSize() ).arg( tr( "pt" ) ) );
   lblFontPreview->setFont( font );
 
   updatePreview();

Modified: trunk/qgis/src/ui/qgslabelingguibase.ui
===================================================================
--- trunk/qgis/src/ui/qgslabelingguibase.ui	2010-05-31 22:08:58 UTC (rev 13615)
+++ trunk/qgis/src/ui/qgslabelingguibase.ui	2010-06-01 07:13:51 UTC (rev 13616)
@@ -77,7 +77,7 @@
       <item>
        <widget class="QStackedWidget" name="stackedPlacement">
         <property name="currentIndex">
-         <number>1</number>
+         <number>0</number>
         </property>
         <widget class="QWidget" name="pagePoint">
          <layout class="QVBoxLayout" name="verticalLayout_2">
@@ -182,7 +182,7 @@
       <item>
        <widget class="QStackedWidget" name="stackedOptions">
         <property name="currentIndex">
-         <number>1</number>
+         <number>0</number>
         </property>
         <widget class="QWidget" name="pageOptionsPoint">
          <layout class="QGridLayout" name="gridLayout_2">
@@ -199,7 +199,7 @@
           <item row="0" column="1">
            <widget class="QDoubleSpinBox" name="spinDistPoint">
             <property name="decimals">
-             <number>0</number>
+             <number>2</number>
             </property>
            </widget>
           </item>
@@ -305,7 +305,7 @@
             <item>
              <widget class="QDoubleSpinBox" name="spinDistLine">
               <property name="decimals">
-               <number>0</number>
+               <number>2</number>
               </property>
              </widget>
             </item>