From 745f91d24932d3b4d836507cfd36c5a13b3661b8 Mon Sep 17 00:00:00 2001 From: Nyall Dawson Date: Tue, 4 Aug 2015 16:23:06 +1000 Subject: [PATCH] Add 'edit' buttons to remaining gradient combo boxes Also consolidate code for easier maintenance. --- .../gui/symbology-ng/qgscolorrampcombobox.sip | 15 +++++ .../symbology-ng/qgssymbollayerv2widget.sip | 2 - src/gui/effects/qgspainteffectwidget.cpp | 32 +---------- src/gui/effects/qgspainteffectwidget.h | 2 +- ...qgssinglebandpseudocolorrendererwidget.cpp | 1 + .../qgscategorizedsymbolrendererv2widget.cpp | 2 + src/gui/symbology-ng/qgscolorrampcombobox.cpp | 55 +++++++++++++++++++ src/gui/symbology-ng/qgscolorrampcombobox.h | 15 +++++ .../qgsgraduatedsymbolrendererv2widget.cpp | 4 ++ .../symbology-ng/qgsheatmaprendererwidget.cpp | 26 +-------- .../symbology-ng/qgsheatmaprendererwidget.h | 1 - .../symbology-ng/qgssymbollayerv2widget.cpp | 52 ++---------------- src/gui/symbology-ng/qgssymbollayerv2widget.h | 2 - .../qgscategorizedsymbolrendererv2widget.ui | 8 +++ src/ui/qgsgraduatedsymbolrendererv2widget.ui | 44 ++++++++++----- ...singlebandpseudocolorrendererwidgetbase.ui | 27 +++++++++ 16 files changed, 170 insertions(+), 118 deletions(-) diff --git a/python/gui/symbology-ng/qgscolorrampcombobox.sip b/python/gui/symbology-ng/qgscolorrampcombobox.sip index fbd07dd3c0b..ec53676fb68 100644 --- a/python/gui/symbology-ng/qgscolorrampcombobox.sip +++ b/python/gui/symbology-ng/qgscolorrampcombobox.sip @@ -33,4 +33,19 @@ class QgsColorRampComboBox : QComboBox public slots: void colorRampChanged( int index ); + + /** Triggers a dialog which allows users to edit the current source + * ramp for the combo box. + * @see sourceRampEdited + * @note added in QGIS 2.12 + */ + void editSourceRamp(); + + signals: + + /** Emitted when the user has edited the current source ramp. + * @see editSourceRamp + * @note added in QGIS 2.12 + */ + void sourceRampEdited(); }; diff --git a/python/gui/symbology-ng/qgssymbollayerv2widget.sip b/python/gui/symbology-ng/qgssymbollayerv2widget.sip index e6714f3424e..daac306c710 100644 --- a/python/gui/symbology-ng/qgssymbollayerv2widget.sip +++ b/python/gui/symbology-ng/qgssymbollayerv2widget.sip @@ -146,7 +146,6 @@ class QgsGradientFillSymbolLayerV2Widget : QgsSymbolLayerV2Widget void setColor( const QColor& color ); void setColor2( const QColor& color ); void applyColorRamp(); - void on_mButtonEditRamp_clicked(); void setGradientType( int index ); void setCoordinateMode( int index ); void setGradientSpread( int index ); @@ -182,7 +181,6 @@ class QgsShapeburstFillSymbolLayerV2Widget : QgsSymbolLayerV2Widget void on_mDistanceUnitWidget_changed(); void on_mRadioUseWholeShape_toggled( bool value ); void applyColorRamp(); - void on_mButtonEditRamp_clicked(); void offsetChanged(); void on_mOffsetUnitWidget_changed(); void on_mIgnoreRingsCheckBox_stateChanged( int state ); diff --git a/src/gui/effects/qgspainteffectwidget.cpp b/src/gui/effects/qgspainteffectwidget.cpp index 9c3777a79ff..9eb9f2256a0 100644 --- a/src/gui/effects/qgspainteffectwidget.cpp +++ b/src/gui/effects/qgspainteffectwidget.cpp @@ -24,7 +24,6 @@ #include "qgscoloreffect.h" #include "qgsstylev2.h" #include "qgsvectorcolorrampv2.h" -#include "qgsvectorgradientcolorrampv2dialog.h" // // draw source @@ -425,6 +424,9 @@ QgsGlowWidget::QgsGlowWidget( QWidget *parent ) mRampComboBox->populate( QgsStyleV2::defaultStyle() ); mRampComboBox->setShowGradientOnly( true ); connect( mRampComboBox, SIGNAL( currentIndexChanged( int ) ), this, SLOT( applyColorRamp() ) ); + connect( mRampComboBox, SIGNAL( sourceRampEdited() ), this, SLOT( applyColorRamp() ) ); + connect( mButtonEditRamp, SIGNAL( clicked() ), mRampComboBox, SLOT( editSourceRamp() ) ); + connect( radioSingleColor, SIGNAL( toggled( bool ) ), this, SLOT( colorModeChanged() ) ); initGui(); @@ -601,34 +603,6 @@ void QgsGlowWidget::applyColorRamp() emit changed(); } -void QgsGlowWidget::on_mButtonEditRamp_clicked() -{ - if ( !mEffect ) - { - return; - } - - if ( mEffect->ramp() && mEffect->ramp()->type() == "gradient" ) - { - QgsVectorColorRampV2* ramp = mEffect->ramp()->clone(); - QgsVectorGradientColorRampV2* gradRamp = static_cast( ramp ); - QgsVectorGradientColorRampV2Dialog dlg( gradRamp, this ); - - if ( dlg.exec() && gradRamp ) - { - mEffect->setRamp( gradRamp ); - mRampComboBox->blockSignals( true ); - mRampComboBox->setSourceColorRamp( mEffect->ramp() ); - mRampComboBox->blockSignals( false ); - emit changed(); - } - else - { - delete ramp; - } - } -} - // // transform // diff --git a/src/gui/effects/qgspainteffectwidget.h b/src/gui/effects/qgspainteffectwidget.h index d12b4bf733e..015d5315e1d 100644 --- a/src/gui/effects/qgspainteffectwidget.h +++ b/src/gui/effects/qgspainteffectwidget.h @@ -184,7 +184,7 @@ class GUI_EXPORT QgsGlowWidget : public QgsPaintEffectWidget, private Ui::Widget void on_mBlurRadiusSpnBx_valueChanged( int value ); void on_mTranspSlider_valueChanged( int value ); void applyColorRamp(); - void on_mButtonEditRamp_clicked(); + }; #include "ui_widget_transform.h" diff --git a/src/gui/raster/qgssinglebandpseudocolorrendererwidget.cpp b/src/gui/raster/qgssinglebandpseudocolorrendererwidget.cpp index 3cede3c8200..d1b3e732122 100644 --- a/src/gui/raster/qgssinglebandpseudocolorrendererwidget.cpp +++ b/src/gui/raster/qgssinglebandpseudocolorrendererwidget.cpp @@ -46,6 +46,7 @@ QgsSingleBandPseudoColorRendererWidget::QgsSingleBandPseudoColorRendererWidget( QgsDebugMsg( "defaultPalette = " + defaultPalette ); mColorRampComboBox->setCurrentIndex( mColorRampComboBox->findText( defaultPalette ) ); + connect( mButtonEditRamp, SIGNAL( clicked() ), mColorRampComboBox, SLOT( editSourceRamp() ) ); if ( !mRasterLayer ) { diff --git a/src/gui/symbology-ng/qgscategorizedsymbolrendererv2widget.cpp b/src/gui/symbology-ng/qgscategorizedsymbolrendererv2widget.cpp index 020e29cad0d..91bbb136fb0 100644 --- a/src/gui/symbology-ng/qgscategorizedsymbolrendererv2widget.cpp +++ b/src/gui/symbology-ng/qgscategorizedsymbolrendererv2widget.cpp @@ -440,6 +440,8 @@ QgsCategorizedSymbolRendererV2Widget::QgsCategorizedSymbolRendererV2Widget( QgsV connect( btnAddCategory, SIGNAL( clicked() ), this, SLOT( addCategory() ) ); connect( cbxInvertedColorRamp, SIGNAL( toggled( bool ) ), this, SLOT( applyColorRamp() ) ); connect( cboCategorizedColorRamp, SIGNAL( currentIndexChanged( int ) ), this, SLOT( applyColorRamp() ) ); + connect( cboCategorizedColorRamp, SIGNAL( sourceRampEdited() ), this, SLOT( applyColorRamp() ) ); + connect( mButtonEditRamp, SIGNAL( clicked() ), cboCategorizedColorRamp, SLOT( editSourceRamp() ) ); // menus for data-defined rotation/size QMenu* advMenu = new QMenu; diff --git a/src/gui/symbology-ng/qgscolorrampcombobox.cpp b/src/gui/symbology-ng/qgscolorrampcombobox.cpp index 4e2e0de79c7..a1d88c60a46 100644 --- a/src/gui/symbology-ng/qgscolorrampcombobox.cpp +++ b/src/gui/symbology-ng/qgscolorrampcombobox.cpp @@ -19,6 +19,11 @@ #include "qgsstylev2.h" #include "qgsstylev2managerdialog.h" +#include "qgsvectorgradientcolorrampv2dialog.h" +#include "qgsvectorrandomcolorrampv2dialog.h" +#include "qgsvectorcolorbrewercolorrampv2dialog.h" +#include "qgscptcitycolorrampv2dialog.h" + QSize QgsColorRampComboBox::rampIconSize( 50, 16 ); QgsColorRampComboBox::QgsColorRampComboBox( QWidget *parent ) : @@ -126,3 +131,53 @@ void QgsColorRampComboBox::colorRampChanged( int index ) // make sure the color ramp is stored mStyle->save(); } + +void QgsColorRampComboBox::editSourceRamp() +{ + QgsVectorColorRampV2* currentRamp = currentColorRamp(); + if ( !currentRamp ) + return; + + QScopedPointer newRamp( currentRamp->clone() ); + + if ( newRamp->type() == "gradient" ) + { + QgsVectorGradientColorRampV2* gradRamp = static_cast( newRamp.data() ); + QgsVectorGradientColorRampV2Dialog dlg( gradRamp, this ); + if ( dlg.exec() && gradRamp ) + { + setSourceColorRamp( gradRamp ); + emit sourceRampEdited(); + } + } + else if ( newRamp->type() == "random" ) + { + QgsVectorRandomColorRampV2* randRamp = static_cast( newRamp.data() ); + QgsVectorRandomColorRampV2Dialog dlg( randRamp, this ); + if ( dlg.exec() && randRamp ) + { + setSourceColorRamp( randRamp ); + emit sourceRampEdited(); + } + } + else if ( newRamp->type() == "colorbrewer" ) + { + QgsVectorColorBrewerColorRampV2* brewerRamp = static_cast( newRamp.data() ); + QgsVectorColorBrewerColorRampV2Dialog dlg( brewerRamp, this ); + if ( dlg.exec() && brewerRamp ) + { + setSourceColorRamp( brewerRamp ); + emit sourceRampEdited(); + } + } + else if ( newRamp->type() == "cpt-city" ) + { + QgsCptCityColorRampV2* cptCityRamp = static_cast( newRamp.data() ); + QgsCptCityColorRampV2Dialog dlg( cptCityRamp, this ); + if ( dlg.exec() && cptCityRamp ) + { + setSourceColorRamp( cptCityRamp ); + emit sourceRampEdited(); + } + } +} diff --git a/src/gui/symbology-ng/qgscolorrampcombobox.h b/src/gui/symbology-ng/qgscolorrampcombobox.h index 339264f16a5..71e944eab29 100644 --- a/src/gui/symbology-ng/qgscolorrampcombobox.h +++ b/src/gui/symbology-ng/qgscolorrampcombobox.h @@ -54,6 +54,21 @@ class GUI_EXPORT QgsColorRampComboBox : public QComboBox public slots: void colorRampChanged( int index ); + /** Triggers a dialog which allows users to edit the current source + * ramp for the combo box. + * @see sourceRampEdited + * @note added in QGIS 2.12 + */ + void editSourceRamp(); + + signals: + + /** Emitted when the user has edited the current source ramp. + * @see editSourceRamp + * @note added in QGIS 2.12 + */ + void sourceRampEdited(); + protected: QgsStyleV2* mStyle; QgsVectorColorRampV2* mSourceColorRamp; // owns the copy diff --git a/src/gui/symbology-ng/qgsgraduatedsymbolrendererv2widget.cpp b/src/gui/symbology-ng/qgsgraduatedsymbolrendererv2widget.cpp index ea83e399391..28c253f7796 100644 --- a/src/gui/symbology-ng/qgsgraduatedsymbolrendererv2widget.cpp +++ b/src/gui/symbology-ng/qgsgraduatedsymbolrendererv2widget.cpp @@ -507,6 +507,8 @@ void QgsGraduatedSymbolRendererV2Widget::connectUpdateHandlers() connect( spinGraduatedClasses, SIGNAL( valueChanged( int ) ), this, SLOT( classifyGraduated() ) ); connect( cboGraduatedMode, SIGNAL( currentIndexChanged( int ) ), this, SLOT( classifyGraduated() ) ); connect( cboGraduatedColorRamp, SIGNAL( currentIndexChanged( int ) ), this, SLOT( reapplyColorRamp() ) ); + connect( cboGraduatedColorRamp, SIGNAL( sourceRampEdited() ), this, SLOT( reapplyColorRamp() ) ); + connect( mButtonEditRamp, SIGNAL( clicked() ), cboGraduatedColorRamp, SLOT( editSourceRamp() ) ); connect( cbxInvertedColorRamp, SIGNAL( toggled( bool ) ), this, SLOT( reapplyColorRamp() ) ); connect( spinPrecision, SIGNAL( valueChanged( int ) ), this, SLOT( labelFormatChanged() ) ); connect( cbxTrimTrailingZeroes, SIGNAL( toggled( bool ) ), this, SLOT( labelFormatChanged() ) ); @@ -525,6 +527,8 @@ void QgsGraduatedSymbolRendererV2Widget::disconnectUpdateHandlers() disconnect( spinGraduatedClasses, SIGNAL( valueChanged( int ) ), this, SLOT( classifyGraduated() ) ); disconnect( cboGraduatedMode, SIGNAL( currentIndexChanged( int ) ), this, SLOT( classifyGraduated() ) ); disconnect( cboGraduatedColorRamp, SIGNAL( currentIndexChanged( int ) ), this, SLOT( reapplyColorRamp() ) ); + disconnect( cboGraduatedColorRamp, SIGNAL( sourceRampEdited() ), this, SLOT( reapplyColorRamp() ) ); + disconnect( mButtonEditRamp, SIGNAL( clicked() ), cboGraduatedColorRamp, SLOT( editSourceRamp() ) ); disconnect( cbxInvertedColorRamp, SIGNAL( toggled( bool ) ), this, SLOT( reapplyColorRamp() ) ); disconnect( spinPrecision, SIGNAL( valueChanged( int ) ), this, SLOT( labelFormatChanged() ) ); disconnect( cbxTrimTrailingZeroes, SIGNAL( toggled( bool ) ), this, SLOT( labelFormatChanged() ) ); diff --git a/src/gui/symbology-ng/qgsheatmaprendererwidget.cpp b/src/gui/symbology-ng/qgsheatmaprendererwidget.cpp index 4b2ab1181c7..741b5b93dfc 100644 --- a/src/gui/symbology-ng/qgsheatmaprendererwidget.cpp +++ b/src/gui/symbology-ng/qgsheatmaprendererwidget.cpp @@ -21,7 +21,6 @@ #include "qgslogger.h" #include "qgsvectorlayer.h" #include "qgsvectorcolorrampv2.h" -#include "qgsvectorgradientcolorrampv2dialog.h" #include "qgsstylev2.h" #include "qgsproject.h" #include @@ -68,6 +67,9 @@ QgsHeatmapRendererWidget::QgsHeatmapRendererWidget( QgsVectorLayer* layer, QgsSt mRampComboBox->setShowGradientOnly( true ); mRampComboBox->populate( QgsStyleV2::defaultStyle() ); connect( mRampComboBox, SIGNAL( currentIndexChanged( int ) ), this, SLOT( applyColorRamp() ) ); + connect( mRampComboBox, SIGNAL( sourceRampEdited() ), this, SLOT( applyColorRamp() ) ); + connect( mButtonEditRamp, SIGNAL( clicked() ), mRampComboBox, SLOT( editSourceRamp() ) ); + if ( mRenderer->colorRamp() ) { mRampComboBox->blockSignals( true ); @@ -115,28 +117,6 @@ void QgsHeatmapRendererWidget::applyColorRamp() mRenderer->setColorRamp( ramp ); } -void QgsHeatmapRendererWidget::on_mButtonEditRamp_clicked() -{ - if ( mRenderer && mRenderer->colorRamp()->type() == "gradient" ) - { - QgsVectorColorRampV2* ramp = mRenderer->colorRamp()->clone(); - QgsVectorGradientColorRampV2* gradRamp = static_cast( ramp ); - QgsVectorGradientColorRampV2Dialog dlg( gradRamp, this ); - - if ( dlg.exec() && gradRamp ) - { - mRenderer->setColorRamp( gradRamp ); - mRampComboBox->blockSignals( true ); - mRampComboBox->setSourceColorRamp( mRenderer->colorRamp() ); - mRampComboBox->blockSignals( false ); - } - else - { - delete ramp; - } - } -} - void QgsHeatmapRendererWidget::on_mRadiusUnitWidget_changed() { if ( !mRenderer ) diff --git a/src/gui/symbology-ng/qgsheatmaprendererwidget.h b/src/gui/symbology-ng/qgsheatmaprendererwidget.h index 16e251ee38c..5fbdc25ae04 100644 --- a/src/gui/symbology-ng/qgsheatmaprendererwidget.h +++ b/src/gui/symbology-ng/qgsheatmaprendererwidget.h @@ -49,7 +49,6 @@ class GUI_EXPORT QgsHeatmapRendererWidget : public QgsRendererV2Widget, private private slots: void applyColorRamp(); - void on_mButtonEditRamp_clicked(); void on_mRadiusUnitWidget_changed(); void on_mRadiusSpinBox_valueChanged( double d ); void on_mMaxSpinBox_valueChanged( double d ); diff --git a/src/gui/symbology-ng/qgssymbollayerv2widget.cpp b/src/gui/symbology-ng/qgssymbollayerv2widget.cpp index 59504b8b9c5..8fb0c088125 100644 --- a/src/gui/symbology-ng/qgssymbollayerv2widget.cpp +++ b/src/gui/symbology-ng/qgssymbollayerv2widget.cpp @@ -755,6 +755,8 @@ QgsGradientFillSymbolLayerV2Widget::QgsGradientFillSymbolLayerV2Widget( const Qg connect( btnChangeColor, SIGNAL( colorChanged( const QColor& ) ), this, SLOT( setColor( const QColor& ) ) ); connect( btnChangeColor2, SIGNAL( colorChanged( const QColor& ) ), this, SLOT( setColor2( const QColor& ) ) ); connect( cboGradientColorRamp, SIGNAL( currentIndexChanged( int ) ), this, SLOT( applyColorRamp() ) ); + connect( cboGradientColorRamp, SIGNAL( sourceRampEdited() ), this, SLOT( applyColorRamp() ) ); + connect( mButtonEditRamp, SIGNAL( clicked() ), cboGradientColorRamp, SLOT( editSourceRamp() ) ); connect( cboGradientType, SIGNAL( currentIndexChanged( int ) ), this, SLOT( setGradientType( int ) ) ); connect( cboCoordinateMode, SIGNAL( currentIndexChanged( int ) ), this, SLOT( setCoordinateMode( int ) ) ); connect( cboGradientSpread, SIGNAL( currentIndexChanged( int ) ), this, SLOT( setGradientSpread( int ) ) ); @@ -948,29 +950,6 @@ void QgsGradientFillSymbolLayerV2Widget::applyColorRamp() emit changed(); } -void QgsGradientFillSymbolLayerV2Widget::on_mButtonEditRamp_clicked() -{ - if ( mLayer->colorRamp()->type() == "gradient" ) - { - QgsVectorColorRampV2* ramp = mLayer->colorRamp()->clone(); - QgsVectorGradientColorRampV2* gradRamp = static_cast( ramp ); - QgsVectorGradientColorRampV2Dialog dlg( gradRamp, this ); - - if ( dlg.exec() && gradRamp ) - { - mLayer->setColorRamp( gradRamp ); - cboGradientColorRamp->blockSignals( true ); - cboGradientColorRamp->setSourceColorRamp( mLayer->colorRamp() ); - cboGradientColorRamp->blockSignals( false ); - emit changed(); - } - else - { - delete ramp; - } - } -} - void QgsGradientFillSymbolLayerV2Widget::setGradientType( int index ) { switch ( index ) @@ -1102,10 +1081,12 @@ QgsShapeburstFillSymbolLayerV2Widget::QgsShapeburstFillSymbolLayerV2Widget( cons spinOffsetX->setClearValue( 0.0 ); spinOffsetY->setClearValue( 0.0 ); - cboGradientColorRamp->setShowGradientOnly( true ); cboGradientColorRamp->populate( QgsStyleV2::defaultStyle() ); connect( cboGradientColorRamp, SIGNAL( currentIndexChanged( int ) ), this, SLOT( applyColorRamp() ) ); + connect( cboGradientColorRamp, SIGNAL( sourceRampEdited() ), this, SLOT( applyColorRamp() ) ); + connect( mButtonEditRamp, SIGNAL( clicked() ), cboGradientColorRamp, SLOT( editSourceRamp() ) ); + connect( btnChangeColor, SIGNAL( colorChanged( const QColor& ) ), this, SLOT( setColor( const QColor& ) ) ); connect( btnChangeColor2, SIGNAL( colorChanged( const QColor& ) ), this, SLOT( setColor2( const QColor& ) ) ); connect( radioTwoColor, SIGNAL( toggled( bool ) ), this, SLOT( colorModeChanged() ) ); @@ -1297,29 +1278,6 @@ void QgsShapeburstFillSymbolLayerV2Widget::applyColorRamp() emit changed(); } -void QgsShapeburstFillSymbolLayerV2Widget::on_mButtonEditRamp_clicked() -{ - if ( mLayer->colorRamp()->type() == "gradient" ) - { - QgsVectorColorRampV2* ramp = mLayer->colorRamp()->clone(); - QgsVectorGradientColorRampV2* gradRamp = static_cast( ramp ); - QgsVectorGradientColorRampV2Dialog dlg( gradRamp, this ); - - if ( dlg.exec() && gradRamp ) - { - mLayer->setColorRamp( gradRamp ); - cboGradientColorRamp->blockSignals( true ); - cboGradientColorRamp->setSourceColorRamp( mLayer->colorRamp() ); - cboGradientColorRamp->blockSignals( false ); - emit changed(); - } - else - { - delete ramp; - } - } -} - void QgsShapeburstFillSymbolLayerV2Widget::offsetChanged() { if ( mLayer ) diff --git a/src/gui/symbology-ng/qgssymbollayerv2widget.h b/src/gui/symbology-ng/qgssymbollayerv2widget.h index 0240d0a6097..9a4783e947a 100644 --- a/src/gui/symbology-ng/qgssymbollayerv2widget.h +++ b/src/gui/symbology-ng/qgssymbollayerv2widget.h @@ -197,7 +197,6 @@ class GUI_EXPORT QgsGradientFillSymbolLayerV2Widget : public QgsSymbolLayerV2Wid void setColor( const QColor& color ); void setColor2( const QColor& color ); void applyColorRamp(); - void on_mButtonEditRamp_clicked(); void setGradientType( int index ); void setCoordinateMode( int index ); void setGradientSpread( int index ); @@ -239,7 +238,6 @@ class GUI_EXPORT QgsShapeburstFillSymbolLayerV2Widget : public QgsSymbolLayerV2W void on_mDistanceUnitWidget_changed(); void on_mRadioUseWholeShape_toggled( bool value ); void applyColorRamp(); - void on_mButtonEditRamp_clicked(); void offsetChanged(); void on_mOffsetUnitWidget_changed(); void on_mIgnoreRingsCheckBox_stateChanged( int state ); diff --git a/src/ui/qgscategorizedsymbolrendererv2widget.ui b/src/ui/qgscategorizedsymbolrendererv2widget.ui index 382f712ddf2..0be242d0e8c 100644 --- a/src/ui/qgscategorizedsymbolrendererv2widget.ui +++ b/src/ui/qgscategorizedsymbolrendererv2widget.ui @@ -90,6 +90,13 @@ + + + + Edit + + + @@ -203,6 +210,7 @@ btnChangeCategorizedSymbol cboCategorizedColorRamp + mButtonEditRamp cbxInvertedColorRamp viewCategories btnAddCategories diff --git a/src/ui/qgsgraduatedsymbolrendererv2widget.ui b/src/ui/qgsgraduatedsymbolrendererv2widget.ui index c0e80de5188..09fde955549 100644 --- a/src/ui/qgsgraduatedsymbolrendererv2widget.ui +++ b/src/ui/qgsgraduatedsymbolrendererv2widget.ui @@ -385,7 +385,7 @@ Negative rounds to powers of 10 0 - + 0 @@ -402,6 +402,13 @@ Negative rounds to powers of 10 + + + + Edit + + + @@ -506,6 +513,17 @@ Negative rounds to powers of 10 + + QgsFieldExpressionWidget + QWidget +
qgsfieldexpressionwidget.h
+ 1 + + + QgsColorRampComboBox + QComboBox +
qgscolorrampcombobox.h
+ QgsDoubleSpinBox QDoubleSpinBox @@ -517,17 +535,6 @@ Negative rounds to powers of 10
qgsunitselectionwidget.h
1 - - QgsFieldExpressionWidget - QWidget -
qgsfieldexpressionwidget.h
- 1 - - - QgsColorRampComboBox - QComboBox -
qgscolorrampcombobox.h
- QgsGraduatedHistogramWidget QWidget @@ -540,13 +547,24 @@ Negative rounds to powers of 10 btnChangeGraduatedSymbol txtLegendFormat spinPrecision + cbxTrimTrailingZeroes methodComboBox cboGraduatedColorRamp + mButtonEditRamp cbxInvertedColorRamp - minSizeSpinBox + tabWidget + cboGraduatedMode + spinGraduatedClasses + btnGraduatedClassify + viewGraduated + btnGraduatedAdd + btnGraduatedDelete + btnDeleteAllClasses + cbxLinkBoundaries maxSizeSpinBox mSizeUnitWidget btnAdvanced + minSizeSpinBox diff --git a/src/ui/qgssinglebandpseudocolorrendererwidgetbase.ui b/src/ui/qgssinglebandpseudocolorrendererwidgetbase.ui index 2ac09fcf585..7237a8c4a84 100644 --- a/src/ui/qgssinglebandpseudocolorrendererwidgetbase.ui +++ b/src/ui/qgssinglebandpseudocolorrendererwidgetbase.ui @@ -197,6 +197,13 @@ + + + + Edit + + + @@ -373,6 +380,26 @@
qgscolorrampcombobox.h
 + + mBandComboBox + mColorInterpolationComboBox + mAddEntryButton + mDeleteEntryButton + mSortButton + mLoadFromBandButton + mLoadFromFileButton + mExportToFileButton + mColormapTreeWidget + mClipCheckBox + mColorRampComboBox + mButtonEditRamp + mInvertCheckBox + mClassificationModeComboBox + mNumberOfEntriesSpinBox + mMinLineEdit + mMaxLineEdit + mClassifyButton +