Subversion Repositories Scribus

Compare Revisions

Regard whitespace Rev 4580 → Rev 4581

/branches/Version13x/Scribus/scribus/scribusstructs.h
150,6 → 150,9
double LocalScY;
double LocalX;
double LocalY;
QString inputProfile;
bool useEmbedded;
int renderingIntent;
};
 
/** Pagemargins */
/branches/Version13x/Scribus/scribus/scribus.cpp
8764,6 → 8764,9
contentsBuffer.LocalScY=imageItem->imageYScale();
contentsBuffer.LocalX=imageItem->imageXOffset();
contentsBuffer.LocalY=imageItem->imageYOffset();
contentsBuffer.inputProfile=imageItem->IProfile;
contentsBuffer.useEmbedded=imageItem->UseEmbedded;
contentsBuffer.renderingIntent=imageItem->IRender;
}
}
}
8774,7 → 8777,7
PageItem *currItem=NULL;
if (HaveDoc && !contentsBuffer.contentsFileName.isEmpty() && (currItem=doc->selection->itemAt(0))!=NULL)
{
if (currItem->itemType()==PageItem::ImageFrame)
if (contentsBuffer.sourceType==PageItem::ImageFrame && currItem->itemType()==PageItem::ImageFrame)
{
PageItem_ImageFrame* imageItem=currItem->asImageFrame();
int t=QMessageBox::Yes;
8794,6 → 8797,9
imageItem->AdjustPictScale();
imageItem->setImageXYScale(contentsBuffer.LocalScX, contentsBuffer.LocalScY);
imageItem->setImageXYOffset(contentsBuffer.LocalX, contentsBuffer.LocalY);
imageItem->IProfile=contentsBuffer.inputProfile;
imageItem->UseEmbedded=contentsBuffer.useEmbedded;
imageItem->IRender=contentsBuffer.renderingIntent;
qApp->eventLoop()->processEvents(QEventLoop::ExcludeUserInput);
qApp->restoreOverrideCursor();
view->DrawNew();