1.1 --- a/mapeditor.cpp	Tue Jun 06 14:58:11 2006 +0000
     1.2 +++ b/mapeditor.cpp	Tue Jun 13 08:49:12 2006 +0000
     1.3 @@ -28,7 +28,7 @@
     1.4  #include <QDragEnterEvent>
     1.5  #include <QTextStream>
     1.6  #include <QDropEvent>
     1.7 -#include <Q3ActionGroup>
     1.8 +#include <QActionGroup>
     1.9  #include <Q3PtrList>
    1.10  
    1.11  #include <iostream>
    1.12 @@ -101,16 +101,16 @@
    1.13  extern QAction *actionFormatBackColor;
    1.14  extern QAction *actionFormatLinkColor;
    1.15  
    1.16 -extern Q3ActionGroup* actionGroupModModes;
    1.17 +extern QActionGroup* actionGroupModModes;
    1.18  extern QAction* actionModModeColor;
    1.19  extern QAction* actionModModeLink;
    1.20  extern QAction* actionModModeCopy;
    1.21  
    1.22 -extern Q3ActionGroup *actionGroupFormatFrameTypes;
    1.23 +extern QActionGroup *actionGroupFormatFrameTypes;
    1.24  extern QAction *actionFormatFrameNone;
    1.25  extern QAction *actionFormatFrameRectangle;
    1.26  
    1.27 -extern Q3ActionGroup *actionGroupFormatLinkStyles;
    1.28 +extern QActionGroup *actionGroupFormatLinkStyles;
    1.29  extern QAction *actionFormatIncludeImagesVer;
    1.30  extern QAction *actionFormatIncludeImagesHor;
    1.31  extern QAction *actionFormatHideLinkUnselected;
    1.32 @@ -2197,15 +2197,19 @@
    1.33  {
    1.34  	if (selection)
    1.35  	{
    1.36 -		BranchObj *bo=(BranchObj*)selection;
    1.37 -		QString s;
    1.38 -		if (bo->isSetStandardFlag(f))
    1.39 -			s="Unset";
    1.40 -		else
    1.41 -			s="Set";
    1.42 -		saveState(selection, QString("%1 standard flag \"%2\" of %3").arg(s).arg(f).arg(getName(bo)));// TODO undoCommand	
    1.43 -		bo->toggleStandardFlag (f,actionSettingsUseFlagGroups->isOn());
    1.44 -		adjustCanvasSize();
    1.45 +		if (typeid(*selection) == typeid(BranchObj) ||
    1.46 +			typeid(*selection) == typeid(MapCenterObj))
    1.47 +		{
    1.48 +			BranchObj *bo=(BranchObj*)selection;
    1.49 +			QString s;
    1.50 +			if (bo->isSetStandardFlag(f))
    1.51 +				s="Unset";
    1.52 +			else
    1.53 +				s="Set";
    1.54 +			saveState(selection, QString("%1 standard flag \"%2\" of %3").arg(s).arg(f).arg(getName(bo)));// TODO undoCommand	
    1.55 +			bo->toggleStandardFlag (f,actionSettingsUseFlagGroups->isOn());
    1.56 +			adjustCanvasSize();
    1.57 +		}
    1.58  	}	
    1.59  }
    1.60  
    1.61 @@ -2640,7 +2644,7 @@
    1.62  		if ( (typeid(*selection) == typeid(FloatImageObj)) )
    1.63  		{
    1.64  			FloatObj *fo=(FloatImageObj*)selection;
    1.65 -			standardFlagsDefault->setEnabled (false);
    1.66 +//FIXME do this in mainwindow					standardFlagsDefault->setEnabled (false);
    1.67  
    1.68  			actionEditOpenURL->setEnabled (false);
    1.69  			actionEditOpenVymLink->setEnabled (false);
    1.70 @@ -2663,7 +2667,7 @@
    1.71  
    1.72  	} else
    1.73  	{
    1.74 -		standardFlagsDefault->setEnabled (false);
    1.75 +//FIXME do this in mainwindow				standardFlagsDefault->setEnabled (false);
    1.76  
    1.77  		actionEditCopy->setEnabled (false);	
    1.78  		actionEditCut->setEnabled (false);