Skip to content

Commit 070879c

Browse files
StevenBStevenB
StevenB
authored and
StevenB
committed
Added cursor tips for composer maps and images.
git-svn-id: http://svn.osgeo.org/qgis/trunk@8442 c8812cc2-4d05-0410-92ff-de0c093fc19c
1 parent b2cff74 commit 070879c

File tree

2 files changed

+5
-1
lines changed

2 files changed

+5
-1
lines changed

src/app/composer/qgscomposer.cpp

+3
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
#include "qgsproject.h"
2525
#include "qgsmessageviewer.h"
2626
#include "qgscontexthelp.h"
27+
#include "qgscursors.h"
2728

2829
#include <QDesktopWidget>
2930
#include <QFileDialog>
@@ -858,6 +859,7 @@ void QgsComposer::on_mActionAddNewMap_activated(void)
858859
mComposition->setTool ( QgsComposition::AddMap );
859860
setToolActionsOff();
860861
mActionAddNewMap->setOn ( true );
862+
mView->setCursor(QCursor(cross_hair_cursor));
861863
}
862864

863865
void QgsComposer::on_mActionAddNewVectLegend_activated(void)
@@ -886,6 +888,7 @@ void QgsComposer::on_mActionAddImage_activated(void)
886888
mComposition->setTool ( QgsComposition::AddPicture );
887889
setToolActionsOff();
888890
mActionAddImage->setOn ( true );
891+
mView->setCursor(QCursor(cross_hair_cursor));
889892
}
890893

891894
void QgsComposer::moveEvent ( QMoveEvent *e ) { saveWindowState(); }

src/app/composer/qgscomposition.cpp

+2-1
Original file line numberDiff line numberDiff line change
@@ -296,7 +296,6 @@ void QgsComposition::mousePressEvent(QMouseEvent* e)
296296
mRectangleItem->setBrush( Qt::NoBrush );
297297
mRectangleItem->setPen( QPen(QColor(0,0,0), 0) );
298298
mRectangleItem->setZValue(100);
299-
//mRectangleItem->setActive(false);
300299
mRectangleItem->show();
301300
mToolStep = 1;
302301
}
@@ -496,6 +495,7 @@ void QgsComposition::mouseReleaseEvent(QMouseEvent* e)
496495
mToolStep = 0;
497496
}
498497
mCanvas->update();
498+
mView->unsetCursor();
499499
}
500500
break;
501501

@@ -525,6 +525,7 @@ void QgsComposition::mouseReleaseEvent(QMouseEvent* e)
525525
} else {
526526
mToolStep = 0;
527527
}
528+
mView->unsetCursor();
528529
}
529530
break;
530531

0 commit comments

Comments
 (0)