Yay, more QML!

m-kuhn · signedav · commit f41aaa79cb3b · 2018-09-05T11:01:32.000+02:00
diff --git a/python/core/auto_generated/qgsattributeeditorelement.sip.in b/python/core/auto_generated/qgsattributeeditorelement.sip.in
@@ -348,15 +348,34 @@ Determines if the "unlink feature" button should be shown
 
 class QgsAttributeEditorQmlElement : QgsAttributeEditorElement
 {
+%Docstring
+An attribute editor widget that will represent arbitrary QML code.
+
+.. versionadded:: 3.4
+%End
 
 %TypeHeaderCode
 #include "qgsattributeeditorelement.h"
 %End
   public:
     QgsAttributeEditorQmlElement( QgsAttributeEditorElement *parent );
 
+    virtual QgsAttributeEditorElement *clone( QgsAttributeEditorElement *parent ) const /Factory/;
+
+
     QString qmlCode() const;
+%Docstring
+The QML code that will be represented within this widget.
+
+.. versionadded:: 3.4
+%End
+
     void setQmlCode( const QString &qmlCode );
+%Docstring
+The QML code that will be represented within this widget.
+
+@param qmlCode
+%End
 
 };
 
diff --git a/src/app/qgsattributesformproperties.cpp b/src/app/qgsattributesformproperties.cpp
@@ -491,6 +491,11 @@ void QgsAttributesFormProperties::onAttributeSelectionChanged()
       mAttributeTypeDialog->setVisible( false );
       break;
     }
+    case DnDTreeItemData::QmlWidget:
+    {
+
+      break;
+    }
 
   }
 }
@@ -572,6 +577,15 @@ QgsAttributeEditorElement *QgsAttributesFormProperties::createAttributeEditorWid
       widgetDef = container;
       break;
     }
+
+    case DnDTreeItemData::QmlWidget:
+    {
+      QgsAttributeEditorQmlElement *element = new QgsAttributeEditorQmlElement( parent );
+      element->setQmlCode( "ABC " );
+
+      widgetDef = element;
+      break;
+    }
   }
 
   widgetDef->setShowLabel( itemData.showLabel() );
diff --git a/src/core/qgsattributeeditorelement.cpp b/src/core/qgsattributeeditorelement.cpp
@@ -151,6 +151,14 @@ void QgsAttributeEditorRelation::setShowUnlinkButton( bool showUnlinkButton )
   mShowUnlinkButton = showUnlinkButton;
 }
 
+QgsAttributeEditorElement *QgsAttributeEditorQmlElement::clone( QgsAttributeEditorElement *parent ) const
+{
+  QgsAttributeEditorQmlElement *element = new QgsAttributeEditorQmlElement( parent );
+  element->setQmlCode( mQmlCode );
+
+  return element;
+}
+
 QString QgsAttributeEditorQmlElement::qmlCode() const
 {
   return mQmlCode;
diff --git a/src/core/qgsattributeeditorelement.h b/src/core/qgsattributeeditorelement.h
@@ -412,14 +412,32 @@ class CORE_EXPORT QgsAttributeEditorRelation : public QgsAttributeEditorElement
     bool mShowUnlinkButton = true;
 };
 
+/**
+ * An attribute editor widget that will represent arbitrary QML code.
+ *
+ * \since QGIS 3.4
+ */
 class CORE_EXPORT QgsAttributeEditorQmlElement : public QgsAttributeEditorElement
 {
   public:
     QgsAttributeEditorQmlElement( QgsAttributeEditorElement *parent )
       : QgsAttributeEditorElement( AeTypeQmlElement, "TODO NAME", parent )
     {}
 
+    QgsAttributeEditorElement *clone( QgsAttributeEditorElement *parent ) const override SIP_FACTORY;
+
+    /**
+     * The QML code that will be represented within this widget.
+     *
+     * \since QGIS 3.4
+     */
     QString qmlCode() const;
+
+    /**
+     * The QML code that will be represented within this widget.
+     *
+     * @param qmlCode
+     */
     void setQmlCode( const QString &qmlCode );
 
   private:
diff --git a/src/gui/qgsattributeform.cpp b/src/gui/qgsattributeform.cpp
@@ -1775,6 +1775,10 @@ QgsAttributeForm::WidgetInfo QgsAttributeForm::createWidgetFromDef( const QgsAtt
       const QgsAttributeEditorQmlElement *elementDef = static_cast<const QgsAttributeEditorQmlElement *>( widgetDef );
 
       QgsQmlWidgetWrapper *qmlWrapper = new QgsQmlWidgetWrapper( mLayer, nullptr, this );
+      QTemporaryFile *qmlFile = new QTemporaryFile();
+      qmlFile->write( elementDef->qmlCode().toUtf8() );
+      qmlFile->setParent( qmlWrapper );
+
       qmlWrapper->setConfig( mLayer->editFormConfig().widgetConfig( "TODO NAME??" ) );
       qmlWrapper->setContext( context );
 

Original file line number	Diff line number	Diff line change
`@@ -491,6 +491,11 @@ void QgsAttributesFormProperties::onAttributeSelectionChanged()`
`491`	`491`	`mAttributeTypeDialog->setVisible( false );`
`492`	`492`	`break;`
`493`	`493`	`}`
	`494`	`+ case DnDTreeItemData::QmlWidget:`
	`495`	`+ {`
	`496`	`+`
	`497`	`+ break;`
	`498`	`+ }`
`494`	`499`
`495`	`500`	`}`
`496`	`501`	`}`
`@@ -572,6 +577,15 @@ QgsAttributeEditorElement *QgsAttributesFormProperties::createAttributeEditorWid`
`572`	`577`	`widgetDef = container;`
`573`	`578`	`break;`
`574`	`579`	`}`
	`580`	`+`
	`581`	`+ case DnDTreeItemData::QmlWidget:`
	`582`	`+ {`
	`583`	`+ QgsAttributeEditorQmlElement *element = new QgsAttributeEditorQmlElement( parent );`
	`584`	`+ element->setQmlCode( "ABC " );`
	`585`	`+`
	`586`	`+ widgetDef = element;`
	`587`	`+ break;`
	`588`	`+ }`
`575`	`589`	`}`
`576`	`590`
`577`	`591`	`widgetDef->setShowLabel( itemData.showLabel() );`
Original file line number	Diff line number	Diff line change
`@@ -151,6 +151,14 @@ void QgsAttributeEditorRelation::setShowUnlinkButton( bool showUnlinkButton )`
`151`	`151`	`mShowUnlinkButton = showUnlinkButton;`
`152`	`152`	`}`
`153`	`153`
	`154`	`+QgsAttributeEditorElement QgsAttributeEditorQmlElement::clone( QgsAttributeEditorElement parent ) const`
	`155`	`+{`
	`156`	`+ QgsAttributeEditorQmlElement *element = new QgsAttributeEditorQmlElement( parent );`
	`157`	`+ element->setQmlCode( mQmlCode );`
	`158`	`+`
	`159`	`+ return element;`
	`160`	`+}`
	`161`	`+`
`154`	`162`	`QString QgsAttributeEditorQmlElement::qmlCode() const`
`155`	`163`	`{`
`156`	`164`	`return mQmlCode;`