Author: jghali
Date: Sat Mar 24 23:44:07 2018
New Revision: 22444
URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=22444
Log:
enable import of RGB and CMYK colors from CxF files
Added:
trunk/Scribus/scribus/ui/cxfimportdialog.cpp
trunk/Scribus/scribus/ui/cxfimportdialog.h
trunk/Scribus/scribus/ui/cxfimportdialogbase.ui
Modified:
trunk/Scribus/scribus/CMakeLists.txt
trunk/Scribus/scribus/palettes/cxfcolor.cpp
trunk/Scribus/scribus/palettes/cxfcolor.h
trunk/Scribus/scribus/palettes/cxfdocument.h
trunk/Scribus/scribus/palettes/cxfobject.cpp
trunk/Scribus/scribus/palettes/paletteloader_cxf.cpp
trunk/Scribus/scribus/palettes/paletteloader_cxf.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=22444&path=/trunk/Scribus/scribus/CMakeLists.txt
==============================================================================
--- trunk/Scribus/scribus/CMakeLists.txt (original)
+++ trunk/Scribus/scribus/CMakeLists.txt Sat Mar 24 23:44:07 2018
@@ -102,6 +102,7 @@
ui/cmykfwbase.ui
ui/colorpalette.ui
ui/colorsandfillsbase.ui
+ ui/cxfimportdialogbase.ui
ui/downloadspalettebase.ui
ui/gradientaddedit.ui
ui/gradienteditor.ui
@@ -345,6 +346,7 @@
ui/cupsoptions.h
ui/curvewidget.h
ui/customfdialog.h
+ ui/cxfimportdialog.h
ui/dasheditor.h
ui/dcolor.h
ui/delpages.h
@@ -843,6 +845,7 @@
ui/cupsoptions.cpp
ui/curvewidget.cpp
ui/customfdialog.cpp
+ ui/cxfimportdialog.cpp
ui/dasheditor.cpp
ui/dcolor.cpp
ui/delpages.cpp
Modified: trunk/Scribus/scribus/palettes/cxfcolor.cpp
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=22444&path=/trunk/Scribus/scribus/palettes/cxfcolor.cpp
==============================================================================
--- trunk/Scribus/scribus/palettes/cxfcolor.cpp (original)
+++ trunk/Scribus/scribus/palettes/cxfcolor.cpp Sat Mar 24 23:44:07 2018
@@ -132,6 +132,54 @@
}
+CxfColorHTML::CxfColorHTML(CxfDocument* cxfDoc)
+ : CxfColorRGB(cxfDoc)
+{
+
+}
+
+bool CxfColorHTML::parse(QDomElement& colorElem)
+{
+ bool convOk = false;
+ bool gotRed(false);
+ bool gotGreen(false);
+ bool gotBlue(false);
+
+ reset();
+
+ QString colorSpec = colorElem.attribute("ColorSpecification");
+ if (colorSpec.isEmpty())
+ return false;
+
+ m_colorSpec = m_cxfDoc->colorSpecification(colorSpec);
+ if (!m_colorSpec)
+ return false;
+
+ QString html = colorElem.attribute("HTML");
+ if (html.length() < 6)
+ return false;
+
+ QString rStr = html.mid(0, 2);
+ int red = rStr.toInt(&convOk, 16);
+ if (!convOk)
+ return false;
+ m_values[0] = red;
+
+ QString gStr = html.mid(2, 2);
+ int green = gStr.toInt(&convOk, 16);
+ if (!convOk)
+ return false;
+ m_values[1] = green;
+
+ QString bStr = html.mid(4, 2);
+ int blue = bStr.toInt(&convOk, 16);
+ if (!convOk)
+ return false;
+ m_values[2] = blue;
+
+ return true;
+}
+
CxfColorCMYK::CxfColorCMYK(CxfDocument* cxfDoc)
: CxfColor(cxfDoc)
{
Modified: trunk/Scribus/scribus/palettes/cxfcolor.h
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=22444&path=/trunk/Scribus/scribus/palettes/cxfcolor.h
==============================================================================
--- trunk/Scribus/scribus/palettes/cxfcolor.h (original)
+++ trunk/Scribus/scribus/palettes/cxfcolor.h Sat Mar 24 23:44:07 2018
@@ -75,6 +75,15 @@
CxfColorAdobeRGB(CxfDocument* cxfDoc);
virtual CxfColorType type() const { return cxfColorAdobeRGB; }
+};
+
+class CxfColorHTML : public CxfColorRGB
+{
+public:
+ CxfColorHTML(CxfDocument* cxfDoc);
+
+ virtual CxfColorType type() const { return cxfColorHTML; }
+ virtual bool parse(QDomElement& colorElem);
};
class CxfColorCMYK : public CxfColor
Modified: trunk/Scribus/scribus/palettes/cxfdocument.h
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=22444&path=/trunk/Scribus/scribus/palettes/cxfdocument.h
==============================================================================
--- trunk/Scribus/scribus/palettes/cxfdocument.h (original)
+++ trunk/Scribus/scribus/palettes/cxfdocument.h Sat Mar 24 23:44:07 2018
@@ -27,7 +27,7 @@
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 CxfObject* objectAt(int index) const { return
m_objects.at(index); }
const QList<CxfObject*>& objects() { return m_objects; }
bool parse(const QString& fileName);
Modified: trunk/Scribus/scribus/palettes/cxfobject.cpp
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=22444&path=/trunk/Scribus/scribus/palettes/cxfobject.cpp
==============================================================================
--- trunk/Scribus/scribus/palettes/cxfobject.cpp (original)
+++ trunk/Scribus/scribus/palettes/cxfobject.cpp Sat Mar 24 23:44:07 2018
@@ -59,11 +59,25 @@
m_colorMap.insert(cxfReflectanceSpectrum,
colorPtr);
continue;
}
+ if (tagName == "ColorAdobeRGB")
+ {
+ CxfColorShPtr colorPtr(new CxfColorAdobeRGB(m_cxfDoc));
+ if (colorPtr->parse(childElem))
+ m_colorMap.insert(cxfColorAdobeRGB, colorPtr);
+ continue;
+ }
if (tagName == "ColorSRGB")
{
CxfColorShPtr colorPtr(new CxfColorSRGB(m_cxfDoc));
if (colorPtr->parse(childElem))
m_colorMap.insert(cxfColorSRGB, colorPtr);
+ continue;
+ }
+ if (tagName == "ColorHTML")
+ {
+ CxfColorShPtr colorPtr(new CxfColorHTML(m_cxfDoc));
+ if (colorPtr->parse(childElem))
+ m_colorMap.insert(cxfColorHTML, colorPtr);
continue;
}
if (tagName == "ColorCIELab")
Modified: trunk/Scribus/scribus/palettes/paletteloader_cxf.cpp
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=22444&path=/trunk/Scribus/scribus/palettes/paletteloader_cxf.cpp
==============================================================================
--- trunk/Scribus/scribus/palettes/paletteloader_cxf.cpp (original)
+++ trunk/Scribus/scribus/palettes/paletteloader_cxf.cpp Sat Mar 24
23:44:07 2018
@@ -5,20 +5,26 @@
for which a new license (GPL+exception) is in place.
*/
+#include <QScopedPointer>
+
#include "lcms2.h"
#include "paletteloader_cxf.h"
#include "cxfcolor.h"
#include "cxfobject.h"
#include "sccolor.h"
+#include "scribuscore.h"
#include "scribusdoc.h"
#include "util.h"
#include "util_formats.h"
+#include "colormgmt/sce308tables.h"
+#include "ui/cxfimportdialog.h"
+
PaletteLoader_CxF::PaletteLoader_CxF()
- : PaletteLoader(), m_spectrumConvertor(Illuminant_D50,
Observer_2deg)
-{
-
+ : PaletteLoader(),
m_spectrumConvertor(ScE308Table5_D50_2deg())
+{
+
}
bool PaletteLoader_CxF::isFileSupported(const QString & fileName) const
@@ -38,10 +44,71 @@
return (bytes.indexOf("CxF") >= 0);
}
+QList<eColorSpaceType> PaletteLoader_CxF::getAvailableColorspaces() const
+{
+ bool importableAsRgb = false;
+ bool importableAsCmyk = false;
+ bool importableAsLab = false;
+
+ int objectCount = m_cxfDoc.objectCount();
+ for (int i = 0; i < objectCount; ++i)
+ {
+ const CxfObject* object = m_cxfDoc.objectAt(i);
+
+ if (!importableAsRgb)
+ importableAsRgb = canImportObjectAsRgb(object);
+ if (!importableAsCmyk)
+ importableAsCmyk = canImportObjectAsCmyk(object);
+ if (!importableAsLab)
+ importableAsLab = canImportObjectAsLab(object);
+
+ if (importableAsRgb && importableAsCmyk && importableAsLab)
+ break;
+ }
+
+ QList<eColorSpaceType> colorspaces;
+ if (importableAsLab)
+ colorspaces.append(ColorSpace_Lab);
+ if (importableAsCmyk)
+ colorspaces.append(ColorSpace_Cmyk);
+ if (importableAsRgb)
+ colorspaces.append(ColorSpace_Rgb);
+ return colorspaces;
+}
+
bool PaletteLoader_CxF::importFile(const QString& fileName, bool /*merge*/)
{
if (!m_cxfDoc.parse(fileName))
return false;
+
+ QList<eColorSpaceType> colorspaces = getAvailableColorspaces();
+ if (colorspaces.count() <= 0)
+ return false;
+
+ if (colorspaces.count() > 1)
+ {
+ QScopedPointer<CxfImportDialog> cxfImportDia(new
CxfImportDialog(ScCore->primaryMainWindow()));
+ cxfImportDia->setPriorities(colorspaces);
+ if (cxfImportDia->exec() != QDialog::Accepted)
+ return true;
+ colorspaces = cxfImportDia->priorities();
+ }
+
+ QList<PaletteLoader_CxF::ColorImportFunction> importFunctions;
+ for (int i = 0; i < colorspaces.count(); ++i)
+ {
+ eColorSpaceType colorspace = colorspaces.at(i);
+ if (colorspace == ColorSpace_Rgb)
+
importFunctions.append(&PaletteLoader_CxF::importObjectAsRgbColor);
+ else if (colorspace == ColorSpace_Cmyk)
+
importFunctions.append(&PaletteLoader_CxF::importObjectAsCmykColor);
+ else if (colorspace == ColorSpace_Lab)
+
importFunctions.append(&PaletteLoader_CxF::importObjectAsLabColor);
+ }
+
+ ColorImportFunction singleImportFunc = 0;
+ if (importFunctions.count() == 1)
+ singleImportFunc = importFunctions.at(0);
int importCount = 0;
int objectCount = m_cxfDoc.objectCount();
@@ -50,11 +117,141 @@
{
const CxfObject* object = m_cxfDoc.objectAt(i);
- if (importObjectAsLabColor(object))
- ++importCount;
+ if (singleImportFunc)
+ {
+ if ((this->*singleImportFunc)(object))
+ ++importCount;
+ continue;
+ }
+
+ for (int j = 0; j < importFunctions.count(); ++j)
+ {
+ ColorImportFunction importFunc = importFunctions.at(j);
+ if ((this->*importFunc)(object))
+ {
+ ++importCount;
+ break;
+ }
+ }
}
return (importCount > 0);
+}
+
+bool PaletteLoader_CxF::canImportObjectAsRgb(const CxfObject* object) const
+{
+ if (object->hasColor(cxfColorRGB))
+ return true;
+ if (object->hasColor(cxfColorSRGB))
+ return true;
+ if (object->hasColor(cxfColorAdobeRGB))
+ return true;
+ if (object->hasColor(cxfColorHTML))
+ return true;
+ return false;
+}
+
+bool PaletteLoader_CxF::canImportObjectAsCmyk(const CxfObject* object) const
+{
+ if (object->hasColor(cxfColorCMYK))
+ return true;
+ return false;
+}
+
+bool PaletteLoader_CxF::canImportObjectAsLab(const CxfObject* object) const
+{
+ if (object->hasColor(cxfReflectanceSpectrum))
+ return true;
+ if (object->hasColor(cxfColorCIELab))
+ return true;
+ if (object->hasColor(cxfColorCIELCh))
+ return true;
+ if (object->hasColor(cxfColorCIEXYZ))
+ return true;
+ return false;
+}
+
+bool PaletteLoader_CxF::importObjectAsRgbColor(const CxfObject* object)
+{
+ ScColor color;
+
+ const CxfColorRGB* cxfRgbColor = dynamic_cast<const
CxfColorRGB*>(object->color(cxfColorRGB));
+ if (cxfRgbColor)
+ {
+ double range = cxfRgbColor->maxRange();
+ double red = cxfRgbColor->red() / range;
+ double green = cxfRgbColor->green() / range;
+ double blue = cxfRgbColor->blue() / range;
+ color.setRgbColorF(red, green, blue);
+ color.setSpotColor(false);
+ color.setRegistrationColor(false);
+ m_colors->tryAddColor(object->name(), color);
+ return true;
+ }
+
+ const CxfColorSRGB* cxfsRgbColor = dynamic_cast<const
CxfColorSRGB*>(object->color(cxfColorSRGB));
+ if (cxfsRgbColor)
+ {
+ double range = cxfsRgbColor->maxRange();
+ double red = cxfsRgbColor->red() / range;
+ double green = cxfsRgbColor->green() / range;
+ double blue = cxfsRgbColor->blue() / range;
+ color.setRgbColorF(red, green, blue);
+ color.setSpotColor(false);
+ color.setRegistrationColor(false);
+ m_colors->tryAddColor(object->name(), color);
+ return true;
+ }
+
+ const CxfColorAdobeRGB* cxfAdobeRgbColor = dynamic_cast<const
CxfColorAdobeRGB*>(object->color(cxfColorAdobeRGB));
+ if (cxfAdobeRgbColor)
+ {
+ double range = cxfAdobeRgbColor->maxRange();
+ double red = cxfAdobeRgbColor->red() / range;
+ double green = cxfAdobeRgbColor->green() / range;
+ double blue = cxfAdobeRgbColor->blue() / range;
+ color.setRgbColorF(red, green, blue);
+ color.setSpotColor(false);
+ color.setRegistrationColor(false);
+ m_colors->tryAddColor(object->name(), color);
+ return true;
+ }
+
+ const CxfColorHTML* cxfHTMLColor = dynamic_cast<const
CxfColorHTML*>(object->color(cxfColorHTML));
+ if (cxfHTMLColor)
+ {
+ double red = cxfHTMLColor->red() / 255.0;
+ double green = cxfHTMLColor->green() / 255.0;
+ double blue = cxfHTMLColor->blue() / 255.0;
+ color.setRgbColorF(red, green, blue);
+ color.setSpotColor(false);
+ color.setRegistrationColor(false);
+ m_colors->tryAddColor(object->name(), color);
+ return true;
+ }
+
+ return false;
+}
+
+bool PaletteLoader_CxF::importObjectAsCmykColor(const CxfObject* object)
+{
+ ScColor color;
+
+ const CxfColorCMYK* cxfCmykColor = dynamic_cast<const
CxfColorCMYK*>(object->color(cxfColorCMYK));
+ if (cxfCmykColor)
+ {
+ double c = cxfCmykColor->cyan() / 100.0;
+ double m = cxfCmykColor->magenta() / 100.0;
+ double y = cxfCmykColor->yellow() / 100.0;
+ double k = cxfCmykColor->black() / 100.0;
+ color.setCmykColorF(c, m, y, k);
+ color.setSpotColor(false);
+ color.setRegistrationColor(false);
+ m_colors->tryAddColor(object->name(), color);
+ return true;
+ }
+
+ return false;
}
bool PaletteLoader_CxF::importObjectAsLabColor(const CxfObject* object)
Modified: trunk/Scribus/scribus/palettes/paletteloader_cxf.h
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=22444&path=/trunk/Scribus/scribus/palettes/paletteloader_cxf.h
==============================================================================
--- trunk/Scribus/scribus/palettes/paletteloader_cxf.h (original)
+++ trunk/Scribus/scribus/palettes/paletteloader_cxf.h Sat Mar 24 23:44:07 2018
@@ -8,6 +8,7 @@
#define PALETTELOADER_CXF_H
#include <QString>
+#include <QList>
class CxfObject;
@@ -16,6 +17,7 @@
#include "scribusapi.h"
#include "vgradient.h"
+#include "colormgmt/sccolormgmtstructs.h"
#include "colormgmt/scspectralvaluesconvertor.h"
class PaletteLoader_CxF : public PaletteLoader
@@ -36,7 +38,17 @@
CxfDocument m_cxfDoc;
ScSpectralValuesConvertor m_spectrumConvertor;
+ bool canImportObjectAsRgb(const CxfObject* object) const;
+ bool canImportObjectAsCmyk(const CxfObject* object) const;
+ bool canImportObjectAsLab(const CxfObject* object) const;
+
+ typedef bool (PaletteLoader_CxF::*ColorImportFunction)(const
CxfObject*);
+
+ bool importObjectAsRgbColor(const CxfObject* object);
+ bool importObjectAsCmykColor(const CxfObject* object);
bool importObjectAsLabColor(const CxfObject* object);
+
+ QList<eColorSpaceType> getAvailableColorspaces() const;
};
#endif
Modified: trunk/Scribus/win32/msvc2012/scribus-main/Scribus.vcxproj
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=22444&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 24
23:44:07 2018
@@ -603,6 +603,7 @@
<moc Include="..\..\..\scribus\ui\fontembeddingmodel.h" />
<moc Include="..\..\..\scribus\ui\pdfversioncombo.h" />
<moc Include="..\..\..\scribus\ui\pdfversionmodel.h" />
+ <moc Include="..\..\..\scribus\ui\cxfimportdialog.h" />
<ClInclude Include="..\..\..\scribus\ui\propertywidgetbase.h" />
<moc Include="..\..\..\scribus\pslib.h" />
<moc Include="..\..\..\scribus\ui\query.h" />
@@ -980,6 +981,7 @@
<ClCompile Include="..\..\..\scribus\ui\cupsoptions.cpp" />
<ClCompile Include="..\..\..\scribus\ui\curvewidget.cpp" />
<ClCompile Include="..\..\..\scribus\ui\customfdialog.cpp" />
+ <ClCompile Include="..\..\..\scribus\ui\cxfimportdialog.cpp" />
<ClCompile Include="..\..\..\scribus\ui\dasheditor.cpp" />
<ClCompile Include="..\..\..\scribus\ui\dcolor.cpp" />
<ClCompile Include="..\..\..\scribus\deferredtask.cpp" />
@@ -1534,6 +1536,7 @@
<uic Include="..\..\..\scribus\ui\colorsandfillsbase.ui" />
<uic Include="..\..\..\scribus\ui\copypagetomasterpage.ui" />
<uic Include="..\..\..\scribus\ui\createrange.ui" />
+ <uic Include="..\..\..\scribus\ui\cxfimportdialogbase.ui" />
<uic Include="..\..\..\scribus\ui\downloadspalettebase.ui" />
<uic Include="..\..\..\scribus\ui\gradientaddedit.ui" />
<uic Include="..\..\..\scribus\ui\gradienteditor.ui" />
Modified: trunk/Scribus/win32/msvc2012/scribus-main/Scribus.vcxproj.filters
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=22444&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
24 23:44:07 2018
@@ -791,10 +791,7 @@
<ClInclude Include="..\..\..\scribus\colormgmt\sce308tables.h">
<Filter>colorMgmt</Filter>
</ClInclude>
- <ClInclude Include="..\..\..\scribus\ui\pdfversioncombo.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="..\..\..\scribus\ui\pdfversionmodel.h">
+ <ClInclude Include="..\..\..\scribus\ui\cxfimportdialog.h">
<Filter>Header Files</Filter>
</ClInclude>
</ItemGroup>
@@ -2471,6 +2468,9 @@
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\..\scribus\ui\pdfversionmodel.cpp">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\..\scribus\ui\cxfimportdialog.cpp">
<Filter>Source Files</Filter>
</ClCompile>
</ItemGroup>
@@ -2851,6 +2851,9 @@
<uic Include="..\..\..\scribus\ui\colorsandfillsbase.ui">
<Filter>Form Files</Filter>
</uic>
+ <uic Include="..\..\..\scribus\ui\cxfimportdialogbase.ui">
+ <Filter>Form Files</Filter>
+ </uic>
</ItemGroup>
<ItemGroup>
<lrelease Include="..\..\..\resources\translations\scribus.af.ts">
@@ -4085,6 +4088,12 @@
<moc Include="..\..\..\scribus\ui\fontembeddingmodel.h">
<Filter>Header Files</Filter>
</moc>
+ <moc Include="..\..\..\scribus\ui\pdfversioncombo.h">
+ <Filter>Header Files</Filter>
+ </moc>
+ <moc Include="..\..\..\scribus\ui\pdfversionmodel.h">
+ <Filter>Header Files</Filter>
+ </moc>
</ItemGroup>
<ItemGroup>
<CustomBuild Include="..\..\..\scribus\color.h">
Modified: trunk/Scribus/win32/msvc2015/scribus-main/Scribus.vcxproj
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=22444&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 24
23:44:07 2018
@@ -603,6 +603,7 @@
<moc Include="..\..\..\scribus\ui\fontembeddingmodel.h" />
<moc Include="..\..\..\scribus\ui\pdfversioncombo.h" />
<moc Include="..\..\..\scribus\ui\pdfversionmodel.h" />
+ <moc Include="..\..\..\scribus\ui\cxfimportdialog.h" />
<ClInclude Include="..\..\..\scribus\ui\propertywidgetbase.h" />
<moc Include="..\..\..\scribus\pslib.h" />
<moc Include="..\..\..\scribus\ui\query.h" />
@@ -980,6 +981,7 @@
<ClCompile Include="..\..\..\scribus\ui\cupsoptions.cpp" />
<ClCompile Include="..\..\..\scribus\ui\curvewidget.cpp" />
<ClCompile Include="..\..\..\scribus\ui\customfdialog.cpp" />
+ <ClCompile Include="..\..\..\scribus\ui\cxfimportdialog.cpp" />
<ClCompile Include="..\..\..\scribus\ui\dasheditor.cpp" />
<ClCompile Include="..\..\..\scribus\ui\dcolor.cpp" />
<ClCompile Include="..\..\..\scribus\deferredtask.cpp" />
@@ -1534,6 +1536,7 @@
<uic Include="..\..\..\scribus\ui\colorsandfillsbase.ui" />
<uic Include="..\..\..\scribus\ui\copypagetomasterpage.ui" />
<uic Include="..\..\..\scribus\ui\createrange.ui" />
+ <uic Include="..\..\..\scribus\ui\cxfimportdialogbase.ui" />
<uic Include="..\..\..\scribus\ui\downloadspalettebase.ui" />
<uic Include="..\..\..\scribus\ui\gradientaddedit.ui" />
<uic Include="..\..\..\scribus\ui\gradienteditor.ui" />
Modified: trunk/Scribus/win32/msvc2015/scribus-main/Scribus.vcxproj.filters
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=22444&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
24 23:44:07 2018
@@ -791,10 +791,7 @@
<ClInclude Include="..\..\..\scribus\colormgmt\sce308tables.h">
<Filter>colorMgmt</Filter>
</ClInclude>
- <ClInclude Include="..\..\..\scribus\ui\pdfversioncombo.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="..\..\..\scribus\ui\pdfversionmodel.h">
+ <ClInclude Include="..\..\..\scribus\ui\cxfimportdialog.h">
<Filter>Header Files</Filter>
</ClInclude>
</ItemGroup>
@@ -2471,6 +2468,9 @@
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\..\scribus\ui\pdfversionmodel.cpp">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\..\scribus\ui\cxfimportdialog.cpp">
<Filter>Source Files</Filter>
</ClCompile>
</ItemGroup>
@@ -2851,6 +2851,9 @@
<uic Include="..\..\..\scribus\ui\colorsandfillsbase.ui">
<Filter>Form Files</Filter>
</uic>
+ <uic Include="..\..\..\scribus\ui\cxfimportdialogbase.ui">
+ <Filter>Form Files</Filter>
+ </uic>
</ItemGroup>
<ItemGroup>
<lrelease Include="..\..\..\resources\translations\scribus.af.ts">
@@ -4085,6 +4088,12 @@
<moc Include="..\..\..\scribus\ui\fontembeddingmodel.h">
<Filter>Header Files</Filter>
</moc>
+ <moc Include="..\..\..\scribus\ui\pdfversioncombo.h">
+ <Filter>Header Files</Filter>
+ </moc>
+ <moc Include="..\..\..\scribus\ui\pdfversionmodel.h">
+ <Filter>Header Files</Filter>
+ </moc>
</ItemGroup>
<ItemGroup>
<CustomBuild Include="..\..\..\scribus\color.h">
_______________________________________________
scribus-commit mailing list
[email protected]
http://lists.scribus.net/mailman/listinfo/scribus-commit
