Subversion Repositories Scribus

Compare Revisions

Ignore whitespace Rev 383 → Rev 384

/trunk/Scribus/ChangeLogCVS
1,5 → 1,8
Changes since 1.2RC1
 
19.08.2004
* bug #547: multi-frame text disappears from later frames
 
18.08.2004
* bug #962: Scribus crashes when opening a document not in .sla format
* bug #976: settings-->hyphenator: wrong window title in German
/trunk/Scribus/scribus/scpainter.cpp
245,39 → 245,16
fill_gradient.setOrigin(orig);
fill_gradient.setVector(vec);
fill_gradient.setFocalPoint(foc);
// fill_gradient.setRepeatMethod( VGradient::reflect );
}
 
void ScPainter::fillPath()
{
if( m_index == 0 ) return;
/* int find = -1;
for( int i = m_index - 1; i >= 0; i-- )
{
if( m_path[i].code == ART_MOVETO_OPEN || m_path[i].code == ART_MOVETO )
{
find = i;
break;
}
}
if( find != -1 && ( m_path[ find ].x3 != m_path[ m_index - 1 ].x3 ||
m_path[ find ].y3 != m_path[ m_index - 1 ].y3 ) )
{
ensureSpace( m_index + 1 );
m_path[ m_index ].code = ART_LINETO;
m_path[ m_index ].x3 = m_path[ find ].x3;
m_path[ m_index ].y3 = m_path[ find ].y3;
m_index++;
m_path[ m_index ].code = ART_END;
}
else
m_path[ m_index++ ].code = ART_END; */
if( fillMode != 0)
{
{
ArtVpath *path = art_bez_path_to_vec( m_path , 0.25 );
drawVPath( path, 0 );
}
// m_index--;
}
}
 
void ScPainter::strokePath()
/trunk/Scribus/scribus/pageitem.cpp
551,6 → 551,58
p->drawImage(&pixm);
p->restore();
}
if ((Ptext.count() != 0) && (Dirty))
{
if (flippedH % 2 != 0)
{
p->translate(Width * sc, 0);
p->scale(-1, 1);
}
if (flippedV % 2 != 0)
{
p->translate(0, Height * sc);
p->scale(1, -1);
}
struct ZZ Zli3;
for (a = 0; a < MaxChars; ++a)
{
hl = Ptext.at(a);
chx = hl->ch;
if (hl->ch == QChar(30))
chx = ExpandToken(a);
Zli3.Zeich = chx;
if (hl->ccolor != "None")
{
SetFarbe(&tmp, hl->ccolor, hl->cshade);
p->setBrush(tmp);
}
if (hl->cstroke != "None")
{
SetFarbe(&tmp, hl->cstroke, hl->cshade2);
p->setPen(tmp, 1, SolidLine, FlatCap, MiterJoin);
}
Zli3.Farb = hl->ccolor;
Zli3.Farb2 = hl->cstroke;
Zli3.shade = hl->cshade;
Zli3.shade2 = hl->cshade2;
Zli3.xco = hl->xp;
Zli3.yco = hl->yp;
Zli3.Sele = hl->cselect;
Zli3.Siz = hl->csize;
Zli3.Style = hl->cstyle;
Zli3.ZFo = hl->cfont;
Zli3.wide = Cwidth(Doc, hl->cfont, chx, hl->csize);
Zli3.kern = hl->cextra;
Zli3.scale = hl->cscale;
if (!Doc->RePos)
DrawZeichenS(p, &Zli3);
}
Dirty = false;
Redrawn = true;
pf2.end();
p->restore();
break;
}
if ((Ptext.count() != 0) || (NextBox != 0))
{
if (NextBox != 0)
1427,41 → 1479,18
break;
}
}
p->save();
NextBox->Dirty = false;
QPixmap pgPix(1, 1);
ScPainter *painter = new ScPainter(&pgPix, 1, 1);
painter->translate(0.5, 0.5);
NextBox->DrawObj(painter, QRect(0, 0, 1, 1));
NextBox->Dirty = true;
painter->end();
delete painter;
p->restore();
if (NextBox->OwnPage != OwnPage)
{
if (Doc->RePos)
{
p->save();
QPixmap pgPix(1, 1);
ScPainter *painter = new ScPainter(&pgPix, 1, 1);
painter->translate(0.5, 0.5);
NextBox->DrawObj(painter, QRect(0, 0, 1, 1));
painter->end();
delete painter;
p->restore();
}
else
NextBox->OwnPage->update();
}
else
{
if ((Doc->AppMode == 7) && (Tinput))
NextBox->OwnPage->RefreshItem(NextBox, true);
else
{
bool savre = Doc->RePos;
Doc->RePos = true;
p->save();
QPixmap pgPix(1, 1);
ScPainter *painter = new ScPainter(&pgPix, 1, 1);
painter->translate(0.5, 0.5);
NextBox->DrawObj(painter, QRect(0, 0, 1, 1));
painter->end();
delete painter;
p->restore();
Doc->RePos = savre;
}
}
NextBox->OwnPage->update();
}
else
{
/trunk/Scribus/scribus/libabout/about.cpp
56,7 → 56,7
tabLayout1->addWidget( PixmapLabel1 );
BuildID = new QLabel( tab, "BB" );
BuildID->setAlignment(Qt::AlignCenter);
QString bu = tr("%1. %2 %3 ").arg("18").arg("August").arg("2004");
QString bu = tr("%1. %2 %3 ").arg("19").arg("August").arg("2004");
#ifdef HAVE_CMS
bu += "C";
#else
/trunk/Scribus/scribus/page.cpp
9117,8 → 9117,21
void Page::doAlign(QValueList<uint> &Object, int moveCode, double xp, double xdisp, double ydisp, double minx)
{
double xd;
for (uint a2 = 0; a2 < Object.count(); ++a2)
uint start, end;
if ((moveCode == 3) || (moveCode == 13))
{
start = 1;
end = Object.count()-1;
if (Object.count() < 3)
return;
}
else
{
start = 0;
end = Object.count();
}
for (uint a2 = start; a2 < end; ++a2)
{
switch (moveCode)
{
case 0: