Skip to content

Commit

Permalink
Fix addDbLayerAction insertion point when arcgis provider is enabled
Browse files Browse the repository at this point in the history
  • Loading branch information
manisandro committed Jun 3, 2016
1 parent 8f15877 commit 04e1e96
Showing 1 changed file with 3 additions and 1 deletion.
4 changes: 3 additions & 1 deletion src/app/qgisapp.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -2175,6 +2175,8 @@ void QgisApp::createToolBars()
mLayerToolBar->removeAction( mActionAddWfsLayer );
featureServiceAction->setObjectName( "ActionFeatureService" );
connect( bt, SIGNAL( triggered( QAction * ) ), this, SLOT( toolButtonActionTriggered( QAction * ) ) );
#else
QAction* mapServiceAction = mActionAddWmsLayer;
#endif

// add db layer button
Expand Down Expand Up @@ -2206,7 +2208,7 @@ void QgisApp::createToolBars()
}
if ( defAddDbLayerAction )
bt->setDefaultAction( defAddDbLayerAction );
QAction* addDbLayerAction = mLayerToolBar->insertWidget( mActionAddWmsLayer, bt );
QAction* addDbLayerAction = mLayerToolBar->insertWidget( mapServiceAction, bt );
addDbLayerAction->setObjectName( "ActionAddDbLayer" );
connect( bt, SIGNAL( triggered( QAction * ) ), this, SLOT( toolButtonActionTriggered( QAction * ) ) );

Expand Down

3 comments on commit 04e1e96

@nirvn
Copy link
Contributor

@nirvn nirvn commented on 04e1e96 Jun 3, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@manisandro thanks.

@nirvn
Copy link
Contributor

@nirvn nirvn commented on 04e1e96 Jun 3, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@manisandro , BTW, @nyalldawson recently renamed [ delete ] buttons to [ remove ] recently, in a bid to avoid confusion as to what the button does. Might be worth updating your dialogs too. Cheers.

@manisandro
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@nirvn Thanks for the heads up, done in 6a46e71

Please sign in to comment.