r20301 by fschmid - Fixe Bug #12659: Totally odd behaviour of complex gradient fills

[scribus-commit]

Author: fschmid
Date: Sun Aug  9 08:15:53 2015
New Revision: 20301

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=20301
Log:
Fixe Bug #12659: Totally odd behaviour of complex gradient fills

Modified:
    trunk/Scribus/scribus/ui/cpalette.cpp

Modified: trunk/Scribus/scribus/ui/cpalette.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=20301&path=/trunk/Scribus/scribus/ui/cpalette.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/cpalette.cpp (original)
+++ trunk/Scribus/scribus/ui/cpalette.cpp Sun Aug  9 08:15:53 2015
@@ -316,7 +316,9 @@
 			setGradientVectorStrokeValues();
 	}
 	editMeshColors->setEnabled(!CGradDia->isVisible());
-	gradEditButton->setEnabled(true);
+	gradEditButton->setEnabled(!editMeshColors->isChecked());
+	gradientType->setEnabled(!(gradEditButton->isChecked() || editMeshColors->isChecked()));
+	fillModeCombo->setEnabled(!(gradEditButton->isChecked() || editMeshColors->isChecked()));
 
 	double patternScaleX, patternScaleY, patternOffsetX, patternOffsetY, patternRotation, patternSkewX, patternSkewY, patternSpace;
 	bool mirrorX, mirrorY;
@@ -660,6 +662,16 @@
 
 void Cpalette::fillStrokeSelector(int /*index*/)
 {
+	if (gradEditButton->isChecked() || editMeshColors->isChecked())
+	{
+		editStrokeGradient = 0;
+		CGradDia->hide();
+		editMeshColors->setEnabled(true);
+		editMeshColors->setChecked(false);
+		gradEditButton->setEnabled(true);
+		gradEditButton->setChecked(false);
+		emit editGradient(editStrokeGradient);
+	}
 	updateFromItem();
 }
 
@@ -1309,6 +1321,8 @@
 		editStrokeGradient = 0;
 		gradEditButton->setEnabled(true);
 	}
+	gradientType->setEnabled(!(gradEditButton->isChecked() || editMeshColors->isChecked()));
+	fillModeCombo->setEnabled(!(gradEditButton->isChecked() || editMeshColors->isChecked()));
 	emit editGradient(editStrokeGradient);
 }
 
@@ -1546,6 +1560,8 @@
 		editStrokeGradient = 9;
 	else
 		editStrokeGradient = 0;
+	gradientType->setEnabled(!(gradEditButton->isChecked() || editMeshColors->isChecked()));
+	fillModeCombo->setEnabled(!(gradEditButton->isChecked() || editMeshColors->isChecked()));
 	emit editGradient(editStrokeGradient);
 }
 
@@ -1561,6 +1577,8 @@
 		CGradDia->hide();
 	}
 	editStrokeGradient = 1;
+	gradientType->setEnabled(!(gradEditButton->isChecked() || editMeshColors->isChecked()));
+	fillModeCombo->setEnabled(!(gradEditButton->isChecked() || editMeshColors->isChecked()));
 	emit editGradient(editStrokeGradient);
 }