/branches/Version13x/Scribus/scribus/fileloader.cpp |
---|
541,7 → 541,7 |
doc->DocPages = doc->Pages; |
else |
{ |
Apage->PageNam = PgNam; |
Apage->setPageName(PgNam); |
doc->MasterNames[PgNam] = a; |
doc->MasterPages = doc->Pages; |
} |
/branches/Version13x/Scribus/scribus/page.h |
---|
64,6 → 64,7 |
void removeYGuide(int index); |
void moveXGuide(int fromIndex, double to); |
void moveYGuide(int fromIndex, double to); |
void setPageName(const QString& newName); |
void restore(UndoState* state, bool isUndo); |
}; |
/branches/Version13x/Scribus/scribus/undomanager.h |
---|
207,7 → 207,7 |
*/ |
int getHistoryLength(); |
/*** |
/** |
* @name Action strings |
* Strings describing undo actions |
*/ |
/branches/Version13x/Scribus/scribus/page.cpp |
---|
44,7 → 44,10 |
void Page::setPageNr(int pageNr) |
{ |
PageNr = pageNr; |
setUName(QString(QObject::tr("Page") + " %1").arg(ScApp->doc->FirstPnum + PageNr)); |
if (PageNam == "") |
setUName(QString(QObject::tr("Page") + " %1").arg(ScApp->doc->FirstPnum + PageNr)); |
else |
setUName(PageNam); |
} |
uint Page::getPageNr() |
174,6 → 177,13 |
} |
} |
void Page::setPageName(const QString& newName) |
{ |
PageNam = newName; |
if (newName != "") |
setUName(QObject::tr("Template ") + newName); |
} |
void Page::restore(UndoState* state, bool isUndo) |
{ |
SimpleState* ss = dynamic_cast<SimpleState*>(state); |
/branches/Version13x/Scribus/scribus/scribusXml.cpp |
---|
820,7 → 820,7 |
if (Mpage) |
{ |
doc->Pages.at(a)->LeftPg=QStoInt(pg.attribute("LEFT","0")); |
doc->Pages.at(a)->PageNam = pg.attribute("NAM",""); |
doc->Pages.at(a)->setPageName(pg.attribute("NAM","")); |
} |
TableItems.clear(); |
TableID.clear(); |
1443,7 → 1443,7 |
} |
else |
{ |
doc->Pages.at(a)->PageNam = PgNam; |
doc->Pages.at(a)->setPageName(PgNam); |
doc->MasterNames[PgNam] = a; |
doc->MasterPages = doc->Pages; |
doc->MasterItems = doc->Items; |
/branches/Version13x/Scribus/scribus/muster.cpp |
---|
201,7 → 201,7 |
} |
currentView->Deselect(true); |
currentView->DrawNew(); |
currentDoc->Pages.at(nr)->PageNam = templateName; |
currentDoc->Pages.at(nr)->setPageName(templateName); |
currentDoc->Pages.at(nr)->MPageNam = ""; |
updateTemplateList(templateName); |
currentDoc->PageAT = atf; |
237,7 → 237,7 |
emit createNew(nr); |
if (currentDoc->PageFP) |
currentDoc->Pages.at(nr)->LeftPg = dia->Links->currentItem() == 0 ? true : false; |
currentDoc->Pages.at(nr)->PageNam = templateName; |
currentDoc->Pages.at(nr)->setPageName(templateName); |
currentDoc->Pages.at(nr)->MPageNam = ""; |
updateTemplateList(templateName); |
currentDoc->PageAT = atf; |
272,7 → 272,7 |
copyC++; |
} |
currentDoc->MasterNames.insert(templateName2, nr); |
currentDoc->Pages.at(nr)->PageNam = templateName2; |
currentDoc->Pages.at(nr)->setPageName(templateName2); |
currentDoc->Pages.at(nr)->MPageNam = ""; |
updateTemplateList(templateName2); |
currentDoc->PageAT = atf; |
/branches/Version13x/Scribus/scribus/scribus.cpp |
---|
2401,7 → 2401,7 |
slotNewPage(0); |
doc->PageAT = atfb; |
doc->MasterNames["Normal"] = 0; |
doc->Pages.at(0)->PageNam = "Normal"; |
doc->Pages.at(0)->setPageName("Normal"); |
doc->MasterPages = doc->Pages; |
doc->PageC = doc->DocPages.count(); |
doc->Pages = doc->DocPages; |
3886,7 → 3886,7 |
slotNewPage(0); |
doc->PageAT = atf; |
doc->MasterNames["Normal"] = 0; |
doc->Pages.at(0)->PageNam = "Normal"; |
doc->Pages.at(0)->setPageName("Normal"); |
doc->MasterPages = doc->Pages; |
doc->PageC = doc->DocPages.count(); |
doc->Pages = doc->DocPages; |