r22356 by jghali -

[scribus-commit]

Author: jghali
Date: Mon Jan 22 18:55:31 2018
New Revision: 22356

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=22356
Log:
#15109: Fill mode for frames/shapes is greyed out after using the option "Move Vector"

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

Modified: trunk/Scribus/scribus/ui/cpalette.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22356&path=/trunk/Scribus/scribus/ui/cpalette.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/cpalette.cpp	(original)
+++ trunk/Scribus/scribus/ui/cpalette.cpp	Mon Jan 22 18:55:31 2018
@@ -326,8 +326,10 @@
 	}
 	editMeshColors->setEnabled(!CGradDia->isVisible());
 	gradEditButton->setEnabled(!editMeshColors->isChecked());
-	gradientType->setEnabled(!(gradEditButton->isChecked() || editMeshColors->isChecked()));
-	fillModeCombo->setEnabled(!(gradEditButton->isChecked() || editMeshColors->isChecked()));
+	fillModeCombo->setEnabled(!gradEditButton->isChecked() && !editMeshColors->isChecked());
+	gradientType->setEnabled(!gradEditButton->isChecked() && !editMeshColors->isChecked());
+	strokeModeCombo->setEnabled(!gradEditButtonStroke->isChecked() && !editMeshColors->isChecked());
+	gradientTypeStroke->setEnabled(!gradEditButtonStroke->isChecked() && !editMeshColors->isChecked());
 
 	double patternScaleX, patternScaleY, patternOffsetX, patternOffsetY, patternRotation, patternSkewX, patternSkewY, patternSpace;
 	bool mirrorX, mirrorY;
@@ -1327,8 +1329,10 @@
 		editStrokeGradient = 0;
 		gradEditButton->setEnabled(true);
 	}
-	gradientType->setEnabled(!(gradEditButton->isChecked() || editMeshColors->isChecked()));
-	fillModeCombo->setEnabled(!(gradEditButton->isChecked() || editMeshColors->isChecked()));
+	fillModeCombo->setEnabled(!gradEditButton->isChecked() && !editMeshColors->isChecked());
+	gradientType->setEnabled(!gradEditButton->isChecked() && !editMeshColors->isChecked());
+	strokeModeCombo->setEnabled(!gradEditButtonStroke->isChecked() && !editMeshColors->isChecked());
+	gradientTypeStroke->setEnabled(!gradEditButtonStroke->isChecked() && !editMeshColors->isChecked());
 	emit editGradient(editStrokeGradient);
 }
 
@@ -1566,8 +1570,8 @@
 		editStrokeGradient = 9;
 	else
 		editStrokeGradient = 0;
-	gradientType->setEnabled(!(gradEditButton->isChecked() || editMeshColors->isChecked()));
-	fillModeCombo->setEnabled(!(gradEditButton->isChecked() || editMeshColors->isChecked()));
+	fillModeCombo->setEnabled(!gradEditButton->isChecked() && !editMeshColors->isChecked());
+	gradientType->setEnabled(!gradEditButton->isChecked() && !editMeshColors->isChecked());
 	emit editGradient(editStrokeGradient);
 }
 
@@ -1583,8 +1587,8 @@
 		CGradDia->hide();
 	}
 	editStrokeGradient = 1;
-	gradientType->setEnabled(!(gradEditButton->isChecked() || editMeshColors->isChecked()));
-	fillModeCombo->setEnabled(!(gradEditButton->isChecked() || editMeshColors->isChecked()));
+	strokeModeCombo->setEnabled(!gradEditButtonStroke->isChecked() && !editMeshColors->isChecked());
+	gradientTypeStroke->setEnabled(!gradEditButtonStroke->isChecked() && !editMeshColors->isChecked());
 	emit editGradient(editStrokeGradient);
 }
 
@@ -1645,6 +1649,10 @@
 		else
 			gradEditButton->setChecked(false);
 		emit editGradient(editStrokeGradient);
+		fillModeCombo->setEnabled(!gradEditButton->isChecked() && !editMeshColors->isChecked());
+		gradientType->setEnabled(!gradEditButton->isChecked() && !editMeshColors->isChecked());
+		strokeModeCombo->setEnabled(!gradEditButtonStroke->isChecked() && !editMeshColors->isChecked());
+		gradientTypeStroke->setEnabled(!gradEditButtonStroke->isChecked() && !editMeshColors->isChecked());
 		editMeshColors->setEnabled(true);
 	}
 }