@@ -195,6 +195,9 @@ QgsSimpleLineSymbolLayerWidget::QgsSimpleLineSymbolLayerWidget( QgsVectorLayer *
195
195
btnChangeColor->setColorDialogTitle ( tr ( " Select Line Color" ) );
196
196
btnChangeColor->setContext ( QStringLiteral ( " symbology" ) );
197
197
198
+ mColorDDBtn ->setFlags ( QgsPropertyOverrideButton::FlagDisableCheckedWidgetOnlyWhenProjectColorSet );
199
+ mColorDDBtn ->registerEnabledWidget ( btnChangeColor, false );
200
+
198
201
mRingFilterComboBox ->addItem ( QgsApplication::getThemeIcon ( QStringLiteral ( " mIconAllRings.svg" ) ), tr ( " All Rings" ), QgsLineSymbolLayer::AllRings );
199
202
mRingFilterComboBox ->addItem ( QgsApplication::getThemeIcon ( QStringLiteral ( " mIconExteriorRing.svg" ) ), tr ( " Exterior Ring Only" ), QgsLineSymbolLayer::ExteriorRingOnly );
200
203
mRingFilterComboBox ->addItem ( QgsApplication::getThemeIcon ( QStringLiteral ( " mIconInteriorRings.svg" ) ), tr ( " Interior Rings Only" ), QgsLineSymbolLayer::InteriorRingsOnly );
@@ -465,6 +468,11 @@ QgsSimpleMarkerSymbolLayerWidget::QgsSimpleMarkerSymbolLayerWidget( QgsVectorLay
465
468
btnChangeColorStroke->setShowNoColor ( true );
466
469
btnChangeColorStroke->setNoColorString ( tr ( " Transparent Stroke" ) );
467
470
471
+ mFillColorDDBtn ->setFlags ( QgsPropertyOverrideButton::FlagDisableCheckedWidgetOnlyWhenProjectColorSet );
472
+ mFillColorDDBtn ->registerEnabledWidget ( btnChangeColorFill, false );
473
+ mStrokeColorDDBtn ->setFlags ( QgsPropertyOverrideButton::FlagDisableCheckedWidgetOnlyWhenProjectColorSet );
474
+ mStrokeColorDDBtn ->registerEnabledWidget ( btnChangeColorStroke, false );
475
+
468
476
spinOffsetX->setClearValue ( 0.0 );
469
477
spinOffsetY->setClearValue ( 0.0 );
470
478
spinAngle->setClearValue ( 0.0 );
@@ -758,6 +766,11 @@ QgsSimpleFillSymbolLayerWidget::QgsSimpleFillSymbolLayerWidget( QgsVectorLayer *
758
766
connect ( cboJoinStyle, static_cast <void ( QComboBox::* )( int )>( &QComboBox::currentIndexChanged ), this , &QgsSimpleFillSymbolLayerWidget::strokeStyleChanged );
759
767
connect ( spinOffsetX, static_cast < void ( QDoubleSpinBox::* )( double ) > ( &QDoubleSpinBox::valueChanged ), this , &QgsSimpleFillSymbolLayerWidget::offsetChanged );
760
768
connect ( spinOffsetY, static_cast < void ( QDoubleSpinBox::* )( double ) > ( &QDoubleSpinBox::valueChanged ), this , &QgsSimpleFillSymbolLayerWidget::offsetChanged );
769
+
770
+ mFillColorDDBtn ->setFlags ( QgsPropertyOverrideButton::FlagDisableCheckedWidgetOnlyWhenProjectColorSet );
771
+ mFillColorDDBtn ->registerEnabledWidget ( btnChangeColor, false );
772
+ mStrokeColorDDBtn ->setFlags ( QgsPropertyOverrideButton::FlagDisableCheckedWidgetOnlyWhenProjectColorSet );
773
+ mStrokeColorDDBtn ->registerEnabledWidget ( btnChangeStrokeColor, false );
761
774
}
762
775
763
776
void QgsSimpleFillSymbolLayerWidget::setSymbolLayer ( QgsSymbolLayer *layer )
@@ -1078,6 +1091,11 @@ QgsGradientFillSymbolLayerWidget::QgsGradientFillSymbolLayerWidget( QgsVectorLay
1078
1091
btnChangeColor2->setShowNoColor ( true );
1079
1092
btnChangeColor2->setNoColorString ( tr ( " Transparent" ) );
1080
1093
1094
+ mStartColorDDBtn ->setFlags ( QgsPropertyOverrideButton::FlagDisableCheckedWidgetOnlyWhenProjectColorSet );
1095
+ mStartColorDDBtn ->registerEnabledWidget ( btnChangeColor, false );
1096
+ mEndColorDDBtn ->setFlags ( QgsPropertyOverrideButton::FlagDisableCheckedWidgetOnlyWhenProjectColorSet );
1097
+ mEndColorDDBtn ->registerEnabledWidget ( btnChangeColor2, false );
1098
+
1081
1099
spinOffsetX->setClearValue ( 0.0 );
1082
1100
spinOffsetY->setClearValue ( 0.0 );
1083
1101
mSpinAngle ->setClearValue ( 0.0 );
@@ -1419,6 +1437,11 @@ QgsShapeburstFillSymbolLayerWidget::QgsShapeburstFillSymbolLayerWidget( QgsVecto
1419
1437
btnChangeColor2->setShowNoColor ( true );
1420
1438
btnChangeColor2->setNoColorString ( tr ( " Transparent" ) );
1421
1439
1440
+ mStartColorDDBtn ->setFlags ( QgsPropertyOverrideButton::FlagDisableCheckedWidgetOnlyWhenProjectColorSet );
1441
+ mStartColorDDBtn ->registerEnabledWidget ( btnChangeColor, false );
1442
+ mEndColorDDBtn ->setFlags ( QgsPropertyOverrideButton::FlagDisableCheckedWidgetOnlyWhenProjectColorSet );
1443
+ mEndColorDDBtn ->registerEnabledWidget ( btnChangeColor2, false );
1444
+
1422
1445
spinOffsetX->setClearValue ( 0.0 );
1423
1446
spinOffsetY->setClearValue ( 0.0 );
1424
1447
@@ -1869,6 +1892,11 @@ QgsSvgMarkerSymbolLayerWidget::QgsSvgMarkerSymbolLayerWidget( QgsVectorLayer *vl
1869
1892
mChangeStrokeColorButton ->setColorDialogTitle ( tr ( " Select Stroke Color" ) );
1870
1893
mChangeStrokeColorButton ->setContext ( QStringLiteral ( " symbology" ) );
1871
1894
1895
+ mFillColorDDBtn ->setFlags ( QgsPropertyOverrideButton::FlagDisableCheckedWidgetOnlyWhenProjectColorSet );
1896
+ mFillColorDDBtn ->registerEnabledWidget ( mChangeColorButton , false );
1897
+ mStrokeColorDDBtn ->setFlags ( QgsPropertyOverrideButton::FlagDisableCheckedWidgetOnlyWhenProjectColorSet );
1898
+ mStrokeColorDDBtn ->registerEnabledWidget ( mChangeStrokeColorButton , false );
1899
+
1872
1900
spinOffsetX->setClearValue ( 0.0 );
1873
1901
spinOffsetY->setClearValue ( 0.0 );
1874
1902
spinAngle->setClearValue ( 0.0 );
@@ -2312,6 +2340,11 @@ QgsSVGFillSymbolLayerWidget::QgsSVGFillSymbolLayerWidget( QgsVectorLayer *vl, QW
2312
2340
mChangeStrokeColorButton ->setColorDialogTitle ( tr ( " Select Stroke Color" ) );
2313
2341
mChangeStrokeColorButton ->setContext ( QStringLiteral ( " symbology" ) );
2314
2342
2343
+ mFilColorDDBtn ->setFlags ( QgsPropertyOverrideButton::FlagDisableCheckedWidgetOnlyWhenProjectColorSet );
2344
+ mFilColorDDBtn ->registerEnabledWidget ( mChangeColorButton , false );
2345
+ mStrokeColorDDBtn ->setFlags ( QgsPropertyOverrideButton::FlagDisableCheckedWidgetOnlyWhenProjectColorSet );
2346
+ mStrokeColorDDBtn ->registerEnabledWidget ( mChangeStrokeColorButton , false );
2347
+
2315
2348
connect ( mSvgListView ->selectionModel (), &QItemSelectionModel::currentChanged, this , &QgsSVGFillSymbolLayerWidget::setFile );
2316
2349
connect ( mSvgTreeView ->selectionModel (), &QItemSelectionModel::currentChanged, this , &QgsSVGFillSymbolLayerWidget::populateIcons );
2317
2350
}
@@ -2834,6 +2867,11 @@ QgsFontMarkerSymbolLayerWidget::QgsFontMarkerSymbolLayerWidget( QgsVectorLayer *
2834
2867
btnStrokeColor->setColorDialogTitle ( tr ( " Select Symbol Stroke Color" ) );
2835
2868
btnStrokeColor->setContext ( QStringLiteral ( " symbology" ) );
2836
2869
2870
+ mColorDDBtn ->setFlags ( QgsPropertyOverrideButton::FlagDisableCheckedWidgetOnlyWhenProjectColorSet );
2871
+ mColorDDBtn ->registerEnabledWidget ( btnColor, false );
2872
+ mStrokeColorDDBtn ->setFlags ( QgsPropertyOverrideButton::FlagDisableCheckedWidgetOnlyWhenProjectColorSet );
2873
+ mStrokeColorDDBtn ->registerEnabledWidget ( btnStrokeColor, false );
2874
+
2837
2875
spinOffsetX->setClearValue ( 0.0 );
2838
2876
spinOffsetY->setClearValue ( 0.0 );
2839
2877
spinAngle->setClearValue ( 0.0 );
0 commit comments