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

[svn_qgis at osgeo.org]

Author: jef
Date: 2009-12-22 14:37:47 -0500 (Tue, 22 Dec 2009)
New Revision: 12582

Modified:
   trunk/qgis/src/app/qgslabeldialog.cpp
   trunk/qgis/src/ui/qgslabeldialogbase.ui
Log:
fix offset labels in label dialog

Modified: trunk/qgis/src/app/qgslabeldialog.cpp
===================================================================
--- trunk/qgis/src/app/qgslabeldialog.cpp	2009-12-22 16:46:46 UTC (rev 12581)
+++ trunk/qgis/src/app/qgslabeldialog.cpp	2009-12-22 19:37:47 UTC (rev 12582)
@@ -188,7 +188,15 @@
   {
     mFont.setItalic( false );
   }
-  mFont.setUnderline( myLabelAttributes->underline() );
+  if ( myLabelAttributes->underlineIsSet() )
+  {
+    mFont.setUnderline( myLabelAttributes->underline() );
+  }
+  else
+  {
+    mFont.setUnderline( false );
+  }
+
   mFontColor = myLabelAttributes->color();
 
   if ( myLabelAttributes->offsetIsSet() )

Modified: trunk/qgis/src/ui/qgslabeldialogbase.ui
===================================================================
--- trunk/qgis/src/ui/qgslabeldialogbase.ui	2009-12-22 16:46:46 UTC (rev 12581)
+++ trunk/qgis/src/ui/qgslabeldialogbase.ui	2009-12-22 19:37:47 UTC (rev 12582)
@@ -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>