diff -r fd6d1292c4ad -r d2f72e448522 mainwindow.cpp --- a/mainwindow.cpp Mon Mar 03 09:25:40 2008 +0000 +++ b/mainwindow.cpp Mon Mar 03 09:25:40 2008 +0000 @@ -1938,117 +1938,8 @@ void Main::fileSave(MapEditor *me, const SaveMode &savemode) { - /* FIXME moved to ME - // Error codes - ErrorCode err=success; - - QString safeFilePath; - if (!me) return; - bool saveZipped=me->saveZipped(); - - // tmp dir for zipping - QString tmpZipDir; - - */ - - - if (!me) return; - - // filename=unnamed, filepath="" in constructor of mapEditor - - /* FIXME moved to ME - if ( !fn.isEmpty() ) - { - // We have a filepath, go on saving - - // Look, if we should zip the data: - if (!saveZipped) - { - QMessageBox mb( vymName, - tr("The map %1\ndid not use the compressed " - "vym file format.\nWriting it uncompressed will also write images \n" - "and flags and thus may overwrite files in the " - "given directory\n\nDo you want to write the map").arg(fn), - QMessageBox::Warning, - QMessageBox::Yes | QMessageBox::Default, - QMessageBox::No , - QMessageBox::Cancel | QMessageBox::Escape); - mb.setButtonText( QMessageBox::Yes, tr("compressed (vym default)") ); - mb.setButtonText( QMessageBox::No, tr("uncompressed") ); - mb.setButtonText( QMessageBox::Cancel, tr("Cancel")); - switch( mb.exec() ) - { - case QMessageBox::Yes: - // save compressed (default file format) - saveZipped=true; - break; - case QMessageBox::No: - // save uncompressed - saveZipped=false; - break; - case QMessageBox::Cancel: - // do nothing - return; - break; - } - me->setZipped (saveZipped); - } - - // First backup existing file, we - // don't want to add to old zip archives - QFile f(fn); - if (f.exists()) - { - if (actionSettingsWriteBackupFile->isOn()) - { - QString bfn(fn + "~"); - QFile bf(bfn); - if (bf.exists() && !bf.remove()) - { - QMessageBox::warning(0, tr("Save Error"), - bfn + tr("\ncould not be removed before saving")); - } - else if (!f.rename(bfn)) - { - QMessageBox::warning(0, tr("Save Error"), - fn + tr("\ncould not be renamed before saving")); - } - } - } - - if (saveZipped) - { - // Create temporary directory for packing - bool ok; - tmpZipDir=makeTmpDir (ok,"vym-zip"); - if (!ok) - { - QMessageBox::critical( 0, tr( "Critical Load Error" ), - tr("Couldn't create temporary directory before save\n")); - return; - } - - safeFilePath=me->getFilePath(); - me->setFilePath (tmpZipDir+"/"+ - me->getMapName()+ ".xml", - safeFilePath); - me->save (savemode); - me->setFilePath (safeFilePath); - - zipDir (tmpZipDir,fn); - } // save zipped - else - { - // Save unzipped. - safeFilePath=me->getFilePath(); - me->setFilePath (fn, safeFilePath); - me->save (savemode); - me->setFilePath (safeFilePath); - } // save zipped - } // filepath available - else - */ + if ( me->getFilePath().isEmpty() ) { // We have no filepath yet, @@ -2059,11 +1950,6 @@ fileSaveAs(savemode); } -/* FIXME moved to ME - if (saveZipped && !tmpZipDir.isEmpty()) - // Delete tmpDir - removeDir (QDir(tmpZipDir)); -*/ if (me->save (savemode)==success) { statusBar()->message(