qgis · Nov 7, 2017
diff --git a/‎python/core/layout/qgslayoutitem.sip
Lines changed: 6 additions & 0 deletions b/‎python/core/layout/qgslayoutitem.sip
Lines changed: 6 additions & 0 deletions
diff --git a/‎python/core/layout/qgslayoutobject.sip
Lines changed: 7 additions & 0 deletions b/‎python/core/layout/qgslayoutobject.sip
Lines changed: 7 additions & 0 deletions
diff --git a/‎python/gui/layout/qgslayoutitemwidget.sip
Lines changed: 37 additions & 0 deletions b/‎python/gui/layout/qgslayoutitemwidget.sip
Lines changed: 37 additions & 0 deletions
diff --git a/‎src/app/CMakeLists.txt
Lines changed: 2 additions & 0 deletions b/‎src/app/CMakeLists.txt
Lines changed: 2 additions & 0 deletions
diff --git a/‎src/app/layout/qgslayoutapputils.cpp
Lines changed: 7 additions & 1 deletion b/‎src/app/layout/qgslayoutapputils.cpp
Lines changed: 7 additions & 1 deletion
@@ -53,6 +53,12 @@ class QgsLayoutItem : QgsLayoutObject, QGraphicsRectItem, QgsLayoutUndoObjectInt
     enum UndoCommand
     {
       UndoIncrementalMove,
+      UndoStrokeColor,
+      UndoStrokeWidth,
+      UndoBackgroundColor,
+      UndoOpacity,
+      UndoSetId,
+      UndoRotation,
     };
 
     explicit QgsLayoutItem( QgsLayout *layout, bool manageZValue = true );
 
@@ -166,6 +166,13 @@ class QgsLayoutObject: QObject, QgsExpressionContextGenerator
  Refreshes the object, causing a recalculation of any property overrides.
 %End
 
+  signals:
+
+    void changed();
+%Docstring
+ Emitted when the object's properties change.
+%End
+
   protected:
 
     bool writeObjectPropertiesToElement( QDomElement &parentElement, QDomDocument &document, const QgsReadWriteContext &context ) const;
 
@@ -97,6 +97,43 @@ class QgsLayoutItemBaseWidget: QgsPanelWidget
 
 };
 
+
+class QgsLayoutItemPropertiesWidget: QWidget
+{
+%Docstring
+ A widget for controlling the common properties of layout items (e.g. position and size, background, stroke, frame).
+ This widget can be embedded into other layout item widgets.
+.. versionadded:: 3.0
+%End
+
+%TypeHeaderCode
+#include "qgslayoutitemwidget.h"
+%End
+  public:
+    QgsLayoutItemPropertiesWidget( QWidget *parent, QgsLayoutItem *item );
+
+    QgsLayoutItem::ReferencePoint positionMode() const;
+%Docstring
+ :rtype: QgsLayoutItem.ReferencePoint
+%End
+
+    void showBackgroundGroup( bool showGroup );
+
+    void showFrameGroup( bool showGroup );
+
+  protected slots:
+    void initializeDataDefinedButtons();
+%Docstring
+Initializes data defined buttons to current atlas coverage layer
+%End
+    void populateDataDefinedButtons();
+%Docstring
+Sets data defined button state to match item
+%End
+
+};
+
+
 /************************************************************************
  * This file has been generated automatically from                      *
  *                                                                      *
 
@@ -178,6 +178,7 @@ SET(QGIS_APP_SRCS
   layout/qgslayoutdesignerdialog.cpp
   layout/qgslayoutguidewidget.cpp
   layout/qgslayoutappmenuprovider.cpp
+  layout/qgslayoutmapwidget.cpp
   layout/qgslayoutpagepropertieswidget.cpp
   layout/qgslayoutpropertieswidget.cpp
 
@@ -373,6 +374,7 @@ SET (QGIS_APP_MOC_HDRS
   layout/qgslayoutappmenuprovider.h
   layout/qgslayoutdesignerdialog.h
   layout/qgslayoutguidewidget.h
+  layout/qgslayoutmapwidget.h
   layout/qgslayoutpagepropertieswidget.h
   layout/qgslayoutpropertieswidget.h
 
 
@@ -18,6 +18,8 @@
 #include "qgslayoutitemguiregistry.h"
 #include "qgslayoutitemregistry.h"
 #include "qgslayoutviewrubberband.h"
+#include "qgslayoutmapwidget.h"
+#include "qgslayoutitemmap.h"
 
 void QgsLayoutAppUtils::registerGuiForKnownItemTypes()
 {
@@ -40,7 +42,11 @@ void QgsLayoutAppUtils::registerGuiForKnownItemTypes()
 
   registry->addLayoutItemGuiMetadata( new QgsLayoutItemGuiMetadata( QgsLayoutItemRegistry::LayoutItem + 1002, QgsApplication::getThemeIcon( QStringLiteral( "/mActionAddLabel.svg" ) ), nullptr, createRubberBand ) );
 
-  registry->addLayoutItemGuiMetadata( new QgsLayoutItemGuiMetadata( QgsLayoutItemRegistry::LayoutMap, QgsApplication::getThemeIcon( QStringLiteral( "/mActionAddMap.svg" ) ), nullptr, createRubberBand ) );
+  registry->addLayoutItemGuiMetadata( new QgsLayoutItemGuiMetadata( QgsLayoutItemRegistry::LayoutMap, QgsApplication::getThemeIcon( QStringLiteral( "/mActionAddMap.svg" ) ),
+                                      [ = ]( QgsLayoutItem * item )->QgsLayoutItemBaseWidget *
+  {
+    return new QgsLayoutMapWidget( qobject_cast< QgsLayoutItemMap * >( item ) );
+  }, createRubberBand ) );
 
   registry->addLayoutItemGuiMetadata( new QgsLayoutItemGuiMetadata( QgsLayoutItemRegistry::LayoutRectangle, QgsApplication::getThemeIcon( QStringLiteral( "/mActionAddBasicRectangle.svg" ) ), nullptr, createRubberBand, QStringLiteral( "shapes" ) ) );
   registry->addLayoutItemGuiMetadata( new QgsLayoutItemGuiMetadata( QgsLayoutItemRegistry::LayoutEllipse, QgsApplication::getThemeIcon( QStringLiteral( "/mActionAddBasicCircle.svg" ) ), nullptr, createEllipseBand, QStringLiteral( "shapes" ) ) );