diff -r e7acede0377c -r 0e994bf2346b mainwindow.cpp
--- a/mainwindow.cpp	Wed Mar 15 13:53:53 2006 +0000
+++ b/mainwindow.cpp	Wed Mar 15 13:53:53 2006 +0000
@@ -123,7 +123,6 @@
 extern QAction *actionEditSelectFirst;
 extern QAction *actionEditSelectLast;
 extern QAction *actionEditLoadImage;
-extern QAction *actionEditToggleFloatExport;
 
 extern QAction* actionFormatColor;
 extern QAction* actionFormatPickColor;
@@ -494,6 +493,7 @@
 		actionEditToggleScroll=a;
 	#endif	
 	actionEditToggleScroll->setEnabled (false);
+	actionEditToggleScroll->setToggleAction(true);
     actionEditToggleScroll->addTo( tb );
     actionEditToggleScroll->addTo( menu );
 	actionListBranches.append(actionEditToggleScroll);
@@ -1175,12 +1175,14 @@
 	actionEditCopy->addTo( floatimageContextMenu );
 	actionEditCut->addTo( floatimageContextMenu );
 
+/* FIXME not needed any longer
 	floatimageContextMenu->insertSeparator();	
     a = new QAction( tr( "Use for Export" ), QPixmap(), tr( "Use for Export"), 0, this, "useForExport" );
 	a->setToggleAction(true);
     connect( a, SIGNAL( activated() ), this, SLOT( editToggleFloatExport() ) );
     a->addTo( floatimageContextMenu);
 	actionEditToggleFloatExport=a;
+	*/
 
 	floatimageContextMenu->insertSeparator();	
 	actionFormatHideLinkUnselected->addTo( floatimageContextMenu );
@@ -1711,11 +1713,9 @@
 		}
     }
 
-	if (me->saveZipped())
-	{
+	if (saveZipped && !tmpMapDir.isEmpty())
 		// Delete tmpDir
 		removeDir (QDir(tmpMapDir));
-	} 
 
 	if (err==success)
 	{
@@ -1737,7 +1737,6 @@
 
 void Main::fileSaveAs(const SaveMode& savemode)
 {
-	QString tmpMapDir;
 	QString fn;
 
 	if (currentMapEditor())
@@ -2225,7 +2224,7 @@
 void Main::editToggleHideExport()
 {
 	if (currentMapEditor())
-		currentMapEditor()->toggleHideExport();	
+		currentMapEditor()->setHideExport();	
 }
 
 void Main::editMapInfo()
@@ -2373,12 +2372,6 @@
 		currentMapEditor()->saveFloatImage(item);
 }
 
-void Main::editToggleFloatExport()
-{
-	if (currentMapEditor())
-		currentMapEditor()->toggleFloatExport();
-}
-
 void Main::editFollowXLink(int item)
 {
 	if (currentMapEditor())