Add undo/redo commands when toggling lock through items panel

qgis · Oct 6, 2017 · 3e933dc · 3e933dc
1 parent afd9d23
commit 3e933dc
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 4 deletions.
diff --git a/src/core/layout/qgslayoutitem.cpp b/src/core/layout/qgslayoutitem.cpp
@@ -114,8 +114,14 @@ void QgsLayoutItem::setLocked( const bool locked )
     return;
   }
 
+  if ( mLayout && !mBlockUndoCommands )
+    mLayout->undoStack()->beginCommand( this, locked ? tr( "Item locked" ) : tr( "Item unlocked" ) );
+
   mIsLocked = locked;
 
+  if ( mLayout && !mBlockUndoCommands )
+    mLayout->undoStack()->endCommand();
+
   //inform model that id data has changed
   if ( mLayout )
   {
@@ -719,6 +725,7 @@ bool QgsLayoutItem::readPropertiesFromElement( const QDomElement &element, const
 {
   readObjectPropertiesFromElement( element, document, context );
 
+  mBlockUndoCommands = true;
   mUuid = element.attribute( QStringLiteral( "uuid" ), QUuid::createUuid().toString() );
   setId( element.attribute( QStringLiteral( "id" ) ) );
   mReferencePoint = static_cast< ReferencePoint >( element.attribute( QStringLiteral( "referencePoint" ) ).toInt() );
@@ -826,6 +833,7 @@ bool QgsLayoutItem::readPropertiesFromElement( const QDomElement &element, const
   mEvaluatedExcludeFromExports = mExcludeFromExports;
 #endif
 
+  mBlockUndoCommands = false;
   return true;
 }
 

diff --git a/src/core/layout/qgslayoutitem.h b/src/core/layout/qgslayoutitem.h
@@ -590,6 +590,8 @@ class CORE_EXPORT QgsLayoutItem : public QgsLayoutObject, public QGraphicsRectIt
     //! Background color
     QColor mBackgroundColor = QColor( 255, 255, 255 );
 
+    bool mBlockUndoCommands = false;
+
     void initConnectionsToLayout();
 
     //! Prepares a painter by setting rendering flags

diff --git a/src/gui/layout/qgslayoutview.cpp b/src/gui/layout/qgslayoutview.cpp
@@ -504,9 +504,7 @@ void QgsLayoutView::lockSelectedItems()
   const QList<QgsLayoutItem *> selectionList = currentLayout()->selectedLayoutItems();
   for ( QgsLayoutItem *item : selectionList )
   {
-    currentLayout()->undoStack()->beginCommand( item, QString() );
     item->setLocked( true );
-    currentLayout()->undoStack()->endCommand();
   }
 
   currentLayout()->deselectAll();
@@ -530,11 +528,9 @@ void QgsLayoutView::unlockAllItems()
     if ( item && item->isLocked() )
     {
       focusItem = item;
-      currentLayout()->undoStack()->beginCommand( item, QString() );
       item->setLocked( false );
       //select unlocked items, same behavior as illustrator
       item->setSelected( true );
-      currentLayout()->undoStack()->endCommand();
     }
   }
   currentLayout()->undoStack()->endMacro();