Subversion Repositories Scribus

Compare Revisions

Ignore whitespace Rev 23 → Rev 24

/trunk/Scribus/ChangeLogCVS
1,4 → 1,9
Changes since Version 0.9.10
03.06.2003 scribus.cpp
page.cpp
pageitem.cpp
serializer.cpp Fixed various Bugs with the Textbox and Styles.
 
02.06.2003 svgexplugin.cpp Improved Image Support, Images are now save as PNG-Images in the
same Folder as the SVG File.
preview.cpp Added New Plugin for Print Preview.
/trunk/Scribus/scribus/pageitem.cpp
1102,8 → 1102,8
}
else
{
if (uint(CPos) > nrc)
CPos = nrc;
// if (uint(CPos) > nrc)
// CPos = nrc;
if (!Doc->RePos)
{
p.setPen(QPen(black, 1, SolidLine, FlatCap, MiterJoin));
1313,7 → 1313,7
else
pr.setPen(QPen(red, 1, DotLine, FlatCap, MiterJoin));
pr.setBrush(NoBrush);
pr.drawRect(-1, -1, static_cast<int>((Width+1)*Doc->Scale), static_cast<int>((Height+1)*Doc->Scale));
pr.drawRect(-1, -1, static_cast<int>(Width*Doc->Scale)+2, static_cast<int>(Height*Doc->Scale)+2);
if (Locked)
{
pr.setPen(QPen(darkRed, 1, SolidLine, FlatCap, MiterJoin));
1352,7 → 1352,7
{
p.setPen(QPen(darkCyan, 1, DotLine, FlatCap, MiterJoin));
p.setBrush(NoBrush);
p.drawRect(-1, -1, static_cast<int>(Width+1), static_cast<int>(Height+1));
p.drawRect(-1, -1, static_cast<int>(Width+2), static_cast<int>(Height+2));
}
}
}
/trunk/Scribus/scribus/libabout/about.cpp
32,7 → 32,7
tabLayout1->addWidget( PixmapLabel1 );
BuildID = new QLabel( tab, "BB" );
BuildID->setAlignment(Qt::AlignCenter);
QString bu = "02. June 2003 ";
QString bu = "03. June 2003 ";
#ifdef HAVE_FREETYPE
bu += "F";
#else
/trunk/Scribus/scribus/scribus.cpp
2477,7 → 2477,8
Serializer *ss = new Serializer(fileName);
if (ss->Read(LoadEnc))
{
ss->GetText(b, doc->CurrentABStil);
int st = doc->CurrentABStil;
ss->GetText(b, st, doc->Vorlagen[st].Font, doc->Vorlagen[st].FontSize);
}
delete ss;
if (doc->Trenner->AutoCheck)
2873,7 → 2874,7
else
{
ScriXmlDoc *ss = new ScriXmlDoc();
Buffer2 = ss->WriteElem(&doc->ActPage->SelItem, doc);
BufferI = ss->WriteElem(&doc->ActPage->SelItem, doc);
delete ss;
}
editMenu->setItemEnabled(edid3, 1);
2935,7 → 2936,8
{
Serializer *ss = new Serializer("");
ss->Objekt = Buffer2;
ss->GetText(b, doc->CurrentABStil, true);
int st = doc->CurrentABStil;
ss->GetText(b, st, doc->Vorlagen[st].Font, doc->Vorlagen[st].FontSize, true);
delete ss;
if (doc->Trenner->AutoCheck)
doc->Trenner->slotHyphenate(b);
/trunk/Scribus/scribus/plugins/svgexplugin/svgexplugin.cpp
271,6 → 271,7
ob = docu->createElement("clipPath");
ob.setAttribute("id", Clipi+IToStr(ClipCount));
ob.setAttribute("clipPathUnits", "userSpaceOnUse");
ob.setAttribute("clip-rule", "evenodd");
QDomElement cl = docu->createElement("path");
cl.setAttribute("d", SetClipPath(Item)+"Z");
ob.appendChild(cl);
280,7 → 281,6
img.save(fi.baseName()+".png", "PNG");
ob = docu->createElement("image");
ob.setAttribute("clip-path", "url(#"+Clipi+IToStr(ClipCount)+")");
ob.setAttribute("clip-rule", "evenodd");
ob.setAttribute("transform", "scale("+FToStr(Item->LocalScX)+", "+FToStr(Item->LocalScY)+") translate("+FToStr(Item->LocalX)+", "+FToStr(Item->LocalY)+")");
ob.setAttribute("xlink:href", fi.baseName()+".png");
ClipCount++;
/trunk/Scribus/scribus/serializer.cpp
46,7 → 46,7
Objekt = Dat;
}
 
void Serializer::GetText(PageItem *Item, int Absatz, bool Append)
void Serializer::GetText(PageItem *Item, int Absatz, QString font, int size, bool Append)
{
struct Pti *hg;
PageItem *nb;
76,8 → 76,16
if (hg->ch == QChar(10)) { hg->ch = QChar(13); }
if (hg->ch == QChar(5)) { hg->ch = QChar(13); }
if (hg->ch == QChar(9)) { hg->ch = " "; }
hg->cfont = Item->IFont;
hg->csize = Item->ISize;
if (font != "")
{
hg->cfont = font;
hg->csize = size;
}
else
{
hg->cfont = Item->IFont;
hg->csize = Item->ISize;
}
hg->ccolor = Item->Pcolor2;
hg->cextra = 0;
hg->cshade = Item->Shade2;
/trunk/Scribus/scribus/page.cpp
242,7 → 242,8
Serializer *ss = new Serializer(ur.path());
if (ss->Read())
{
ss->GetText(b, b->Ausrich);
int st = doku->CurrentABStil;
ss->GetText(b, st, doku->Vorlagen[st].Font, doku->Vorlagen[st].FontSize);
emit DocChanged();
}
delete ss;
5546,7 → 5547,8
{
for (a = 0; a < b->Ptext.count(); ++a)
{
b->Ptext.at(a)->csize = size;
if (b->Ptext.at(a)->cab < 5)
b->Ptext.at(a)->csize = size;
}
}
if (b->PType == 8)