[QGIS Commit] r12075 - trunk/qgis/src/app

[svn_qgis at osgeo.org]

Author: jef
Date: 2009-11-10 12:46:24 -0500 (Tue, 10 Nov 2009)
New Revision: 12075

Modified:
   trunk/qgis/src/app/qgisapp.cpp
   trunk/qgis/src/app/qgisapp.h
Log:
fix crash on toggle editing

Modified: trunk/qgis/src/app/qgisapp.cpp
===================================================================
--- trunk/qgis/src/app/qgisapp.cpp	2009-11-10 16:43:50 UTC (rev 12074)
+++ trunk/qgis/src/app/qgisapp.cpp	2009-11-10 17:46:24 UTC (rev 12075)
@@ -695,7 +695,7 @@
   mActionDeleteSelected->setEnabled( false );
 
   //these three tools to be deprecated - use node tool rather
-  /**
+#if 0
   mActionAddVertex = new QAction( getThemeIcon( "mActionAddVertex.png" ), tr( "Add Vertex" ), this );
   shortcuts->registerAction( mActionAddVertex );
   mActionAddVertex->setStatusTip( tr( "Add Vertex" ) );
@@ -713,7 +713,7 @@
   mActionDeleteVertex->setStatusTip( tr( "Delete Vertex" ) );
   connect( mActionDeleteVertex, SIGNAL( triggered() ), this, SLOT( deleteVertex() ) );
   mActionDeleteVertex->setEnabled( false );
-  */
+#endif
 
   mActionAddRing = new QAction( getThemeIcon( "mActionAddRing.png" ), tr( "Add Ring" ), this );
   shortcuts->registerAction( mActionAddRing );
@@ -5728,10 +5728,11 @@
         mActionCapturePolygon->setEnabled( false );
         mActionCaptureLine->setVisible( false );
         mActionCapturePolygon->setVisible( false );
-        //these three tools to be deprecated - use node tool rather
-        //mActionAddVertex->setEnabled( false );
-        //mActionDeleteVertex->setEnabled( false );
-        //mActionMoveVertex->setEnabled( false );
+#if 0   //these three tools to be deprecated - use node tool rather
+        mActionAddVertex->setEnabled( false );
+        mActionDeleteVertex->setEnabled( false );
+        mActionMoveVertex->setEnabled( false );
+#endif
         mActionAddRing->setEnabled( false );
         mActionAddIsland->setEnabled( false );
         mActionReshapeFeatures->setEnabled( false );
@@ -5740,10 +5741,13 @@
         mActionDeleteRing->setEnabled( false );
         mActionRotatePointSymbols->setEnabled( false );
 
+#if 0
         if ( vlayer->isEditable() && dprovider->capabilities() & QgsVectorDataProvider::ChangeGeometries )
         {
           mActionMoveVertex->setEnabled( true );
         }
+#endif
+
         if ( vlayer->isEditable() && dprovider->capabilities() & QgsVectorDataProvider::ChangeAttributeValues )
         {
           if ( QgsMapToolRotatePointSymbols::layerIsRotatable( vlayer ) )

Modified: trunk/qgis/src/app/qgisapp.h
===================================================================
--- trunk/qgis/src/app/qgisapp.h	2009-11-10 16:43:50 UTC (rev 12074)
+++ trunk/qgis/src/app/qgisapp.h	2009-11-10 17:46:24 UTC (rev 12075)
@@ -744,9 +744,11 @@
     QAction *mActionMoveFeature;
     QAction *mActionReshapeFeatures;
     QAction *mActionSplitFeatures;
+#if 0 // deprecated
     QAction *mActionAddVertex;
     QAction *mActionDeleteVertex;
     QAction *mActionMoveVertex;
+#endif
     QAction *mActionAddRing;
     QAction *mActionAddIsland;
     QAction *mActionEditSeparator2;
@@ -974,7 +976,7 @@
 
     /* Maptip object
      */
-    QgsMapTip *  mpMaptip;
+    QgsMapTip *mpMaptip;
 
     // Flag to indicate if maptips are on or off
     bool mMapTipsVisible;