Skip to content

Commit 81bb122

Browse files
author
timlinux
committed
[FEATURE] layers now unified to one toolbar and removed hide show all layers and add to overview icons from toolbar (as discussed at hackfest)
git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@12073 c8812cc2-4d05-0410-92ff-de0c093fc19c
1 parent 169c168 commit 81bb122

File tree

3 files changed

+15
-14
lines changed

3 files changed

+15
-14
lines changed

src/app/qgisapp.cpp

+13-12
Original file line numberDiff line numberDiff line change
@@ -1374,26 +1374,27 @@ void QgisApp::createToolBars()
13741374
mFileToolBar->addAction( mActionSaveProject );
13751375
mFileToolBar->addAction( mActionSaveProjectAs );
13761376
mFileToolBar->addAction( mActionNewPrintComposer );
1377-
mFileToolBar->addAction( mActionAddOgrLayer );
1378-
mFileToolBar->addAction( mActionAddRasterLayer );
1379-
#ifdef HAVE_POSTGRESQL
1380-
mFileToolBar->addAction( mActionAddPgLayer );
1381-
#endif
1382-
#ifdef HAVE_SPATIALITE
1383-
mFileToolBar->addAction( mActionAddSpatiaLiteLayer );
1384-
#endif
1385-
mFileToolBar->addAction( mActionAddWmsLayer );
13861377
mToolbarMenu->addAction( mFileToolBar->toggleViewAction() );
13871378
//
13881379
// Layer Toolbar
13891380
mLayerToolBar = addToolBar( tr( "Manage Layers" ) );
13901381
mLayerToolBar->setIconSize( myIconSize );
13911382
mLayerToolBar->setObjectName( "LayerToolBar" );
1383+
mLayerToolBar->addAction( mActionAddOgrLayer );
1384+
mLayerToolBar->addAction( mActionAddRasterLayer );
1385+
#ifdef HAVE_POSTGRESQL
1386+
mLayerToolBar->addAction( mActionAddPgLayer );
1387+
#endif
1388+
#ifdef HAVE_SPATIALITE
1389+
mLayerToolBar->addAction( mActionAddSpatiaLiteLayer );
1390+
#endif
1391+
mLayerToolBar->addAction( mActionAddWmsLayer );
13921392
mLayerToolBar->addAction( mActionNewVectorLayer );
13931393
mLayerToolBar->addAction( mActionRemoveLayer );
1394-
mLayerToolBar->addAction( mActionAddToOverview );
1395-
mLayerToolBar->addAction( mActionShowAllLayers );
1396-
mLayerToolBar->addAction( mActionHideAllLayers );
1394+
//commented out for QGIS 1.4 by Tim
1395+
//mLayerToolBar->addAction( mActionAddToOverview );
1396+
//mLayerToolBar->addAction( mActionShowAllLayers );
1397+
//mLayerToolBar->addAction( mActionHideAllLayers );
13971398
mToolbarMenu->addAction( mLayerToolBar->toggleViewAction() );
13981399
//
13991400
// Digitizing Toolbar

src/plugins/gps_importer/qgsgpsplugin.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ void QgsGPSPlugin::initGui()
9696
connect( mQActionPointer, SIGNAL( triggered() ), this, SLOT( run() ) );
9797
connect( mCreateGPXAction, SIGNAL( triggered() ), this, SLOT( createGPX() ) );
9898

99-
mQGisInterface->fileToolBar()->addAction( mQActionPointer );
99+
mQGisInterface->layerToolBar()->addAction( mQActionPointer );
100100
mQGisInterface->addPluginToMenu( tr( "&Gps" ), mQActionPointer );
101101
mQGisInterface->addPluginToMenu( tr( "&Gps" ), mCreateGPXAction );
102102

src/plugins/wfs/qgswfsplugin.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ void QgsWFSPlugin::initGui()
5151
mWfsDialogAction = new QAction( QIcon(), tr( "&Add WFS layer" ), 0 );
5252
setCurrentTheme( "" );
5353
QObject::connect( mWfsDialogAction, SIGNAL( triggered() ), this, SLOT( showSourceDialog() ) );
54-
mIface->fileToolBar()->addAction( mWfsDialogAction );
54+
mIface->layerToolBar()->addAction( mWfsDialogAction );
5555
mIface->addPluginToMenu( tr( "&Add WFS layer" ), mWfsDialogAction );
5656
// this is called when the icon theme is changed
5757
connect( mIface, SIGNAL( currentThemeChanged( QString ) ), this, SLOT( setCurrentTheme( QString ) ) );

0 commit comments

Comments
 (0)