Skip to content

Commit

Permalink
fix offset labels in label dialog
Browse files Browse the repository at this point in the history
git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@12582 c8812cc2-4d05-0410-92ff-de0c093fc19c
  • Loading branch information
jef committed Dec 22, 2009
1 parent 14fcdd7 commit c52a317
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 3 deletions.
10 changes: 9 additions & 1 deletion src/app/qgslabeldialog.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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() )
Expand Down
4 changes: 2 additions & 2 deletions src/ui/qgslabeldialogbase.ui
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down

0 comments on commit c52a317

Please sign in to comment.