Merge pull request #5921 from nirvn/layout_item_icon

nirvn · web-flow · commit 909a0fc21c95 · 2017-12-21T11:08:50.000+07:00
diff --git a/images/images.qrc b/images/images.qrc
@@ -321,6 +321,7 @@
         <file>themes/default/mActionSharingExport.svg</file>
         <file>themes/default/mActionSharingImport.svg</file>
         <file>themes/default/mActionShowAllLayers.svg</file>
+        <file>themes/default/mActionShowAllLayersGray.svg</file>
         <file>themes/default/mActionShowBookmarks.svg</file>
         <file>themes/default/mActionShowHideLabels.svg</file>
         <file>themes/default/mActionShowPinnedLabels.svg</file>
@@ -434,6 +435,19 @@
         <file>themes/default/mIconWms.svg</file>
         <file>themes/default/mIconZip.png</file>
         <file>themes/default/mIconZoom.svg</file>
+        <file>themes/default/mLayoutItem.svg</file>
+        <file>themes/default/mLayoutItemShapeEllipse.svg</file>
+        <file>themes/default/mLayoutItemShapeRectangle.svg</file>
+        <file>themes/default/mLayoutItemShapeTriangle.svg</file>
+        <file>themes/default/mLayoutItemHtml.svg</file>
+        <file>themes/default/mLayoutItemPicture.svg</file>
+        <file>themes/default/mLayoutItemLabel.svg</file>
+        <file>themes/default/mLayoutItemLegend.svg</file>
+        <file>themes/default/mLayoutItemMap.svg</file>
+        <file>themes/default/mLayoutItemPolygon.svg</file>
+        <file>themes/default/mLayoutItemPolyline.svg</file>
+        <file>themes/default/mLayoutItemScaleBar.svg</file>
+        <file>themes/default/mLayoutItemTable.svg</file>
         <file>themes/default/mMessageLog.svg</file>
         <file>themes/default/mMessageLogRead.svg</file>
         <file>themes/default/north_arrow.png</file>
diff --git a/images/themes/default/lockedGray.svg b/images/themes/default/lockedGray.svg
@@ -1,7 +1 @@
-<svg enable-background="new 0 0 24 24" height="16" viewBox="0 0 16 16" width="16" xmlns="http://www.w3.org/2000/svg">
-<g stroke-linecap="square" transform="translate(0 -16)">
-<path d="m4.4067695 22.865202c.118637-3.818452.9490726-5.54713 3.8198656-5.314294 2.8704699.232276 3.5159769 2.078983 3.3968089 5.897741" fill="none" stroke="#888a85" stroke-linejoin="round" stroke-width="3"/>
-<path d="m4.2757863 25l .1166762-2.134798c.118637-3.818452.9490726-5.591324 3.8198656-5.358488 2.8704699.232276 3.5159769 2.123177 3.3968089 5.941935l-.085506 1.551351" fill="none" stroke="#eeeeec" stroke-linejoin="round"/>
-<rect fill="#666" height="7" rx=".84615386" ry="1" stroke="#666" stroke-width=".99999994" width="11" x="2.5" y="24.5"/>
-</g>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" height="16" width="16"><path d="M4.407 7.888c.118-3.818.949-5.547 3.82-5.314 2.87.232 3.516 2.08 3.396 5.898" fill="none" stroke="#888a85" stroke-width="3" stroke-linecap="square" stroke-linejoin="round"/><path d="M4.276 10.023l.116-2.135c.12-3.818.95-5.59 3.82-5.358 2.87.232 3.516 2.123 3.397 5.942l-.085 1.551" fill="none" stroke="#eeeeec" stroke-linecap="square" stroke-linejoin="round"/><rect y="8.5" x="2.5" width="11" ry="1" rx=".846" height="7" fill="#666" stroke="#666" stroke-linecap="square"/></svg>
diff --git a/images/themes/default/mActionShowAllLayersGray.svg b/images/themes/default/mActionShowAllLayersGray.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="24" width="24"><radialGradient id="a" cx="16.5" cy="-12.5" gradientTransform="matrix(.71393 1.06416 -.69303 .45911 -10.292 4.616)" gradientUnits="userSpaceOnUse" r="7"><stop offset="0" stop-color="#fffff4"/><stop offset="1" stop-color="#a0a0a0"/></radialGradient><g transform="translate(0 -8)"><path d="M23.92 22.589s-1.891-.277-2.87-1.367c-.627-.697-3.68-3.947-5.455-4.65-2.963-1.173-5.321-1.134-7.57-.547-2.09.547-3.53 1.338-4.903 2.646-.64.608-1.518 2.273-1.506 2.551-.019.23 1.215 2.153 2.868 3.326 1.508 1.07 3.592 2.337 5.903 2.733 2.795.48 3.821.38 6.48-.47 1.4-.447 3.889-2.57 3.889-2.57s.52-.35 1.333-.953c.7-.52 1.832-.699 1.832-.699z" fill="#eeeeec" fill-rule="evenodd"/><path d="M10.704 15.637c-.788.029-1.067.046-1.907.208a14.32 14.32 0 0 0-1.26.314c-.829.986-1.232 2.303-1.232 3.587 0 3.025 2.468 5.477 5.512 5.477 3.043 0 5.51-2.452 5.511-5.477-.002-.803.042-1.575-.302-2.301-.524-.4-1.16-.754-1.584-.918-1.87-.722-3.335-.942-4.738-.89z" fill="url(#a)" stroke="#424242" stroke-linecap="round" stroke-linejoin="round"/><ellipse cx="11.817" cy="19.659" rx="2.226" ry="2.212"/><path d="M1.143 15.424c5.006-1.495 8.554-2.062 10.993-2.286 5.222-.479 7.062.4 8.403 1.389 1.448 1.067 1.763 1.76 1.763 1.76" fill="none" stroke="#888a85"/><path d="M23.92 22.589s-1.891-.277-2.87-1.367c-.627-.697-3.68-3.947-5.455-4.65-2.963-1.173-5.321-1.134-7.57-.547-2.09.547-3.53 1.338-4.903 2.646-.64.608-1.518 2.273-1.506 2.551-.019.23 1.215 2.153 2.868 3.326 1.508 1.07 3.592 2.337 5.903 2.733 2.795.48 3.821.38 6.48-.47 1.4-.447 3.889-2.57 3.889-2.57s.52-.35 1.333-.953c.7-.52 1.832-.699 1.832-.699z" fill="none" stroke="#888a85"/><ellipse cx="11.17" cy="18.742" fill="#eeeeec" rx=".891" ry=".885"/></g></svg>
diff --git a/images/themes/default/mLayoutItem.svg b/images/themes/default/mLayoutItem.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="16" width="16"><path d="M2.5 2.5h11v11h-11z" fill="#f0f0f0" stroke="#9a9a9a"/></svg>
diff --git a/images/themes/default/mLayoutItemHtml.svg b/images/themes/default/mLayoutItemHtml.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="16" width="16"><path d="M1.5 1.5h13v13h-13z" fill="#f0f0f0" stroke="#9a9a9a"/><path d="M3 12h9M3 9h7M3 6h10" fill="#b3b3b3" stroke="#b3b3b3" stroke-width="2"/><path d="M5.955 3.52L3.5 6l2.455 2.48m4.09 0L12.5 6l-2.455-2.48M7.182 8.48l1.636-4.96" fill="none" stroke="#f0f0f0" stroke-width="3" stroke-linecap="round" stroke-linejoin="round"/><path d="M5.955 3.52L3.5 6l2.455 2.48m4.09 0L12.5 6l-2.455-2.48M7.182 8.48l1.636-4.96" fill="none" stroke="#424242" stroke-linecap="round" stroke-linejoin="round"/></svg>
diff --git a/images/themes/default/mLayoutItemLabel.svg b/images/themes/default/mLayoutItemLabel.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="16" width="16"><path d="M1.5 2.5h13v11h-13z" fill="#f0f0f0" stroke="#9a9a9a"/><path d="M8 11.5v-7M10.5 6V4.5h-5V6M7 11.5h2" fill="none" stroke="#424242"/></svg>
diff --git a/images/themes/default/mLayoutItemLegend.svg b/images/themes/default/mLayoutItemLegend.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="16" width="16"><path d="M1.5 1.5h3v3h-3zM1.5 6.5h3v3h-3zM1.5 11.5h3v3h-3z" fill="#b3b3b3" stroke="#424242"/><path d="M6 13h4M6 8h9M6 3h6" fill="#b3b3b3" stroke="#b3b3b3" stroke-width="2"/></svg>
diff --git a/images/themes/default/mLayoutItemMap.svg b/images/themes/default/mLayoutItemMap.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="16" width="16"><linearGradient id="a" gradientUnits="userSpaceOnUse" x1="3.5" x2="11.5" y1="19.5" y2="19.5" gradientTransform="translate(0 -8)"><stop offset="0" stop-color="#b7b7b7"/><stop offset="1" stop-color="#e6e6e6"/></linearGradient><path d="M14.5 13.5H2.658c-.58 0-1.145-.824-1.158-1.45V2.5h13z" fill="url(#a)" fill-rule="evenodd" stroke="#9a9a9a"/><path d="M3.816 2.185c-.58-.58-1.737-.58-2.316 0v8.897c.579-.58 1.737-.58 2.316 0z" fill="#e6e6e6" fill-rule="evenodd" stroke="#9a9a9a"/></svg>
diff --git a/images/themes/default/mLayoutItemPicture.svg b/images/themes/default/mLayoutItemPicture.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="16" width="16"><path d="M1.5 3.5h13v9h-13z" fill="#424242" stroke="#9a9a9a"/><path d="M2 8l3.263-2.077L14 9.385v2.769H2z" fill="#f0f0f0" fill-rule="evenodd"/></svg>
diff --git a/images/themes/default/mLayoutItemPolygon.svg b/images/themes/default/mLayoutItemPolygon.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="16" width="16"><ellipse cy="2.975" cx="2.974" rx="1.522" ry="1.523" fill="#b3b3b3" stroke="#424242" stroke-width=".295" stroke-linejoin="round" stroke-miterlimit=".4"/><ellipse cy="2.67" cx="12.409" rx="1.522" ry="1.523" fill="#b3b3b3" stroke="#424242" stroke-width=".295" stroke-linejoin="round" stroke-miterlimit=".4"/><ellipse cy="10.589" cx="2.669" rx="1.522" ry="1.523" fill="#b3b3b3" stroke="#424242" stroke-width=".295" stroke-linejoin="round" stroke-miterlimit=".4"/><ellipse cy="13.33" cx="7.235" rx="1.522" ry="1.523" fill="#b3b3b3" stroke="#424242" stroke-width=".295" stroke-linejoin="round" stroke-miterlimit=".4"/><path d="M2.73 9.067l.183-4.57m1.582-1.571l6.393-.207m.856 1.321L7.9 11.96m-1.97.586l-1.956-1.174" fill="#b3b3b3" stroke="#424242"/></svg>
diff --git a/images/themes/default/mLayoutItemPolyline.svg b/images/themes/default/mLayoutItemPolyline.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="16" width="16"><ellipse cy="7.976" cx="2.642" rx="1.494" ry="1.495" fill="#b3b3b3" stroke="#424242" stroke-width=".295" stroke-linejoin="round" stroke-miterlimit=".4"/><path d="M3.962 4.012l-.848 2.545" fill="none" stroke="#424242"/><ellipse cy="2.642" cx="4.435" rx="1.494" ry="1.495" fill="#b3b3b3" stroke="#424242" stroke-width=".295" stroke-linejoin="round" stroke-miterlimit=".4"/><ellipse cy="3.24" cx="12.804" rx="1.494" ry="1.495" fill="#b3b3b3" stroke="#424242" stroke-width=".295" stroke-linejoin="round" stroke-miterlimit=".4"/><ellipse cy="13.358" cx="6.228" rx="1.494" ry="1.495" fill="#b3b3b3" stroke="#424242" stroke-width=".295" stroke-linejoin="round" stroke-miterlimit=".4"/><path d="M5.926 2.7l5.387.385M3.47 9.22l1.93 2.894" fill="none" stroke="#424242"/></svg>
diff --git a/images/themes/default/mLayoutItemScaleBar.svg b/images/themes/default/mLayoutItemScaleBar.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="16" width="16"><path d="M6 6h4v4H6z" fill="#fff"/><path d="M2 6h4v4H2z" fill="#424242"/><path d="M11 7h2v2h-2z" fill="#424242" stroke="#424242" stroke-width="2"/><path d="M1.5 6.5h13v3h-13z" fill="none" stroke="#9a9a9a"/></svg>
diff --git a/images/themes/default/mLayoutItemShapeEllipse.svg b/images/themes/default/mLayoutItemShapeEllipse.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="16" width="16"><circle cy="8" cx="8" r="5.5" fill="#f0f0f0" stroke="#9a9a9a" stroke-linejoin="round" stroke-miterlimit=".4"/></svg>
diff --git a/images/themes/default/mLayoutItemShapeRectangle.svg b/images/themes/default/mLayoutItemShapeRectangle.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="16" width="16"><path d="M2.5 2.5h11v11h-11z" fill="#f0f0f0" stroke="#9a9a9a"/></svg>
diff --git a/images/themes/default/mLayoutItemShapeTriangle.svg b/images/themes/default/mLayoutItemShapeTriangle.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="16" width="16"><path d="M2.5 13.5L8 2.5l5.5 11z" fill="#f0f0f0" fill-rule="evenodd" stroke="#9a9a9a" stroke-linejoin="round" stroke-miterlimit=".4"/></svg>
diff --git a/images/themes/default/mLayoutItemTable.svg b/images/themes/default/mLayoutItemTable.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="16" width="16"><path d="M1.5 1.5h13v13h-13z" fill="#e6e6e6" stroke="#9a9a9a"/><path d="M1.5 1.5h13v5h-13z" fill="#b3b3b3" stroke="#9a9a9a"/><path overflow="visible" d="M3 4h4" fill="none" stroke="#424242" stroke-width="2"/><path d="M8 4h5" fill="none" stroke="#424242" stroke-width="2"/><path overflow="visible" d="M3 8.5h4" fill="none" stroke="#b3b3b3"/><path d="M8 8.5h5" fill="none" stroke="#b3b3b3"/><path overflow="visible" d="M3 12.5h4" fill="none" stroke="#b3b3b3"/><path d="M8 12.5h5" fill="none" stroke="#b3b3b3"/><path overflow="visible" d="M3 10.5h4" fill="none" stroke="#b3b3b3"/><path d="M8 10.5h5" fill="none" stroke="#b3b3b3"/></svg>
diff --git a/python/core/layout/qgslayoutframe.sip b/python/core/layout/qgslayoutframe.sip
@@ -35,6 +35,8 @@ Creates a new QgsLayoutFrame belonging to the specified ``layout``.
 
     virtual int type() const;
 
+    virtual QIcon icon() const;
+
     virtual QString uuid() const;
 
 
diff --git a/python/core/layout/qgslayoutitem.sip b/python/core/layout/qgslayoutitem.sip
@@ -262,9 +262,14 @@ tasks.
     virtual int type() const;
 
 %Docstring
-Return unique graphics item type identifier.
+Returns a unique graphics item type identifier.
 
 Plugin based subclasses should return an identifier greater than QgsLayoutItemRegistry.PluginItem.
+%End
+
+    virtual QIcon icon() const;
+%Docstring
+Returns the item's icon.
 %End
 
     virtual QString uuid() const;
diff --git a/python/core/layout/qgslayoutitemattributetable.sip b/python/core/layout/qgslayoutitemattributetable.sip
@@ -39,6 +39,8 @@ Ownership is transferred to the layout.
 
     virtual int type() const;
 
+    virtual QIcon icon() const;
+
     virtual QString displayName() const;
 
 
diff --git a/python/core/layout/qgslayoutitemhtml.sip b/python/core/layout/qgslayoutitemhtml.sip
@@ -39,6 +39,8 @@ Ownership is transferred to the layout.
 
     virtual int type() const;
 
+    virtual QIcon icon() const;
+
 
     static QgsLayoutItemHtml *create( QgsLayout *layout ) /Factory/;
 %Docstring
diff --git a/python/core/layout/qgslayoutitemlabel.sip b/python/core/layout/qgslayoutitemlabel.sip
@@ -42,6 +42,8 @@ The caller takes responsibility for deleting the returned object.
 
     virtual int type() const;
 
+    virtual QIcon icon() const;
+
     virtual QString displayName() const;
 
 
diff --git a/python/core/layout/qgslayoutitemlegend.sip b/python/core/layout/qgslayoutitemlegend.sip
@@ -65,6 +65,8 @@ The caller takes responsibility for deleting the returned object.
 
     virtual int type() const;
 
+    virtual QIcon icon() const;
+
     virtual QString displayName() const;
 
 
diff --git a/python/core/layout/qgslayoutitemmap.sip b/python/core/layout/qgslayoutitemmap.sip
@@ -39,6 +39,8 @@ Constructor for QgsLayoutItemMap, with the specified parent ``layout``.
 
     virtual int type() const;
 
+    virtual QIcon icon() const;
+
 
     void assignFreeId();
 %Docstring
diff --git a/python/core/layout/qgslayoutitempicture.sip b/python/core/layout/qgslayoutitempicture.sip
@@ -51,6 +51,8 @@ Constructor for QgsLayoutItemPicture, with the specified parent ``layout``.
 
     virtual int type() const;
 
+    virtual QIcon icon() const;
+
 
     static QgsLayoutItemPicture *create( QgsLayout *layout ) /Factory/;
 %Docstring
diff --git a/python/core/layout/qgslayoutitempolygon.sip b/python/core/layout/qgslayoutitempolygon.sip
@@ -43,6 +43,8 @@ The caller takes responsibility for deleting the returned object.
 
     virtual int type() const;
 
+    virtual QIcon icon() const;
+
     virtual QString displayName() const;
 
 
diff --git a/python/core/layout/qgslayoutitempolyline.sip b/python/core/layout/qgslayoutitempolyline.sip
@@ -49,6 +49,8 @@ The caller takes responsibility for deleting the returned object.
 
     virtual int type() const;
 
+    virtual QIcon icon() const;
+
     virtual QString displayName() const;
 
 
diff --git a/python/core/layout/qgslayoutitemscalebar.sip b/python/core/layout/qgslayoutitemscalebar.sip
@@ -28,6 +28,8 @@ Constructor for QgsLayoutItemScaleBar, with the specified parent ``layout``.
 
     virtual int type() const;
 
+    virtual QIcon icon() const;
+
 
     static QgsLayoutItemScaleBar *create( QgsLayout *layout ) /Factory/;
 %Docstring
diff --git a/python/core/layout/qgslayoutitemshape.sip b/python/core/layout/qgslayoutitemshape.sip
@@ -36,6 +36,8 @@ Constructor for QgsLayoutItemShape, with the specified parent ``layout``.
 
     virtual int type() const;
 
+    virtual QIcon icon() const;
+
 
     virtual QString displayName() const;
 
diff --git a/python/core/layout/qgslayoutmultiframe.sip b/python/core/layout/qgslayoutmultiframe.sip
@@ -73,6 +73,11 @@ Returns the total size of the multiframe's content, in layout units.
     virtual int type() const = 0;
 %Docstring
 Returns unique multiframe type id.
+%End
+
+    virtual QIcon icon() const;
+%Docstring
+Returns the item's icon.
 %End
 
     virtual QSizeF fixedFrameSize( const int frameIndex = -1 ) const;
diff --git a/src/core/layout/qgslayoutframe.cpp b/src/core/layout/qgslayoutframe.cpp
@@ -110,6 +110,14 @@ int QgsLayoutFrame::type() const
   return QgsLayoutItemRegistry::LayoutFrame;
 }
 
+QIcon QgsLayoutFrame::icon() const
+{
+  if ( mMultiFrame )
+    return mMultiFrame->icon();
+  else
+    return QIcon();
+}
+
 QString QgsLayoutFrame::uuid() const
 {
   if ( mMultiFrame )
diff --git a/src/core/layout/qgslayoutframe.h b/src/core/layout/qgslayoutframe.h
@@ -46,6 +46,7 @@ class CORE_EXPORT QgsLayoutFrame: public QgsLayoutItem
     static QgsLayoutFrame *create( QgsLayout *layout ) SIP_FACTORY;
 
     int type() const override;
+    QIcon icon() const override;
     QString uuid() const override;
 
     //Overridden to allow multiframe to set display name
diff --git a/src/core/layout/qgslayoutitem.h b/src/core/layout/qgslayoutitem.h
@@ -25,6 +25,7 @@
 #include "qgslayoutundocommand.h"
 #include "qgslayoutmeasurement.h"
 #include <QGraphicsRectItem>
+#include <QIcon>
 #include <QPainter>
 
 class QgsLayout;
@@ -292,12 +293,17 @@ class CORE_EXPORT QgsLayoutItem : public QgsLayoutObject, public QGraphicsRectIt
     virtual void cleanup();
 
     /**
-     * Return unique graphics item type identifier.
+     * Returns a unique graphics item type identifier.
      *
      * Plugin based subclasses should return an identifier greater than QgsLayoutItemRegistry::PluginItem.
      */
     int type() const override;
 
+    /**
+     * Returns the item's icon.
+     */
+    virtual QIcon icon() const { return QgsApplication::getThemeIcon( QStringLiteral( "/mLayoutItem.svg" ) ); }
+
     /**
      * Returns the item identification string. This is a unique random string set for the item
      * upon creation.
diff --git a/src/core/layout/qgslayoutitemattributetable.cpp b/src/core/layout/qgslayoutitemattributetable.cpp
@@ -95,6 +95,11 @@ int QgsLayoutItemAttributeTable::type() const
   return QgsLayoutItemRegistry::LayoutAttributeTable;
 }
 
+QIcon QgsLayoutItemAttributeTable::icon() const
+{
+  return QgsApplication::getThemeIcon( QStringLiteral( "/mLayoutItemTable.svg" ) );
+}
+
 QgsLayoutItemAttributeTable *QgsLayoutItemAttributeTable::create( QgsLayout *layout )
 {
   return new QgsLayoutItemAttributeTable( layout );
diff --git a/src/core/layout/qgslayoutitemattributetable.h b/src/core/layout/qgslayoutitemattributetable.h
@@ -56,6 +56,7 @@ class CORE_EXPORT QgsLayoutItemAttributeTable: public QgsLayoutTable
     QgsLayoutItemAttributeTable( QgsLayout *layout SIP_TRANSFERTHIS );
 
     int type() const override;
+    QIcon icon() const override;
     QString displayName() const override;
 
     /**
diff --git a/src/core/layout/qgslayoutitemhtml.cpp b/src/core/layout/qgslayoutitemhtml.cpp
@@ -81,6 +81,11 @@ int QgsLayoutItemHtml::type() const
   return QgsLayoutItemRegistry::LayoutHtml;
 }
 
+QIcon QgsLayoutItemHtml::icon() const
+{
+  return QgsApplication::getThemeIcon( QStringLiteral( "/mLayoutItemHtml.svg" ) );
+}
+
 QgsLayoutItemHtml *QgsLayoutItemHtml::create( QgsLayout *layout )
 {
   return new QgsLayoutItemHtml( layout );
diff --git a/src/core/layout/qgslayoutitemhtml.h b/src/core/layout/qgslayoutitemhtml.h
@@ -56,6 +56,7 @@ class CORE_EXPORT QgsLayoutItemHtml: public QgsLayoutMultiFrame
     ~QgsLayoutItemHtml() override;
 
     int type() const override;
+    QIcon icon() const override;
 
     /**
      * Returns a new QgsLayoutItemHtml for the specified parent \a layout.
diff --git a/src/core/layout/qgslayoutitemlabel.cpp b/src/core/layout/qgslayoutitemlabel.cpp
@@ -102,6 +102,11 @@ int QgsLayoutItemLabel::type() const
   return QgsLayoutItemRegistry::LayoutLabel;
 }
 
+QIcon QgsLayoutItemLabel::icon() const
+{
+  return QgsApplication::getThemeIcon( QStringLiteral( "/mLayoutItemLabel.svg" ) );
+}
+
 void QgsLayoutItemLabel::draw( QgsRenderContext &context, const QStyleOptionGraphicsItem * )
 {
   QPainter *painter = context.painter();
diff --git a/src/core/layout/qgslayoutitemlabel.h b/src/core/layout/qgslayoutitemlabel.h
@@ -57,6 +57,7 @@ class CORE_EXPORT QgsLayoutItemLabel: public QgsLayoutItem
     static QgsLayoutItemLabel *create( QgsLayout *layout ) SIP_FACTORY;
 
     int type() const override;
+    QIcon icon() const override;
     //Overridden to contain part of label's text
     QString displayName() const override;
 
diff --git a/src/core/layout/qgslayoutitemlegend.cpp b/src/core/layout/qgslayoutitemlegend.cpp
@@ -58,6 +58,11 @@ int QgsLayoutItemLegend::type() const
   return QgsLayoutItemRegistry::LayoutLegend;
 }
 
+QIcon QgsLayoutItemLegend::icon() const
+{
+  return QgsApplication::getThemeIcon( QStringLiteral( "/mLayoutItemLegend.svg" ) );
+}
+
 void QgsLayoutItemLegend::paint( QPainter *painter, const QStyleOptionGraphicsItem *itemStyle, QWidget *pWidget )
 {
   if ( !painter )
diff --git a/src/core/layout/qgslayoutitemlegend.h b/src/core/layout/qgslayoutitemlegend.h
@@ -77,6 +77,7 @@ class CORE_EXPORT QgsLayoutItemLegend : public QgsLayoutItem
     static QgsLayoutItemLegend *create( QgsLayout *layout ) SIP_FACTORY;
 
     int type() const override;
+    QIcon icon() const override;
     //Overridden to show legend title
     QString displayName() const override;
 
diff --git a/src/core/layout/qgslayoutitemmap.cpp b/src/core/layout/qgslayoutitemmap.cpp
@@ -75,6 +75,11 @@ int QgsLayoutItemMap::type() const
   return QgsLayoutItemRegistry::LayoutMap;
 }
 
+QIcon QgsLayoutItemMap::icon() const
+{
+  return QgsApplication::getThemeIcon( QStringLiteral( "/mLayoutItemMap.svg" ) );
+}
+
 void QgsLayoutItemMap::assignFreeId()
 {
   if ( !mLayout )
diff --git a/src/core/layout/qgslayoutitemmap.h b/src/core/layout/qgslayoutitemmap.h
@@ -70,6 +70,7 @@ class CORE_EXPORT QgsLayoutItemMap : public QgsLayoutItem
     ~QgsLayoutItemMap() override;
 
     int type() const override;
+    QIcon icon() const override;
 
     /**
      * Sets the map id() to a number not yet used in the layout. The existing id() is kept if it is not in use.
diff --git a/src/core/layout/qgslayoutitempicture.cpp b/src/core/layout/qgslayoutitempicture.cpp
@@ -71,6 +71,11 @@ int QgsLayoutItemPicture::type() const
   return QgsLayoutItemRegistry::LayoutPicture;
 }
 
+QIcon QgsLayoutItemPicture::icon() const
+{
+  return QgsApplication::getThemeIcon( QStringLiteral( "/mLayoutItemPicture.svg" ) );
+}
+
 QgsLayoutItemPicture *QgsLayoutItemPicture::create( QgsLayout *layout )
 {
   return new QgsLayoutItemPicture( layout );
diff --git a/src/core/layout/qgslayoutitempicture.h b/src/core/layout/qgslayoutitempicture.h
@@ -71,6 +71,7 @@ class CORE_EXPORT QgsLayoutItemPicture: public QgsLayoutItem
     QgsLayoutItemPicture( QgsLayout *layout );
 
     int type() const override;
+    QIcon icon() const override;
 
     /**
      * Returns a new picture item for the specified \a layout.
diff --git a/src/core/layout/qgslayoutitempolygon.cpp b/src/core/layout/qgslayoutitempolygon.cpp
@@ -47,6 +47,11 @@ int QgsLayoutItemPolygon::type() const
   return QgsLayoutItemRegistry::LayoutPolygon;
 }
 
+QIcon QgsLayoutItemPolygon::icon() const
+{
+  return QgsApplication::getThemeIcon( QStringLiteral( "/mLayoutItemPolygon.svg" ) );
+}
+
 bool QgsLayoutItemPolygon::_addNode( const int indexPoint,
                                      QPointF newPoint,
                                      const double radius )
diff --git a/src/core/layout/qgslayoutitempolygon.h b/src/core/layout/qgslayoutitempolygon.h
@@ -52,6 +52,7 @@ class CORE_EXPORT QgsLayoutItemPolygon: public QgsLayoutNodesItem
     static QgsLayoutItemPolygon *create( QgsLayout *layout ) SIP_FACTORY;
 
     int type() const override;
+    QIcon icon() const override;
     QString displayName() const override;
 
     /**
diff --git a/src/core/layout/qgslayoutitempolyline.cpp b/src/core/layout/qgslayoutitempolyline.cpp
@@ -48,6 +48,11 @@ int QgsLayoutItemPolyline::type() const
   return QgsLayoutItemRegistry::LayoutPolyline;
 }
 
+QIcon QgsLayoutItemPolyline::icon() const
+{
+  return QgsApplication::getThemeIcon( QStringLiteral( "/mLayoutItemPolyline.svg" ) );
+}
+
 bool QgsLayoutItemPolyline::_addNode( const int indexPoint,
                                       QPointF newPoint,
                                       const double radius )
diff --git a/src/core/layout/qgslayoutitempolyline.h b/src/core/layout/qgslayoutitempolyline.h
diff --git a/src/core/layout/qgslayoutitemscalebar.cpp b/src/core/layout/qgslayoutitemscalebar.cpp
diff --git a/src/core/layout/qgslayoutitemscalebar.h b/src/core/layout/qgslayoutitemscalebar.h
diff --git a/src/core/layout/qgslayoutitemshape.cpp b/src/core/layout/qgslayoutitemshape.cpp
diff --git a/src/core/layout/qgslayoutitemshape.h b/src/core/layout/qgslayoutitemshape.h
diff --git a/src/core/layout/qgslayoutmodel.cpp b/src/core/layout/qgslayoutmodel.cpp
diff --git a/src/core/layout/qgslayoutmultiframe.h b/src/core/layout/qgslayoutmultiframe.h
