Subversion Repositories Scribus

Compare Revisions

Ignore whitespace Rev 8 → Rev 9

/trunk/Scribus/ChangeLogCVS
1,4 → 1,9
Changes since Version 0.9.9
14.05.2003 pslib.cpp Removed unused Code
scribusview.cpp
mpalette.cpp
pageitem.cpp Picture Frames can now have a Borderline too.
 
12.05.2003 customfdialog.cpp Fixed a small Bug with the File-Preview.
pdflib.cpp Removed some unneeded Code.
 
/trunk/Scribus/scribus/mpalette.cpp
937,9 → 937,10
SShape->setEnabled(true);
SText->setEnabled(false);
SImage->setEnabled(true);
SLine->setEnabled(false);
SLine->setEnabled(true);
TabStack->widget(1)->setEnabled(true);
TabStack->widget(3)->setEnabled(true);
TabStack->widget(4)->setEnabled(true);
FlipH->setEnabled(true);
FlipV->setEnabled(true);
ShapeGroup->setEnabled(true);
/trunk/Scribus/scribus/util.cpp
14,7 → 14,7
* (at your option) any later version. *
* *
***************************************************************************/
#include <iostream>
 
#include <qstring.h>
#include <qpixmap.h>
#include <qbitmap.h>
635,7 → 635,7
{
uint cl = FT_Get_Char_Index(doc->FFonts[name], c1);
uint cr = FT_Get_Char_Index(doc->FFonts[name], c2);
FT_Get_Kerning(doc->FFonts[name], cl, cr, FT_KERNING_UNSCALED, &delta);
FT_Get_Kerning(doc->FFonts[name], cl, cr, ft_kerning_unscaled, &delta);
w += delta.x / fo->uniEM * Siz;
}
return w;
/trunk/Scribus/scribus/pageitem.cpp
415,6 → 415,11
}
}
#endif
if (Pcolor2 != "None")
{
p.setBrush(NoBrush);
DrawPolyL(&p, Clip);
}
break;
case 4:
p.save();
1134,7 → 1139,6
}
break;
case 7:
// DrawPolyL(&p, Clip);
if (PoLine.size() > 3)
{
for (uint poi=0; poi<PoLine.size()-3; poi += 4)
/trunk/Scribus/scribus/scribusview.cpp
963,21 → 963,16
{
SetFarbe(ite->Pcolor, ite->Shade, &h, &s, &v, &k);
p->PS_setcmykcolor_fill(h / 255.0, s / 255.0, v / 255.0, k / 255.0);
if ((ite->FrameType == 2) && (!ite->ClipEdited))
p->PS_RoundRect(0, 0, ite->Width, -ite->Height, ite->RadRect);
else
SetClipPath(p, ite);
SetClipPath(p, ite);
p->PS_closepath();
p->PS_fill(multiPath);
}
else
p->PS_setcmykcolor_dummy();
if ((ite->FrameType == 2) && (!ite->ClipEdited))
p->PS_RoundRect(0, 0, ite->Width, -ite->Height, ite->RadRect);
else
SetClipPath(p, ite);
SetClipPath(p, ite);
p->PS_closepath();
p->PS_clip(multiPath);
p->PS_save();
if ((ite->flippedH % 2) != 0)
{
p->PS_translate(ite->Width, 0);
994,6 → 989,13
p->PS_image(-ite->BBoxX+ite->LocalX, -ite->LocalY, ite->Pfile, ite->LocalScX, ite->LocalScY, ite->IProfile, ite->UseEmbedded, Ic);
}
p->PS_restore();
if (ite->Pcolor2 != "None")
{
SetClipPath(p, ite);
p->PS_closepath();
p->PS_stroke();
}
p->PS_restore();
}
if (ite->PType == 4)
{
1008,10 → 1010,7
p->PS_rotate(-ite->Rot);
if ((ite->Pcolor != "None") || (ite->GrType != 0))
{
if ((ite->FrameType == 2) && (!ite->ClipEdited))
p->PS_RoundRect(0, 0, ite->Width, -ite->Height, ite->RadRect);
else
SetClipPath(p, ite);
SetClipPath(p, ite);
p->PS_closepath();
if (ite->GrType != 0)
{
1272,27 → 1271,17
p->PS_rotate(-c->Rot);
switch (c->PType)
{
case 1:
p->PS_translate(c->Width / 2, -c->Height / 2);
p->PS_circle(c->Width / 2, c->Height / 2);
needsStroke = true;
break;
case 2:
if (c->Pcolor != "None")
{
if ((c->FrameType == 2) && (!c->ClipEdited))
p->PS_RoundRect(0, 0, c->Width, -c->Height, c->RadRect);
else
SetClipPath(p, c);
SetClipPath(p, c);
p->PS_closepath();
p->PS_fill(multiPath);
}
if ((c->FrameType == 2) && (!c->ClipEdited))
p->PS_RoundRect(0, 0, c->Width, -c->Height, c->RadRect);
else
SetClipPath(p, c);
SetClipPath(p, c);
p->PS_closepath();
p->PS_clip(multiPath);
p->PS_save();
if ((c->flippedH % 2) != 0)
{
p->PS_translate(c->Width, 0);
1310,6 → 1299,13
p->PS_image(-c->BBoxX+c->LocalX, -c->LocalY, c->Pfile, c->LocalScX, c->LocalScY, c->IProfile, c->UseEmbedded, ic, c->AnName);
else
p->PS_image(-c->BBoxX+c->LocalX, -c->LocalY, c->Pfile, c->LocalScX, c->LocalScY, c->IProfile, c->UseEmbedded, ic);
}
p->PS_restore();
if (c->Pcolor2 != "None")
{
SetClipPath(p, c);
p->PS_closepath();
p->PS_stroke();
}
needsStroke = false;
break;
1340,10 → 1336,7
}
if ((c->Pcolor != "None") || (c->GrType != 0))
{
if ((c->FrameType == 2) && (!c->ClipEdited))
p->PS_RoundRect(0, 0, c->Width, -c->Height, c->RadRect);
else
SetClipPath(p, c);
SetClipPath(p, c);
p->PS_closepath();
if ((c->GrType != 0) && (a->PageNam == ""))
{
1529,6 → 1522,7
p->PS_stroke();
needsStroke = false;
break;
case 1:
case 3:
case 6:
SetClipPath(p, c);
/trunk/Scribus/scribus/libpostscript/pslib.h
37,9 → 37,6
virtual void PS_begin_doc(int Ori, float breite, float hoehe, int numpage);
virtual void PS_begin_page(float breite, float hoehe, struct Margs* Ma);
virtual void PS_end_page();
virtual void PS_rect(float x, float y, float b, float h);
virtual void PS_RoundRect(float x, float y, float b, float h, float r);
virtual void PS_circle(float r, float r2);
virtual void PS_curve(float x1, float y1, float x2, float y2, float x3, float y3);
virtual void PS_moveto(float x, float y);
virtual void PS_lineto(float x, float y);
/trunk/Scribus/scribus/libpostscript/pslib.cpp
503,32 → 503,6
PutSeite("%%PageTrailer\nrestore\nsp\n");
}
 
void PSLib::PS_rect(float x, float y, float b, float h)
{
PutSeite(ToStr(x) + " " + ToStr(y) + " m\n");
PutSeite(ToStr(x) + " " + ToStr(y+h) + " li\n");
PutSeite(ToStr(x+b) + " " + ToStr(y+h) + " li\n");
PutSeite(ToStr(x+b) + " " + ToStr(y) + " li\n");
PutSeite("cl\n");
}
 
void PSLib::PS_RoundRect(float x, float y, float b, float h, float r)
{
PutSeite(ToStr(x+r) + " " + ToStr(y) + " m\n");
PutSeite(ToStr(x+b) + " " + ToStr(y) + " " + ToStr(x+b) + " " + ToStr(y+h) + " " + ToStr(r) + " arct\n");
PutSeite(ToStr(x+b) + " " + ToStr(y+h) + " " + ToStr(x) + " " + ToStr(y+h) + " " + ToStr(r) + " arct\n");
PutSeite(ToStr(x) + " " + ToStr(y+h) + " " + ToStr(x) + " " + ToStr(y) + " " + ToStr(r) + " arct\n");
PutSeite(ToStr(x) + " " + ToStr(y) + " " + ToStr(x+b) + " " + ToStr(y) + " " + ToStr(r) + " arct\n");
PutSeite("cl\n");
}
 
void PSLib::PS_circle(float r, float r2)
{
PutSeite("/cmtx matrix currentmatrix def\n");
PutSeite(ToStr(r) + " " + ToStr(r2) + " scale ci\n");
PutSeite("cmtx setmatrix\n");
}
 
void PSLib::PS_curve(float x1, float y1, float x2, float y2, float x3, float y3)
{
PutSeite(ToStr(x1) + " " + ToStr(y1) + " " + ToStr(x2) + " " + ToStr(y2) + " " + ToStr(x3) + " " + ToStr(y3) + " curveto\n");
/trunk/Scribus/scribus/libpdf/pdflib.cpp
1327,6 → 1327,7
PutPage("h\nW*\nn\n");
else
PutPage("h\nW\nn\n");
PutPage("q\n");
if ((ite->flippedH % 2) != 0)
PutPage("-1 0 0 1 "+FToStr(ite->Width)+" 0 cm\n");
if ((ite->flippedV % 2) != 0)
1335,6 → 1336,12
{
PDF_Image(ite->Pfile, ite->LocalScX, ite->LocalScY, ite->LocalX, -ite->LocalY, false, ite->IProfile, ite->UseEmbedded, ite->IRender);
}
PutPage("Q\n");
if (ite->Pcolor2 != "None")
{
PutPage(SetClipPath(ite));
PutPage("h\nS\n");
}
break;
case 4:
if ((ite->isAnnotation) && (Options->Version != 12))