Added cursor tips for composer maps and images.

StevenB · StevenB · commit f59b118c83c2 · 2008-05-15T13:15:09.000Z
git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@8442 c8812cc2-4d05-0410-92ff-de0c093fc19c
diff --git a/src/app/composer/qgscomposer.cpp b/src/app/composer/qgscomposer.cpp
@@ -24,6 +24,7 @@
 #include "qgsproject.h"
 #include "qgsmessageviewer.h"
 #include "qgscontexthelp.h"
+#include "qgscursors.h"
 
 #include <QDesktopWidget>
 #include <QFileDialog>
@@ -858,6 +859,7 @@ void QgsComposer::on_mActionAddNewMap_activated(void)
   mComposition->setTool ( QgsComposition::AddMap );
   setToolActionsOff();
   mActionAddNewMap->setOn ( true );
+  mView->setCursor(QCursor(cross_hair_cursor));
 }
 
 void QgsComposer::on_mActionAddNewVectLegend_activated(void)
@@ -886,6 +888,7 @@ void QgsComposer::on_mActionAddImage_activated(void)
   mComposition->setTool ( QgsComposition::AddPicture );
   setToolActionsOff();
   mActionAddImage->setOn ( true );
+  mView->setCursor(QCursor(cross_hair_cursor));
 }
 
 void QgsComposer::moveEvent ( QMoveEvent *e ) { saveWindowState(); }
diff --git a/src/app/composer/qgscomposition.cpp b/src/app/composer/qgscomposition.cpp
@@ -296,7 +296,6 @@ void QgsComposition::mousePressEvent(QMouseEvent* e)
         mRectangleItem->setBrush( Qt::NoBrush );
         mRectangleItem->setPen( QPen(QColor(0,0,0), 0) );
         mRectangleItem->setZValue(100);
-        //mRectangleItem->setActive(false);
         mRectangleItem->show();
         mToolStep = 1;
       }
@@ -496,6 +495,7 @@ void QgsComposition::mouseReleaseEvent(QMouseEvent* e)
           mToolStep = 0;
         }
         mCanvas->update();
+        mView->unsetCursor();
       }
       break;
 
@@ -525,6 +525,7 @@ void QgsComposition::mouseReleaseEvent(QMouseEvent* e)
         } else {
             mToolStep = 0;
         }
+        mView->unsetCursor();
       }
       break;
 

Original file line number	Diff line number	Diff line change
`@@ -296,7 +296,6 @@ void QgsComposition::mousePressEvent(QMouseEvent* e)`
`296`	`296`	`mRectangleItem->setBrush( Qt::NoBrush );`
`297`	`297`	`mRectangleItem->setPen( QPen(QColor(0,0,0), 0) );`
`298`	`298`	`mRectangleItem->setZValue(100);`
`299`		`- //mRectangleItem->setActive(false);`
`300`	`299`	`mRectangleItem->show();`
`301`	`300`	`mToolStep = 1;`
`302`	`301`	`}`
`@@ -496,6 +495,7 @@ void QgsComposition::mouseReleaseEvent(QMouseEvent* e)`
`496`	`495`	`mToolStep = 0;`
`497`	`496`	`}`
`498`	`497`	`mCanvas->update();`
	`498`	`+ mView->unsetCursor();`
`499`	`499`	`}`
`500`	`500`	`break;`
`501`	`501`
`@@ -525,6 +525,7 @@ void QgsComposition::mouseReleaseEvent(QMouseEvent* e)`
`525`	`525`	`} else {`
`526`	`526`	`mToolStep = 0;`
`527`	`527`	`}`
	`528`	`+ mView->unsetCursor();`
`528`	`529`	`}`
`529`	`530`	`break;`
`530`	`531`