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

mhugent · mhugent · commit b946c3341f9e · 2010-06-01T07:13:51.000Z
git-svn-id: http://svn.osgeo.org/qgis/trunk@13616 c8812cc2-4d05-0410-92ff-de0c093fc19c
diff --git a/src/app/qgslabelinggui.cpp b/src/app/qgslabelinggui.cpp
@@ -61,6 +61,8 @@ QgsLabelingGui::QgsLabelingGui( QgsPalLabeling* lbl, QgsVectorLayer* layer, QWid
   }
 
   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::changeTextFont()
 
 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();
diff --git a/src/ui/qgslabelingguibase.ui b/src/ui/qgslabelingguibase.ui
@@ -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>

Original file line number	Diff line number	Diff line change
`@@ -61,6 +61,8 @@ QgsLabelingGui::QgsLabelingGui( QgsPalLabeling* lbl, QgsVectorLayer* layer, QWid`
`61`	`61`	`}`
`62`	`62`
`63`	`63`	`chkMergeLines->setEnabled( layer->geometryType() == QGis::Line );`
	`64`	`+ label_19->setEnabled( layer->geometryType() != QGis::Point );`
	`65`	`+ mMinSizeSpinBox->setEnabled( layer->geometryType() != QGis::Point );`
`64`	`66`
`65`	`67`	`populateFieldNames();`
`66`	`68`
`@@ -266,7 +268,7 @@ void QgsLabelingGui::changeTextFont()`
`266`	`268`
`267`	`269`	`void QgsLabelingGui::updateFont( QFont font )`
`268`	`270`	`{`
`269`		`- lblFontName->setText( QString( "%1, %2" ).arg( font.family() ).arg( font.pointSize() ) );`
	`271`	`+ lblFontName->setText( QString( "%1, %2 %3" ).arg( font.family() ).arg( font.pointSize() ).arg( tr( "pt" ) ) );`
`270`	`272`	`lblFontPreview->setFont( font );`
`271`	`273`
`272`	`274`	`updatePreview();`