2293,12 → 2293,11 |
if (requiresGUI) |
{ |
wsp->addWindow(w); |
connect(undoManager, SIGNAL(undoRedoBegin()), tempDoc, SLOT(undoRedoBegin())); |
connect(undoManager, SIGNAL(undoRedoDone()), tempDoc, SLOT(undoRedoDone())); |
connect(undoManager, SIGNAL(undoRedoDone()), tempView, SLOT(DrawNew())); |
//connect(w, SIGNAL(Schliessen()), this, SLOT(DoFileClose())); |
//#9250 : transfered to newActWin() |
//connect(undoManager, SIGNAL(undoRedoBegin()), tempDoc, SLOT(undoRedoBegin())); |
//connect(undoManager, SIGNAL(undoRedoDone()), tempDoc, SLOT(undoRedoDone())); |
//connect(undoManager, SIGNAL(undoRedoDone()), tempView, SLOT(DrawNew())); |
connect(tempView, SIGNAL(signalGuideInformation(int, qreal)), alignDistributePalette, SLOT(setGuide(int, qreal))); |
// connect(w, SIGNAL(SaveAndClose()), this, SLOT(DoSaveClose())); |
} |
//Independent finishing tasks after tempDoc setup |
if (showView) |
2361,7 → 2360,6 |
alignDistributePalette->setDoc(doc); |
connect(undoManager, SIGNAL(undoRedoDone()), view, SLOT(DrawNew())); |
view->show(); |
//connect(w, SIGNAL(Schliessen()), this, SLOT(DoFileClose())); |
} |
|
void ScribusMainWindow::windowsMenuAboutToShow() |
2437,9 → 2435,23 |
} |
docCheckerPalette->clearErrorList(); |
|
if (HaveDoc && (doc != NULL) && doc->hasGUI()) |
{ |
disconnect(undoManager, SIGNAL(undoRedoBegin()), doc, SLOT(undoRedoBegin())); |
disconnect(undoManager, SIGNAL(undoRedoDone()) , doc, SLOT(undoRedoDone())); |
disconnect(undoManager, SIGNAL(undoRedoDone()) , doc->view(), SLOT(DrawNew())); |
} |
|
doc = ActWin->doc(); |
undoManager->switchStack(doc->DocName); |
|
if ((doc != NULL) && doc->hasGUI()) |
{ |
connect(undoManager, SIGNAL(undoRedoBegin()), doc, SLOT(undoRedoBegin())); |
connect(undoManager, SIGNAL(undoRedoDone()) , doc, SLOT(undoRedoDone())); |
connect(undoManager, SIGNAL(undoRedoDone()) , doc->view(), SLOT(DrawNew())); |
} |
|
if (view!=NULL) |
{ |
actionManager->disconnectNewViewActions(); |
3972,7 → 3984,6 |
doc->PDF_Options.LPISettings.insert("Black", lpo); |
} |
|
//connect(w, SIGNAL(Schliessen()), this, SLOT(DoFileClose())); |
if (!doc->CMSSettings.CMSinUse) |
doc->HasCMS = false; |
if ((ScCore->haveCMS()) && (doc->CMSSettings.CMSinUse)) |
9065,7 → 9076,6 |
{ |
std::cout << "Saving: " << doc->DocName.toStdString() << ".emergency" << std::endl; |
doc->autoSaveTimer->stop(); |
//disconnect(ActWin, SIGNAL(Schliessen()), ScMW, SLOT(DoFileClose())); |
FileLoader fl(doc->DocName+".emergency"); |
fl.SaveFile(doc->DocName+".emergency", doc, 0); |
} |