Use QgsExpressionLineEdit for geometry generator expression

nyalldawson · nyalldawson · commit c468a0471c17 · 2016-08-22T08:39:33.000+10:00
The full expression builder widget is too large to fit
comfortable in the geometry generator setting widget,
especially when used in layer styling dock mode.
diff --git a/src/gui/symbology-ng/qgssymbollayerwidget.cpp b/src/gui/symbology-ng/qgssymbollayerwidget.cpp
@@ -3346,23 +3346,20 @@ QgsGeometryGeneratorSymbolLayerWidget::QgsGeometryGeneratorSymbolLayerWidget( co
     , mLayer( nullptr )
 {
   setupUi( this );
+  modificationExpressionSelector->setMultiLine( true );
   modificationExpressionSelector->setLayer( const_cast<QgsVectorLayer*>( vl ) );
-  modificationExpressionSelector->loadFieldNames();
-  modificationExpressionSelector->setExpressionContext( createExpressionContext() );
+  modificationExpressionSelector->registerExpressionContextGenerator( this );
   cbxGeometryType->addItem( QgsApplication::getThemeIcon( "/mIconPolygonLayer.svg" ), tr( "Polygon / MultiPolygon" ), QgsSymbol::Fill );
   cbxGeometryType->addItem( QgsApplication::getThemeIcon( "/mIconLineLayer.svg" ), tr( "LineString / MultiLineString" ), QgsSymbol::Line );
   cbxGeometryType->addItem( QgsApplication::getThemeIcon( "/mIconPointLayer.svg" ), tr( "Point / MultiPoint" ), QgsSymbol::Marker );
-  connect( modificationExpressionSelector, SIGNAL( expressionParsed( bool ) ), this, SLOT( updateExpression() ) );
+  connect( modificationExpressionSelector, SIGNAL( expressionChanged( QString ) ), this, SLOT( updateExpression( QString ) ) );
   connect( cbxGeometryType, SIGNAL( currentIndexChanged( int ) ), this, SLOT( updateSymbolType() ) );
 }
 
 void QgsGeometryGeneratorSymbolLayerWidget::setSymbolLayer( QgsSymbolLayer* l )
 {
   mLayer = static_cast<QgsGeometryGeneratorSymbolLayer*>( l );
-
-  if ( mPresetExpressionContext )
-    modificationExpressionSelector->setExpressionContext( *mPresetExpressionContext );
-  modificationExpressionSelector->setExpressionText( mLayer->geometryExpression() );
+  modificationExpressionSelector->setExpression( mLayer->geometryExpression() );
   cbxGeometryType->setCurrentIndex( cbxGeometryType->findData( mLayer->symbolType() ) );
 }
 
@@ -3371,9 +3368,9 @@ QgsSymbolLayer* QgsGeometryGeneratorSymbolLayerWidget::symbolLayer()
   return mLayer;
 }
 
-void QgsGeometryGeneratorSymbolLayerWidget::updateExpression()
+void QgsGeometryGeneratorSymbolLayerWidget::updateExpression( const QString& string )
 {
-  mLayer->setGeometryExpression( modificationExpressionSelector->expressionText() );
+  mLayer->setGeometryExpression( string );
 
   emit changed();
 }
diff --git a/src/gui/symbology-ng/qgssymbollayerwidget.h b/src/gui/symbology-ng/qgssymbollayerwidget.h
@@ -29,7 +29,7 @@ class QgsMapCanvas;
 /** \ingroup gui
  * \class QgsSymbolLayerWidget
  */
-class GUI_EXPORT QgsSymbolLayerWidget : public QWidget, private QgsExpressionContextGenerator
+class GUI_EXPORT QgsSymbolLayerWidget : public QWidget, protected QgsExpressionContextGenerator
 {
     Q_OBJECT
 
@@ -797,7 +797,7 @@ class GUI_EXPORT QgsGeometryGeneratorSymbolLayerWidget : public QgsSymbolLayerWi
     QgsGeometryGeneratorSymbolLayer* mLayer;
 
   private slots:
-    void updateExpression();
+    void updateExpression( const QString& string );
     void updateSymbolType();
 };
 
diff --git a/src/ui/symbollayer/qgsgeometrygeneratorwidgetbase.ui b/src/ui/symbollayer/qgsgeometrygeneratorwidgetbase.ui
@@ -15,13 +15,7 @@
   </property>
   <layout class="QGridLayout" name="gridLayout">
    <item row="1" column="0" colspan="2">
-    <widget class="QgsExpressionBuilderWidget" name="modificationExpressionSelector" native="true">
-     <layout class="QGridLayout" name="gridLayout_2">
-      <property name="margin">
-       <number>0</number>
-      </property>
-     </layout>
-    </widget>
+    <widget class="QgsExpressionLineEdit" name="modificationExpressionSelector" native="true"/>
    </item>
    <item row="0" column="1">
     <widget class="QComboBox" name="cbxGeometryType"/>
@@ -43,9 +37,9 @@
  </widget>
  <customwidgets>
   <customwidget>
-   <class>QgsExpressionBuilderWidget</class>
+   <class>QgsExpressionLineEdit</class>
    <extends>QWidget</extends>
-   <header>qgsexpressionbuilderwidget.h</header>
+   <header>qgsexpressionlineedit.h</header>
    <container>1</container>
   </customwidget>
  </customwidgets>

Original file line number	Diff line number	Diff line change
`@@ -3346,23 +3346,20 @@ QgsGeometryGeneratorSymbolLayerWidget::QgsGeometryGeneratorSymbolLayerWidget( co`
`3346`	`3346`	`, mLayer( nullptr )`
`3347`	`3347`	`{`
`3348`	`3348`	`setupUi( this );`
	`3349`	`+ modificationExpressionSelector->setMultiLine( true );`
`3349`	`3350`	`modificationExpressionSelector->setLayer( const_cast<QgsVectorLayer*>( vl ) );`
`3350`		`- modificationExpressionSelector->loadFieldNames();`
`3351`		`- modificationExpressionSelector->setExpressionContext( createExpressionContext() );`
	`3351`	`+ modificationExpressionSelector->registerExpressionContextGenerator( this );`
`3352`	`3352`	`cbxGeometryType->addItem( QgsApplication::getThemeIcon( "/mIconPolygonLayer.svg" ), tr( "Polygon / MultiPolygon" ), QgsSymbol::Fill );`
`3353`	`3353`	`cbxGeometryType->addItem( QgsApplication::getThemeIcon( "/mIconLineLayer.svg" ), tr( "LineString / MultiLineString" ), QgsSymbol::Line );`
`3354`	`3354`	`cbxGeometryType->addItem( QgsApplication::getThemeIcon( "/mIconPointLayer.svg" ), tr( "Point / MultiPoint" ), QgsSymbol::Marker );`
`3355`		`- connect( modificationExpressionSelector, SIGNAL( expressionParsed( bool ) ), this, SLOT( updateExpression() ) );`
	`3355`	`+ connect( modificationExpressionSelector, SIGNAL( expressionChanged( QString ) ), this, SLOT( updateExpression( QString ) ) );`
`3356`	`3356`	`connect( cbxGeometryType, SIGNAL( currentIndexChanged( int ) ), this, SLOT( updateSymbolType() ) );`
`3357`	`3357`	`}`
`3358`	`3358`
`3359`	`3359`	`void QgsGeometryGeneratorSymbolLayerWidget::setSymbolLayer( QgsSymbolLayer* l )`
`3360`	`3360`	`{`
`3361`	`3361`	`mLayer = static_cast<QgsGeometryGeneratorSymbolLayer*>( l );`
`3362`		`-`
`3363`		`- if ( mPresetExpressionContext )`
`3364`		`- modificationExpressionSelector->setExpressionContext( *mPresetExpressionContext );`
`3365`		`- modificationExpressionSelector->setExpressionText( mLayer->geometryExpression() );`
	`3362`	`+ modificationExpressionSelector->setExpression( mLayer->geometryExpression() );`
`3366`	`3363`	`cbxGeometryType->setCurrentIndex( cbxGeometryType->findData( mLayer->symbolType() ) );`
`3367`	`3364`	`}`
`3368`	`3365`
`@@ -3371,9 +3368,9 @@ QgsSymbolLayer* QgsGeometryGeneratorSymbolLayerWidget::symbolLayer()`
`3371`	`3368`	`return mLayer;`
`3372`	`3369`	`}`
`3373`	`3370`
`3374`		`-void QgsGeometryGeneratorSymbolLayerWidget::updateExpression()`
	`3371`	`+void QgsGeometryGeneratorSymbolLayerWidget::updateExpression( const QString& string )`
`3375`	`3372`	`{`
`3376`		`- mLayer->setGeometryExpression( modificationExpressionSelector->expressionText() );`
	`3373`	`+ mLayer->setGeometryExpression( string );`
`3377`	`3374`
`3378`	`3375`	`emit changed();`
`3379`	`3376`	`}`