Skip to content

Commit 490796c

Browse files
committed
#9094: implements user/dev advices
1 parent a7e9ac2 commit 490796c

15 files changed

+523
-11
lines changed

src/app/nodetool/qgsmaptoolnodetool.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -711,7 +711,7 @@ void QgsMapToolNodeTool::keyReleaseEvent( QKeyEvent* e )
711711
return;
712712
}
713713

714-
if ( mSelectedFeature && e->key() == Qt::Key_Backspace )
714+
if ( mSelectedFeature && ( e->key() == Qt::Key_Backspace || e->key() == Qt::Key_Delete ) )
715715
{
716716
mSelectedFeature->deleteSelectedVertexes();
717717
mCanvas->refresh();

src/app/qgisapp.cpp

+6-5
Original file line numberDiff line numberDiff line change
@@ -4859,6 +4859,10 @@ void QgisApp::deleteSelected( QgsMapLayer *layer, QWidget* parent, bool promptCo
48594859
tr( "A problem occured during deletion of features" ),
48604860
QgsMessageBar::WARNING );
48614861
}
4862+
else
4863+
{
4864+
showStatusMessage( tr( "%n feature(s) deleted.", "number of features deleted", numberOfDeletedFeatures ) );
4865+
}
48624866

48634867
vlayer->endEditCommand();
48644868
}
@@ -6505,6 +6509,8 @@ void QgisApp::removeLayer( bool promptConfirmation )
65056509

65066510
mMapLegend->removeSelectedLayers();
65076511

6512+
showStatusMessage( tr( "%n layer(s) removed.", "number of layers removed", numberOfRemovedLayers ) );
6513+
65086514
mMapCanvas->refresh();
65096515
}
65106516

@@ -9056,11 +9062,6 @@ void QgisApp::keyPressEvent( QKeyEvent * e )
90569062
{
90579063
stopRendering();
90589064
}
9059-
//remove selected layers
9060-
else if ( e->key() == Qt::Key_D )
9061-
{
9062-
removeLayer( true );
9063-
}
90649065
#if defined(Q_OS_WIN)&& defined(QGISDEBUG)
90659066
else if ( e->key() == Qt::Key_Backslash && e->modifiers() & Qt::ControlModifier )
90669067
{

src/app/qgisapp.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -686,7 +686,7 @@ class APP_EXPORT QgisApp : public QMainWindow, private Ui::MainWindow
686686
//! Slot to handle user center input;
687687
void userCenter();
688688
//! Remove a layer from the map and legend
689-
void removeLayer( bool promptConfirmation = false );
689+
void removeLayer( bool promptConfirmation = true );
690690
/** Duplicate map layer(s) in legend
691691
* @note added in 1.9 */
692692
void duplicateLayers( const QList<QgsMapLayer *> lyrList = QList<QgsMapLayer *>() );

src/app/qgsmaptoolselect.cpp

+9-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
* *
1414
***************************************************************************/
1515

16-
16+
#include "qgisapp.h"
1717
#include "qgsmaptoolselect.h"
1818
#include "qgsmaptoolselectutils.h"
1919
#include "qgsrubberband.h"
@@ -50,3 +50,11 @@ void QgsMapToolSelect::canvasReleaseEvent( QMouseEvent * e )
5050
delete selectGeom;
5151
rubberBand.reset( QGis::Polygon );
5252
}
53+
54+
void QgsMapToolSelect::keyPressEvent( QKeyEvent* e )
55+
{
56+
if ( e->key() == Qt::Key_Backspace || e->key() == Qt::Key_Delete )
57+
{
58+
QgisApp::instance()->deleteSelected( );
59+
}
60+
}

src/app/qgsmaptoolselect.h

+3
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,9 @@ class APP_EXPORT QgsMapToolSelect : public QgsMapTool
3030
//! Overridden mouse release event
3131
virtual void canvasReleaseEvent( QMouseEvent * e );
3232

33+
//! Overridden key press event
34+
virtual void keyPressEvent( QKeyEvent* e );
35+
3336
private:
3437
};
3538

src/app/qgsmaptoolselectfreehand.cpp

+9
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ email : jpalmer at linz dot govt dot nz
1313
* *
1414
***************************************************************************/
1515

16+
#include "qgisapp.h"
1617
#include "qgsmaptoolselectfreehand.h"
1718
#include "qgsmaptoolselectutils.h"
1819
#include "qgsgeometry.h"
@@ -77,3 +78,11 @@ void QgsMapToolSelectFreehand::canvasReleaseEvent( QMouseEvent * e )
7778
mRubberBand = 0;
7879
mDragging = false;
7980
}
81+
82+
void QgsMapToolSelectFreehand::keyPressEvent( QKeyEvent* e )
83+
{
84+
if ( e->key() == Qt::Key_Backspace || e->key() == Qt::Key_Delete )
85+
{
86+
QgisApp::instance()->deleteSelected( );
87+
}
88+
}

src/app/qgsmaptoolselectfreehand.h

+3
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,9 @@ class APP_EXPORT QgsMapToolSelectFreehand : public QgsMapTool
3939
//! Overridden mouse release event
4040
virtual void canvasReleaseEvent( QMouseEvent * e );
4141

42+
//! Overridden key press event
43+
virtual void keyPressEvent( QKeyEvent* e );
44+
4245
private:
4346

4447
//! used for storing all of the maps point for the freehand sketch

src/app/qgsmaptoolselectpolygon.cpp

+8
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ email : jpalmer at linz dot govt dot nz
1313
* *
1414
***************************************************************************/
1515

16+
#include "qgisapp.h"
1617
#include "qgsmaptoolselectpolygon.h"
1718
#include "qgsmaptoolselectutils.h"
1819
#include "qgsgeometry.h"
@@ -72,3 +73,10 @@ void QgsMapToolSelectPolygon::canvasMoveEvent( QMouseEvent * e )
7273
}
7374
}
7475

76+
void QgsMapToolSelectPolygon::keyPressEvent( QKeyEvent* e )
77+
{
78+
if ( e->key() == Qt::Key_Backspace || e->key() == Qt::Key_Delete )
79+
{
80+
QgisApp::instance()->deleteSelected( );
81+
}
82+
}

src/app/qgsmaptoolselectpolygon.h

+3
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,9 @@ class APP_EXPORT QgsMapToolSelectPolygon : public QgsMapTool
3636
//! Overridden mouse press event
3737
virtual void canvasPressEvent( QMouseEvent * e );
3838

39+
//! Overridden key press event
40+
virtual void keyPressEvent( QKeyEvent* e );
41+
3942
private:
4043

4144
//! used for storing all of the maps point for the polygon

src/app/qgsmaptoolselectradius.cpp

+9
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ email : jpalmer at linz dot govt dot nz
1313
* *
1414
***************************************************************************/
1515

16+
#include "qgisapp.h"
1617
#include "qgsmaptoolselectradius.h"
1718
#include "qgsmaptoolselectutils.h"
1819
#include "qgsgeometry.h"
@@ -109,3 +110,11 @@ void QgsMapToolSelectRadius::setRadiusRubberBand( QgsPoint & radiusEdge )
109110
mRubberBand->addPoint( radiusPoint );
110111
}
111112
}
113+
114+
void QgsMapToolSelectRadius::keyPressEvent( QKeyEvent* e )
115+
{
116+
if ( e->key() == Qt::Key_Backspace || e->key() == Qt::Key_Delete )
117+
{
118+
QgisApp::instance()->deleteSelected( );
119+
}
120+
}

src/app/qgsmaptoolselectradius.h

+3
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,9 @@ class APP_EXPORT QgsMapToolSelectRadius : public QgsMapTool
4141
//! Overridden mouse release event
4242
virtual void canvasReleaseEvent( QMouseEvent * e );
4343

44+
//! Overridden key press event
45+
virtual void keyPressEvent( QKeyEvent* e );
46+
4447
private:
4548

4649
//! sets the rubber band to a circle approximated using 40 segments.

src/app/qgsmaptoolselectrectangle.cpp

+9
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
* *
1515
***************************************************************************/
1616

17+
#include "qgisapp.h"
1718
#include "qgsmaptoolselectrectangle.h"
1819
#include "qgsmaptoolselectutils.h"
1920
#include "qgsrubberband.h"
@@ -111,3 +112,11 @@ void QgsMapToolSelectRectangle::canvasReleaseEvent( QMouseEvent *e )
111112

112113
mDragging = false;
113114
}
115+
116+
void QgsMapToolSelectRectangle::keyPressEvent( QKeyEvent* e )
117+
{
118+
if ( e->key() == Qt::Key_Backspace || e->key() == Qt::Key_Delete )
119+
{
120+
QgisApp::instance()->deleteSelected( );
121+
}
122+
}

src/app/qgsmaptoolselectrectangle.h

+3
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,9 @@ class APP_EXPORT QgsMapToolSelectRectangle : public QgsMapTool
4343
//! Overridden mouse release event
4444
virtual void canvasReleaseEvent( QMouseEvent * e );
4545

46+
//! Overridden key press event
47+
virtual void keyPressEvent( QKeyEvent* e );
48+
4649
private:
4750

4851
//! Flag to indicate a map canvas drag operation is taking place

0 commit comments

Comments
 (0)