Author: jghali
Date: Tue Mar 6 23:00:22 2018
New Revision: 22423
URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=22423
Log:
first bits of CxF color palette importer
Added:
trunk/Scribus/scribus/palettes/cxfcolorspecification.cpp
trunk/Scribus/scribus/palettes/cxfcolorspecification.h
trunk/Scribus/scribus/palettes/cxfmeasurementspec.cpp
trunk/Scribus/scribus/palettes/cxfmeasurementspec.h
trunk/Scribus/scribus/palettes/cxftristimulusspec.cpp
trunk/Scribus/scribus/palettes/cxftristimulusspec.h
trunk/Scribus/scribus/palettes/cxftypes.h
trunk/Scribus/scribus/palettes/cxfutils.cpp
trunk/Scribus/scribus/palettes/cxfutils.h
Modified:
trunk/Scribus/scribus/CMakeLists.txt
trunk/Scribus/win32/msvc2012/scribus-main/Scribus.vcxproj
trunk/Scribus/win32/msvc2012/scribus-main/Scribus.vcxproj.filters
trunk/Scribus/win32/msvc2015/scribus-main/Scribus.vcxproj
trunk/Scribus/win32/msvc2015/scribus-main/Scribus.vcxproj.filters
Modified: trunk/Scribus/scribus/CMakeLists.txt
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=22423&path=/trunk/Scribus/scribus/CMakeLists.txt
==============================================================================
--- trunk/Scribus/scribus/CMakeLists.txt (original)
+++ trunk/Scribus/scribus/CMakeLists.txt Tue Mar 6 23:00:22 2018
@@ -787,6 +787,10 @@
imagedataloaders/scimgdataloader_qt.cpp
imagedataloaders/scimgdataloader_tiff.cpp
imagedataloaders/scimgdataloader_wpg.cpp
+ palettes/cxfcolorspecification.cpp
+ palettes/cxfmeasurementspec.cpp
+ palettes/cxftristimulusspec.cpp
+ palettes/cxfutils.cpp
palettes/paletteloader.cpp
palettes/paletteloader_adobe_acb.cpp
palettes/paletteloader_adobe_aco.cpp
Modified: trunk/Scribus/win32/msvc2012/scribus-main/Scribus.vcxproj
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=22423&path=/trunk/Scribus/win32/msvc2012/scribus-main/Scribus.vcxproj
==============================================================================
--- trunk/Scribus/win32/msvc2012/scribus-main/Scribus.vcxproj (original)
+++ trunk/Scribus/win32/msvc2012/scribus-main/Scribus.vcxproj Tue Mar 6
23:00:22 2018
@@ -324,6 +324,11 @@
<ClInclude
Include="..\..\..\scribus\imagedataloaders\scimgdataloader_ora.h" />
<moc Include="..\..\..\scribus\selectionrubberband.h" />
<ClInclude Include="..\..\..\scribus\nodeeditcontext.h" />
+ <ClInclude Include="..\..\..\scribus\palettes\cxfcolorspecification.h" />
+ <ClInclude Include="..\..\..\scribus\palettes\cxfmeasurementspec.h" />
+ <ClInclude Include="..\..\..\scribus\palettes\cxftristimulusspec.h" />
+ <ClInclude Include="..\..\..\scribus\palettes\cxftypes.h" />
+ <ClInclude Include="..\..\..\scribus\palettes\cxfutils.h" />
<ClInclude Include="..\..\..\scribus\palettes\paletteloader.h" />
<ClInclude Include="..\..\..\scribus\palettes\paletteloader_adobe_acb.h" />
<ClInclude Include="..\..\..\scribus\palettes\paletteloader_adobe_aco.h" />
@@ -847,6 +852,10 @@
<ClCompile
Include="..\..\..\scribus\imagedataloaders\scimgdataloader_kra.cpp" />
<ClCompile Include="..\..\..\scribus\marks.cpp" />
<ClCompile Include="..\..\..\scribus\nodeeditcontext.cpp" />
+ <ClCompile Include="..\..\..\scribus\palettes\cxfcolorspecification.cpp" />
+ <ClCompile Include="..\..\..\scribus\palettes\cxfmeasurementspec.cpp" />
+ <ClCompile Include="..\..\..\scribus\palettes\cxftristimulusspec.cpp" />
+ <ClCompile Include="..\..\..\scribus\palettes\cxfutils.cpp" />
<ClCompile Include="..\..\..\scribus\palettes\paletteloader.cpp" />
<ClCompile Include="..\..\..\scribus\palettes\paletteloader_adobe_acb.cpp"
/>
<ClCompile Include="..\..\..\scribus\palettes\paletteloader_adobe_aco.cpp"
/>
Modified: trunk/Scribus/win32/msvc2012/scribus-main/Scribus.vcxproj.filters
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=22423&path=/trunk/Scribus/win32/msvc2012/scribus-main/Scribus.vcxproj.filters
==============================================================================
--- trunk/Scribus/win32/msvc2012/scribus-main/Scribus.vcxproj.filters
(original)
+++ trunk/Scribus/win32/msvc2012/scribus-main/Scribus.vcxproj.filters Tue Mar
6 23:00:22 2018
@@ -761,6 +761,21 @@
<ClInclude Include="..\..\..\scribus\palettes\paletteloader_swatchbook.h">
<Filter>Header Files</Filter>
</ClInclude>
+ <ClInclude Include="..\..\..\scribus\palettes\cxftypes.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\..\scribus\palettes\cxfutils.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\..\scribus\palettes\cxfmeasurementspec.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\..\scribus\palettes\cxftristimulusspec.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\..\scribus\palettes\cxfcolorspecification.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
</ItemGroup>
<ItemGroup>
<ClCompile Include="..\..\..\scribus\desaxe\digester.cpp">
@@ -2402,6 +2417,18 @@
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile
Include="..\..\..\scribus\palettes\paletteloader_swatchbook.cpp">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\..\scribus\palettes\cxfutils.cpp">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\..\scribus\palettes\cxfmeasurementspec.cpp">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\..\scribus\palettes\cxftristimulusspec.cpp">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\..\scribus\palettes\cxfcolorspecification.cpp">
<Filter>Source Files</Filter>
</ClCompile>
</ItemGroup>
Modified: trunk/Scribus/win32/msvc2015/scribus-main/Scribus.vcxproj
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=22423&path=/trunk/Scribus/win32/msvc2015/scribus-main/Scribus.vcxproj
==============================================================================
--- trunk/Scribus/win32/msvc2015/scribus-main/Scribus.vcxproj (original)
+++ trunk/Scribus/win32/msvc2015/scribus-main/Scribus.vcxproj Tue Mar 6
23:00:22 2018
@@ -324,6 +324,11 @@
<ClInclude
Include="..\..\..\scribus\imagedataloaders\scimgdataloader_ora.h" />
<moc Include="..\..\..\scribus\selectionrubberband.h" />
<ClInclude Include="..\..\..\scribus\nodeeditcontext.h" />
+ <ClInclude Include="..\..\..\scribus\palettes\cxfcolorspecification.h" />
+ <ClInclude Include="..\..\..\scribus\palettes\cxfmeasurementspec.h" />
+ <ClInclude Include="..\..\..\scribus\palettes\cxftristimulusspec.h" />
+ <ClInclude Include="..\..\..\scribus\palettes\cxftypes.h" />
+ <ClInclude Include="..\..\..\scribus\palettes\cxfutils.h" />
<ClInclude Include="..\..\..\scribus\palettes\paletteloader.h" />
<ClInclude Include="..\..\..\scribus\palettes\paletteloader_adobe_acb.h" />
<ClInclude Include="..\..\..\scribus\palettes\paletteloader_adobe_aco.h" />
@@ -847,6 +852,10 @@
<ClCompile
Include="..\..\..\scribus\imagedataloaders\scimgdataloader_kra.cpp" />
<ClCompile Include="..\..\..\scribus\marks.cpp" />
<ClCompile Include="..\..\..\scribus\nodeeditcontext.cpp" />
+ <ClCompile Include="..\..\..\scribus\palettes\cxfcolorspecification.cpp" />
+ <ClCompile Include="..\..\..\scribus\palettes\cxfmeasurementspec.cpp" />
+ <ClCompile Include="..\..\..\scribus\palettes\cxftristimulusspec.cpp" />
+ <ClCompile Include="..\..\..\scribus\palettes\cxfutils.cpp" />
<ClCompile Include="..\..\..\scribus\palettes\paletteloader.cpp" />
<ClCompile Include="..\..\..\scribus\palettes\paletteloader_adobe_acb.cpp"
/>
<ClCompile Include="..\..\..\scribus\palettes\paletteloader_adobe_aco.cpp"
/>
Modified: trunk/Scribus/win32/msvc2015/scribus-main/Scribus.vcxproj.filters
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=22423&path=/trunk/Scribus/win32/msvc2015/scribus-main/Scribus.vcxproj.filters
==============================================================================
--- trunk/Scribus/win32/msvc2015/scribus-main/Scribus.vcxproj.filters
(original)
+++ trunk/Scribus/win32/msvc2015/scribus-main/Scribus.vcxproj.filters Tue Mar
6 23:00:22 2018
@@ -761,6 +761,21 @@
<ClInclude Include="..\..\..\scribus\palettes\paletteloader_swatchbook.h">
<Filter>Header Files</Filter>
</ClInclude>
+ <ClInclude Include="..\..\..\scribus\palettes\cxftypes.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\..\scribus\palettes\cxfutils.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\..\scribus\palettes\cxfmeasurementspec.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\..\scribus\palettes\cxftristimulusspec.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\..\scribus\palettes\cxfcolorspecification.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
</ItemGroup>
<ItemGroup>
<ClCompile Include="..\..\..\scribus\desaxe\digester.cpp">
@@ -2402,6 +2417,18 @@
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile
Include="..\..\..\scribus\palettes\paletteloader_swatchbook.cpp">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\..\scribus\palettes\cxfutils.cpp">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\..\scribus\palettes\cxfmeasurementspec.cpp">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\..\scribus\palettes\cxftristimulusspec.cpp">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\..\scribus\palettes\cxfcolorspecification.cpp">
<Filter>Source Files</Filter>
</ClCompile>
</ItemGroup>
_______________________________________________
scribus-commit mailing list
[email protected]
http://lists.scribus.net/mailman/listinfo/scribus-commit
