changes to annotations mark the project dirty (fixes #7586)

SebDieBln · SebDieBln · commit 30d7795ff35e · 2015-11-30T22:58:20.000+01:00
this includes adding, editing, moving, resizing and deleting
diff --git a/src/app/qgsmaptoolannotation.cpp b/src/app/qgsmaptoolannotation.cpp
@@ -26,6 +26,7 @@
 #include "qgstextannotationitem.h"
 #include "qgssvgannotationdialog.h"
 #include "qgssvgannotationitem.h"
+#include "qgsproject.h"
 #include <QDialog>
 #include <QMouseEvent>
 
@@ -141,6 +142,7 @@ void QgsMapToolAnnotation::keyPressEvent( QKeyEvent* e )
         mCanvas->scene()->removeItem( sItem );
         delete sItem;
         mCanvas->setCursor( neutralCursor );
+        QgsProject::instance()->setDirty( true ); // TODO QGIS3: Rework the whole annotation code to be MVC compliant, see PR #2506
 
         // Override default shortcut management in MapCanvas
         e->ignore();
@@ -158,6 +160,7 @@ void QgsMapToolAnnotation::canvasMoveEvent( QgsMapMouseEvent* e )
     {
       sItem->setMapPosition( toMapCoordinates( e->pos() ) );
       sItem->update();
+      QgsProject::instance()->setDirty( true );
     }
     else if ( mCurrentMoveAction == QgsAnnotationItem::MoveFramePosition )
     {
@@ -171,6 +174,7 @@ void QgsMapToolAnnotation::canvasMoveEvent( QgsMapMouseEvent* e )
         sItem->setMapPosition( toMapCoordinates( newCanvasPos.toPoint() ) );
       }
       sItem->update();
+      QgsProject::instance()->setDirty( true );
     }
     else if ( mCurrentMoveAction != QgsAnnotationItem::NoAction )
     {
@@ -220,6 +224,7 @@ void QgsMapToolAnnotation::canvasMoveEvent( QgsMapMouseEvent* e )
       sItem->setOffsetFromReferencePoint( QPointF( xmin, ymin ) );
       sItem->setFrameSize( QSizeF( xmax - xmin, ymax - ymin ) );
       sItem->update();
+      QgsProject::instance()->setDirty( true );
     }
   }
   else if ( sItem )
@@ -243,7 +248,8 @@ void QgsMapToolAnnotation::canvasDoubleClickEvent( QgsMapMouseEvent* e )
   QDialog* itemEditor = createItemEditor( item );
   if ( itemEditor )
   {
-    itemEditor->exec();
+    if ( itemEditor->exec() )
+      QgsProject::instance()->setDirty( true );
     delete itemEditor;
   }
 }
diff --git a/src/app/qgsmaptoolformannotation.cpp b/src/app/qgsmaptoolformannotation.cpp
@@ -19,6 +19,7 @@
 #include "qgsformannotationitem.h"
 #include "qgsmapcanvas.h"
 #include "qgsvectorlayer.h"
+#include "qgsproject.h"
 #include <QMouseEvent>
 
 QgsMapToolFormAnnotation::QgsMapToolFormAnnotation( QgsMapCanvas* canvas ): QgsMapToolAnnotation( canvas )
@@ -48,6 +49,7 @@ QgsAnnotationItem* QgsMapToolFormAnnotation::createItem( QMouseEvent* e )
   formItem->setMapPosition( toMapCoordinates( e->pos() ) );
   formItem->setSelected( true );
   formItem->setFrameSize( QSizeF( 200, 100 ) );
+  QgsProject::instance()->setDirty( true );
   return formItem;
 }
 
diff --git a/src/app/qgsmaptoolhtmlannotation.cpp b/src/app/qgsmaptoolhtmlannotation.cpp
@@ -19,6 +19,7 @@
 #include "qgshtmlannotationitem.h"
 #include "qgsmapcanvas.h"
 #include "qgsvectorlayer.h"
+#include "qgsproject.h"
 #include <QMouseEvent>
 
 QgsMapToolHtmlAnnotation::QgsMapToolHtmlAnnotation( QgsMapCanvas* canvas ): QgsMapToolAnnotation( canvas )
@@ -48,6 +49,7 @@ QgsAnnotationItem* QgsMapToolHtmlAnnotation::createItem( QMouseEvent* e )
   formItem->setMapPosition( toMapCoordinates( e->pos() ) );
   formItem->setSelected( true );
   formItem->setFrameSize( QSizeF( 200, 100 ) );
+  QgsProject::instance()->setDirty( true );
   return formItem;
 }
 
diff --git a/src/app/qgsmaptoolsvgannotation.cpp b/src/app/qgsmaptoolsvgannotation.cpp
@@ -17,6 +17,7 @@
 
 #include "qgsmaptoolsvgannotation.h"
 #include "qgssvgannotationitem.h"
+#include "qgsproject.h"
 #include <QMouseEvent>
 
 QgsMapToolSvgAnnotation::QgsMapToolSvgAnnotation( QgsMapCanvas* canvas ): QgsMapToolAnnotation( canvas )
@@ -35,5 +36,6 @@ QgsAnnotationItem* QgsMapToolSvgAnnotation::createItem( QMouseEvent* e )
   svgItem->setMapPosition( toMapCoordinates( e->pos() ) );
   svgItem->setSelected( true );
   svgItem->setFrameSize( QSizeF( 200, 100 ) );
+  QgsProject::instance()->setDirty( true );
   return svgItem;
 }
diff --git a/src/app/qgsmaptooltextannotation.cpp b/src/app/qgsmaptooltextannotation.cpp
@@ -17,6 +17,7 @@
 
 #include "qgsmaptooltextannotation.h"
 #include "qgstextannotationitem.h"
+#include "qgsproject.h"
 #include <QMouseEvent>
 
 QgsMapToolTextAnnotation::QgsMapToolTextAnnotation( QgsMapCanvas* canvas ): QgsMapToolAnnotation( canvas )
@@ -36,6 +37,7 @@ QgsAnnotationItem* QgsMapToolTextAnnotation::createItem( QMouseEvent* e )
   textItem->setMapPosition( toMapCoordinates( e->pos() ) );
   textItem->setFrameSize( QSizeF( 200, 100 ) );
   textItem->setSelected( true );
+  QgsProject::instance()->setDirty( true );
   return textItem;
 }
 

Original file line number	Diff line number	Diff line change
`@@ -26,6 +26,7 @@`
`26`	`26`	`#include "qgstextannotationitem.h"`
`27`	`27`	`#include "qgssvgannotationdialog.h"`
`28`	`28`	`#include "qgssvgannotationitem.h"`
	`29`	`+#include "qgsproject.h"`
`29`	`30`	`#include <QDialog>`
`30`	`31`	`#include <QMouseEvent>`
`31`	`32`
`@@ -141,6 +142,7 @@ void QgsMapToolAnnotation::keyPressEvent( QKeyEvent* e )`
`141`	`142`	`mCanvas->scene()->removeItem( sItem );`
`142`	`143`	`delete sItem;`
`143`	`144`	`mCanvas->setCursor( neutralCursor );`
	`145`	`+ QgsProject::instance()->setDirty( true ); // TODO QGIS3: Rework the whole annotation code to be MVC compliant, see PR #2506`
`144`	`146`
`145`	`147`	`// Override default shortcut management in MapCanvas`
`146`	`148`	`e->ignore();`
`@@ -158,6 +160,7 @@ void QgsMapToolAnnotation::canvasMoveEvent( QgsMapMouseEvent* e )`
`158`	`160`	`{`
`159`	`161`	`sItem->setMapPosition( toMapCoordinates( e->pos() ) );`
`160`	`162`	`sItem->update();`
	`163`	`+ QgsProject::instance()->setDirty( true );`
`161`	`164`	`}`
`162`	`165`	`else if ( mCurrentMoveAction == QgsAnnotationItem::MoveFramePosition )`
`163`	`166`	`{`
`@@ -171,6 +174,7 @@ void QgsMapToolAnnotation::canvasMoveEvent( QgsMapMouseEvent* e )`
`171`	`174`	`sItem->setMapPosition( toMapCoordinates( newCanvasPos.toPoint() ) );`
`172`	`175`	`}`
`173`	`176`	`sItem->update();`
	`177`	`+ QgsProject::instance()->setDirty( true );`
`174`	`178`	`}`
`175`	`179`	`else if ( mCurrentMoveAction != QgsAnnotationItem::NoAction )`
`176`	`180`	`{`
`@@ -220,6 +224,7 @@ void QgsMapToolAnnotation::canvasMoveEvent( QgsMapMouseEvent* e )`
`220`	`224`	`sItem->setOffsetFromReferencePoint( QPointF( xmin, ymin ) );`
`221`	`225`	`sItem->setFrameSize( QSizeF( xmax - xmin, ymax - ymin ) );`
`222`	`226`	`sItem->update();`
	`227`	`+ QgsProject::instance()->setDirty( true );`
`223`	`228`	`}`
`224`	`229`	`}`
`225`	`230`	`else if ( sItem )`
`@@ -243,7 +248,8 @@ void QgsMapToolAnnotation::canvasDoubleClickEvent( QgsMapMouseEvent* e )`
`243`	`248`	`QDialog* itemEditor = createItemEditor( item );`
`244`	`249`	`if ( itemEditor )`
`245`	`250`	`{`
`246`		`- itemEditor->exec();`
	`251`	`+ if ( itemEditor->exec() )`
	`252`	`+ QgsProject::instance()->setDirty( true );`
`247`	`253`	`delete itemEditor;`
`248`	`254`	`}`
`249`	`255`	`}`