Skip to content

Commit

Permalink
apply #2277
Browse files Browse the repository at this point in the history
git-svn-id: http://svn.osgeo.org/qgis/trunk@12441 c8812cc2-4d05-0410-92ff-de0c093fc19c
  • Loading branch information
jef committed Dec 13, 2009
1 parent 97d5e90 commit 8b0c041
Showing 1 changed file with 5 additions and 4 deletions.
9 changes: 5 additions & 4 deletions src/plugins/copyright_label/plugin.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -108,8 +108,9 @@ void QgsCopyrightLabelPlugin::projectRead()
now = QDate::currentDate();
defString = "© QGIS " + now.toString( "yyyy" );

mQFont.setFamily( QgsProject::instance()->readEntry( "CopyrightLabel", "/FontName", "Sans Serif" ) );
mQFont.setPointSize( QgsProject::instance()->readNumEntry( "CopyrightLabel", "/FontSize", 9 ) );
// there is no font setting in the UI, so just use the Qt/QGIS default font (what mQFont gets when created)
// mQFont.setFamily( QgsProject::instance()->readEntry( "CopyrightLabel", "/FontName", "Sans Serif" ) );
// mQFont.setPointSize( QgsProject::instance()->readNumEntry( "CopyrightLabel", "/FontSize", 9 ) );
mLabelQString = QgsProject::instance()->readEntry( "CopyrightLabel", "/Label", defString );
mPlacementIndex = QgsProject::instance()->readNumEntry( "CopyrightLabel", "/Placement", 3 );
mEnable = QgsProject::instance()->readBoolEntry( "CopyrightLabel", "/Enabled", true );
Expand Down Expand Up @@ -171,7 +172,7 @@ void QgsCopyrightLabelPlugin::renderLabel( QPainter * theQPainter )
{
case 0: // Bottom Left
//Define bottom left hand corner start point
myYOffset = myHeight - size.height() + 5;
myYOffset = myHeight - ( size.height() + 5 );
myXOffset = 5;
break;
case 1: // Top left
Expand All @@ -186,7 +187,7 @@ void QgsCopyrightLabelPlugin::renderLabel( QPainter * theQPainter )
break;
case 3: // Bottom Right
//Define bottom right hand corner start point
myYOffset = myHeight - size.height() + 5;
myYOffset = myHeight - ( size.height() + 5 );
myXOffset = myWidth - ( size.width() + 5 );
break;
default:
Expand Down

0 comments on commit 8b0c041

Please sign in to comment.