python/core/qgsvectorlayerundocommand.sip

@@ -67,7 +67,7 @@ class QgsVectorLayerUndoCommandChangeAttribute : QgsVectorLayerUndoCommand
 };
 
 
-class QgsVectorLayerUndoCommandAddAttribute : public QgsVectorLayerUndoCommand
+class QgsVectorLayerUndoCommandAddAttribute : QgsVectorLayerUndoCommand
 {
 %TypeHeaderCode
 #include "qgsvectorlayerundocommand.h"

src/core/qgsexpression.cpp

@@ -2315,13 +2315,14 @@ bool QgsExpression::NodeCondition::prepare( QgsExpression* parent, const QgsFiel
 
 QString QgsExpression::NodeCondition::dump() const
 {
-  QString msg = "CONDITION:\n";
+  QString msg = QString("CASE ");
   foreach ( WhenThen* cond, mConditions )
   {
-    msg += QString( "- WHEN %1 THEN %2\n" ).arg( cond->mWhenExp->dump() ).arg( cond->mThenExp->dump() );
+    msg += QString( "WHEN %1 THEN %2" ).arg( cond->mWhenExp->dump() ).arg( cond->mThenExp->dump() );
   }
   if ( mElseExp )
-    msg += QString( "- ELSE %1" ).arg( mElseExp->dump() );
+    msg += QString( "ELSE %1" ).arg( mElseExp->dump() );
+  msg += QString(" END");
   return msg;
 }
 

src/core/qgsexpression.h

@@ -152,12 +152,9 @@ class CORE_EXPORT QgsExpression
 
     int scale() {return mScale; }
 
-    //! Return the expression string that was given when created.
-    const QString expression() const { return mExp; }
+    const QString expression() const { return dump(); }
 
-    //! Return the a debugging string of the expression.
-    //! This can be used for debugging. Use {@link expression()}
-    //! if you need the full expression string.
+    //! Return the expression string that represents this QgsExpression.
     QString dump() const;
 
     //! Return calculator used for distance and area calculations

src/core/qgsvectorlayerundocommand.h

@@ -32,7 +32,7 @@ class QgsGeometryCache;
 #include "qgsvectorlayereditbuffer.h"
 
 
-class QgsVectorLayerUndoCommand : public QUndoCommand
+class CORE_EXPORT QgsVectorLayerUndoCommand : public QUndoCommand
 {
   public:
     QgsVectorLayerUndoCommand( QgsVectorLayerEditBuffer *buffer )
@@ -50,7 +50,7 @@ class QgsVectorLayerUndoCommand : public QUndoCommand
 };
 
 
-class QgsVectorLayerUndoCommandAddFeature : public QgsVectorLayerUndoCommand
+class CORE_EXPORT QgsVectorLayerUndoCommandAddFeature : public QgsVectorLayerUndoCommand
 {
   public:
     QgsVectorLayerUndoCommandAddFeature( QgsVectorLayerEditBuffer* buffer, QgsFeature& f );
@@ -63,7 +63,7 @@ class QgsVectorLayerUndoCommandAddFeature : public QgsVectorLayerUndoCommand
 };
 
 
-class QgsVectorLayerUndoCommandDeleteFeature : public QgsVectorLayerUndoCommand
+class CORE_EXPORT QgsVectorLayerUndoCommandDeleteFeature : public QgsVectorLayerUndoCommand
 {
   public:
     QgsVectorLayerUndoCommandDeleteFeature( QgsVectorLayerEditBuffer* buffer, QgsFeatureId fid );
@@ -77,7 +77,7 @@ class QgsVectorLayerUndoCommandDeleteFeature : public QgsVectorLayerUndoCommand
 };
 
 
-class QgsVectorLayerUndoCommandChangeGeometry : public QgsVectorLayerUndoCommand
+class CORE_EXPORT QgsVectorLayerUndoCommandChangeGeometry : public QgsVectorLayerUndoCommand
 {
   public:
     QgsVectorLayerUndoCommandChangeGeometry( QgsVectorLayerEditBuffer* buffer, QgsFeatureId fid, QgsGeometry* newGeom );
@@ -95,7 +95,7 @@ class QgsVectorLayerUndoCommandChangeGeometry : public QgsVectorLayerUndoCommand
 };
 
 
-class QgsVectorLayerUndoCommandChangeAttribute : public QgsVectorLayerUndoCommand
+class CORE_EXPORT QgsVectorLayerUndoCommandChangeAttribute : public QgsVectorLayerUndoCommand
 {
   public:
     QgsVectorLayerUndoCommandChangeAttribute( QgsVectorLayerEditBuffer* buffer, QgsFeatureId fid, int fieldIndex, const QVariant& newValue );
@@ -111,7 +111,7 @@ class QgsVectorLayerUndoCommandChangeAttribute : public QgsVectorLayerUndoComman
 };
 
 
-class QgsVectorLayerUndoCommandAddAttribute : public QgsVectorLayerUndoCommand
+class CORE_EXPORT QgsVectorLayerUndoCommandAddAttribute : public QgsVectorLayerUndoCommand
 {
   public:
     QgsVectorLayerUndoCommandAddAttribute( QgsVectorLayerEditBuffer* buffer, const QgsField& field );
@@ -125,7 +125,7 @@ class QgsVectorLayerUndoCommandAddAttribute : public QgsVectorLayerUndoCommand
 };
 
 
-class QgsVectorLayerUndoCommandDeleteAttribute : public QgsVectorLayerUndoCommand
+class CORE_EXPORT QgsVectorLayerUndoCommandDeleteAttribute : public QgsVectorLayerUndoCommand
 {
   public:
     QgsVectorLayerUndoCommandDeleteAttribute( QgsVectorLayerEditBuffer* buffer, int fieldIndex );

src/ui/qgsexpressionbuilder.ui

@@ -20,6 +20,9 @@
    <string>Form</string>
   </property>
   <layout class="QGridLayout" name="gridLayout_2">
+   <property name="margin">
+    <number>0</number>
+   </property>
    <item row="0" column="0">
     <widget class="QSplitter" name="splitter_2">
      <property name="orientation">

src/ui/qgsexpressionbuilderdialogbase.ui

@@ -6,14 +6,17 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>625</width>
-    <height>554</height>
+    <width>507</width>
+    <height>539</height>
    </rect>
   </property>
   <property name="windowTitle">
    <string>Expression string builder</string>
   </property>
   <layout class="QGridLayout" name="gridLayout">
+   <property name="margin">
+    <number>3</number>
+   </property>
    <item row="0" column="0">
     <widget class="QgsExpressionBuilderWidget" name="builder" native="true">
      <property name="autoFillBackground">

src/ui/qgsexpressionselectiondialogbase.ui

@@ -14,6 +14,9 @@
    <string>Select By Expression</string>
   </property>
   <layout class="QGridLayout" name="gridLayout">
+   <property name="margin">
+    <number>3</number>
+   </property>
    <item row="1" column="0">
     <spacer name="horizontalSpacer">
      <property name="orientation">