Subversion Repositories Scribus

Compare Revisions

Ignore whitespace Rev 5622 → Rev 5623

/branches/Version13x/Scribus/scribus/muster.h
61,8 → 61,6
void removePage(int);
//void loadPage(QString, int, bool);
void finished();
void docAltered();
 
};
 
#endif // MUSTERPAGES_H
/branches/Version13x/Scribus/scribus/muster.cpp
123,7 → 123,6
sMuster = "Normal";
updateMasterPageList(sMuster);
//currentDoc->MasterPages = currentDoc->Pages;
emit docAltered();
}
}
 
257,7 → 256,6
currentDoc->setLoading(false);
currentView->DrawNew();
currentDoc->GroupCounter = GrMax + 1;
emit docAltered();
}
delete dia;
}
304,7 → 302,6
currentView->showMasterPage(currentDoc->MasterNames[MasterPageName]);
currentView->reformPages();
//currentDoc->MasterPages = currentDoc->Pages;
emit docAltered();
}
delete dia;
}
353,7 → 350,6
currentView->showMasterPage(currentDoc->MasterNames[MasterPageName2]);
qApp->setOverrideCursor(QCursor(arrowCursor), true);
//currentDoc->MasterPages = currentDoc->Pages;
emit docAltered();
}
delete dia;
}
/branches/Version13x/Scribus/scribus/scribus.cpp
2804,6 → 2804,8
ActWin->setMenuStatus(1, scrActions["fileClose"]->isEnabled());
ActWin->setMenuStatus(2, scrActions["fileSave"]->isEnabled());
ActWin->setMenuStatus(3, scrActions["fileSaveAs"]->isEnabled());
outlinePalette->BuildTree();
}
 
void ScribusMainWindow::updateRecent(QString fn)
7429,8 → 7431,6
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()), outlinePalette, SLOT(BuildTree()));
connect(dia, SIGNAL(docAltered()), SLOT(slotDocCh()));
scrActions["pageInsert"]->setEnabled(false);
scrActions["pageImport"]->setEnabled(false);
scrActions["pageDelete"]->setEnabled(false);