r22427 by jghali -
scribus-commit
scribus-commit at lists.scribus.net
Sat Mar 10 01:33:43 UTC 2018
Author: jghali
Date: Sat Mar 10 01:33:43 2018
New Revision: 22427
URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=22427
Log:
more CxF importer related work
Added:
trunk/Scribus/scribus/palettes/cxfobject.cpp
trunk/Scribus/scribus/palettes/cxfobject.h
trunk/Scribus/scribus/palettes/paletteloader_cxf.cpp
trunk/Scribus/scribus/palettes/paletteloader_cxf.h
Modified:
trunk/Scribus/scribus/CMakeLists.txt
trunk/Scribus/scribus/palettes/cxfcolor.cpp
trunk/Scribus/scribus/palettes/cxfcolor.h
trunk/Scribus/scribus/palettes/cxfdocument.cpp
trunk/Scribus/scribus/palettes/cxfdocument.h
trunk/Scribus/scribus/palettes/cxftristimulusspec.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=22427&path=/trunk/Scribus/scribus/CMakeLists.txt
==============================================================================
--- trunk/Scribus/scribus/CMakeLists.txt (original)
+++ trunk/Scribus/scribus/CMakeLists.txt Sat Mar 10 01:33:43 2018
@@ -790,6 +790,7 @@
palettes/cxfcolor.cpp
palettes/cxfcolorspecification.cpp
palettes/cxfdocument.cpp
+ palettes/cxfobject.cpp
palettes/cxfmeasurementspec.cpp
palettes/cxftristimulusspec.cpp
palettes/cxfutils.cpp
@@ -798,6 +799,7 @@
palettes/paletteloader_adobe_aco.cpp
palettes/paletteloader_adobe_ase.cpp
palettes/paletteloader_autocad_acb.cpp
+ palettes/paletteloader_cxf.cpp
palettes/paletteloader_ps.cpp
palettes/paletteloader_sk1.cpp
palettes/paletteloader_swatchbook.cpp
Modified: trunk/Scribus/scribus/palettes/cxfcolor.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22427&path=/trunk/Scribus/scribus/palettes/cxfcolor.cpp
==============================================================================
--- trunk/Scribus/scribus/palettes/cxfcolor.cpp (original)
+++ trunk/Scribus/scribus/palettes/cxfcolor.cpp Sat Mar 10 01:33:43 2018
@@ -10,6 +10,7 @@
#include "cxfcolor.h"
#include "cxfcolorspecification.h"
#include "cxfdocument.h"
+#include "cxfmeasurementspec.h"
#include "colormgmt/sccolormgmtstructs.h"
@@ -167,7 +168,7 @@
QDomElement childElem = childNode.toElement();
QString tagName = childElem.tagName();
- if (tagName == "C")
+ if (tagName == "Cyan")
{
QString str = childElem.text();
double cyan = str.toDouble(&gotCyan);
@@ -176,7 +177,7 @@
m_values[0] = qMax(0.0, qMin(cyan, 100.0));
continue;
}
- if (tagName == "M")
+ if (tagName == "Magenta")
{
QString str = childElem.text();
double magenta = str.toDouble(&gotMagenta);
@@ -185,7 +186,7 @@
m_values[1] = qMax(0.0, qMin(magenta, 100.0));
continue;
}
- if (tagName == "Y")
+ if (tagName == "Yellow")
{
QString str = childElem.text();
double yellow = str.toDouble(&gotYellow);
@@ -194,7 +195,7 @@
m_values[2] = qMax(0.0, qMin(yellow, 100.0));
continue;
}
- if (tagName == "K")
+ if (tagName == "Black")
{
QString str = childElem.text();
double black = str.toDouble(&gotBlack);
@@ -377,4 +378,162 @@
m_values[0] = 0.0;
m_values[1] = 0.0;
m_values[2] = 0.0;
+}
+
+CxfColorCIEXYZ::CxfColorCIEXYZ(CxfDocument* cxfDoc)
+ : CxfColor(cxfDoc)
+{
+ m_values[0] = 0.0;
+ m_values[1] = 0.0;
+ m_values[2] = 0.0;
+}
+
+bool CxfColorCIEXYZ::parse(QDomElement& colorElem)
+{
+ bool gotXYZ_X(false);
+ bool gotXYZ_Y(false);
+ bool gotXYZ_Z(false);
+
+ reset();
+
+ QString colorSpec = colorElem.attribute("ColorSpecification");
+ if (colorSpec.isEmpty())
+ return false;
+
+ m_colorSpec = m_cxfDoc->colorSpecification(colorSpec);
+ if (!m_colorSpec)
+ return false;
+
+ QDomNodeList childNodes = colorElem.childNodes();
+ for (int i = 0; i < childNodes.count(); ++i)
+ {
+ QDomNode childNode = childNodes.at(i);
+ if (!childNode.isElement())
+ continue;
+ QDomElement childElem = childNode.toElement();
+
+ QString tagName = childElem.tagName();
+ if (tagName == "X")
+ {
+ QString str = childElem.text();
+ double xyz_x = str.toDouble(&gotXYZ_X);
+ if (!gotXYZ_X)
+ return false;
+ m_values[0] = qMax(0.0, qMin(xyz_x, 100.0));
+ m_values[0] /= 100.0;
+ continue;
+ }
+ if (tagName == "Y")
+ {
+ QString str = childElem.text();
+ double xyz_y = str.toDouble(&gotXYZ_Y);
+ if (!gotXYZ_Y)
+ return false;
+ m_values[1] = qMax(0.0, qMin(xyz_y, 100.0));
+ m_values[1] /= 100.0;
+ continue;
+ }
+ if (tagName == "Z")
+ {
+ QString str = childElem.text();
+ double xyz_z = str.toDouble(&gotXYZ_Z);
+ if (!gotXYZ_Z)
+ return false;
+ m_values[2] = qMax(0.0, qMin(xyz_z, 100.0));
+ m_values[2] /= 100.0;
+ continue;
+ }
+ }
+
+ return (gotXYZ_X && gotXYZ_Y && gotXYZ_Z);
+}
+
+void CxfColorCIEXYZ::reset()
+{
+ CxfColor::reset();
+
+ m_values[0] = 0.0;
+ m_values[1] = 0.0;
+ m_values[2] = 0.0;
+}
+
+CxfReflectanceSpectrum::CxfReflectanceSpectrum(CxfDocument* cxfDoc)
+ : CxfColor(cxfDoc)
+{
+ m_wavelengthStart = 0;
+}
+
+bool CxfReflectanceSpectrum::parse(QDomElement& colorElem)
+{
+ bool convOk = false;
+
+ reset();
+
+ QString colorSpec = colorElem.attribute("ColorSpecification");
+ if (colorSpec.isEmpty())
+ return false;
+
+ m_colorSpec = m_cxfDoc->colorSpecification(colorSpec);
+ if (!m_colorSpec)
+ return false;
+
+ if (!m_colorSpec->hasWavelengthRange())
+ return false;
+
+ QString str = colorElem.attribute("StartWL");
+ if (str.length() > 0)
+ {
+ int wlStart = str.toInt(&convOk);
+ if (!convOk || (wlStart < 360) || (wlStart > 400))
+ return false;
+ m_wavelengthStart = wlStart;
+ }
+
+ QString spectrum = colorElem.text().trimmed();
+ if (spectrum.isEmpty())
+ return false;
+
+ QStringList values = spectrum.split(QChar(' '), QString::SkipEmptyParts);
+ if (values.count() <= 0)
+ return false;
+
+ m_values.reserve(values.count());
+ for (int i = 0; i < values.count(); ++i)
+ {
+ str = values.at(i);
+ double d = str.toDouble(&convOk);
+ if (!convOk)
+ return false;
+ d = qMax(0.0, qMin(d, 1.0));
+ m_values.append(d);
+ }
+
+ return true;
+}
+
+void CxfReflectanceSpectrum::reset()
+{
+ m_values.clear();
+ m_wavelengthStart = 0;
+}
+
+int CxfReflectanceSpectrum::wavelengthStart() const
+{
+ if (m_wavelengthStart > 0)
+ return m_wavelengthStart;
+ return m_colorSpec->measurementSpec().wavelengthStart();
+}
+
+int CxfReflectanceSpectrum::wavelengthIncrement() const
+{
+ return m_colorSpec->measurementSpec().wavelengthIncrement();
+}
+
+QVector<int> CxfReflectanceSpectrum::wavelengths() const
+{
+ if (m_values.count() <= 0)
+ return QVector<int>();
+ int wlStart = wavelengthStart();
+ int wlInc = m_colorSpec->measurementSpec().wavelengthIncrement();
+ return CxfMeasurementSpec::wavelengths(wlStart, wlInc, m_values.count());
}
Modified: trunk/Scribus/scribus/palettes/cxfcolor.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22427&path=/trunk/Scribus/scribus/palettes/cxfcolor.h
==============================================================================
--- trunk/Scribus/scribus/palettes/cxfcolor.h (original)
+++ trunk/Scribus/scribus/palettes/cxfcolor.h Sat Mar 10 01:33:43 2018
@@ -9,6 +9,9 @@
#define CXFCOLOR_H
#include <QDomDocument>
+#include <QSharedPointer>
+#include <QVector>
+
#include "cxftypes.h"
class CxfColorSpecification;
@@ -34,6 +37,8 @@
CxfDocument* m_cxfDoc;
const CxfColorSpecification* m_colorSpec;
};
+
+typedef QSharedPointer<CxfColor> CxfColorShPtr;
class CxfColorRGB : public CxfColor
{
@@ -129,4 +134,44 @@
double m_values[3];
};
+class CxfColorCIEXYZ : public CxfColor
+{
+public:
+ CxfColorCIEXYZ(CxfDocument* cxfDoc);
+
+ double X() const { return m_values[0]; }
+ double Y() const { return m_values[1]; }
+ double Z() const { return m_values[2]; }
+
+ ScLab lab() const;
+
+ virtual CxfColorType type() const { return cxfColorCIELCh; }
+
+ virtual bool parse(QDomElement& colorElem);
+ virtual void reset();
+
+protected:
+ double m_values[3];
+};
+
+class CxfReflectanceSpectrum : public CxfColor
+{
+public:
+ CxfReflectanceSpectrum(CxfDocument* cxfDoc);
+
+ const QVector<double>& values() const { return m_values; }
+ virtual CxfColorType type() const { return cxfReflectanceSpectrum; }
+
+ virtual bool parse(QDomElement& colorElem);
+ virtual void reset();
+
+ int wavelengthStart() const;
+ int wavelengthIncrement() const;
+ QVector<int> wavelengths() const;
+
+protected:
+ QVector<double> m_values;
+ int m_wavelengthStart;
+};
+
#endif
Modified: trunk/Scribus/scribus/palettes/cxfdocument.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22427&path=/trunk/Scribus/scribus/palettes/cxfdocument.cpp
==============================================================================
--- trunk/Scribus/scribus/palettes/cxfdocument.cpp (original)
+++ trunk/Scribus/scribus/palettes/cxfdocument.cpp Sat Mar 10 01:33:43 2018
@@ -14,6 +14,15 @@
}
+CxfDocument::~CxfDocument()
+{
+ while (m_objects.count() > 0)
+ {
+ CxfObject* object = m_objects.takeAt(0);
+ delete object;
+ }
+}
+
const CxfColorSpecification* CxfDocument::colorSpecification(const QString& name) const
{
CxfColorSpecificationShPtr specPtr = m_colorSpecs.value(name, CxfColorSpecificationShPtr());
@@ -27,7 +36,7 @@
return false;
QDomDocument domDoc;
- if (!domDoc.setContent(&file))
+ if (!domDoc.setContent(&file, true))
{
file.close();
return false;
@@ -53,7 +62,15 @@
if (m_colorSpecs.count() <= 0)
return false;
- return true;
+ // Parse objects
+ QDomNodeList objectNodes = rsrcElem.elementsByTagName("ObjectCollection");
+ for (int i = 0; i < objectNodes.count(); ++i)
+ {
+ QDomElement collectionNode = objectNodes.at(i).toElement();
+ parseObjectCollection(collectionNode);
+ }
+
+ return (m_objects.count() > 0);
}
bool CxfDocument::parseColorSpecificationCollection(QDomElement& elem)
@@ -77,6 +94,30 @@
return (m_colorSpecs.count() > 0);
}
+bool CxfDocument::parseObjectCollection(QDomElement& elem)
+{
+ QDomNodeList childNodes = elem.childNodes();
+ for (int i = 0; i < childNodes.count(); ++i)
+ {
+ QDomNode childNode = childNodes.at(i);
+ if (!childNode.isElement())
+ continue;
+
+ QDomElement childElem = childNode.toElement();
+ if (childElem.tagName() != "Object")
+ continue;
+
+ CxfObject* object = new CxfObject(this);
+ if (!object->parse(childElem))
+ {
+ delete object;
+ continue;
+ }
+ m_objects.append(object);
+ }
+ return (m_colorSpecs.count() > 0);
+}
+
void CxfDocument::reset()
{
m_colorSpecs.clear();
Modified: trunk/Scribus/scribus/palettes/cxfdocument.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22427&path=/trunk/Scribus/scribus/palettes/cxfdocument.h
==============================================================================
--- trunk/Scribus/scribus/palettes/cxfdocument.h (original)
+++ trunk/Scribus/scribus/palettes/cxfdocument.h Sat Mar 10 01:33:43 2018
@@ -9,27 +9,36 @@
#define CXFDOCUMENT_H
#include <QDomDocument>
+#include <QList>
#include <QMap>
#include <QString>
#include "cxfcolorspecification.h"
+#include "cxfobject.h"
class CxfDocument
{
public:
CxfDocument();
+ ~CxfDocument();
const CxfColorSpecification* colorSpecification(const QString& name) const;
const QMap<QString, CxfColorSpecificationShPtr>& colorSpecifications() const { return m_colorSpecs; }
bool hasColorSpecification(const QString& name) const { return m_colorSpecs.contains(name); }
+
+ int objectCount() const { return m_objects.count(); }
+ const CxfObject* objectAt(int index) { return m_objects.at(index); }
+ const QList<CxfObject*>& objects() { return m_objects; }
bool parse(const QString& fileName);
void reset();
protected:
QMap<QString, CxfColorSpecificationShPtr> m_colorSpecs;
+ QList<CxfObject*> m_objects;
bool parseColorSpecificationCollection(QDomElement& elem);
+ bool parseObjectCollection(QDomElement& elem);
};
#endif
Modified: trunk/Scribus/scribus/palettes/cxftristimulusspec.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22427&path=/trunk/Scribus/scribus/palettes/cxftristimulusspec.h
==============================================================================
--- trunk/Scribus/scribus/palettes/cxftristimulusspec.h (original)
+++ trunk/Scribus/scribus/palettes/cxftristimulusspec.h Sat Mar 10 01:33:43 2018
@@ -19,6 +19,8 @@
CxfIlluminant illuminant() const { return m_illuminant; }
CxfObserver observer() const { return m_observer; }
CxfCIEConversionMethod conversionMethod() const { return m_convMethod; }
+
+ bool isD50_2degree() const { return (m_illuminant == cxfIlluminantD50 && m_observer == cxfObserver2_Degree); }
bool isValid() const;
bool isSupported() const;
Modified: trunk/Scribus/win32/msvc2012/scribus-main/Scribus.vcxproj
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22427&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 Sat Mar 10 01:33:43 2018
@@ -328,6 +328,7 @@
<ClInclude Include="..\..\..\scribus\palettes\cxfcolorspecification.h" />
<ClInclude Include="..\..\..\scribus\palettes\cxfdocument.h" />
<ClInclude Include="..\..\..\scribus\palettes\cxfmeasurementspec.h" />
+ <ClInclude Include="..\..\..\scribus\palettes\cxfobject.h" />
<ClInclude Include="..\..\..\scribus\palettes\cxftristimulusspec.h" />
<ClInclude Include="..\..\..\scribus\palettes\cxftypes.h" />
<ClInclude Include="..\..\..\scribus\palettes\cxfutils.h" />
@@ -336,6 +337,7 @@
<ClInclude Include="..\..\..\scribus\palettes\paletteloader_adobe_aco.h" />
<ClInclude Include="..\..\..\scribus\palettes\paletteloader_adobe_ase.h" />
<ClInclude Include="..\..\..\scribus\palettes\paletteloader_autocad_acb.h" />
+ <ClInclude Include="..\..\..\scribus\palettes\paletteloader_cxf.h" />
<ClInclude Include="..\..\..\scribus\palettes\paletteloader_ps.h" />
<ClInclude Include="..\..\..\scribus\palettes\paletteloader_sk1.h" />
<ClInclude Include="..\..\..\scribus\palettes\paletteloader_swatchbook.h" />
@@ -858,6 +860,7 @@
<ClCompile Include="..\..\..\scribus\palettes\cxfcolorspecification.cpp" />
<ClCompile Include="..\..\..\scribus\palettes\cxfdocument.cpp" />
<ClCompile Include="..\..\..\scribus\palettes\cxfmeasurementspec.cpp" />
+ <ClCompile Include="..\..\..\scribus\palettes\cxfobject.cpp" />
<ClCompile Include="..\..\..\scribus\palettes\cxftristimulusspec.cpp" />
<ClCompile Include="..\..\..\scribus\palettes\cxfutils.cpp" />
<ClCompile Include="..\..\..\scribus\palettes\paletteloader.cpp" />
@@ -865,6 +868,7 @@
<ClCompile Include="..\..\..\scribus\palettes\paletteloader_adobe_aco.cpp" />
<ClCompile Include="..\..\..\scribus\palettes\paletteloader_adobe_ase.cpp" />
<ClCompile Include="..\..\..\scribus\palettes\paletteloader_autocad_acb.cpp" />
+ <ClCompile Include="..\..\..\scribus\palettes\paletteloader_cxf.cpp" />
<ClCompile Include="..\..\..\scribus\palettes\paletteloader_ps.cpp" />
<ClCompile Include="..\..\..\scribus\palettes\paletteloader_sk1.cpp" />
<ClCompile Include="..\..\..\scribus\palettes\paletteloader_swatchbook.cpp" />
Modified: trunk/Scribus/win32/msvc2012/scribus-main/Scribus.vcxproj.filters
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22427&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 Sat Mar 10 01:33:43 2018
@@ -782,6 +782,12 @@
<ClInclude Include="..\..\..\scribus\palettes\cxfcolor.h">
<Filter>Header Files</Filter>
</ClInclude>
+ <ClInclude Include="..\..\..\scribus\palettes\cxfobject.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\..\scribus\palettes\paletteloader_cxf.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
</ItemGroup>
<ItemGroup>
<ClCompile Include="..\..\..\scribus\desaxe\digester.cpp">
@@ -2443,6 +2449,12 @@
<ClCompile Include="..\..\..\scribus\palettes\cxfcolor.cpp">
<Filter>Source Files</Filter>
</ClCompile>
+ <ClInclude Include="..\..\..\scribus\palettes\cxfobject.cpp">
+ <Filter>Source Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\..\scribus\palettes\paletteloader_cxf.cpp">
+ <Filter>Source Files</Filter>
+ </ClInclude>
</ItemGroup>
<ItemGroup>
<ResourceCompile Include="Scribus.rc">
Modified: trunk/Scribus/win32/msvc2015/scribus-main/Scribus.vcxproj
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22427&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 Sat Mar 10 01:33:43 2018
@@ -328,6 +328,7 @@
<ClInclude Include="..\..\..\scribus\palettes\cxfcolorspecification.h" />
<ClInclude Include="..\..\..\scribus\palettes\cxfdocument.h" />
<ClInclude Include="..\..\..\scribus\palettes\cxfmeasurementspec.h" />
+ <ClInclude Include="..\..\..\scribus\palettes\cxfobject.h" />
<ClInclude Include="..\..\..\scribus\palettes\cxftristimulusspec.h" />
<ClInclude Include="..\..\..\scribus\palettes\cxftypes.h" />
<ClInclude Include="..\..\..\scribus\palettes\cxfutils.h" />
@@ -336,6 +337,7 @@
<ClInclude Include="..\..\..\scribus\palettes\paletteloader_adobe_aco.h" />
<ClInclude Include="..\..\..\scribus\palettes\paletteloader_adobe_ase.h" />
<ClInclude Include="..\..\..\scribus\palettes\paletteloader_autocad_acb.h" />
+ <ClInclude Include="..\..\..\scribus\palettes\paletteloader_cxf.h" />
<ClInclude Include="..\..\..\scribus\palettes\paletteloader_ps.h" />
<ClInclude Include="..\..\..\scribus\palettes\paletteloader_sk1.h" />
<ClInclude Include="..\..\..\scribus\palettes\paletteloader_swatchbook.h" />
@@ -858,6 +860,7 @@
<ClCompile Include="..\..\..\scribus\palettes\cxfcolorspecification.cpp" />
<ClCompile Include="..\..\..\scribus\palettes\cxfdocument.cpp" />
<ClCompile Include="..\..\..\scribus\palettes\cxfmeasurementspec.cpp" />
+ <ClCompile Include="..\..\..\scribus\palettes\cxfobject.cpp" />
<ClCompile Include="..\..\..\scribus\palettes\cxftristimulusspec.cpp" />
<ClCompile Include="..\..\..\scribus\palettes\cxfutils.cpp" />
<ClCompile Include="..\..\..\scribus\palettes\paletteloader.cpp" />
@@ -865,6 +868,7 @@
<ClCompile Include="..\..\..\scribus\palettes\paletteloader_adobe_aco.cpp" />
<ClCompile Include="..\..\..\scribus\palettes\paletteloader_adobe_ase.cpp" />
<ClCompile Include="..\..\..\scribus\palettes\paletteloader_autocad_acb.cpp" />
+ <ClCompile Include="..\..\..\scribus\palettes\paletteloader_cxf.cpp" />
<ClCompile Include="..\..\..\scribus\palettes\paletteloader_ps.cpp" />
<ClCompile Include="..\..\..\scribus\palettes\paletteloader_sk1.cpp" />
<ClCompile Include="..\..\..\scribus\palettes\paletteloader_swatchbook.cpp" />
Modified: trunk/Scribus/win32/msvc2015/scribus-main/Scribus.vcxproj.filters
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22427&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 Sat Mar 10 01:33:43 2018
@@ -782,6 +782,12 @@
<ClInclude Include="..\..\..\scribus\palettes\cxfcolor.h">
<Filter>Header Files</Filter>
</ClInclude>
+ <ClInclude Include="..\..\..\scribus\palettes\cxfobject.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\..\scribus\palettes\paletteloader_cxf.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
</ItemGroup>
<ItemGroup>
<ClCompile Include="..\..\..\scribus\desaxe\digester.cpp">
@@ -2441,6 +2447,12 @@
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\..\scribus\palettes\cxfcolor.cpp">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\..\scribus\palettes\cxfobject.cpp">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\..\scribus\palettes\paletteloader_cxf.cpp">
<Filter>Source Files</Filter>
</ClCompile>
</ItemGroup>
More information about the scribus-commit
mailing list