diff -r 608f976aa7bb -r 6a0342b3c519 mapeditor.cpp --- a/mapeditor.cpp Tue Jun 06 14:58:11 2006 +0000 +++ b/mapeditor.cpp Tue Jun 13 08:49:12 2006 +0000 @@ -28,7 +28,7 @@ #include #include #include -#include +#include #include #include @@ -101,16 +101,16 @@ extern QAction *actionFormatBackColor; extern QAction *actionFormatLinkColor; -extern Q3ActionGroup* actionGroupModModes; +extern QActionGroup* actionGroupModModes; extern QAction* actionModModeColor; extern QAction* actionModModeLink; extern QAction* actionModModeCopy; -extern Q3ActionGroup *actionGroupFormatFrameTypes; +extern QActionGroup *actionGroupFormatFrameTypes; extern QAction *actionFormatFrameNone; extern QAction *actionFormatFrameRectangle; -extern Q3ActionGroup *actionGroupFormatLinkStyles; +extern QActionGroup *actionGroupFormatLinkStyles; extern QAction *actionFormatIncludeImagesVer; extern QAction *actionFormatIncludeImagesHor; extern QAction *actionFormatHideLinkUnselected; @@ -2197,15 +2197,19 @@ { if (selection) { - BranchObj *bo=(BranchObj*)selection; - QString s; - if (bo->isSetStandardFlag(f)) - s="Unset"; - else - s="Set"; - saveState(selection, QString("%1 standard flag \"%2\" of %3").arg(s).arg(f).arg(getName(bo)));// TODO undoCommand - bo->toggleStandardFlag (f,actionSettingsUseFlagGroups->isOn()); - adjustCanvasSize(); + if (typeid(*selection) == typeid(BranchObj) || + typeid(*selection) == typeid(MapCenterObj)) + { + BranchObj *bo=(BranchObj*)selection; + QString s; + if (bo->isSetStandardFlag(f)) + s="Unset"; + else + s="Set"; + saveState(selection, QString("%1 standard flag \"%2\" of %3").arg(s).arg(f).arg(getName(bo)));// TODO undoCommand + bo->toggleStandardFlag (f,actionSettingsUseFlagGroups->isOn()); + adjustCanvasSize(); + } } } @@ -2640,7 +2644,7 @@ if ( (typeid(*selection) == typeid(FloatImageObj)) ) { FloatObj *fo=(FloatImageObj*)selection; - standardFlagsDefault->setEnabled (false); +//FIXME do this in mainwindow standardFlagsDefault->setEnabled (false); actionEditOpenURL->setEnabled (false); actionEditOpenVymLink->setEnabled (false); @@ -2663,7 +2667,7 @@ } else { - standardFlagsDefault->setEnabled (false); +//FIXME do this in mainwindow standardFlagsDefault->setEnabled (false); actionEditCopy->setEnabled (false); actionEditCut->setEnabled (false);