# HG changeset patch
# User insilmaril
# Date 1206443799 0
# Node ID 8c6faaa1e2b1dcfe59c30841e524e328126f41fb
# Parent  d2f72e4485223c8e167833e4ecaed10d5375a156
Several bugfixes

diff -r d2f72e448522 -r 8c6faaa1e2b1 demos/vym-projectplan.vym
Binary file demos/vym-projectplan.vym has changed
diff -r d2f72e448522 -r 8c6faaa1e2b1 floatimageobj.cpp
--- a/floatimageobj.cpp	Mon Mar 03 09:25:40 2008 +0000
+++ b/floatimageobj.cpp	Tue Mar 25 11:16:39 2008 +0000
@@ -185,10 +185,10 @@
 	QString zAttr=attribut ("zPlane",QString().setNum(zPlane));
 	QString url;
 
-	url="images/"+prefix+"image-" + QString().number(saveCounter,10) + "." +filetype;
+	url="images/"+prefix+"image-" + QString().number(saveCounter,10) + ".png" ;
 
 	// And really save the image
-	icon->save (tmpdir + "/" + url, "PNG");
+	icon->save (tmpdir +"/"+ url, "PNG");
  
 	QString nameAttr=attribut ("orgName",originalFilename);
 
diff -r d2f72e448522 -r 8c6faaa1e2b1 mainwindow.cpp
--- a/mainwindow.cpp	Mon Mar 03 09:25:40 2008 +0000
+++ b/mainwindow.cpp	Tue Mar 25 11:16:39 2008 +0000
@@ -2468,7 +2468,7 @@
 					urls.at(i);
 #endif
 				p->start ("dcop",args);
-				cout << qPrintable (args.join(" "))<<endl;
+				//cout << qPrintable (args.join(" "))<<endl;
 				if ( !p->waitForStarted() ) success=false;
 			}
 			if (!success)
diff -r d2f72e448522 -r 8c6faaa1e2b1 mapeditor.cpp
--- a/mapeditor.cpp	Mon Mar 03 09:25:40 2008 +0000
+++ b/mapeditor.cpp	Tue Mar 25 11:16:39 2008 +0000
@@ -1661,7 +1661,11 @@
 
 
 		// We need to set the tmpDir in order  to load files with rel. path
-		QString tmpdir= fname.left(fname.findRev("/",-1));	
+		QString tmpdir;
+		if (zipped)
+			tmpdir=tmpZipDir;
+		else
+			tmpdir=fname.left(fname.findRev("/",-1));	
 		handler->setTmpDir (tmpdir);
 		handler->setInputFile (file.name());
 		handler->setLoadMode (lmode);
@@ -1693,18 +1697,16 @@
 		}	
 	}	
 
-	// Delete tmpDir
+	// Delete tmpZipDir
 	removeDir (QDir(tmpZipDir));
 
 	updateActions();
+
 	return err;
 }
 
 ErrorCode MapEditor::save (const SaveMode &savemode)
 {
-	cout <<"ME::save "<<qPrintable (mapName)<<"  zipped="<<zipped<<endl; // FIXME debug
-	// Create mapName and fileDir
-	makeSubDirs (fileDir);
 	QString tmpZipDir;
 	QString mapFileName;
 	QString safeFilePath;
@@ -1757,7 +1759,6 @@
 	{
 		if ( settings.value ("/mapeditor/writeBackupFile").toBool())
 		{
-			cout << "ME::doing backup...\n";//FIXME
 			QString backupFileName(destPath + "~");
 			QFile backupFile(backupFileName);
 			if (backupFile.exists() && !backupFile.remove())
@@ -1789,6 +1790,9 @@
 		setFilePath (tmpZipDir+"/"+ mapName+ ".xml", safeFilePath);
 	} // zipped
 
+	// Create mapName and fileDir
+	makeSubDirs (fileDir);
+
 	QString saveFile;
 	if (savemode==CompleteMap || xelection.isEmpty())
 	{
@@ -1831,17 +1835,6 @@
 	return err;
 }
 
-/* FIXME not needed any longer
-void MapEditor::setZipped (bool z)
-{
-	zipped=z;
-}
-
-bool MapEditor::saveZipped ()
-{
-	return zipped;
-}
-*/
 
 void MapEditor::print()
 {
@@ -2433,6 +2426,7 @@
 {
 	bool old=blockSaveState;
 	blockSaveState=true;
+	bool zippedOrg=zipped;
 	if (redosAvail > 0 || n!=0)
 	{
 		// Use the "historical" buffer
@@ -2442,6 +2436,7 @@
 	} else
 		// Use the global buffer
 		load (clipboardDir+"/"+clipboardFile,ImportAdd, VymMap);
+	zipped=zippedOrg;
 	blockSaveState=old;
 }
 
@@ -3191,6 +3186,7 @@
 	if (bo1)
 	{
 		par=(BranchObj*)(bo1->getParObj());
+		if (!par) return;
 		bo2=par->getFirstBranch();
 		if (bo2) {
 			xelection.select(bo2);
@@ -3209,6 +3205,7 @@
 	if (bo1)
 	{
 		par=(BranchObj*)(bo1->getParObj());
+		if (!par) return;
 		bo2=par->getLastBranch();
 		if (bo2) 
 		{
@@ -5217,6 +5214,7 @@
 	cout << "fsaved: "<<qPrintable (fileChangedTime.toString())<<endl;
 	cout << "  fnow: "<<qPrintable (QFileInfo(filePath).lastModified().toString())<<endl;
 	cout << "  time: "<<qPrintable (now.toString())<<endl;
+	cout << " zipped="<<zipped<<endl;
 	*/
 	// Disable autosave, while we have gone back in history
 	int redosAvail=undoSet.readNumEntry (QString("/history/redosAvail"));
diff -r d2f72e448522 -r 8c6faaa1e2b1 tex/vym.changelog
--- a/tex/vym.changelog	Mon Mar 03 09:25:40 2008 +0000
+++ b/tex/vym.changelog	Tue Mar 25 11:16:39 2008 +0000
@@ -1,3 +1,18 @@
+-------------------------------------------------------------------
+Thu Mar 13 02:06:59 CET 2008 - uwedr@suse.de
+
+- Bugfix: vym no longer forgets that a map is zipped
+
+-------------------------------------------------------------------
+Sun Mar  9 13:36:20 CET 2008 - uwedr@suse.de
+
+- Bugfix: Segfault when pressing Home or End on MapCenter 
+
+-------------------------------------------------------------------
+Wed Mar  5 17:54:12 CET 2008 - uwedr@suse.de
+
+- Bugfix: Broken paths to floatimages 
+
 -------------------------------------------------------------------
 Wed Feb 27 17:07:57 CET 2008 - uwedr@suse.de
 
@@ -11,7 +26,7 @@
            asks for reload if necessary
 
 -------------------------------------------------------------------
-Mon Jan 21 22:52:18 CET 2008 - uwe
+Mon Jan 21 22:52:18 CET 2008 - uwedr@suse.de
 
 - Bugfix: No more warning dialog for overwriting note, when note is
           empty 
diff -r d2f72e448522 -r 8c6faaa1e2b1 version.h
--- a/version.h	Mon Mar 03 09:25:40 2008 +0000
+++ b/version.h	Tue Mar 25 11:16:39 2008 +0000
@@ -7,7 +7,7 @@
 #define __VYM_VERSION "1.11.6"
 //#define __VYM_CODENAME "Codename: 1.10.0-RC-3"
 #define __VYM_CODENAME "Codename: development version"
-#define __VYM_BUILD_DATE "2008-02-29"
+#define __VYM_BUILD_DATE "2008-03-13"
 
 
 bool checkVersion(const QString &);