Subversion Repositories Scribus

Compare Revisions

Ignore whitespace Rev 3575 → Rev 3576

/trunk/Scribus/scribus/scribuswin.cpp
71,7 → 71,7
CloseTxt = tr("&Leave Anyway");
else
CloseTxt = tr("C&lose Anyway");
int exit=QMessageBox::information(this,
int exit=QMessageBox::information(ScApp,
tr("Warning"),
tr("Document:")+" "+doc->DocName+"\n"+ tr("has been changed since the last save."),
tr("&Save Now"),
89,7 → 89,8
case 1:
break;
case 2:
emit Schliessen();
//emit Schliessen();
ScApp->DoFileClose();
ce->accept();
break;
}
96,7 → 97,8
}
else
{
emit Schliessen();
//emit Schliessen();
ScApp->DoFileClose();
ce->accept();
}
}
/trunk/Scribus/scribus/scribus.cpp
2018,10 → 2018,12
{
QWidgetList windows = wsp->windowList();
ScribusWin* tw;
disconnect(wsp, SIGNAL(windowActivated(QWidget *)), this, SLOT(newActWin(QWidget *)));
if (!windows.isEmpty())
{
singleClose = true;
for ( int i = 0; i < static_cast<int>(windows.count()); ++i )
uint windowCount=windows.count();
for ( uint i = 0; i < windowCount; ++i )
{
newActWin(windows.at(i));
tw = ActWin;
2030,6 → 2032,7
{
ce->ignore();
singleClose = false;
connect(wsp, SIGNAL(windowActivated(QWidget *)), this, SLOT(newActWin(QWidget *)));
return;
}
}
2283,7 → 2286,7
RestoreBookMarks();
doc->WinHan = w;
w->setCentralWidget(view);
connect(w, SIGNAL(Schliessen()), this, SLOT(DoFileClose()));
//connect(w, SIGNAL(Schliessen()), this, SLOT(DoFileClose()));
// connect(w, SIGNAL(SaveAndClose()), this, SLOT(DoSaveClose()));
if (CMSavail)
{
3426,7 → 3429,7
lpo.Angle = 45;
doc->PDF_Optionen.LPISettings.insert("Black", lpo);
}
connect(w, SIGNAL(Schliessen()), this, SLOT(DoFileClose()));
//connect(w, SIGNAL(Schliessen()), this, SLOT(DoFileClose()));
if (!doc->HasCMS)
{
doc->CMSSettings.DefaultInputProfile = Prefs.DCMSset.DefaultInputProfile;
9522,7 → 9525,7
{
std::cout << "Saving: " << doc->DocName+".emergency" << std::endl;
doc->ASaveTimer->stop();
disconnect(ActWin, SIGNAL(Schliessen()), ScApp, SLOT(DoFileClose()));
//disconnect(ActWin, SIGNAL(Schliessen()), ScApp, SLOT(DoFileClose()));
ScriXmlDoc *ss = new ScriXmlDoc();
ss->WriteDoc(doc->DocName+".emergency", doc, view, 0);
delete ss;