Subversion Repositories Scribus

Compare Revisions

Ignore whitespace Rev 1185 → Rev 1186

/branches/Version13x/Scribus/scribus/util.cpp
282,31 → 282,19
int callGS(const QStringList & args_in)
{
QStringList args;
 
/* these parameters are always the same */
args.append(ScApp->Prefs.gs_exe);
args.append("-q");
args.append("-dNOPAUSE");
QString cmd1 = ScApp->Prefs.gs_exe;
cmd1 += " -q -dNOPAUSE";
if (ScApp->HavePngAlpha != 0)
args.append("-sDEVICE=png16m");
cmd1 += " -sDEVICE=png16m";
else
args.append("-sDEVICE=pngalpha");
cmd1 += " -sDEVICE=pngalpha";
if (ScApp->Prefs.gs_antiText)
args.append("-dTextAlphaBits=4");
cmd1 += " -dTextAlphaBits=4";
if (ScApp->Prefs.gs_antiGraph)
args.append("-dGraphicsAlphaBits=4");
/* insert specific arguments */
QStringList p;
p = args_in;
args += args_in;
/* insert last unspecific arguments */
args.append("-c");
args.append("showpage");
args.append("-c");
args.append("quit");
return System(args);
cmd1 += " -dGraphicsAlphaBits=4";
QString extArgs = args_in.join(" ");
cmd1 += " " + extArgs + " -c showpage -c quit";
return system(cmd1);
}
 
int copyFile(QString source, QString target)
/branches/Version13x/Scribus/scribus/scribusview.cpp
7823,7 → 7823,28
b->pixm = QImage();
b->pixmOrg = QImage();
if (b->PType == 2)
{
b->LocalScX = 1;
b->LocalScY = 1;
b->LocalViewX = 1;
b->LocalViewY = 1;
b->OrigW = 0;
b->OrigH = 0;
b->dpiX = 72.0;
b->dpiY = 72.0;
b->LocalX = 0;
b->LocalY = 0;
b->flippedH = 0;
b->flippedV = 0;
b->textAlignment = 0;
b->EmProfile = "";
b->ScaleType = true;
b->AspectRatio = true;
b->Transparency = 0.0;
b->TranspStroke = 0.0;
b->InvPict = false;
emit UpdtObj(Doc->currentPage->PageNr, b->ItemNr);
}
updateContents();
emit DocChanged();
}
/branches/Version13x/Scribus/scribus/libabout/about.cpp
65,7 → 65,7
tabLayout1->addWidget( pixmapLabel1 );
buildID = new QLabel( tab, "BB" );
buildID->setAlignment(Qt::AlignCenter);
QString bu = tr("%1. %2 %3 ").arg("13").arg("January").arg("2005");
QString bu = tr("%1. %2 %3 ").arg("15").arg("January").arg("2005");
#ifdef HAVE_CMS
bu += "C";
#else