r17861 by jghali - #11145: Enabling separations in Print preview dialog fails

[scribus-commit]

Author: jghali
Date: Thu Nov  8 00:25:23 2012
New Revision: 17861

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=17861
Log:
#11145: Enabling separations in Print preview dialog fails

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

Modified: trunk/Scribus/scribus/ui/preview.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=17861&path=/trunk/Scribus/scribus/ui/preview.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/preview.cpp (original)
+++ trunk/Scribus/scribus/ui/preview.cpp Thu Nov  8 00:25:23 2012
@@ -992,8 +992,10 @@
 			{
 				if ((GsMinor < 54) && (GsMajor < 9))
 					loaderror = im.loadPicture(ScPaths::getTempFileDir()+"/sc.tif.Cyan.tif", 1, cms, ScImage::RGBData, 72, &mode);
+				else if ((GsMajor < 9) || ((GsMajor == 9) && (GsMinor <= 5)))
+					loaderror = im.loadPicture(ScPaths::getTempFileDir()+"/sc.Cyan.tif", 1, cms, ScImage::RGBData, 72, &mode);
 				else
-					loaderror = im.loadPicture(ScPaths::getTempFileDir()+"/sc.Cyan.tif", 1, cms, ScImage::RGBData, 72, &mode);
+					loaderror = im.loadPicture(ScPaths::getTempFileDir()+"/sc(Cyan).tif", 1, cms, ScImage::RGBData, 72, &mode);
 				if (!loaderror)
 				{
 					imageLoadError(Bild, Seite);
@@ -1008,8 +1010,10 @@
 			{
 				if ((GsMinor < 54) && (GsMajor < 9))
 					loaderror = im.loadPicture(ScPaths::getTempFileDir()+"/sc.tif.Magenta.tif", 1, cms, ScImage::RGBData, 72, &mode);
+				else if ((GsMajor < 9) || ((GsMajor == 9) && (GsMinor <= 5)))
+					loaderror = im.loadPicture(ScPaths::getTempFileDir()+"/sc.Magenta.tif", 1, cms, ScImage::RGBData, 72, &mode);
 				else
-					loaderror = im.loadPicture(ScPaths::getTempFileDir()+"/sc.Magenta.tif", 1, cms, ScImage::RGBData, 72, &mode);
+					loaderror = im.loadPicture(ScPaths::getTempFileDir()+"/sc(Magenta).tif", 1, cms, ScImage::RGBData, 72, &mode);
 				if (!loaderror)
 				{
 					imageLoadError(Bild, Seite);
@@ -1024,8 +1028,10 @@
 			{
 				if ((GsMinor < 54) && (GsMajor < 9))
 					loaderror = im.loadPicture(ScPaths::getTempFileDir()+"/sc.tif.Yellow.tif", 1, cms, ScImage::RGBData, 72, &mode);
+				else if ((GsMajor < 9) || ((GsMajor == 9) && (GsMinor <= 5)))
+					loaderror = im.loadPicture(ScPaths::getTempFileDir()+"/sc.Yellow.tif", 1, cms, ScImage::RGBData, 72, &mode);
 				else
-					loaderror = im.loadPicture(ScPaths::getTempFileDir()+"/sc.Yellow.tif", 1, cms, ScImage::RGBData, 72, &mode);
+					loaderror = im.loadPicture(ScPaths::getTempFileDir()+"/sc(Yellow).tif", 1, cms, ScImage::RGBData, 72, &mode);
 				if (!loaderror)
 				{
 					imageLoadError(Bild, Seite);
@@ -1047,8 +1053,10 @@
 						QString fnam;
 						if ((GsMinor < 54) && (GsMajor < 9))
 							fnam = QString(ScPaths::getTempFileDir()+"/sc.tif.s%1.tif").arg(sepit.value());
+						else if ((GsMajor < 9) || ((GsMajor == 9) && (GsMinor <= 5)))
+							fnam = QString(ScPaths::getTempFileDir()+"/sc.s%1.tif").arg(sepit.value());
 						else
-							fnam = QString(ScPaths::getTempFileDir()+"/sc.s%1.tif").arg(sepit.value());
+							fnam = QString(ScPaths::getTempFileDir()+"/sc(%1).tif").arg(sepit.key());
 						if (!im.loadPicture(fnam, 1, cms, ScImage::RGBData, 72, &mode))
 						{
 							imageLoadError(Bild, Seite);
@@ -1067,8 +1075,10 @@
 				cms.allowColorManagement(false);
 				if ((GsMinor < 54) && (GsMajor < 9))
 					loaderror = im.loadPicture(ScPaths::getTempFileDir()+"/sc.tif.Black.tif", 1, cms, ScImage::RGBData, 72, &mode);
+				else if ((GsMajor < 9) || ((GsMajor == 9) && (GsMinor <= 5)))
+					loaderror = im.loadPicture(ScPaths::getTempFileDir()+"/sc.Black.tif", 1, cms, ScImage::RGBData, 72, &mode);
 				else
-					loaderror = im.loadPicture(ScPaths::getTempFileDir()+"/sc.Black.tif", 1, cms, ScImage::RGBData, 72, &mode);
+					loaderror = im.loadPicture(ScPaths::getTempFileDir()+"/sc(Black).tif", 1, cms, ScImage::RGBData, 72, &mode);
 				if (!loaderror)
 				{
 					imageLoadError(Bild, Seite);