Subversion Repositories Scribus

Compare Revisions

Ignore whitespace Rev 22809 → Rev 22810

/trunk/Scribus/resources/profiles/CMakeLists.txt
5,6 → 5,8
install(FILES
GenericCMYK.icm
GenericCMYK.txt
ISOcoated_v2_300_bas.icc
ISOcoated_v2_300_bas.txt
Readme
sRGB.icm
srgb.license
/trunk/Scribus/resources/profiles/ISOcoated_v2_300_bas.icc
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes:
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Index: Scribus/resources/profiles/ISOcoated_v2_300_bas.txt
===================================================================
--- Scribus/resources/profiles/ISOcoated_v2_300_bas.txt (nonexistent)
+++ Scribus/resources/profiles/ISOcoated_v2_300_bas.txt (revision 22810)
@@ -0,0 +1,24 @@
+Open Source Initiative OSI - The zlib/libpng License:Licensing
+[OSI Approved License]
+The zlib/libpng License
+
+Copyright (c) 2007-2010, basICColor GmbH
+
+This software is provided 'as-is', without any express or implied
+warranty. In no event will the authors be held liable for any damages
+arising from the use of this software.
+
+Permission is granted to anyone to use this software for any purpose,
+including commercial applications, and to alter it and redistribute it
+freely, subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not
+claim that you wrote the original software. If you use this software
+in a product, an acknowledgment in the product documentation would be
+appreciated but is not required.
+
+2. Altered source versions must be plainly marked as such, and must not be
+misrepresented as being the original software.
+
+3. This notice may not be removed or altered from any source distribution.
+
Index: Scribus/resources/profiles/install.targets
===================================================================
--- Scribus/resources/profiles/install.targets (revision 22809)
+++ Scribus/resources/profiles/install.targets (revision 22810)
@@ -19,6 +19,16 @@
SkipUnchangedFiles="true"
/>
<Copy
+ SourceFiles="$(MSBuildThisFileDirectory)ISOcoated_v2_300_bas.icc"
+ DestinationFolder="$(OutDir)\share\profiles"
+ SkipUnchangedFiles="true"
+ />
+ <Copy
+ SourceFiles="$(MSBuildThisFileDirectory)ISOcoated_v2_300_bas.txt"
+ DestinationFolder="$(OutDir)\share\profiles"
+ SkipUnchangedFiles="true"
+ />
+ <Copy
SourceFiles="$(MSBuildThisFileDirectory)Readme"
DestinationFolder="$(OutDir)\share\profiles"
SkipUnchangedFiles="true"
Index: Scribus/scribus/scribuscore.cpp
===================================================================
--- Scribus/scribus/scribuscore.cpp (revision 22809)
+++ Scribus/scribus/scribuscore.cpp (revision 22810)
@@ -413,8 +413,9 @@
void ScribusCore::InitDefaultColorTransforms()
{
- QString defaultRGBString = "sRGB IEC61966-2.1";
- QString defaultCMYKString = "Fogra27L CMYK Coated Press";
+ QString defaultRGBString = "sRGB IEC61966-2.1";
+ QString defaultCMYKString1 = "ISO Coated v2 300% (basICColor)";
+ QString defaultCMYKString2 = "Fogra27L CMYK Coated Press";
// Ouvre le profile RGB par d�fault
if (InputProfiles.contains(defaultRGBString))
@@ -423,10 +424,10 @@
defaultRGBProfile = defaultEngine.createProfile_sRGB();
// Ouvre le profile CMYK par d�faut
- if (InputProfilesCMYK.contains(defaultCMYKString))
- {
- defaultCMYKProfile = defaultEngine.openProfileFromFile(InputProfilesCMYK[defaultCMYKString]);
- }
+ if (InputProfilesCMYK.contains(defaultCMYKString1))
+ defaultCMYKProfile = defaultEngine.openProfileFromFile(InputProfilesCMYK[defaultCMYKString1]);
+ else if (InputProfilesCMYK.contains(defaultCMYKString2))
+ defaultCMYKProfile = defaultEngine.openProfileFromFile(InputProfilesCMYK[defaultCMYKString2]);
// Keep all chance to have monitor profile set
monitorProfile = defaultRGBProfile;
@@ -506,8 +507,10 @@
}
if ((m_prefsManager->appPrefs.colorPrefs.DCMSset.DefaultImageCMYKProfile.isEmpty()) || (!InputProfilesCMYK.contains(m_prefsManager->appPrefs.colorPrefs.DCMSset.DefaultImageCMYKProfile)))
{
- ip = InputProfilesCMYK.find("Fogra27L CMYK Coated Press");
+ ip = InputProfilesCMYK.find("ISO Coated v2 300% (basICColor)");
if (ip == InputProfilesCMYK.end())
+ ip = InputProfilesCMYK.find("Fogra27L CMYK Coated Press");
+ if (ip == InputProfilesCMYK.end())
ip = InputProfilesCMYK.begin();
m_prefsManager->appPrefs.colorPrefs.DCMSset.DefaultImageCMYKProfile = ip.key();
}
@@ -520,8 +523,10 @@
}
if ((m_prefsManager->appPrefs.colorPrefs.DCMSset.DefaultSolidColorCMYKProfile.isEmpty()) || (!InputProfilesCMYK.contains(m_prefsManager->appPrefs.colorPrefs.DCMSset.DefaultSolidColorCMYKProfile)))
{
- ip = InputProfilesCMYK.find("Fogra27L CMYK Coated Press");
+ ip = InputProfilesCMYK.find("ISO Coated v2 300% (basICColor)");
if (ip == InputProfilesCMYK.end())
+ ip = InputProfilesCMYK.find("Fogra27L CMYK Coated Press");
+ if (ip == InputProfilesCMYK.end())
ip = InputProfilesCMYK.begin();
m_prefsManager->appPrefs.colorPrefs.DCMSset.DefaultSolidColorCMYKProfile = ip.key();
}
@@ -534,8 +539,10 @@
}
if ((m_prefsManager->appPrefs.colorPrefs.DCMSset.DefaultPrinterProfile.isEmpty()) || (!PrinterProfiles.contains(m_prefsManager->appPrefs.colorPrefs.DCMSset.DefaultPrinterProfile)))
{
- ip = PrinterProfiles.find("Fogra27L CMYK Coated Press");
+ ip = PrinterProfiles.find("ISO Coated v2 300% (basICColor)");
if (ip == PrinterProfiles.end())
+ ip = PrinterProfiles.find("Fogra27L CMYK Coated Press");
+ if (ip == PrinterProfiles.end())
ip = PrinterProfiles.begin();
m_prefsManager->appPrefs.colorPrefs.DCMSset.DefaultPrinterProfile = ip.key();
}