Fix d&d designer expressions and drop not-used methods

qgis · Apr 13, 2020 · 47d6cb9 · 47d6cb9
1 parent 1219d61
commit 47d6cb9
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 28 deletions.
diff --git a/src/core/qgseditformconfig.cpp b/src/core/qgseditformconfig.cpp
@@ -639,8 +639,7 @@ QgsAttributeEditorElement *QgsEditFormConfig::attributeEditorElementFromDomEleme
       newElement->setShowLabel( elem.attribute( QStringLiteral( "showLabel" ) ).toInt() );
     else
       newElement->setShowLabel( true );
-    if ( elem.hasAttribute( QStringLiteral( "labelExpression" ) ) )
-      newElement->setLabelExpression( elem.attribute( QStringLiteral( "labelExpression" ) ) );
+    newElement->setLabelExpression( labelExpression( newElement->name() ) );
   }
 
   return newElement;

diff --git a/src/gui/qgsattributeform.cpp b/src/gui/qgsattributeform.cpp
@@ -1470,13 +1470,15 @@ void QgsAttributeForm::init()
         }
         else
         {
-          if ( ! widgetInfo.labelExpression.isEmpty() )
-          {
-            mExpressionLabels[ label ] = QgsExpression( widgetInfo.labelExpression );
-          }
           layout->addWidget( label, row, column++ );
           layout->addWidget( widgetInfo.widget, row, column++ );
         }
+
+        if ( ! widgetInfo.labelExpression.isEmpty() )
+        {
+          mExpressionLabels[ label ] = QgsExpression( widgetInfo.labelExpression );
+        }
+
       }
 
       if ( column >= columnCount * 2 )

diff --git a/src/gui/vector/qgsattributesformproperties.cpp b/src/gui/vector/qgsattributesformproperties.cpp
@@ -464,7 +464,6 @@ QTreeWidgetItem *QgsAttributesFormProperties::loadAttributeEditorTreeItem( QgsAt
     {
       DnDTreeItemData itemData = DnDTreeItemData( DnDTreeItemData::Field, widgetDef->name(), widgetDef->name() );
       itemData.setShowLabel( widgetDef->showLabel() );
-      itemData.setLabelExpression( widgetDef->labelExpression() );
       newWidget = tree->addItem( parent, itemData );
       break;
     }
@@ -474,7 +473,6 @@ QTreeWidgetItem *QgsAttributesFormProperties::loadAttributeEditorTreeItem( QgsAt
       const QgsAttributeEditorRelation *relationEditor = static_cast<const QgsAttributeEditorRelation *>( widgetDef );
       DnDTreeItemData itemData = DnDTreeItemData( DnDTreeItemData::Relation, relationEditor->relation().id(), relationEditor->relation().name() );
       itemData.setShowLabel( widgetDef->showLabel() );
-      itemData.setLabelExpression( widgetDef->labelExpression() );
       RelationEditorConfiguration relEdConfig;
       relEdConfig.showLinkButton = relationEditor->showLinkButton();
       relEdConfig.showUnlinkButton = relationEditor->showUnlinkButton();
@@ -493,7 +491,6 @@ QTreeWidgetItem *QgsAttributesFormProperties::loadAttributeEditorTreeItem( QgsAt
       if ( !container )
         break;
 
-      itemData.setLabelExpression( widgetDef->labelExpression() );
       itemData.setColumnCount( container->columnCount() );
       itemData.setShowAsGroupBox( container->isGroupBox() );
       itemData.setBackgroundColor( container->backgroundColor() );
@@ -513,7 +510,6 @@ QTreeWidgetItem *QgsAttributesFormProperties::loadAttributeEditorTreeItem( QgsAt
       const QgsAttributeEditorQmlElement *qmlElementEditor = static_cast<const QgsAttributeEditorQmlElement *>( widgetDef );
       DnDTreeItemData itemData = DnDTreeItemData( DnDTreeItemData::QmlWidget, widgetDef->name(), widgetDef->name() );
       itemData.setShowLabel( widgetDef->showLabel() );
-      itemData.setLabelExpression( widgetDef->labelExpression() );
       QmlElementEditorConfiguration qmlEdConfig;
       qmlEdConfig.qmlCode = qmlElementEditor->qmlCode();
       itemData.setQmlElementEditorConfiguration( qmlEdConfig );
@@ -526,7 +522,6 @@ QTreeWidgetItem *QgsAttributesFormProperties::loadAttributeEditorTreeItem( QgsAt
       const QgsAttributeEditorHtmlElement *htmlElementEditor = static_cast<const QgsAttributeEditorHtmlElement *>( widgetDef );
       DnDTreeItemData itemData = DnDTreeItemData( DnDTreeItemData::HtmlWidget, widgetDef->name(), widgetDef->name() );
       itemData.setShowLabel( widgetDef->showLabel() );
-      itemData.setLabelExpression( widgetDef->labelExpression() );
       HtmlElementEditorConfiguration htmlEdConfig;
       htmlEdConfig.htmlCode = htmlElementEditor->htmlCode();
       itemData.setHtmlElementEditorConfiguration( htmlEdConfig );
@@ -703,6 +698,7 @@ QgsAttributeEditorElement *QgsAttributesFormProperties::createAttributeEditorWid
     {
       int idx = mLayer->fields().lookupField( itemData.name() );
       widgetDef = new QgsAttributeEditorField( itemData.name(), idx, parent );
+      widgetDef->setLabelExpression( mAttributeTypeDialog->aliasExpression() );
       break;
     }
 
@@ -758,7 +754,6 @@ QgsAttributeEditorElement *QgsAttributesFormProperties::createAttributeEditorWid
   }
 
   widgetDef->setShowLabel( itemData.showLabel() );
-  widgetDef->setLabelExpression( itemData.labelExpression() );
 
   return widgetDef;
 }
@@ -1613,13 +1608,3 @@ void QgsAttributesFormProperties::DnDTreeItemData::setBackgroundColor( const QCo
   mBackgroundColor = backgroundColor;
 }
 
-QString QgsAttributesFormProperties::DnDTreeItemData::labelExpression() const
-{
-  return mLabelExpression;
-}
-
-void QgsAttributesFormProperties::DnDTreeItemData::setLabelExpression( const QString &labelExpression )
-{
-  mLabelExpression = labelExpression;
-}
-
diff --git a/src/gui/vector/qgsattributesformproperties.h b/src/gui/vector/qgsattributesformproperties.h
@@ -100,11 +100,10 @@ class GUI_EXPORT QgsAttributesFormProperties : public QWidget, private Ui_QgsAtt
         //do we need that
         DnDTreeItemData() = default;
 
-        DnDTreeItemData( Type type, const QString &name, const QString &displayName, const QColor &backgroundColor = QColor(), const QString &labelExpression = QString() )
+        DnDTreeItemData( Type type, const QString &name, const QString &displayName, const QColor &backgroundColor = QColor() )
           : mType( type )
           , mName( name )
           , mDisplayName( displayName )
-          , mLabelExpression( labelExpression )
           , mBackgroundColor( backgroundColor )
         {}
 
@@ -143,14 +142,10 @@ class GUI_EXPORT QgsAttributesFormProperties : public QWidget, private Ui_QgsAtt
         QColor backgroundColor() const;
         void setBackgroundColor( const QColor &backgroundColor );
 
-        QString labelExpression() const;
-        void setLabelExpression( const QString &labelExpression );
-
       private:
         Type mType = Field;
         QString mName;
         QString mDisplayName;
-        QString mLabelExpression;
         int mColumnCount = 1;
         bool mShowAsGroupBox = false;
         bool mShowLabel = true;