more names for the map tools

3nids · 3nids · commit 0840a9d7ee7d · 2014-10-09T15:54:12.000+02:00
diff --git a/src/app/nodetool/qgsmaptoolnodetool.cpp b/src/app/nodetool/qgsmaptoolnodetool.cpp
@@ -40,6 +40,7 @@ QgsMapToolNodeTool::QgsMapToolNodeTool( QgsMapCanvas* canvas )
     , mIsPoint( false )
     , mDeselectOnRelease( -1 )
 {
+  mToolName =  tr( "Node tool" );
 }
 
 QgsMapToolNodeTool::~QgsMapToolNodeTool()
diff --git a/src/app/qgsmaptooladdfeature.cpp b/src/app/qgsmaptooladdfeature.cpp
@@ -30,15 +30,17 @@
 #include <QMouseEvent>
 #include <QSettings>
 
-QgsMapToolAddFeature::QgsMapToolAddFeature( QgsMapCanvas* canvas ): QgsMapToolCapture( canvas )
+QgsMapToolAddFeature::QgsMapToolAddFeature( QgsMapCanvas* canvas )
+    : QgsMapToolCapture( canvas )
 {
+  mToolName = tr( "Add feature" );
 }
 
 QgsMapToolAddFeature::~QgsMapToolAddFeature()
 {
 }
 
-bool QgsMapToolAddFeature::addFeature(QgsVectorLayer *vlayer, QgsFeature *f, bool showModal )
+bool QgsMapToolAddFeature::addFeature( QgsVectorLayer *vlayer, QgsFeature *f, bool showModal )
 {
   QgsFeatureAction action( tr( "add feature" ), *f, vlayer, -1, -1, this );
   return action.addFeature( QgsAttributeMap(), showModal );
diff --git a/src/app/qgsmaptooladdpart.cpp b/src/app/qgsmaptooladdpart.cpp
@@ -25,6 +25,7 @@
 QgsMapToolAddPart::QgsMapToolAddPart( QgsMapCanvas* canvas )
     : QgsMapToolCapture( canvas )
 {
+  mToolName = tr( "Add part" );
 }
 
 QgsMapToolAddPart::~QgsMapToolAddPart()
diff --git a/src/app/qgsmaptooladdring.cpp b/src/app/qgsmaptooladdring.cpp
@@ -22,8 +22,10 @@
 #include "qgsvectorlayer.h"
 
 
-QgsMapToolAddRing::QgsMapToolAddRing( QgsMapCanvas* canvas ): QgsMapToolCapture( canvas, QgsMapToolCapture::CapturePolygon )
+QgsMapToolAddRing::QgsMapToolAddRing( QgsMapCanvas* canvas )
+    : QgsMapToolCapture( canvas, QgsMapToolCapture::CapturePolygon )
 {
+  mToolName = tr( "Add ring" );
 }
 
 QgsMapToolAddRing::~QgsMapToolAddRing()
diff --git a/src/app/qgsmaptooldeletepart.cpp b/src/app/qgsmaptooldeletepart.cpp
@@ -24,8 +24,10 @@
 #include <QMouseEvent>
 
 QgsMapToolDeletePart::QgsMapToolDeletePart( QgsMapCanvas* canvas )
-    : QgsMapToolEdit( canvas ), mRubberBand( 0 )
+    : QgsMapToolEdit( canvas )
+    , mRubberBand( 0 )
 {
+  mToolName = tr( "Delete part" );
 }
 
 QgsMapToolDeletePart::~QgsMapToolDeletePart()
diff --git a/src/app/qgsmaptooldeletering.cpp b/src/app/qgsmaptooldeletering.cpp
@@ -23,7 +23,8 @@
 #include <limits>
 
 QgsMapToolDeleteRing::QgsMapToolDeleteRing( QgsMapCanvas* canvas )
-    : QgsMapToolVertexEdit( canvas ), mRubberBand( 0 )
+    : QgsMapToolVertexEdit( canvas )
+    , mRubberBand( 0 )
 {
   mToolName = tr( "Delete ring" );
 }
diff --git a/src/app/qgsmaptoolfillring.cpp b/src/app/qgsmaptoolfillring.cpp
@@ -25,9 +25,10 @@
 
 #include <limits>
 
-QgsMapToolFillRing::QgsMapToolFillRing( QgsMapCanvas* canvas ): QgsMapToolCapture( canvas, QgsMapToolCapture::CapturePolygon )
+QgsMapToolFillRing::QgsMapToolFillRing( QgsMapCanvas* canvas )
+    : QgsMapToolCapture( canvas, QgsMapToolCapture::CapturePolygon )
 {
-
+  mToolName = tr( "Fill ring" );
 }
 
 QgsMapToolFillRing::~QgsMapToolFillRing()
diff --git a/src/app/qgsmaptoolidentifyaction.cpp b/src/app/qgsmaptoolidentifyaction.cpp
@@ -46,6 +46,7 @@
 QgsMapToolIdentifyAction::QgsMapToolIdentifyAction( QgsMapCanvas * canvas )
     : QgsMapToolIdentify( canvas )
 {
+  mToolName = tr( "Identify" );
   // set cursor
   QPixmap myIdentifyQPixmap = QPixmap(( const char ** ) identify_cursor );
   mCursor = QCursor( myIdentifyQPixmap, 1, 1 );
diff --git a/src/app/qgsmaptoollabel.cpp b/src/app/qgsmaptoollabel.cpp
@@ -25,7 +25,11 @@
 #include "qgsdiagramrendererv2.h"
 #include <QMouseEvent>
 
-QgsMapToolLabel::QgsMapToolLabel( QgsMapCanvas* canvas ): QgsMapTool( canvas ), mLabelRubberBand( 0 ), mFeatureRubberBand( 0 ), mFixPointRubberBand( 0 )
+QgsMapToolLabel::QgsMapToolLabel( QgsMapCanvas* canvas )
+    : QgsMapTool( canvas )
+    , mLabelRubberBand( 0 )
+    , mFeatureRubberBand( 0 )
+    , mFixPointRubberBand( 0 )
     , mCurrentLayer( 0 )
 {
 }
diff --git a/src/app/qgsmaptoolmeasureangle.cpp b/src/app/qgsmaptoolmeasureangle.cpp
@@ -25,8 +25,12 @@
 #include <QSettings>
 #include <cmath>
 
-QgsMapToolMeasureAngle::QgsMapToolMeasureAngle( QgsMapCanvas* canvas ): QgsMapTool( canvas ), mRubberBand( 0 ), mResultDisplay( 0 )
+QgsMapToolMeasureAngle::QgsMapToolMeasureAngle( QgsMapCanvas* canvas )
+    : QgsMapTool( canvas )
+    , mRubberBand( 0 )
+    , mResultDisplay( 0 )
 {
+  mToolName = tr( "Measure angle" );
   mSnapper.setMapCanvas( canvas );
 
   connect( canvas, SIGNAL( destinationCrsChanged() ),
diff --git a/src/app/qgsmaptoolmovefeature.cpp b/src/app/qgsmaptoolmovefeature.cpp
@@ -24,9 +24,11 @@
 #include <QMouseEvent>
 #include <QSettings>
 #include <limits>
-QgsMapToolMoveFeature::QgsMapToolMoveFeature( QgsMapCanvas* canvas ): QgsMapToolEdit( canvas ), mRubberBand( 0 )
+QgsMapToolMoveFeature::QgsMapToolMoveFeature( QgsMapCanvas* canvas )
+    : QgsMapToolEdit( canvas )
+    , mRubberBand( 0 )
 {
-
+  mToolName = tr( "Move feature" );
 }
 
 QgsMapToolMoveFeature::~QgsMapToolMoveFeature()
diff --git a/src/app/qgsmaptoolmovelabel.cpp b/src/app/qgsmaptoolmovelabel.cpp
@@ -22,8 +22,10 @@
 #include "qgsvectorlayer.h"
 #include <QMouseEvent>
 
-QgsMapToolMoveLabel::QgsMapToolMoveLabel( QgsMapCanvas* canvas ): QgsMapToolLabel( canvas )
+QgsMapToolMoveLabel::QgsMapToolMoveLabel( QgsMapCanvas* canvas )
+    : QgsMapToolLabel( canvas )
 {
+  mToolName = tr( "Move label" );
 }
 
 QgsMapToolMoveLabel::~QgsMapToolMoveLabel()
diff --git a/src/app/qgsmaptoolpinlabels.cpp b/src/app/qgsmaptoolpinlabels.cpp
@@ -28,8 +28,10 @@
 #include <qgslogger.h>
 #include <QMouseEvent>
 
-QgsMapToolPinLabels::QgsMapToolPinLabels( QgsMapCanvas* canvas ): QgsMapToolLabel( canvas )
+QgsMapToolPinLabels::QgsMapToolPinLabels( QgsMapCanvas* canvas )
+    : QgsMapToolLabel( canvas )
 {
+  mToolName = tr( "Pin labels" );
   mRubberBand = 0;
   mShowPinned = false;
 
diff --git a/src/app/qgsmaptoolselect.cpp b/src/app/qgsmaptoolselect.cpp
@@ -31,6 +31,7 @@
 QgsMapToolSelect::QgsMapToolSelect( QgsMapCanvas* canvas )
     : QgsMapTool( canvas )
 {
+  mToolName = tr( "Select" );
   mCursor = Qt::ArrowCursor;
   mFillColor = QColor( 254, 178, 76, 63 );
   mBorderColour = QColor( 254, 58, 29, 100 );
diff --git a/src/app/qgsmaptoolselectrectangle.cpp b/src/app/qgsmaptoolselectrectangle.cpp
@@ -30,8 +30,10 @@
 
 
 QgsMapToolSelectFeatures::QgsMapToolSelectFeatures( QgsMapCanvas* canvas )
-    : QgsMapTool( canvas ), mDragging( false )
+    : QgsMapTool( canvas )
+    , mDragging( false )
 {
+  mToolName = tr( "Select features" );
   QPixmap mySelectQPixmap = QPixmap(( const char ** ) select_cursor );
   mCursor = QCursor( mySelectQPixmap, 1, 1 );
   mRubberBand = 0;
diff --git a/src/app/qgsmaptoolshowhidelabels.cpp b/src/app/qgsmaptoolshowhidelabels.cpp
@@ -27,8 +27,10 @@
 
 #include <QMouseEvent>
 
-QgsMapToolShowHideLabels::QgsMapToolShowHideLabels( QgsMapCanvas* canvas ): QgsMapToolLabel( canvas )
+QgsMapToolShowHideLabels::QgsMapToolShowHideLabels( QgsMapCanvas* canvas )
+    : QgsMapToolLabel( canvas )
 {
+  mToolName = tr( "Show/hide labels" );
   mRubberBand = 0;
 }
 
diff --git a/src/app/qgsmaptoolsplitfeatures.cpp b/src/app/qgsmaptoolsplitfeatures.cpp
@@ -22,9 +22,10 @@
 
 #include <QMouseEvent>
 
-QgsMapToolSplitFeatures::QgsMapToolSplitFeatures( QgsMapCanvas* canvas ): QgsMapToolCapture( canvas, QgsMapToolCapture::CaptureLine )
+QgsMapToolSplitFeatures::QgsMapToolSplitFeatures( QgsMapCanvas* canvas )
+    : QgsMapToolCapture( canvas, QgsMapToolCapture::CaptureLine )
 {
-
+  mToolName = tr( "Split features" );
 }
 
 QgsMapToolSplitFeatures::~QgsMapToolSplitFeatures()
diff --git a/src/app/qgsmaptoolsplitparts.cpp b/src/app/qgsmaptoolsplitparts.cpp
@@ -22,9 +22,10 @@
 
 #include <QMouseEvent>
 
-QgsMapToolSplitParts::QgsMapToolSplitParts( QgsMapCanvas* canvas ): QgsMapToolCapture( canvas, QgsMapToolCapture::CaptureLine )
+QgsMapToolSplitParts::QgsMapToolSplitParts( QgsMapCanvas* canvas )
+    : QgsMapToolCapture( canvas, QgsMapToolCapture::CaptureLine )
 {
-
+  mToolName = tr( "Split parts" );
 }
 
 QgsMapToolSplitParts::~QgsMapToolSplitParts()
diff --git a/src/app/qgsmaptoolvertexedit.cpp b/src/app/qgsmaptoolvertexedit.cpp
@@ -30,7 +30,8 @@
 #include <QSettings>
 #include <QPixmap>
 
-QgsMapToolVertexEdit::QgsMapToolVertexEdit( QgsMapCanvas* canvas ): QgsMapToolEdit( canvas )
+QgsMapToolVertexEdit::QgsMapToolVertexEdit( QgsMapCanvas* canvas )
+    : QgsMapToolEdit( canvas )
 {
 
 }
diff --git a/src/gui/qgsmaptoolidentifyfeature.cpp b/src/gui/qgsmaptoolidentifyfeature.cpp
@@ -24,6 +24,8 @@ QgsMapToolIdentifyFeature::QgsMapToolIdentifyFeature( QgsMapCanvas* canvas, QgsV
     , mCanvas( canvas )
     , mLayer( vl )
 {
+  mToolName = tr( "Identify feature" );
+
   // set cursor
   QPixmap cursorPixmap = QPixmap(( const char ** ) cross_hair_cursor );
   mCursor = QCursor( cursorPixmap, 1, 1 );
diff --git a/src/gui/qgsmaptoolpan.cpp b/src/gui/qgsmaptoolpan.cpp
@@ -23,8 +23,10 @@
 
 
 QgsMapToolPan::QgsMapToolPan( QgsMapCanvas* canvas )
-    : QgsMapTool( canvas ), mDragging( false )
+    : QgsMapTool( canvas )
+    , mDragging( false )
 {
+  mToolName = tr( "Pan" );
   // set cursor
   QBitmap panBmp = QBitmap::fromData( QSize( 16, 16 ), pan_bits );
   QBitmap panBmpMask = QBitmap::fromData( QSize( 16, 16 ), pan_mask_bits );
diff --git a/src/gui/qgsmaptoolzoom.cpp b/src/gui/qgsmaptoolzoom.cpp
@@ -28,8 +28,12 @@
 
 
 QgsMapToolZoom::QgsMapToolZoom( QgsMapCanvas* canvas, bool zoomOut )
-    : QgsMapTool( canvas ), mZoomOut( zoomOut ), mDragging( false ), mRubberBand( 0 )
+    : QgsMapTool( canvas )
+    , mZoomOut( zoomOut )
+    , mDragging( false )
+    , mRubberBand( 0 )
 {
+  mToolName = tr( "Zoom" );
   // set the cursor
   QPixmap myZoomQPixmap = QPixmap(( const char ** )( zoomOut ? zoom_out : zoom_in ) );
   mCursor = QCursor( myZoomQPixmap, 7, 7 );

Original file line number	Diff line number	Diff line change
`@@ -40,6 +40,7 @@ QgsMapToolNodeTool::QgsMapToolNodeTool( QgsMapCanvas* canvas )`
`40`	`40`	`, mIsPoint( false )`
`41`	`41`	`, mDeselectOnRelease( -1 )`
`42`	`42`	`{`
	`43`	`+ mToolName = tr( "Node tool" );`
`43`	`44`	`}`
`44`	`45`
`45`	`46`	`QgsMapToolNodeTool::~QgsMapToolNodeTool()`
Original file line number	Diff line number	Diff line change
`@@ -30,15 +30,17 @@`
`30`	`30`	`#include <QMouseEvent>`
`31`	`31`	`#include <QSettings>`
`32`	`32`
`33`		`-QgsMapToolAddFeature::QgsMapToolAddFeature( QgsMapCanvas* canvas ): QgsMapToolCapture( canvas )`
	`33`	`+QgsMapToolAddFeature::QgsMapToolAddFeature( QgsMapCanvas* canvas )`
	`34`	`+ : QgsMapToolCapture( canvas )`
`34`	`35`	`{`
	`36`	`+ mToolName = tr( "Add feature" );`
`35`	`37`	`}`
`36`	`38`
`37`	`39`	`QgsMapToolAddFeature::~QgsMapToolAddFeature()`
`38`	`40`	`{`
`39`	`41`	`}`
`40`	`42`
`41`		`-bool QgsMapToolAddFeature::addFeature(QgsVectorLayer vlayer, QgsFeature f, bool showModal )`
	`43`	`+bool QgsMapToolAddFeature::addFeature( QgsVectorLayer vlayer, QgsFeature f, bool showModal )`
`42`	`44`	`{`
`43`	`45`	`QgsFeatureAction action( tr( "add feature" ), *f, vlayer, -1, -1, this );`
`44`	`46`	`return action.addFeature( QgsAttributeMap(), showModal );`
Original file line number	Diff line number	Diff line change
`@@ -25,6 +25,7 @@`
`25`	`25`	`QgsMapToolAddPart::QgsMapToolAddPart( QgsMapCanvas* canvas )`
`26`	`26`	`: QgsMapToolCapture( canvas )`
`27`	`27`	`{`
	`28`	`+ mToolName = tr( "Add part" );`
`28`	`29`	`}`
`29`	`30`
`30`	`31`	`QgsMapToolAddPart::~QgsMapToolAddPart()`
Original file line number	Diff line number	Diff line change
`@@ -22,8 +22,10 @@`
`22`	`22`	`#include "qgsvectorlayer.h"`
`23`	`23`
`24`	`24`
`25`		`-QgsMapToolAddRing::QgsMapToolAddRing( QgsMapCanvas* canvas ): QgsMapToolCapture( canvas, QgsMapToolCapture::CapturePolygon )`
	`25`	`+QgsMapToolAddRing::QgsMapToolAddRing( QgsMapCanvas* canvas )`
	`26`	`+ : QgsMapToolCapture( canvas, QgsMapToolCapture::CapturePolygon )`
`26`	`27`	`{`
	`28`	`+ mToolName = tr( "Add ring" );`
`27`	`29`	`}`
`28`	`30`
`29`	`31`	`QgsMapToolAddRing::~QgsMapToolAddRing()`
Original file line number	Diff line number	Diff line change
`@@ -24,8 +24,10 @@`
`24`	`24`	`#include <QMouseEvent>`
`25`	`25`
`26`	`26`	`QgsMapToolDeletePart::QgsMapToolDeletePart( QgsMapCanvas* canvas )`
`27`		`- : QgsMapToolEdit( canvas ), mRubberBand( 0 )`
	`27`	`+ : QgsMapToolEdit( canvas )`
	`28`	`+ , mRubberBand( 0 )`
`28`	`29`	`{`
	`30`	`+ mToolName = tr( "Delete part" );`
`29`	`31`	`}`
`30`	`32`
`31`	`33`	`QgsMapToolDeletePart::~QgsMapToolDeletePart()`
Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,8 @@`
`23`	`23`	`#include <limits>`
`24`	`24`
`25`	`25`	`QgsMapToolDeleteRing::QgsMapToolDeleteRing( QgsMapCanvas* canvas )`
`26`		`- : QgsMapToolVertexEdit( canvas ), mRubberBand( 0 )`
	`26`	`+ : QgsMapToolVertexEdit( canvas )`
	`27`	`+ , mRubberBand( 0 )`
`27`	`28`	`{`
`28`	`29`	`mToolName = tr( "Delete ring" );`
`29`	`30`	`}`
Original file line number	Diff line number	Diff line change
`@@ -25,9 +25,10 @@`
`25`	`25`
`26`	`26`	`#include <limits>`
`27`	`27`
`28`		`-QgsMapToolFillRing::QgsMapToolFillRing( QgsMapCanvas* canvas ): QgsMapToolCapture( canvas, QgsMapToolCapture::CapturePolygon )`
	`28`	`+QgsMapToolFillRing::QgsMapToolFillRing( QgsMapCanvas* canvas )`
	`29`	`+ : QgsMapToolCapture( canvas, QgsMapToolCapture::CapturePolygon )`
`29`	`30`	`{`
`30`		`-`
	`31`	`+ mToolName = tr( "Fill ring" );`
`31`	`32`	`}`
`32`	`33`
`33`	`34`	`QgsMapToolFillRing::~QgsMapToolFillRing()`
Original file line number	Diff line number	Diff line change
`@@ -46,6 +46,7 @@`
`46`	`46`	`QgsMapToolIdentifyAction::QgsMapToolIdentifyAction( QgsMapCanvas * canvas )`
`47`	`47`	`: QgsMapToolIdentify( canvas )`
`48`	`48`	`{`
	`49`	`+ mToolName = tr( "Identify" );`
`49`	`50`	`// set cursor`
`50`	`51`	`QPixmap myIdentifyQPixmap = QPixmap(( const char ** ) identify_cursor );`
`51`	`52`	`mCursor = QCursor( myIdentifyQPixmap, 1, 1 );`
Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,11 @@`
`25`	`25`	`#include "qgsdiagramrendererv2.h"`
`26`	`26`	`#include <QMouseEvent>`
`27`	`27`
`28`		`-QgsMapToolLabel::QgsMapToolLabel( QgsMapCanvas* canvas ): QgsMapTool( canvas ), mLabelRubberBand( 0 ), mFeatureRubberBand( 0 ), mFixPointRubberBand( 0 )`
	`28`	`+QgsMapToolLabel::QgsMapToolLabel( QgsMapCanvas* canvas )`
	`29`	`+ : QgsMapTool( canvas )`
	`30`	`+ , mLabelRubberBand( 0 )`
	`31`	`+ , mFeatureRubberBand( 0 )`
	`32`	`+ , mFixPointRubberBand( 0 )`
`29`	`33`	`, mCurrentLayer( 0 )`
`30`	`34`	`{`
`31`	`35`	`}`
Original file line number	Diff line number	Diff line change
`@@ -24,9 +24,11 @@`
`24`	`24`	`#include <QMouseEvent>`
`25`	`25`	`#include <QSettings>`
`26`	`26`	`#include <limits>`
`27`		`-QgsMapToolMoveFeature::QgsMapToolMoveFeature( QgsMapCanvas* canvas ): QgsMapToolEdit( canvas ), mRubberBand( 0 )`
	`27`	`+QgsMapToolMoveFeature::QgsMapToolMoveFeature( QgsMapCanvas* canvas )`
	`28`	`+ : QgsMapToolEdit( canvas )`
	`29`	`+ , mRubberBand( 0 )`
`28`	`30`	`{`
`29`		`-`
	`31`	`+ mToolName = tr( "Move feature" );`
`30`	`32`	`}`
`31`	`33`
`32`	`34`	`QgsMapToolMoveFeature::~QgsMapToolMoveFeature()`