Do not activate auxiliary data button everywhere

pblottiere · pblottiere · commit 703fbde035bd · 2017-10-09T05:13:59.000+01:00
diff --git a/python/gui/qgspropertyoverridebutton.sip b/python/gui/qgspropertyoverridebutton.sip
@@ -42,25 +42,29 @@ class QgsPropertyOverrideButton: QToolButton
     void init( int propertyKey,
                const QgsProperty &property,
                const QgsPropertiesDefinition &definitions,
-               const QgsVectorLayer *layer = 0 );
+               const QgsVectorLayer *layer = 0,
+               bool auxiliaryStorageEnabled = false );
 %Docstring
  Initialize a newly constructed property button (useful if button was included in a UI layout).
  \param propertyKey key for corresponding property
  \param property initial value of associated property to show in widget
  \param definitions properties definitions for corresponding collection
  \param layer associated vector layer
+ \param auxiliaryStorageEnabled If true, activate the button to store data defined in auxiliary storage
 %End
 
     void init( int propertyKey,
                const QgsAbstractPropertyCollection &collection,
                const QgsPropertiesDefinition &definitions,
-               const QgsVectorLayer *layer = 0 );
+               const QgsVectorLayer *layer = 0,
+               bool auxiliaryStorageEnabled = false );
 %Docstring
  Initialize a newly constructed property button (useful if button was included in a UI layout).
  \param propertyKey key for corresponding property
  \param collection associated property collection
  \param definitions properties definitions for collection
  \param layer associated vector layer
+ \param auxiliaryStorageEnabled If true, activate the button to store data defined in auxiliary storage
 %End
 
     QgsProperty toProperty() const;
diff --git a/src/app/qgsdiagramproperties.cpp b/src/app/qgsdiagramproperties.cpp
@@ -486,7 +486,7 @@ QgsDiagramProperties::~QgsDiagramProperties()
 
 void QgsDiagramProperties::registerDataDefinedButton( QgsPropertyOverrideButton *button, QgsDiagramLayerSettings::Property key )
 {
-  button->init( key, mDataDefinedProperties, QgsDiagramLayerSettings::propertyDefinitions(), mLayer );
+  button->init( key, mDataDefinedProperties, QgsDiagramLayerSettings::propertyDefinitions(), mLayer, true );
   connect( button, &QgsPropertyOverrideButton::changed, this, &QgsDiagramProperties::updateProperty );
   connect( button, &QgsPropertyOverrideButton::createAuxiliaryField, this, &QgsDiagramProperties::createAuxiliaryField );
   button->registerExpressionContextGenerator( this );
diff --git a/src/app/qgslabelinggui.cpp b/src/app/qgslabelinggui.cpp
@@ -46,7 +46,7 @@ QgsExpressionContext QgsLabelingGui::createExpressionContext() const
 
 void QgsLabelingGui::registerDataDefinedButton( QgsPropertyOverrideButton *button, QgsPalLayerSettings::Property key )
 {
-  button->init( key, mDataDefinedProperties, QgsPalLayerSettings::propertyDefinitions(), mLayer );
+  button->init( key, mDataDefinedProperties, QgsPalLayerSettings::propertyDefinitions(), mLayer, true );
   connect( button, &QgsPropertyOverrideButton::changed, this, &QgsLabelingGui::updateProperty );
   connect( button, &QgsPropertyOverrideButton::createAuxiliaryField, this, &QgsLabelingGui::createAuxiliaryField );
   button->registerExpressionContextGenerator( this );
diff --git a/src/gui/qgspropertyoverridebutton.cpp b/src/gui/qgspropertyoverridebutton.cpp
@@ -83,9 +83,10 @@ QgsPropertyOverrideButton::QgsPropertyOverrideButton( QWidget *parent,
 }
 
 
-void QgsPropertyOverrideButton::init( int propertyKey, const QgsProperty &property, const QgsPropertiesDefinition &definitions, const QgsVectorLayer *layer )
+void QgsPropertyOverrideButton::init( int propertyKey, const QgsProperty &property, const QgsPropertiesDefinition &definitions, const QgsVectorLayer *layer, bool auxiliaryStorageEnabled )
 {
   mVectorLayer = layer;
+  mAuxiliaryStorageEnabled = auxiliaryStorageEnabled;
   setToProperty( property );
   mPropertyKey = propertyKey;
 
@@ -126,9 +127,9 @@ void QgsPropertyOverrideButton::init( int propertyKey, const QgsProperty &proper
   updateGui();
 }
 
-void QgsPropertyOverrideButton::init( int propertyKey, const QgsAbstractPropertyCollection &collection, const QgsPropertiesDefinition &definitions, const QgsVectorLayer *layer )
+void QgsPropertyOverrideButton::init( int propertyKey, const QgsAbstractPropertyCollection &collection, const QgsPropertiesDefinition &definitions, const QgsVectorLayer *layer, bool auxiliaryStorageEnabled )
 {
-  init( propertyKey, collection.property( propertyKey ), definitions, layer );
+  init( propertyKey, collection.property( propertyKey ), definitions, layer, auxiliaryStorageEnabled );
 }
 
 
@@ -334,18 +335,21 @@ void QgsPropertyOverrideButton::aboutToShowMenu()
   mDefineMenu->addSeparator();
 
   // deactivate button if field already exists
-  mDefineMenu->addAction( mActionCreateAuxiliaryField );
+  if ( mAuxiliaryStorageEnabled )
+  {
+    mDefineMenu->addAction( mActionCreateAuxiliaryField );
 
-  const QgsAuxiliaryLayer *alayer = mVectorLayer->auxiliaryLayer();
+    const QgsAuxiliaryLayer *alayer = mVectorLayer->auxiliaryLayer();
 
-  mActionCreateAuxiliaryField->setEnabled( true );
-  mActionCreateAuxiliaryField->setChecked( false );
-  if ( alayer && alayer->exists( mDefinition ) )
-  {
-    if ( mProperty.field() == QgsAuxiliaryField::nameFromProperty( mDefinition, true ) )
+    mActionCreateAuxiliaryField->setEnabled( true );
+    mActionCreateAuxiliaryField->setChecked( false );
+    if ( alayer && alayer->exists( mDefinition ) )
     {
-      mActionCreateAuxiliaryField->setEnabled( false );
-      mActionCreateAuxiliaryField->setChecked( true );
+      if ( mProperty.field() == QgsAuxiliaryField::nameFromProperty( mDefinition, true ) )
+      {
+        mActionCreateAuxiliaryField->setEnabled( false );
+        mActionCreateAuxiliaryField->setChecked( true );
+      }
     }
   }
 
diff --git a/src/gui/qgspropertyoverridebutton.h b/src/gui/qgspropertyoverridebutton.h
@@ -69,23 +69,27 @@ class GUI_EXPORT QgsPropertyOverrideButton: public QToolButton
      * \param property initial value of associated property to show in widget
      * \param definitions properties definitions for corresponding collection
      * \param layer associated vector layer
+     * \param auxiliaryStorageEnabled If true, activate the button to store data defined in auxiliary storage
      */
     void init( int propertyKey,
                const QgsProperty &property,
                const QgsPropertiesDefinition &definitions,
-               const QgsVectorLayer *layer = nullptr );
+               const QgsVectorLayer *layer = nullptr,
+               bool auxiliaryStorageEnabled = false );
 
     /**
      * Initialize a newly constructed property button (useful if button was included in a UI layout).
      * \param propertyKey key for corresponding property
      * \param collection associated property collection
      * \param definitions properties definitions for collection
      * \param layer associated vector layer
+     * \param auxiliaryStorageEnabled If true, activate the button to store data defined in auxiliary storage
      */
     void init( int propertyKey,
                const QgsAbstractPropertyCollection &collection,
                const QgsPropertiesDefinition &definitions,
-               const QgsVectorLayer *layer = nullptr );
+               const QgsVectorLayer *layer = nullptr,
+               bool auxiliaryStorageEnabled = false );
 
     /**
      * Returns a QgsProperty object encapsulating the current state of the
@@ -295,6 +299,8 @@ class GUI_EXPORT QgsPropertyOverrideButton: public QToolButton
     //! Internal property used for storing state of widget
     QgsProperty mProperty;
 
+    bool mAuxiliaryStorageEnabled = false;
+
     std::shared_ptr< QgsSymbol > mSymbol;
 
   private slots:
diff --git a/src/gui/symbology/qgssymbollayerwidget.cpp b/src/gui/symbology/qgssymbollayerwidget.cpp
@@ -111,7 +111,7 @@ QgsSymbolWidgetContext QgsSymbolLayerWidget::context() const
 
 void QgsSymbolLayerWidget::registerDataDefinedButton( QgsPropertyOverrideButton *button, QgsSymbolLayer::Property key )
 {
-  button->init( key, symbolLayer()->dataDefinedProperties(), QgsSymbolLayer::propertyDefinitions(), mVectorLayer );
+  button->init( key, symbolLayer()->dataDefinedProperties(), QgsSymbolLayer::propertyDefinitions(), mVectorLayer, true );
   connect( button, &QgsPropertyOverrideButton::changed, this, &QgsSymbolLayerWidget::updateDataDefinedProperty );
   connect( button, &QgsPropertyOverrideButton::createAuxiliaryField, this, &QgsSymbolLayerWidget::createAuxiliaryField );
 
diff --git a/src/gui/symbology/qgssymbolslistwidget.cpp b/src/gui/symbology/qgssymbolslistwidget.cpp
@@ -559,10 +559,10 @@ void QgsSymbolsListWidget::updateSymbolInfo()
     if ( mLayer )
     {
       QgsProperty ddSize( markerSymbol->dataDefinedSize() );
-      mSizeDDBtn->init( QgsSymbolLayer::PropertySize, ddSize, QgsSymbolLayer::propertyDefinitions(), mLayer );
+      mSizeDDBtn->init( QgsSymbolLayer::PropertySize, ddSize, QgsSymbolLayer::propertyDefinitions(), mLayer, true );
       spinSize->setEnabled( !mSizeDDBtn->isActive() );
       QgsProperty ddAngle( markerSymbol->dataDefinedAngle() );
-      mRotationDDBtn->init( QgsSymbolLayer::PropertyAngle, ddAngle, QgsSymbolLayer::propertyDefinitions(), mLayer );
+      mRotationDDBtn->init( QgsSymbolLayer::PropertyAngle, ddAngle, QgsSymbolLayer::propertyDefinitions(), mLayer, true );
       spinAngle->setEnabled( !mRotationDDBtn->isActive() );
     }
     else
@@ -579,7 +579,7 @@ void QgsSymbolsListWidget::updateSymbolInfo()
     if ( mLayer )
     {
       QgsProperty dd( lineSymbol->dataDefinedWidth() );
-      mWidthDDBtn->init( QgsSymbolLayer::PropertyStrokeWidth, dd, QgsSymbolLayer::propertyDefinitions(), mLayer );
+      mWidthDDBtn->init( QgsSymbolLayer::PropertyStrokeWidth, dd, QgsSymbolLayer::propertyDefinitions(), mLayer, true );
       spinWidth->setEnabled( !mWidthDDBtn->isActive() );
     }
     else

Original file line number	Diff line number	Diff line change
`@@ -486,7 +486,7 @@ QgsDiagramProperties::~QgsDiagramProperties()`
`486`	`486`
`487`	`487`	`void QgsDiagramProperties::registerDataDefinedButton( QgsPropertyOverrideButton *button, QgsDiagramLayerSettings::Property key )`
`488`	`488`	`{`
`489`		`- button->init( key, mDataDefinedProperties, QgsDiagramLayerSettings::propertyDefinitions(), mLayer );`
	`489`	`+ button->init( key, mDataDefinedProperties, QgsDiagramLayerSettings::propertyDefinitions(), mLayer, true );`
`490`	`490`	`connect( button, &QgsPropertyOverrideButton::changed, this, &QgsDiagramProperties::updateProperty );`
`491`	`491`	`connect( button, &QgsPropertyOverrideButton::createAuxiliaryField, this, &QgsDiagramProperties::createAuxiliaryField );`
`492`	`492`	`button->registerExpressionContextGenerator( this );`
Original file line number	Diff line number	Diff line change
`@@ -46,7 +46,7 @@ QgsExpressionContext QgsLabelingGui::createExpressionContext() const`
`46`	`46`
`47`	`47`	`void QgsLabelingGui::registerDataDefinedButton( QgsPropertyOverrideButton *button, QgsPalLayerSettings::Property key )`
`48`	`48`	`{`
`49`		`- button->init( key, mDataDefinedProperties, QgsPalLayerSettings::propertyDefinitions(), mLayer );`
	`49`	`+ button->init( key, mDataDefinedProperties, QgsPalLayerSettings::propertyDefinitions(), mLayer, true );`
`50`	`50`	`connect( button, &QgsPropertyOverrideButton::changed, this, &QgsLabelingGui::updateProperty );`
`51`	`51`	`connect( button, &QgsPropertyOverrideButton::createAuxiliaryField, this, &QgsLabelingGui::createAuxiliaryField );`
`52`	`52`	`button->registerExpressionContextGenerator( this );`
Original file line number	Diff line number	Diff line change
`@@ -83,9 +83,10 @@ QgsPropertyOverrideButton::QgsPropertyOverrideButton( QWidget *parent,`
`83`	`83`	`}`
`84`	`84`
`85`	`85`
`86`		`-void QgsPropertyOverrideButton::init( int propertyKey, const QgsProperty &property, const QgsPropertiesDefinition &definitions, const QgsVectorLayer *layer )`
	`86`	`+void QgsPropertyOverrideButton::init( int propertyKey, const QgsProperty &property, const QgsPropertiesDefinition &definitions, const QgsVectorLayer *layer, bool auxiliaryStorageEnabled )`
`87`	`87`	`{`
`88`	`88`	`mVectorLayer = layer;`
	`89`	`+ mAuxiliaryStorageEnabled = auxiliaryStorageEnabled;`
`89`	`90`	`setToProperty( property );`
`90`	`91`	`mPropertyKey = propertyKey;`
`91`	`92`
`@@ -126,9 +127,9 @@ void QgsPropertyOverrideButton::init( int propertyKey, const QgsProperty &proper`
`126`	`127`	`updateGui();`
`127`	`128`	`}`
`128`	`129`
`129`		`-void QgsPropertyOverrideButton::init( int propertyKey, const QgsAbstractPropertyCollection &collection, const QgsPropertiesDefinition &definitions, const QgsVectorLayer *layer )`
	`130`	`+void QgsPropertyOverrideButton::init( int propertyKey, const QgsAbstractPropertyCollection &collection, const QgsPropertiesDefinition &definitions, const QgsVectorLayer *layer, bool auxiliaryStorageEnabled )`
`130`	`131`	`{`
`131`		`- init( propertyKey, collection.property( propertyKey ), definitions, layer );`
	`132`	`+ init( propertyKey, collection.property( propertyKey ), definitions, layer, auxiliaryStorageEnabled );`
`132`	`133`	`}`
`133`	`134`
`134`	`135`
`@@ -334,18 +335,21 @@ void QgsPropertyOverrideButton::aboutToShowMenu()`
`334`	`335`	`mDefineMenu->addSeparator();`
`335`	`336`
`336`	`337`	`// deactivate button if field already exists`
`337`		`- mDefineMenu->addAction( mActionCreateAuxiliaryField );`
	`338`	`+ if ( mAuxiliaryStorageEnabled )`
	`339`	`+ {`
	`340`	`+ mDefineMenu->addAction( mActionCreateAuxiliaryField );`
`338`	`341`
`339`		`- const QgsAuxiliaryLayer *alayer = mVectorLayer->auxiliaryLayer();`
	`342`	`+ const QgsAuxiliaryLayer *alayer = mVectorLayer->auxiliaryLayer();`
`340`	`343`
`341`		`- mActionCreateAuxiliaryField->setEnabled( true );`
`342`		`- mActionCreateAuxiliaryField->setChecked( false );`
`343`		`- if ( alayer && alayer->exists( mDefinition ) )`
`344`		`- {`
`345`		`- if ( mProperty.field() == QgsAuxiliaryField::nameFromProperty( mDefinition, true ) )`
	`344`	`+ mActionCreateAuxiliaryField->setEnabled( true );`
	`345`	`+ mActionCreateAuxiliaryField->setChecked( false );`
	`346`	`+ if ( alayer && alayer->exists( mDefinition ) )`
`346`	`347`	`{`
`347`		`- mActionCreateAuxiliaryField->setEnabled( false );`
`348`		`- mActionCreateAuxiliaryField->setChecked( true );`
	`348`	`+ if ( mProperty.field() == QgsAuxiliaryField::nameFromProperty( mDefinition, true ) )`
	`349`	`+ {`
	`350`	`+ mActionCreateAuxiliaryField->setEnabled( false );`
	`351`	`+ mActionCreateAuxiliaryField->setChecked( true );`
	`352`	`+ }`
`349`	`353`	`}`
`350`	`354`	`}`
`351`	`355`
Original file line number	Diff line number	Diff line change
`@@ -111,7 +111,7 @@ QgsSymbolWidgetContext QgsSymbolLayerWidget::context() const`
`111`	`111`
`112`	`112`	`void QgsSymbolLayerWidget::registerDataDefinedButton( QgsPropertyOverrideButton *button, QgsSymbolLayer::Property key )`
`113`	`113`	`{`
`114`		`- button->init( key, symbolLayer()->dataDefinedProperties(), QgsSymbolLayer::propertyDefinitions(), mVectorLayer );`
	`114`	`+ button->init( key, symbolLayer()->dataDefinedProperties(), QgsSymbolLayer::propertyDefinitions(), mVectorLayer, true );`
`115`	`115`	`connect( button, &QgsPropertyOverrideButton::changed, this, &QgsSymbolLayerWidget::updateDataDefinedProperty );`
`116`	`116`	`connect( button, &QgsPropertyOverrideButton::createAuxiliaryField, this, &QgsSymbolLayerWidget::createAuxiliaryField );`
`117`	`117`
Original file line number	Diff line number	Diff line change
`@@ -559,10 +559,10 @@ void QgsSymbolsListWidget::updateSymbolInfo()`
`559`	`559`	`if ( mLayer )`
`560`	`560`	`{`
`561`	`561`	`QgsProperty ddSize( markerSymbol->dataDefinedSize() );`
`562`		`- mSizeDDBtn->init( QgsSymbolLayer::PropertySize, ddSize, QgsSymbolLayer::propertyDefinitions(), mLayer );`
	`562`	`+ mSizeDDBtn->init( QgsSymbolLayer::PropertySize, ddSize, QgsSymbolLayer::propertyDefinitions(), mLayer, true );`
`563`	`563`	`spinSize->setEnabled( !mSizeDDBtn->isActive() );`
`564`	`564`	`QgsProperty ddAngle( markerSymbol->dataDefinedAngle() );`
`565`		`- mRotationDDBtn->init( QgsSymbolLayer::PropertyAngle, ddAngle, QgsSymbolLayer::propertyDefinitions(), mLayer );`
	`565`	`+ mRotationDDBtn->init( QgsSymbolLayer::PropertyAngle, ddAngle, QgsSymbolLayer::propertyDefinitions(), mLayer, true );`
`566`	`566`	`spinAngle->setEnabled( !mRotationDDBtn->isActive() );`
`567`	`567`	`}`
`568`	`568`	`else`
`@@ -579,7 +579,7 @@ void QgsSymbolsListWidget::updateSymbolInfo()`
`579`	`579`	`if ( mLayer )`
`580`	`580`	`{`
`581`	`581`	`QgsProperty dd( lineSymbol->dataDefinedWidth() );`
`582`		`- mWidthDDBtn->init( QgsSymbolLayer::PropertyStrokeWidth, dd, QgsSymbolLayer::propertyDefinitions(), mLayer );`
	`582`	`+ mWidthDDBtn->init( QgsSymbolLayer::PropertyStrokeWidth, dd, QgsSymbolLayer::propertyDefinitions(), mLayer, true );`
`583`	`583`	`spinWidth->setEnabled( !mWidthDDBtn->isActive() );`
`584`	`584`	`}`
`585`	`585`	`else`