Skip to content
Permalink
Browse files

[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
  • Loading branch information
timlinux
timlinux committed Nov 10, 2009
1 parent 169c168 commit 81bb122781287d15da30b0d1d196fe83586cdf66
Showing with 15 additions and 14 deletions.
  1. +13 −12 src/app/qgisapp.cpp
  2. +1 −1 src/plugins/gps_importer/qgsgpsplugin.cpp
  3. +1 −1 src/plugins/wfs/qgswfsplugin.cpp
@@ -1374,26 +1374,27 @@ void QgisApp::createToolBars()
mFileToolBar->addAction( mActionSaveProject );
mFileToolBar->addAction( mActionSaveProjectAs );
mFileToolBar->addAction( mActionNewPrintComposer );
mFileToolBar->addAction( mActionAddOgrLayer );
mFileToolBar->addAction( mActionAddRasterLayer );
#ifdef HAVE_POSTGRESQL
mFileToolBar->addAction( mActionAddPgLayer );
#endif
#ifdef HAVE_SPATIALITE
mFileToolBar->addAction( mActionAddSpatiaLiteLayer );
#endif
mFileToolBar->addAction( mActionAddWmsLayer );
mToolbarMenu->addAction( mFileToolBar->toggleViewAction() );
//
// Layer Toolbar
mLayerToolBar = addToolBar( tr( "Manage Layers" ) );
mLayerToolBar->setIconSize( myIconSize );
mLayerToolBar->setObjectName( "LayerToolBar" );
mLayerToolBar->addAction( mActionAddOgrLayer );
mLayerToolBar->addAction( mActionAddRasterLayer );
#ifdef HAVE_POSTGRESQL
mLayerToolBar->addAction( mActionAddPgLayer );
#endif
#ifdef HAVE_SPATIALITE
mLayerToolBar->addAction( mActionAddSpatiaLiteLayer );
#endif
mLayerToolBar->addAction( mActionAddWmsLayer );
mLayerToolBar->addAction( mActionNewVectorLayer );
mLayerToolBar->addAction( mActionRemoveLayer );
mLayerToolBar->addAction( mActionAddToOverview );
mLayerToolBar->addAction( mActionShowAllLayers );
mLayerToolBar->addAction( mActionHideAllLayers );
//commented out for QGIS 1.4 by Tim
//mLayerToolBar->addAction( mActionAddToOverview );
//mLayerToolBar->addAction( mActionShowAllLayers );
//mLayerToolBar->addAction( mActionHideAllLayers );
mToolbarMenu->addAction( mLayerToolBar->toggleViewAction() );
//
// Digitizing Toolbar
@@ -96,7 +96,7 @@ void QgsGPSPlugin::initGui()
connect( mQActionPointer, SIGNAL( triggered() ), this, SLOT( run() ) );
connect( mCreateGPXAction, SIGNAL( triggered() ), this, SLOT( createGPX() ) );

mQGisInterface->fileToolBar()->addAction( mQActionPointer );
mQGisInterface->layerToolBar()->addAction( mQActionPointer );
mQGisInterface->addPluginToMenu( tr( "&Gps" ), mQActionPointer );
mQGisInterface->addPluginToMenu( tr( "&Gps" ), mCreateGPXAction );

@@ -51,7 +51,7 @@ void QgsWFSPlugin::initGui()
mWfsDialogAction = new QAction( QIcon(), tr( "&Add WFS layer" ), 0 );
setCurrentTheme( "" );
QObject::connect( mWfsDialogAction, SIGNAL( triggered() ), this, SLOT( showSourceDialog() ) );
mIface->fileToolBar()->addAction( mWfsDialogAction );
mIface->layerToolBar()->addAction( mWfsDialogAction );
mIface->addPluginToMenu( tr( "&Add WFS layer" ), mWfsDialogAction );
// this is called when the icon theme is changed
connect( mIface, SIGNAL( currentThemeChanged( QString ) ), this, SLOT( setCurrentTheme( QString ) ) );

0 comments on commit 81bb122

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