Author: jghali
Date: Thu Mar 8 22:46:15 2018
New Revision: 22426
URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=22426
Log:
more CxF importer related work
Added:
trunk/Scribus/scribus/palettes/cxfcolor.cpp
trunk/Scribus/scribus/palettes/cxfcolor.h
trunk/Scribus/scribus/palettes/cxfdocument.cpp
trunk/Scribus/scribus/palettes/cxfdocument.h
Modified:
trunk/Scribus/scribus/CMakeLists.txt
trunk/Scribus/scribus/palettes/cxfcolorspecification.h
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=22426&path=/trunk/Scribus/scribus/CMakeLists.txt
==============================================================================
--- trunk/Scribus/scribus/CMakeLists.txt (original)
+++ trunk/Scribus/scribus/CMakeLists.txt Thu Mar 8 22:46:15 2018
@@ -787,7 +787,9 @@
imagedataloaders/scimgdataloader_qt.cpp
imagedataloaders/scimgdataloader_tiff.cpp
imagedataloaders/scimgdataloader_wpg.cpp
+ palettes/cxfcolor.cpp
palettes/cxfcolorspecification.cpp
+ palettes/cxfdocument.cpp
palettes/cxfmeasurementspec.cpp
palettes/cxftristimulusspec.cpp
palettes/cxfutils.cpp
Modified: trunk/Scribus/scribus/palettes/cxfcolorspecification.h
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=22426&path=/trunk/Scribus/scribus/palettes/cxfcolorspecification.h
==============================================================================
--- trunk/Scribus/scribus/palettes/cxfcolorspecification.h (original)
+++ trunk/Scribus/scribus/palettes/cxfcolorspecification.h Thu Mar 8
22:46:15 2018
@@ -9,6 +9,7 @@
#define CXFCOLORSPECIFICATION_H
#include <QDomDocument>
+#include <QSharedPointer>
#include <QString>
#include "cxfmeasurementspec.h"
@@ -43,4 +44,6 @@
CxfTristimulusSpec m_tristimulusSpec;
};
+typedef QSharedPointer<CxfColorSpecification> CxfColorSpecificationShPtr;
+
#endif
Modified: trunk/Scribus/win32/msvc2012/scribus-main/Scribus.vcxproj
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=22426&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 Thu Mar 8
22:46:15 2018
@@ -324,7 +324,9 @@
<ClInclude
Include="..\..\..\scribus\imagedataloaders\scimgdataloader_ora.h" />
<moc Include="..\..\..\scribus\selectionrubberband.h" />
<ClInclude Include="..\..\..\scribus\nodeeditcontext.h" />
+ <ClInclude Include="..\..\..\scribus\palettes\cxfcolor.h" />
<ClInclude Include="..\..\..\scribus\palettes\cxfcolorspecification.h" />
+ <ClInclude Include="..\..\..\scribus\palettes\cxfdocument.h" />
<ClInclude Include="..\..\..\scribus\palettes\cxfmeasurementspec.h" />
<ClInclude Include="..\..\..\scribus\palettes\cxftristimulusspec.h" />
<ClInclude Include="..\..\..\scribus\palettes\cxftypes.h" />
@@ -852,7 +854,9 @@
<ClCompile
Include="..\..\..\scribus\imagedataloaders\scimgdataloader_kra.cpp" />
<ClCompile Include="..\..\..\scribus\marks.cpp" />
<ClCompile Include="..\..\..\scribus\nodeeditcontext.cpp" />
+ <ClCompile Include="..\..\..\scribus\palettes\cxfcolor.cpp" />
<ClCompile Include="..\..\..\scribus\palettes\cxfcolorspecification.cpp" />
+ <ClCompile Include="..\..\..\scribus\palettes\cxfdocument.cpp" />
<ClCompile Include="..\..\..\scribus\palettes\cxfmeasurementspec.cpp" />
<ClCompile Include="..\..\..\scribus\palettes\cxftristimulusspec.cpp" />
<ClCompile Include="..\..\..\scribus\palettes\cxfutils.cpp" />
Modified: trunk/Scribus/win32/msvc2012/scribus-main/Scribus.vcxproj.filters
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=22426&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 Thu Mar
8 22:46:15 2018
@@ -776,6 +776,12 @@
<ClInclude Include="..\..\..\scribus\palettes\cxfcolorspecification.h">
<Filter>Header Files</Filter>
</ClInclude>
+ <ClInclude Include="..\..\..\scribus\palettes\cxfdocument.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\..\scribus\palettes\cxfcolor.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
</ItemGroup>
<ItemGroup>
<ClCompile Include="..\..\..\scribus\desaxe\digester.cpp">
@@ -2429,6 +2435,12 @@
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\..\scribus\palettes\cxfcolorspecification.cpp">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\..\scribus\palettes\cxfdocument.cpp">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\..\scribus\palettes\cxfcolor.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=22426&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 Thu Mar 8
22:46:15 2018
@@ -324,7 +324,9 @@
<ClInclude
Include="..\..\..\scribus\imagedataloaders\scimgdataloader_ora.h" />
<moc Include="..\..\..\scribus\selectionrubberband.h" />
<ClInclude Include="..\..\..\scribus\nodeeditcontext.h" />
+ <ClInclude Include="..\..\..\scribus\palettes\cxfcolor.h" />
<ClInclude Include="..\..\..\scribus\palettes\cxfcolorspecification.h" />
+ <ClInclude Include="..\..\..\scribus\palettes\cxfdocument.h" />
<ClInclude Include="..\..\..\scribus\palettes\cxfmeasurementspec.h" />
<ClInclude Include="..\..\..\scribus\palettes\cxftristimulusspec.h" />
<ClInclude Include="..\..\..\scribus\palettes\cxftypes.h" />
@@ -852,7 +854,9 @@
<ClCompile
Include="..\..\..\scribus\imagedataloaders\scimgdataloader_kra.cpp" />
<ClCompile Include="..\..\..\scribus\marks.cpp" />
<ClCompile Include="..\..\..\scribus\nodeeditcontext.cpp" />
+ <ClCompile Include="..\..\..\scribus\palettes\cxfcolor.cpp" />
<ClCompile Include="..\..\..\scribus\palettes\cxfcolorspecification.cpp" />
+ <ClCompile Include="..\..\..\scribus\palettes\cxfdocument.cpp" />
<ClCompile Include="..\..\..\scribus\palettes\cxfmeasurementspec.cpp" />
<ClCompile Include="..\..\..\scribus\palettes\cxftristimulusspec.cpp" />
<ClCompile Include="..\..\..\scribus\palettes\cxfutils.cpp" />
Modified: trunk/Scribus/win32/msvc2015/scribus-main/Scribus.vcxproj.filters
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=22426&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 Thu Mar
8 22:46:15 2018
@@ -776,6 +776,12 @@
<ClInclude Include="..\..\..\scribus\palettes\cxfcolorspecification.h">
<Filter>Header Files</Filter>
</ClInclude>
+ <ClInclude Include="..\..\..\scribus\palettes\cxfdocument.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\..\scribus\palettes\cxfcolor.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
</ItemGroup>
<ItemGroup>
<ClCompile Include="..\..\..\scribus\desaxe\digester.cpp">
@@ -2429,6 +2435,12 @@
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\..\scribus\palettes\cxfcolorspecification.cpp">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\..\scribus\palettes\cxfdocument.cpp">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\..\scribus\palettes\cxfcolor.cpp">
<Filter>Source Files</Filter>
</ClCompile>
</ItemGroup>
_______________________________________________
scribus-commit mailing list
[email protected]
http://lists.scribus.net/mailman/listinfo/scribus-commit
