Skip to content
Permalink
Browse files
Remove more references to the DB2 button
  • Loading branch information
DelazJ authored and nyalldawson committed Jul 15, 2021
1 parent 7290148 commit c4f17d75914fb99e95b60cf23cc96d167ef179c2
Showing with 4 additions and 13 deletions.
  1. +4 −13 src/app/qgisapp.cpp
@@ -2692,7 +2692,6 @@ void QgisApp::createActions()
connect( mActionAddSpatiaLiteLayer, &QAction::triggered, this, [ = ] { dataSourceManager( QStringLiteral( "spatialite" ) ); } );
#endif
connect( mActionAddMssqlLayer, &QAction::triggered, this, [ = ] { dataSourceManager( QStringLiteral( "mssql" ) ); } );
connect( mActionAddDb2Layer, &QAction::triggered, this, [ = ] { dataSourceManager( QStringLiteral( "DB2" ) ); } );
connect( mActionAddOracleLayer, &QAction::triggered, this, [ = ] { dataSourceManager( QStringLiteral( "oracle" ) ); } );
connect( mActionAddHanaLayer, &QAction::triggered, this, [ = ] { dataSourceManager( QStringLiteral( "hana" ) ); } );
connect( mActionAddWmsLayer, &QAction::triggered, this, [ = ] { dataSourceManager( QStringLiteral( "wms" ) ); } );
@@ -3507,9 +3506,7 @@ void QgisApp::createToolBars()
bt->addAction( mActionAddPgLayer );
if ( mActionAddMssqlLayer )
bt->addAction( mActionAddMssqlLayer );
if ( mActionAddDb2Layer )
bt->addAction( mActionAddDb2Layer );
if ( mActionAddOracleLayer )
if ( mActionAddOracleLayer )
bt->addAction( mActionAddOracleLayer );
if ( mActionAddHanaLayer )
bt->addAction( mActionAddHanaLayer );
@@ -3523,12 +3520,9 @@ void QgisApp::createToolBars()
defAddDbLayerAction = mActionAddMssqlLayer;
break;
case 2:
defAddDbLayerAction = mActionAddDb2Layer;
break;
case 3:
defAddDbLayerAction = mActionAddOracleLayer;
break;
case 4:
case 3:
defAddDbLayerAction = mActionAddHanaLayer;
break;
}
@@ -3988,7 +3982,6 @@ void QgisApp::setTheme( const QString &themeName )
mActionAddSpatiaLiteLayer->setIcon( QgsApplication::getThemeIcon( QStringLiteral( "/mActionAddSpatiaLiteLayer.svg" ) ) );
#endif
mActionAddMssqlLayer->setIcon( QgsApplication::getThemeIcon( QStringLiteral( "/mActionAddMssqlLayer.svg" ) ) );
mActionAddDb2Layer->setIcon( QgsApplication::getThemeIcon( QStringLiteral( "/mActionAddDb2Layer.svg" ) ) );
#ifdef HAVE_ORACLE
mActionAddOracleLayer->setIcon( QgsApplication::getThemeIcon( QStringLiteral( "/mActionAddOracleLayer.svg" ) ) );
#endif
@@ -16601,12 +16594,10 @@ void QgisApp::toolButtonActionTriggered( QAction *action )
settings.setValue( QStringLiteral( "UI/defaultAddDbLayerAction" ), 0 );
else if ( mActionAddMssqlLayer && action == mActionAddMssqlLayer )
settings.setValue( QStringLiteral( "UI/defaultAddDbLayerAction" ), 1 );
else if ( mActionAddDb2Layer && action == mActionAddDb2Layer )
settings.setValue( QStringLiteral( "UI/defaultAddDbLayerAction" ), 2 );
else if ( mActionAddOracleLayer && action == mActionAddOracleLayer )
settings.setValue( QStringLiteral( "UI/defaultAddDbLayerAction" ), 3 );
settings.setValue( QStringLiteral( "UI/defaultAddDbLayerAction" ), 2 );
else if ( mActionAddHanaLayer && action == mActionAddHanaLayer )
settings.setValue( QStringLiteral( "UI/defaultAddDbLayerAction" ), 4 );
settings.setValue( QStringLiteral( "UI/defaultAddDbLayerAction" ), 3 );
else if ( action == mActionMoveFeature )
settings.setValue( QStringLiteral( "UI/defaultMoveTool" ), 0 );
else if ( action == mActionMoveFeatureCopy )

0 comments on commit c4f17d7

Please sign in to comment.