#9094: implements user/dev advices

qgis · Dec 17, 2013 · 490796c · 490796c
1 parent a7e9ac2
commit 490796c
Show file tree

Hide file tree

Showing 15 changed files with 523 additions and 11 deletions.
diff --git a/src/app/nodetool/qgsmaptoolnodetool.cpp b/src/app/nodetool/qgsmaptoolnodetool.cpp
@@ -711,7 +711,7 @@ void QgsMapToolNodeTool::keyReleaseEvent( QKeyEvent* e )
     return;
   }
 
-  if ( mSelectedFeature && e->key() == Qt::Key_Backspace )
+  if ( mSelectedFeature && ( e->key() == Qt::Key_Backspace || e->key() == Qt::Key_Delete ) )
   {
     mSelectedFeature->deleteSelectedVertexes();
     mCanvas->refresh();

diff --git a/src/app/qgisapp.cpp b/src/app/qgisapp.cpp
@@ -4859,6 +4859,10 @@ void QgisApp::deleteSelected( QgsMapLayer *layer, QWidget* parent, bool promptCo
                                tr( "A problem occured during deletion of features" ),
                                QgsMessageBar::WARNING );
   }
+  else
+  {
+    showStatusMessage( tr( "%n feature(s) deleted.", "number of features deleted", numberOfDeletedFeatures ) );
+  }
 
   vlayer->endEditCommand();
 }
@@ -6505,6 +6509,8 @@ void QgisApp::removeLayer( bool promptConfirmation )
 
   mMapLegend->removeSelectedLayers();
 
+  showStatusMessage( tr( "%n layer(s) removed.", "number of layers removed", numberOfRemovedLayers ) );
+
   mMapCanvas->refresh();
 }
 
@@ -9056,11 +9062,6 @@ void QgisApp::keyPressEvent( QKeyEvent * e )
   {
     stopRendering();
   }
-  //remove selected layers
-  else if ( e->key() == Qt::Key_D )
-  {
-    removeLayer( true );
-  }
 #if defined(Q_OS_WIN)&& defined(QGISDEBUG)
   else if ( e->key() == Qt::Key_Backslash && e->modifiers() & Qt::ControlModifier )
   {

diff --git a/src/app/qgisapp.h b/src/app/qgisapp.h
@@ -686,7 +686,7 @@ class APP_EXPORT QgisApp : public QMainWindow, private Ui::MainWindow
     //! Slot to handle user center input;
     void userCenter();
     //! Remove a layer from the map and legend
-    void removeLayer( bool promptConfirmation = false );
+    void removeLayer( bool promptConfirmation = true );
     /** Duplicate map layer(s) in legend
      * @note added in 1.9 */
     void duplicateLayers( const QList<QgsMapLayer *> lyrList = QList<QgsMapLayer *>() );

diff --git a/src/app/qgsmaptoolselect.cpp b/src/app/qgsmaptoolselect.cpp
@@ -13,7 +13,7 @@
  *                                                                         *
  ***************************************************************************/
 
-
+#include "qgisapp.h"
 #include "qgsmaptoolselect.h"
 #include "qgsmaptoolselectutils.h"
 #include "qgsrubberband.h"
@@ -50,3 +50,11 @@ void QgsMapToolSelect::canvasReleaseEvent( QMouseEvent * e )
   delete selectGeom;
   rubberBand.reset( QGis::Polygon );
 }
+
+void QgsMapToolSelect::keyPressEvent( QKeyEvent* e )
+{
+  if ( e->key() == Qt::Key_Backspace || e->key() == Qt::Key_Delete )
+  {
+    QgisApp::instance()->deleteSelected( );
+  }
+}
diff --git a/src/app/qgsmaptoolselect.h b/src/app/qgsmaptoolselect.h
@@ -30,6 +30,9 @@ class APP_EXPORT QgsMapToolSelect : public QgsMapTool
     //! Overridden mouse release event
     virtual void canvasReleaseEvent( QMouseEvent * e );
 
+    //! Overridden key press event
+    virtual void keyPressEvent( QKeyEvent* e );
+
   private:
 };
 

diff --git a/src/app/qgsmaptoolselectfreehand.cpp b/src/app/qgsmaptoolselectfreehand.cpp
@@ -13,6 +13,7 @@ email                : jpalmer at linz dot govt dot nz
 *                                                                         *
 ***************************************************************************/
 
+#include "qgisapp.h"
 #include "qgsmaptoolselectfreehand.h"
 #include "qgsmaptoolselectutils.h"
 #include "qgsgeometry.h"
@@ -77,3 +78,11 @@ void QgsMapToolSelectFreehand::canvasReleaseEvent( QMouseEvent * e )
   mRubberBand = 0;
   mDragging = false;
 }
+
+void QgsMapToolSelectFreehand::keyPressEvent( QKeyEvent* e )
+{
+  if ( e->key() == Qt::Key_Backspace || e->key() == Qt::Key_Delete )
+  {
+    QgisApp::instance()->deleteSelected( );
+  }
+}
diff --git a/src/app/qgsmaptoolselectfreehand.h b/src/app/qgsmaptoolselectfreehand.h
@@ -39,6 +39,9 @@ class APP_EXPORT QgsMapToolSelectFreehand : public QgsMapTool
     //! Overridden mouse release event
     virtual void canvasReleaseEvent( QMouseEvent * e );
 
+    //! Overridden key press event
+    virtual void keyPressEvent( QKeyEvent* e );
+
   private:
 
     //! used for storing all of the maps point for the freehand sketch

diff --git a/src/app/qgsmaptoolselectpolygon.cpp b/src/app/qgsmaptoolselectpolygon.cpp
@@ -13,6 +13,7 @@ email                : jpalmer at linz dot govt dot nz
 *                                                                         *
 ***************************************************************************/
 
+#include "qgisapp.h"
 #include "qgsmaptoolselectpolygon.h"
 #include "qgsmaptoolselectutils.h"
 #include "qgsgeometry.h"
@@ -72,3 +73,10 @@ void QgsMapToolSelectPolygon::canvasMoveEvent( QMouseEvent * e )
   }
 }
 
+void QgsMapToolSelectPolygon::keyPressEvent( QKeyEvent* e )
+{
+  if ( e->key() == Qt::Key_Backspace || e->key() == Qt::Key_Delete )
+  {
+    QgisApp::instance()->deleteSelected( );
+  }
+}
diff --git a/src/app/qgsmaptoolselectpolygon.h b/src/app/qgsmaptoolselectpolygon.h
@@ -36,6 +36,9 @@ class APP_EXPORT QgsMapToolSelectPolygon : public QgsMapTool
     //! Overridden mouse press event
     virtual void canvasPressEvent( QMouseEvent * e );
 
+    //! Overridden key press event
+    virtual void keyPressEvent( QKeyEvent* e );
+
   private:
 
     //! used for storing all of the maps point for the polygon

diff --git a/src/app/qgsmaptoolselectradius.cpp b/src/app/qgsmaptoolselectradius.cpp
@@ -13,6 +13,7 @@ email                : jpalmer at linz dot govt dot nz
 *                                                                         *
 ***************************************************************************/
 
+#include "qgisapp.h"
 #include "qgsmaptoolselectradius.h"
 #include "qgsmaptoolselectutils.h"
 #include "qgsgeometry.h"
@@ -109,3 +110,11 @@ void QgsMapToolSelectRadius::setRadiusRubberBand( QgsPoint & radiusEdge )
     mRubberBand->addPoint( radiusPoint );
   }
 }
+
+void QgsMapToolSelectRadius::keyPressEvent( QKeyEvent* e )
+{
+  if ( e->key() == Qt::Key_Backspace || e->key() == Qt::Key_Delete )
+  {
+    QgisApp::instance()->deleteSelected( );
+  }
+}
diff --git a/src/app/qgsmaptoolselectradius.h b/src/app/qgsmaptoolselectradius.h
@@ -41,6 +41,9 @@ class APP_EXPORT QgsMapToolSelectRadius : public QgsMapTool
     //! Overridden mouse release event
     virtual void canvasReleaseEvent( QMouseEvent * e );
 
+    //! Overridden key press event
+    virtual void keyPressEvent( QKeyEvent* e );
+
   private:
 
     //! sets the rubber band to a circle approximated using 40 segments.

diff --git a/src/app/qgsmaptoolselectrectangle.cpp b/src/app/qgsmaptoolselectrectangle.cpp
@@ -14,6 +14,7 @@
  *                                                                         *
  ***************************************************************************/
 
+#include "qgisapp.h"
 #include "qgsmaptoolselectrectangle.h"
 #include "qgsmaptoolselectutils.h"
 #include "qgsrubberband.h"
@@ -111,3 +112,11 @@ void QgsMapToolSelectRectangle::canvasReleaseEvent( QMouseEvent *e )
 
   mDragging = false;
 }
+
+void QgsMapToolSelectRectangle::keyPressEvent( QKeyEvent* e )
+{
+  if ( e->key() == Qt::Key_Backspace || e->key() == Qt::Key_Delete )
+  {
+    QgisApp::instance()->deleteSelected( );
+  }
+}
diff --git a/src/app/qgsmaptoolselectrectangle.h b/src/app/qgsmaptoolselectrectangle.h
@@ -43,6 +43,9 @@ class APP_EXPORT QgsMapToolSelectRectangle : public QgsMapTool
     //! Overridden mouse release event
     virtual void canvasReleaseEvent( QMouseEvent * e );
 
+    //! Overridden key press event
+    virtual void keyPressEvent( QKeyEvent* e );
+
   private:
 
     //! Flag to indicate a map canvas drag operation is taking place