Skip to content
Permalink
Browse files

Decorations are turned off by default

  • Loading branch information
wonder-sk committed Aug 22, 2011
1 parent 13a3603 commit 7a2a328fddb354b7e6203853f4aeea6a5d17878c
Showing with 4 additions and 10 deletions.
  1. +1 −1 src/app/qgsdecorationcopyright.cpp
  2. +1 −1 src/app/qgsdecorationnortharrow.cpp
  3. +2 −8 src/app/qgsdecorationscalebar.cpp
@@ -68,7 +68,7 @@ void QgsDecorationCopyright::projectRead()
QgsProject* prj = QgsProject::instance();
mLabelQString = prj->readEntry( "CopyrightLabel", "/Label", defString );
mPlacementIndex = prj->readNumEntry( "CopyrightLabel", "/Placement", 3 );
mEnable = prj->readBoolEntry( "CopyrightLabel", "/Enabled", true );
mEnable = prj->readBoolEntry( "CopyrightLabel", "/Enabled", false );
mLabelQColor.setNamedColor( prj->readEntry( "CopyrightLabel", "/Color", "#000000" ) ); // default color is black
}

@@ -80,7 +80,7 @@ void QgsDecorationNorthArrow::projectRead()

mRotationInt = QgsProject::instance()->readNumEntry( "NorthArrow", "/Rotation", 0 );
mPlacementIndex = QgsProject::instance()->readNumEntry( "NorthArrow", "/Placement", 0 );
mEnable = QgsProject::instance()->readBoolEntry( "NorthArrow", "/Enabled", true );
mEnable = QgsProject::instance()->readBoolEntry( "NorthArrow", "/Enabled", false );
mAutomatic = QgsProject::instance()->readBoolEntry( "NorthArrow", "/Automatic", true );
}

@@ -62,11 +62,7 @@ QgsDecorationScaleBar::QgsDecorationScaleBar( QObject* parent )
mStyleLabels << tr( "Tick Down" ) << tr( "Tick Up" )
<< tr( "Bar" ) << tr( "Box" );

mPreferredSize = 30;
mStyleIndex = 0;
mEnabled = true;
mSnapping = true;
mColor = Qt::black;
projectRead();
}

QgsDecorationScaleBar::~QgsDecorationScaleBar()
@@ -76,12 +72,10 @@ QgsDecorationScaleBar::~QgsDecorationScaleBar()

void QgsDecorationScaleBar::projectRead()
{
QgsDebugMsg( "+++++++++ scalebar plugin - project read slot called...." );

mPreferredSize = QgsProject::instance()->readNumEntry( "ScaleBar", "/PreferredSize", 30 );
mStyleIndex = QgsProject::instance()->readNumEntry( "ScaleBar", "/Style", 0 );
mPlacementIndex = QgsProject::instance()->readNumEntry( "ScaleBar", "/Placement", 2 );
mEnabled = QgsProject::instance()->readBoolEntry( "ScaleBar", "/Enabled", true );
mEnabled = QgsProject::instance()->readBoolEntry( "ScaleBar", "/Enabled", false );
mSnapping = QgsProject::instance()->readBoolEntry( "ScaleBar", "/Snapping", true );
int myRedInt = QgsProject::instance()->readNumEntry( "ScaleBar", "/ColorRedPart", 0 );
int myGreenInt = QgsProject::instance()->readNumEntry( "ScaleBar", "/ColorGreenPart", 0 );

0 comments on commit 7a2a328

Please sign in to comment.
You can’t perform that action at this time.