r15912 by jghali - - enforce availability of registration color : this color must not be user defined and as a consequence should not be defined in palettes, that patch also fix any attempt to do so by enforcing correct definition of registration color
scribus-commit
scribus-commit at lists.scribus.net
Thu Nov 18 20:35:10 CET 2010
Author: jghali
Date: Thu Nov 18 19:35:10 2010
New Revision: 15912
URL: http://scribus.info/websvn/listing.php?repname=Scribus&sc=1&rev=15912
Log:
- enforce availability of registration color : this color must not be user defined and as a consequence should not be defined in palettes, that patch also fix any attempt to do so by enforcing correct definition of registration color
- remove registration/black/white from color palettes : these colors definitions are enforced by Scribus and in case of color standards should not be in corresponding palette files unless the standard explicitly defines them
Modified:
trunk/Scribus/resources/swatches/AS_2007S-1996.xml
trunk/Scribus/resources/swatches/BS_381C.xml
trunk/Scribus/resources/swatches/BS_4800.xml
trunk/Scribus/resources/swatches/CrayonTM.xml
trunk/Scribus/resources/swatches/GCMI_Colors.xml
trunk/Scribus/resources/swatches/JIS_8721.xml
trunk/Scribus/resources/swatches/Japanese_Traditional.xml
trunk/Scribus/resources/swatches/Munsell_Soil_Colors.xml
trunk/Scribus/resources/swatches/NBS-ISCC_Colours.xml
trunk/Scribus/resources/swatches/Resene/Resene_BS2660_101.xml
trunk/Scribus/resources/swatches/Resene/Resene_BS5252_2008.xml
trunk/Scribus/resources/swatches/Resene/Resene_Decks_Paths_2009.xml
trunk/Scribus/resources/swatches/Resene/Resene_Heritage_2008.xml
trunk/Scribus/resources/swatches/Resene/Resene_Karen_Walker_2008.xml
trunk/Scribus/resources/swatches/Resene/Resene_KidzColour_2008.xml
trunk/Scribus/resources/swatches/Resene/Resene_Multi-Finish.xml
trunk/Scribus/resources/swatches/Resene/Resene_Summit_Roof_2010.xml
trunk/Scribus/resources/swatches/Resene/Resene_The_Range_2011-12.xml
trunk/Scribus/resources/swatches/Resene/Resene_The_Range_WandN_2010.xml
trunk/Scribus/resources/swatches/Scribus_Gnome.xml
trunk/Scribus/resources/swatches/Scribus_OpenOffice.xml
trunk/Scribus/resources/swatches/Scribus_SVG.xml
trunk/Scribus/resources/swatches/Scribus_X11.xml
trunk/Scribus/resources/swatches/Scribus_X11Grey.xml
trunk/Scribus/resources/swatches/Standardised_Rock_Colours.xml
trunk/Scribus/resources/swatches/Tango.xml
trunk/Scribus/resources/swatches/US_FS_595.xml
trunk/Scribus/scribus/plugins/import/wmf/wmfimport.cpp
trunk/Scribus/scribus/prefsmanager.cpp
trunk/Scribus/scribus/sccolor.cpp
trunk/Scribus/scribus/sccolor.h
trunk/Scribus/scribus/scribusdoc.cpp
trunk/Scribus/scribus/ui/paintmanager.cpp
Modified: trunk/Scribus/resources/swatches/AS_2007S-1996.xml
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=15912&path=/trunk/Scribus/resources/swatches/AS_2007S-1996.xml
==============================================================================
--- trunk/Scribus/resources/swatches/AS_2007S-1996.xml (original)
+++ trunk/Scribus/resources/swatches/AS_2007S-1996.xml Thu Nov 18 19:35:10 2010
@@ -206,9 +206,6 @@
<COLOR Spot="1" RGB="#886b42" NAME="Y 63 Khaki" />
<COLOR Spot="1" RGB="#a89988" NAME="Y 65 Mushroom" />
<COLOR Spot="1" RGB="#5e5549" NAME="Y 66 Mudstone" />
- <COLOR CMYK="#000000ff" NAME="Black" />
- <COLOR CMYK="#00000000" NAME="White" />
- <COLOR CMYK="#ffffffff" NAME="Registration" Register="1" />
</SCRIBUSCOLORS>
<!--Please note that the colours in this palette are no accurate representations of a Standards Australia Standard. If you need an accurate reference, please refer to a printed colour chart or colour chips. These pallettes are understood to be in the Public Domain.-->
Modified: trunk/Scribus/resources/swatches/BS_381C.xml
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=15912&path=/trunk/Scribus/resources/swatches/BS_381C.xml
==============================================================================
--- trunk/Scribus/resources/swatches/BS_381C.xml (original)
+++ trunk/Scribus/resources/swatches/BS_381C.xml Thu Nov 18 19:35:10 2010
@@ -119,8 +119,5 @@
<COLOR Spot="1" RGB="#B0C8C0" Register="0" NAME="697 Light Admiralty Grey" />
<COLOR Spot="1" RGB="#603868" Register="0" NAME="796 Dark Violet" />
<COLOR Spot="1" RGB="#C0A0C8" Register="0" NAME="797 Light Violet" />
- <COLOR Spot="0" Register="0" NAME="Black" CMYK="#000000ff" />
- <COLOR Spot="0" Register="1" NAME="Registration" CMYK="#ffffffff" />
- <COLOR Spot="0" Register="0" NAME="White" CMYK="#00000000" />
</SCRIBUSCOLORS>
<!--Please note that the colours in this palette are no accurate representations of a British Standards Institution Standard. If you need an accurate reference, please refer to a printed colour chart or colour chips. These pallettes are understood to be in the Public Domain.-->
Modified: trunk/Scribus/resources/swatches/BS_4800.xml
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=15912&path=/trunk/Scribus/resources/swatches/BS_4800.xml
==============================================================================
--- trunk/Scribus/resources/swatches/BS_4800.xml (original)
+++ trunk/Scribus/resources/swatches/BS_4800.xml Thu Nov 18 19:35:10 2010
@@ -100,8 +100,5 @@
<COLOR Spot="1" RGB="#5f3c64" Register="0" NAME="24C39 Regal Violet" />
<COLOR Spot="1" RGB="#000000" Register="0" NAME="00E53 Black" />
<COLOR Spot="1" RGB="#FFFFFF" Register="0" NAME="00E55 White" />
- <COLOR Spot="0" Register="0" NAME="Black" CMYK="#000000ff" />
- <COLOR Spot="0" Register="1" NAME="Registration" CMYK="#ffffffff" />
- <COLOR Spot="0" Register="0" NAME="White" CMYK="#00000000" />
</SCRIBUSCOLORS>
<!--Please note that the colours in this palette are no accurate representations of a British Standards Institution Standard. If you need an accurate reference, please refer to a printed colour chart or colour chips. These pallettes are understood to be in the Public Domain. -->
Modified: trunk/Scribus/resources/swatches/CrayonTM.xml
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=15912&path=/trunk/Scribus/resources/swatches/CrayonTM.xml
==============================================================================
--- trunk/Scribus/resources/swatches/CrayonTM.xml (original)
+++ trunk/Scribus/resources/swatches/CrayonTM.xml Thu Nov 18 19:35:10 2010
@@ -134,9 +134,6 @@
<COLOR Spot="0" RGB="#FCE883" Register="0" NAME="Yellow" />
<COLOR Spot="0" RGB="#C5E384" Register="0" NAME="Yellow Green" />
<COLOR Spot="0" RGB="#FFAE42" Register="0" NAME="Yellow Orange" />
- <COLOR Spot="0" Register="0" NAME="Black" CMYK="#000000ff" />
- <COLOR Spot="0" Register="1" NAME="Registration" CMYK="#ffffffff" />
- <COLOR Spot="0" Register="0" NAME="White" CMYK="#00000000" />
</SCRIBUSCOLORS>
<!--Retrieved from http://en.wikipedia.org/wiki/List_of_Crayola_colors. License: CC-Share alike (http://en.wikipedia.org/wiki/Wikipedia:Text_of_Creative_Commons_Attribution-ShareAlike_3.0_Unported_License) -->
Modified: trunk/Scribus/resources/swatches/GCMI_Colors.xml
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=15912&path=/trunk/Scribus/resources/swatches/GCMI_Colors.xml
==============================================================================
--- trunk/Scribus/resources/swatches/GCMI_Colors.xml (original)
+++ trunk/Scribus/resources/swatches/GCMI_Colors.xml Thu Nov 18 19:35:10 2010
@@ -59,7 +59,6 @@
<COLOR Spot="1" Register="0" NAME="VIII-9002" CMYK="#000000b2"/>
<COLOR Spot="1" Register="0" NAME="91" CMYK="#00050d0d"/>
<COLOR Spot="1" Register="0" NAME="Kraft" CMYK="#33529400"/>
- <COLOR Spot="0" Register="1" NAME="Registration" CMYK="#ffffffff"/>
<COLOR Spot="0" Register="0" NAME="White" CMYK="#00000000"/>
</SCRIBUSCOLORS>
<!--Created manually from the file http://www.internationalpaper.com/documents/EN/KraftBag/GCMI_COLORS.PDF. Thus, this list is not considered a creative work. If you distribute it, you are nevertheless advised to avoid any suggestion that this is palette has been approved by the Glass Packaging Institute (GPI), which it isn't! If you want to need anaccurate and GPI-approved colour reference, you can acquire one via the GPI: http://www.gpi.org/glassresources/flexo-guide/order-the-flexo-color-guide-ed.html-->
Modified: trunk/Scribus/resources/swatches/JIS_8721.xml
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=15912&path=/trunk/Scribus/resources/swatches/JIS_8721.xml
==============================================================================
--- trunk/Scribus/resources/swatches/JIS_8721.xml (original)
+++ trunk/Scribus/resources/swatches/JIS_8721.xml Thu Nov 18 19:35:10 2010
@@ -1,8 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<SCRIBUSCOLORS Name="JIS 8721" >
- <COLOR Spot="0" Register="0" NAME="Black" CMYK="#000000ff" />
- <COLOR Spot="0" Register="1" NAME="Registration" CMYK="#ffffffff" />
- <COLOR Spot="0" Register="0" NAME="White" CMYK="#00000000" />
<COLOR Spot="1" RGB="#2B4B65" Register="0" NAME="aiiro" />
<COLOR Spot="1" RGB="#576D79" Register="0" NAME="ainezu" />
<COLOR Spot="1" RGB="#BE0032" Register="0" NAME="aka" />
Modified: trunk/Scribus/resources/swatches/Japanese_Traditional.xml
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=15912&path=/trunk/Scribus/resources/swatches/Japanese_Traditional.xml
==============================================================================
--- trunk/Scribus/resources/swatches/Japanese_Traditional.xml (original)
+++ trunk/Scribus/resources/swatches/Japanese_Traditional.xml Thu Nov 18 19:35:10 2010
@@ -1,7 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<SCRIBUSCOLORS Name="Japanese Traditional">
<COLOR Spot="0" Register="0" NAME="Black" CMYK="#000000ff" />
- <COLOR Spot="0" Register="1" NAME="Registration" CMYK="#ffffffff" />
<COLOR Spot="0" Register="0" NAME="White" CMYK="#00000000" />
<COLOR RGB="#fef4f4" NAME="桜色 ã•ãらã„ã‚ #fef4f4" />
<COLOR RGB="#fdeff2" NAME="è–„æ¡œ ã†ã™ã–ãら #fdeff2" />
Modified: trunk/Scribus/resources/swatches/Munsell_Soil_Colors.xml
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=15912&path=/trunk/Scribus/resources/swatches/Munsell_Soil_Colors.xml
==============================================================================
--- trunk/Scribus/resources/swatches/Munsell_Soil_Colors.xml (original)
+++ trunk/Scribus/resources/swatches/Munsell_Soil_Colors.xml Thu Nov 18 19:35:10 2010
@@ -322,8 +322,5 @@
<COLOR RGB="#909399" NAME="[GLEY2] 5PB 6/1" Spot="1" />
<COLOR RGB="#aaaeb3" NAME="[GLEY2] 5PB 7/1" Spot="1" />
<COLOR RGB="#c5c9ce" NAME="[GLEY2] 5PB 8/1" Spot="1" />
- <COLOR Spot="0" Register="0" NAME="Black" CMYK="#000000ff" />
- <COLOR Spot="0" Register="1" NAME="Registration" CMYK="#ffffffff" />
- <COLOR Spot="0" Register="0" NAME="White" CMYK="#00000000" />
</SCRIBUSCOLORS>
<!-- Based on the Munsell Color System as adopted by the United States Department of Agriculture. Like other works of the United States Government the data are considered to be in the Public Domain -->
Modified: trunk/Scribus/resources/swatches/NBS-ISCC_Colours.xml
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=15912&path=/trunk/Scribus/resources/swatches/NBS-ISCC_Colours.xml
==============================================================================
--- trunk/Scribus/resources/swatches/NBS-ISCC_Colours.xml (original)
+++ trunk/Scribus/resources/swatches/NBS-ISCC_Colours.xml Thu Nov 18 19:35:10 2010
@@ -274,9 +274,6 @@
<COLOR Spot="0" RGB="#817066" Register="0" NAME="Medium Gray" />
<COLOR Spot="0" RGB="#49423D" Register="0" NAME="Dark Gray" />
<COLOR Spot="0" RGB="#131313" Register="0" NAME="Black_" />
- <COLOR Spot="0" Register="0" NAME="Black" CMYK="#000000ff" />
- <COLOR Spot="0" Register="1" NAME="Registration" CMYK="#ffffffff" />
- <COLOR Spot="0" Register="0" NAME="White" CMYK="#00000000" />
</SCRIBUSCOLORS>
<!--Retrieved from http://www.anthus.com/Colors/Cent.html. The colour names have been published in Kenneth L. Kelly and Deanne B. Judd, Color: Universal Language and Dictionary of Names, National Bureau of Standards, Spec. Publ. 440, Dec. 1976. The Hex values are the result of the application of the Munsell colour model, which has been published in 1905. A slightly modified version of this colour set is available under a BSD-style license from http://tx4.us/nbs-iscc.htm.-->
Modified: trunk/Scribus/resources/swatches/Resene/Resene_BS2660_101.xml
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=15912&path=/trunk/Scribus/resources/swatches/Resene/Resene_BS2660_101.xml
==============================================================================
--- trunk/Scribus/resources/swatches/Resene/Resene_BS2660_101.xml (original)
+++ trunk/Scribus/resources/swatches/Resene/Resene_BS2660_101.xml Thu Nov 18 19:35:10 2010
@@ -101,7 +101,4 @@
<COLOR RGB="#4c5356" NAME="Resene Trout N45-008-228" Spot="1" />
<COLOR RGB="#2c5778" NAME="Resene Venice Blue B46-066-241" Spot="1" />
<COLOR RGB="#e3d474" NAME="Resene Wild Rice G86-088-092" Spot="1" />
- <COLOR Spot="0" Register="0" NAME="Black" CMYK="#000000ff" />
- <COLOR Spot="0" Register="1" NAME="Registration" CMYK="#ffffffff" />
- <COLOR Spot="0" Register="0" NAME="White" CMYK="#00000000" />
</SCRIBUSCOLORS>
Modified: trunk/Scribus/resources/swatches/Resene/Resene_BS5252_2008.xml
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=15912&path=/trunk/Scribus/resources/swatches/Resene/Resene_BS5252_2008.xml
==============================================================================
--- trunk/Scribus/resources/swatches/Resene/Resene_BS5252_2008.xml (original)
+++ trunk/Scribus/resources/swatches/Resene/Resene_BS5252_2008.xml Thu Nov 18 19:35:10 2010
@@ -235,7 +235,4 @@
<COLOR RGB="#a29ecd" NAME="Resene Wistful B73-042-284" Spot="1" />
<COLOR RGB="#826a21" NAME="Resene Yukon Gold Y53-101-084" Spot="1" />
<COLOR RGB="#17462e" NAME="Resene Zuccini G36-054-160" Spot="1" />
- <COLOR Spot="0" Register="0" NAME="Black" CMYK="#000000ff" />
- <COLOR Spot="0" Register="1" NAME="Registration" CMYK="#ffffffff" />
- <COLOR Spot="0" Register="0" NAME="White" CMYK="#00000000" />
</SCRIBUSCOLORS>
Modified: trunk/Scribus/resources/swatches/Resene/Resene_Decks_Paths_2009.xml
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=15912&path=/trunk/Scribus/resources/swatches/Resene/Resene_Decks_Paths_2009.xml
==============================================================================
--- trunk/Scribus/resources/swatches/Resene/Resene_Decks_Paths_2009.xml (original)
+++ trunk/Scribus/resources/swatches/Resene/Resene_Decks_Paths_2009.xml Thu Nov 18 19:35:10 2010
@@ -64,7 +64,4 @@
<COLOR RGB="#ad6242" NAME="Resene Tuscany O58-086-050" Spot="1" />
<COLOR RGB="#626746" NAME="Resene Woodland G51-034-107" Spot="1" />
<COLOR RGB="#554545" NAME="Resene Woody Brown BR42-013-021" Spot="1" />
- <COLOR Spot="0" Register="0" NAME="Black" CMYK="#000000ff" />
- <COLOR Spot="0" Register="1" NAME="Registration" CMYK="#ffffffff" />
- <COLOR Spot="0" Register="0" NAME="White" CMYK="#00000000" />
</SCRIBUSCOLORS>
Modified: trunk/Scribus/resources/swatches/Resene/Resene_Heritage_2008.xml
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=15912&path=/trunk/Scribus/resources/swatches/Resene/Resene_Heritage_2008.xml
==============================================================================
--- trunk/Scribus/resources/swatches/Resene/Resene_Heritage_2008.xml (original)
+++ trunk/Scribus/resources/swatches/Resene/Resene_Heritage_2008.xml Thu Nov 18 19:35:10 2010
@@ -48,7 +48,4 @@
<COLOR RGB="#c7bd95" NAME="Resene Thistle Y79-036-089" Spot="1" />
<COLOR RGB="#8e593c" NAME="Resene Toffee O53-077-055" Spot="1" />
<COLOR RGB="#c19156" NAME="Resene Twine Y68-078-073" Spot="1" />
- <COLOR Spot="0" Register="0" NAME="Black" CMYK="#000000ff" />
- <COLOR Spot="0" Register="1" NAME="Registration" CMYK="#ffffffff" />
- <COLOR Spot="0" Register="0" NAME="White" CMYK="#00000000" />
</SCRIBUSCOLORS>
Modified: trunk/Scribus/resources/swatches/Resene/Resene_Karen_Walker_2008.xml
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=15912&path=/trunk/Scribus/resources/swatches/Resene/Resene_Karen_Walker_2008.xml
==============================================================================
--- trunk/Scribus/resources/swatches/Resene/Resene_Karen_Walker_2008.xml (original)
+++ trunk/Scribus/resources/swatches/Resene/Resene_Karen_Walker_2008.xml Thu Nov 18 19:35:10 2010
@@ -42,7 +42,4 @@
<COLOR RGB="#4a302b" NAME="Resene Warmed Brown BR35-031-042" Spot="1" />
<COLOR RGB="#909782" NAME="Resene Washed Green G68-019-118" Spot="1" />
<COLOR RGB="#e0da9f" NAME="Resene Weathered Yellow G88-055-097" Spot="1" />
- <COLOR Spot="0" Register="0" NAME="Black" CMYK="#000000ff" />
- <COLOR Spot="0" Register="1" NAME="Registration" CMYK="#ffffffff" />
- <COLOR Spot="0" Register="0" NAME="White" CMYK="#00000000" />
</SCRIBUSCOLORS>
Modified: trunk/Scribus/resources/swatches/Resene/Resene_KidzColour_2008.xml
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=15912&path=/trunk/Scribus/resources/swatches/Resene/Resene_KidzColour_2008.xml
==============================================================================
--- trunk/Scribus/resources/swatches/Resene/Resene_KidzColour_2008.xml (original)
+++ trunk/Scribus/resources/swatches/Resene/Resene_KidzColour_2008.xml Thu Nov 18 19:35:10 2010
@@ -77,7 +77,4 @@
<COLOR RGB="#008b97" NAME="Resene Yabbadabbadoo G60-087-202" Spot="1" />
<COLOR RGB="#006c98" NAME="Resene Yeehaa M59-082-236" Spot="1" />
<COLOR RGB="#c4c0e2" NAME="Resene Zappo V83-028-285" Spot="1" />
- <COLOR Spot="0" Register="0" NAME="Black" CMYK="#000000ff" />
- <COLOR Spot="0" Register="1" NAME="Registration" CMYK="#ffffffff" />
- <COLOR Spot="0" Register="0" NAME="White" CMYK="#00000000" />
</SCRIBUSCOLORS>
Modified: trunk/Scribus/resources/swatches/Resene/Resene_Multi-Finish.xml
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=15912&path=/trunk/Scribus/resources/swatches/Resene/Resene_Multi-Finish.xml
==============================================================================
--- trunk/Scribus/resources/swatches/Resene/Resene_Multi-Finish.xml (original)
+++ trunk/Scribus/resources/swatches/Resene/Resene_Multi-Finish.xml Thu Nov 18 19:35:10 2010
@@ -1008,7 +1008,4 @@
<COLOR RGB="#a29589" NAME="Resene Zorba BR68-016-056" Spot="1" />
<COLOR RGB="#585156" NAME="Resene Zulu N47-007-327" Spot="1" />
<COLOR RGB="#cdd5d5" NAME="Resene Zumthor N88-007-210" Spot="1" />
- <COLOR Spot="0" Register="0" NAME="Black" CMYK="#000000ff" />
- <COLOR Spot="0" Register="1" NAME="Registration" CMYK="#ffffffff" />
- <COLOR Spot="0" Register="0" NAME="White" CMYK="#00000000" />
</SCRIBUSCOLORS>
Modified: trunk/Scribus/resources/swatches/Resene/Resene_Summit_Roof_2010.xml
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=15912&path=/trunk/Scribus/resources/swatches/Resene/Resene_Summit_Roof_2010.xml
==============================================================================
--- trunk/Scribus/resources/swatches/Resene/Resene_Summit_Roof_2010.xml (original)
+++ trunk/Scribus/resources/swatches/Resene/Resene_Summit_Roof_2010.xml Thu Nov 18 19:35:10 2010
@@ -64,7 +64,4 @@
<COLOR RGB="#365c6c" NAME="Resene Undercurrent B49-037-228" Spot="1" />
<COLOR RGB="#36383c" NAME="Resene Vulcan M32-008-267" Spot="1" />
<COLOR RGB="#514e4a" NAME="Resene Winchester M50-006-077" Spot="1" />
- <COLOR Spot="0" Register="0" NAME="Black" CMYK="#000000ff" />
- <COLOR Spot="0" Register="1" NAME="Registration" CMYK="#ffffffff" />
- <COLOR Spot="0" Register="0" NAME="White" CMYK="#00000000" />
</SCRIBUSCOLORS>
Modified: trunk/Scribus/resources/swatches/Resene/Resene_The_Range_2011-12.xml
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=15912&path=/trunk/Scribus/resources/swatches/Resene/Resene_The_Range_2011-12.xml
==============================================================================
--- trunk/Scribus/resources/swatches/Resene/Resene_The_Range_2011-12.xml (original)
+++ trunk/Scribus/resources/swatches/Resene/Resene_The_Range_2011-12.xml Thu Nov 18 19:35:10 2010
@@ -168,7 +168,4 @@
<COLOR RGB="#675744" NAME="Resene Wombat BR49-028-072" Spot="1" />
<COLOR RGB="#681b2b" NAME="Resene X Factor R37-091-022" Spot="1" />
<COLOR RGB="#91e0b7" NAME="Resene Zeal O86-060-161" Spot="1" />
- <COLOR Spot="0" Register="0" NAME="Black" CMYK="#000000ff" />
- <COLOR Spot="0" Register="1" NAME="Registration" CMYK="#ffffffff" />
- <COLOR Spot="0" Register="0" NAME="White" CMYK="#00000000" />
</SCRIBUSCOLORS>
Modified: trunk/Scribus/resources/swatches/Resene/Resene_The_Range_WandN_2010.xml
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=15912&path=/trunk/Scribus/resources/swatches/Resene/Resene_The_Range_WandN_2010.xml
==============================================================================
--- trunk/Scribus/resources/swatches/Resene/Resene_The_Range_WandN_2010.xml (original)
+++ trunk/Scribus/resources/swatches/Resene/Resene_The_Range_WandN_2010.xml Thu Nov 18 19:35:10 2010
@@ -360,7 +360,4 @@
<COLOR RGB="#dad6cc" NAME="Resene White Pointer N89-007-087" Spot="1" />
<COLOR RGB="#d4cfb4" NAME="Resene White Rock G87-023-095" Spot="1" />
<COLOR RGB="#cecac8" NAME="Resene Whiteout N86-003-062" Spot="1" />
- <COLOR Spot="0" Register="0" NAME="Black" CMYK="#000000ff" />
- <COLOR Spot="0" Register="1" NAME="Registration" CMYK="#ffffffff" />
- <COLOR Spot="0" Register="0" NAME="White" CMYK="#00000000" />
</SCRIBUSCOLORS>
Modified: trunk/Scribus/resources/swatches/Scribus_Gnome.xml
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=15912&path=/trunk/Scribus/resources/swatches/Scribus_Gnome.xml
==============================================================================
--- trunk/Scribus/resources/swatches/Scribus_Gnome.xml (original)
+++ trunk/Scribus/resources/swatches/Scribus_Gnome.xml Thu Nov 18 19:35:10 2010
@@ -32,8 +32,5 @@
<COLOR RGB="#267726" NAME="Accent_Green_Dark" />
<COLOR RGB="#ffffff" NAME="White" />
<COLOR RGB="#000000" NAME="Black" />
- <COLOR Spot="0" Register="0" NAME="Black" CMYK="#000000ff" />
- <COLOR Spot="0" Register="1" NAME="Registration" CMYK="#ffffffff" />
- <COLOR Spot="0" Register="0" NAME="White" CMYK="#00000000" />
</SCRIBUSCOLORS>
<!--Based on http://primates.ximian.com/~tigert/new_stock_project/files/Gnome_Stock_Icon_Palette-->
Modified: trunk/Scribus/resources/swatches/Scribus_OpenOffice.xml
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=15912&path=/trunk/Scribus/resources/swatches/Scribus_OpenOffice.xml
==============================================================================
--- trunk/Scribus/resources/swatches/Scribus_OpenOffice.xml (original)
+++ trunk/Scribus/resources/swatches/Scribus_OpenOffice.xml Thu Nov 18 19:35:10 2010
@@ -92,7 +92,4 @@
<COLOR CMYK="#0000b34c" NAME="Yellow 6" />
<COLOR CMYK="#0000677f" NAME="Yellow 7" />
<COLOR CMYK="#00006699" NAME="Yellow 8" />
- <COLOR Spot="0" Register="0" NAME="Black" CMYK="#000000ff" />
- <COLOR Spot="0" Register="1" NAME="Registration" CMYK="#ffffffff" />
- <COLOR Spot="0" Register="0" NAME="White" CMYK="#00000000" />
</SCRIBUSCOLORS>
Modified: trunk/Scribus/resources/swatches/Scribus_SVG.xml
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=15912&path=/trunk/Scribus/resources/swatches/Scribus_SVG.xml
==============================================================================
--- trunk/Scribus/resources/swatches/Scribus_SVG.xml (original)
+++ trunk/Scribus/resources/swatches/Scribus_SVG.xml Thu Nov 18 19:35:10 2010
@@ -147,7 +147,4 @@
<COLOR RGB="#808000" NAME="olive" />
<COLOR RGB="#c0c0c0" NAME="silver" />
<COLOR RGB="#008080" NAME="teal" />
- <COLOR Spot="0" Register="0" NAME="Black" CMYK="#000000ff" />
- <COLOR Spot="0" Register="1" NAME="Registration" CMYK="#ffffffff" />
- <COLOR Spot="0" Register="0" NAME="White" CMYK="#00000000" />
</SCRIBUSCOLORS>
Modified: trunk/Scribus/resources/swatches/Scribus_X11.xml
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=15912&path=/trunk/Scribus/resources/swatches/Scribus_X11.xml
==============================================================================
--- trunk/Scribus/resources/swatches/Scribus_X11.xml (original)
+++ trunk/Scribus/resources/swatches/Scribus_X11.xml Thu Nov 18 19:35:10 2010
@@ -548,7 +548,4 @@
<COLOR RGB="#8b008b" NAME="DarkMagenta" />
<COLOR RGB="#8b0000" NAME="DarkRed" />
<COLOR RGB="#90ee90" NAME="LightGreen" />
- <COLOR Spot="0" Register="0" NAME="Black" CMYK="#000000ff" />
- <COLOR Spot="0" Register="1" NAME="Registration" CMYK="#ffffffff" />
- <COLOR Spot="0" Register="0" NAME="White" CMYK="#00000000" />
</SCRIBUSCOLORS>
Modified: trunk/Scribus/resources/swatches/Scribus_X11Grey.xml
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=15912&path=/trunk/Scribus/resources/swatches/Scribus_X11Grey.xml
==============================================================================
--- trunk/Scribus/resources/swatches/Scribus_X11Grey.xml (original)
+++ trunk/Scribus/resources/swatches/Scribus_X11Grey.xml Thu Nov 18 19:35:10 2010
@@ -109,7 +109,4 @@
<COLOR RGB="#fcfcfc" NAME="Grey099" />
<COLOR RGB="#ffffff" NAME="Grey100" />
<COLOR RGB="#a9a9a9" NAME="DarkGrey" />
- <COLOR Spot="0" Register="0" NAME="Black" CMYK="#000000ff" />
- <COLOR Spot="0" Register="1" NAME="Registration" CMYK="#ffffffff" />
- <COLOR Spot="0" Register="0" NAME="White" CMYK="#00000000" />
</SCRIBUSCOLORS>
Modified: trunk/Scribus/resources/swatches/Standardised_Rock_Colours.xml
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=15912&path=/trunk/Scribus/resources/swatches/Standardised_Rock_Colours.xml
==============================================================================
--- trunk/Scribus/resources/swatches/Standardised_Rock_Colours.xml (original)
+++ trunk/Scribus/resources/swatches/Standardised_Rock_Colours.xml Thu Nov 18 19:35:10 2010
@@ -1,6 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<SCRIBUSCOLORS Name="Standardised Rock Colours" >
- <COLOR Spot="0" Register="0" NAME="Black" CMYK="#000000ff" />
<COLOR Spot="0" RGB="#EBDDDD" Register="0" NAME="Grayish Orange Pink" />
<COLOR Spot="0" RGB="#9E8B85" Register="0" NAME="Pale Red" />
<COLOR Spot="0" RGB="#94563D" Register="0" NAME="Moderate Reddish Brown" />
@@ -22,7 +21,5 @@
<COLOR Spot="0" RGB="#D5CAD0" Register="0" NAME="Pale Pink" />
<COLOR Spot="0" RGB="#615E69" Register="0" NAME="Grayish Purple" />
<COLOR Spot="0" RGB="#4B434E" Register="0" NAME="Very Dusky Red Purple" />
- <COLOR Spot="0" Register="1" NAME="Registration" CMYK="#ffffffff" />
- <COLOR Spot="0" Register="0" NAME="White" CMYK="#00000000" />
</SCRIBUSCOLORS>
<!--Based on http://www.geocities.com/eocene1/Color.html; Copyright has expired -->
Modified: trunk/Scribus/resources/swatches/Tango.xml
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=15912&path=/trunk/Scribus/resources/swatches/Tango.xml
==============================================================================
--- trunk/Scribus/resources/swatches/Tango.xml (original)
+++ trunk/Scribus/resources/swatches/Tango.xml Thu Nov 18 19:35:10 2010
@@ -66,9 +66,6 @@
<COLOR Spot="0" RGB="#edd812" Register="0" NAME=" Yellow 2" />
<COLOR Spot="0" RGB="#b09a11" Register="0" NAME=" Yellow 3" />
<COLOR Spot="0" RGB="#4e4917" Register="0" NAME=" Yellow 4" />
- <COLOR Spot="0" Register="0" NAME="Black" CMYK="#000000ff" />
- <COLOR Spot="0" Register="1" NAME="Registration" CMYK="#ffffffff" />
- <COLOR Spot="0" Register="0" NAME="White" CMYK="#00000000" />
</SCRIBUSCOLORS>
<!-- Retrieved from http://wiki.creativecommons.org/Colors. License: CC Attribution 3.0: http://creativecommons.org/licenses/by/3.0/ -->
Modified: trunk/Scribus/resources/swatches/US_FS_595.xml
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=15912&path=/trunk/Scribus/resources/swatches/US_FS_595.xml
==============================================================================
--- trunk/Scribus/resources/swatches/US_FS_595.xml (original)
+++ trunk/Scribus/resources/swatches/US_FS_595.xml Thu Nov 18 19:35:10 2010
@@ -1,8 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<SCRIBUSCOLORS Name="US Federal Standard 595" >
- <COLOR Spot="0" Register="0" NAME="Black" CMYK="#000000ff" />
- <COLOR Spot="0" Register="1" NAME="Registration" CMYK="#ffffffff" />
- <COLOR Spot="0" Register="0" NAME="White" CMYK="#00000000" />
<COLOR Spot="1" RGB="#532F15" Register="0" NAME="10140" />
<COLOR Spot="1" RGB="#9B2F25" Register="0" NAME="11136" />
<COLOR Spot="1" RGB="#ECB2A6" Register="0" NAME="11630" />
Modified: trunk/Scribus/scribus/plugins/import/wmf/wmfimport.cpp
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=15912&path=/trunk/Scribus/scribus/plugins/import/wmf/wmfimport.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/import/wmf/wmfimport.cpp (original)
+++ trunk/Scribus/scribus/plugins/import/wmf/wmfimport.cpp Thu Nov 18 19:35:10 2010
@@ -329,7 +329,7 @@
m_Doc->setLoading(true);
m_Doc->DoDrawing = false;
m_Doc->scMW()->setScriptRunning(true);
- m_Doc->PageColors.ensureBlackAndWhite();
+ m_Doc->PageColors.ensureDefaultColors();
QList<PageItem*> Elements = parseWmfCommands();
m_tmpSel->clear();
QImage tmpImage = QImage();
@@ -662,7 +662,7 @@
m_Doc->scMW()->setScriptRunning(true);
qApp->setOverrideCursor(QCursor(Qt::WaitCursor));
//gc->Family = m_Doc->toolSettings.textFont;
- m_Doc->PageColors.ensureBlackAndWhite();
+ m_Doc->PageColors.ensureDefaultColors();
//m_gc.push( gc );
QList<PageItem*> Elements = parseWmfCommands();
if (flags & LoadSavePlugin::lfCreateDoc)
Modified: trunk/Scribus/scribus/prefsmanager.cpp
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=15912&path=/trunk/Scribus/scribus/prefsmanager.cpp
==============================================================================
--- trunk/Scribus/scribus/prefsmanager.cpp (original)
+++ trunk/Scribus/scribus/prefsmanager.cpp Thu Nov 18 19:35:10 2010
@@ -2364,7 +2364,7 @@
if (appPrefs.colorPrefs.DColorSet != "Scribus Small")
{
if (importColorsFromFile(pfadC, appPrefs.colorPrefs.DColors, &appPrefs.defaultGradients, false))
- appPrefs.colorPrefs.DColors.ensureBlackAndWhite();
+ appPrefs.colorPrefs.DColors.ensureDefaultColors();
else
{
appPrefs.colorPrefs.DColors.insert("White", ScColor(0, 0, 0, 0));
@@ -2535,7 +2535,7 @@
DOC=DOC.nextSibling();
}
// Some sanity checks
- appPrefs.colorPrefs.DColors.ensureBlackAndWhite();
+ appPrefs.colorPrefs.DColors.ensureDefaultColors();
if ((appPrefs.docSetupPrefs.pagePositioning < 0) || (appPrefs.docSetupPrefs.pagePositioning >= appPrefs.pageSets.count()))
appPrefs.docSetupPrefs.pagePositioning = 0;
if ((appPrefs.docSetupPrefs.docUnitIndex < UNITMIN) || (appPrefs.docSetupPrefs.docUnitIndex > UNITMAX))
Modified: trunk/Scribus/scribus/sccolor.cpp
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=15912&path=/trunk/Scribus/scribus/sccolor.cpp
==============================================================================
--- trunk/Scribus/scribus/sccolor.cpp (original)
+++ trunk/Scribus/scribus/sccolor.cpp Thu Nov 18 19:35:10 2010
@@ -336,10 +336,11 @@
return m_doc;
}
-void ColorList::ensureBlackAndWhite(void)
+void ColorList::ensureDefaultColors(void)
{
ensureBlack();
ensureWhite();
+ ensureRegistration();
}
void ColorList::ensureBlack(void)
@@ -382,6 +383,13 @@
insert("White", ScColor(0, 0, 0, 0));
}
+void ColorList::ensureRegistration(void)
+{
+ ScColor cc = ScColor(255, 255, 255, 255);
+ cc.setRegistrationColor(true);
+ insert("Registration", cc);
+}
+
QString ColorList::tryAddColor(QString name, ScColor col)
{
if (contains(name))
Modified: trunk/Scribus/scribus/sccolor.h
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=15912&path=/trunk/Scribus/scribus/sccolor.h
==============================================================================
--- trunk/Scribus/scribus/sccolor.h (original)
+++ trunk/Scribus/scribus/sccolor.h Thu Nov 18 19:35:10 2010
@@ -147,6 +147,9 @@
/** \brief Ensure availability of white color. */
void ensureWhite(void);
+ /** \brief Ensure availability of registration color. */
+ void ensureRegistration(void);
+
public:
ColorList(ScribusDoc* doc = NULL, bool retainDoc = false);
@@ -165,7 +168,7 @@
void copyColors(const ColorList& colorList, bool overwrite = TRUE);
/** \brief Ensure availability of black and white colors. */
- void ensureBlackAndWhite(void);
+ void ensureDefaultColors(void);
/** \brief Try to add ScColor col to the list, if col already exists either by name or by value the existing color name is returned. */
QString tryAddColor(QString name, ScColor col);
Modified: trunk/Scribus/scribus/scribusdoc.cpp
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=15912&path=/trunk/Scribus/scribus/scribusdoc.cpp
==============================================================================
--- trunk/Scribus/scribus/scribusdoc.cpp (original)
+++ trunk/Scribus/scribus/scribusdoc.cpp Thu Nov 18 19:35:10 2010
@@ -373,7 +373,7 @@
docPrefsData.opToolPrefs.dispY = appPrefsData.opToolPrefs.dispY;
docPrefsData.opToolPrefs.constrain = appPrefsData.opToolPrefs.constrain;
- PageColors.ensureBlackAndWhite();
+ PageColors.ensureDefaultColors();
if (appPrefsData.itemToolPrefs.shapeLineColor != CommonStrings::None)
PageColors.insert(appPrefsData.itemToolPrefs.shapeLineColor, appPrefsData.colorPrefs.DColors[appPrefsData.itemToolPrefs.shapeLineColor]);
docPrefsData.itemToolPrefs.shapeLineColor = appPrefsData.itemToolPrefs.shapeLineColor;
@@ -594,7 +594,7 @@
docGradients = prefsManager->appPrefs.defaultGradients;
PageColors = prefsManager->colorSet();
- PageColors.ensureBlackAndWhite();
+ PageColors.ensureDefaultColors();
PageColors.setDocument(this);
docPrefsData.colorPrefs.DCMSset = prefsManager->appPrefs.colorPrefs.DCMSset;
Modified: trunk/Scribus/scribus/ui/paintmanager.cpp
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=15912&path=/trunk/Scribus/scribus/ui/paintmanager.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/paintmanager.cpp (original)
+++ trunk/Scribus/scribus/ui/paintmanager.cpp Thu Nov 18 19:35:10 2010
@@ -675,7 +675,7 @@
}
dialogGradients.clear();
m_colorList.clear();
- m_colorList.ensureBlackAndWhite();
+ m_colorList.ensureDefaultColors();
}
else
{
@@ -730,19 +730,6 @@
{
ColorList UsedC;
ColorList::Iterator it;
- ScColor regColor;
- QString regName;
- bool hasReg = false;
- for (it = m_colorList.begin(); it != m_colorList.end(); ++it)
- {
- if (it.value().isRegistrationColor())
- {
- regColor = it.value();
- regName = it.key();
- hasReg = true;
- break;
- }
- }
ColorList UsedCG = getGradientColors();
if (m_doc != 0)
{
@@ -755,9 +742,7 @@
}
else
m_colorList = UsedCG;
- m_colorList.ensureBlackAndWhite();
- if (hasReg)
- m_colorList.insert(regName, regColor);
+ m_colorList.ensureDefaultColors();
updateGradientList();
updateColorList();
itemSelected(0);
@@ -1141,7 +1126,7 @@
if (item->text(0) != "Scribus Small")
{
if (importColorsFromFile(pfadC2, m_colorList, &dialogGradients, (m_doc!=0)))
- m_colorList.ensureBlackAndWhite();
+ m_colorList.ensureDefaultColors();
else
{
m_colorList.insert("White", ScColor(0, 0, 0, 0));
More information about the scribus-commit
mailing list