Configuration and display

works in basic - no attributs. no handy configurator.

python/core/auto_generated/qgsattributeeditorelement.sip.in

@@ -358,7 +358,7 @@ An attribute editor widget that will represent arbitrary QML code.
 #include "qgsattributeeditorelement.h"
 %End
   public:
-    QgsAttributeEditorQmlElement( QgsAttributeEditorElement *parent );
+    QgsAttributeEditorQmlElement( const QString &name, QgsAttributeEditorElement *parent );
 
     virtual QgsAttributeEditorElement *clone( QgsAttributeEditorElement *parent ) const /Factory/;
 

python/gui/auto_generated/editorwidgets/qgsqmlwidgetwrapper.sip.in

@@ -43,6 +43,8 @@ the Free Software Foundation; either version 2 of the License, or     *
     virtual void initWidget( QWidget *editor );
 
 
+    void setQmlCode( const QString &qmlCode );
+
   public slots:
 
     virtual void setFeature( const QgsFeature &feature );

src/app/qgsattributesformproperties.cpp

@@ -456,8 +456,20 @@ QTreeWidgetItem *QgsAttributesFormProperties::loadAttributeEditorTreeItem( QgsAt
       {
         loadAttributeEditorTreeItem( wdg, newWidget, tree );
       }
+      break;
+    }
+
+    case QgsAttributeEditorElement::AeTypeQmlElement:
+    {
+      const QgsAttributeEditorQmlElement *qmlElementEditor = static_cast<const QgsAttributeEditorQmlElement *>( widgetDef );
+      DnDTreeItemData itemData = DnDTreeItemData( DnDTreeItemData::QmlWidget, widgetDef->name(), widgetDef->name() );
+      itemData.setShowLabel( widgetDef->showLabel() );
+      QmlElementEditorConfiguration qmlEdConfig;
+      qmlEdConfig.qmlCode = qmlElementEditor->qmlCode();
+      itemData.setQmlElementEditorConfiguration( qmlEdConfig );
+      newWidget = tree->addItem( parent, itemData );
+      break;
     }
-    break;
     default:
       //should not happen
       break;
@@ -580,8 +592,43 @@ QgsAttributeEditorElement *QgsAttributesFormProperties::createAttributeEditorWid
 
     case DnDTreeItemData::QmlWidget:
     {
-      QgsAttributeEditorQmlElement *element = new QgsAttributeEditorQmlElement( parent );
-      element->setQmlCode( "ABC " );
+      QgsAttributeEditorQmlElement *element = new QgsAttributeEditorQmlElement( item->text( 0 ), parent );
+      element->setQmlCode( itemData.qmlElementEditorConfiguration().qmlCode );
+
+      /*
+      element->setQmlCode( QStringLiteral(
+                             "import QtQuick 2.0\n"
+                             "\n"
+                             "Rectangle {\n"
+                             "    width: 100\n"
+                             "    height: 100\n"
+                             "    color: \"red\"\n"
+                             "}\n" ) );
+
+      element->setQmlCode( QStringLiteral(
+                          "import QtQuick 2.0\n"
+                          "import QtCharts 2.0\n"
+                          "\n"
+                          "ChartView {\n"
+                          "    width: 600\n"
+                          "    height: 400\n"
+                          "\n"
+                          "    PieSeries {\n"
+                          "        id: pieSeries\n"
+                          "        PieSlice { label: \"outlet 1\"; value: attributes.outlet_1 }\n"
+                          "        PieSlice { label: \"outlet 2\"; value: attributes.outlet_2 }\n"
+                          "        PieSlice { label: \"outlet 3\"; value: attributes.outlet_3 }\n"
+                          "        PieSlice { label: \"outlet 4\"; value: attributes.outlet_4 }\n"
+                          "    }\n"
+                          "}\n" ) );
+      import QtQuick 2.0
+
+      Rectangle {
+      width: 100
+      height: 100
+      color: "red"
+      }
+      */
 
       widgetDef = element;
       break;
@@ -1087,12 +1134,11 @@ void DnDTree::onItemDoubleClicked( QTreeWidgetItem *item, int column )
       dlg.setLayout( layout );
       layout->addWidget( baseWidget );
 
-      QCheckBox *showLinkButton = new QCheckBox( tr( "Show link button" ) );
-      showLinkButton->setChecked( itemData.relationEditorConfiguration().showLinkButton );
-      QCheckBox *showUnlinkButton = new QCheckBox( tr( "Show unlink button" ) );
-      showUnlinkButton->setChecked( itemData.relationEditorConfiguration().showUnlinkButton );
-      layout->addRow( showLinkButton );
-      layout->addRow( showUnlinkButton );
+      QPlainTextEdit *qmlCode = new QPlainTextEdit( itemData.qmlElementEditorConfiguration().qmlCode );
+      QLineEdit *title = new QLineEdit( itemData.name() );
+
+      layout->addRow( tr( "Title" ), title );
+      layout->addRow( tr( "QML Code" ), qmlCode );
 
       QDialogButtonBox *buttonBox = new QDialogButtonBox( QDialogButtonBox::Ok | QDialogButtonBox::Cancel );
 
@@ -1103,13 +1149,14 @@ void DnDTree::onItemDoubleClicked( QTreeWidgetItem *item, int column )
 
       if ( dlg.exec() )
       {
-        QgsAttributesFormProperties::RelationEditorConfiguration relEdCfg;
-        relEdCfg.showLinkButton = showLinkButton->isChecked();
-        relEdCfg.showUnlinkButton = showUnlinkButton->isChecked();
+        QgsAttributesFormProperties::QmlElementEditorConfiguration qmlEdCfg;
+        qmlEdCfg.qmlCode = qmlCode->toPlainText();
+        itemData.setName( title->text() );
+        itemData.setQmlElementEditorConfiguration( qmlEdCfg );
         itemData.setShowLabel( showLabelCheckbox->isChecked() );
-        itemData.setRelationEditorConfiguration( relEdCfg );
 
         item->setData( 0, QgsAttributesFormProperties::DnDTreeRole, itemData );
+        item->setText( 0, title->text() );
       }
     }
     break;
@@ -1216,3 +1263,13 @@ void QgsAttributesFormProperties::DnDTreeItemData::setRelationEditorConfiguratio
   mRelationEditorConfiguration = relationEditorConfiguration;
 }
 
+QgsAttributesFormProperties::QmlElementEditorConfiguration QgsAttributesFormProperties::DnDTreeItemData::qmlElementEditorConfiguration() const
+{
+  return mQmlElementEditorConfiguration;
+}
+
+void QgsAttributesFormProperties::DnDTreeItemData::setQmlElementEditorConfiguration( QgsAttributesFormProperties::QmlElementEditorConfiguration qmlElementEditorConfiguration )
+{
+  mQmlElementEditorConfiguration = qmlElementEditorConfiguration;
+}
+

src/app/qgsattributesformproperties.h

@@ -29,6 +29,7 @@
 #include <QFileDialog>
 #include <QHBoxLayout>
 #include <QFormLayout>
+#include <QPlainTextEdit>
 
 #include "qgsvectorlayer.h"
 #include "ui_qgsattributesformproperties.h"
@@ -70,6 +71,11 @@ class APP_EXPORT QgsAttributesFormProperties : public QWidget, private Ui_QgsAtt
       bool showUnlinkButton = true;
     };
 
+    struct QmlElementEditorConfiguration
+    {
+      QString qmlCode;
+    };
+
     class DnDTreeItemData : public QTreeWidgetItem
     {
       public:
@@ -116,6 +122,9 @@ class APP_EXPORT QgsAttributesFormProperties : public QWidget, private Ui_QgsAtt
         RelationEditorConfiguration relationEditorConfiguration() const;
         void setRelationEditorConfiguration( RelationEditorConfiguration relationEditorConfiguration );
 
+        QmlElementEditorConfiguration qmlElementEditorConfiguration() const;
+        void setQmlElementEditorConfiguration( QmlElementEditorConfiguration qmlElementEditorConfiguration );
+
       private:
         Type mType = Field;
         QString mName;
@@ -126,6 +135,7 @@ class APP_EXPORT QgsAttributesFormProperties : public QWidget, private Ui_QgsAtt
         bool mShowLabel = true;
         QgsOptionalExpression mVisibilityExpression;
         RelationEditorConfiguration mRelationEditorConfiguration;
+        QmlElementEditorConfiguration mQmlElementEditorConfiguration;
     };
 
 

src/core/qgsattributeeditorelement.cpp

@@ -153,7 +153,7 @@ void QgsAttributeEditorRelation::setShowUnlinkButton( bool showUnlinkButton )
 
 QgsAttributeEditorElement *QgsAttributeEditorQmlElement::clone( QgsAttributeEditorElement *parent ) const
 {
-  QgsAttributeEditorQmlElement *element = new QgsAttributeEditorQmlElement( parent );
+  QgsAttributeEditorQmlElement *element = new QgsAttributeEditorQmlElement( name(), parent );
   element->setQmlCode( mQmlCode );
 
   return element;

src/core/qgsattributeeditorelement.h

@@ -420,8 +420,8 @@ class CORE_EXPORT QgsAttributeEditorRelation : public QgsAttributeEditorElement
 class CORE_EXPORT QgsAttributeEditorQmlElement : public QgsAttributeEditorElement
 {
   public:
-    QgsAttributeEditorQmlElement( QgsAttributeEditorElement *parent )
-      : QgsAttributeEditorElement( AeTypeQmlElement, "TODO NAME", parent )
+    QgsAttributeEditorQmlElement( const QString &name, QgsAttributeEditorElement *parent )
+      : QgsAttributeEditorElement( AeTypeQmlElement, name, parent )
     {}
 
     QgsAttributeEditorElement *clone( QgsAttributeEditorElement *parent ) const override SIP_FACTORY;

src/core/qgseditformconfig.cpp

@@ -558,13 +558,13 @@ QgsAttributeEditorElement *QgsEditFormConfig::attributeEditorElementFromDomEleme
 
     newElement = container;
   }
-  else if ( elem.tagName() == QLatin1String( "attributeEditorField" ) )
+  else if ( elem.tagName() == QStringLiteral( "attributeEditorField" ) )
   {
     QString name = elem.attribute( QStringLiteral( "name" ) );
     int idx = d->mFields.lookupField( name );
     newElement = new QgsAttributeEditorField( name, idx, parent );
   }
-  else if ( elem.tagName() == QLatin1String( "attributeEditorRelation" ) )
+  else if ( elem.tagName() == QStringLiteral( "attributeEditorRelation" ) )
   {
     // At this time, the relations are not loaded
     // So we only grab the id and delegate the rest to onRelationsLoaded()
@@ -573,6 +573,12 @@ QgsAttributeEditorElement *QgsEditFormConfig::attributeEditorElementFromDomEleme
     relElement->setShowUnlinkButton( elem.attribute( QStringLiteral( "showUnlinkButton" ), QStringLiteral( "1" ) ).toInt() );
     newElement = relElement;
   }
+  else if ( elem.tagName() == QStringLiteral( "attributeEditorQmlElement" ) )
+  {
+    QgsAttributeEditorQmlElement *qmlElement = new QgsAttributeEditorQmlElement( elem.attribute( QStringLiteral( "name" ) ), parent );
+    qmlElement->setQmlCode( elem.text() );
+    newElement = qmlElement;
+  }
 
   if ( newElement )
   {

src/gui/editorwidgets/qgsqmlwidgetwrapper.cpp

@@ -40,32 +40,29 @@ void QgsQmlWidgetWrapper::initWidget( QWidget *editor )
   if ( !quickWidget )
     return;
 
+
   if ( !mQmlFile.open() )
   {
     QgsMessageLog::logMessage( tr( "Failed to open temporary QML file" ) );
     return;
   }
 
-  QString qmlCode = QStringLiteral(
-                      "import QtQuick 2.0"
-                      "import QtCharts 2.0"
-                      ""
-                      "ChartView {"
-                      "    width: 600"
-                      "    height: 400"
-                      ""
-                      "    PieSeries {"
-                      "        id: pieSeries"
-                      "        PieSlice { label: \"outlet 1\"; value: attributes.outlet_1 }"
-                      "        PieSlice { label: \"outlet 2\"; value: attributes.outlet_2 }"
-                      "        PieSlice { label: \"outlet 3\"; value: attributes.outlet_3 }"
-                      "        PieSlice { label: \"outlet 4\"; value: attributes.outlet_4 }"
-                      "    }"
-                      "}" );
+  quickWidget->setSource( QUrl::fromLocalFile( mQmlFile.fileName() ) );
+
+  mQmlFile.close();
+}
+
+void QgsQmlWidgetWrapper::setQmlCode( const QString &qmlCode )
+{
+  if ( !mQmlFile.open() )
+  {
+    QgsMessageLog::logMessage( tr( "Failed to open temporary QML file" ) );
+    return;
+  }
 
   mQmlFile.write( qmlCode.toUtf8() );
 
-  quickWidget->setSource( QUrl::fromLocalFile( mQmlFile.fileName() ) );
+  mQmlFile.close();
 }
 
 void QgsQmlWidgetWrapper::setFeature( const QgsFeature &feature )

src/gui/editorwidgets/qgsqmlwidgetwrapper.h

@@ -19,6 +19,7 @@
 #include "qgswidgetwrapper.h"
 #include "qgis.h"
 #include "qgis_gui.h"
+#include <QtQuickWidgets/QQuickWidget>
 
 
 class GUI_EXPORT QgsQmlWidgetWrapper : public QgsWidgetWrapper
@@ -34,12 +35,16 @@ class GUI_EXPORT QgsQmlWidgetWrapper : public QgsWidgetWrapper
 
     void initWidget( QWidget *editor ) override;
 
+    void setQmlCode( const QString &qmlCode );
+
   public slots:
 
     void setFeature( const QgsFeature &feature ) override;
 
   private:
     QTemporaryFile mQmlFile;
+
+    QQuickWidget *mWidget = nullptr;
 };
 
 #endif // QGSQMLWIDGETWRAPPER_H

src/gui/qgsattributeform.cpp

@@ -1775,11 +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->setQmlCode( elementDef->qmlCode() );
+
+      //qmlWrapper->setConfig( mLayer->editFormConfig().widgetConfig( elementDef->name()) );
       qmlWrapper->setContext( context );
 
       // QgsAttributeFormRelationEditorWidget *formWidget = new QgsAttributeFormRelationEditorWidget( rww, this );
@@ -1788,8 +1787,9 @@ QgsAttributeForm::WidgetInfo QgsAttributeForm::createWidgetFromDef( const QgsAtt
       // mFormWidgets.append( formWidget );
 
       newWidgetInfo.widget = qmlWrapper->widget();
-      newWidgetInfo.labelText = QString();
+      newWidgetInfo.labelText = elementDef->name();
       newWidgetInfo.labelOnTop = true;
+      newWidgetInfo.showLabel = widgetDef->showLabel();
       break;
     }