r21147 by jghali -

[scribus-commit]

Author: jghali
Date: Fri Apr  1 10:32:20 2016
New Revision: 21147

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=21147
Log:
#13896: Widgets inconsistently enabled in colors tab of PDF export settings in Document Setup

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

Modified: trunk/Scribus/scribus/ui/prefs_pdfexport.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=21147&path=/trunk/Scribus/scribus/ui/prefs_pdfexport.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/prefs_pdfexport.cpp	(original)
+++ trunk/Scribus/scribus/ui/prefs_pdfexport.cpp	Fri Apr  1 10:32:20 2016
@@ -806,7 +806,7 @@
 {
 	cmsEnabled=enabled;
 	addPDFVersions(enabled);
-	enableProfiles(enabled);
+	enableProfiles(outputIntentionComboBox->currentIndex());
 }
 
 void Prefs_PDFExport::enablePDFExportTabs(bool enabled)
@@ -964,13 +964,22 @@
 {
 	//if we want to show/hide instead
 	//setSolidsImagesWidgetsShown(enabled);
+	bool enableSolidWidgets = false;
 	useSolidColorProfileCheckBox->setEnabled(enabled);
-	solidColorProfileComboBox->setEnabled(enabled);
-	solidColorRenderingIntentComboBox->setEnabled(enabled);
+	if (enabled)
+		enableSolidWidgets = useSolidColorProfileCheckBox->isChecked();
+	solidColorProfileComboBox->setEnabled(enableSolidWidgets);
+	solidColorRenderingIntentComboBox->setEnabled(enableSolidWidgets);
+
+	bool enableImageWidgets = false;
 	useImageProfileCheckBox->setEnabled(enabled);
-	doNotUseEmbeddedImageProfileCheckBox->setEnabled(enabled);
-	imageProfileComboBox->setEnabled(enabled);
-	imageRenderingIntentComboBox->setEnabled(enabled);
+	if (enabled)
+		enableImageWidgets = useImageProfileCheckBox->isChecked();
+	doNotUseEmbeddedImageProfileCheckBox->setEnabled(enableImageWidgets);
+	if (enableImageWidgets)
+		enableImageWidgets = doNotUseEmbeddedImageProfileCheckBox->isChecked();
+	imageProfileComboBox->setEnabled(enableImageWidgets);
+	imageRenderingIntentComboBox->setEnabled(enableImageWidgets);
 }
 
 void Prefs_PDFExport::enablePDFXWidgets(bool enabled)