Subversion Repositories Scribus

Compare Revisions

Regard whitespace Rev 2596 → Rev 2597

/branches/Version13x/Scribus/scribus/about.cpp
51,7 → 51,7
tabLayout1->addWidget( pixmapLabel1 );
buildID = new QLabel( tab, "BB" );
buildID->setAlignment(Qt::AlignCenter);
QString bu = tr("%1 %2 %3 ").arg("27").arg("June").arg("2005");
QString bu = tr("%1 %2 %3 ").arg("28").arg("June").arg("2005");
#ifdef HAVE_CMS
bu += "C";
#else
/branches/Version13x/Scribus/scribus/scribus.cpp
4554,6 → 4554,7
}
view->unitChange();
ScApp->ScriptRunning = false;
view->Deselect(true);
mainWindowStatusLabel->setText("");
mainWindowProgressBar->reset();
#ifdef HAVE_CMS
/branches/Version13x/Scribus/scribus/plugins/svgimplugin/svgplugin.cpp
100,7 → 100,6
QString fileName;
if (plug->pluginManager->dllInput != "")
fileName = plug->pluginManager->dllInput;
 
else
{
PrefsContext* prefs = prefsFile->getPluginContext("SVGPlugin");
189,11 → 188,11
{
bool ret = false;
SvgStyle *gc = new SvgStyle;
Conversion = 0.8;
Conversion = 1.0; // 0.8;
QDomElement docElem = inpdoc.documentElement();
double width = !docElem.attribute("width").isEmpty() ? parseUnit(docElem.attribute( "width" )) : 550.0;
double height = !docElem.attribute("height").isEmpty() ? parseUnit(docElem.attribute( "height" )) : 841.0;
Conversion = 0.8;
Conversion = 0.8; // 0.8;
if (Prog->pluginManager->dllInput != "")
{
Prog->doc->setPage(width, height, 0, 0, 0, 0, 0, 0, false, false);
238,8 → 237,8
QStringList points = QStringList::split( ' ', viewbox.replace( QRegExp(","), " ").simplifyWhiteSpace() );
viewTransformX = points[0].toDouble();
viewTransformY = points[1].toDouble();
viewScaleX = width / (points[2].toDouble() * 0.8);
viewScaleY = height / (points[3].toDouble() * 0.8);
viewScaleX = width / points[2].toDouble();
viewScaleY = height / points[3].toDouble();
haveViewBox = true;
}
parseGroup( docElem );
494,7 → 493,7
{
x = (*(it++)).toDouble();
y = (*it).toDouble();
svgMoveTo(x, y);
svgMoveTo(x * Conversion, y * Conversion);
bFirst = false;
WasM = true;
}
502,7 → 501,7
{
x = (*(it++)).toDouble();
y = (*it).toDouble();
svgLineTo(&ite->PoLine, x, y);
svgLineTo(&ite->PoLine, x * Conversion, y * Conversion);
}
}
if( STag == "polygon" )
722,8 → 721,7
*/
QWMatrix SVGPlug::parseTransform( const QString &transform )
{
QWMatrix result;
 
QWMatrix ret;
// Split string for handling 1 transform statement at a time
QStringList subtransforms = QStringList::split(')', transform);
QStringList::ConstIterator it = subtransforms.begin();
730,16 → 728,14
QStringList::ConstIterator end = subtransforms.end();
for(; it != end; ++it)
{
QWMatrix result;
QStringList subtransform = QStringList::split('(', (*it));
 
subtransform[0] = subtransform[0].stripWhiteSpace().lower();
subtransform[1] = subtransform[1].simplifyWhiteSpace();
QRegExp reg("[,( ]");
QStringList params = QStringList::split(reg, subtransform[1]);
 
if(subtransform[0].startsWith(";") || subtransform[0].startsWith(","))
subtransform[0] = subtransform[0].right(subtransform[0].length() - 1);
 
if(subtransform[0] == "rotate")
{
if(params.count() == 3)
746,7 → 742,6
{
double x = params[1].toDouble() * Conversion;
double y = params[2].toDouble() * Conversion;
 
result.translate(x, y);
result.rotate(params[0].toDouble());
result.translate(-x, -y);
777,16 → 772,13
if(params.count() >= 6)
{
double sx = params[0].toDouble();
if (sx == 0)
sx = 1.0;
double sy = params[3].toDouble();
if (sy == 0)
sy = 1.0;
result.setMatrix(sx, params[1].toDouble(), params[2].toDouble(), sy, params[4].toDouble() * Conversion, params[5].toDouble() * Conversion);
}
}
ret = ret * result;
}
return result;
return ret;
}
 
/*!