1.1 --- a/mainwindow.cpp	Tue Mar 14 14:27:08 2006 +0000
     1.2 +++ b/mainwindow.cpp	Wed Mar 15 13:53:54 2006 +0000
     1.3 @@ -123,7 +123,6 @@
     1.4  extern QAction *actionEditSelectFirst;
     1.5  extern QAction *actionEditSelectLast;
     1.6  extern QAction *actionEditLoadImage;
     1.7 -extern QAction *actionEditToggleFloatExport;
     1.8  
     1.9  extern QAction* actionFormatColor;
    1.10  extern QAction* actionFormatPickColor;
    1.11 @@ -494,6 +493,7 @@
    1.12  		actionEditToggleScroll=a;
    1.13  	#endif	
    1.14  	actionEditToggleScroll->setEnabled (false);
    1.15 +	actionEditToggleScroll->setToggleAction(true);
    1.16      actionEditToggleScroll->addTo( tb );
    1.17      actionEditToggleScroll->addTo( menu );
    1.18  	actionListBranches.append(actionEditToggleScroll);
    1.19 @@ -1175,12 +1175,14 @@
    1.20  	actionEditCopy->addTo( floatimageContextMenu );
    1.21  	actionEditCut->addTo( floatimageContextMenu );
    1.22  
    1.23 +/* FIXME not needed any longer
    1.24  	floatimageContextMenu->insertSeparator();	
    1.25      a = new QAction( tr( "Use for Export" ), QPixmap(), tr( "Use for Export"), 0, this, "useForExport" );
    1.26  	a->setToggleAction(true);
    1.27      connect( a, SIGNAL( activated() ), this, SLOT( editToggleFloatExport() ) );
    1.28      a->addTo( floatimageContextMenu);
    1.29  	actionEditToggleFloatExport=a;
    1.30 +	*/
    1.31  
    1.32  	floatimageContextMenu->insertSeparator();	
    1.33  	actionFormatHideLinkUnselected->addTo( floatimageContextMenu );
    1.34 @@ -1711,11 +1713,9 @@
    1.35  		}
    1.36      }
    1.37  
    1.38 -	if (me->saveZipped())
    1.39 -	{
    1.40 +	if (saveZipped && !tmpMapDir.isEmpty())
    1.41  		// Delete tmpDir
    1.42  		removeDir (QDir(tmpMapDir));
    1.43 -	} 
    1.44  
    1.45  	if (err==success)
    1.46  	{
    1.47 @@ -1737,7 +1737,6 @@
    1.48  
    1.49  void Main::fileSaveAs(const SaveMode& savemode)
    1.50  {
    1.51 -	QString tmpMapDir;
    1.52  	QString fn;
    1.53  
    1.54  	if (currentMapEditor())
    1.55 @@ -2225,7 +2224,7 @@
    1.56  void Main::editToggleHideExport()
    1.57  {
    1.58  	if (currentMapEditor())
    1.59 -		currentMapEditor()->toggleHideExport();	
    1.60 +		currentMapEditor()->setHideExport();	
    1.61  }
    1.62  
    1.63  void Main::editMapInfo()
    1.64 @@ -2373,12 +2372,6 @@
    1.65  		currentMapEditor()->saveFloatImage(item);
    1.66  }
    1.67  
    1.68 -void Main::editToggleFloatExport()
    1.69 -{
    1.70 -	if (currentMapEditor())
    1.71 -		currentMapEditor()->toggleFloatExport();
    1.72 -}
    1.73 -
    1.74  void Main::editFollowXLink(int item)
    1.75  {
    1.76  	if (currentMapEditor())