Subversion Repositories Scribus

Compare Revisions

Ignore whitespace Rev 1860 → Rev 1861

/branches/Version13x/Scribus/scribus/druck.cpp
36,7 → 36,7
extern QPixmap loadIcon(QString nam);
extern PrefsFile* prefsFile;
 
AdvOptions::AdvOptions(QWidget* parent, bool Hm, bool Vm, bool Ic, int ps, bool DoGcr) : QDialog( parent, "prin", true, 0 )
AdvOptions::AdvOptions(QWidget* parent, bool Hm, bool Vm, bool Ic, int ps, bool DoGcr, bool doDev) : QDialog( parent, "prin", true, 0 )
{
setCaption( tr( "Advanced Options" ) );
setIcon(loadIcon("AppIcon.png"));
52,6 → 52,9
GcR = new QCheckBox( tr("Apply Under Color &Removal"), this, "GCR");
GcR->setChecked(DoGcr);
AdvOptionsLayout->addWidget( GcR );
devPar = new QCheckBox( tr("Set Media Size"), this, "devPar");
devPar->setChecked(doDev);
AdvOptionsLayout->addWidget( devPar );
#ifdef HAVE_CMS
if (CMSuse)
{
358,6 → 361,7
MirrorV = prefs->getBool("MirrorV", false);
ICCinUse = prefs->getBool("ICCinUse", false);
DoGCR = prefs->getBool("DoGCR", gcr);
doDev = prefs->getBool("doDev", false);
PSLevel = prefs->getInt("PSLevel", 3);
AdvOptButton = new QPushButton( tr("Ad&vanced Options..."), ButtonGroup3_2, "Adv");
ButtonGroup3_2Layout->addWidget( AdvOptButton );
430,12 → 434,13
 
void Druck::SetAdvOptions()
{
AdvOptions* dia = new AdvOptions(this, MirrorH, MirrorV, ICCinUse, PSLevel, DoGCR);
AdvOptions* dia = new AdvOptions(this, MirrorH, MirrorV, ICCinUse, PSLevel, DoGCR, doDev);
if (dia->exec())
{
MirrorH = dia->MirrorH->isChecked();
MirrorV = dia->MirrorV->isChecked();
DoGCR = dia->GcR->isChecked();
doDev = dia->devPar->isChecked();
#ifdef HAVE_CMS
if (CMSuse)
{
/branches/Version13x/Scribus/scribus/about.cpp
49,7 → 49,7
tabLayout1->addWidget( pixmapLabel1 );
buildID = new QLabel( tab, "BB" );
buildID->setAlignment(Qt::AlignCenter);
QString bu = tr("%1 %2 %3 ").arg("8").arg("April").arg("2005");
QString bu = tr("%1 %2 %3 ").arg("9").arg("April").arg("2005");
#ifdef HAVE_CMS
bu += "C";
#else
/branches/Version13x/Scribus/scribus/druck.h
29,12 → 29,13
Q_OBJECT
 
public:
AdvOptions(QWidget* parent, bool Hm, bool Vm, bool Ic, int ps, bool DoGcr);
AdvOptions(QWidget* parent, bool Hm, bool Vm, bool Ic, int ps, bool DoGcr, bool doDev);
~AdvOptions() {};
QCheckBox* MirrorH;
QCheckBox* MirrorV;
QCheckBox* UseICC;
QCheckBox* GcR;
QCheckBox* devPar;
QButtonGroup* ButtonGroupP;
QRadioButton* PS3;
QRadioButton* PS2;
73,6 → 74,7
bool MirrorV;
bool ICCinUse;
bool DoGCR;
bool doDev;
int PSLevel;
 
public slots:
/branches/Version13x/Scribus/scribus/scribusstructs.h
527,6 → 527,7
bool mirrorV;
bool useICC;
bool doGCR;
bool setDevParam;
int copies;
std::vector<int> pageNumbers;
QString printerOptions;
/branches/Version13x/Scribus/scribus/pageitem.cpp
950,13 → 950,13
wide = RealCWidth(Doc, hl->cfont, chx2, chsd);
desc2 = 0;
desc = 0;
asce = qRound(hl->cfont->numAscent * (chs / 10.0));
asce = qRound(hl->cfont->numAscent * (hl->csize / 10.0));
}
else
{
desc2 = -hl->cfont->numDescender * (chs / 10.0);
desc = qRound(-hl->cfont->numDescender * (chs / 10.0));
asce = qRound(hl->cfont->numAscent * (chs / 10.0));
desc2 = -hl->cfont->numDescender * (hl->csize / 10.0);
desc = qRound(-hl->cfont->numDescender * (hl->csize / 10.0));
asce = qRound(hl->cfont->numAscent * (hl->csize / 10.0));
}
wide = wide * (hl->cscale / 100.0);
fBorder = false;
/branches/Version13x/Scribus/scribus/libpostscript/pslib.h
38,7 → 38,7
virtual ~PSLib() {};
virtual bool PS_set_file(QString fn);
virtual void PS_set_Info(QString art, QString was);
virtual void PS_begin_doc(int Ori, double x, double y, double breite, double hoehe, int numpage);
virtual void PS_begin_doc(int Ori, double x, double y, double breite, double hoehe, int numpage, bool doDev);
virtual void PS_begin_page(double breite, double hoehe, struct MarginStruct* Ma, bool Clipping);
virtual void PS_end_page();
virtual void PS_curve(double x1, double y1, double x2, double y2, double x3, double y3);
78,7 → 78,7
virtual void PS_TemplateEnd();
virtual void PS_UseTemplate(QString Name);
virtual void PS_ImageData(PageItem *c, bool inver, QString fn, QString Name, QString Prof, bool UseEmbedded, bool UseProf);
virtual void CreatePS(ScribusDoc* Doc, ScribusView* view, std::vector<int> &pageNs, bool sep, QString SepNam, bool farb, bool Hm, bool Vm, bool Ic, bool gcr);
virtual void CreatePS(ScribusDoc* Doc, ScribusView* view, std::vector<int> &pageNs, bool sep, QString SepNam, bool farb, bool Hm, bool Vm, bool Ic, bool gcr, bool doDev);
virtual void ProcessItem(ScribusDoc* Doc, Page* a, PageItem* c, uint PNr, bool sep, bool farb, bool ic, bool gcr, bool master);
virtual void ProcessPage(ScribusDoc* Doc, ScribusView* view, Page* a, uint PNr, bool sep = false, bool farb = true, bool ic = false, bool gcr = true);
virtual void SetClipPath(FPointArray *c, bool poly = true);
/branches/Version13x/Scribus/scribus/libpostscript/pslib.cpp
265,7 → 265,7
return Spool.open(IO_WriteOnly);
}
 
void PSLib::PS_begin_doc(int, double x, double y, double breite, double hoehe, int numpage)
void PSLib::PS_begin_doc(int, double x, double y, double breite, double hoehe, int numpage, bool doDev)
{
PutDoc(Header);
PutDoc("%%For: " + User + "\n");
292,13 → 292,12
PutDoc(Fonts);
if (GraySc)
PutDoc(GrayCalc);
PutDoc("%%EndSetup\n");
/* if ((Art) && (Ori != 0))
if ((Art) && (doDev))
{
PutSeite("<< /PageSize [ "+ToStr(breite)+" "+ToStr(hoehe)+" ]\n");
PutSeite("/Orientation 3\n");
PutSeite(">> setpagedevice\n");
} */
}
PutDoc("%%EndSetup\n");
Prolog = "";
FontDesc = "";
}
950,7 → 949,7
PutDoc(i);
}
 
void PSLib::CreatePS(ScribusDoc* Doc, ScribusView* view, std::vector<int> &pageNs, bool sep, QString SepNam, bool farb, bool Hm, bool Vm, bool Ic, bool gcr)
void PSLib::CreatePS(ScribusDoc* Doc, ScribusView* view, std::vector<int> &pageNs, bool sep, QString SepNam, bool farb, bool Hm, bool Vm, bool Ic, bool gcr, bool doDev)
{
uint a;
int sepac;
969,10 → 968,10
int pgNum = pageNs[0];
gx -= Doc->Pages.at(pgNum)->Xoffset;
gy -= Doc->Pages.at(pgNum)->Yoffset;
PS_begin_doc(Doc->PageOri, gx, Doc->PageH - (gy+gh), gx + gw, Doc->PageH - gy, 1);
PS_begin_doc(Doc->PageOri, gx, Doc->PageH - (gy+gh), gx + gw, Doc->PageH - gy, 1, false);
}
else
PS_begin_doc(Doc->PageOri, 0.0, 0.0, Doc->PageB, Doc->PageH, pageNs.size());
PS_begin_doc(Doc->PageOri, 0.0, 0.0, Doc->PageB, Doc->PageH, pageNs.size(), doDev);
for (uint ap = 0; ap < Doc->MasterPages.count(); ++ap)
{
if (Doc->MasterItems.count() != 0)
/branches/Version13x/Scribus/scribus/scribus.cpp
5450,6 → 5450,7
options.useICC = printer->ICCinUse;
options.doGCR = printer->DoGCR;
options.PSLevel = printer->PSLevel;
options.setDevParam = printer->doDev;
PDef.Pname = options.printer;
PDef.Dname = options.filename;
if (printer->OtherCom->isChecked())
5511,7 → 5512,7
// Write the PS to a file
CMYKColor::UseProf = options->useICC;
dd->CreatePS(doc, view, options->pageNumbers, options->outputSeparations, options->separationName,
options->useColor, options->mirrorH, options->mirrorV, options->useICC, options->doGCR);
options->useColor, options->mirrorH, options->mirrorV, options->useICC, options->doGCR, options->setDevParam);
CMYKColor::UseProf = true;
if (options->PSLevel != 3)
{
8533,7 → 8534,7
if (dd != NULL)
{
if (dd->PS_set_file(fn))
dd->CreatePS(doc, view, pageNs, false, tr("All"), true, false, false, true, Prefs.GCRMode);
dd->CreatePS(doc, view, pageNs, false, tr("All"), true, false, false, true, Prefs.GCRMode, false);
else
return_value = false;
delete dd;
/branches/Version13x/Scribus/scribus/plugins/scriptplugin/objprinter.cpp
453,7 → 453,7
PSfile = dd->PS_set_file(fna);
if (PSfile)
{
dd->CreatePS(Carrier->doc, Carrier->view, pageNs, sep, SepName, color, mirrorH, mirrorV, useICC, DoGCR);
dd->CreatePS(Carrier->doc, Carrier->view, pageNs, sep, SepName, color, mirrorH, mirrorV, useICC, DoGCR, false);
if (PSLevel != 3)
{
QString tmp;
/branches/Version13x/Scribus/scribus/plugins/printpreview/preview.cpp
426,7 → 426,7
dd->PS_set_file(app->PrefsPfad+"/tmp.ps");
std::vector<int> pageNs;
pageNs.push_back(Seite+1);
dd->CreatePS(app->doc, app->view, pageNs, false, tr("All"), true, false, false, false, EnableGCR->isChecked());
dd->CreatePS(app->doc, app->view, pageNs, false, tr("All"), true, false, false, false, EnableGCR->isChecked(), false);
delete dd;
app->closePSDriver();
}