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

[ui] Insure color widgets are enabled only when image decoration enabled

Browse Source 
(fixes #31962)
This commit is contained in:
Mathieu Pellerin 2019-09-24 18:31:53 +07:00
parent 61bfced6a7
commit f21d7fafee
2 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/app/decorations/qgsdecorationimagedialog.cpp
View File

@ -62,6 +62,7 @@ QgsDecorationImageDialog::QgsDecorationImageDialog( QgsDecorationImage &deco, QW
// enabled
grpEnable->setChecked( mDeco.enabled() );
connect( grpEnable, &QGroupBox::toggled, this, [ = ] { updateEnabledColorButtons(); } );
wgtImagePath->setFilePath( mDeco.imagePath() );
connect( wgtImagePath, &QgsFileWidget::fileChanged, this, &QgsDecorationImageDialog::updateImagePath );
@ -110,10 +111,8 @@ void QgsDecorationImageDialog::apply()
mDeco.update();
}
void QgsDecorationImageDialog::updateImagePath( const QString &imagePath )
void QgsDecorationImageDialog::updateEnabledColorButtons()
{
if ( mDeco.imagePath() != imagePath )
mDeco.setImagePath( imagePath );
if ( mDeco.mImageFormat == QgsDecorationImage::FormatSVG )
{
@ -121,13 +120,13 @@ void QgsDecorationImageDialog::updateImagePath( const QString &imagePath )
double defaultStrokeWidth, defaultFillOpacity, defaultStrokeOpacity;
bool hasDefaultFillColor, hasDefaultFillOpacity, hasDefaultStrokeColor, hasDefaultStrokeWidth, hasDefaultStrokeOpacity;
bool hasFillParam, hasFillOpacityParam, hasStrokeParam, hasStrokeWidthParam, hasStrokeOpacityParam;
QgsApplication::svgCache()->containsParams( imagePath, hasFillParam, hasDefaultFillColor, defaultFill,
QgsApplication::svgCache()->containsParams( mDeco.imagePath(), hasFillParam, hasDefaultFillColor, defaultFill,
hasFillOpacityParam, hasDefaultFillOpacity, defaultFillOpacity,
hasStrokeParam, hasDefaultStrokeColor, defaultStroke,
hasStrokeWidthParam, hasDefaultStrokeWidth, defaultStrokeWidth,
hasStrokeOpacityParam, hasDefaultStrokeOpacity, defaultStrokeOpacity );
pbnChangeColor->setEnabled( hasFillParam );
pbnChangeColor->setEnabled( grpEnable->isChecked() && hasFillParam );
pbnChangeColor->setAllowOpacity( hasFillOpacityParam );
if ( hasFillParam )
{
@ -135,7 +134,7 @@ void QgsDecorationImageDialog::updateImagePath( const QString &imagePath )
fill.setAlphaF( hasFillOpacityParam && hasDefaultFillOpacity ? defaultFillOpacity : 1.0 );
pbnChangeColor->setColor( fill );
}
pbnChangeOutlineColor->setEnabled( hasStrokeParam );
pbnChangeOutlineColor->setEnabled( grpEnable->isChecked() && hasStrokeParam );
pbnChangeOutlineColor->setAllowOpacity( hasStrokeOpacityParam );
if ( hasStrokeParam )
{
@ -149,7 +148,14 @@ void QgsDecorationImageDialog::updateImagePath( const QString &imagePath )
pbnChangeColor->setEnabled( false );
pbnChangeOutlineColor->setEnabled( false );
}
}
void QgsDecorationImageDialog::updateImagePath( const QString &imagePath )
{
if ( mDeco.imagePath() != imagePath )
mDeco.setImagePath( imagePath );
updateEnabledColorButtons();
drawImage();
}

1
src/app/decorations/qgsdecorationimagedialog.h
View File

@ -30,6 +30,7 @@ class APP_EXPORT QgsDecorationImageDialog : public QDialog, private Ui::QgsDecor
private:
void drawImage();
void updateEnabledColorButtons();
void updateImagePath( const QString &imagePath );
void resizeEvent( QResizeEvent * ) override; //overloads qwidget