Clean up GUI for properties

Author: nyalldawson

python/core/qgspropertytransformer.sip

@@ -5,9 +5,9 @@ class QgsPropertyTransformer
 %End
 
 %ConvertToSubClassCode
-  if (sipCpp->transformType() == QgsPropertyTransformer::SizeScaleTransformer)
+  if (sipCpp->transformerType() == QgsPropertyTransformer::SizeScaleTransformer)
 	sipType = sipType_QgsSizeScaleTransformer;
-  else if (sipCpp->transformType() == QgsPropertyTransformer::ColorRampTransformer)
+  else if (sipCpp->transformerType() == QgsPropertyTransformer::ColorRampTransformer)
 	sipType = sipType_QgsColorRampTransformer;
   else
 	sipType = sipType_QgsPropertyTransformer;

python/gui/gui.sip

@@ -143,6 +143,7 @@
 %Include qgsprevieweffect.sip
 %Include qgsprojectionselectionwidget.sip
 %Include qgsprojectionselector.sip
+%Include qgspropertyoverridebutton.sip
 %Include qgsquerybuilder.sip
 %Include qgsrasterformatsaveoptionswidget.sip
 %Include qgsrasterlayersaveasdialog.sip

python/gui/qgspropertyoverridebutton.sip

@@ -0,0 +1,58 @@
+class QgsPropertyOverrideButton : QToolButton
+{
+%TypeHeaderCode
+#include <qgspropertyoverridebutton.h>
+%End
+  public:
+
+    QgsPropertyOverrideButton( QWidget* parent /TransferThis/ = nullptr,
+                            const QgsVectorLayer* layer = nullptr );
+
+    void init( int propertyKey,
+               const QgsProperty& property,
+               const QgsPropertiesDefinition& definitions,
+               const QgsVectorLayer* layer = nullptr );
+
+    void init( int propertyKey,
+               const QgsAbstractPropertyCollection& collection,
+               const QgsPropertiesDefinition& definitions,
+               const QgsVectorLayer* layer = nullptr );
+
+    QgsProperty toProperty() const;
+
+    void setToProperty( const QgsProperty& property );
+
+    int propertyKey() const;
+
+    bool isActive() const;
+
+    QgsPropertyDefinition::DataType validDataType() const;
+
+    QString fullDescription() const;
+
+    QString usageInfo() const;
+
+    void setUsageInfo( const QString& info );
+
+    void setVectorLayer( const QgsVectorLayer* layer );
+
+    const QgsVectorLayer* vectorLayer() const;
+
+    void registerCheckedWidget( QWidget* widget );
+
+    void registerExpressionContextGenerator( QgsExpressionContextGenerator* generator );
+
+  public slots:
+
+    void setActive( bool active );
+
+  signals:
+
+    void changed();
+
+    void activated( bool isActive );
+
+  protected:
+    void mouseReleaseEvent( QMouseEvent *event );
+};
+

src/app/composer/qgscomposerhtmlwidget.cpp

@@ -65,7 +65,7 @@ QgsComposerHtmlWidget::QgsComposerHtmlWidget( QgsComposerHtml* html, QgsComposer
   }
 
   //connections for data defined buttons
-  connect( mUrlDDBtn, &QgsDataDefinedButtonV2::activated, mUrlLineEdit, &QLineEdit::setDisabled );
+  connect( mUrlDDBtn, &QgsPropertyOverrideButton::activated, mUrlLineEdit, &QLineEdit::setDisabled );
   registerDataDefinedButton( mUrlDDBtn, QgsComposerObject::SourceUrl );
 }
 

src/app/composer/qgscomposeritemwidget.cpp

@@ -21,7 +21,7 @@
 #include "qgsatlascomposition.h"
 #include "qgscomposition.h"
 #include "qgspoint.h"
-#include "qgsdatadefinedbuttonv2.h"
+#include "qgspropertyoverridebutton.h"
 #include "qgsexpressioncontext.h"
 #include "qgsproject.h"
 #include <QColorDialog>
@@ -46,7 +46,7 @@ QgsComposerConfigObject::~QgsComposerConfigObject()
 void QgsComposerConfigObject::updateDataDefinedProperty()
 {
   //match data defined button to item's data defined property
-  QgsDataDefinedButtonV2* ddButton = qobject_cast<QgsDataDefinedButtonV2*>( sender() );
+  QgsPropertyOverrideButton* ddButton = qobject_cast<QgsPropertyOverrideButton*>( sender() );
   if ( !ddButton )
   {
     return;
@@ -68,22 +68,22 @@ void QgsComposerConfigObject::updateDataDefinedProperty()
 
 void QgsComposerConfigObject::updateDataDefinedButtons()
 {
-  Q_FOREACH ( QgsDataDefinedButtonV2* button, findChildren< QgsDataDefinedButtonV2* >() )
+  Q_FOREACH ( QgsPropertyOverrideButton* button, findChildren< QgsPropertyOverrideButton* >() )
   {
     button->setVectorLayer( atlasCoverageLayer() );
   }
 }
 
-void QgsComposerConfigObject::initializeDataDefinedButton( QgsDataDefinedButtonV2* button, QgsComposerObject::DataDefinedProperty key )
+void QgsComposerConfigObject::initializeDataDefinedButton( QgsPropertyOverrideButton* button, QgsComposerObject::DataDefinedProperty key )
 {
   button->blockSignals( true );
   button->init( key, mComposerObject->dataDefinedProperties(), QgsComposerObject::PROPERTY_DEFINITIONS, atlasCoverageLayer() );
-  connect( button, &QgsDataDefinedButtonV2::changed, this, &QgsComposerConfigObject::updateDataDefinedProperty );
+  connect( button, &QgsPropertyOverrideButton::changed, this, &QgsComposerConfigObject::updateDataDefinedProperty );
   button->registerExpressionContextGenerator( mComposerObject );
   button->blockSignals( false );
 }
 
-void QgsComposerConfigObject::updateDataDefinedButton( QgsDataDefinedButtonV2* button )
+void QgsComposerConfigObject::updateDataDefinedButton( QgsPropertyOverrideButton* button )
 {
   if ( !button )
     return;
@@ -551,7 +551,7 @@ void QgsComposerItemWidget::initializeDataDefinedButtons()
 
 void QgsComposerItemWidget::populateDataDefinedButtons()
 {
-  Q_FOREACH ( QgsDataDefinedButtonV2* button, findChildren< QgsDataDefinedButtonV2* >() )
+  Q_FOREACH ( QgsPropertyOverrideButton* button, findChildren< QgsPropertyOverrideButton* >() )
   {
     mConfigObject->updateDataDefinedButton( button );
   }
@@ -781,12 +781,12 @@ QgsComposerItemBaseWidget::QgsComposerItemBaseWidget( QWidget* parent, QgsCompos
 
 }
 
-void QgsComposerItemBaseWidget::registerDataDefinedButton( QgsDataDefinedButtonV2* button, QgsComposerObject::DataDefinedProperty property )
+void QgsComposerItemBaseWidget::registerDataDefinedButton( QgsPropertyOverrideButton* button, QgsComposerObject::DataDefinedProperty property )
 {
   mConfigObject->initializeDataDefinedButton( button, property );
 }
 
-void QgsComposerItemBaseWidget::updateDataDefinedButton( QgsDataDefinedButtonV2* button )
+void QgsComposerItemBaseWidget::updateDataDefinedButton( QgsPropertyOverrideButton* button )
 {
   mConfigObject->updateDataDefinedButton( button );
 }

src/app/composer/qgscomposeritemwidget.h

@@ -60,12 +60,12 @@ class QgsComposerConfigObject: public QObject
      * @param button button to register
      * @param key corresponding data defined property key
      */
-    void initializeDataDefinedButton( QgsDataDefinedButtonV2* button, QgsComposerObject::DataDefinedProperty key );
+    void initializeDataDefinedButton( QgsPropertyOverrideButton* button, QgsComposerObject::DataDefinedProperty key );
 
     /**
      * Updates a data defined button to reflect the item's current properties.
      */
-    void updateDataDefinedButton( QgsDataDefinedButtonV2* button );
+    void updateDataDefinedButton( QgsPropertyOverrideButton* button );
 
     //! Returns the current atlas coverage layer (if set)
     QgsVectorLayer* atlasCoverageLayer() const;
@@ -102,12 +102,12 @@ class QgsComposerItemBaseWidget: public QgsPanelWidget
      * @param button button to register
      * @param property corresponding data defined property key
      */
-    void registerDataDefinedButton( QgsDataDefinedButtonV2* button, QgsComposerObject::DataDefinedProperty property );
+    void registerDataDefinedButton( QgsPropertyOverrideButton* button, QgsComposerObject::DataDefinedProperty property );
 
     /**
      * Updates a previously registered data defined button to reflect the item's current properties.
      */
-    void updateDataDefinedButton( QgsDataDefinedButtonV2* button );
+    void updateDataDefinedButton( QgsPropertyOverrideButton* button );
 
     //! Returns the current atlas coverage layer (if set)
     QgsVectorLayer* atlasCoverageLayer() const;

src/app/composer/qgscomposerpicturewidget.cpp

@@ -77,7 +77,7 @@ QgsComposerPictureWidget::QgsComposerPictureWidget( QgsComposerPicture* picture
   connect( mPicture, SIGNAL( pictureRotationChanged( double ) ), this, SLOT( setPicRotationSpinValue( double ) ) );
 
   //connections for data defined buttons
-  connect( mSourceDDBtn, &QgsDataDefinedButtonV2::activated, mPictureLineEdit, &QLineEdit::setDisabled );
+  connect( mSourceDDBtn, &QgsPropertyOverrideButton::activated, mPictureLineEdit, &QLineEdit::setDisabled );
   registerDataDefinedButton( mSourceDDBtn, QgsComposerObject::PictureSource );
   registerDataDefinedButton( mFillColorDDBtn, QgsComposerObject::PictureSvgBackgroundColor );
   registerDataDefinedButton( mOutlineColorDDBtn, QgsComposerObject::PictureSvgOutlineColor );

src/app/composer/qgscompositionwidget.cpp

@@ -108,11 +108,11 @@ QgsCompositionWidget::QgsCompositionWidget( QWidget* parent, QgsComposition* c )
   connect( mBottomMarginSpinBox, SIGNAL( valueChanged( double ) ), this, SLOT( resizeMarginsChanged() ) );
   connect( mLeftMarginSpinBox, SIGNAL( valueChanged( double ) ), this, SLOT( resizeMarginsChanged() ) );
 
-  connect( mPaperSizeDDBtn, &QgsDataDefinedButtonV2::activated, mPaperSizeComboBox, &QComboBox::setDisabled );
-  connect( mPaperWidthDDBtn, &QgsDataDefinedButtonV2::activated, mPaperWidthDoubleSpinBox, &QgsDoubleSpinBox::setDisabled );
-  connect( mPaperHeightDDBtn, &QgsDataDefinedButtonV2::activated, mPaperHeightDoubleSpinBox, &QgsDoubleSpinBox::setDisabled );
-  connect( mNumPagesDDBtn, &QgsDataDefinedButtonV2::activated, mNumPagesSpinBox, &QgsSpinBox::setDisabled );
-  connect( mPaperOrientationDDBtn, &QgsDataDefinedButtonV2::activated, mPaperOrientationComboBox, &QComboBox::setDisabled );
+  connect( mPaperSizeDDBtn, &QgsPropertyOverrideButton::activated, mPaperSizeComboBox, &QComboBox::setDisabled );
+  connect( mPaperWidthDDBtn, &QgsPropertyOverrideButton::activated, mPaperWidthDoubleSpinBox, &QgsDoubleSpinBox::setDisabled );
+  connect( mPaperHeightDDBtn, &QgsPropertyOverrideButton::activated, mPaperHeightDoubleSpinBox, &QgsDoubleSpinBox::setDisabled );
+  connect( mNumPagesDDBtn, &QgsPropertyOverrideButton::activated, mNumPagesSpinBox, &QgsSpinBox::setDisabled );
+  connect( mPaperOrientationDDBtn, &QgsPropertyOverrideButton::activated, mPaperOrientationComboBox, &QComboBox::setDisabled );
 
   connect( mReferenceMapComboBox, &QgsComposerItemComboBox::itemChanged, this, &QgsCompositionWidget::referenceMapChanged );
 
@@ -149,11 +149,11 @@ void QgsCompositionWidget::populateDataDefinedButtons()
     vl = atlas->coverageLayer();
   }
 
-  Q_FOREACH ( QgsDataDefinedButtonV2* button, findChildren< QgsDataDefinedButtonV2* >() )
+  Q_FOREACH ( QgsPropertyOverrideButton* button, findChildren< QgsPropertyOverrideButton* >() )
   {
     button->blockSignals( true );
     button->registerExpressionContextGenerator( mComposition );
-    connect( button, &QgsDataDefinedButtonV2::changed, this, &QgsCompositionWidget::updateDataDefinedProperty );
+    connect( button, &QgsPropertyOverrideButton::changed, this, &QgsCompositionWidget::updateDataDefinedProperty );
   }
 
   mPaperSizeDDBtn->init( QgsComposerObject::PresetPaperSize, mComposition->dataDefinedProperties(), QgsComposerObject::PROPERTY_DEFINITIONS, vl );
@@ -165,7 +165,7 @@ void QgsCompositionWidget::populateDataDefinedButtons()
   //initial state of controls - disable related controls when dd buttons are active
   mPaperSizeComboBox->setEnabled( !mPaperSizeDDBtn->isActive() );
 
-  Q_FOREACH ( QgsDataDefinedButtonV2* button, findChildren< QgsDataDefinedButtonV2* >() )
+  Q_FOREACH ( QgsPropertyOverrideButton* button, findChildren< QgsPropertyOverrideButton* >() )
   {
     button->blockSignals( false );
   }
@@ -216,7 +216,7 @@ void QgsCompositionWidget::cleanUpStyleSelector( QgsPanelWidget* container )
 
 void QgsCompositionWidget::updateDataDefinedProperty()
 {
-  QgsDataDefinedButtonV2* ddButton = qobject_cast<QgsDataDefinedButtonV2*>( sender() );
+  QgsPropertyOverrideButton* ddButton = qobject_cast<QgsPropertyOverrideButton*>( sender() );
   if ( !ddButton || !mComposition )
   {
     return;

src/app/composer/qgscompositionwidget.h

@@ -114,6 +114,6 @@ class QgsCompositionWidget: public QgsPanelWidget, private Ui::QgsCompositionWid
     void blockSignals( bool block );
 
     //! Sets a data defined property for the item from its current data defined button settings
-    void setDataDefinedProperty( const QgsDataDefinedButtonV2 *ddBtn, QgsComposerObject::DataDefinedProperty property );
+    void setDataDefinedProperty( const QgsPropertyOverrideButton *ddBtn, QgsComposerObject::DataDefinedProperty property );
 
 };

src/app/qgsdiagramproperties.cpp

@@ -427,16 +427,16 @@ QgsDiagramProperties::~QgsDiagramProperties()
   settings.setValue( QStringLiteral( "/Windows/Diagrams/Tab" ), mDiagramOptionsListWidget->currentRow() );
 }
 
-void QgsDiagramProperties::registerDataDefinedButton( QgsDataDefinedButtonV2 * button, QgsDiagramLayerSettings::Property key )
+void QgsDiagramProperties::registerDataDefinedButton( QgsPropertyOverrideButton * button, QgsDiagramLayerSettings::Property key )
 {
   button->init( key, mProperties, QgsDiagramLayerSettings::PROPERTY_DEFINITIONS, mLayer );
-  connect( button, &QgsDataDefinedButtonV2::changed, this, &QgsDiagramProperties::updateProperty );
+  connect( button, &QgsPropertyOverrideButton::changed, this, &QgsDiagramProperties::updateProperty );
   button->registerExpressionContextGenerator( this );
 }
 
 void QgsDiagramProperties::updateProperty()
 {
-  QgsDataDefinedButtonV2* button = qobject_cast<QgsDataDefinedButtonV2*>( sender() );
+  QgsPropertyOverrideButton* button = qobject_cast<QgsPropertyOverrideButton*>( sender() );
   QgsDiagramLayerSettings::Property key = static_cast<  QgsDiagramLayerSettings::Property >( button->propertyKey() );
   mProperties.setProperty( key, button->toProperty() );
 }