Subversion Repositories Scribus

Compare Revisions

Ignore whitespace Rev 2571 → Rev 2572

/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("26").arg("June").arg("2005");
QString bu = tr("%1 %2 %3 ").arg("27").arg("June").arg("2005");
#ifdef HAVE_CMS
bu += "C";
#else
/branches/Version13x/Scribus/scribus/scribus.cpp
998,7 → 998,7
QString extraPath = tsx.read();
fontPrefsFile12.close();
QStringList extraFonts = QStringList::split("\n",extraPath);
for (int i = 0; i < extraFonts.count(); ++i)
for (uint i = 0; i < extraFonts.count(); ++i)
fontPrefs->set(i, 0, extraFonts[i]);
}
}
/branches/Version13x/Scribus/scribus/libpdf/pdflib.cpp
1003,7 → 1003,7
continue;
PutPage("q\n");
if (((ite->fillTransparency() != 0) || (ite->lineTransparency() != 0)) && (Options->Version >= 14))
PDF_Transparenz(ite);
PutPage(PDF_Transparenz(ite));
if ((ite->isBookmark) && (Options->Bookmarks))
PDF_Bookmark(ite->BMnr, pag->Height - (ite->Ypos - pag->Yoffset));
if (!ite->printable() || ((ite->itemType() == PageItem::TextFrame) && (pag->PageNam != "")))
1621,7 → 1621,7
{
PutPage("q\n");
if (((ite->fillTransparency() != 0) || (ite->lineTransparency() != 0)) && (Options->Version >= 14))
PDF_Transparenz(ite);
PutPage(PDF_Transparenz(ite));
if (ite->fillColor() != "None")
PutPage(putColor(ite->fillColor(), ite->fillShade(), true));
if (ite->lineColor() != "None")
1743,7 → 1743,7
continue;
PutPage("q\n");
if (((ite->fillTransparency() != 0) || (ite->lineTransparency() != 0)) && (Options->Version >= 14))
PDF_Transparenz(ite);
PutPage(PDF_Transparenz(ite));
if (ite->fillColor() != "None")
PutPage(putColor(ite->fillColor(), ite->fillShade(), true));
if (ite->lineColor() != "None")
1890,7 → 1890,7
continue;
PutPage("q\n");
if (((ite->fillTransparency() != 0) || (ite->lineTransparency() != 0)) && (Options->Version >= 14))
PDF_Transparenz(ite);
PutPage(PDF_Transparenz(ite));
if (!ite->printable())
{
PutPage("Q\n");
2021,7 → 2021,7
return tmp;
tmp += "q\n";
if (((ite->fillTransparency() != 0) || (ite->lineTransparency() != 0)) && (Options->Version >= 14))
PDF_Transparenz(ite);
tmp += PDF_Transparenz(ite);
if ((ite->isBookmark) && (Options->Bookmarks))
PDF_Bookmark(ite->BMnr, pag->Height - (ite->Ypos - pag->Yoffset));
if (!ite->printable() || ((ite->itemType() == PageItem::TextFrame) && (pag->PageNam != "")))
2036,7 → 2036,7
tmp += FToStr(fabs(ite->Pwidth))+" w\n";
if (ite->DashValues.count() != 0)
{
PutPage("[ ");
tmp += "[ ";
QValueList<double>::iterator it;
for ( it = ite->DashValues.begin(); it != ite->DashValues.end(); ++it )
{
2400,7 → 2400,7
PutDoc("/ca "+FToStr(1.0 - ite->lineTransparency())+"\n");
PutDoc("/SMask /None\n/AIS false\n/OPM 1\n");
PutDoc("/BM /Normal\n>>\nendobj\n");
PutPage("/"+ShName+" gs\n");
tmp += "/"+ShName+" gs\n";
}
tmp += putColor(ite->lineColor(), ite->lineShade(), false);
tmp += SetClipPathArray(&arrow);
3210,7 → 3210,7
return tmp;
}
 
void PDFlib::PDF_Transparenz(PageItem *currItem)
QString PDFlib::PDF_Transparenz(PageItem *currItem)
{
StartObj(ObjCounter);
QString ShName = ResNam+IToStr(ResCount);
3222,7 → 3222,7
PutDoc("/ca "+FToStr(1.0 - currItem->fillTransparency())+"\n");
PutDoc("/SMask /None\n/AIS false\n/OPM 1\n");
PutDoc("/BM /Normal\n>>\nendobj\n");
PutPage("/"+ShName+" gs\n");
return "/"+ShName+" gs\n";
}
 
QString PDFlib::PDF_Gradient(PageItem *currItem)
/branches/Version13x/Scribus/scribus/libpdf/pdflib.h
81,7 → 81,7
void PDF_Bookmark(int nr, double ypos);
QString PDF_Gradient(PageItem *currItem);
QString PDF_DoLinGradient(PageItem *currItem, QValueList<double> Stops, QValueList<double> Trans, QStringList Colors);
void PDF_Transparenz(PageItem *currItem);
QString PDF_Transparenz(PageItem *currItem);
void PDF_Annotation(PageItem *ite, uint PNr);
void PDF_Form(QString im);
void PDF_xForm(double w, double h, QString im);