Skip to content

Commit 79a05cf

Browse files
author
jef
committedDec 22, 2009
fix offset labels in label dialog
git-svn-id: http://svn.osgeo.org/qgis/trunk@12582 c8812cc2-4d05-0410-92ff-de0c093fc19c
1 parent 7083026 commit 79a05cf

File tree

2 files changed

+11
-3
lines changed

2 files changed

+11
-3
lines changed
 

‎src/app/qgslabeldialog.cpp

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -188,7 +188,15 @@ void QgsLabelDialog::init( )
188188
{
189189
mFont.setItalic( false );
190190
}
191-
mFont.setUnderline( myLabelAttributes->underline() );
191+
if ( myLabelAttributes->underlineIsSet() )
192+
{
193+
mFont.setUnderline( myLabelAttributes->underline() );
194+
}
195+
else
196+
{
197+
mFont.setUnderline( false );
198+
}
199+
192200
mFontColor = myLabelAttributes->color();
193201

194202
if ( myLabelAttributes->offsetIsSet() )

‎src/ui/qgslabeldialogbase.ui

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -449,14 +449,14 @@
449449
<item row="0" column="0">
450450
<widget class="QLabel" name="textLabel1_2_2_2_3">
451451
<property name="text">
452-
<string>Y Offset (pts)</string>
452+
<string>X Offset (pts)</string>
453453
</property>
454454
</widget>
455455
</item>
456456
<item row="0" column="1">
457457
<widget class="QLabel" name="textLabel1_2_3_2">
458458
<property name="text">
459-
<string>X Offset (pts)</string>
459+
<string>Y Offset (pts)</string>
460460
</property>
461461
</widget>
462462
</item>

0 commit comments

Comments
 (0)
Please sign in to comment.