spacer

app/attributes/attributecontroller.cpp

@@ -27,6 +27,7 @@
 #include "qgsattributeeditorrelation.h"
 #include "qgsattributeeditorcontainer.h"
 #include "qgsvectorlayerutils.h"
+#include "qgsattributeeditorspacerelement.h"
 #include "qgsvectorlayereditbuffer.h"
 #include "qgsexpressioncontextutils.h"
 #include "qgsrelation.h"
@@ -246,7 +247,6 @@ void AttributeController::flatten(
               field,
               groupName,
               parentTabRow,
-              FormItem::Field,
               layer->attributeDisplayName( fieldIndex ),
               !isReadOnly,
               getEditorWidgetSetup( layer, fieldIndex ),
@@ -300,7 +300,6 @@ void AttributeController::flatten(
               widgetUuid,
               groupName,
               parentTabRow,
-              FormItem::Relation,
               label,
               parentVisibilityExpressions, // relation field doesn't have visibility expression itself
               associatedRelation
@@ -312,9 +311,34 @@ void AttributeController::flatten(
 
         break;
       }
+      case Qgis::AttributeEditorType::SpacerElement:
+      {
+        QUuid fieldUuid = QUuid::createUuid();
+
+        QgsAttributeEditorSpacerElement *spacerElement = static_cast<QgsAttributeEditorSpacerElement *>( element );
+
+        const QString groupName = container->isGroupBox() ? container->name() : QString();
+        std::shared_ptr<FormItem> formItemData =
+          std::shared_ptr<FormItem>(
+            FormItem::createSpacerItem(
+              fieldUuid,
+              groupName,
+              parentTabRow,
+              spacerElement->name(),
+              spacerElement->drawLine(),
+              parentVisibilityExpressions // spacer doesn't have visibility expression itself
+            )
+          );
+
+        mFormItems[formItemData->id()] = formItemData;
+
+
+        items.append( fieldUuid );
+        break;
+      }
 
       default:
-        // Invalid, Action, QmlElement, HtmlElement, TextElement and SpacerElement
+        // Invalid, Action, QmlElement, HtmlElement, TextElement
         // are not supported at the moment
         break;
     }

app/attributes/attributedata.cpp

@@ -16,19 +16,18 @@
 
 #include "attributedata.h"
 
-FormItem::FormItem(
-  const QUuid &id,
-  const QgsField &field,
-  const QString &groupName,
-  const int parentTabId,
-  FormItem::FormItemType type,
-  const QString &name,
-  bool isEditable,
-  const QgsEditorWidgetSetup &editorWidgetSetup,
-  int fieldIndex,
-  const QgsExpression &visibilityExpression,
-  const QgsRelation &relation
-)
+FormItem::FormItem( const QUuid &id,
+                    const QgsField &field,
+                    const QString &groupName,
+                    const int parentTabId,
+                    FormItem::FormItemType type,
+                    const QString &name,
+                    bool isEditable,
+                    const QgsEditorWidgetSetup &editorWidgetSetup,
+                    int fieldIndex,
+                    const QgsExpression &visibilityExpression,
+                    const QgsRelation &relation
+                  )
   : mId( id )
   , mField( field )
   , mGroupName( groupName )
@@ -48,7 +47,6 @@ FormItem *FormItem::createFieldItem(
   const QgsField &field,
   const QString &groupName,
   int parentTabId,
-  FormItemType type,
   const QString &name,
   bool isEditable,
   const QgsEditorWidgetSetup
@@ -62,19 +60,19 @@ FormItem *FormItem::createFieldItem(
            field,
            groupName,
            parentTabId,
-           type,
+           FormItem::Field,
            name,
            isEditable,
            editorWidgetSetup,
            fieldIndex,
-           visibilityExpression
+           visibilityExpression,
+           QgsRelation()
          );
 }
 
 FormItem *FormItem::createRelationItem( const QUuid &id,
                                         const QString &groupName,
                                         int parentTabId,
-                                        FormItemType type,
                                         const QString &name,
                                         const QgsExpression &visibilityExpression,
                                         const QgsRelation &relation
@@ -85,7 +83,7 @@ FormItem *FormItem::createRelationItem( const QUuid &id,
     QgsField(),
     groupName,
     parentTabId,
-    type,
+    FormItem::Relation,
     name,
     true,
     QgsEditorWidgetSetup(),
@@ -96,6 +94,33 @@ FormItem *FormItem::createRelationItem( const QUuid &id,
   return item;
 }
 
+FormItem *FormItem::createSpacerItem(
+  const QUuid &id,
+  const QString &groupName,
+  int parentTabId,
+  const QString &name,
+  bool isHLine,
+  const QgsExpression &visibilityExpression
+)
+{
+  FormItem *it = new FormItem(
+    id,
+    QgsField(),
+    groupName,
+    parentTabId,
+    FormItem::Spacer,
+    name,
+    false,
+    QgsEditorWidgetSetup(),
+    -1,
+    visibilityExpression,
+    QgsRelation()
+  );
+
+  it->setRawValue( isHLine );
+  return it;
+}
+
 FormItem::FormItemType FormItem::type() const
 {
   return mType;
@@ -116,6 +141,9 @@ QString FormItem::editorWidgetType() const
   if ( mType == FormItem::Relation )
     return QStringLiteral( "relation" );
 
+  if ( mType == FormItem::Spacer )
+    return QStringLiteral( "spacer" );
+
   return mEditorWidgetSetup.type();
 }
 

app/attributes/attributedata.h

@@ -45,6 +45,7 @@ class FormItem
       Container,
       Relation,
       Field,
+      Spacer
     };
     Q_ENUMS( FormItemType )
 
@@ -59,15 +60,14 @@ class FormItem
       const QgsEditorWidgetSetup &editorWidgetSetup,
       int fieldIndex,
       const QgsExpression &visibilityExpression,
-      const QgsRelation &relation = QgsRelation()
+      const QgsRelation &relation
     );
 
     static FormItem *createFieldItem(
       const QUuid &id,
       const QgsField &field,
       const QString &groupName,
       int parentTabId,
-      FormItem::FormItemType type,
       const QString &name,
       bool isEditable,
       const QgsEditorWidgetSetup &editorWidgetSetup,
@@ -79,12 +79,20 @@ class FormItem
       const QUuid &id,
       const QString &groupName,
       int parentTabId,
-      FormItem::FormItemType type,
       const QString &name,
       const QgsExpression &visibilityExpression,
       const QgsRelation &relation
     );
 
+    static FormItem *createSpacerItem(
+      const QUuid &id,
+      const QString &groupName,
+      int parentTabId,
+      const QString &name,
+      bool isHLine,
+      const QgsExpression &visibilityExpression
+    );
+
     FormItem::FormItemType type() const;
     QString name() const;
     bool isEditable() const;
@@ -141,7 +149,7 @@ class FormItem
     QVariant mOriginalValue; // original unmodified value
     QVariant mRawValue;
 
-    const QgsRelation mRelation; // empty if type is field
+    const QgsRelation mRelation; // Only used for FormItemType::Relation
 };
 
 class  TabItem

app/inpututils.cpp

@@ -1062,6 +1062,7 @@ const QUrl InputUtils::getEditorComponentSource( const QString &widgetName, cons
                                    QStringLiteral( "datetime" ),
                                    QStringLiteral( "range" ),
                                    QStringLiteral( "relation" ),
+                                   QStringLiteral( "spacer" ),
                                    QStringLiteral( "relationreference" )
                                  };
   if ( supportedWidgets.contains( widgetName ) )

app/qml/CMakeLists.txt

@@ -56,6 +56,7 @@ set(MM_QML
     editor/inputvaluemap.qml
     editor/inputvaluerelationcombobox.qml
     editor/inputvaluerelationpage.qml
+    editor/inputspacer.qml
     form/FeatureForm.qml
     form/FeatureFormPage.qml
     form/FeatureFormStyling.qml

app/qml/editor/inputspacer.qml

@@ -0,0 +1,30 @@
+/***************************************************************************
+ checkbox.qml
+ ***************************************************************************
+ *                                                                         *
+ *   This program is free software; you can redistribute it and/or modify  *
+ *   it under the terms of the GNU General Public License as published by  *
+ *   the Free Software Foundation; either version 2 of the License, or     *
+ *   (at your option) any later version.                                   *
+ *                                                                         *
+ ***************************************************************************/
+
+import QtQuick
+import QtQuick.Controls
+import "../components"
+
+Rectangle {
+  id: spacer
+
+  property bool isHLine: value
+  property int spacerHeight: customStyle.fields.height
+  property int hLineWidth: 1
+
+  height: isHLine ? hLineWidth : spacerHeight
+  width: parent.width
+  color: isHLine ? customStyle.fields.fontColor : "transparent"
+  anchors {
+    right: parent.right
+    left: parent.left
+  }
+}

app/qml/form/FeatureForm.qml

@@ -398,7 +398,7 @@ Item {
       id: fieldContainer
 
       // TODO: filter such fields in field proxy model instead
-      property bool shouldBeVisible: Type === FormItem.Field || Type === FormItem.Relation
+      property bool shouldBeVisible: Type === FormItem.Field || Type === FormItem.Relation || Type === FormItem.Spacer
 
       visible: shouldBeVisible
 
@@ -434,6 +434,8 @@ Item {
             id: fieldLabel
 
             text: Name
+            height: visible ? paintedHeight : 0
+            visible: Type !== FormItem.Spacer
             color: form.style.constraint.validColor
             leftPadding: form.style.fields.sideMargin
             font.pixelSize: form.style.fields.labelPixelSize
@@ -512,7 +514,8 @@ Item {
             source: {
               if ( widget !== undefined )
                 return __inputUtils.getEditorComponentSource( widget.toLowerCase(), config, field )
-              else return ''
+              else
+                return ''
             }
           }