Subversion Repositories Scribus

Compare Revisions

Ignore whitespace Rev 13948 → Rev 13945

/branches/Version135/Scribus/scribus/pdflib_core.cpp
6671,7 → 6671,6
ImInfo.reso = Options.Resolution / 72.0;
ImInfo.Width = 0;
ImInfo.Height = 0;
ImInfo.Page = 0;
ImInfo.xa = x;
ImInfo.ya = y;
ImInfo.origXsc = c->imageXScale();
6686,8 → 6685,7
|| (c->asLatexFrame())
|| (c->effectsInUse.count() != 0)
|| ((ImInfo2.origXsc != ImInfo.origXsc) || (ImInfo2.origYsc != ImInfo.origYsc))
|| (ImInfo2.RequestProps != c->pixm.imgInfo.RequestProps)
|| (ImInfo2.Page != c->pixm.imgInfo.actualPageNumber))
|| (ImInfo2.RequestProps != c->pixm.imgInfo.RequestProps))
{
bool imageLoaded = false;
if ((extensionIndicatesPDF(ext) || ((extensionIndicatesEPSorPS(ext)) && (c->pixm.imgInfo.type != ImageType7))) && c->effectsInUse.count() == 0)
6715,7 → 6713,6
else
imageLoaded = PDF_EmbeddedPDF(c, fn, sx, sy, x, y, fromAN, Profil, Embedded, Intent, ImInfo, output);
isEmbeddedPDF = true;
ImInfo.Page = c->pixm.imgInfo.actualPageNumber;
}
if(!imageLoaded && extensionIndicatesPDF(ext) && c->effectsInUse.count() == 0 && Options.embedPDF)
qDebug() << "Failed to embed the PDF file";
/branches/Version135/Scribus/scribus/pdflib_core.h
68,7 → 68,6
int ResNum;
int Width;
int Height;
int Page;
double reso;
double sxa;
double sya;
/branches/Version135/Scribus/scribus/propertiespalette.cpp
2089,10 → 2089,7
}
if (CurItem->asImageFrame())
{
disconnect(imagePageNumber, SIGNAL(valueChanged(int)), this, SLOT(NewPage()));
imagePageNumber->setMaximum(CurItem->pixm.imgInfo.numberOfPages);
imagePageNumber->setValue(CurItem->pixm.imgInfo.actualPageNumber);
connect(imagePageNumber, SIGNAL(valueChanged(int)), this, SLOT(NewPage()));
}
Revert->setChecked(CurItem->reversed());
setTextFlowMode(CurItem->textFlowMode());
/branches/Version135/Scribus/scribus/pageitem.h
404,7 → 404,6
QString Pfile3;
QString externalFile() const { return Pfile; }
void setExternalFile(QString val);
void setImagePagenumber(int num) { pixm.imgInfo.actualPageNumber = num; }
//FIXME: maybe these should go into annotation?
QString fileIconPressed() const { return Pfile2; }
/branches/Version135/Scribus/scribus/pageitem_desaxe.cpp
126,7 → 126,6
result.insert("image-embedded-profile", item->embeddedImageProfile());
result.insert("image-flipped-hor", toXMLString(item->imageFlippedH()));
result.insert("image-flipped-vert", toXMLString(item->imageFlippedV()));
result.insert("pagenumber", toXMLString(item->pixm.imgInfo.actualPageNumber));
result.insert("cms-profile", item->cmsProfile());
result.insert("cms-intent", toXMLString(item->cmsRenderingIntent()));
628,7 → 627,6
ruleset.addRule(itemPrefix, SetAttributeWithConversion<PageItem,double>( & PageItem::setImageYScale, "image-y-scale", &parseDouble ));
ruleset.addRule(itemPrefix, SetAttributeWithConversion<PageItem,double>( & PageItem::setImageXOffset, "image-x-position", &parseDouble ));
ruleset.addRule(itemPrefix, SetAttributeWithConversion<PageItem,double>( & PageItem::setImageYOffset, "image-y-position", &parseDouble ));
ruleset.addRule(itemPrefix, SetAttributeWithConversion<PageItem,int>( & PageItem::setImagePagenumber, "pagenumber", &parseInt ));
// ruleset.addRule(itemPrefix, SetAttributeWithConversion<PageItem,double>("image-x-dpi", &parseDouble )); //NYI
// ruleset.addRule(itemPrefix, SetAttributeWithConversion<PageItem,double>("image-y-dpi", &parseDouble )); //NYI
ruleset.addRule(itemPrefix, SetAttributeWithConversion<PageItem,bool>( & PageItem::setImageShown, "image-shown", &parseBool ));