sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-06-18 00:04:02 -04:00
Code Issues Packages Projects Releases Wiki Activity

Clean up GUI for properties

Browse Source
This commit is contained in:
Nyall Dawson 2017-01-19 18:54:16 +10:00
parent ffaa40edc4
commit d5664ed635
54 changed files with 556 additions and 444 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
python/core/qgspropertytransformer.sip
View File

@ -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;

1
python/gui/gui.sip
View File

@ -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

58
python/gui/qgspropertyoverridebutton.sip Normal file
View File

@ -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 );
};

2
src/app/composer/qgscomposerhtmlwidget.cpp
View File

@ -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 );
}

18
src/app/composer/qgscomposeritemwidget.cpp
View File

@ -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 );
}

8
src/app/composer/qgscomposeritemwidget.h
View File

@ -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;

2
src/app/composer/qgscomposerpicturewidget.cpp
View File

@ -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 );

18
src/app/composer/qgscompositionwidget.cpp
View File

@ -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;

2
src/app/composer/qgscompositionwidget.h
View File

@ -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 );
};

6
src/app/qgsdiagramproperties.cpp
View File

@ -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() );
}

2
src/app/qgsdiagramproperties.h
View File

@ -87,7 +87,7 @@ class APP_EXPORT QgsDiagramProperties : public QWidget, private Ui::QgsDiagramPr
QgsExpressionContext createExpressionContext() const override;
void registerDataDefinedButton( QgsDataDefinedButtonV2 *button, QgsDiagramLayerSettings::Property key );
void registerDataDefinedButton( QgsPropertyOverrideButton *button, QgsDiagramLayerSettings::Property key );
private slots:

10
src/app/qgslabelinggui.cpp
View File

@ -42,16 +42,16 @@ QgsExpressionContext QgsLabelingGui::createExpressionContext() const
return expContext;
}
void QgsLabelingGui::registerDataDefinedButton( QgsDataDefinedButtonV2* button, QgsPalLayerSettings::Property key )
void QgsLabelingGui::registerDataDefinedButton( QgsPropertyOverrideButton* button, QgsPalLayerSettings::Property key )
{
button->init( key, mProperties, QgsPalLayerSettings::PROPERTY_DEFINITIONS, mLayer );
connect( button, &QgsDataDefinedButtonV2::changed, this, &QgsLabelingGui::updateProperty );
connect( button, &QgsPropertyOverrideButton::changed, this, &QgsLabelingGui::updateProperty );
button->registerExpressionContextGenerator( this );
}
void QgsLabelingGui::updateProperty()
{
QgsDataDefinedButtonV2* button = qobject_cast<QgsDataDefinedButtonV2*>( sender() );
QgsPropertyOverrideButton* button = qobject_cast<QgsPropertyOverrideButton*>( sender() );
QgsPalLayerSettings::Property key = static_cast< QgsPalLayerSettings::Property >( button->propertyKey() );
mProperties.setProperty( key, button->toProperty() );
}
@ -552,7 +552,7 @@ void QgsLabelingGui::populateDataDefinedButtons()
// TODO: is this necessary? maybe just use the data defined-only rotation?
//mPointAngleDDBtn, QgsPalLayerSettings::OffsetRotation,
// QgsDataDefinedButtonV2::AnyType, QgsDataDefinedButtonV2::double180RotDesc() );
// QgsPropertyOverrideButton::AnyType, QgsPropertyOverrideButton::double180RotDesc() );
registerDataDefinedButton( mMaxCharAngleDDBtn, QgsPalLayerSettings::CurvedCharAngleInOut );
registerDataDefinedButton( mRepeatDistanceDDBtn, QgsPalLayerSettings::RepeatDistance );
registerDataDefinedButton( mRepeatDistanceUnitDDBtn, QgsPalLayerSettings::RepeatDistanceUnit );
@ -596,7 +596,7 @@ void QgsLabelingGui::populateDataDefinedButtons()
registerDataDefinedButton( mZIndexDDBtn, QgsPalLayerSettings::ZIndex );
}
void QgsLabelingGui::syncDefinedCheckboxFrame( QgsDataDefinedButtonV2* ddBtn, QCheckBox* chkBx, QFrame* f )
void QgsLabelingGui::syncDefinedCheckboxFrame( QgsPropertyOverrideButton* ddBtn, QCheckBox* chkBx, QFrame* f )
{
if ( ddBtn->isActive() && !chkBx->isChecked() )
{

6
src/app/qgslabelinggui.h
View File

@ -20,7 +20,7 @@
#include "qgspallabeling.h"
#include "qgstextformatwidget.h"
#include "qgsdatadefinedbuttonv2.h"
#include "qgspropertyoverridebutton.h"
#include "qgis_app.h"
class APP_EXPORT QgsLabelingGui : public QgsTextFormatWidget, private QgsExpressionContextGenerator
@ -52,7 +52,7 @@ class APP_EXPORT QgsLabelingGui : public QgsTextFormatWidget, private QgsExpress
protected:
void blockInitSignals( bool block );
void syncDefinedCheckboxFrame( QgsDataDefinedButtonV2* ddBtn, QCheckBox* chkBx, QFrame* f );
void syncDefinedCheckboxFrame( QgsPropertyOverrideButton* ddBtn, QCheckBox* chkBx, QFrame* f );
private:
QgsVectorLayer* mLayer;
@ -63,7 +63,7 @@ class APP_EXPORT QgsLabelingGui : public QgsTextFormatWidget, private QgsExpress
QgsExpressionContext createExpressionContext() const override;
void populateDataDefinedButtons();
void registerDataDefinedButton( QgsDataDefinedButtonV2 *button, QgsPalLayerSettings::Property key );
void registerDataDefinedButton( QgsPropertyOverrideButton *button, QgsPalLayerSettings::Property key );
private slots:

2
src/core/qgspropertycollection.h
View File

@ -235,7 +235,6 @@ class CORE_EXPORT QgsAbstractPropertyCollection
private:
QString mName;
int mCount = 0;
};
/**
@ -313,6 +312,7 @@ class CORE_EXPORT QgsPropertyCollection : public QgsAbstractPropertyCollection
mutable bool mDirty;
mutable bool mHasActiveProperties;
mutable bool mHasActiveDynamicProperties;
mutable int mCount = 0;
//! Scans through properties and updates cached values
void rescan() const;

4
src/gui/CMakeLists.txt
View File

@ -196,7 +196,6 @@ SET(QGIS_GUI_SRCS
qgscursors.cpp
qgscustomdrophandler.cpp
qgsdatadefinedbutton.cpp
qgsdatadefinedbuttonv2.cpp
qgsdatumtransformdialog.cpp
qgsdetaileditemdata.cpp
qgsdetaileditemdelegate.cpp
@ -286,6 +285,7 @@ SET(QGIS_GUI_SRCS
qgsprevieweffect.cpp
qgsprojectionselectionwidget.cpp
qgsprojectionselector.cpp
qgspropertyoverridebutton.cpp
qgsquerybuilder.cpp
qgsrasterformatsaveoptionswidget.cpp
qgsrasterlayersaveasdialog.cpp
@ -367,7 +367,6 @@ SET(QGIS_GUI_MOC_HDRS
qgsconfigureshortcutsdialog.h
qgscredentialdialog.h
qgsdatadefinedbutton.h
qgsdatadefinedbuttonv2.h
qgsdatumtransformdialog.h
qgsdetaileditemdelegate.h
qgsdetaileditemwidget.h
@ -449,6 +448,7 @@ SET(QGIS_GUI_MOC_HDRS
qgsprevieweffect.h
qgsprojectionselectionwidget.h
qgsprojectionselector.h
qgspropertyoverridebutton.h
qgsquerybuilder.h
qgsrasterformatsaveoptionswidget.h
qgsrasterlayersaveasdialog.h

86
src/gui/qgsdatadefinedbuttonv2.cpp → src/gui/qgspropertyoverridebutton.cpp
View File

@ -1,8 +1,8 @@
/***************************************************************************
qgsdatadefinedbuttonv2.cpp
--------------------------
Date : March 2016
Copyright : (C) 2016 by Nyall Dawson
qgspropertyoverridebutton.cpp
-----------------------------
Date : January 2017
Copyright : (C) 2017 by Nyall Dawson
Email : nyall dot dawson at gmail dot com
***************************************************************************
* *
@ -13,10 +13,9 @@
* *
***************************************************************************/
#include "qgsdatadefinedbuttonv2.h"
#include "qgspropertyoverridebutton.h"
#include <qgsapplication.h>
#include <qgsdatadefined.h>
#include <qgsexpressionbuilderdialog.h>
#include <qgsexpression.h>
#include <qgsmessageviewer.h>
@ -28,7 +27,7 @@
#include <QPointer>
#include <QGroupBox>
QgsDataDefinedButtonV2::QgsDataDefinedButtonV2( QWidget* parent,
QgsPropertyOverrideButton::QgsPropertyOverrideButton( QWidget* parent,
const QgsVectorLayer* layer )
: QToolButton( parent )
, mVectorLayer( layer )
@ -44,9 +43,11 @@ QgsDataDefinedButtonV2::QgsDataDefinedButtonV2( QWidget* parent,
setIconSize( QSize( 24, 24 ) );
setPopupMode( QToolButton::InstantPopup );
connect( this, &QgsPropertyOverrideButton::activated, this, &QgsPropertyOverrideButton::checkCheckedWidgets );
mDefineMenu = new QMenu( this );
connect( mDefineMenu, &QMenu::aboutToShow, this, &QgsDataDefinedButtonV2::aboutToShowMenu );
connect( mDefineMenu, &QMenu::triggered, this, &QgsDataDefinedButtonV2::menuActionTriggered );
connect( mDefineMenu, &QMenu::aboutToShow, this, &QgsPropertyOverrideButton::aboutToShowMenu );
connect( mDefineMenu, &QMenu::triggered, this, &QgsPropertyOverrideButton::menuActionTriggered );
setMenu( mDefineMenu );
mFieldsMenu = new QMenu( this );
@ -77,7 +78,7 @@ QgsDataDefinedButtonV2::QgsDataDefinedButtonV2( QWidget* parent,
mDefineMenu->addAction( mActionAssistant );
}
void QgsDataDefinedButtonV2::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 )
{
mVectorLayer = layer;
setToProperty( property );
@ -120,13 +121,13 @@ void QgsDataDefinedButtonV2::init( int propertyKey, const QgsProperty& property,
updateGui();
}
void QgsDataDefinedButtonV2::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 )
{
init( propertyKey, collection.property( propertyKey ), definitions, layer );
}
void QgsDataDefinedButtonV2::updateFieldLists()
void QgsPropertyOverrideButton::updateFieldLists()
{
mFieldNameList.clear();
mFieldTypeList.clear();
@ -180,7 +181,7 @@ void QgsDataDefinedButtonV2::updateFieldLists()
}
}
QgsProperty QgsDataDefinedButtonV2::toProperty() const
QgsProperty QgsPropertyOverrideButton::toProperty() const
{
QgsProperty p;
if ( mUseExpression )
@ -194,21 +195,22 @@ QgsProperty QgsDataDefinedButtonV2::toProperty() const
return p;
}
void QgsDataDefinedButtonV2::setVectorLayer( const QgsVectorLayer* layer )
void QgsPropertyOverrideButton::setVectorLayer( const QgsVectorLayer* layer )
{
mVectorLayer = layer;
}
void QgsDataDefinedButtonV2::registerCheckedWidget( QWidget* widget )
void QgsPropertyOverrideButton::registerCheckedWidget( QWidget* widget )
{
//TODO
Q_FOREACH( const QPointer<QWidget>& w, mCheckedWidgets )
{
if ( widget == w.data() )
return;
}
mCheckedWidgets.append( QPointer<QWidget>( widget ) );
}
void QgsDataDefinedButtonV2::setAssistant( const QString& title, QgsDataDefinedAssistant* assistant ) {}
QgsDataDefinedAssistant*QgsDataDefinedButtonV2::assistant() { return nullptr; }
void QgsDataDefinedButtonV2::mouseReleaseEvent( QMouseEvent *event )
void QgsPropertyOverrideButton::mouseReleaseEvent( QMouseEvent *event )
{
// Ctrl-click to toggle activated state
if (( event->modifiers() & ( Qt::ControlModifier ) )
@ -225,7 +227,7 @@ void QgsDataDefinedButtonV2::mouseReleaseEvent( QMouseEvent *event )
QToolButton::mousePressEvent( event );
}
void QgsDataDefinedButtonV2::setToProperty( const QgsProperty& property )
void QgsPropertyOverrideButton::setToProperty( const QgsProperty& property )
{
if ( property )
{
@ -258,7 +260,7 @@ void QgsDataDefinedButtonV2::setToProperty( const QgsProperty& property )
updateGui();
}
void QgsDataDefinedButtonV2::aboutToShowMenu()
void QgsPropertyOverrideButton::aboutToShowMenu()
{
mDefineMenu->clear();
// update fields so that changes made to layer's fields are reflected
@ -415,7 +417,7 @@ void QgsDataDefinedButtonV2::aboutToShowMenu()
}
}
void QgsDataDefinedButtonV2::menuActionTriggered( QAction* action )
void QgsPropertyOverrideButton::menuActionTriggered( QAction* action )
{
if ( action == mActionActive )
{
@ -497,7 +499,7 @@ void QgsDataDefinedButtonV2::menuActionTriggered( QAction* action )
}
}
void QgsDataDefinedButtonV2::showDescriptionDialog()
void QgsPropertyOverrideButton::showDescriptionDialog()
{
QgsMessageViewer* mv = new QgsMessageViewer( this );
mv->setWindowTitle( tr( "Data definition description" ) );
@ -506,7 +508,7 @@ void QgsDataDefinedButtonV2::showDescriptionDialog()
}
void QgsDataDefinedButtonV2::showExpressionDialog()
void QgsPropertyOverrideButton::showExpressionDialog()
{
QgsExpressionContext context = mExpressionContextGenerator ? mExpressionContextGenerator->createExpressionContext() : QgsExpressionContext();
@ -525,7 +527,7 @@ void QgsDataDefinedButtonV2::showExpressionDialog()
activateWindow(); // reset focus to parent window
}
void QgsDataDefinedButtonV2::updateGui()
void QgsPropertyOverrideButton::updateGui()
{
bool hasExp = !mExpressionString.isEmpty();
bool hasField = !mFieldName.isEmpty();
@ -607,7 +609,7 @@ void QgsDataDefinedButtonV2::updateGui()
}
void QgsDataDefinedButtonV2::setActivePrivate( bool active )
void QgsPropertyOverrideButton::setActivePrivate( bool active )
{
if ( mActive != active )
{
@ -616,7 +618,31 @@ void QgsDataDefinedButtonV2::setActivePrivate( bool active )
}
}
void QgsDataDefinedButtonV2::setActive( bool active )
void QgsPropertyOverrideButton::checkCheckedWidgets( bool check )
{
// don't uncheck, only set to checked
if ( !check )
{
return;
}
Q_FOREACH( const QPointer< QWidget >& w, mCheckedWidgets )
{
QAbstractButton *btn = qobject_cast< QAbstractButton * >( w.data() );
if ( btn && btn->isCheckable() )
{
btn->setChecked( true );
continue;
}
QGroupBox *grpbx = qobject_cast< QGroupBox * >( w.data() );
if ( grpbx && grpbx->isCheckable() )
{
grpbx->setChecked( true );
}
}
}
void QgsPropertyOverrideButton::setActive( bool active )
{
if ( mActive != active )
{
@ -626,7 +652,7 @@ void QgsDataDefinedButtonV2::setActive( bool active )
}
}
void QgsDataDefinedButtonV2::registerExpressionContextGenerator( QgsExpressionContextGenerator* generator )
void QgsPropertyOverrideButton::registerExpressionContextGenerator( QgsExpressionContextGenerator* generator )
{
mExpressionContextGenerator = generator;
}

101
src/gui/qgsdatadefinedbuttonv2.h → src/gui/qgspropertyoverridebutton.h
View File

@ -1,8 +1,8 @@
/***************************************************************************
qgsdatadefinedbuttonv2.h
------------------------
Date : March 2016
Copyright : (C) 2016 by Nyall Dawson
qgspropertyoverridebutton.h
---------------------------
Date : January 2017
Copyright : (C) 2017 by Nyall Dawson
Email : nyall dot dawson at gmail dot com
***************************************************************************
* *
@ -12,8 +12,8 @@
* (at your option) any later version. *
* *
***************************************************************************/
#ifndef QGSDATADEFINEDBUTTONV2_H
#define QGSDATADEFINEDBUTTONV2_H
#ifndef QGSPROPERTYOVERRIDEBUTTON_H
#define QGSPROPERTYOVERRIDEBUTTON_H
#include "qgis_gui.h"
#include <QDialog>
@ -28,16 +28,24 @@
#include "qgsexpressioncontextgenerator.h"
class QgsVectorLayer;
class QgsDataDefined;
class QgsMapCanvas;
class QgsDataDefinedAssistant;
/** \ingroup gui
* \class QgsDataDefinedButtonV2
* A button for defining data source field mappings or expressions.
* \class QgsPropertyOverrideButton
* A button for controlling property overrides which may apply to a widget.
*
* QgsPropertyOverrideButton is designed to be used alongside the QGIS
* properties framework (QgsProperty, QgsPropertyDefinition
* and QgsPropertyCollection).
*
* It allows users to specify field or expression based overrides
* which should be applied to a property of an object. Eg, this widget
* is used for controlling data defined overrides in symbology, labeling
* and composer.
* \note added in QGIS 3.0
*/
class GUI_EXPORT QgsDataDefinedButtonV2: public QToolButton
class GUI_EXPORT QgsPropertyOverrideButton: public QToolButton
{
Q_OBJECT
Q_PROPERTY( QString usageInfo READ usageInfo WRITE setUsageInfo )
@ -46,18 +54,18 @@ class GUI_EXPORT QgsDataDefinedButtonV2: public QToolButton
public:
/**
* Constructor for QgsDataDefinedButtonV2.
* Constructor for QgsPropertyOverrideButton.
* @param parent parent widget
* @param layer associated vector layer
*/
QgsDataDefinedButtonV2( QWidget* parent = nullptr,
QgsPropertyOverrideButton( QWidget* parent = nullptr,
const QgsVectorLayer* layer = nullptr );
/**
* Initialize a newly constructed property button (useful if button was included in a form layout).
* Initialize a newly constructed property button (useful if button was included in a UI layout).
* @param propertyKey key for corresponding property
* @param property associated property
* @param definitions properties definitions for collection
* @param property initial value of associated property to show in widget
* @param definitions properties definitions for corresponding collection
* @param layer associated vector layer
*/
void init( int propertyKey,
@ -66,7 +74,7 @@ class GUI_EXPORT QgsDataDefinedButtonV2: public QToolButton
const QgsVectorLayer* layer = nullptr );
/**
* Initialize a newly constructed property button (useful if button was included in a form layout).
* 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
@ -77,10 +85,21 @@ class GUI_EXPORT QgsDataDefinedButtonV2: public QToolButton
const QgsPropertiesDefinition& definitions,
const QgsVectorLayer* layer = nullptr );
/**
* Returns a QgsProperty object encapsulating the current state of the
* widget.
* @see setToProperty()
*/
QgsProperty toProperty() const;
/**
* Sets the widget to reflect the current state of a QgsProperty.
*/
void setToProperty( const QgsProperty& property );
/**
* Returns the property key linked to the button.
*/
int propertyKey() const { return mPropertyKey; }
/**
@ -89,23 +108,27 @@ class GUI_EXPORT QgsDataDefinedButtonV2: public QToolButton
bool isActive() const { return mActive; }
/**
* The valid data types that will work for the definition (QVariant-coercible to expected type)
* Compared against the variant type of the QgsField from data source and expression result
* Returns the data type which the widget will accept. This is used to filter
* out fields from the associated vector layer to only show fields which
* are compatible with the property.
*/
QgsPropertyDefinition::DataType validDataType() const { return mDataTypes; }
/**
* The full definition description and current definition (internally generated on a contextual basis)
* Returns the full definition description and current definition
* (internally generated on a contextual basis).
*/
QString fullDescription() const { return mFullDescription; }
/**
* The usage information about this data definition
* Returns usage information for the property.
* @see setUsageInfo()
*/
QString usageInfo() const { return mUsageInfo; }
/**
* Set the usage information about this data definition
* Set the usage information for the property.
* @see usageInfo()
*/
void setUsageInfo( const QString& info ) { mUsageInfo = info; updateGui(); }
@ -123,42 +146,21 @@ class GUI_EXPORT QgsDataDefinedButtonV2: public QToolButton
*/
const QgsVectorLayer* vectorLayer() const { return mVectorLayer; }
//TODO
/**
* Register a sibling widget that get checked when data definition or expression is active
* Register a sibling widget that get checked when the property is active.
*/
void registerCheckedWidget( QWidget* widget );
/**
* Sets an assistant used to define the data defined object properties.
* Ownership of the assistant is transferred to the widget.
* @param title menu title for the assistant
* @param assistant data defined assistant. Set to null to remove the assistant
* option from the button.
* @note added in 2.10
* @see assistant()
*/
void setAssistant( const QString& title, QgsDataDefinedAssistant * assistant );
/** Returns the assistant used to defined the data defined object properties, if set.
* @see setAssistant()
* @note added in QGIS 2.12
*/
QgsDataDefinedAssistant* assistant();
/**
* Register an expression context generator class that will be used to retrieve
* an expression context for the button.
* @param generator A QgsExpressionContextGenerator class that will be used to
* create an expression context when required.
* an expression context for the button when required.
*/
void registerExpressionContextGenerator( QgsExpressionContextGenerator* generator );
public slots:
/**
* Set whether the current data definition or expression is to be used
* Set whether the current property override definition is to be used
*/
void setActive( bool active );
@ -187,6 +189,7 @@ class GUI_EXPORT QgsDataDefinedButtonV2: public QToolButton
*/
void setActivePrivate( bool active );
int mPropertyKey = -1;
const QgsVectorLayer* mVectorLayer = nullptr;
@ -222,10 +225,14 @@ class GUI_EXPORT QgsDataDefinedButtonV2: public QToolButton
QgsExpressionContextGenerator* mExpressionContextGenerator;
QList< QPointer<QWidget> > mCheckedWidgets;
private slots:
void aboutToShowMenu();
void menuActionTriggered( QAction* action );
void checkCheckedWidgets( bool checked );
};
#endif // QGSDATADEFINEDBUTTONV2_H
#endif // QGSPROPERTYOVERRIDEBUTTON_H

4
src/gui/qgstextformatwidget.cpp
View File

@ -518,7 +518,7 @@ void QgsTextFormatWidget::setWidgetMode( QgsTextFormatWidget::Mode mode )
void QgsTextFormatWidget::toggleDDButtons( bool visible )
{
Q_FOREACH ( QgsDataDefinedButtonV2* button, findChildren< QgsDataDefinedButtonV2* >() )
Q_FOREACH ( QgsPropertyOverrideButton* button, findChildren< QgsPropertyOverrideButton* >() )
{
button->setVisible( visible );
}
@ -544,7 +544,7 @@ void QgsTextFormatWidget::connectValueChanged( const QList<QWidget *>& widgets,
{
Q_FOREACH ( QWidget* widget, widgets )
{
if ( QgsDataDefinedButtonV2* w = qobject_cast<QgsDataDefinedButtonV2*>( widget ) )
if ( QgsPropertyOverrideButton* w = qobject_cast<QgsPropertyOverrideButton*>( widget ) )
{
connect( w, SIGNAL( changed() ), this, slot );
}

6
src/gui/symbology-ng/qgslayerpropertieswidget.cpp
View File

@ -259,16 +259,16 @@ QgsExpressionContext QgsLayerPropertiesWidget::createExpressionContext() const
return expContext;
}
void QgsLayerPropertiesWidget::registerDataDefinedButton( QgsDataDefinedButtonV2* button, QgsSymbolLayer::Property key )
void QgsLayerPropertiesWidget::registerDataDefinedButton( QgsPropertyOverrideButton* button, QgsSymbolLayer::Property key )
{
button->init( key, mLayer->dataDefinedProperties(), QgsSymbolLayer::PROPERTY_DEFINITIONS, mVectorLayer );
connect( button, &QgsDataDefinedButtonV2::changed, this, &QgsLayerPropertiesWidget::updateProperty );
connect( button, &QgsPropertyOverrideButton::changed, this, &QgsLayerPropertiesWidget::updateProperty );
button->registerExpressionContextGenerator( this );
}
void QgsLayerPropertiesWidget::updateProperty()
{
QgsDataDefinedButtonV2* button = qobject_cast<QgsDataDefinedButtonV2*>( sender() );
QgsPropertyOverrideButton* button = qobject_cast<QgsPropertyOverrideButton*>( sender() );
QgsSymbolLayer::Property key = static_cast< QgsSymbolLayer::Property >( button->propertyKey() );
mLayer->setDataDefinedProperty( key, button->toProperty() );
emit changed();

2
src/gui/symbology-ng/qgslayerpropertieswidget.h
View File

@ -78,7 +78,7 @@ class GUI_EXPORT QgsLayerPropertiesWidget : public QgsPanelWidget, protected Qgs
QgsExpressionContext createExpressionContext() const override;
void registerDataDefinedButton( QgsDataDefinedButtonV2 *button, QgsSymbolLayer::Property key );
void registerDataDefinedButton( QgsPropertyOverrideButton *button, QgsSymbolLayer::Property key );
protected: // data
QgsSymbolLayer* mLayer;

2
src/gui/symbology-ng/qgsrendererpropertiesdialog.cpp
View File

@ -141,7 +141,7 @@ void QgsRendererPropertiesDialog::connectValueChanged( const QList<QWidget *>& w
{
Q_FOREACH ( QWidget* widget, widgets )
{
if ( QgsDataDefinedButtonV2* w = qobject_cast<QgsDataDefinedButtonV2*>( widget ) )
if ( QgsPropertyOverrideButton* w = qobject_cast<QgsPropertyOverrideButton*>( widget ) )
{
connect( w, SIGNAL( changed ), this, slot );
}

7
src/gui/symbology-ng/qgsrendererwidget.cpp
View File

@ -286,17 +286,20 @@ QgsDataDefinedValueDialog::QgsDataDefinedValueDialog( const QList<QgsSymbol*>& s
setupUi( this );
setWindowFlags( Qt::WindowStaysOnTopHint );
mLabel->setText( label );
connect( mDDBtn, &QgsDataDefinedButtonV2::changed, this, &QgsDataDefinedValueDialog::dataDefinedChanged );
connect( mDDBtn, &QgsPropertyOverrideButton::changed, this, &QgsDataDefinedValueDialog::dataDefinedChanged );
}
void QgsDataDefinedValueDialog::setContext( const QgsSymbolWidgetContext& context )
{
mContext = context;
Q_FOREACH ( QgsDataDefinedButtonV2* ddButton, findChildren<QgsDataDefinedButtonV2*>() )
#if 0
Q_FOREACH ( QgsPropertyOverrideButton* ddButton, findChildren<QgsPropertyOverrideButton*>() )
{
if ( ddButton->assistant() )
ddButton->assistant()->setMapCanvas( context.mapCanvas() );
}
#endif
}
QgsSymbolWidgetContext QgsDataDefinedValueDialog::context() const

2
src/gui/symbology-ng/qgsrendererwidget.h
View File

@ -212,8 +212,10 @@ class GUI_EXPORT QgsDataDefinedSizeDialog : public QgsDataDefinedValueDialog
: QgsDataDefinedValueDialog( symbolList, layer, tr( "Size" ) )
{
init( QgsSymbolLayer::PropertySize );
#if 0
if ( !symbolList.isEmpty() && symbolList.at( 0 ) && vectorLayer() )
mDDBtn->setAssistant( tr( "Size Assistant..." ), new QgsSizeScaleWidget( vectorLayer(), static_cast<const QgsMarkerSymbol*>( symbolList.at( 0 ) ) ) );
#endif
}
protected:

21
src/gui/symbology-ng/qgssymbollayerwidget.cpp
View File

@ -95,11 +95,13 @@ void QgsSymbolLayerWidget::setContext( const QgsSymbolWidgetContext& context )
{
unitWidget->setMapCanvas( mContext.mapCanvas() );
}
Q_FOREACH ( QgsDataDefinedButtonV2* ddButton, findChildren<QgsDataDefinedButtonV2*>() )
#if 0
Q_FOREACH ( QgsPropertyOverrideButton* ddButton, findChildren<QgsPropertyOverrideButton*>() )
{
if ( ddButton->assistant() )
ddButton->assistant()->setMapCanvas( mContext.mapCanvas() );
}
#endif
}
QgsSymbolWidgetContext QgsSymbolLayerWidget::context() const
@ -107,17 +109,17 @@ QgsSymbolWidgetContext QgsSymbolLayerWidget::context() const
return mContext;
}
void QgsSymbolLayerWidget::registerDataDefinedButton( QgsDataDefinedButtonV2 * button, QgsSymbolLayer::Property key )
void QgsSymbolLayerWidget::registerDataDefinedButton( QgsPropertyOverrideButton * button, QgsSymbolLayer::Property key )
{
button->init( key, symbolLayer()->dataDefinedProperties(), QgsSymbolLayer::PROPERTY_DEFINITIONS, mVectorLayer );
connect( button, &QgsDataDefinedButtonV2::changed, this, &QgsSymbolLayerWidget::updateDataDefinedProperty );
connect( button, &QgsPropertyOverrideButton::changed, this, &QgsSymbolLayerWidget::updateDataDefinedProperty );
button->registerExpressionContextGenerator( this );
}
void QgsSymbolLayerWidget::updateDataDefinedProperty()
{
QgsDataDefinedButtonV2* button = qobject_cast<QgsDataDefinedButtonV2*>( sender() );
QgsPropertyOverrideButton* button = qobject_cast<QgsPropertyOverrideButton*>( sender() );
QgsSymbolLayer::Property key = static_cast< QgsSymbolLayer::Property >( button->propertyKey() );
symbolLayer()->setDataDefinedProperty( key, button->toProperty() );
emit changed();
@ -151,9 +153,10 @@ QgsSimpleLineSymbolLayerWidget::QgsSimpleLineSymbolLayerWidget( const QgsVectorL
//make a temporary symbol for the size assistant preview
mAssistantPreviewSymbol = new QgsLineSymbol();
#if 0
if ( vectorLayer() )
mPenWidthDDBtn->setAssistant( tr( "Width Assistant..." ), new QgsSizeScaleWidget( vectorLayer(), mAssistantPreviewSymbol ) );
#endif
connect( spinWidth, SIGNAL( valueChanged( double ) ), this, SLOT( penWidthChanged() ) );
connect( btnChangeColor, SIGNAL( colorChanged( const QColor& ) ), this, SLOT( colorChanged( const QColor& ) ) );
@ -401,8 +404,10 @@ QgsSimpleMarkerSymbolLayerWidget::QgsSimpleMarkerSymbolLayerWidget( const QgsVec
//make a temporary symbol for the size assistant preview
mAssistantPreviewSymbol = new QgsMarkerSymbol();
#if 0
if ( vectorLayer() )
mSizeDDBtn->setAssistant( tr( "Size Assistant..." ), new QgsSizeScaleWidget( vectorLayer(), mAssistantPreviewSymbol ) );
#endif
QSize size = lstNames->iconSize();
double markerSize = DEFAULT_POINT_SIZE * 2;
@ -818,8 +823,10 @@ QgsFilledMarkerSymbolLayerWidget::QgsFilledMarkerSymbolLayerWidget( const QgsVec
//make a temporary symbol for the size assistant preview
mAssistantPreviewSymbol = new QgsMarkerSymbol();
#if 0
if ( vectorLayer() )
mSizeDDBtn->setAssistant( tr( "Size Assistant..." ), new QgsSizeScaleWidget( vectorLayer(), mAssistantPreviewSymbol ) );
#endif
QSize size = lstNames->iconSize();
double markerSize = DEFAULT_POINT_SIZE * 2;
@ -1762,10 +1769,12 @@ QgsSvgMarkerSymbolLayerWidget::QgsSvgMarkerSymbolLayerWidget( const QgsVectorLay
connect( spinOffsetY, SIGNAL( valueChanged( double ) ), this, SLOT( setOffset() ) );
connect( this, SIGNAL( changed() ), this, SLOT( updateAssistantSymbol() ) );
#if 0
//make a temporary symbol for the size assistant preview
mAssistantPreviewSymbol = new QgsMarkerSymbol();
if ( vectorLayer() )
mSizeDDBtn->setAssistant( tr( "Size Assistant..." ), new QgsSizeScaleWidget( vectorLayer(), mAssistantPreviewSymbol ) );
#endif
}
QgsSvgMarkerSymbolLayerWidget::~QgsSvgMarkerSymbolLayerWidget()
@ -2681,8 +2690,10 @@ QgsFontMarkerSymbolLayerWidget::QgsFontMarkerSymbolLayerWidget( const QgsVectorL
//make a temporary symbol for the size assistant preview
mAssistantPreviewSymbol = new QgsMarkerSymbol();
#if 0
if ( vectorLayer() )
mSizeDDBtn->setAssistant( tr( "Size Assistant..." ), new QgsSizeScaleWidget( vectorLayer(), mAssistantPreviewSymbol ) );
#endif
connect( cboFont, SIGNAL( currentFontChanged( const QFont & ) ), this, SLOT( setFontFamily( const QFont& ) ) );
connect( spinSize, SIGNAL( valueChanged( double ) ), this, SLOT( setSize( double ) ) );

4
src/gui/symbology-ng/qgssymbollayerwidget.h
View File

@ -17,7 +17,7 @@
#ifndef QGSSYMBOLLAYERWIDGET_H
#define QGSSYMBOLLAYERWIDGET_H
#include "qgsdatadefinedbuttonv2.h"
#include "qgspropertyoverridebutton.h"
#include "qgssymbolwidgetcontext.h"
#include "qgssymbollayer.h"
#include <QWidget>
@ -63,7 +63,7 @@ class GUI_EXPORT QgsSymbolLayerWidget : public QWidget, protected QgsExpressionC
protected:
void registerDataDefinedButton( QgsDataDefinedButtonV2* button, QgsSymbolLayer::Property key );
void registerDataDefinedButton( QgsPropertyOverrideButton* button, QgsSymbolLayer::Property key );
QgsExpressionContext createExpressionContext() const override;

16
src/gui/symbology-ng/qgssymbolslistwidget.cpp
View File

@ -100,16 +100,18 @@ QgsSymbolsListWidget::QgsSymbolsListWidget( QgsSymbol* symbol, QgsStyle* style,
connect( spinWidth, SIGNAL( valueChanged( double ) ), this, SLOT( setLineWidth( double ) ) );
registerDataDefinedButton( mRotationDDBtn, QgsSymbolLayer::PropertyAngle );
connect( mRotationDDBtn, &QgsDataDefinedButtonV2::changed, this, &QgsSymbolsListWidget::updateDataDefinedMarkerAngle );
connect( mRotationDDBtn, &QgsPropertyOverrideButton::changed, this, &QgsSymbolsListWidget::updateDataDefinedMarkerAngle );
registerDataDefinedButton( mSizeDDBtn, QgsSymbolLayer::PropertySize );
connect( mSizeDDBtn, &QgsDataDefinedButtonV2::changed, this, &QgsSymbolsListWidget::updateDataDefinedMarkerSize );
connect( mSizeDDBtn, &QgsPropertyOverrideButton::changed, this, &QgsSymbolsListWidget::updateDataDefinedMarkerSize );
registerDataDefinedButton( mWidthDDBtn, QgsSymbolLayer::PropertyOutlineWidth );
connect( mWidthDDBtn, &QgsDataDefinedButtonV2::changed, this, &QgsSymbolsListWidget::updateDataDefinedLineWidth );
connect( mWidthDDBtn, &QgsPropertyOverrideButton::changed, this, &QgsSymbolsListWidget::updateDataDefinedLineWidth );
#if 0
if ( mSymbol->type() == QgsSymbol::Marker && mLayer )
mSizeDDBtn->setAssistant( tr( "Size Assistant..." ), new QgsSizeScaleWidget( mLayer, mSymbol ) );
else if ( mSymbol->type() == QgsSymbol::Line && mLayer )
mWidthDDBtn->setAssistant( tr( "Width Assistant..." ), new QgsSizeScaleWidget( mLayer, mSymbol ) );
#endif
// Live color updates are not undoable to child symbol layers
btnColor->setAcceptLiveUpdates( false );
@ -127,7 +129,7 @@ QgsSymbolsListWidget::~QgsSymbolsListWidget()
btnAdvanced->menu()->removeAction( mClipFeaturesAction );
}
void QgsSymbolsListWidget::registerDataDefinedButton( QgsDataDefinedButtonV2 * button, QgsSymbolLayer::Property key )
void QgsSymbolsListWidget::registerDataDefinedButton( QgsPropertyOverrideButton * button, QgsSymbolLayer::Property key )
{
button->setProperty( "propertyKey", key );
button->registerExpressionContextGenerator( this );
@ -140,11 +142,13 @@ void QgsSymbolsListWidget::setContext( const QgsSymbolWidgetContext& context )
{
unitWidget->setMapCanvas( mContext.mapCanvas() );
}
Q_FOREACH ( QgsDataDefinedButtonV2* ddButton, findChildren<QgsDataDefinedButtonV2*>() )
#if 0
Q_FOREACH ( QgsPropertyOverrideButton* ddButton, findChildren<QgsPropertyOverrideButton*>() )
{
if ( ddButton->assistant() )
ddButton->assistant()->setMapCanvas( mContext.mapCanvas() );
}
#endif
}
QgsSymbolWidgetContext QgsSymbolsListWidget::context() const
@ -497,7 +501,7 @@ void QgsSymbolsListWidget::updateSymbolInfo()
{
updateSymbolColor();
Q_FOREACH ( QgsDataDefinedButtonV2* button, findChildren< QgsDataDefinedButtonV2* >() )
Q_FOREACH ( QgsPropertyOverrideButton* button, findChildren< QgsPropertyOverrideButton* >() )
{
button->registerExpressionContextGenerator( this );
}

2
src/gui/symbology-ng/qgssymbolslistwidget.h
View File

@ -108,7 +108,7 @@ class GUI_EXPORT QgsSymbolsListWidget : public QWidget, private Ui::SymbolsListW
QgsSymbolWidgetContext mContext;
QgsExpressionContext createExpressionContext() const override;
void registerDataDefinedButton( QgsDataDefinedButtonV2* button, QgsSymbolLayer::Property key );
void registerDataDefinedButton( QgsPropertyOverrideButton* button, QgsSymbolLayer::Property key );
};
#endif //QGSSYMBOLSLISTWIDGET_H

6
src/ui/composer/qgscomposerhtmlwidgetbase.ui
View File

@ -96,7 +96,7 @@
</widget>
</item>
<item>
<widget class="QgsDataDefinedButtonV2" name="mUrlDDBtn">
<widget class="QgsPropertyOverrideButton" name="mUrlDDBtn">
<property name="text">
<string>...</string>
</property>
@ -282,9 +282,9 @@
</widget>
<customwidgets>
<customwidget>
<class>QgsDataDefinedButtonV2</class>
<class>QgsPropertyOverrideButton</class>
<extends>QToolButton</extends>
<header>qgsdatadefinedbuttonv2.h</header>
<header>qgspropertyoverridebutton.h</header>
</customwidget>
<customwidget>
<class>QgsDoubleSpinBox</class>

24
src/ui/composer/qgscomposeritemwidgetbase.ui
View File

@ -79,28 +79,28 @@
</widget>
</item>
<item row="1" column="3">
<widget class="QgsDataDefinedButtonV2" name="mXPositionDDBtn">
<widget class="QgsPropertyOverrideButton" name="mXPositionDDBtn">
<property name="text">
<string>...</string>
</property>
</widget>
</item>
<item row="2" column="3">
<widget class="QgsDataDefinedButtonV2" name="mYPositionDDBtn">
<widget class="QgsPropertyOverrideButton" name="mYPositionDDBtn">
<property name="text">
<string>...</string>
</property>
</widget>
</item>
<item row="3" column="3">
<widget class="QgsDataDefinedButtonV2" name="mWidthDDBtn">
<widget class="QgsPropertyOverrideButton" name="mWidthDDBtn">
<property name="text">
<string>...</string>
</property>
</widget>
</item>
<item row="4" column="3">
<widget class="QgsDataDefinedButtonV2" name="mHeightDDBtn">
<widget class="QgsPropertyOverrideButton" name="mHeightDDBtn">
<property name="text">
<string>...</string>
</property>
@ -380,7 +380,7 @@
</widget>
</item>
<item>
<widget class="QgsDataDefinedButtonV2" name="mItemRotationDDBtn">
<widget class="QgsPropertyOverrideButton" name="mItemRotationDDBtn">
<property name="text">
<string>...</string>
</property>
@ -454,7 +454,7 @@
</spacer>
</item>
<item>
<widget class="QgsDataDefinedButtonV2" name="mItemFrameColorDDBtn">
<widget class="QgsPropertyOverrideButton" name="mItemFrameColorDDBtn">
<property name="text">
<string>...</string>
</property>
@ -580,7 +580,7 @@
</spacer>
</item>
<item>
<widget class="QgsDataDefinedButtonV2" name="mItemBackgroundColorDDBtn">
<widget class="QgsPropertyOverrideButton" name="mItemBackgroundColorDDBtn">
<property name="text">
<string>...</string>
</property>
@ -647,7 +647,7 @@
<widget class="QgsBlendModeComboBox" name="mBlendModeCombo"/>
</item>
<item>
<widget class="QgsDataDefinedButtonV2" name="mBlendModeDDBtn">
<widget class="QgsPropertyOverrideButton" name="mBlendModeDDBtn">
<property name="text">
<string>...</string>
</property>
@ -688,7 +688,7 @@
</widget>
</item>
<item>
<widget class="QgsDataDefinedButtonV2" name="mTransparencyDDBtn">
<widget class="QgsPropertyOverrideButton" name="mTransparencyDDBtn">
<property name="text">
<string>...</string>
</property>
@ -706,7 +706,7 @@
</widget>
</item>
<item>
<widget class="QgsDataDefinedButtonV2" name="mExcludePrintsDDBtn">
<widget class="QgsPropertyOverrideButton" name="mExcludePrintsDDBtn">
<property name="text">
<string>...</string>
</property>
@ -762,9 +762,9 @@
<container>1</container>
</customwidget>
<customwidget>
<class>QgsDataDefinedButtonV2</class>
<class>QgsPropertyOverrideButton</class>
<extends>QToolButton</extends>
<header>qgsdatadefinedbuttonv2.h</header>
<header>qgspropertyoverridebutton.h</header>
</customwidget>
<customwidget>
<class>QgsDoubleSpinBox</class>

8
src/ui/composer/qgscomposerlegendwidgetbase.ui
View File

@ -126,7 +126,7 @@
<widget class="QLineEdit" name="mTitleLineEdit"/>
</item>
<item row="0" column="2">
<widget class="QgsDataDefinedButtonV2" name="mLegendTitleDDBtn">
<widget class="QgsPropertyOverrideButton" name="mLegendTitleDDBtn">
<property name="text">
<string>...</string>
</property>
@ -573,7 +573,7 @@
</widget>
</item>
<item row="0" column="2">
<widget class="QgsDataDefinedButtonV2" name="mColumnsDDBtn">
<widget class="QgsPropertyOverrideButton" name="mColumnsDDBtn">
<property name="text">
<string>...</string>
</property>
@ -1035,9 +1035,9 @@
<container>1</container>
</customwidget>
<customwidget>
<class>QgsDataDefinedButtonV2</class>
<class>QgsPropertyOverrideButton</class>
<extends>QToolButton</extends>
<header>qgsdatadefinedbuttonv2.h</header>
<header>qgspropertyoverridebutton.h</header>
</customwidget>
<customwidget>
<class>QgsDoubleSpinBox</class>

22
src/ui/composer/qgscomposermapwidgetbase.ui
View File

@ -91,7 +91,7 @@
</widget>
</item>
<item>
<widget class="QgsDataDefinedButtonV2" name="mScaleDDBtn">
<widget class="QgsPropertyOverrideButton" name="mScaleDDBtn">
<property name="text">
<string>...</string>
</property>
@ -119,7 +119,7 @@
</widget>
</item>
<item>
<widget class="QgsDataDefinedButtonV2" name="mMapRotationDDBtn">
<widget class="QgsPropertyOverrideButton" name="mMapRotationDDBtn">
<property name="text">
<string>...</string>
</property>
@ -201,7 +201,7 @@
<widget class="QComboBox" name="mFollowVisibilityPresetCombo"/>
</item>
<item>
<widget class="QgsDataDefinedButtonV2" name="mStylePresetsDDBtn">
<widget class="QgsPropertyOverrideButton" name="mStylePresetsDDBtn">
<property name="text">
<string>...</string>
</property>
@ -248,7 +248,7 @@
</widget>
</item>
<item>
<widget class="QgsDataDefinedButtonV2" name="mLayersDDBtn">
<widget class="QgsPropertyOverrideButton" name="mLayersDDBtn">
<property name="text">
<string>...</string>
</property>
@ -303,7 +303,7 @@
<widget class="QLineEdit" name="mXMinLineEdit"/>
</item>
<item>
<widget class="QgsDataDefinedButtonV2" name="mXMinDDBtn">
<widget class="QgsPropertyOverrideButton" name="mXMinDDBtn">
<property name="text">
<string>...</string>
</property>
@ -330,7 +330,7 @@
<widget class="QLineEdit" name="mYMinLineEdit"/>
</item>
<item>
<widget class="QgsDataDefinedButtonV2" name="mYMinDDBtn">
<widget class="QgsPropertyOverrideButton" name="mYMinDDBtn">
<property name="text">
<string>...</string>
</property>
@ -357,7 +357,7 @@
<widget class="QLineEdit" name="mXMaxLineEdit"/>
</item>
<item>
<widget class="QgsDataDefinedButtonV2" name="mXMaxDDBtn">
<widget class="QgsPropertyOverrideButton" name="mXMaxDDBtn">
<property name="text">
<string>...</string>
</property>
@ -384,7 +384,7 @@
<widget class="QLineEdit" name="mYMaxLineEdit"/>
</item>
<item>
<widget class="QgsDataDefinedButtonV2" name="mYMaxDDBtn">
<widget class="QgsPropertyOverrideButton" name="mYMaxDDBtn">
<property name="text">
<string>...</string>
</property>
@ -462,7 +462,7 @@
</widget>
</item>
<item>
<widget class="QgsDataDefinedButtonV2" name="mAtlasMarginDDBtn">
<widget class="QgsPropertyOverrideButton" name="mAtlasMarginDDBtn">
<property name="text">
<string>...</string>
</property>
@ -796,9 +796,9 @@
<header>qgsspinbox.h</header>
</customwidget>
<customwidget>
<class>QgsDataDefinedButtonV2</class>
<class>QgsPropertyOverrideButton</class>
<extends>QToolButton</extends>
<header>qgsdatadefinedbuttonv2.h</header>
<header>qgspropertyoverridebutton.h</header>
</customwidget>
<customwidget>
<class>QgsBlendModeComboBox</class>

12
src/ui/composer/qgscomposerpicturewidgetbase.ui
View File

@ -113,7 +113,7 @@
</widget>
</item>
<item>
<widget class="QgsDataDefinedButtonV2" name="mSourceDDBtn">
<widget class="QgsPropertyOverrideButton" name="mSourceDDBtn">
<property name="text">
<string>...</string>
</property>
@ -375,7 +375,7 @@
</widget>
</item>
<item row="0" column="3">
<widget class="QgsDataDefinedButtonV2" name="mFillColorDDBtn">
<widget class="QgsPropertyOverrideButton" name="mFillColorDDBtn">
<property name="text">
<string>...</string>
</property>
@ -453,14 +453,14 @@
</widget>
</item>
<item row="1" column="3">
<widget class="QgsDataDefinedButtonV2" name="mOutlineColorDDBtn">
<widget class="QgsPropertyOverrideButton" name="mOutlineColorDDBtn">
<property name="text">
<string>...</string>
</property>
</widget>
</item>
<item row="2" column="3">
<widget class="QgsDataDefinedButtonV2" name="mOutlineWidthDDBtn">
<widget class="QgsPropertyOverrideButton" name="mOutlineWidthDDBtn">
<property name="text">
<string>...</string>
</property>
@ -555,9 +555,9 @@
<container>1</container>
</customwidget>
<customwidget>
<class>QgsDataDefinedButtonV2</class>
<class>QgsPropertyOverrideButton</class>
<extends>QToolButton</extends>
<header>qgsdatadefinedbuttonv2.h</header>
<header>qgspropertyoverridebutton.h</header>
</customwidget>
<customwidget>
<class>QgsDoubleSpinBox</class>

12
src/ui/composer/qgscomposerscalebarwidgetbase.ui
View File

@ -422,7 +422,7 @@
</widget>
</item>
<item row="2" column="2">
<widget class="QgsDataDefinedButtonV2" name="mLineWidthDDBtn">
<widget class="QgsPropertyOverrideButton" name="mLineWidthDDBtn">
<property name="text">
<string>...</string>
</property>
@ -553,7 +553,7 @@
</widget>
</item>
<item>
<widget class="QgsDataDefinedButtonV2" name="mLineColorDDBtn">
<widget class="QgsPropertyOverrideButton" name="mLineColorDDBtn">
<property name="text">
<string>...</string>
</property>
@ -610,7 +610,7 @@
</widget>
</item>
<item>
<widget class="QgsDataDefinedButtonV2" name="mFillColor2DDBtn">
<widget class="QgsPropertyOverrideButton" name="mFillColor2DDBtn">
<property name="text">
<string>...</string>
</property>
@ -660,7 +660,7 @@
</widget>
</item>
<item>
<widget class="QgsDataDefinedButtonV2" name="mFillColorDDBtn">
<widget class="QgsPropertyOverrideButton" name="mFillColorDDBtn">
<property name="text">
<string>...</string>
</property>
@ -699,9 +699,9 @@
<container>1</container>
</customwidget>
<customwidget>
<class>QgsDataDefinedButtonV2</class>
<class>QgsPropertyOverrideButton</class>
<extends>QToolButton</extends>
<header>qgsdatadefinedbuttonv2.h</header>
<header>qgspropertyoverridebutton.h</header>
</customwidget>
<customwidget>
<class>QgsDoubleSpinBox</class>

14
src/ui/composer/qgscompositionwidgetbase.ui
View File

@ -94,7 +94,7 @@
</widget>
</item>
<item>
<widget class="QgsDataDefinedButtonV2" name="mNumPagesDDBtn">
<widget class="QgsPropertyOverrideButton" name="mNumPagesDDBtn">
<property name="text">
<string>...</string>
</property>
@ -241,7 +241,7 @@
</widget>
</item>
<item>
<widget class="QgsDataDefinedButtonV2" name="mPaperHeightDDBtn">
<widget class="QgsPropertyOverrideButton" name="mPaperHeightDDBtn">
<property name="text">
<string>...</string>
</property>
@ -274,7 +274,7 @@
</widget>
</item>
<item>
<widget class="QgsDataDefinedButtonV2" name="mPaperWidthDDBtn">
<widget class="QgsPropertyOverrideButton" name="mPaperWidthDDBtn">
<property name="text">
<string>...</string>
</property>
@ -298,7 +298,7 @@
</widget>
</item>
<item>
<widget class="QgsDataDefinedButtonV2" name="mPaperSizeDDBtn">
<widget class="QgsPropertyOverrideButton" name="mPaperSizeDDBtn">
<property name="text">
<string>...</string>
</property>
@ -332,7 +332,7 @@
</widget>
</item>
<item>
<widget class="QgsDataDefinedButtonV2" name="mPaperOrientationDDBtn">
<widget class="QgsPropertyOverrideButton" name="mPaperOrientationDDBtn">
<property name="text">
<string>...</string>
</property>
@ -697,9 +697,9 @@
<header>qgscomposeritemcombobox.h</header>
</customwidget>
<customwidget>
<class>QgsDataDefinedButtonV2</class>
<class>QgsPropertyOverrideButton</class>
<extends>QToolButton</extends>
<header>qgsdatadefinedbuttonv2.h</header>
<header>qgspropertyoverridebutton.h</header>
</customwidget>
</customwidgets>
<tabstops>

26
src/ui/qgsdiagrampropertiesbase.ui
View File

@ -734,7 +734,7 @@
</widget>
</item>
<item>
<widget class="QgsDataDefinedButtonV2" name="mBackgroundColorDDBtn">
<widget class="QgsPropertyOverrideButton" name="mBackgroundColorDDBtn">
<property name="text">
<string>...</string>
</property>
@ -777,7 +777,7 @@
</widget>
</item>
<item>
<widget class="QgsDataDefinedButtonV2" name="mLineColorDDBtn">
<widget class="QgsPropertyOverrideButton" name="mLineColorDDBtn">
<property name="text">
<string>...</string>
</property>
@ -821,7 +821,7 @@
</widget>
</item>
<item>
<widget class="QgsDataDefinedButtonV2" name="mLineWidthDDBtn">
<widget class="QgsPropertyOverrideButton" name="mLineWidthDDBtn">
<property name="text">
<string>...</string>
</property>
@ -848,7 +848,7 @@
<widget class="QComboBox" name="mAngleOffsetComboBox"/>
</item>
<item>
<widget class="QgsDataDefinedButtonV2" name="mStartAngleDDBtn">
<widget class="QgsPropertyOverrideButton" name="mStartAngleDDBtn">
<property name="text">
<string>...</string>
</property>
@ -968,14 +968,14 @@
</spacer>
</item>
<item row="1" column="2">
<widget class="QgsDataDefinedButtonV2" name="mShowDiagramDDBtn">
<widget class="QgsPropertyOverrideButton" name="mShowDiagramDDBtn">
<property name="text">
<string>...</string>
</property>
</widget>
</item>
<item row="1" column="5">
<widget class="QgsDataDefinedButtonV2" name="mAlwaysShowDDBtn">
<widget class="QgsPropertyOverrideButton" name="mAlwaysShowDDBtn">
<property name="text">
<string>...</string>
</property>
@ -1499,7 +1499,7 @@
<widget class="QgsDoubleSpinBox" name="mDiagramDistanceSpinBox"/>
</item>
<item>
<widget class="QgsDataDefinedButtonV2" name="mDistanceDDBtn">
<widget class="QgsPropertyOverrideButton" name="mDistanceDDBtn">
<property name="text">
<string>...</string>
</property>
@ -1556,7 +1556,7 @@
</widget>
</item>
<item>
<widget class="QgsDataDefinedButtonV2" name="mPriorityDDBtn">
<widget class="QgsPropertyOverrideButton" name="mPriorityDDBtn">
<property name="text">
<string>...</string>
</property>
@ -1600,7 +1600,7 @@
</widget>
</item>
<item>
<widget class="QgsDataDefinedButtonV2" name="mZOrderDDBtn">
<widget class="QgsPropertyOverrideButton" name="mZOrderDDBtn">
<property name="text">
<string>...</string>
</property>
@ -1754,7 +1754,7 @@
</widget>
</item>
<item>
<widget class="QgsDataDefinedButtonV2" name="mCoordXDDBtn">
<widget class="QgsPropertyOverrideButton" name="mCoordXDDBtn">
<property name="text">
<string>...</string>
</property>
@ -1774,7 +1774,7 @@
</widget>
</item>
<item>
<widget class="QgsDataDefinedButtonV2" name="mCoordYDDBtn">
<widget class="QgsPropertyOverrideButton" name="mCoordYDDBtn">
<property name="text">
<string>...</string>
</property>
@ -2178,9 +2178,9 @@
<container>1</container>
</customwidget>
<customwidget>
<class>QgsDataDefinedButtonV2</class>
<class>QgsPropertyOverrideButton</class>
<extends>QToolButton</extends>
<header>qgsdatadefinedbuttonv2.h</header>
<header>qgspropertyoverridebutton.h</header>
</customwidget>
</customwidgets>
<tabstops>

186
src/ui/qgstextformatwidgetbase.ui
View File

@ -810,7 +810,7 @@
</widget>
</item>
<item>
<widget class="QgsDataDefinedButtonV2" name="mFontUnderlineDDBtn">
<widget class="QgsPropertyOverrideButton" name="mFontUnderlineDDBtn">
<property name="text">
<string>...</string>
</property>
@ -851,7 +851,7 @@
</widget>
</item>
<item>
<widget class="QgsDataDefinedButtonV2" name="mFontStrikeoutDDBtn">
<widget class="QgsPropertyOverrideButton" name="mFontStrikeoutDDBtn">
<property name="text">
<string>...</string>
</property>
@ -905,7 +905,7 @@
</widget>
</item>
<item>
<widget class="QgsDataDefinedButtonV2" name="mFontBoldDDBtn">
<widget class="QgsPropertyOverrideButton" name="mFontBoldDDBtn">
<property name="text">
<string>...</string>
</property>
@ -1034,42 +1034,42 @@ font-style: italic;</string>
</widget>
</item>
<item row="3" column="2">
<widget class="QgsDataDefinedButtonV2" name="mFontStyleDDBtn">
<widget class="QgsPropertyOverrideButton" name="mFontStyleDDBtn">
<property name="text">
<string>...</string>
</property>
</widget>
</item>
<item row="5" column="2">
<widget class="QgsDataDefinedButtonV2" name="mFontSizeDDBtn">
<widget class="QgsPropertyOverrideButton" name="mFontSizeDDBtn">
<property name="text">
<string>...</string>
</property>
</widget>
</item>
<item row="13" column="2">
<widget class="QgsDataDefinedButtonV2" name="mFontBlendModeDDBtn">
<widget class="QgsPropertyOverrideButton" name="mFontBlendModeDDBtn">
<property name="text">
<string>...</string>
</property>
</widget>
</item>
<item row="4" column="2">
<widget class="QgsDataDefinedButtonV2" name="mFontItalicDDBtn">
<widget class="QgsPropertyOverrideButton" name="mFontItalicDDBtn">
<property name="text">
<string>...</string>
</property>
</widget>
</item>
<item row="7" column="2">
<widget class="QgsDataDefinedButtonV2" name="mFontColorDDBtn">
<widget class="QgsPropertyOverrideButton" name="mFontColorDDBtn">
<property name="text">
<string>...</string>
</property>
</widget>
</item>
<item row="11" column="2">
<widget class="QgsDataDefinedButtonV2" name="mFontLetterSpacingDDBtn">
<widget class="QgsPropertyOverrideButton" name="mFontLetterSpacingDDBtn">
<property name="text">
<string>...</string>
</property>
@ -1083,7 +1083,7 @@ font-style: italic;</string>
</widget>
</item>
<item row="9" column="2">
<widget class="QgsDataDefinedButtonV2" name="mFontCaseDDBtn">
<widget class="QgsPropertyOverrideButton" name="mFontCaseDDBtn">
<property name="text">
<string>...</string>
</property>
@ -1097,7 +1097,7 @@ font-style: italic;</string>
</widget>
</item>
<item row="6" column="2">
<widget class="QgsDataDefinedButtonV2" name="mFontUnitsDDBtn">
<widget class="QgsPropertyOverrideButton" name="mFontUnitsDDBtn">
<property name="text">
<string>...</string>
</property>
@ -1133,7 +1133,7 @@ font-style: italic;</string>
</widget>
</item>
<item row="1" column="2">
<widget class="QgsDataDefinedButtonV2" name="mFontDDBtn">
<widget class="QgsPropertyOverrideButton" name="mFontDDBtn">
<property name="text">
<string>...</string>
</property>
@ -1153,7 +1153,7 @@ font-style: italic;</string>
</widget>
</item>
<item row="8" column="2">
<widget class="QgsDataDefinedButtonV2" name="mFontTranspDDBtn">
<widget class="QgsPropertyOverrideButton" name="mFontTranspDDBtn">
<property name="text">
<string>...</string>
</property>
@ -1241,7 +1241,7 @@ font-style: italic;</string>
</widget>
</item>
<item row="12" column="2">
<widget class="QgsDataDefinedButtonV2" name="mFontWordSpacingDDBtn">
<widget class="QgsPropertyOverrideButton" name="mFontWordSpacingDDBtn">
<property name="text">
<string>...</string>
</property>
@ -1491,7 +1491,7 @@ font-style: italic;</string>
<number>0</number>
</property>
<item row="0" column="2">
<widget class="QgsDataDefinedButtonV2" name="mWrapCharDDBtn">
<widget class="QgsPropertyOverrideButton" name="mWrapCharDDBtn">
<property name="text">
<string>...</string>
</property>
@ -1508,7 +1508,7 @@ font-style: italic;</string>
</widget>
</item>
<item row="1" column="2">
<widget class="QgsDataDefinedButtonV2" name="mFontLineHeightDDBtn">
<widget class="QgsPropertyOverrideButton" name="mFontLineHeightDDBtn">
<property name="text">
<string>...</string>
</property>
@ -1613,7 +1613,7 @@ font-style: italic;</string>
</widget>
</item>
<item row="2" column="2">
<widget class="QgsDataDefinedButtonV2" name="mFontMultiLineAlignDDBtn">
<widget class="QgsPropertyOverrideButton" name="mFontMultiLineAlignDDBtn">
<property name="text">
<string>...</string>
</property>
@ -1656,7 +1656,7 @@ font-style: italic;</string>
</spacer>
</item>
<item row="0" column="1">
<widget class="QgsDataDefinedButtonV2" name="mDirectSymbDDBtn">
<widget class="QgsPropertyOverrideButton" name="mDirectSymbDDBtn">
<property name="text">
<string>...</string>
</property>
@ -1747,14 +1747,14 @@ font-style: italic;</string>
</widget>
</item>
<item row="2" column="2">
<widget class="QgsDataDefinedButtonV2" name="mDirectSymbPlacementDDBtn">
<widget class="QgsPropertyOverrideButton" name="mDirectSymbPlacementDDBtn">
<property name="text">
<string>...</string>
</property>
</widget>
</item>
<item row="0" column="2">
<widget class="QgsDataDefinedButtonV2" name="mDirectSymbLeftDDBtn">
<widget class="QgsPropertyOverrideButton" name="mDirectSymbLeftDDBtn">
<property name="text">
<string>...</string>
</property>
@ -1801,7 +1801,7 @@ font-style: italic;</string>
</widget>
</item>
<item row="1" column="2">
<widget class="QgsDataDefinedButtonV2" name="mDirectSymbRightDDBtn">
<widget class="QgsPropertyOverrideButton" name="mDirectSymbRightDDBtn">
<property name="text">
<string>...</string>
</property>
@ -1858,7 +1858,7 @@ font-style: italic;</string>
</widget>
</item>
<item row="3" column="2">
<widget class="QgsDataDefinedButtonV2" name="mDirectSymbRevDDBtn">
<widget class="QgsPropertyOverrideButton" name="mDirectSymbRevDDBtn">
<property name="text">
<string>...</string>
</property>
@ -1956,7 +1956,7 @@ font-style: italic;</string>
</widget>
</item>
<item row="0" column="1">
<widget class="QgsDataDefinedButtonV2" name="mFormatNumDDBtn">
<widget class="QgsPropertyOverrideButton" name="mFormatNumDDBtn">
<property name="text">
<string>...</string>
</property>
@ -2004,7 +2004,7 @@ font-style: italic;</string>
</widget>
</item>
<item row="0" column="2">
<widget class="QgsDataDefinedButtonV2" name="mFormatNumDecimalsDDBtn">
<widget class="QgsPropertyOverrideButton" name="mFormatNumDecimalsDDBtn">
<property name="text">
<string>...</string>
</property>
@ -2021,7 +2021,7 @@ font-style: italic;</string>
</widget>
</item>
<item row="1" column="2">
<widget class="QgsDataDefinedButtonV2" name="mFormatNumPlusSignDDBtn">
<widget class="QgsPropertyOverrideButton" name="mFormatNumPlusSignDDBtn">
<property name="text">
<string>...</string>
</property>
@ -2098,7 +2098,7 @@ font-style: italic;</string>
<item>
<layout class="QGridLayout" name="gridLayout_36">
<item row="1" column="1">
<widget class="QgsDataDefinedButtonV2" name="mBufferDrawDDBtn">
<widget class="QgsPropertyOverrideButton" name="mBufferDrawDDBtn">
<property name="text">
<string>...</string>
</property>
@ -2146,14 +2146,14 @@ font-style: italic;</string>
<number>0</number>
</property>
<item row="1" column="2">
<widget class="QgsDataDefinedButtonV2" name="mBufferUnitsDDBtn">
<widget class="QgsPropertyOverrideButton" name="mBufferUnitsDDBtn">
<property name="text">
<string>...</string>
</property>
</widget>
</item>
<item row="6" column="2">
<widget class="QgsDataDefinedButtonV2" name="mBufferBlendModeDDBtn">
<widget class="QgsPropertyOverrideButton" name="mBufferBlendModeDDBtn">
<property name="text">
<string>...</string>
</property>
@ -2309,14 +2309,14 @@ font-style: italic;</string>
</widget>
</item>
<item row="4" column="2">
<widget class="QgsDataDefinedButtonV2" name="mBufferTranspDDBtn">
<widget class="QgsPropertyOverrideButton" name="mBufferTranspDDBtn">
<property name="text">
<string>...</string>
</property>
</widget>
</item>
<item row="5" column="2">
<widget class="QgsDataDefinedButtonV2" name="mBufferJoinStyleDDBtn">
<widget class="QgsPropertyOverrideButton" name="mBufferJoinStyleDDBtn">
<property name="text">
<string>...</string>
</property>
@ -2348,14 +2348,14 @@ font-style: italic;</string>
</widget>
</item>
<item row="0" column="2">
<widget class="QgsDataDefinedButtonV2" name="mBufferSizeDDBtn">
<widget class="QgsPropertyOverrideButton" name="mBufferSizeDDBtn">
<property name="text">
<string>...</string>
</property>
</widget>
</item>
<item row="2" column="2">
<widget class="QgsDataDefinedButtonV2" name="mBufferColorDDBtn">
<widget class="QgsPropertyOverrideButton" name="mBufferColorDDBtn">
<property name="text">
<string>...</string>
</property>
@ -2510,7 +2510,7 @@ font-style: italic;</string>
</widget>
</item>
<item row="1" column="1">
<widget class="QgsDataDefinedButtonV2" name="mShapeDrawDDBtn">
<widget class="QgsPropertyOverrideButton" name="mShapeDrawDDBtn">
<property name="text">
<string>...</string>
</property>
@ -2591,7 +2591,7 @@ font-style: italic;</string>
</widget>
</item>
<item row="17" column="2">
<widget class="QgsDataDefinedButtonV2" name="mShapeFillColorDDBtn">
<widget class="QgsPropertyOverrideButton" name="mShapeFillColorDDBtn">
<property name="text">
<string>...</string>
</property>
@ -2620,21 +2620,21 @@ font-style: italic;</string>
</widget>
</item>
<item row="5" column="2">
<widget class="QgsDataDefinedButtonV2" name="mShapeSizeUnitsDDBtn">
<widget class="QgsPropertyOverrideButton" name="mShapeSizeUnitsDDBtn">
<property name="text">
<string>...</string>
</property>
</widget>
</item>
<item row="19" column="2">
<widget class="QgsDataDefinedButtonV2" name="mShapeBorderWidthDDBtn">
<widget class="QgsPropertyOverrideButton" name="mShapeBorderWidthDDBtn">
<property name="text">
<string>...</string>
</property>
</widget>
</item>
<item row="18" column="2">
<widget class="QgsDataDefinedButtonV2" name="mShapeBorderColorDDBtn">
<widget class="QgsPropertyOverrideButton" name="mShapeBorderColorDDBtn">
<property name="text">
<string>...</string>
</property>
@ -2660,7 +2660,7 @@ font-style: italic;</string>
</widget>
</item>
<item row="15" column="2">
<widget class="QgsDataDefinedButtonV2" name="mShapeBlendModeDDBtn">
<widget class="QgsPropertyOverrideButton" name="mShapeBlendModeDDBtn">
<property name="text">
<string>...</string>
</property>
@ -2713,7 +2713,7 @@ font-style: italic;</string>
</widget>
</item>
<item row="21" column="2">
<widget class="QgsDataDefinedButtonV2" name="mShapePenStyleDDBtn">
<widget class="QgsPropertyOverrideButton" name="mShapePenStyleDDBtn">
<property name="text">
<string>...</string>
</property>
@ -2772,7 +2772,7 @@ font-style: italic;</string>
</layout>
</item>
<item row="13" column="2">
<widget class="QgsDataDefinedButtonV2" name="mShapeRadiusUnitsDDBtn">
<widget class="QgsPropertyOverrideButton" name="mShapeRadiusUnitsDDBtn">
<property name="text">
<string>...</string>
</property>
@ -2789,7 +2789,7 @@ font-style: italic;</string>
</widget>
</item>
<item row="0" column="2">
<widget class="QgsDataDefinedButtonV2" name="mShapeTypeDDBtn">
<widget class="QgsPropertyOverrideButton" name="mShapeTypeDDBtn">
<property name="text">
<string>...</string>
</property>
@ -2844,7 +2844,7 @@ font-style: italic;</string>
</widget>
</item>
<item row="11" column="2">
<widget class="QgsDataDefinedButtonV2" name="mShapeOffsetUnitsDDBtn">
<widget class="QgsPropertyOverrideButton" name="mShapeOffsetUnitsDDBtn">
<property name="text">
<string>...</string>
</property>
@ -2864,7 +2864,7 @@ font-style: italic;</string>
</widget>
</item>
<item row="4" column="2">
<widget class="QgsDataDefinedButtonV2" name="mShapeSizeYDDBtn">
<widget class="QgsPropertyOverrideButton" name="mShapeSizeYDDBtn">
<property name="text">
<string>...</string>
</property>
@ -2907,7 +2907,7 @@ font-style: italic;</string>
</widget>
</item>
<item row="3" column="2">
<widget class="QgsDataDefinedButtonV2" name="mShapeSizeXDDBtn">
<widget class="QgsPropertyOverrideButton" name="mShapeSizeXDDBtn">
<property name="text">
<string>...</string>
</property>
@ -2928,7 +2928,7 @@ font-style: italic;</string>
</widget>
</item>
<item row="2" column="2">
<widget class="QgsDataDefinedButtonV2" name="mShapeSizeTypeDDBtn">
<widget class="QgsPropertyOverrideButton" name="mShapeSizeTypeDDBtn">
<property name="text">
<string>...</string>
</property>
@ -2989,7 +2989,7 @@ font-style: italic;</string>
</widget>
</item>
<item row="7" column="2">
<widget class="QgsDataDefinedButtonV2" name="mShapeRotationTypeDDBtn">
<widget class="QgsPropertyOverrideButton" name="mShapeRotationTypeDDBtn">
<property name="text">
<string>...</string>
</property>
@ -3021,7 +3021,7 @@ font-style: italic;</string>
</widget>
</item>
<item>
<widget class="QgsDataDefinedButtonV2" name="mShapeSVGPathDDBtn">
<widget class="QgsPropertyOverrideButton" name="mShapeSVGPathDDBtn">
<property name="text">
<string>...</string>
</property>
@ -3031,7 +3031,7 @@ font-style: italic;</string>
</widget>
</item>
<item row="14" column="2">
<widget class="QgsDataDefinedButtonV2" name="mShapeTranspDDBtn">
<widget class="QgsPropertyOverrideButton" name="mShapeTranspDDBtn">
<property name="text">
<string>...</string>
</property>
@ -3081,14 +3081,14 @@ font-style: italic;</string>
</layout>
</item>
<item row="20" column="2">
<widget class="QgsDataDefinedButtonV2" name="mShapeBorderUnitsDDBtn">
<widget class="QgsPropertyOverrideButton" name="mShapeBorderUnitsDDBtn">
<property name="text">
<string>...</string>
</property>
</widget>
</item>
<item row="8" column="2">
<widget class="QgsDataDefinedButtonV2" name="mShapeRotationDDBtn">
<widget class="QgsPropertyOverrideButton" name="mShapeRotationDDBtn">
<property name="text">
<string>...</string>
</property>
@ -3147,7 +3147,7 @@ font-style: italic;</string>
</layout>
</item>
<item row="12" column="2">
<widget class="QgsDataDefinedButtonV2" name="mShapeRadiusDDBtn">
<widget class="QgsPropertyOverrideButton" name="mShapeRadiusDDBtn">
<property name="text">
<string>...</string>
</property>
@ -3215,7 +3215,7 @@ font-style: italic;</string>
</layout>
</item>
<item row="9" column="2">
<widget class="QgsDataDefinedButtonV2" name="mShapeOffsetDDBtn">
<widget class="QgsPropertyOverrideButton" name="mShapeOffsetDDBtn">
<property name="text">
<string>...</string>
</property>
@ -3346,7 +3346,7 @@ font-style: italic;</string>
</widget>
</item>
<item row="1" column="1">
<widget class="QgsDataDefinedButtonV2" name="mShadowDrawDDBtn">
<widget class="QgsPropertyOverrideButton" name="mShadowDrawDDBtn">
<property name="text">
<string>...</string>
</property>
@ -3651,70 +3651,70 @@ font-style: italic;</string>
</layout>
</item>
<item row="0" column="2">
<widget class="QgsDataDefinedButtonV2" name="mShadowUnderDDBtn">
<widget class="QgsPropertyOverrideButton" name="mShadowUnderDDBtn">
<property name="text">
<string>...</string>
</property>
</widget>
</item>
<item row="1" column="2">
<widget class="QgsDataDefinedButtonV2" name="mShadowOffsetAngleDDBtn">
<widget class="QgsPropertyOverrideButton" name="mShadowOffsetAngleDDBtn">
<property name="text">
<string>...</string>
</property>
</widget>
</item>
<item row="2" column="2">
<widget class="QgsDataDefinedButtonV2" name="mShadowOffsetDDBtn">
<widget class="QgsPropertyOverrideButton" name="mShadowOffsetDDBtn">
<property name="text">
<string>...</string>
</property>
</widget>
</item>
<item row="3" column="2">
<widget class="QgsDataDefinedButtonV2" name="mShadowOffsetUnitsDDBtn">
<widget class="QgsPropertyOverrideButton" name="mShadowOffsetUnitsDDBtn">
<property name="text">
<string>...</string>
</property>
</widget>
</item>
<item row="5" column="2">
<widget class="QgsDataDefinedButtonV2" name="mShadowRadiusDDBtn">
<widget class="QgsPropertyOverrideButton" name="mShadowRadiusDDBtn">
<property name="text">
<string>...</string>
</property>
</widget>
</item>
<item row="6" column="2">
<widget class="QgsDataDefinedButtonV2" name="mShadowRadiusUnitsDDBtn">
<widget class="QgsPropertyOverrideButton" name="mShadowRadiusUnitsDDBtn">
<property name="text">
<string>...</string>
</property>
</widget>
</item>
<item row="8" column="2">
<widget class="QgsDataDefinedButtonV2" name="mShadowTranspDDBtn">
<widget class="QgsPropertyOverrideButton" name="mShadowTranspDDBtn">
<property name="text">
<string>...</string>
</property>
</widget>
</item>
<item row="9" column="2">
<widget class="QgsDataDefinedButtonV2" name="mShadowScaleDDBtn">
<widget class="QgsPropertyOverrideButton" name="mShadowScaleDDBtn">
<property name="text">
<string>...</string>
</property>
</widget>
</item>
<item row="10" column="2">
<widget class="QgsDataDefinedButtonV2" name="mShadowColorDDBtn">
<widget class="QgsPropertyOverrideButton" name="mShadowColorDDBtn">
<property name="text">
<string>...</string>
</property>
</widget>
</item>
<item row="11" column="2">
<widget class="QgsDataDefinedButtonV2" name="mShadowBlendDDBtn">
<widget class="QgsPropertyOverrideButton" name="mShadowBlendDDBtn">
<property name="text">
<string>...</string>
</property>
@ -4225,7 +4225,7 @@ font-style: italic;</string>
</widget>
</item>
<item row="0" column="3">
<widget class="QgsDataDefinedButtonV2" name="mCentroidDDBtn">
<widget class="QgsPropertyOverrideButton" name="mCentroidDDBtn">
<property name="text">
<string>...</string>
</property>
@ -4301,14 +4301,14 @@ font-style: italic;</string>
</widget>
</item>
<item row="0" column="2">
<widget class="QgsDataDefinedButtonV2" name="mLineDistanceDDBtn">
<widget class="QgsPropertyOverrideButton" name="mLineDistanceDDBtn">
<property name="text">
<string>...</string>
</property>
</widget>
</item>
<item row="1" column="2">
<widget class="QgsDataDefinedButtonV2" name="mLineDistanceUnitDDBtn">
<widget class="QgsPropertyOverrideButton" name="mLineDistanceUnitDDBtn">
<property name="text">
<string>...</string>
</property>
@ -4392,7 +4392,7 @@ font-style: italic;</string>
<number>0</number>
</property>
<item row="0" column="2">
<widget class="QgsDataDefinedButtonV2" name="mPointQuadOffsetDDBtn">
<widget class="QgsPropertyOverrideButton" name="mPointQuadOffsetDDBtn">
<property name="text">
<string>...</string>
</property>
@ -4679,7 +4679,7 @@ font-style: italic;</string>
<number>0</number>
</property>
<item row="0" column="2">
<widget class="QgsDataDefinedButtonV2" name="mPointPositionOrderDDBtn">
<widget class="QgsPropertyOverrideButton" name="mPointPositionOrderDDBtn">
<property name="text">
<string>...</string>
</property>
@ -4794,14 +4794,14 @@ font-style: italic;</string>
</widget>
</item>
<item row="0" column="3">
<widget class="QgsDataDefinedButtonV2" name="mPointOffsetDDBtn">
<widget class="QgsPropertyOverrideButton" name="mPointOffsetDDBtn">
<property name="text">
<string>...</string>
</property>
</widget>
</item>
<item row="1" column="3">
<widget class="QgsDataDefinedButtonV2" name="mPointOffsetUnitsDDBtn">
<widget class="QgsPropertyOverrideButton" name="mPointOffsetUnitsDDBtn">
<property name="text">
<string>...</string>
</property>
@ -4924,7 +4924,7 @@ font-style: italic;</string>
</widget>
</item>
<item row="0" column="2">
<widget class="QgsDataDefinedButtonV2" name="mPointAngleDDBtn">
<widget class="QgsPropertyOverrideButton" name="mPointAngleDDBtn">
<property name="text">
<string>...</string>
</property>
@ -4984,7 +4984,7 @@ font-style: italic;</string>
</widget>
</item>
<item row="0" column="2">
<widget class="QgsDataDefinedButtonV2" name="mRepeatDistanceDDBtn">
<widget class="QgsPropertyOverrideButton" name="mRepeatDistanceDDBtn">
<property name="text">
<string>...</string>
</property>
@ -4998,7 +4998,7 @@ font-style: italic;</string>
</widget>
</item>
<item row="1" column="2">
<widget class="QgsDataDefinedButtonV2" name="mRepeatDistanceUnitDDBtn">
<widget class="QgsPropertyOverrideButton" name="mRepeatDistanceUnitDDBtn">
<property name="text">
<string>...</string>
</property>
@ -5071,7 +5071,7 @@ font-style: italic;</string>
</widget>
</item>
<item row="1" column="5">
<widget class="QgsDataDefinedButtonV2" name="mMaxCharAngleDDBtn">
<widget class="QgsPropertyOverrideButton" name="mMaxCharAngleDDBtn">
<property name="text">
<string>...</string>
</property>
@ -5169,7 +5169,7 @@ font-style: italic;</string>
</widget>
</item>
<item>
<widget class="QgsDataDefinedButtonV2" name="mCoordXDDBtn">
<widget class="QgsPropertyOverrideButton" name="mCoordXDDBtn">
<property name="text">
<string>...</string>
</property>
@ -5189,7 +5189,7 @@ font-style: italic;</string>
</widget>
</item>
<item>
<widget class="QgsDataDefinedButtonV2" name="mCoordYDDBtn">
<widget class="QgsPropertyOverrideButton" name="mCoordYDDBtn">
<property name="text">
<string>...</string>
</property>
@ -5234,7 +5234,7 @@ font-style: italic;</string>
<item row="2" column="1">
<layout class="QHBoxLayout" name="horizontalLayout_25">
<item>
<widget class="QgsDataDefinedButtonV2" name="mCoordRotationDDBtn">
<widget class="QgsPropertyOverrideButton" name="mCoordRotationDDBtn">
<property name="text">
<string>...</string>
</property>
@ -5287,7 +5287,7 @@ font-style: italic;</string>
</widget>
</item>
<item>
<widget class="QgsDataDefinedButtonV2" name="mCoordAlignmentHDDBtn">
<widget class="QgsPropertyOverrideButton" name="mCoordAlignmentHDDBtn">
<property name="text">
<string>...</string>
</property>
@ -5307,7 +5307,7 @@ font-style: italic;</string>
</widget>
</item>
<item>
<widget class="QgsDataDefinedButtonV2" name="mCoordAlignmentVDDBtn">
<widget class="QgsPropertyOverrideButton" name="mCoordAlignmentVDDBtn">
<property name="text">
<string>...</string>
</property>
@ -5381,7 +5381,7 @@ font-style: italic;</string>
</widget>
</item>
<item>
<widget class="QgsDataDefinedButtonV2" name="mPriorityDDBtn">
<widget class="QgsPropertyOverrideButton" name="mPriorityDDBtn">
<property name="text">
<string>...</string>
</property>
@ -5491,7 +5491,7 @@ font-style: italic;</string>
</widget>
</item>
<item row="0" column="1">
<widget class="QgsDataDefinedButtonV2" name="mScaleBasedVisibilityDDBtn">
<widget class="QgsPropertyOverrideButton" name="mScaleBasedVisibilityDDBtn">
<property name="text">
<string>...</string>
</property>
@ -5557,7 +5557,7 @@ font-style: italic;</string>
</widget>
</item>
<item row="0" column="1">
<widget class="QgsDataDefinedButtonV2" name="mScaleBasedVisibilityMinDDBtn">
<widget class="QgsPropertyOverrideButton" name="mScaleBasedVisibilityMinDDBtn">
<property name="text">
<string>...</string>
</property>
@ -5592,7 +5592,7 @@ font-style: italic;</string>
</widget>
</item>
<item row="1" column="1">
<widget class="QgsDataDefinedButtonV2" name="mScaleBasedVisibilityMaxDDBtn">
<widget class="QgsPropertyOverrideButton" name="mScaleBasedVisibilityMaxDDBtn">
<property name="text">
<string>...</string>
</property>
@ -5622,7 +5622,7 @@ font-style: italic;</string>
</widget>
</item>
<item row="0" column="1">
<widget class="QgsDataDefinedButtonV2" name="mFontLimitPixelDDBtn">
<widget class="QgsPropertyOverrideButton" name="mFontLimitPixelDDBtn">
<property name="text">
<string>...</string>
</property>
@ -5694,7 +5694,7 @@ font-style: italic;</string>
</widget>
</item>
<item row="0" column="1">
<widget class="QgsDataDefinedButtonV2" name="mFontMinPixelDDBtn">
<widget class="QgsPropertyOverrideButton" name="mFontMinPixelDDBtn">
<property name="text">
<string>...</string>
</property>
@ -5732,7 +5732,7 @@ font-style: italic;</string>
</widget>
</item>
<item row="1" column="1">
<widget class="QgsDataDefinedButtonV2" name="mFontMaxPixelDDBtn">
<widget class="QgsPropertyOverrideButton" name="mFontMaxPixelDDBtn">
<property name="text">
<string>...</string>
</property>
@ -5773,7 +5773,7 @@ font-style: italic;</string>
</widget>
</item>
<item>
<widget class="QgsDataDefinedButtonV2" name="mZIndexDDBtn">
<widget class="QgsPropertyOverrideButton" name="mZIndexDDBtn">
<property name="text">
<string>...</string>
</property>
@ -5839,14 +5839,14 @@ font-style: italic;</string>
</spacer>
</item>
<item row="1" column="2">
<widget class="QgsDataDefinedButtonV2" name="mShowLabelDDBtn">
<widget class="QgsPropertyOverrideButton" name="mShowLabelDDBtn">
<property name="text">
<string>...</string>
</property>
</widget>
</item>
<item row="1" column="5">
<widget class="QgsDataDefinedButtonV2" name="mAlwaysShowDDBtn">
<widget class="QgsPropertyOverrideButton" name="mAlwaysShowDDBtn">
<property name="text">
<string>...</string>
</property>
@ -6209,7 +6209,7 @@ font-style: italic;</string>
</widget>
</item>
<item>
<widget class="QgsDataDefinedButtonV2" name="mIsObstacleDDBtn">
<widget class="QgsPropertyOverrideButton" name="mIsObstacleDDBtn">
<property name="text">
<string>...</string>
</property>
@ -6285,7 +6285,7 @@ font-style: italic;</string>
</widget>
</item>
<item>
<widget class="QgsDataDefinedButtonV2" name="mObstacleFactorDDBtn">
<widget class="QgsPropertyOverrideButton" name="mObstacleFactorDDBtn">
<property name="text">
<string>...</string>
</property>
@ -6440,9 +6440,9 @@ font-style: italic;</string>
<container>1</container>
</customwidget>
<customwidget>
<class>QgsDataDefinedButtonV2</class>
<class>QgsPropertyOverrideButton</class>
<extends>QToolButton</extends>
<header>qgsdatadefinedbuttonv2.h</header>
<header>qgspropertyoverridebutton.h</header>
</customwidget>
<customwidget>
<class>QgsDoubleSpinBox</class>

18
src/ui/symbollayer/qgsarrowsymbollayerwidgetbase.ui
View File

@ -18,7 +18,7 @@
</property>
<layout class="QGridLayout" name="gridLayout">
<item row="1" column="2">
<widget class="QgsDataDefinedButtonV2" name="mArrowTypeDDBtn">
<widget class="QgsPropertyOverrideButton" name="mArrowTypeDDBtn">
<property name="text">
<string>...</string>
</property>
@ -96,7 +96,7 @@
</layout>
</item>
<item row="5" column="2">
<widget class="QgsDataDefinedButtonV2" name="mHeadHeightDDBtn">
<widget class="QgsPropertyOverrideButton" name="mHeadHeightDDBtn">
<property name="text">
<string>...</string>
</property>
@ -130,14 +130,14 @@
</widget>
</item>
<item row="4" column="2">
<widget class="QgsDataDefinedButtonV2" name="mHeadWidthDDBtn">
<widget class="QgsPropertyOverrideButton" name="mHeadWidthDDBtn">
<property name="text">
<string>...</string>
</property>
</widget>
</item>
<item row="2" column="2">
<widget class="QgsDataDefinedButtonV2" name="mArrowWidthDDBtn">
<widget class="QgsPropertyOverrideButton" name="mArrowWidthDDBtn">
<property name="text">
<string>...</string>
</property>
@ -177,7 +177,7 @@
</layout>
</item>
<item row="6" column="2">
<widget class="QgsDataDefinedButtonV2" name="mOffsetDDBtn">
<widget class="QgsPropertyOverrideButton" name="mOffsetDDBtn">
<property name="text">
<string>...</string>
</property>
@ -213,7 +213,7 @@
</layout>
</item>
<item row="0" column="2">
<widget class="QgsDataDefinedButtonV2" name="mHeadTypeDDBtn">
<widget class="QgsPropertyOverrideButton" name="mHeadTypeDDBtn">
<property name="text">
<string>...</string>
</property>
@ -227,7 +227,7 @@
</widget>
</item>
<item row="3" column="2">
<widget class="QgsDataDefinedButtonV2" name="mArrowStartWidthDDBtn">
<widget class="QgsPropertyOverrideButton" name="mArrowStartWidthDDBtn">
<property name="text">
<string>...</string>
</property>
@ -362,9 +362,9 @@
<header>qgsdoublespinbox.h</header>
</customwidget>
<customwidget>
<class>QgsDataDefinedButtonV2</class>
<class>QgsPropertyOverrideButton</class>
<extends>QToolButton</extends>
<header>qgsdatadefinedbuttonv2.h</header>
<header>qgspropertyoverridebutton.h</header>
</customwidget>
<customwidget>
<class>QgsUnitSelectionWidget</class>

28
src/ui/symbollayer/widget_ellipse.ui
View File

@ -497,84 +497,84 @@
</layout>
</item>
<item row="0" column="2">
<widget class="QgsDataDefinedButtonV2" name="mFillColorDDBtn">
<widget class="QgsPropertyOverrideButton" name="mFillColorDDBtn">
<property name="text">
<string>...</string>
</property>
</widget>
</item>
<item row="1" column="2">
<widget class="QgsDataDefinedButtonV2" name="mBorderColorDDBtn">
<widget class="QgsPropertyOverrideButton" name="mBorderColorDDBtn">
<property name="text">
<string>...</string>
</property>
</widget>
</item>
<item row="2" column="2">
<widget class="QgsDataDefinedButtonV2" name="mSymbolWidthDDBtn">
<widget class="QgsPropertyOverrideButton" name="mSymbolWidthDDBtn">
<property name="text">
<string>...</string>
</property>
</widget>
</item>
<item row="3" column="2">
<widget class="QgsDataDefinedButtonV2" name="mSymbolHeightDDBtn">
<widget class="QgsPropertyOverrideButton" name="mSymbolHeightDDBtn">
<property name="text">
<string>...</string>
</property>
</widget>
</item>
<item row="4" column="2">
<widget class="QgsDataDefinedButtonV2" name="mOutlineStyleDDBtn">
<widget class="QgsPropertyOverrideButton" name="mOutlineStyleDDBtn">
<property name="text">
<string>...</string>
</property>
</widget>
</item>
<item row="5" column="2">
<widget class="QgsDataDefinedButtonV2" name="mJoinStyleDDBtn">
<widget class="QgsPropertyOverrideButton" name="mJoinStyleDDBtn">
<property name="text">
<string>...</string>
</property>
</widget>
</item>
<item row="6" column="2">
<widget class="QgsDataDefinedButtonV2" name="mOutlineWidthDDBtn">
<widget class="QgsPropertyOverrideButton" name="mOutlineWidthDDBtn">
<property name="text">
<string>...</string>
</property>
</widget>
</item>
<item row="7" column="2">
<widget class="QgsDataDefinedButtonV2" name="mRotationDDBtn">
<widget class="QgsPropertyOverrideButton" name="mRotationDDBtn">
<property name="text">
<string>...</string>
</property>
</widget>
</item>
<item row="8" column="2">
<widget class="QgsDataDefinedButtonV2" name="mOffsetDDBtn">
<widget class="QgsPropertyOverrideButton" name="mOffsetDDBtn">
<property name="text">
<string>...</string>
</property>
</widget>
</item>
<item row="9" column="2">
<widget class="QgsDataDefinedButtonV2" name="mVerticalAnchorDDBtn">
<widget class="QgsPropertyOverrideButton" name="mVerticalAnchorDDBtn">
<property name="text">
<string>...</string>
</property>
</widget>
</item>
<item row="10" column="2">
<widget class="QgsDataDefinedButtonV2" name="mHorizontalAnchorDDBtn">
<widget class="QgsPropertyOverrideButton" name="mHorizontalAnchorDDBtn">
<property name="text">
<string>...</string>
</property>
</widget>
</item>
<item row="11" column="2">
<widget class="QgsDataDefinedButtonV2" name="mShapeDDBtn">
<widget class="QgsPropertyOverrideButton" name="mShapeDDBtn">
<property name="text">
<string>...</string>
</property>
@ -590,9 +590,9 @@
<container>1</container>
</customwidget>
<customwidget>
<class>QgsDataDefinedButtonV2</class>
<class>QgsPropertyOverrideButton</class>
<extends>QToolButton</extends>
<header>qgsdatadefinedbuttonv2.h</header>
<header>qgspropertyoverridebutton.h</header>
</customwidget>
<customwidget>
<class>QgsDoubleSpinBox</class>

16
src/ui/symbollayer/widget_filledmarker.ui
View File

@ -64,7 +64,7 @@
</layout>
</item>
<item row="0" column="2">
<widget class="QgsDataDefinedButtonV2" name="mSizeDDBtn">
<widget class="QgsPropertyOverrideButton" name="mSizeDDBtn">
<property name="text">
<string>...</string>
</property>
@ -94,7 +94,7 @@
</widget>
</item>
<item row="1" column="2">
<widget class="QgsDataDefinedButtonV2" name="mAngleDDBtn">
<widget class="QgsPropertyOverrideButton" name="mAngleDDBtn">
<property name="text">
<string>...</string>
</property>
@ -173,7 +173,7 @@
</layout>
</item>
<item row="3" column="2">
<widget class="QgsDataDefinedButtonV2" name="mOffsetDDBtn">
<widget class="QgsPropertyOverrideButton" name="mOffsetDDBtn">
<property name="text">
<string>...</string>
</property>
@ -206,7 +206,7 @@
</widget>
</item>
<item row="4" column="2">
<widget class="QgsDataDefinedButtonV2" name="mHorizontalAnchorDDBtn">
<widget class="QgsPropertyOverrideButton" name="mHorizontalAnchorDDBtn">
<property name="text">
<string>...</string>
</property>
@ -232,7 +232,7 @@
</widget>
</item>
<item row="5" column="2">
<widget class="QgsDataDefinedButtonV2" name="mVerticalAnchorDDBtn">
<widget class="QgsPropertyOverrideButton" name="mVerticalAnchorDDBtn">
<property name="text">
<string>...</string>
</property>
@ -282,7 +282,7 @@
</widget>
</item>
<item row="6" column="2">
<widget class="QgsDataDefinedButtonV2" name="mNameDDBtn">
<widget class="QgsPropertyOverrideButton" name="mNameDDBtn">
<property name="text">
<string>...</string>
</property>
@ -292,9 +292,9 @@
</widget>
<customwidgets>
<customwidget>
<class>QgsDataDefinedButtonV2</class>
<class>QgsPropertyOverrideButton</class>
<extends>QToolButton</extends>
<header>qgsdatadefinedbuttonv2.h</header>
<header>qgspropertyoverridebutton.h</header>
</customwidget>
<customwidget>
<class>QgsDoubleSpinBox</class>

24
src/ui/symbollayer/widget_fontmarker.ui
View File

@ -163,7 +163,7 @@
</widget>
</item>
<item row="2" column="2">
<widget class="QgsDataDefinedButtonV2" name="mBorderColorDDBtn">
<widget class="QgsPropertyOverrideButton" name="mBorderColorDDBtn">
<property name="text">
<string>...</string>
</property>
@ -245,7 +245,7 @@
</widget>
</item>
<item row="5" column="2">
<widget class="QgsDataDefinedButtonV2" name="mBorderWidthDDBtn">
<widget class="QgsPropertyOverrideButton" name="mBorderWidthDDBtn">
<property name="text">
<string>...</string>
</property>
@ -259,7 +259,7 @@
</widget>
</item>
<item row="4" column="2">
<widget class="QgsDataDefinedButtonV2" name="mJoinStyleDDBtn">
<widget class="QgsPropertyOverrideButton" name="mJoinStyleDDBtn">
<property name="text">
<string>...</string>
</property>
@ -308,7 +308,7 @@
</widget>
</item>
<item row="3" column="2">
<widget class="QgsDataDefinedButtonV2" name="mSizeDDBtn">
<widget class="QgsPropertyOverrideButton" name="mSizeDDBtn">
<property name="text">
<string>...</string>
</property>
@ -382,7 +382,7 @@
</layout>
</item>
<item row="1" column="2">
<widget class="QgsDataDefinedButtonV2" name="mColorDDBtn">
<widget class="QgsPropertyOverrideButton" name="mColorDDBtn">
<property name="text">
<string>...</string>
</property>
@ -416,35 +416,35 @@
</layout>
</item>
<item row="6" column="2">
<widget class="QgsDataDefinedButtonV2" name="mRotationDDBtn">
<widget class="QgsPropertyOverrideButton" name="mRotationDDBtn">
<property name="text">
<string>...</string>
</property>
</widget>
</item>
<item row="7" column="2">
<widget class="QgsDataDefinedButtonV2" name="mOffsetDDBtn">
<widget class="QgsPropertyOverrideButton" name="mOffsetDDBtn">
<property name="text">
<string>...</string>
</property>
</widget>
</item>
<item row="8" column="2">
<widget class="QgsDataDefinedButtonV2" name="mHorizontalAnchorDDBtn">
<widget class="QgsPropertyOverrideButton" name="mHorizontalAnchorDDBtn">
<property name="text">
<string>...</string>
</property>
</widget>
</item>
<item row="9" column="2">
<widget class="QgsDataDefinedButtonV2" name="mVerticalAnchorDDBtn">
<widget class="QgsPropertyOverrideButton" name="mVerticalAnchorDDBtn">
<property name="text">
<string>...</string>
</property>
</widget>
</item>
<item row="10" column="2">
<widget class="QgsDataDefinedButtonV2" name="mCharDDBtn">
<widget class="QgsPropertyOverrideButton" name="mCharDDBtn">
<property name="text">
<string>...</string>
</property>
@ -460,9 +460,9 @@
<container>1</container>
</customwidget>
<customwidget>
<class>QgsDataDefinedButtonV2</class>
<class>QgsPropertyOverrideButton</class>
<extends>QToolButton</extends>
<header>qgsdatadefinedbuttonv2.h</header>
<header>qgspropertyoverridebutton.h</header>
</customwidget>
<customwidget>
<class>QgsDoubleSpinBox</class>

28
src/ui/symbollayer/widget_gradientfill.ui
View File

@ -72,7 +72,7 @@
</layout>
</item>
<item row="5" column="2">
<widget class="QgsDataDefinedButtonV2" name="mSpreadDDBtn">
<widget class="QgsPropertyOverrideButton" name="mSpreadDDBtn">
<property name="text">
<string>...</string>
</property>
@ -172,7 +172,7 @@
</widget>
</item>
<item row="8" column="2" rowspan="2">
<widget class="QgsDataDefinedButtonV2" name="mRefPoint1YDDBtn">
<widget class="QgsPropertyOverrideButton" name="mRefPoint1YDDBtn">
<property name="text">
<string>...</string>
</property>
@ -257,14 +257,14 @@
</layout>
</item>
<item row="17" column="2">
<widget class="QgsDataDefinedButtonV2" name="mAngleDDBtn">
<widget class="QgsPropertyOverrideButton" name="mAngleDDBtn">
<property name="text">
<string>...</string>
</property>
</widget>
</item>
<item row="4" column="2">
<widget class="QgsDataDefinedButtonV2" name="mCoordinateModeDDBtn">
<widget class="QgsPropertyOverrideButton" name="mCoordinateModeDDBtn">
<property name="text">
<string>...</string>
</property>
@ -301,7 +301,7 @@
</layout>
</item>
<item row="3" column="2">
<widget class="QgsDataDefinedButtonV2" name="mGradientTypeDDBtn">
<widget class="QgsPropertyOverrideButton" name="mGradientTypeDDBtn">
<property name="text">
<string>...</string>
</property>
@ -315,21 +315,21 @@
</widget>
</item>
<item row="0" column="2">
<widget class="QgsDataDefinedButtonV2" name="mStartColorDDBtn">
<widget class="QgsPropertyOverrideButton" name="mStartColorDDBtn">
<property name="text">
<string>...</string>
</property>
</widget>
</item>
<item row="13" column="2" rowspan="2">
<widget class="QgsDataDefinedButtonV2" name="mRefPoint2YDDBtn">
<widget class="QgsPropertyOverrideButton" name="mRefPoint2YDDBtn">
<property name="text">
<string>...</string>
</property>
</widget>
</item>
<item row="15" column="2">
<widget class="QgsDataDefinedButtonV2" name="mRefPoint2CentroidDDBtn">
<widget class="QgsPropertyOverrideButton" name="mRefPoint2CentroidDDBtn">
<property name="text">
<string>...</string>
</property>
@ -432,14 +432,14 @@
</widget>
</item>
<item row="10" column="2">
<widget class="QgsDataDefinedButtonV2" name="mRefPoint1CentroidDDBtn">
<widget class="QgsPropertyOverrideButton" name="mRefPoint1CentroidDDBtn">
<property name="text">
<string>...</string>
</property>
</widget>
</item>
<item row="1" column="2">
<widget class="QgsDataDefinedButtonV2" name="mEndColorDDBtn">
<widget class="QgsPropertyOverrideButton" name="mEndColorDDBtn">
<property name="text">
<string>...</string>
</property>
@ -483,7 +483,7 @@
</layout>
</item>
<item row="6" column="2" rowspan="2">
<widget class="QgsDataDefinedButtonV2" name="mRefPoint1XDDBtn">
<widget class="QgsPropertyOverrideButton" name="mRefPoint1XDDBtn">
<property name="text">
<string>...</string>
</property>
@ -497,7 +497,7 @@
</widget>
</item>
<item row="12" column="2">
<widget class="QgsDataDefinedButtonV2" name="mRefPoint2XDDBtn">
<widget class="QgsPropertyOverrideButton" name="mRefPoint2XDDBtn">
<property name="text">
<string>...</string>
</property>
@ -553,9 +553,9 @@
<container>1</container>
</customwidget>
<customwidget>
<class>QgsDataDefinedButtonV2</class>
<class>QgsPropertyOverrideButton</class>
<extends>QToolButton</extends>
<header>qgsdatadefinedbuttonv2.h</header>
<header>qgspropertyoverridebutton.h</header>
</customwidget>
<customwidget>
<class>QgsDoubleSpinBox</class>

6
src/ui/symbollayer/widget_layerproperties.ui
View File

@ -84,7 +84,7 @@
</widget>
</item>
<item>
<widget class="QgsDataDefinedButtonV2" name="mEnabledDDBtn">
<widget class="QgsPropertyOverrideButton" name="mEnabledDDBtn">
<property name="text">
<string>...</string>
</property>
@ -125,9 +125,9 @@
<container>1</container>
</customwidget>
<customwidget>
<class>QgsDataDefinedButtonV2</class>
<class>QgsPropertyOverrideButton</class>
<extends>QToolButton</extends>
<header>qgsdatadefinedbuttonv2.h</header>
<header>qgspropertyoverridebutton.h</header>
</customwidget>
</customwidgets>
<resources/>

8
src/ui/symbollayer/widget_linepatternfill.ui
View File

@ -22,7 +22,7 @@
</widget>
</item>
<item row="0" column="2">
<widget class="QgsDataDefinedButtonV2" name="mAngleDDBtn">
<widget class="QgsPropertyOverrideButton" name="mAngleDDBtn">
<property name="text">
<string>...</string>
</property>
@ -111,7 +111,7 @@
</layout>
</item>
<item row="1" column="2">
<widget class="QgsDataDefinedButtonV2" name="mDistanceDDBtn">
<widget class="QgsPropertyOverrideButton" name="mDistanceDDBtn">
<property name="text">
<string>...</string>
</property>
@ -154,9 +154,9 @@
</widget>
<customwidgets>
<customwidget>
<class>QgsDataDefinedButtonV2</class>
<class>QgsPropertyOverrideButton</class>
<extends>QToolButton</extends>
<header>qgsdatadefinedbuttonv2.h</header>
<header>qgspropertyoverridebutton.h</header>
</customwidget>
<customwidget>
<class>QgsDoubleSpinBox</class>

12
src/ui/symbollayer/widget_markerline.ui
View File

@ -157,21 +157,21 @@
</widget>
</item>
<item row="0" column="0">
<widget class="QgsDataDefinedButtonV2" name="mPlacementDDBtn">
<widget class="QgsPropertyOverrideButton" name="mPlacementDDBtn">
<property name="text">
<string>...</string>
</property>
</widget>
</item>
<item row="0" column="2">
<widget class="QgsDataDefinedButtonV2" name="mIntervalDDBtn">
<widget class="QgsPropertyOverrideButton" name="mIntervalDDBtn">
<property name="text">
<string>...</string>
</property>
</widget>
</item>
<item row="6" column="2">
<widget class="QgsDataDefinedButtonV2" name="mOffsetAlongLineDDBtn">
<widget class="QgsPropertyOverrideButton" name="mOffsetAlongLineDDBtn">
<property name="text">
<string>...</string>
</property>
@ -232,7 +232,7 @@
</widget>
</item>
<item>
<widget class="QgsDataDefinedButtonV2" name="mLineOffsetDDBtn">
<widget class="QgsPropertyOverrideButton" name="mLineOffsetDDBtn">
<property name="text">
<string>...</string>
</property>
@ -254,9 +254,9 @@
</widget>
<customwidgets>
<customwidget>
<class>QgsDataDefinedButtonV2</class>
<class>QgsPropertyOverrideButton</class>
<extends>QToolButton</extends>
<header>qgsdatadefinedbuttonv2.h</header>
<header>qgspropertyoverridebutton.h</header>
</customwidget>
<customwidget>
<class>QgsDoubleSpinBox</class>

12
src/ui/symbollayer/widget_pointpatternfill.ui
View File

@ -72,7 +72,7 @@
</layout>
</item>
<item row="2" column="2">
<widget class="QgsDataDefinedButtonV2" name="mVerticalDistanceDDBtn">
<widget class="QgsPropertyOverrideButton" name="mVerticalDistanceDDBtn">
<property name="text">
<string>...</string>
</property>
@ -122,7 +122,7 @@
</layout>
</item>
<item row="1" column="2">
<widget class="QgsDataDefinedButtonV2" name="mHorizontalDistanceDDBtn">
<widget class="QgsPropertyOverrideButton" name="mHorizontalDistanceDDBtn">
<property name="text">
<string>...</string>
</property>
@ -172,7 +172,7 @@
</layout>
</item>
<item row="4" column="2">
<widget class="QgsDataDefinedButtonV2" name="mHorizontalDisplacementDDBtn">
<widget class="QgsPropertyOverrideButton" name="mHorizontalDisplacementDDBtn">
<property name="text">
<string>...</string>
</property>
@ -215,7 +215,7 @@
</layout>
</item>
<item row="5" column="2">
<widget class="QgsDataDefinedButtonV2" name="mVerticalDisplacementDDBtn">
<widget class="QgsPropertyOverrideButton" name="mVerticalDisplacementDDBtn">
<property name="text">
<string>...</string>
</property>
@ -238,9 +238,9 @@
</widget>
<customwidgets>
<customwidget>
<class>QgsDataDefinedButtonV2</class>
<class>QgsPropertyOverrideButton</class>
<extends>QToolButton</extends>
<header>qgsdatadefinedbuttonv2.h</header>
<header>qgspropertyoverridebutton.h</header>
</customwidget>
<customwidget>
<class>QgsDoubleSpinBox</class>

12
src/ui/symbollayer/widget_rasterfill.ui
View File

@ -61,7 +61,7 @@
</layout>
</item>
<item row="1" column="2">
<widget class="QgsDataDefinedButtonV2" name="mFilenameDDBtn">
<widget class="QgsPropertyOverrideButton" name="mFilenameDDBtn">
<property name="text">
<string>...</string>
</property>
@ -91,7 +91,7 @@
</layout>
</item>
<item row="5" column="2">
<widget class="QgsDataDefinedButtonV2" name="mOpacityDDBtn">
<widget class="QgsPropertyOverrideButton" name="mOpacityDDBtn">
<property name="text">
<string>...</string>
</property>
@ -275,14 +275,14 @@
</widget>
</item>
<item row="2" column="2">
<widget class="QgsDataDefinedButtonV2" name="mWidthDDBtn">
<widget class="QgsPropertyOverrideButton" name="mWidthDDBtn">
<property name="text">
<string>...</string>
</property>
</widget>
</item>
<item row="3" column="2">
<widget class="QgsDataDefinedButtonV2" name="mRotationDDBtn">
<widget class="QgsPropertyOverrideButton" name="mRotationDDBtn">
<property name="text">
<string>...</string>
</property>
@ -344,9 +344,9 @@
</widget>
<customwidgets>
<customwidget>
<class>QgsDataDefinedButtonV2</class>
<class>QgsPropertyOverrideButton</class>
<extends>QToolButton</extends>
<header>qgsdatadefinedbuttonv2.h</header>
<header>qgspropertyoverridebutton.h</header>
</customwidget>
<customwidget>
<class>QgsDoubleSpinBox</class>

6
src/ui/symbollayer/widget_set_dd_value.ui
View File

@ -22,7 +22,7 @@
</widget>
</item>
<item row="0" column="2">
<widget class="QgsDataDefinedButtonV2" name="mDDBtn">
<widget class="QgsPropertyOverrideButton" name="mDDBtn">
<property name="text">
<string>...</string>
</property>
@ -49,9 +49,9 @@
</widget>
<customwidgets>
<customwidget>
<class>QgsDataDefinedButtonV2</class>
<class>QgsPropertyOverrideButton</class>
<extends>QToolButton</extends>
<header>qgsdatadefinedbuttonv2.h</header>
<header>qgspropertyoverridebutton.h</header>
</customwidget>
<customwidget>
<class>QgsDoubleSpinBox</class>

16
src/ui/symbollayer/widget_shapeburstfill.ui
View File

@ -51,7 +51,7 @@
</widget>
</item>
<item row="5" column="4">
<widget class="QgsDataDefinedButtonV2" name="mShadeWholeShapeDDBtn">
<widget class="QgsPropertyOverrideButton" name="mShadeWholeShapeDDBtn">
<property name="text">
<string>...</string>
</property>
@ -94,14 +94,14 @@
</layout>
</item>
<item row="6" column="4">
<widget class="QgsDataDefinedButtonV2" name="mShadeDistanceDDBtn">
<widget class="QgsPropertyOverrideButton" name="mShadeDistanceDDBtn">
<property name="text">
<string>...</string>
</property>
</widget>
</item>
<item row="2" column="4">
<widget class="QgsDataDefinedButtonV2" name="mEndColorDDBtn">
<widget class="QgsPropertyOverrideButton" name="mEndColorDDBtn">
<property name="text">
<string>...</string>
</property>
@ -184,14 +184,14 @@
</widget>
</item>
<item row="9" column="4">
<widget class="QgsDataDefinedButtonV2" name="mBlurRadiusDDBtn">
<widget class="QgsPropertyOverrideButton" name="mBlurRadiusDDBtn">
<property name="text">
<string>...</string>
</property>
</widget>
</item>
<item row="1" column="4">
<widget class="QgsDataDefinedButtonV2" name="mStartColorDDBtn">
<widget class="QgsPropertyOverrideButton" name="mStartColorDDBtn">
<property name="text">
<string>...</string>
</property>
@ -247,7 +247,7 @@
</widget>
</item>
<item row="8" column="4">
<widget class="QgsDataDefinedButtonV2" name="mIgnoreRingsDDBtn">
<widget class="QgsPropertyOverrideButton" name="mIgnoreRingsDDBtn">
<property name="text">
<string>...</string>
</property>
@ -404,9 +404,9 @@
</widget>
<customwidgets>
<customwidget>
<class>QgsDataDefinedButtonV2</class>
<class>QgsPropertyOverrideButton</class>
<extends>QToolButton</extends>
<header>qgsdatadefinedbuttonv2.h</header>
<header>qgspropertyoverridebutton.h</header>
</customwidget>
<customwidget>
<class>QgsDoubleSpinBox</class>

16
src/ui/symbollayer/widget_simplefill.ui
View File

@ -58,21 +58,21 @@
</widget>
</item>
<item row="2" column="2">
<widget class="QgsDataDefinedButtonV2" name="mFillStyleDDBtn">
<widget class="QgsPropertyOverrideButton" name="mFillStyleDDBtn">
<property name="text">
<string>...</string>
</property>
</widget>
</item>
<item row="0" column="2">
<widget class="QgsDataDefinedButtonV2" name="mFillColorDDBtn">
<widget class="QgsPropertyOverrideButton" name="mFillColorDDBtn">
<property name="text">
<string>...</string>
</property>
</widget>
</item>
<item row="5" column="2">
<widget class="QgsDataDefinedButtonV2" name="mBorderWidthDDBtn">
<widget class="QgsPropertyOverrideButton" name="mBorderWidthDDBtn">
<property name="text">
<string>...</string>
</property>
@ -232,14 +232,14 @@
</widget>
</item>
<item row="1" column="2">
<widget class="QgsDataDefinedButtonV2" name="mBorderColorDDBtn">
<widget class="QgsPropertyOverrideButton" name="mBorderColorDDBtn">
<property name="text">
<string>...</string>
</property>
</widget>
</item>
<item row="4" column="2">
<widget class="QgsDataDefinedButtonV2" name="mJoinStyleDDBtn">
<widget class="QgsPropertyOverrideButton" name="mJoinStyleDDBtn">
<property name="text">
<string>...</string>
</property>
@ -285,7 +285,7 @@
</widget>
</item>
<item row="3" column="2">
<widget class="QgsDataDefinedButtonV2" name="mBorderStyleDDBtn">
<widget class="QgsPropertyOverrideButton" name="mBorderStyleDDBtn">
<property name="text">
<string>...</string>
</property>
@ -337,9 +337,9 @@
<container>1</container>
</customwidget>
<customwidget>
<class>QgsDataDefinedButtonV2</class>
<class>QgsPropertyOverrideButton</class>
<extends>QToolButton</extends>
<header>qgsdatadefinedbuttonv2.h</header>
<header>qgspropertyoverridebutton.h</header>
</customwidget>
<customwidget>
<class>QgsDoubleSpinBox</class>

18
src/ui/symbollayer/widget_simpleline.ui
View File

@ -57,7 +57,7 @@
</layout>
</item>
<item row="4" column="2">
<widget class="QgsDataDefinedButtonV2" name="mJoinStyleDDBtn">
<widget class="QgsPropertyOverrideButton" name="mJoinStyleDDBtn">
<property name="text">
<string>...</string>
</property>
@ -189,7 +189,7 @@
</widget>
</item>
<item row="7" column="2">
<widget class="QgsDataDefinedButtonV2" name="mDashPatternDDBtn">
<widget class="QgsPropertyOverrideButton" name="mDashPatternDDBtn">
<property name="text">
<string>...</string>
</property>
@ -242,35 +242,35 @@
</layout>
</item>
<item row="5" column="2">
<widget class="QgsDataDefinedButtonV2" name="mCapStyleDDBtn">
<widget class="QgsPropertyOverrideButton" name="mCapStyleDDBtn">
<property name="text">
<string>...</string>
</property>
</widget>
</item>
<item row="0" column="2">
<widget class="QgsDataDefinedButtonV2" name="mColorDDBtn">
<widget class="QgsPropertyOverrideButton" name="mColorDDBtn">
<property name="text">
<string>...</string>
</property>
</widget>
</item>
<item row="1" column="2">
<widget class="QgsDataDefinedButtonV2" name="mPenWidthDDBtn">
<widget class="QgsPropertyOverrideButton" name="mPenWidthDDBtn">
<property name="text">
<string>...</string>
</property>
</widget>
</item>
<item row="3" column="2">
<widget class="QgsDataDefinedButtonV2" name="mPenStyleDDBtn">
<widget class="QgsPropertyOverrideButton" name="mPenStyleDDBtn">
<property name="text">
<string>...</string>
</property>
</widget>
</item>
<item row="2" column="2">
<widget class="QgsDataDefinedButtonV2" name="mOffsetDDBtn">
<widget class="QgsPropertyOverrideButton" name="mOffsetDDBtn">
<property name="text">
<string>...</string>
</property>
@ -293,9 +293,9 @@
<container>1</container>
</customwidget>
<customwidget>
<class>QgsDataDefinedButtonV2</class>
<class>QgsPropertyOverrideButton</class>
<extends>QToolButton</extends>
<header>qgsdatadefinedbuttonv2.h</header>
<header>qgspropertyoverridebutton.h</header>
</customwidget>
<customwidget>
<class>QgsDoubleSpinBox</class>

26
src/ui/symbollayer/widget_simplemarker.ui
View File

@ -168,14 +168,14 @@
</widget>
</item>
<item row="6" column="2">
<widget class="QgsDataDefinedButtonV2" name="mAngleDDBtn">
<widget class="QgsPropertyOverrideButton" name="mAngleDDBtn">
<property name="text">
<string>...</string>
</property>
</widget>
</item>
<item row="2" column="2">
<widget class="QgsDataDefinedButtonV2" name="mSizeDDBtn">
<widget class="QgsPropertyOverrideButton" name="mSizeDDBtn">
<property name="text">
<string>...</string>
</property>
@ -369,14 +369,14 @@
</layout>
</item>
<item row="4" column="2">
<widget class="QgsDataDefinedButtonV2" name="mJoinStyleDDBtn">
<widget class="QgsPropertyOverrideButton" name="mJoinStyleDDBtn">
<property name="text">
<string>...</string>
</property>
</widget>
</item>
<item row="3" column="2">
<widget class="QgsDataDefinedButtonV2" name="mOutlineStyleDDBtn">
<widget class="QgsPropertyOverrideButton" name="mOutlineStyleDDBtn">
<property name="text">
<string>...</string>
</property>
@ -436,35 +436,35 @@
</widget>
</item>
<item row="5" column="2">
<widget class="QgsDataDefinedButtonV2" name="mOutlineWidthDDBtn">
<widget class="QgsPropertyOverrideButton" name="mOutlineWidthDDBtn">
<property name="text">
<string>...</string>
</property>
</widget>
</item>
<item row="8" column="2">
<widget class="QgsDataDefinedButtonV2" name="mVerticalAnchorDDBtn">
<widget class="QgsPropertyOverrideButton" name="mVerticalAnchorDDBtn">
<property name="text">
<string>...</string>
</property>
</widget>
</item>
<item row="9" column="2">
<widget class="QgsDataDefinedButtonV2" name="mHorizontalAnchorDDBtn">
<widget class="QgsPropertyOverrideButton" name="mHorizontalAnchorDDBtn">
<property name="text">
<string>...</string>
</property>
</widget>
</item>
<item row="10" column="2">
<widget class="QgsDataDefinedButtonV2" name="mNameDDBtn">
<widget class="QgsPropertyOverrideButton" name="mNameDDBtn">
<property name="text">
<string>...</string>
</property>
</widget>
</item>
<item row="7" column="2">
<widget class="QgsDataDefinedButtonV2" name="mOffsetDDBtn">
<widget class="QgsPropertyOverrideButton" name="mOffsetDDBtn">
<property name="text">
<string>...</string>
</property>
@ -503,14 +503,14 @@
</layout>
</item>
<item row="1" column="2">
<widget class="QgsDataDefinedButtonV2" name="mBorderColorDDBtn">
<widget class="QgsPropertyOverrideButton" name="mBorderColorDDBtn">
<property name="text">
<string>...</string>
</property>
</widget>
</item>
<item row="0" column="2">
<widget class="QgsDataDefinedButtonV2" name="mFillColorDDBtn">
<widget class="QgsPropertyOverrideButton" name="mFillColorDDBtn">
<property name="text">
<string>...</string>
</property>
@ -526,9 +526,9 @@
<container>1</container>
</customwidget>
<customwidget>
<class>QgsDataDefinedButtonV2</class>
<class>QgsPropertyOverrideButton</class>
<extends>QToolButton</extends>
<header>qgsdatadefinedbuttonv2.h</header>
<header>qgspropertyoverridebutton.h</header>
</customwidget>
<customwidget>
<class>QgsDoubleSpinBox</class>

16
src/ui/symbollayer/widget_svgfill.ui
View File

@ -212,35 +212,35 @@
</widget>
</item>
<item row="0" column="2">
<widget class="QgsDataDefinedButtonV2" name="mTextureWidthDDBtn">
<widget class="QgsPropertyOverrideButton" name="mTextureWidthDDBtn">
<property name="text">
<string>...</string>
</property>
</widget>
</item>
<item row="1" column="2">
<widget class="QgsDataDefinedButtonV2" name="mRotationDDBtn">
<widget class="QgsPropertyOverrideButton" name="mRotationDDBtn">
<property name="text">
<string>...</string>
</property>
</widget>
</item>
<item row="2" column="2">
<widget class="QgsDataDefinedButtonV2" name="mFilColorDDBtn">
<widget class="QgsPropertyOverrideButton" name="mFilColorDDBtn">
<property name="text">
<string>...</string>
</property>
</widget>
</item>
<item row="3" column="2">
<widget class="QgsDataDefinedButtonV2" name="mBorderColorDDBtn">
<widget class="QgsPropertyOverrideButton" name="mBorderColorDDBtn">
<property name="text">
<string>...</string>
</property>
</widget>
</item>
<item row="4" column="2">
<widget class="QgsDataDefinedButtonV2" name="mBorderWidthDDBtn">
<widget class="QgsPropertyOverrideButton" name="mBorderWidthDDBtn">
<property name="text">
<string>...</string>
</property>
@ -318,7 +318,7 @@
</layout>
</item>
<item row="6" column="2">
<widget class="QgsDataDefinedButtonV2" name="mSVGDDBtn">
<widget class="QgsPropertyOverrideButton" name="mSVGDDBtn">
<property name="text">
<string>...</string>
</property>
@ -328,9 +328,9 @@
</widget>
<customwidgets>
<customwidget>
<class>QgsDataDefinedButtonV2</class>
<class>QgsPropertyOverrideButton</class>
<extends>QToolButton</extends>
<header>qgsdatadefinedbuttonv2.h</header>
<header>qgspropertyoverridebutton.h</header>
</customwidget>
<customwidget>
<class>QgsDoubleSpinBox</class>

22
src/ui/symbollayer/widget_svgmarker.ui
View File

@ -22,7 +22,7 @@
</widget>
</item>
<item row="6" column="2">
<widget class="QgsDataDefinedButtonV2" name="mVerticalAnchorDDBtn">
<widget class="QgsPropertyOverrideButton" name="mVerticalAnchorDDBtn">
<property name="text">
<string>...</string>
</property>
@ -219,14 +219,14 @@
</widget>
</item>
<item row="4" column="2">
<widget class="QgsDataDefinedButtonV2" name="mBorderWidthDDBtn">
<widget class="QgsPropertyOverrideButton" name="mBorderWidthDDBtn">
<property name="text">
<string>...</string>
</property>
</widget>
</item>
<item row="5" column="2">
<widget class="QgsDataDefinedButtonV2" name="mOffsetDDBtn">
<widget class="QgsPropertyOverrideButton" name="mOffsetDDBtn">
<property name="text">
<string>...</string>
</property>
@ -246,14 +246,14 @@
</widget>
</item>
<item row="1" column="2">
<widget class="QgsDataDefinedButtonV2" name="mAngleDDBtn">
<widget class="QgsPropertyOverrideButton" name="mAngleDDBtn">
<property name="text">
<string>...</string>
</property>
</widget>
</item>
<item row="2" column="2">
<widget class="QgsDataDefinedButtonV2" name="mFillColorDDBtn">
<widget class="QgsPropertyOverrideButton" name="mFillColorDDBtn">
<property name="text">
<string>...</string>
</property>
@ -403,7 +403,7 @@
</layout>
</item>
<item row="7" column="2">
<widget class="QgsDataDefinedButtonV2" name="mHorizontalAnchorDDBtn">
<widget class="QgsPropertyOverrideButton" name="mHorizontalAnchorDDBtn">
<property name="text">
<string>...</string>
</property>
@ -488,14 +488,14 @@
</layout>
</item>
<item row="3" column="2">
<widget class="QgsDataDefinedButtonV2" name="mBorderColorDDBtn">
<widget class="QgsPropertyOverrideButton" name="mBorderColorDDBtn">
<property name="text">
<string>...</string>
</property>
</widget>
</item>
<item row="0" column="2">
<widget class="QgsDataDefinedButtonV2" name="mSizeDDBtn">
<widget class="QgsPropertyOverrideButton" name="mSizeDDBtn">
<property name="text">
<string>...</string>
</property>
@ -516,7 +516,7 @@
</layout>
</item>
<item row="9" column="2">
<widget class="QgsDataDefinedButtonV2" name="mFilenameDDBtn">
<widget class="QgsPropertyOverrideButton" name="mFilenameDDBtn">
<property name="text">
<string>...</string>
</property>
@ -526,9 +526,9 @@
</widget>
<customwidgets>
<customwidget>
<class>QgsDataDefinedButtonV2</class>
<class>QgsPropertyOverrideButton</class>
<extends>QToolButton</extends>
<header>qgsdatadefinedbuttonv2.h</header>
<header>qgspropertyoverridebutton.h</header>
</customwidget>
<customwidget>
<class>QgsDoubleSpinBox</class>

10
src/ui/symbollayer/widget_symbolslist.ui
View File

@ -286,7 +286,7 @@
</widget>
</item>
<item>
<widget class="QgsDataDefinedButtonV2" name="mSizeDDBtn">
<widget class="QgsPropertyOverrideButton" name="mSizeDDBtn">
<property name="text">
<string>...</string>
</property>
@ -329,7 +329,7 @@
</widget>
</item>
<item>
<widget class="QgsDataDefinedButtonV2" name="mRotationDDBtn">
<widget class="QgsPropertyOverrideButton" name="mRotationDDBtn">
<property name="text">
<string>...</string>
</property>
@ -379,7 +379,7 @@
</widget>
</item>
<item>
<widget class="QgsDataDefinedButtonV2" name="mWidthDDBtn">
<widget class="QgsPropertyOverrideButton" name="mWidthDDBtn">
<property name="text">
<string>...</string>
</property>
@ -410,9 +410,9 @@
<container>1</container>
</customwidget>
<customwidget>
<class>QgsDataDefinedButtonV2</class>
<class>QgsPropertyOverrideButton</class>
<extends>QToolButton</extends>
<header>qgsdatadefinedbuttonv2.h</header>
<header>qgspropertyoverridebutton.h</header>
</customwidget>
<customwidget>
<class>QgsDoubleSpinBox</class>