Fix missing space between 'Middle' and 'Right' click instructions, consistently use 'vertex' rather than 'point' while adding lines or boundaries. Fixes bug #3846.

Sandro Santilli · Sandro Santilli · commit 7c8ded108127 · 2011-05-26T18:38:29.000+02:00
diff --git a/src/plugins/grass/qgsgrassedit.cpp b/src/plugins/grass/qgsgrassedit.cpp
@@ -1912,11 +1912,11 @@ void QgsGrassEdit::setCanvasPrompt( QString left, QString mid, QString right )
   QgsDebugMsg( "entered." );
   mCanvasPrompt = "";
   if ( left.length() > 0 )
-    mCanvasPrompt.append( tr( "Left: %1   " ).arg( left ) );
+    mCanvasPrompt.append( tr( "Left: %1" ).arg( left ) );
   if ( mid.length() > 0 )
-    mCanvasPrompt.append( tr( "Middle: %1" ).arg( mid ) );
+    mCanvasPrompt.append( tr( " -- Middle: %1" ).arg( mid ) );
   if ( right.length() > 0 )
-    mCanvasPrompt.append( tr( "Right: %1" ).arg( right ) );
+    mCanvasPrompt.append( tr( " -- Right: %1" ).arg( right ) );
 }
 
 void QgsGrassEdit::attributesClosed()
diff --git a/src/plugins/grass/qgsgrassedittools.cpp b/src/plugins/grass/qgsgrassedittools.cpp
@@ -228,15 +228,15 @@ void QgsGrassEditNewLine::mouseClick( QgsPoint & point, Qt::MouseButton button )
 
   if ( e->mEditPoints->n_points == 0 )
   {
-    e->setCanvasPrompt( tr( "New point" ), "", "" );
+    e->setCanvasPrompt( tr( "New vertex" ), "", "" );
   }
   else if ( e->mEditPoints->n_points == 1 )
   {
-    e->setCanvasPrompt( tr( "New point" ), tr( "Undo last point" ), "" );
+    e->setCanvasPrompt( tr( "New vertex" ), tr( "Undo last vertex" ), "" );
   }
   else if ( e->mEditPoints->n_points > 1 )
   {
-    e->setCanvasPrompt( tr( "New point" ), tr( "Undo last point" ), tr( "Close line" ) );
+    e->setCanvasPrompt( tr( "New vertex" ), tr( "Undo last vertex" ), tr( "Close line" ) );
   }
 }
 

Original file line number	Diff line number	Diff line change
`@@ -228,15 +228,15 @@ void QgsGrassEditNewLine::mouseClick( QgsPoint & point, Qt::MouseButton button )`
`228`	`228`
`229`	`229`	`if ( e->mEditPoints->n_points == 0 )`
`230`	`230`	`{`
`231`		`- e->setCanvasPrompt( tr( "New point" ), "", "" );`
	`231`	`+ e->setCanvasPrompt( tr( "New vertex" ), "", "" );`
`232`	`232`	`}`
`233`	`233`	`else if ( e->mEditPoints->n_points == 1 )`
`234`	`234`	`{`
`235`		`- e->setCanvasPrompt( tr( "New point" ), tr( "Undo last point" ), "" );`
	`235`	`+ e->setCanvasPrompt( tr( "New vertex" ), tr( "Undo last vertex" ), "" );`
`236`	`236`	`}`
`237`	`237`	`else if ( e->mEditPoints->n_points > 1 )`
`238`	`238`	`{`
`239`		`- e->setCanvasPrompt( tr( "New point" ), tr( "Undo last point" ), tr( "Close line" ) );`
	`239`	`+ e->setCanvasPrompt( tr( "New vertex" ), tr( "Undo last vertex" ), tr( "Close line" ) );`
`240`	`240`	`}`
`241`	`241`	`}`
`242`	`242`