[QGIS Commit] r12073 - in trunk/qgis/src: app plugins/gps_importer plugins/wfs

[svn_qgis at osgeo.org]

Author: timlinux
Date: 2009-11-10 11:16:38 -0500 (Tue, 10 Nov 2009)
New Revision: 12073

Modified:
   trunk/qgis/src/app/qgisapp.cpp
   trunk/qgis/src/plugins/gps_importer/qgsgpsplugin.cpp
   trunk/qgis/src/plugins/wfs/qgswfsplugin.cpp
Log:
[FEATURE] layers now unified to one toolbar and removed hide show all layers and add to overview icons from toolbar (as discussed at hackfest)

Modified: trunk/qgis/src/app/qgisapp.cpp
===================================================================
--- trunk/qgis/src/app/qgisapp.cpp	2009-11-10 15:32:47 UTC (rev 12072)
+++ trunk/qgis/src/app/qgisapp.cpp	2009-11-10 16:16:38 UTC (rev 12073)
@@ -1374,26 +1374,27 @@
   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

Modified: trunk/qgis/src/plugins/gps_importer/qgsgpsplugin.cpp
===================================================================
--- trunk/qgis/src/plugins/gps_importer/qgsgpsplugin.cpp	2009-11-10 15:32:47 UTC (rev 12072)
+++ trunk/qgis/src/plugins/gps_importer/qgsgpsplugin.cpp	2009-11-10 16:16:38 UTC (rev 12073)
@@ -96,7 +96,7 @@
   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 );
 

Modified: trunk/qgis/src/plugins/wfs/qgswfsplugin.cpp
===================================================================
--- trunk/qgis/src/plugins/wfs/qgswfsplugin.cpp	2009-11-10 15:32:47 UTC (rev 12072)
+++ trunk/qgis/src/plugins/wfs/qgswfsplugin.cpp	2009-11-10 16:16:38 UTC (rev 12073)
@@ -51,7 +51,7 @@
     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 ) ) );