fix offset labels in label dialog

jef · jef · commit 79a05cfd034e · 2009-12-22T19:37:47.000Z
git-svn-id: http://svn.osgeo.org/qgis/trunk@12582 c8812cc2-4d05-0410-92ff-de0c093fc19c
diff --git a/src/app/qgslabeldialog.cpp b/src/app/qgslabeldialog.cpp
@@ -188,7 +188,15 @@ void QgsLabelDialog::init( )
   {
     mFont.setItalic( false );
   }
-  mFont.setUnderline( myLabelAttributes->underline() );
+  if ( myLabelAttributes->underlineIsSet() )
+  {
+    mFont.setUnderline( myLabelAttributes->underline() );
+  }
+  else
+  {
+    mFont.setUnderline( false );
+  }
+
   mFontColor = myLabelAttributes->color();
 
   if ( myLabelAttributes->offsetIsSet() )
diff --git a/src/ui/qgslabeldialogbase.ui b/src/ui/qgslabeldialogbase.ui
@@ -449,14 +449,14 @@
           <item row="0" column="0">
            <widget class="QLabel" name="textLabel1_2_2_2_3">
             <property name="text">
-             <string>Y Offset (pts)</string>
+             <string>X Offset (pts)</string>
             </property>
            </widget>
           </item>
           <item row="0" column="1">
            <widget class="QLabel" name="textLabel1_2_3_2">
             <property name="text">
-             <string>X Offset (pts)</string>
+             <string>Y Offset (pts)</string>
             </property>
            </widget>
           </item>
