Subversion Repositories Scribus

Compare Revisions

Ignore whitespace Rev 3364 → Rev 3365

/branches/Version13x/Scribus/scribus/about.cpp
46,7 → 46,7
tabLayout1->addWidget( pixmapLabel1 );
buildID = new QLabel( tab, "BB" );
buildID->setAlignment(Qt::AlignCenter);
QString bu = tr("%1 %2 %3 ").arg("20").arg("September").arg("2005 ");
QString bu = tr("%1 %2 %3 ").arg("21").arg("September").arg("2005 ");
#ifdef HAVE_CMS
bu += "C";
#else
/branches/Version13x/Scribus/scribus/scribus.cpp
6487,7 → 6487,8
MovePages *dia = new MovePages(this, doc->currentPage->pageNr()+1, doc->Pages.count(), false);
if (dia->exec())
{
doc->setLoading(true);
bool autoText = doc->PageAT;
doc->PageAT = false;
Page* from = doc->Pages.at(dia->getFromPage()-1);
int wo = dia->getWherePage();
switch (dia->getWhere())
6502,6 → 6503,7
slotNewPage(doc->Pages.count());
break;
}
doc->PageAT = autoText;
Page* Ziel = doc->currentPage;
Ziel->setInitialHeight(from->height());
Ziel->setInitialWidth(from->width());
6511,6 → 6513,7
Ziel->initialMargins.Bottom = from->Margins.Bottom;
Ziel->initialMargins.Left = from->Margins.Left;
Ziel->initialMargins.Right = from->Margins.Right;
view->reformPages();
QMap<int,int> TableID;
QPtrList<PageItem> TableItems;
TableID.clear();
6595,8 → 6598,6
}
doc->GroupCounter = GrMax + 1;
view->Deselect(true);
doc->setLoading(false);
view->reformPages();
view->DrawNew();
slotDocCh();
pagePalette->RebuildPage();