Subversion Repositories Scribus

Compare Revisions

Ignore whitespace Rev 16338 → Rev 16339

/branches/ScribusOIF/scribus/documentchecker.cpp
183,6 → 183,14
itemError.insert(PlacedPDF, 0);
if ((ext == "gif") && (checkerSettings.checkForGIF))
itemError.insert(ImageIsGIF, 0);
 
//qDebug() << "MASTER: ImageUnderfullsFrame" << currItem->height() << currItem->imageYScale()*currItem->pixm.height() << currItem->width() << currItem->imageXScale()*currItem->pixm.width();
// check image vs. frame sizes
if (currItem->height() > currItem->imageYScale() * currItem->pixm.height()
|| currItem->width() > currItem->imageXScale() * currItem->pixm.width())
{
itemError.insert(PartFilledImageFrame, 0);
}
if (extensionIndicatesPDF(ext))
{
447,6 → 455,15
itemError.insert(PlacedPDF, 0);
if ((ext == "gif") && (checkerSettings.checkForGIF))
itemError.insert(ImageIsGIF, 0);
 
//qDebug() << "REGULAR: ImageUnderfullsFrame" << currItem->height() << currItem->imageYScale()*currItem->pixm.height() << currItem->width() << currItem->imageXScale()*currItem->pixm.width();
// check image vs. frame sizes
if (currItem->height() > currItem->imageYScale() * currItem->pixm.height()
|| currItem->width() > currItem->imageXScale() * currItem->pixm.width())
{
itemError.insert(PartFilledImageFrame, 0);
}
 
if (extensionIndicatesPDF(ext))
{
PDFAnalyzer analyst(currItem->Pfile);
/branches/ScribusOIF/scribus/pdflib_core.cpp
1080,10 → 1080,11
a = 0;
for (it = ReallyUsed.begin(); it != ReallyUsed.end(); ++it)
{
ScFace::FontFormat fformat = AllFonts[it.key()].format();
if ((!AllFonts[it.key()].hasNames()) /*|| (Options.SubsetList.contains(it.key()))*/)
ScFace& face(AllFonts[it.key()]);
ScFace::FontFormat fformat = face.format();
if ((!face.hasNames()) /*|| (Options.SubsetList.contains(it.key()))*/)
{
if (AllFonts[it.key()].hasNames())
if (face.hasNames())
{
UsedFontsP.insert(it.key(), "/Fo"+QString::number(a));
uint SubFonts = 0;
1098,7 → 1099,7
QString fon("");
QMap<uint, uint> glyphMapping;
QMap<uint,std::pair<QChar,QString> > gl;
AllFonts[it.key()].glyphNames(gl);
face.glyphNames(gl);
QMap<uint,FPointArray>& RealGlyphs(it.value());
QMap<uint,FPointArray>::Iterator ig;
for (ig = RealGlyphs.begin(); ig != RealGlyphs.end(); ++ig)
5346,7 → 5347,7
uint idx = hl->glyph.glyph;
uint idx1;
if (Options.SubsetList.contains(style.font().replacementName()))
idx1 = Type3Fonts[UsedFontsP[style.font().replacementName()]][idx] / 255;
idx1 = Type3Fonts[UsedFontsP[style.font().replacementName()]][idx] / 256;
else
idx1 = idx / 224;
ScFace currentFace = style.font();
/branches/ScribusOIF/scribus/KarbonCurveFit.cpp
21,7 → 21,9
*/
 
#include "KarbonCurveFit.h"
#include <QVector>
#include <math.h>
const qreal Zero = 10e-12;
 
/*
An Algorithm for Automatically Fitting Digitized Curves
32,7 → 34,7
http://www.acm.org/pubs/tog/GraphicsGems/gems/README
*/
 
#define MAXPOINTS 1000 /* The most points you can have */
//#define MAXPOINTS 1000 /* The most points you can have */
 
class FitVector {
public:
53,7 → 55,7
 
void normalize(){
double len=length();
if(len==0.0f)
if (qFuzzyCompare(len, 0.0))
return;
m_X/=len; m_Y/=len;
}
65,7 → 67,7
 
void scale(double s){
double len = length();
if(len==0.0f)
if (qFuzzyCompare(len, 0.0))
return;
m_X *= s/len;
m_Y *= s/len;
128,9 → 130,11
u[i-first] = u[i-first-1] +
distance(points.at(i), points.at(i-1));
}
 
double denominator = u[last-first];
if (qFuzzyCompare(denominator, 0.0))
denominator = Zero;
for (i = first + 1; i <= last; i++) {
u[i-first] = u[i-first] / u[last-first];
u[i-first] = u[i-first] / denominator;
}
 
return(u);
208,7 → 212,7
QPointF* GenerateBezier(const QList<QPointF> &points, int first, int last, double *uPrime,FitVector tHat1,FitVector tHat2)
{
int i;
FitVector A[MAXPOINTS][2]; /* Precomputed rhs for eqn */
// FitVector A[MAXPOINTS][2]; /* Precomputed rhs for eqn */
int nPts; /* Number of pts in sub-curve */
double C[2][2]; /* Matrix C */
double X[2]; /* Matrix X */
223,7 → 227,7
curve = new QPointF[4];
nPts = last - first + 1;
 
QVector< QVector<FitVector> > A(nPts, QVector<FitVector>(2));
/* Compute the A's */
for (i = 0; i < nPts; i++) {
FitVector v1, v2;
274,9 → 278,11
det_X_C1 = X[0] * C[1][1] - X[1] * C[0][1];
 
/* Finally, derive alpha values */
if (det_C0_C1 == 0.0) {
if (qFuzzyCompare(det_C0_C1, 0.0)) {
det_C0_C1 = (C[0][0] * C[1][1]) * 10e-12;
}
if (qFuzzyCompare(det_C0_C1, 0.0))
det_C0_C1 = Zero;
alpha_l = det_X_C1 / det_C0_C1;
alpha_r = det_C0_X / det_C0_C1;
 
408,7 → 414,8
numerator = (Q_u.x() - P.x()) * (Q1_u.x()) + (Q_u.y() - P.y()) * (Q1_u.y());
denominator = (Q1_u.x()) * (Q1_u.x()) + (Q1_u.y()) * (Q1_u.y()) +
(Q_u.x() - P.x()) * (Q2_u.x()) + (Q_u.y() - P.y()) * (Q2_u.y());
if (qFuzzyCompare(denominator, 0.0))
denominator = Zero;
/* u = u - f(u)/f'(u) */
uPrime = u - (numerator/denominator);
return (uPrime);
530,7 → 537,8
}
 
 
QPainterPath bezierFit(const QList<QPointF> &points,float error){
QPainterPath bezierFit(const QList<QPointF> &points,float error)
{
FitVector tHat1, tHat2;
 
tHat1 = ComputeLeftTangent(points,0);
554,3 → 562,8
return path;
}
 
QPainterPath bezierFit( const QPolygonF &points, float error )
{
QList<QPointF> clip = QList<QPointF>::fromVector(points);
return bezierFit(clip, error);
}
/branches/ScribusOIF/scribus/canvasmode_nodeedit.cpp
1081,8 → 1081,19
if (edited)
{
currItem->FrameType = 3;
double xp, yp, w, h, xp2, yp2, w2, h2;
xp = currItem->xPos();
yp = currItem->yPos();
w = currItem->width();
h = currItem->height();
m_doc->AdjustItemSize(currItem);
xp2 = currItem->xPos();
yp2 = currItem->yPos();
w2 = currItem->width();
h2 = currItem->height();
currItem->update();
if ((xp != xp2) || (yp != yp2) || (w != w2) || (h != h2))
m_view->DrawNew();
}
if ((m_doc->nodeEdit.SelNode.count() != 0) || ((m_doc->nodeEdit.SegP1 != -1) && (m_doc->nodeEdit.SegP2 != -1)) || (m_doc->nodeEdit.hasNodeSelected() && (!m_doc->nodeEdit.EdPoints)))
{
/branches/ScribusOIF/scribus/scribusdoc.cpp
5346,7 → 5346,9
//If a section is inactive, theres no page numbers printed
if (docPrefsData.docSectionMap[key].active==false)
return retVal;
retVal=docPrefsData.docSectionMap[key].pageNumberFillChar;
retVal = docPrefsData.docSectionMap[key].pageNumberFillChar;
if (retVal == QChar(0))
retVal = QChar(32);
return retVal;
}
 
5360,7 → 5362,7
//If a section is inactive, theres no page numbers printed
if (docPrefsData.docSectionMap[key].active==false)
return retVal;
retVal=docPrefsData.docSectionMap[key].pageNumberWidth;
retVal = qMin(docPrefsData.docSectionMap[key].pageNumberWidth, 20); // added the qmin as a sanity check -> fixes bug #9721
return retVal;
}
 
12331,6 → 12333,7
uint StartInd = 0;
m_Selection->delaySignalsOn();
PageItem *currItem = m_Selection->itemAt(0);
int currItemNr = currItem->ItemNr;
uint EndInd = currItem->PoLine.size();
for (uint a = EndInd-1; a > 0; --a)
{
12338,8 → 12341,9
{
StartInd = a + 1;
bb = new PageItem_Polygon(*currItem);
Items->append(bb);
bb->ItemNr = Items->count()-1;
currItemNr++;
Items->insert(currItemNr, bb);
bb->ItemNr = currItemNr;
bb->convertTo(PageItem::Polygon);
bb->Frame = false;
bb->FrameType = 3;
12349,6 → 12353,7
AdjustItemSize(bb);
bb->ContourLine = bb->PoLine.copy();
bb->ClipEdited = true;
m_Selection->addItem(bb, false);
a -= 3;
EndInd = StartInd - 4;
}
12358,6 → 12363,7
currItem->ContourLine = currItem->PoLine.copy();
currItem->ClipEdited = true;
m_Selection->delaySignalsOff();
renumberItemsInListOrder();
//FIXME: stop using m_View
m_View->Deselect(true);
regionsChanged()->update(QRectF());
/branches/ScribusOIF/scribus/scribusstructs.h
271,7 → 271,8
DeviceColorAndOutputIntend=14,
FontNotEmbedded=15,
EmbeddedFontIsOpenType=16,
OffConflictLayers=17
OffConflictLayers=17,
PartFilledImageFrame= 18
} PreflightError;
 
typedef QMap<PreflightError, int> errorCodes;
/branches/ScribusOIF/scribus/actionmanager.cpp
1623,6 → 1623,7
 
//Item Menu
defKeys.insert("itemDuplicate", Qt::CTRL+Qt::Key_D);
defKeys.insert("itemMulDuplicate", Qt::CTRL+Qt::SHIFT+Qt::Key_D);
defKeys.insert("itemDelete", Qt::CTRL+Qt::Key_K);
defKeys.insert("itemGroup", Qt::CTRL+Qt::Key_G);
defKeys.insert("itemUngroup", Qt::CTRL+Qt::SHIFT+Qt::Key_G);
/branches/ScribusOIF/scribus/colorsetmanager.cpp
112,7 → 112,7
}
fiC.close();
}
appPrefs.colorPrefs.DColorSet = "Scribus Basic";
appPrefs.colorPrefs.DColorSet = ScPaths::instance().shareDir() + "swatches/" + "Scribus Basic";
}
}
 
/branches/ScribusOIF/scribus/ui/checkDocument.cpp
206,6 → 206,10
item->setIcon(COLUMN_ITEM, onlyWarning );
break;
}
case PartFilledImageFrame:
item->setText(COLUMN_PROBLEM, partFilledImageFrame);
item->setIcon(COLUMN_ITEM, onlyWarning);
break;
case Transparency:
item->setText(COLUMN_PROBLEM, transpar);
item->setIcon(COLUMN_ITEM, graveError );
616,6 → 620,7
rasterPDF = tr("Object is a placed PDF");
isGIF = tr("Image is GIF");
WrongFont = tr("Annotation uses a non TrueType font");
partFilledImageFrame = tr("Image dimension is smaller than its frame");
//isGIFtoolTip = "<qt>" + tr("GIF images are not reccomended for print. See the online docs for more info") + "</qt>";
}
 
/branches/ScribusOIF/scribus/ui/outlinepalette.cpp
628,6 → 628,7
case 1:
if (!currDoc->masterPageMode())
emit selectMasterPage(item->PageItemObject->OnMasterPage);
pgItem = item->PageItemObject;
if (item->PageItemObject->isGroup())
emit selectElementByItem(pgItem, false);
else
/branches/ScribusOIF/scribus/ui/checkDocument.h
131,6 → 131,7
QString isGIF;
QString isGIFtoolTip;
QString WrongFont;
QString partFilledImageFrame;
 
//! \brief Flag if is ignore button shown. true = hidden, false = shown.
bool noButton;
/branches/ScribusOIF/scribus/scribus.cpp
1942,6 → 1942,7
else
doc->PageColors = prefsManager->appPrefs.colorPrefs.DColors;
}
tempDoc->PageColors.ensureDefaultColors();
tempDoc->setup(unitIndex, pageArrangement, firstPageLocation, orientation, firstPageNumber, defaultPageSize, newDocName);
if (requiresGUI)
{
/branches/ScribusOIF/scribus/plugins/scriptplugin/scripts/Autoquote.py
80,7 → 80,7
follow_double = u"\u201d"
lead_single = u"\u00bb"
follow_single = u"\u00ab"
else:
else:
scribus.messageBox('Language Error', 'You need to choose an available language', icon=0, button1=1)
sys.exit(2)
164,4 → 164,4
scribus.setRedraw(1)
scribus.docChanged(1)
endmessage = 'Successfully ran script\n Last character read was '+str(char) # Change this message to your liking
scribus.messageBox("Finished", endmessage,icon=0,button1=1)
scribus.messageBox("Finished", endmessage,icon=0,button1=1)
/branches/ScribusOIF/scribus/plugins/tools/pathstroker/pathstroker.cpp
145,7 → 145,7
stroke.setDashPattern(m_array);
}
stroke.setWidth(currItem->lineWidth());
QPainterPath result = stroke.createStroke(pp).simplified();
QPainterPath result = stroke.createStroke(pp);
if (currItem->startArrowIndex() != 0)
{
FPoint Start = currItem->PoLine.point(0);
207,7 → 207,7
newItem->OldH2 = newItem->height();
newItem->updateClip();
newItem->ContourLine = newItem->PoLine.copy();
newItem->setFillEvenOdd(true);
newItem->setFillEvenOdd(false);
currDoc->m_Selection->addItem(newItem);
}
else
262,7 → 262,7
newItem->OldH2 = newItem->height();
newItem->updateClip();
newItem->ContourLine = newItem->PoLine.copy();
newItem->setFillEvenOdd(true);
newItem->setFillEvenOdd(false);
currDoc->m_Selection->addItem(newItem);
}
}
/branches/ScribusOIF/scribus/plugins/tools/smoothpath/smoothpath.cpp
0,0 → 1,152
/*
For general Scribus (>=1.3.2) copyright and licensing information please refer
to the COPYING file provided with the program. Following this notice may exist
a copyright and/or license notice that predates the release of Scribus 1.3.2
for which a new license (GPL+exception) is in place.
*/
/***************************************************************************
* Copyright (C) 2011 by Franz Schmid *
* franz.schmid@altmuehlnet.de *
* *
* This program is free software; you can redistribute it and/or modify *
* it under the terms of the GNU General Public License as published by *
* the Free Software Foundation; either version 2 of the License, or *
* (at your option) any later version. *
* *
* This program is distributed in the hope that it will be useful, *
* but WITHOUT ANY WARRANTY; without even the implied warranty of *
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
* GNU General Public License for more details. *
* *
* You should have received a copy of the GNU General Public License *
* along with this program; if not, write to the *
* Free Software Foundation, Inc., *
* 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *
****************************************************************************/
 
#if defined(_MSC_VER)
#define _USE_MATH_DEFINES
#endif
#include <cmath>
#include "smoothpath.h"
#include "scribuscore.h"
#include "scribusdoc.h"
#include "scribusstructs.h"
#include "selection.h"
#include "util.h"
#include <QPainterPath>
#include <QPolygonF>
#include <QList>
#include "KarbonCurveFit.h"
 
int smoothpath_getPluginAPIVersion()
{
return PLUGIN_API_VERSION;
}
 
ScPlugin* smoothpath_getPlugin()
{
SmoothPathPlugin* plug = new SmoothPathPlugin();
Q_CHECK_PTR(plug);
return plug;
}
 
void smoothpath_freePlugin(ScPlugin* plugin)
{
SmoothPathPlugin* plug = dynamic_cast<SmoothPathPlugin*>(plugin);
Q_ASSERT(plug);
delete plug;
}
 
SmoothPathPlugin::SmoothPathPlugin() : ScActionPlugin()
{
// Set action info in languageChange, so we only have to do
// it in one place.
languageChange();
}
 
SmoothPathPlugin::~SmoothPathPlugin() {};
 
void SmoothPathPlugin::languageChange()
{
// Note that we leave the unused members unset. They'll be initialised
// with their default ctors during construction.
// Action name
m_actionInfo.name = "SmoothPath";
// Action text for menu, including accel
m_actionInfo.text = tr("Smooth Path");
// Menu
m_actionInfo.menu = "ItemPathOps";
m_actionInfo.parentMenu = "Item";
m_actionInfo.subMenuName = tr("Path Tools");
m_actionInfo.enabledOnStartup = false;
m_actionInfo.notSuitableFor.append(PageItem::Line);
m_actionInfo.notSuitableFor.append(PageItem::TextFrame);
m_actionInfo.notSuitableFor.append(PageItem::ImageFrame);
m_actionInfo.notSuitableFor.append(PageItem::Polygon);
m_actionInfo.notSuitableFor.append(PageItem::PathText);
m_actionInfo.notSuitableFor.append(PageItem::LatexFrame);
m_actionInfo.notSuitableFor.append(PageItem::Symbol);
m_actionInfo.notSuitableFor.append(PageItem::RegularPolygon);
m_actionInfo.notSuitableFor.append(PageItem::Arc);
m_actionInfo.notSuitableFor.append(PageItem::Spiral);
m_actionInfo.forAppMode.append(modeNormal);
m_actionInfo.needsNumObjects = 1;
}
 
const QString SmoothPathPlugin::fullTrName() const
{
return QObject::tr("SmoothPath");
}
 
const ScActionPlugin::AboutData* SmoothPathPlugin::getAboutData() const
{
AboutData* about = new AboutData;
Q_CHECK_PTR(about);
about->authors = QString::fromUtf8("Franz Schmid <Franz.Schmid@altmuehlnet.de>");
about->shortDescription = tr("Smoothes a Path");
about->description = tr("Converts a Polyline made of straight Lines to a smoothed Bezier Curve.");
// about->version
// about->releaseDate
// about->copyright
about->license = "GPL";
return about;
}
 
void SmoothPathPlugin::deleteAboutData(const AboutData* about) const
{
Q_ASSERT(about);
delete about;
}
 
bool SmoothPathPlugin::run(ScribusDoc* doc, QString)
{
ScribusDoc* currDoc = doc;
if (currDoc == 0)
currDoc = ScCore->primaryMainWindow()->doc;
if (currDoc->m_Selection->count() > 0)
{
PageItem *currItem = currDoc->m_Selection->itemAt(0);
QPainterPath pp;
if (currItem->itemType() == PageItem::PolyLine)
pp = currItem->PoLine.toQPainterPath(false);
else
pp = currItem->PoLine.toQPainterPath(true);
QList<QPolygonF> polyList = pp.toSubpathPolygons();
QPainterPath result;
for (int a = 0; a < polyList.count(); a++)
{
result.addPath(bezierFit(polyList[a], 5.0));
}
currItem->PoLine.fromQPainterPath(result);
currItem->ClipEdited = true;
currItem->FrameType = 3;
currDoc->AdjustItemSize(currItem);
currItem->OldB2 = currItem->width();
currItem->OldH2 = currItem->height();
currItem->updateClip();
currDoc->regionsChanged()->update(QRectF());
currDoc->changed();
}
return true;
}
/branches/ScribusOIF/scribus/plugins/tools/smoothpath/smoothpath.h
0,0 → 1,55
/*
For general Scribus (>=1.3.2) copyright and licensing information please refer
to the COPYING file provided with the program. Following this notice may exist
a copyright and/or license notice that predates the release of Scribus 1.3.2
for which a new license (GPL+exception) is in place.
*/
/***************************************************************************
* Copyright (C) 2011 by Franz Schmid *
* franz.schmid@altmuehlnet.de *
* *
* This program is free software; you can redistribute it and/or modify *
* it under the terms of the GNU General Public License as published by *
* the Free Software Foundation; either version 2 of the License, or *
* (at your option) any later version. *
* *
* This program is distributed in the hope that it will be useful, *
* but WITHOUT ANY WARRANTY; without even the implied warranty of *
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
* GNU General Public License for more details. *
* *
* You should have received a copy of the GNU General Public License *
* along with this program; if not, write to the *
* Free Software Foundation, Inc., *
* 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *
****************************************************************************/
 
#ifndef SMOOTHPATH_H
#define SMOOTHPATH_H
 
#include "pluginapi.h"
#include "scplugin.h"
 
class PLUGIN_API SmoothPathPlugin : public ScActionPlugin
{
Q_OBJECT
 
public:
// Standard plugin implementation
SmoothPathPlugin();
virtual ~SmoothPathPlugin();
virtual bool run(ScribusDoc* doc, QString target = QString::null);
virtual const QString fullTrName() const;
virtual const AboutData* getAboutData() const;
virtual void deleteAboutData(const AboutData* about) const;
virtual void languageChange();
virtual void addToMainWindowMenu(ScribusMainWindow *) {};
 
// Special features (none)
};
 
extern "C" PLUGIN_API int smoothpath_getPluginAPIVersion();
extern "C" PLUGIN_API ScPlugin* smoothpath_getPlugin();
extern "C" PLUGIN_API void smoothpath_freePlugin(ScPlugin* plugin);
 
#endif
/branches/ScribusOIF/scribus/plugins/tools/smoothpath/CMakeLists.txt
0,0 → 1,26
INCLUDE_DIRECTORIES(
${CMAKE_SOURCE_DIR}
${CMAKE_SOURCE_DIR}/scribus
)
 
SET(SMOOTHPATH_PLUGIN_MOC_CLASSES
smoothpath.h
)
 
SET(SMOOTHPATH_PLUGIN_SOURCES
smoothpath.cpp
)
 
SET(SCRIBUS_SMOOTHPATH_PLUGIN "smoothpath")
 
QT4_WRAP_CPP(SMOOTHPATH_PLUGIN_MOC_SOURCES ${SMOOTHPATH_PLUGIN_MOC_CLASSES})
 
ADD_LIBRARY(${SCRIBUS_SMOOTHPATH_PLUGIN} MODULE ${SMOOTHPATH_PLUGIN_SOURCES} ${SMOOTHPATH_PLUGIN_MOC_SOURCES})
 
TARGET_LINK_LIBRARIES(${SCRIBUS_SMOOTHPATH_PLUGIN} ${PLUGIN_LIBRARIES})
 
INSTALL(TARGETS ${SCRIBUS_SMOOTHPATH_PLUGIN}
LIBRARY
DESTINATION ${PLUGINDIR}
PERMISSIONS ${PLUGIN_PERMISSIONS}
)
/branches/ScribusOIF/scribus/plugins/tools/flattenpath/flattenpath.h
0,0 → 1,55
/*
For general Scribus (>=1.3.2) copyright and licensing information please refer
to the COPYING file provided with the program. Following this notice may exist
a copyright and/or license notice that predates the release of Scribus 1.3.2
for which a new license (GPL+exception) is in place.
*/
/***************************************************************************
* Copyright (C) 2011 by Franz Schmid *
* franz.schmid@altmuehlnet.de *
* *
* This program is free software; you can redistribute it and/or modify *
* it under the terms of the GNU General Public License as published by *
* the Free Software Foundation; either version 2 of the License, or *
* (at your option) any later version. *
* *
* This program is distributed in the hope that it will be useful, *
* but WITHOUT ANY WARRANTY; without even the implied warranty of *
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
* GNU General Public License for more details. *
* *
* You should have received a copy of the GNU General Public License *
* along with this program; if not, write to the *
* Free Software Foundation, Inc., *
* 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *
****************************************************************************/
 
#ifndef FLATTENPATH_H
#define FLATTENPATH_H
 
#include "pluginapi.h"
#include "scplugin.h"
 
class PLUGIN_API FlattenPathPlugin : public ScActionPlugin
{
Q_OBJECT
 
public:
// Standard plugin implementation
FlattenPathPlugin();
virtual ~FlattenPathPlugin();
virtual bool run(ScribusDoc* doc, QString target = QString::null);
virtual const QString fullTrName() const;
virtual const AboutData* getAboutData() const;
virtual void deleteAboutData(const AboutData* about) const;
virtual void languageChange();
virtual void addToMainWindowMenu(ScribusMainWindow *) {};
 
// Special features (none)
};
 
extern "C" PLUGIN_API int flattenpath_getPluginAPIVersion();
extern "C" PLUGIN_API ScPlugin* flattenpath_getPlugin();
extern "C" PLUGIN_API void flattenpath_freePlugin(ScPlugin* plugin);
 
#endif
/branches/ScribusOIF/scribus/plugins/tools/flattenpath/flattenpath.cpp
0,0 → 1,146
/*
For general Scribus (>=1.3.2) copyright and licensing information please refer
to the COPYING file provided with the program. Following this notice may exist
a copyright and/or license notice that predates the release of Scribus 1.3.2
for which a new license (GPL+exception) is in place.
*/
/***************************************************************************
* Copyright (C) 2011 by Franz Schmid *
* franz.schmid@altmuehlnet.de *
* *
* This program is free software; you can redistribute it and/or modify *
* it under the terms of the GNU General Public License as published by *
* the Free Software Foundation; either version 2 of the License, or *
* (at your option) any later version. *
* *
* This program is distributed in the hope that it will be useful, *
* but WITHOUT ANY WARRANTY; without even the implied warranty of *
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
* GNU General Public License for more details. *
* *
* You should have received a copy of the GNU General Public License *
* along with this program; if not, write to the *
* Free Software Foundation, Inc., *
* 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *
****************************************************************************/
 
#if defined(_MSC_VER)
#define _USE_MATH_DEFINES
#endif
#include <cmath>
#include "flattenpath.h"
#include "scribuscore.h"
#include "scribusdoc.h"
#include "scribusstructs.h"
#include "selection.h"
#include "util.h"
#include <QPainterPath>
#include <QPolygonF>
#include <QList>
 
int flattenpath_getPluginAPIVersion()
{
return PLUGIN_API_VERSION;
}
 
ScPlugin* flattenpath_getPlugin()
{
FlattenPathPlugin* plug = new FlattenPathPlugin();
Q_CHECK_PTR(plug);
return plug;
}
 
void flattenpath_freePlugin(ScPlugin* plugin)
{
FlattenPathPlugin* plug = dynamic_cast<FlattenPathPlugin*>(plugin);
Q_ASSERT(plug);
delete plug;
}
 
FlattenPathPlugin::FlattenPathPlugin() : ScActionPlugin()
{
// Set action info in languageChange, so we only have to do
// it in one place.
languageChange();
}
 
FlattenPathPlugin::~FlattenPathPlugin() {};
 
void FlattenPathPlugin::languageChange()
{
// Note that we leave the unused members unset. They'll be initialised
// with their default ctors during construction.
// Action name
m_actionInfo.name = "FlattenPath";
// Action text for menu, including accel
m_actionInfo.text = tr("Flatten Path");
// Menu
m_actionInfo.menu = "ItemPathOps";
m_actionInfo.parentMenu = "Item";
m_actionInfo.subMenuName = tr("Path Tools");
m_actionInfo.enabledOnStartup = false;
m_actionInfo.notSuitableFor.append(PageItem::Line);
m_actionInfo.notSuitableFor.append(PageItem::Symbol);
m_actionInfo.notSuitableFor.append(PageItem::RegularPolygon);
m_actionInfo.notSuitableFor.append(PageItem::Arc);
m_actionInfo.notSuitableFor.append(PageItem::Spiral);
m_actionInfo.forAppMode.append(modeNormal);
m_actionInfo.needsNumObjects = 1;
}
 
const QString FlattenPathPlugin::fullTrName() const
{
return QObject::tr("FlattenPath");
}
 
const ScActionPlugin::AboutData* FlattenPathPlugin::getAboutData() const
{
AboutData* about = new AboutData;
Q_CHECK_PTR(about);
about->authors = QString::fromUtf8("Franz Schmid <Franz.Schmid@altmuehlnet.de>");
about->shortDescription = tr("Flattens a Path");
about->description = tr("Converts a Bezier Path to a Path made of line segments.");
// about->version
// about->releaseDate
// about->copyright
about->license = "GPL";
return about;
}
 
void FlattenPathPlugin::deleteAboutData(const AboutData* about) const
{
Q_ASSERT(about);
delete about;
}
 
bool FlattenPathPlugin::run(ScribusDoc* doc, QString)
{
ScribusDoc* currDoc = doc;
if (currDoc == 0)
currDoc = ScCore->primaryMainWindow()->doc;
if (currDoc->m_Selection->count() > 0)
{
PageItem *currItem = currDoc->m_Selection->itemAt(0);
QPainterPath pp;
if (currItem->itemType() == PageItem::PolyLine)
pp = currItem->PoLine.toQPainterPath(false);
else
pp = currItem->PoLine.toQPainterPath(true);
QList<QPolygonF> polyList = pp.toSubpathPolygons();
QPainterPath result;
for (int a = 0; a < polyList.count(); a++)
{
result.addPolygon(polyList[a]);
}
currItem->PoLine.fromQPainterPath(result);
currItem->ClipEdited = true;
currItem->FrameType = 3;
currDoc->AdjustItemSize(currItem);
currItem->OldB2 = currItem->width();
currItem->OldH2 = currItem->height();
currItem->updateClip();
currDoc->regionsChanged()->update(QRectF());
currDoc->changed();
}
return true;
}
/branches/ScribusOIF/scribus/plugins/tools/flattenpath/CMakeLists.txt
0,0 → 1,26
INCLUDE_DIRECTORIES(
${CMAKE_SOURCE_DIR}
${CMAKE_SOURCE_DIR}/scribus
)
 
SET(FLATTENPATH_PLUGIN_MOC_CLASSES
flattenpath.h
)
 
SET(FLATTENPATH_PLUGIN_SOURCES
flattenpath.cpp
)
 
SET(SCRIBUS_FLATTENPATH_PLUGIN "flattenpath")
 
QT4_WRAP_CPP(FLATTENPATH_PLUGIN_MOC_SOURCES ${FLATTENPATH_PLUGIN_MOC_CLASSES})
 
ADD_LIBRARY(${SCRIBUS_FLATTENPATH_PLUGIN} MODULE ${FLATTENPATH_PLUGIN_SOURCES} ${FLATTENPATH_PLUGIN_MOC_SOURCES})
 
TARGET_LINK_LIBRARIES(${SCRIBUS_FLATTENPATH_PLUGIN} ${PLUGIN_LIBRARIES})
 
INSTALL(TARGETS ${SCRIBUS_FLATTENPATH_PLUGIN}
LIBRARY
DESTINATION ${PLUGINDIR}
PERMISSIONS ${PLUGIN_PERMISSIONS}
)
/branches/ScribusOIF/scribus/plugins/tools/CMakeLists.txt
8,6 → 8,8
ADD_SUBDIRECTORY(pathfinder)
ADD_SUBDIRECTORY(pathstroker)
ADD_SUBDIRECTORY(subdivide)
ADD_SUBDIRECTORY(flattenpath)
ADD_SUBDIRECTORY(smoothpath)
if (HAVE_ASPELL)
ADD_SUBDIRECTORY(spellcheck)
endif (HAVE_ASPELL)
/branches/ScribusOIF/scribus/plugins/import/shape/importshape.cpp
447,16 → 447,21
{
if (!((params == "foreground") || (params == "background") || (params == "fg") || (params == "bg") || (params == "none") || (params == "default") || (params == "inverse")))
{
fill.setNamedColor( params );
FillCol = "FromDia"+fill.name();
ScColor tmp;
tmp.fromQColor(fill);
tmp.setSpotColor(false);
tmp.setRegistrationColor(false);
QString fNam = m_Doc->PageColors.tryAddColor(FillCol, tmp);
if (fNam == FillCol)
importedColors.append(FillCol);
FillCol = fNam;
if (params == "nofill")
FillCol = CommonStrings::None;
else
{
fill.setNamedColor( params );
FillCol = "FromDia"+fill.name();
ScColor tmp;
tmp.fromQColor(fill);
tmp.setSpotColor(false);
tmp.setRegistrationColor(false);
QString fNam = m_Doc->PageColors.tryAddColor(FillCol, tmp);
if (fNam == FillCol)
importedColors.append(FillCol);
FillCol = fNam;
}
}
}
else if (command == "stroke")
/branches/ScribusOIF/scribus/KarbonCurveFit.h
26,7 → 26,10
#include <QList>
#include <QPointF>
#include <QPainterPath>
#include <QPolygonF>
 
#include "scribusapi.h"
 
/*
* Fits bezier curve to given list of points.
*
42,7 → 45,8
* @return a path shape representing the fitted curve
*/
 
QPainterPath bezierFit( const QList<QPointF> &points, float error );
QPainterPath SCRIBUS_API bezierFit( const QList<QPointF> &points, float error );
QPainterPath SCRIBUS_API bezierFit( const QPolygonF &points, float error );
 
#endif
 
/branches/ScribusOIF/scribus/canvasgesture_resize.cpp
111,7 → 111,7
void ResizeGesture::drawControls(QPainter* p)
{
QColor drawColor = qApp->palette().color(QPalette::Active, QPalette::Highlight);
QRect localRect = m_canvas->canvasToLocal(m_bounds);
QRect localRect = m_canvas->canvasToLocal(m_bounds.normalized());
p->save();
// p->setPen(QPen(Qt::black, 1, Qt::DashLine, Qt::FlatCap, Qt::MiterJoin));
// p->drawRect(localRect);
132,12 → 132,14
 
if (m_origBounds != m_bounds)
{
QRectF n_bounds = m_bounds.normalized();
QRectF n_origBounds = m_origBounds.normalized();
p->save();
// p->translate(m_bounds.topLeft() - m_origBounds.topLeft());
drawOutline(p, qAbs(m_bounds.width()) / qMax(qAbs(m_origBounds.width()), static_cast<qreal>(1.0)),
qAbs(m_bounds.height()) / qMax(qAbs(m_origBounds.height()), static_cast<qreal>(1.0)),
m_bounds.left() - m_origBounds.left(),
m_bounds.top() - m_origBounds.top());
drawOutline(p, qAbs(n_bounds.width()) / qMax(qAbs(n_origBounds.width()), static_cast<qreal>(1.0)),
qAbs(n_bounds.height()) / qMax(qAbs(n_origBounds.height()), static_cast<qreal>(1.0)),
n_bounds.left() - n_origBounds.left(),
n_bounds.top() - n_origBounds.top());
p->restore();
}
}
/branches/ScribusOIF/scribus/documentchecker.h
25,6 → 25,8
#define DOCUMENTCHECKER_H
 
#include "scribusapi.h"
#include "scribusstructs.h"
 
class ScribusDoc;
 
/*! \brief It create a error/warning list for CheckDocument GUI class.
34,6 → 36,7
class SCRIBUS_API DocumentChecker
{
public:
 
//! Check the passed document for errors, return true on error found
static bool checkDocument(ScribusDoc *currDoc);
};
/branches/ScribusOIF/win32/vc9/xfigimport/xfigimport.vcproj
213,200 → 213,6
Name="VCPostBuildEventTool"
/>
</Configuration>
<Configuration
Name="Debug-arthur|Win32"
OutputDirectory="..\..\..\..\Scribus-builds\Scribus-vc9-$(ConfigurationName)\scribus\plugins"
IntermediateDirectory="..\..\..\..\Scribus-builds\Build-objs-vc9\$(ConfigurationName)\$(TargetName)"
ConfigurationType="2"
InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC70.vsprops;..\Scribus-build.vsprops"
CharacterSet="1"
>
<Tool
Name="VCPreBuildEventTool"
/>
<Tool
Name="uic.exe"
/>
<Tool
Name="VCCustomBuildTool"
/>
<Tool
Name="moc.exe"
/>
<Tool
Name="rcc.exe"
/>
<Tool
Name="lrelease.exe"
/>
<Tool
Name="VCXMLDataGeneratorTool"
/>
<Tool
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories="..;..\..\..\scribus;&quot;$(QT4_DIR)\include\QtCore&quot;;&quot;$(QT4_DIR)\include\QtGui&quot;;&quot;$(QT4_DIR)\include\QtXml&quot;;&quot;$(QT4_DIR)\include&quot;;&quot;$(QT4_DIR)\src\3rdparty\zlib&quot;;&quot;$(LCMS_DIR)\include&quot;;&quot;$(CAIRO_DIR)\include&quot;;&quot;$(FREETYPE_DIR)\include&quot;;&quot;$(LIBJPEG_DIR)\include&quot;;&quot;$(LIBTIFF_DIR)\include&quot;"
PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;QT_LARGEFILE_SUPPORT;QT_EDITION=QT_EDITION_DESKTOP;QT_DLL;QT_GUI_LIB;QT_CORE_LIB;QT_THREAD_SUPPORT;COMPILE_PLUGIN_AS_DLL;DOCDIR=\&quot;doc/\&quot;;ICONDIR=\&quot;icons/\&quot;;SAMPLESDIR=\&quot;samples/\&quot;;SCRIPTSDIR=\&quot;scripts/\&quot;;TEMPLATEDIR=\&quot;templates/\&quot;;LIBDIR=\&quot;libs/\&quot;;PLUGINDIR=\&quot;plugins/\&quot;;AVOID_WIN32_FILEIO"
MinimalRebuild="true"
BasicRuntimeChecks="3"
RuntimeLibrary="3"
RuntimeTypeInfo="true"
UsePrecompiledHeader="0"
WarningLevel="3"
Detect64BitPortabilityProblems="false"
DebugInformationFormat="4"
DisableSpecificWarnings="4190;4251;4267;4996"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
AdditionalDependencies="QtCored4.lib QtGuid4.lib QtXmld4.lib freetypeD.lib libjpeg.a libtiff.lib lcms2_staticd.lib scribus-api.lib"
OutputFile="$(OutDir)\importxfig.dll"
LinkIncremental="2"
AdditionalLibraryDirectories="&quot;$(LCMS_DIR)\lib&quot;;&quot;$(FREETYPE_DIR)\lib&quot;;&quot;$(LIBJPEG_DIR)\lib&quot;;&quot;$(LIBTIFF_DIR)\lib&quot;;&quot;$(QT4_DIR)\lib&quot;;&quot;$(OutDir)\..&quot;"
GenerateDebugInformation="true"
ProgramDatabaseFile="$(OutDir)\importxfig.pdb"
SubSystem="2"
RandomizedBaseAddress="1"
DataExecutionPrevention="0"
ImportLibrary="$(OutDir)\importxfig.lib"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
<Tool
Name="VCManifestTool"
/>
<Tool
Name="VCXDCMakeTool"
/>
<Tool
Name="VCBscMakeTool"
/>
<Tool
Name="VCFxCopTool"
/>
<Tool
Name="VCAppVerifierTool"
/>
<Tool
Name="VCPostBuildEventTool"
/>
</Configuration>
<Configuration
Name="Release-arthur|Win32"
OutputDirectory="..\..\..\..\Scribus-builds\Scribus-vc9-$(ConfigurationName)\scribus\plugins"
IntermediateDirectory="..\..\..\..\Scribus-builds\Build-objs-vc9\$(ConfigurationName)\$(TargetName)"
ConfigurationType="2"
InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC70.vsprops;..\Scribus-build.vsprops"
CharacterSet="1"
>
<Tool
Name="VCPreBuildEventTool"
/>
<Tool
Name="uic.exe"
/>
<Tool
Name="VCCustomBuildTool"
/>
<Tool
Name="moc.exe"
/>
<Tool
Name="rcc.exe"
/>
<Tool
Name="lrelease.exe"
/>
<Tool
Name="VCXMLDataGeneratorTool"
/>
<Tool
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="1"
InlineFunctionExpansion="1"
OmitFramePointers="true"
AdditionalIncludeDirectories="..;..\..\..\scribus;&quot;$(QT4_DIR)\include\QtCore&quot;;&quot;$(QT4_DIR)\include\QtGui&quot;;&quot;$(QT4_DIR)\include\QtXml&quot;;&quot;$(QT4_DIR)\include&quot;;&quot;$(QT4_DIR)\src\3rdparty\zlib&quot;;&quot;$(LCMS_DIR)\include&quot;;&quot;$(CAIRO_DIR)\include&quot;;&quot;$(FREETYPE_DIR)\include&quot;;&quot;$(LIBJPEG_DIR)\include&quot;;&quot;$(LIBTIFF_DIR)\include&quot;"
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;QT_LARGEFILE_SUPPORT;QT_EDITION=QT_EDITION_DESKTOP;QT_DLL;QT_GUI_LIB;QT_CORE_LIB;QT_THREAD_SUPPORT;COMPILE_PLUGIN_AS_DLL;AVOID_WIN32_FILEIO"
StringPooling="true"
RuntimeLibrary="2"
EnableFunctionLevelLinking="true"
RuntimeTypeInfo="true"
UsePrecompiledHeader="0"
WarningLevel="3"
Detect64BitPortabilityProblems="false"
DebugInformationFormat="3"
DisableSpecificWarnings="4190;4251;4267;4996"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
AdditionalDependencies="QtCore4.lib QtGui4.lib QtXml4.lib freetype.lib libjpeg.a libtiff.lib lcms2_static.lib scribus-api.lib"
OutputFile="$(OutDir)\importxfig.dll"
LinkIncremental="1"
AdditionalLibraryDirectories="&quot;$(LCMS_DIR)\lib&quot;;&quot;$(FREETYPE_DIR)\lib&quot;;&quot;$(LIBJPEG_DIR)\lib&quot;;&quot;$(LIBTIFF_DIR)\lib&quot;;&quot;$(QT4_DIR)\lib&quot;;&quot;$(OutDir)\..&quot;"
GenerateDebugInformation="true"
ProgramDatabaseFile="$(OutDir)\importxfig.pdb"
SubSystem="2"
OptimizeReferences="2"
EnableCOMDATFolding="2"
RandomizedBaseAddress="1"
DataExecutionPrevention="0"
ImportLibrary="$(OutDir)\importxfig.lib"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
<Tool
Name="VCManifestTool"
/>
<Tool
Name="VCXDCMakeTool"
/>
<Tool
Name="VCBscMakeTool"
/>
<Tool
Name="VCFxCopTool"
/>
<Tool
Name="VCAppVerifierTool"
/>
<Tool
Name="VCPostBuildEventTool"
/>
</Configuration>
</Configurations>
<References>
</References>
449,20 → 255,6
Name="moc.exe"
/>
</FileConfiguration>
<FileConfiguration
Name="Debug-arthur|Win32"
>
<Tool
Name="moc.exe"
/>
</FileConfiguration>
<FileConfiguration
Name="Release-arthur|Win32"
>
<Tool
Name="moc.exe"
/>
</FileConfiguration>
</File>
<File
RelativePath="..\..\..\scribus\plugins\import\xfig\importxfigplugin.h"
481,20 → 273,6
Name="moc.exe"
/>
</FileConfiguration>
<FileConfiguration
Name="Debug-arthur|Win32"
>
<Tool
Name="moc.exe"
/>
</FileConfiguration>
<FileConfiguration
Name="Release-arthur|Win32"
>
<Tool
Name="moc.exe"
/>
</FileConfiguration>
</File>
</Filter>
<Filter
/branches/ScribusOIF/win32/vc9/smoothpath/smoothpathdll.cpp
0,0 → 1,15
// svgimport-1.3.0.cpp : définit le point d'entrée pour l'application DLL.
//
 
#define WIN32_LEAN_AND_MEAN // Exclure les en-têtes Windows rarement utilisés
// Fichiers d'en-tête Windows :
#include <windows.h>
 
BOOL APIENTRY DllMain( HANDLE hModule,
DWORD ul_reason_for_call,
LPVOID lpReserved
)
{
return TRUE;
}
 
/branches/ScribusOIF/win32/vc9/smoothpath/smoothpath.vcproj
0,0 → 1,276
<?xml version="1.0" encoding="Windows-1252"?>
<VisualStudioProject
ProjectType="Visual C++"
Version="9,00"
Name="smoothpath"
ProjectGUID="{F3471C52-C0FF-4690-B9BF-9A97A6F2BA2F}"
RootNamespace="smoothpath"
Keyword="Win32Proj"
TargetFrameworkVersion="131072"
>
<Platforms>
<Platform
Name="Win32"
/>
</Platforms>
<ToolFiles>
<ToolFile
RelativePath="..\Scribus-build.rules"
/>
</ToolFiles>
<Configurations>
<Configuration
Name="Debug-cairo|Win32"
OutputDirectory="..\..\..\..\Scribus-builds\Scribus-vc9-$(ConfigurationName)\scribus\plugins"
IntermediateDirectory="..\..\..\..\Scribus-builds\build-objs-vc9\$(ConfigurationName)\$(TargetName)"
ConfigurationType="2"
InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC70.vsprops;..\Scribus-build.vsprops"
CharacterSet="1"
>
<Tool
Name="VCPreBuildEventTool"
/>
<Tool
Name="uic.exe"
/>
<Tool
Name="VCCustomBuildTool"
/>
<Tool
Name="moc.exe"
/>
<Tool
Name="rcc.exe"
/>
<Tool
Name="lrelease.exe"
/>
<Tool
Name="VCXMLDataGeneratorTool"
/>
<Tool
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories="..;..\..\..\scribus;&quot;$(QT4_DIR)\include\QtCore&quot;;&quot;$(QT4_DIR)\include\QtGui&quot;;&quot;$(QT4_DIR)\include\QtXml&quot;;&quot;$(QT4_DIR)\include&quot;;&quot;$(QT4_DIR)\src\3rdparty\zlib&quot;;&quot;$(LCMS_DIR)\include&quot;;&quot;$(CAIRO_DIR)\include&quot;;&quot;$(FREETYPE_DIR)\include&quot;;&quot;$(LIBJPEG_DIR)\include&quot;;&quot;$(LIBTIFF_DIR)\include&quot;"
PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;QT_LARGEFILE_SUPPORT;QT_EDITION=QT_EDITION_DESKTOP;QT_DLL;QT_GUI_LIB;QT_CORE_LIB;QT_THREAD_SUPPORT;;HAVE_CAIRO;COMPILE_PLUGIN_AS_DLL;AVOID_WIN32_FILEIO"
MinimalRebuild="true"
BasicRuntimeChecks="3"
RuntimeLibrary="3"
RuntimeTypeInfo="true"
UsePrecompiledHeader="0"
WarningLevel="3"
Detect64BitPortabilityProblems="false"
DebugInformationFormat="3"
DisableSpecificWarnings="4190;4251;4267;4996"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
AdditionalDependencies="QtCored4.lib QtGuid4.lib QtXmld4.lib freetypeD.lib libjpeg.a libtiff.lib lcms2_staticd.lib scribus-api.lib"
OutputFile="$(OutDir)\smoothpath.dll"
LinkIncremental="2"
AdditionalLibraryDirectories="&quot;$(LCMS_DIR)\lib&quot;;&quot;$(FREETYPE_DIR)\lib&quot;;&quot;$(LIBJPEG_DIR)\lib&quot;;&quot;$(LIBTIFF_DIR)\lib&quot;;&quot;$(QT4_DIR)\lib&quot;;&quot;$(OutDir)\..&quot;"
GenerateDebugInformation="true"
ProgramDatabaseFile="$(OutDir)\smoothpath.pdb"
SubSystem="2"
RandomizedBaseAddress="1"
DataExecutionPrevention="0"
ImportLibrary="$(OutDir)\smoothpath.lib"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
<Tool
Name="VCManifestTool"
/>
<Tool
Name="VCXDCMakeTool"
/>
<Tool
Name="VCBscMakeTool"
/>
<Tool
Name="VCFxCopTool"
/>
<Tool
Name="VCAppVerifierTool"
/>
<Tool
Name="VCPostBuildEventTool"
/>
</Configuration>
<Configuration
Name="Release-cairo|Win32"
OutputDirectory="..\..\..\..\Scribus-builds\Scribus-vc9-$(ConfigurationName)\scribus\plugins"
IntermediateDirectory="..\..\..\..\Scribus-builds\build-objs-vc9\$(ConfigurationName)\$(TargetName)"
ConfigurationType="2"
InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC70.vsprops;..\Scribus-build.vsprops"
CharacterSet="1"
>
<Tool
Name="VCPreBuildEventTool"
/>
<Tool
Name="uic.exe"
/>
<Tool
Name="VCCustomBuildTool"
/>
<Tool
Name="moc.exe"
/>
<Tool
Name="rcc.exe"
/>
<Tool
Name="lrelease.exe"
/>
<Tool
Name="VCXMLDataGeneratorTool"
/>
<Tool
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="1"
InlineFunctionExpansion="1"
OmitFramePointers="true"
AdditionalIncludeDirectories="..;..\..\..\scribus;&quot;$(QT4_DIR)\include\QtCore&quot;;&quot;$(QT4_DIR)\include\QtGui&quot;;&quot;$(QT4_DIR)\include\QtXml&quot;;&quot;$(QT4_DIR)\include&quot;;&quot;$(QT4_DIR)\src\3rdparty\zlib&quot;;&quot;$(LCMS_DIR)\include&quot;;&quot;$(CAIRO_DIR)\include&quot;;&quot;$(FREETYPE_DIR)\include&quot;;&quot;$(LIBJPEG_DIR)\include&quot;;&quot;$(LIBTIFF_DIR)\include&quot;"
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;QT_LARGEFILE_SUPPORT;QT_EDITION=QT_EDITION_DESKTOP;QT_DLL;QT_GUI_LIB;QT_CORE_LIB;QT_THREAD_SUPPORT;;HAVE_CAIRO;COMPILE_PLUGIN_AS_DLL;AVOID_WIN32_FILEIO"
StringPooling="true"
RuntimeLibrary="2"
EnableFunctionLevelLinking="true"
RuntimeTypeInfo="true"
UsePrecompiledHeader="0"
WarningLevel="3"
Detect64BitPortabilityProblems="false"
DebugInformationFormat="3"
DisableSpecificWarnings="4190;4251;4267;4996"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
AdditionalDependencies="QtCore4.lib QtGui4.lib QtXml4.lib freetype.lib libjpeg.a libtiff.lib lcms2_static.lib scribus-api.lib"
OutputFile="$(OutDir)\smoothpath.dll"
LinkIncremental="1"
AdditionalLibraryDirectories="&quot;$(LCMS_DIR)\lib&quot;;&quot;$(FREETYPE_DIR)\lib&quot;;&quot;$(LIBJPEG_DIR)\lib&quot;;&quot;$(LIBTIFF_DIR)\lib&quot;;&quot;$(QT4_DIR)\lib&quot;;&quot;$(OutDir)\..&quot;"
GenerateDebugInformation="true"
ProgramDatabaseFile="$(OutDir)\smoothpath.pdb"
SubSystem="2"
OptimizeReferences="2"
EnableCOMDATFolding="2"
RandomizedBaseAddress="1"
DataExecutionPrevention="0"
ImportLibrary="$(OutDir)\smoothpath.lib"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
<Tool
Name="VCManifestTool"
/>
<Tool
Name="VCXDCMakeTool"
/>
<Tool
Name="VCBscMakeTool"
/>
<Tool
Name="VCFxCopTool"
/>
<Tool
Name="VCAppVerifierTool"
/>
<Tool
Name="VCPostBuildEventTool"
/>
</Configuration>
</Configurations>
<References>
</References>
<Files>
<Filter
Name="Source Files"
Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm"
>
<File
RelativePath="..\..\..\scribus\plugins\tools\smoothpath\smoothpath.cpp"
>
</File>
<File
RelativePath=".\smoothpathdll.cpp"
>
</File>
</Filter>
<Filter
Name="Header Files"
Filter="h;hpp;hxx;hm;inl;inc"
>
<File
RelativePath="..\..\..\scribus\plugins\tools\smoothpath\smoothpath.h"
>
<FileConfiguration
Name="Debug-cairo|Win32"
>
<Tool
Name="moc.exe"
/>
</FileConfiguration>
<FileConfiguration
Name="Release-cairo|Win32"
>
<Tool
Name="moc.exe"
/>
</FileConfiguration>
</File>
</Filter>
<Filter
Name="Generated Moc Files"
>
<File
RelativePath="..\..\..\scribus\plugins\tools\smoothpath\moc_smoothpath.cpp"
>
</File>
</Filter>
<Filter
Name="Generated Form Files"
>
</Filter>
<Filter
Name="Form Files"
Filter="ui"
>
</Filter>
</Files>
<Globals>
</Globals>
</VisualStudioProject>
/branches/ScribusOIF/win32/vc9/Scribus.sln
165,14 → 165,14
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pathalongpath", "pathalongpath\pathalongpath.vcproj", "{CAF6D555-0E2E-4ABB-9585-00860B8B183E}"
ProjectSection(ProjectDependencies) = postProject
{B17FCD80-7978-4544-93C4-2FE1AC6FE9F3} = {B17FCD80-7978-4544-93C4-2FE1AC6FE9F3}
{6AC5EDDC-2540-47E0-873E-FE40FB06FBFD} = {6AC5EDDC-2540-47E0-873E-FE40FB06FBFD}
{B17FCD80-7978-4544-93C4-2FE1AC6FE9F3} = {B17FCD80-7978-4544-93C4-2FE1AC6FE9F3}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "meshdistortion", "meshdistortion\meshdistortion.vcproj", "{2B610023-D3A6-4EC3-B7D5-868ED3B9321E}"
ProjectSection(ProjectDependencies) = postProject
{B17FCD80-7978-4544-93C4-2FE1AC6FE9F3} = {B17FCD80-7978-4544-93C4-2FE1AC6FE9F3}
{6AC5EDDC-2540-47E0-873E-FE40FB06FBFD} = {6AC5EDDC-2540-47E0-873E-FE40FB06FBFD}
{B17FCD80-7978-4544-93C4-2FE1AC6FE9F3} = {B17FCD80-7978-4544-93C4-2FE1AC6FE9F3}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pathconnect", "pathconnect\pathconnect.vcproj", "{EDE59DB3-794A-4E3F-942A-98189DF6DCE2}"
256,6 → 256,16
{B17FCD80-7978-4544-93C4-2FE1AC6FE9F3} = {B17FCD80-7978-4544-93C4-2FE1AC6FE9F3}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "flattenpath", "flattenpath\flattenpath.vcproj", "{FC2F57D2-73F5-4ACD-B51B-3ED524F0C826}"
ProjectSection(ProjectDependencies) = postProject
{B17FCD80-7978-4544-93C4-2FE1AC6FE9F3} = {B17FCD80-7978-4544-93C4-2FE1AC6FE9F3}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "smoothpath", "smoothpath\smoothpath.vcproj", "{F3471C52-C0FF-4690-B9BF-9A97A6F2BA2F}"
ProjectSection(ProjectDependencies) = postProject
{B17FCD80-7978-4544-93C4-2FE1AC6FE9F3} = {B17FCD80-7978-4544-93C4-2FE1AC6FE9F3}
EndProjectSection
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug-cairo|Win32 = Debug-cairo|Win32
478,6 → 488,14
{1A8E95AC-29CD-459E-9E5E-09FA64ECC4F6}.Debug-cairo|Win32.Build.0 = Debug-cairo|Win32
{1A8E95AC-29CD-459E-9E5E-09FA64ECC4F6}.Release-cairo|Win32.ActiveCfg = Release-cairo|Win32
{1A8E95AC-29CD-459E-9E5E-09FA64ECC4F6}.Release-cairo|Win32.Build.0 = Release-cairo|Win32
{FC2F57D2-73F5-4ACD-B51B-3ED524F0C826}.Debug-cairo|Win32.ActiveCfg = Debug-cairo|Win32
{FC2F57D2-73F5-4ACD-B51B-3ED524F0C826}.Debug-cairo|Win32.Build.0 = Debug-cairo|Win32
{FC2F57D2-73F5-4ACD-B51B-3ED524F0C826}.Release-cairo|Win32.ActiveCfg = Release-cairo|Win32
{FC2F57D2-73F5-4ACD-B51B-3ED524F0C826}.Release-cairo|Win32.Build.0 = Release-cairo|Win32
{F3471C52-C0FF-4690-B9BF-9A97A6F2BA2F}.Debug-cairo|Win32.ActiveCfg = Debug-cairo|Win32
{F3471C52-C0FF-4690-B9BF-9A97A6F2BA2F}.Debug-cairo|Win32.Build.0 = Debug-cairo|Win32
{F3471C52-C0FF-4690-B9BF-9A97A6F2BA2F}.Release-cairo|Win32.ActiveCfg = Release-cairo|Win32
{F3471C52-C0FF-4690-B9BF-9A97A6F2BA2F}.Release-cairo|Win32.Build.0 = Release-cairo|Win32
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
/branches/ScribusOIF/win32/vc9/flattenpath/flattenpathdll.cpp
0,0 → 1,15
// svgimport-1.3.0.cpp : définit le point d'entrée pour l'application DLL.
//
 
#define WIN32_LEAN_AND_MEAN // Exclure les en-têtes Windows rarement utilisés
// Fichiers d'en-tête Windows :
#include <windows.h>
 
BOOL APIENTRY DllMain( HANDLE hModule,
DWORD ul_reason_for_call,
LPVOID lpReserved
)
{
return TRUE;
}
 
/branches/ScribusOIF/win32/vc9/flattenpath/flattenpath.vcproj
0,0 → 1,276
<?xml version="1.0" encoding="Windows-1252"?>
<VisualStudioProject
ProjectType="Visual C++"
Version="9,00"
Name="flattenpath"
ProjectGUID="{FC2F57D2-73F5-4ACD-B51B-3ED524F0C826}"
RootNamespace="flattenpath"
Keyword="Win32Proj"
TargetFrameworkVersion="131072"
>
<Platforms>
<Platform
Name="Win32"
/>
</Platforms>
<ToolFiles>
<ToolFile
RelativePath="..\Scribus-build.rules"
/>
</ToolFiles>
<Configurations>
<Configuration
Name="Debug-cairo|Win32"
OutputDirectory="..\..\..\..\Scribus-builds\Scribus-vc9-$(ConfigurationName)\scribus\plugins"
IntermediateDirectory="..\..\..\..\Scribus-builds\build-objs-vc9\$(ConfigurationName)\$(TargetName)"
ConfigurationType="2"
InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC70.vsprops;..\Scribus-build.vsprops"
CharacterSet="1"
>
<Tool
Name="VCPreBuildEventTool"
/>
<Tool
Name="uic.exe"
/>
<Tool
Name="VCCustomBuildTool"
/>
<Tool
Name="moc.exe"
/>
<Tool
Name="rcc.exe"
/>
<Tool
Name="lrelease.exe"
/>
<Tool
Name="VCXMLDataGeneratorTool"
/>
<Tool
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories="..;..\..\..\scribus;&quot;$(QT4_DIR)\include\QtCore&quot;;&quot;$(QT4_DIR)\include\QtGui&quot;;&quot;$(QT4_DIR)\include\QtXml&quot;;&quot;$(QT4_DIR)\include&quot;;&quot;$(QT4_DIR)\src\3rdparty\zlib&quot;;&quot;$(LCMS_DIR)\include&quot;;&quot;$(CAIRO_DIR)\include&quot;;&quot;$(FREETYPE_DIR)\include&quot;;&quot;$(LIBJPEG_DIR)\include&quot;;&quot;$(LIBTIFF_DIR)\include&quot;"
PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;QT_LARGEFILE_SUPPORT;QT_EDITION=QT_EDITION_DESKTOP;QT_DLL;QT_GUI_LIB;QT_CORE_LIB;QT_THREAD_SUPPORT;;HAVE_CAIRO;COMPILE_PLUGIN_AS_DLL;AVOID_WIN32_FILEIO"
MinimalRebuild="true"
BasicRuntimeChecks="3"
RuntimeLibrary="3"
RuntimeTypeInfo="true"
UsePrecompiledHeader="0"
WarningLevel="3"
Detect64BitPortabilityProblems="false"
DebugInformationFormat="3"
DisableSpecificWarnings="4190;4251;4267;4996"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
AdditionalDependencies="QtCored4.lib QtGuid4.lib QtXmld4.lib freetypeD.lib libjpeg.a libtiff.lib lcms2_staticd.lib scribus-api.lib"
OutputFile="$(OutDir)\flattenpath.dll"
LinkIncremental="2"
AdditionalLibraryDirectories="&quot;$(LCMS_DIR)\lib&quot;;&quot;$(FREETYPE_DIR)\lib&quot;;&quot;$(LIBJPEG_DIR)\lib&quot;;&quot;$(LIBTIFF_DIR)\lib&quot;;&quot;$(QT4_DIR)\lib&quot;;&quot;$(OutDir)\..&quot;"
GenerateDebugInformation="true"
ProgramDatabaseFile="$(OutDir)\flattenpath.pdb"
SubSystem="2"
RandomizedBaseAddress="1"
DataExecutionPrevention="0"
ImportLibrary="$(OutDir)\flattenpath.lib"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
<Tool
Name="VCManifestTool"
/>
<Tool
Name="VCXDCMakeTool"
/>
<Tool
Name="VCBscMakeTool"
/>
<Tool
Name="VCFxCopTool"
/>
<Tool
Name="VCAppVerifierTool"
/>
<Tool
Name="VCPostBuildEventTool"
/>
</Configuration>
<Configuration
Name="Release-cairo|Win32"
OutputDirectory="..\..\..\..\Scribus-builds\Scribus-vc9-$(ConfigurationName)\scribus\plugins"
IntermediateDirectory="..\..\..\..\Scribus-builds\build-objs-vc9\$(ConfigurationName)\$(TargetName)"
ConfigurationType="2"
InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC70.vsprops;..\Scribus-build.vsprops"
CharacterSet="1"
>
<Tool
Name="VCPreBuildEventTool"
/>
<Tool
Name="uic.exe"
/>
<Tool
Name="VCCustomBuildTool"
/>
<Tool
Name="moc.exe"
/>
<Tool
Name="rcc.exe"
/>
<Tool
Name="lrelease.exe"
/>
<Tool
Name="VCXMLDataGeneratorTool"
/>
<Tool
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="1"
InlineFunctionExpansion="1"
OmitFramePointers="true"
AdditionalIncludeDirectories="..;..\..\..\scribus;&quot;$(QT4_DIR)\include\QtCore&quot;;&quot;$(QT4_DIR)\include\QtGui&quot;;&quot;$(QT4_DIR)\include\QtXml&quot;;&quot;$(QT4_DIR)\include&quot;;&quot;$(QT4_DIR)\src\3rdparty\zlib&quot;;&quot;$(LCMS_DIR)\include&quot;;&quot;$(CAIRO_DIR)\include&quot;;&quot;$(FREETYPE_DIR)\include&quot;;&quot;$(LIBJPEG_DIR)\include&quot;;&quot;$(LIBTIFF_DIR)\include&quot;"
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;QT_LARGEFILE_SUPPORT;QT_EDITION=QT_EDITION_DESKTOP;QT_DLL;QT_GUI_LIB;QT_CORE_LIB;QT_THREAD_SUPPORT;;HAVE_CAIRO;COMPILE_PLUGIN_AS_DLL;AVOID_WIN32_FILEIO"
StringPooling="true"
RuntimeLibrary="2"
EnableFunctionLevelLinking="true"
RuntimeTypeInfo="true"
UsePrecompiledHeader="0"
WarningLevel="3"
Detect64BitPortabilityProblems="false"
DebugInformationFormat="3"
DisableSpecificWarnings="4190;4251;4267;4996"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
AdditionalDependencies="QtCore4.lib QtGui4.lib QtXml4.lib freetype.lib libjpeg.a libtiff.lib lcms2_static.lib scribus-api.lib"
OutputFile="$(OutDir)\flattenpath.dll"
LinkIncremental="1"
AdditionalLibraryDirectories="&quot;$(LCMS_DIR)\lib&quot;;&quot;$(FREETYPE_DIR)\lib&quot;;&quot;$(LIBJPEG_DIR)\lib&quot;;&quot;$(LIBTIFF_DIR)\lib&quot;;&quot;$(QT4_DIR)\lib&quot;;&quot;$(OutDir)\..&quot;"
GenerateDebugInformation="true"
ProgramDatabaseFile="$(OutDir)\flattenpath.pdb"
SubSystem="2"
OptimizeReferences="2"
EnableCOMDATFolding="2"
RandomizedBaseAddress="1"
DataExecutionPrevention="0"
ImportLibrary="$(OutDir)\flattenpath.lib"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
<Tool
Name="VCManifestTool"
/>
<Tool
Name="VCXDCMakeTool"
/>
<Tool
Name="VCBscMakeTool"
/>
<Tool
Name="VCFxCopTool"
/>
<Tool
Name="VCAppVerifierTool"
/>
<Tool
Name="VCPostBuildEventTool"
/>
</Configuration>
</Configurations>
<References>
</References>
<Files>
<Filter
Name="Source Files"
Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm"
>
<File
RelativePath="..\..\..\scribus\plugins\tools\flattenpath\flattenpath.cpp"
>
</File>
<File
RelativePath=".\flattenpathdll.cpp"
>
</File>
</Filter>
<Filter
Name="Header Files"
Filter="h;hpp;hxx;hm;inl;inc"
>
<File
RelativePath="..\..\..\scribus\plugins\tools\flattenpath\flattenpath.h"
>
<FileConfiguration
Name="Debug-cairo|Win32"
>
<Tool
Name="moc.exe"
/>
</FileConfiguration>
<FileConfiguration
Name="Release-cairo|Win32"
>
<Tool
Name="moc.exe"
/>
</FileConfiguration>
</File>
</Filter>
<Filter
Name="Generated Moc Files"
>
<File
RelativePath="..\..\..\scribus\plugins\tools\flattenpath\moc_flattenpath.cpp"
>
</File>
</Filter>
<Filter
Name="Generated Form Files"
>
</Filter>
<Filter
Name="Form Files"
Filter="ui"
>
</Filter>
</Files>
<Globals>
</Globals>
</VisualStudioProject>