sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-02-25 00:58:06 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:qgis/QGIS

Browse Source
This commit is contained in:
Paolo 2014-01-21 12:57:25 +01:00
commit 1cd307c9e1
1 changed files with 42 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/gui/qgscomposerview.cpp
View File

@ -75,13 +75,16 @@ void QgsComposerView::setCurrentTool( QgsComposerView::Tool t )
{
return;
}
if ( t == QgsComposerView::Pan )
switch ( t )
{
case QgsComposerView::Pan:
{
//lock cursor to prevent composer items changing it
composition()->setPreventCursorChange( true );
viewport()->setCursor( Qt::OpenHandCursor );
break;
}
else if ( t == QgsComposerView::Zoom )
case QgsComposerView::Zoom:
{
//lock cursor to prevent composer items changing it
composition()->setPreventCursorChange( true );
@ -89,13 +92,33 @@ void QgsComposerView::setCurrentTool( QgsComposerView::Tool t )
QPixmap myZoomQPixmap = QPixmap(( const char ** )( zoom_in ) );
QCursor zoomCursor = QCursor( myZoomQPixmap, 7, 7 );
viewport()->setCursor( zoomCursor );
break;
}
else
case QgsComposerView::AddArrow:
case QgsComposerView::AddHtml:
case QgsComposerView::AddMap:
case QgsComposerView::AddLegend:
case QgsComposerView::AddLabel:
case QgsComposerView::AddScalebar:
case QgsComposerView::AddPicture:
case QgsComposerView::AddRectangle:
case QgsComposerView::AddEllipse:
case QgsComposerView::AddTriangle:
case QgsComposerView::AddTable:
{
//using a drawing tool
//lock cursor to prevent composer items changing it
composition()->setPreventCursorChange( true );
viewport()->setCursor( Qt::CrossCursor );
break;
}
default:
{
//not using pan tool, composer items can change cursor
composition()->setPreventCursorChange( false );
viewport()->setCursor( Qt::ArrowCursor );
}
}
}
void QgsComposerView::mousePressEvent( QMouseEvent* e )