[QGIS Commit] r8442 - trunk/qgis/src/app/composer

[svn_qgis at osgeo.org]

Author: StevenB
Date: 2008-05-15 09:15:09 -0400 (Thu, 15 May 2008)
New Revision: 8442

Modified:
   trunk/qgis/src/app/composer/qgscomposer.cpp
   trunk/qgis/src/app/composer/qgscomposition.cpp
Log:
Added cursor tips for composer maps and images.


Modified: trunk/qgis/src/app/composer/qgscomposer.cpp
===================================================================
--- trunk/qgis/src/app/composer/qgscomposer.cpp	2008-05-15 12:46:36 UTC (rev 8441)
+++ trunk/qgis/src/app/composer/qgscomposer.cpp	2008-05-15 13:15:09 UTC (rev 8442)
@@ -24,6 +24,7 @@
 #include "qgsproject.h"
 #include "qgsmessageviewer.h"
 #include "qgscontexthelp.h"
+#include "qgscursors.h"
 
 #include <QDesktopWidget>
 #include <QFileDialog>
@@ -858,6 +859,7 @@
   mComposition->setTool ( QgsComposition::AddMap );
   setToolActionsOff();
   mActionAddNewMap->setOn ( true );
+  mView->setCursor(QCursor(cross_hair_cursor));
 }
 
 void QgsComposer::on_mActionAddNewVectLegend_activated(void)
@@ -886,6 +888,7 @@
   mComposition->setTool ( QgsComposition::AddPicture );
   setToolActionsOff();
   mActionAddImage->setOn ( true );
+  mView->setCursor(QCursor(cross_hair_cursor));
 }
 
 void QgsComposer::moveEvent ( QMoveEvent *e ) { saveWindowState(); }

Modified: trunk/qgis/src/app/composer/qgscomposition.cpp
===================================================================
--- trunk/qgis/src/app/composer/qgscomposition.cpp	2008-05-15 12:46:36 UTC (rev 8441)
+++ trunk/qgis/src/app/composer/qgscomposition.cpp	2008-05-15 13:15:09 UTC (rev 8442)
@@ -296,7 +296,6 @@
         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 @@
           mToolStep = 0;
         }
         mCanvas->update();
+        mView->unsetCursor();
       }
       break;
 
@@ -525,6 +525,7 @@
         } else {
             mToolStep = 0;
         }
+        mView->unsetCursor();
       }
       break;