Skip to content

Commit 7a2a328

Browse files
committed
Decorations are turned off by default
1 parent 13a3603 commit 7a2a328

File tree

3 files changed

+4
-10
lines changed

3 files changed

+4
-10
lines changed

src/app/qgsdecorationcopyright.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ void QgsDecorationCopyright::projectRead()
6868
QgsProject* prj = QgsProject::instance();
6969
mLabelQString = prj->readEntry( "CopyrightLabel", "/Label", defString );
7070
mPlacementIndex = prj->readNumEntry( "CopyrightLabel", "/Placement", 3 );
71-
mEnable = prj->readBoolEntry( "CopyrightLabel", "/Enabled", true );
71+
mEnable = prj->readBoolEntry( "CopyrightLabel", "/Enabled", false );
7272
mLabelQColor.setNamedColor( prj->readEntry( "CopyrightLabel", "/Color", "#000000" ) ); // default color is black
7373
}
7474

src/app/qgsdecorationnortharrow.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ void QgsDecorationNorthArrow::projectRead()
8080

8181
mRotationInt = QgsProject::instance()->readNumEntry( "NorthArrow", "/Rotation", 0 );
8282
mPlacementIndex = QgsProject::instance()->readNumEntry( "NorthArrow", "/Placement", 0 );
83-
mEnable = QgsProject::instance()->readBoolEntry( "NorthArrow", "/Enabled", true );
83+
mEnable = QgsProject::instance()->readBoolEntry( "NorthArrow", "/Enabled", false );
8484
mAutomatic = QgsProject::instance()->readBoolEntry( "NorthArrow", "/Automatic", true );
8585
}
8686

src/app/qgsdecorationscalebar.cpp

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -62,11 +62,7 @@ QgsDecorationScaleBar::QgsDecorationScaleBar( QObject* parent )
6262
mStyleLabels << tr( "Tick Down" ) << tr( "Tick Up" )
6363
<< tr( "Bar" ) << tr( "Box" );
6464

65-
mPreferredSize = 30;
66-
mStyleIndex = 0;
67-
mEnabled = true;
68-
mSnapping = true;
69-
mColor = Qt::black;
65+
projectRead();
7066
}
7167

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

7773
void QgsDecorationScaleBar::projectRead()
7874
{
79-
QgsDebugMsg( "+++++++++ scalebar plugin - project read slot called...." );
80-
8175
mPreferredSize = QgsProject::instance()->readNumEntry( "ScaleBar", "/PreferredSize", 30 );
8276
mStyleIndex = QgsProject::instance()->readNumEntry( "ScaleBar", "/Style", 0 );
8377
mPlacementIndex = QgsProject::instance()->readNumEntry( "ScaleBar", "/Placement", 2 );
84-
mEnabled = QgsProject::instance()->readBoolEntry( "ScaleBar", "/Enabled", true );
78+
mEnabled = QgsProject::instance()->readBoolEntry( "ScaleBar", "/Enabled", false );
8579
mSnapping = QgsProject::instance()->readBoolEntry( "ScaleBar", "/Snapping", true );
8680
int myRedInt = QgsProject::instance()->readNumEntry( "ScaleBar", "/ColorRedPart", 0 );
8781
int myGreenInt = QgsProject::instance()->readNumEntry( "ScaleBar", "/ColorGreenPart", 0 );

0 commit comments

Comments
 (0)