Skip to content
Permalink
Browse files

reenable tips for new minor releases

(cherry picked from commit 765d1a9)
  • Loading branch information
jef-n committed Jun 11, 2015
1 parent 19b79d8 commit cb8d3368d340171d93841fbc08bf2b7c42f00ee1
Showing with 4 additions and 4 deletions.
  1. +1 −1 src/app/qgisapp.cpp
  2. +2 −2 src/app/qgsoptions.cpp
  3. +1 −1 src/app/qgstipgui.cpp
@@ -800,7 +800,7 @@ QgisApp::QgisApp( QSplashScreen *splash, bool restorePlugins, QWidget * parent,
mLastComposerId = 0;

// Show a nice tip of the day
if ( settings.value( "/qgis/showTips", 1 ).toBool() )
if ( settings.value( QString( "/qgis/showTips%1" ).arg( QGis::QGIS_VERSION_INT / 100 ), true ).toBool() )
{
mSplash->hide();
QgsTipGui myTip;
@@ -575,7 +575,7 @@ QgsOptions::QgsOptions( QWidget *parent, Qt::WindowFlags fl ) :
mLegendLayersBoldChkBx->setChecked( settings.value( "/qgis/legendLayersBold", true ).toBool() );
mLegendGroupsBoldChkBx->setChecked( settings.value( "/qgis/legendGroupsBold", false ).toBool() );
cbxHideSplash->setChecked( settings.value( "/qgis/hideSplash", false ).toBool() );
cbxShowTips->setChecked( settings.value( "/qgis/showTips", true ).toBool() );
cbxShowTips->setChecked( settings.value( QString( "/qgis/showTips%1" ).arg( QGis::QGIS_VERSION_INT / 100 ), true ).toBool() );
cbxAttributeTableDocked->setChecked( settings.value( "/qgis/dockAttributeTable", false ).toBool() );
cbxSnappingOptionsDocked->setChecked( settings.value( "/qgis/dockSnapping", false ).toBool() );
cbxAddPostgisDC->setChecked( settings.value( "/qgis/addPostgisDC", false ).toBool() );
@@ -1082,7 +1082,7 @@ void QgsOptions::saveOptions()
bool legendGroupsBold = settings.value( "/qgis/legendGroupsBold", false ).toBool();
settings.setValue( "/qgis/legendGroupsBold", mLegendGroupsBoldChkBx->isChecked() );
settings.setValue( "/qgis/hideSplash", cbxHideSplash->isChecked() );
settings.setValue( "/qgis/showTips", cbxShowTips->isChecked() );
settings.setValue( QString( "/qgis/showTips%1" ).arg( QGis::QGIS_VERSION_INT / 100 ), cbxShowTips->isChecked() );
settings.setValue( "/qgis/dockAttributeTable", cbxAttributeTableDocked->isChecked() );
settings.setValue( "/qgis/attributeTableBehaviour", cmbAttrTableBehaviour->itemData( cmbAttrTableBehaviour->currentIndex() ) );
settings.setValue( "/qgis/attributeTableRowCache", spinBoxAttrTableRowCache->value() );
@@ -80,7 +80,7 @@ void QgsTipGui::on_cbxDisableTips_toggled( bool theFlag )
QSettings settings;
//note the ! below as when the cbx is checked (true) we want to
//change the setting to false
settings.setValue( "/qgis/showTips", !theFlag );
settings.setValue( QString( "/qgis/showTips%1" ).arg( QGis::QGIS_VERSION_INT / 100 ), !theFlag );
hide();
}

0 comments on commit cb8d336

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