/trunk/Scribus/ChangeLogCVS |
---|
1,6 → 1,4 |
Changes since Version 1.1.1 |
15.10.2003 Made some improvements to linked Textframes. |
13.10.2003 Fixed crash when doubleclicking an empty Textframe. |
12.10.2003 Made the Color Menue in the Menuebar working with Text. |
/trunk/Scribus/scribus/libabout/about.cpp |
---|
32,7 → 32,7 |
tabLayout1->addWidget( PixmapLabel1 ); |
BuildID = new QLabel( tab, "BB" ); |
BuildID->setAlignment(Qt::AlignCenter); |
QString bu = "15. October 2003 "; |
QString bu = "13. October 2003 "; |
#ifdef HAVE_CMS |
bu += "C"; |
#else |
/trunk/Scribus/scribus/page.cpp |
---|
3646,17 → 3646,7 |
{ |
b->NextBox = bb; |
bb->BackBox = b; |
if ((bb->ItemNr < b->ItemNr) && (bb->OwnPage == b->OwnPage)) |
{ |
Items.insert(b->ItemNr+1, bb); |
bb = Items.take(bb->ItemNr); |
for (uint a = 0; a < Items.count(); ++a) |
{ |
Items.at(a)->ItemNr = a; |
if (Items.at(a)->isBookmark) |
emit NewBMNr(Items.at(a)->BMnr, a); |
} |
} |
// b->paintObj(QRect(0, 0, b->OwnPage->width(), b->OwnPage->height())); |
b->OwnPage->repaint(); |
} |
emit DocChanged(); |
3669,29 → 3659,10 |
{ |
if (b->BackBox != 0) |
{ |
if (b->NextBox != 0) |
{ |
PageItem* nb = b->NextBox; |
while (nb != 0) |
{ |
uint a = nb->Ptext.count(); |
for (uint s=0; s<a; ++s) |
{ |
b->Ptext.append(nb->Ptext.take(0)); |
} |
nb = nb->NextBox; |
} |
} |
uint a2 = b->Ptext.count(); |
for (uint s = 0; s < a2; ++s) |
{ |
b->BackBox->Ptext.append(b->Ptext.take(0)); |
} |
b->BackBox->NextBox = 0; |
b->BackBox = 0; |
} |
emit DocChanged(); |
b->OwnPage->repaint(); |
} |
break; |
case 12: |
/trunk/Scribus/scribus/pageitem.cpp |
---|
998,17 → 998,8 |
break; |
} |
} |
if (NextBox->OwnPage != OwnPage) |
if ((NextBox->OwnPage != OwnPage) || (NextBox->ItemNr < ItemNr)) |
NextBox->OwnPage->RefreshItem(NextBox, true); |
else |
{ |
bool savre = Doc->RePos; |
Doc->RePos = true; |
p->save(); |
NextBox->DrawObj(p, QRect(0, 0, 1, 1)); |
p->restore(); |
Doc->RePos = savre; |
} |
} |
else |
{ |