[QGIS Commit] r11175 - branches/symbology-ng-branch/src/app

[svn_qgis at osgeo.org]

Author: wonder
Date: 2009-07-24 15:31:31 -0400 (Fri, 24 Jul 2009)
New Revision: 11175

Modified:
   branches/symbology-ng-branch/src/app/qgisapp.cpp
   branches/symbology-ng-branch/src/app/qgisapp.h
Log:
Removed temporary symbology-ng buttons from the tool bar, style manager is now accessible from options menu.


Modified: branches/symbology-ng-branch/src/app/qgisapp.cpp
===================================================================
--- branches/symbology-ng-branch/src/app/qgisapp.cpp	2009-07-24 15:30:33 UTC (rev 11174)
+++ branches/symbology-ng-branch/src/app/qgisapp.cpp	2009-07-24 19:31:31 UTC (rev 11175)
@@ -1021,44 +1021,14 @@
   mActionAbout->setMenuRole( QAction::AboutRole ); // put in application menu on Mac OS X
   connect( mActionAbout, SIGNAL( triggered() ), this, SLOT( about() ) );
 
-  // %%%
-  mActionUseRendererV2 = new QAction( "V2", this );
-  mActionUseRendererV2->setStatusTip( tr( "Toggles renderer V2 for current layer" ) );
-  connect( mActionUseRendererV2, SIGNAL( triggered() ), this, SLOT( toggleRendererV2() ) );
-
-  // %%%
-  mActionStyleManagerV2 = new QAction( "MGR", this );
+  mActionStyleManagerV2 = new QAction( tr("Style manager..."), this );
   mActionStyleManagerV2->setStatusTip( tr( "Show style manager V2" ) );
   connect( mActionStyleManagerV2, SIGNAL( triggered() ), this, SLOT( showStyleManagerV2() ) );
 }
 
 #include "qgsstylev2.h"
-#include "qgssymbolv2.h"
-#include "qgsrendererv2.h"
-#include "qgsrendererv2propertiesdialog.h"
 #include "qgsstylev2managerdialog.h"
 
-
-
-void QgisApp::toggleRendererV2()
-{
-  QgsMapLayer* layer = activeLayer();
-  if (layer == NULL || layer->type() != QgsMapLayer::VectorLayer)
-  {
-    QMessageBox::information(this, "sorry", "Give me a vector layer!");
-    return;
-  }
-  QgsVectorLayer* vlayer = static_cast<QgsVectorLayer*>(layer);
-  
-  QgsRendererV2PropertiesDialog dlg(vlayer, QgsStyleV2::defaultStyle(), this);
-  if (!dlg.exec())
-    return;
-  
-  mMapLegend->refreshLayerSymbology( vlayer->getLayerID(), false );
-
-  refreshMapCanvas();
-}
-
 void QgisApp::showStyleManagerV2()
 {
   QgsStyleV2ManagerDialog dlg(QgsStyleV2::defaultStyle(), QgsApplication::userStyleV2Path(), this);
@@ -1227,6 +1197,7 @@
     mActionEditSeparator3 = mEditMenu->addSeparator();
     mEditMenu->addAction( mActionOptions );
     mEditMenu->addAction( mActionConfigureShortcuts );
+    mEditMenu->addAction( mActionStyleManagerV2 );
     mEditMenu->addAction( mActionCustomProjection );
   }
 
@@ -1317,6 +1288,7 @@
 
     mSettingsMenu->addAction( mActionProjectProperties );
     mSettingsMenu->addAction( mActionCustomProjection );
+    mSettingsMenu->addAction( mActionStyleManagerV2 );
     mSettingsMenu->addAction( mActionConfigureShortcuts );
     mSettingsMenu->addAction( mActionOptions );
   }
@@ -1385,8 +1357,6 @@
   mFileToolBar->addAction( mActionAddSpatiaLiteLayer );
 #endif
   mFileToolBar->addAction( mActionAddWmsLayer );
-  mFileToolBar->addAction( mActionUseRendererV2 );
-  mFileToolBar->addAction( mActionStyleManagerV2 );
   mToolbarMenu->addAction( mFileToolBar->toggleViewAction() );
   //
   // Layer Toolbar

Modified: branches/symbology-ng-branch/src/app/qgisapp.h
===================================================================
--- branches/symbology-ng-branch/src/app/qgisapp.h	2009-07-24 15:30:33 UTC (rev 11174)
+++ branches/symbology-ng-branch/src/app/qgisapp.h	2009-07-24 19:31:31 UTC (rev 11175)
@@ -607,7 +607,6 @@
     //! Stops rendering of the main map
     void stopRendering();
 
-    void toggleRendererV2();
     void showStyleManagerV2();
 
   signals: