Subversion Repositories Scribus

Compare Revisions

Ignore whitespace Rev 2775 → Rev 2776

/branches/Version13x/Scribus/scribus/muster.h
51,6 → 51,7
 
signals:
void createNew(int);
void removePage(int);
void loadPage(QString, int, bool);
void finished();
void docAltered(ScribusDoc *);
/branches/Version13x/Scribus/scribus/about.cpp
45,7 → 45,7
tabLayout1->addWidget( pixmapLabel1 );
buildID = new QLabel( tab, "BB" );
buildID->setAlignment(Qt::AlignCenter);
QString bu = tr("%1 %2 %3 ").arg("09").arg("July").arg("2005");
QString bu = tr("%1 %2 %3 ").arg("10").arg("July").arg("2005");
#ifdef HAVE_CMS
bu += "C";
#else
/branches/Version13x/Scribus/scribus/muster.cpp
94,8 → 94,7
if (exit == 1)
{
currentDoc->pageCount = currentDoc->Pages.count();
currentView->delPage(currentDoc->MasterNames[sMuster]);
currentView->reformPages();
emit removePage(currentDoc->MasterNames[sMuster]);
currentDoc->MasterNames.clear();
for (uint a = 0; a < currentDoc->Pages.count(); ++a)
currentDoc->MasterNames[currentDoc->Pages.at(a)->PageNam] = currentDoc->Pages.at(a)->PageNr;
/branches/Version13x/Scribus/scribus/scribus.cpp
9321,6 → 9321,7
doc->masterPageMode = true;
MasterPagesPalette *dia = new MasterPagesPalette(this, doc, view, temp);
connect(dia, SIGNAL(createNew(int)), this, SLOT(slotNewMasterPage(int)));
connect(dia, SIGNAL(removePage(int )), this, SLOT(DeletePage2(int )));
connect(dia, SIGNAL(loadPage(QString, int, bool)), this, SLOT(loadPage(QString, int, bool)));
connect(dia, SIGNAL(finished()), this, SLOT(manageMasterPagesEnd()));
connect(dia, SIGNAL(docAltered(ScribusDoc* )), outlinePalette, SLOT(BuildTree(ScribusDoc* )));