[QGIS Commit] r14905 - trunk/qgis/src/core

[svn_qgis at osgeo.org]

Author: mhugent
Date: 2010-12-13 13:39:05 -0800 (Mon, 13 Dec 2010)
New Revision: 14905

Modified:
   trunk/qgis/src/core/qgspallabeling.cpp
Log:
Write / read strikeout and underline for label-ng. Fixes bug #3323

Modified: trunk/qgis/src/core/qgspallabeling.cpp
===================================================================
--- trunk/qgis/src/core/qgspallabeling.cpp	2010-12-13 20:40:44 UTC (rev 14904)
+++ trunk/qgis/src/core/qgspallabeling.cpp	2010-12-13 21:39:05 UTC (rev 14905)
@@ -268,6 +268,8 @@
   int fontWeight = layer->customProperty( "labeling/fontWeight" ).toInt();
   bool fontItalic = layer->customProperty( "labeling/fontItalic" ).toBool();
   textFont = QFont( fontFamily, fontSize, fontWeight, fontItalic );
+  textFont.setUnderline( layer->customProperty( "labeling/fontUnderline" ).toBool() );
+  textFont.setStrikeOut( layer->customProperty( "labeling/fontStrikeout" ).toBool() );
   textFont.setPointSizeF( fontSize ); //double precision needed because of map units
   textColor = _readColor( layer, "labeling/textColor" );
   enabled = layer->customProperty( "labeling/enabled" ).toBool();
@@ -300,6 +302,8 @@
   layer->setCustomProperty( "labeling/fontSize", textFont.pointSizeF() );
   layer->setCustomProperty( "labeling/fontWeight", textFont.weight() );
   layer->setCustomProperty( "labeling/fontItalic", textFont.italic() );
+  layer->setCustomProperty( "labeling/fontStrikeout", textFont.strikeOut() );
+  layer->setCustomProperty( "labeling/fontUnderline", textFont.underline() );
 
   _writeColor( layer, "labeling/textColor", textColor );
   layer->setCustomProperty( "labeling/enabled", enabled );