r15719 by fschmid - PaintManager: fixed the issue that RGB Spotcolors are wrongly indicated as CMYK

[scribus-commit]

Author: fschmid
Date: Mon Nov  1 19:07:41 2010
New Revision: 15719

URL: http://scribus.info/websvn/listing.php?repname=Scribus&sc=1&rev=15719
Log:
PaintManager: fixed the issue that RGB Spotcolors are wrongly indicated as CMYK
PaintManager: allow creation of RGB Spotcolors.

Modified:
    trunk/Scribus/scribus/ui/cmykfw.cpp
    trunk/Scribus/scribus/util_color.cpp

Modified: trunk/Scribus/scribus/ui/cmykfw.cpp
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=15719&path=/trunk/Scribus/scribus/ui/cmykfw.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/cmykfw.cpp (original)
+++ trunk/Scribus/scribus/ui/cmykfw.cpp Mon Nov  1 19:07:41 2010
@@ -614,7 +614,8 @@
 	if (Separations->isChecked())
 	{
 		ComboBox1->setCurrentIndex( 0 );
-		SelModel( tr("CMYK"));
+//		Commented out to allow RGB Spot-Colors
+//		SelModel( tr("CMYK"));
 	}
 	connect( ComboBox1, SIGNAL(activated(const QString&)), this, SLOT(SelModel(const QString&)));
 }

Modified: trunk/Scribus/scribus/util_color.cpp
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=15719&path=/trunk/Scribus/scribus/util_color.cpp
==============================================================================
--- trunk/Scribus/scribus/util_color.cpp (original)
+++ trunk/Scribus/scribus/util_color.cpp Mon Nov  1 19:07:41 2010
@@ -247,7 +247,7 @@
 	paintAlert(*pm, *pa, 0, 0);
 	if (ScColorEngine::isOutOfGamut(col, doc))
 		paintAlert(alertIcon, *pa, 15, 0);
-	if ((col.getColorModel() == colorModelCMYK) || (col.isSpotColor()))
+	if (col.getColorModel() == colorModelCMYK)   // || (col.isSpotColor()))
 		paintAlert(cmykIcon, *pa, 30, 0);
 	else
 		paintAlert(rgbIcon, *pa, 30, 0);