diff -r e524edc45aff -r 3dabc6424d73 mapeditor.cpp
--- a/mapeditor.cpp	Wed Feb 27 16:09:06 2008 +0000
+++ b/mapeditor.cpp	Wed Feb 27 16:09:06 2008 +0000
@@ -145,6 +145,10 @@
 	autosaveTimer=new QTimer (this);
 	connect(autosaveTimer, SIGNAL(timeout()), this, SLOT(autosave()));
 
+	fileChangedTimer=new QTimer (this);
+	fileChangedTimer->start(3000);
+	connect(fileChangedTimer, SIGNAL(timeout()), this, SLOT(fileChanged()));
+
 	// Network
 	netstate=Offline;
 
@@ -185,6 +189,7 @@
 {
 	//cout <<"Destructor MapEditor\n";
 	autosaveTimer->stop();
+	fileChangedTimer->stop();
 
 	// tmpMapDir is in tmpVymDir, so it gets removed automagically when vym closes
 	
@@ -1498,7 +1503,7 @@
 	{
 		filePath=fpath;		// becomes absolute path
 		fileName=fpath;		// gets stripped of path
-		destPath=destname;	// needed for vymlinks
+		destPath=destname;	// needed for vymlinks and during load to reset fileChangedTime
 
 		// If fpath is not an absolute path, complete it
 		filePath=QDir(fpath).absPath();
@@ -1543,7 +1548,8 @@
 	ErrorCode err=success;
 
 	parseBaseHandler *handler;
-	switch (ftype)
+	fileType=ftype;
+	switch (fileType)
 	{
 		case VymMap: handler=new parseVYMHandler; break;
 		case FreemindMap : handler=new parseFreemindHandler; break;
@@ -1575,14 +1581,72 @@
 				QString("Add map %1 to %2").arg(fname).arg(getName(bo)));
 	}	
     
-	QFile file( fname );
+
+	// Create temporary directory for packing
+	bool ok;
+	QString tmpZipDir=makeTmpDir (ok,"vym-pack");
+	if (!ok)
+	{
+		QMessageBox::critical( 0, tr( "Critical Load Error" ),
+		   tr("Couldn't create temporary directory before load\n"));
+		return aborted; 
+	}
+
+	// Try to unzip file
+	err=unzipDir (tmpZipDir,fname);
+	QString xmlfile;
+	if (err==nozip)
+	{
+		xmlfile=fname;
+		zipped=false;
+	} else
+	{
+		zipped=true;
+		
+		// Look for mapname.xml
+		xmlfile= fname.left(fname.findRev(".",-1,true));
+		xmlfile=xmlfile.section( '/', -1 );
+		QFile mfile( tmpZipDir + "/" + xmlfile + ".xml");
+		if (!mfile.exists() )
+		{
+			// mapname.xml does not exist, well, 
+			// maybe someone renamed the mapname.vym file...
+			// Try to find any .xml in the toplevel 
+			// directory of the .vym file
+			QStringList flist=QDir (tmpZipDir).entryList("*.xml");
+			if (flist.count()==1) 
+			{
+				// Only one entry, take this one
+				xmlfile=tmpZipDir + "/"+flist.first();
+			} else
+			{
+				for ( QStringList::Iterator it = flist.begin(); it != flist.end(); ++it ) 
+					*it=tmpZipDir + "/" + *it;
+				// TODO Multiple entries, load all (but only the first one into this ME)
+				//mainWindow->fileLoadFromTmp (flist);
+				//returnCode=1;	// Silently forget this attempt to load
+				qWarning ("MainWindow::load (fn)  multimap found...");
+			}	
+				
+			if (flist.isEmpty() )
+			{
+				QMessageBox::critical( 0, tr( "Critical Load Error" ),
+						   tr("Couldn't find a map (*.xml) in .vym archive.\n"));
+				err=aborted;				   
+			}	
+		} //file doesn't exist	
+		else
+			xmlfile=mfile.name();
+	}
+
+	QFile file( xmlfile);
 
 	// I am paranoid: file should exist anyway
 	// according to check in mainwindow.
 	if (!file.exists() )
 	{
 		QMessageBox::critical( 0, tr( "Critical Parse Error" ),
-				   tr("Couldn't open map " +fname)+".");
+				   tr(QString("Couldn't open map %1").arg(file.name())));
 		err=aborted;	
 	} else
 	{
@@ -1607,7 +1671,7 @@
 		file.close();
 		if ( ok ) 
 		{
-			model->reposition();
+			model->reposition();	// FIXME reposition the view instead...
 			xelection.update();
 			if (lmode==NewMap)
 			{
@@ -1616,6 +1680,9 @@
 				mapUnsaved=false;
 				autosaveTimer->stop();
 			}
+
+			// Reset timestamp to check for later updates of file
+			fileChangedTime=QFileInfo (destPath).lastModified();
 		} else 
 		{
 			QMessageBox::critical( 0, tr( "Critical Parse Error" ),
@@ -1625,22 +1692,102 @@
 			// partially read by the parser
 		}	
 	}	
+
+	// Delete tmpDir
+	removeDir (QDir(tmpZipDir));
+
 	updateActions();
 	return err;
 }
 
-int MapEditor::save (const SaveMode &savemode)
-{
+ErrorCode MapEditor::save (const SaveMode &savemode)
+{
+	cout <<"ME::save zipped="<<zipped<<endl;
 	// Create mapName and fileDir
 	makeSubDirs (fileDir);
-	QString fname;
-	if (saveZipped())
+	QString tmpZipDir;
+	QString mapFileName;
+	QString safeFilePath;
+
+	ErrorCode err=success;
+
+	if (zipped)
 		// save as .xml
-		fname=mapName+".xml";
+		mapFileName=mapName+".xml";
 	else
 		// use name given by user, even if he chooses .doc
-		fname=fileName;
-
+		mapFileName=fileName;
+
+	// Look, if we should zip the data:
+	if (!zipped)
+	{
+		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(filePath),
+			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)
+				zipped=true;
+				break;
+			case QMessageBox::No:
+				// save uncompressed
+				zipped=false;
+				break;
+			case QMessageBox::Cancel:
+				// do nothing
+				return aborted;
+				break;
+		}
+	}
+
+	// First backup existing file, we 
+	// don't want to add to old zip archives
+	QFile f(destPath);
+	if (f.exists())
+	{
+		if ( settings.value ("/mapeditor/writeBackupFile").toBool())
+		{
+			cout << "ME::doing backup...\n";//FIXME
+			QString backupFileName(destPath + "~");
+			QFile backupFile(backupFileName);
+			if (backupFile.exists() && !backupFile.remove())
+			{
+				QMessageBox::warning(0, tr("Save Error"),
+									 tr("%1\ncould not be removed before saving").arg(backupFileName));
+			}
+			else if (!f.rename(backupFileName))
+			{
+				QMessageBox::warning(0, tr("Save Error"),
+									 tr("%1\ncould not be renamed before saving").arg(destPath));
+			}
+		}
+	}
+
+	if (zipped)
+	{
+		// 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 aborted; 
+		}
+
+		safeFilePath=filePath;
+		setFilePath (tmpZipDir+"/"+ mapName+ ".xml", safeFilePath);
+	} // zipped
 
 	QString saveFile;
 	if (savemode==CompleteMap || xelection.isEmpty())
@@ -1661,11 +1808,27 @@
 		// TODO take care of multiselections
 	}	
 
-	if (!saveStringToDisk(fileDir+fname,saveFile))
-		return 1;
+	if (!saveStringToDisk(fileDir+mapFileName,saveFile))
+	{
+		err=aborted;
+		qWarning ("ME::saveStringToDisk failed!");
+	}
+
+	if (zipped)
+	{
+		// zip
+		if (err==success) err=zipDir (tmpZipDir,destPath);
+
+		// Delete tmpDir
+		removeDir (QDir(tmpZipDir));
+
+		// Restore original filepath outside of tmp zip dir
+		setFilePath (safeFilePath);
+	}
 
 	updateActions();
-	return 0;
+	fileChangedTime=QFileInfo (destPath).lastModified();
+	return err;
 }
 
 void MapEditor::setZipped (bool z)
@@ -3937,7 +4100,7 @@
 				{
 					case QMessageBox::Yes:
 						// save 
-						break;;
+						break;
 					case QMessageBox::Cancel:
 						// do nothing
 						delete (fd);
@@ -5046,13 +5209,65 @@
 
 void MapEditor::autosave()
 {
+	QDateTime now=QDateTime().currentDateTime();
+	/* FIXME debug
+	*/
+	cout << "ME::autosave checking "<<qPrintable(filePath)<<"...\n"; 
+	cout << "fsaved: "<<qPrintable (fileChangedTime.toString())<<endl;
+	cout << "  fnow: "<<qPrintable (QFileInfo(filePath).lastModified().toString())<<endl;
+	cout << "  time: "<<qPrintable (now.toString())<<endl;
 	// Disable autosave, while we have gone back in history
 	int redosAvail=undoSet.readNumEntry (QString("/history/redosAvail"));
 	if (redosAvail>0) return;
 
 
 	if (mapUnsaved &&mapChanged && settings.value ("/mapeditor/autosave/use",true).toBool() )
-		mainWindow->fileSave (this);
+	{
+		if (QFileInfo(filePath).lastModified()<=fileChangedTime) 
+			mainWindow->fileSave (this);
+		else
+			if (debug)
+				cout <<"  ME::autosave  rejected, file on disk is newer than last save.\n"; 
+
+	}	
+}
+
+void MapEditor::fileChanged()
+{
+	// Check if file on disk has changed meanwhile
+	if (!filePath.isEmpty())
+	{
+		QDateTime tmod=QFileInfo (filePath).lastModified();
+		if (tmod>fileChangedTime)
+		{
+			
+			/* FIXME debug message, sometimes there's a glitch in the metrics...
+			cout << "ME::fileChanged()\n" 
+			     << "  last saved:     "<<qPrintable (fileChangedTime.toString())<<endl
+				 << "  last modififed: "<<qPrintable (tmod.toString())<<endl;
+			*/	 
+			// FIXME switch to current mapeditor and finish lineedits...
+			QMessageBox mb( vymName,
+				tr("The file of the map  on disk has changed:\n\n"  
+				   "   %1\n\nDo you want to reload this map with the new file?").arg(filePath),
+				QMessageBox::Question,
+				QMessageBox::Yes ,
+				QMessageBox::Cancel | QMessageBox::Default,
+				QMessageBox::NoButton );
+
+			mb.setButtonText( QMessageBox::Yes, tr("Reload"));
+			mb.setButtonText( QMessageBox::No, tr("Ignore"));
+			switch( mb.exec() ) 
+			{
+				case QMessageBox::Yes:
+					// Reload map
+					load (filePath,NewMap,fileType);
+		        case QMessageBox::Cancel:
+					fileChangedTime=tmod; // allow autosave to overwrite newer file!
+			}
+		}
+	}	
+
 }