diff --git a/src/Mod/Sketcher/Gui/CommandAlterGeometry.cpp b/src/Mod/Sketcher/Gui/CommandAlterGeometry.cpp index 44681cf8e7..456cd72784 100644 --- a/src/Mod/Sketcher/Gui/CommandAlterGeometry.cpp +++ b/src/Mod/Sketcher/Gui/CommandAlterGeometry.cpp @@ -83,13 +83,34 @@ CmdSketcherToggleConstruction::CmdSketcherToggleConstruction() // list of toggle construction commands Gui::CommandManager &rcCmdMgr = Gui::Application::Instance->commandManager(); rcCmdMgr.addCommandMode("ToggleConstruction", "Sketcher_CreateLine"); + rcCmdMgr.addCommandMode("ToggleConstruction", "Sketcher_CreateRectangle"); + rcCmdMgr.addCommandMode("ToggleConstruction", "Sketcher_CreateRectangle_Center"); + rcCmdMgr.addCommandMode("ToggleConstruction", "Sketcher_CreateOblong"); rcCmdMgr.addCommandMode("ToggleConstruction", "Sketcher_CompCreateRectangles"); rcCmdMgr.addCommandMode("ToggleConstruction", "Sketcher_CreatePolyline"); rcCmdMgr.addCommandMode("ToggleConstruction", "Sketcher_CreateSlot"); + rcCmdMgr.addCommandMode("ToggleConstruction", "Sketcher_CreateArc"); + rcCmdMgr.addCommandMode("ToggleConstruction", "Sketcher_Create3PointArc"); rcCmdMgr.addCommandMode("ToggleConstruction", "Sketcher_CompCreateArc"); + rcCmdMgr.addCommandMode("ToggleConstruction", "Sketcher_CreateEllipseByCenter"); + rcCmdMgr.addCommandMode("ToggleConstruction", "Sketcher_CreateEllipseBy3Points"); + rcCmdMgr.addCommandMode("ToggleConstruction", "Sketcher_CreateArcOfEllipse"); + rcCmdMgr.addCommandMode("ToggleConstruction", "Sketcher_CreateArcOfHyperbola"); + rcCmdMgr.addCommandMode("ToggleConstruction", "Sketcher_CreateArcOfParabola"); rcCmdMgr.addCommandMode("ToggleConstruction", "Sketcher_CompCreateConic"); + rcCmdMgr.addCommandMode("ToggleConstruction", "Sketcher_CreateCircle"); + rcCmdMgr.addCommandMode("ToggleConstruction", "Sketcher_Create3PointCircle"); rcCmdMgr.addCommandMode("ToggleConstruction", "Sketcher_CompCreateCircle"); + rcCmdMgr.addCommandMode("ToggleConstruction", "Sketcher_CreateTriangle"); + rcCmdMgr.addCommandMode("ToggleConstruction", "Sketcher_CreateSquare"); + rcCmdMgr.addCommandMode("ToggleConstruction", "Sketcher_CreatePentagon"); + rcCmdMgr.addCommandMode("ToggleConstruction", "Sketcher_CreateHexagon"); + rcCmdMgr.addCommandMode("ToggleConstruction", "Sketcher_CreateHeptagon"); + rcCmdMgr.addCommandMode("ToggleConstruction", "Sketcher_CreateOctagon"); + rcCmdMgr.addCommandMode("ToggleConstruction", "Sketcher_CreateRegularPolygon"); rcCmdMgr.addCommandMode("ToggleConstruction", "Sketcher_CompCreateRegularPolygon"); + rcCmdMgr.addCommandMode("ToggleConstruction", "Sketcher_CreateBSpline"); + rcCmdMgr.addCommandMode("ToggleConstruction", "Sketcher_CreatePeriodicBSpline"); rcCmdMgr.addCommandMode("ToggleConstruction", "Sketcher_CompCreateBSpline"); rcCmdMgr.addCommandMode("ToggleConstruction", "Sketcher_CarbonCopy"); } diff --git a/src/Mod/Sketcher/Gui/CommandCreateGeo.cpp b/src/Mod/Sketcher/Gui/CommandCreateGeo.cpp index 4dbf7b323e..dc1ccd681e 100644 --- a/src/Mod/Sketcher/Gui/CommandCreateGeo.cpp +++ b/src/Mod/Sketcher/Gui/CommandCreateGeo.cpp @@ -91,6 +91,23 @@ using namespace std; using namespace SketcherGui; +#define CONSTRUCTION_UPDATE_ACTION(CLASS,ICON) \ + /* This macro creates an updateAction() function that will toggle between normal & construction icon */ \ + void CLASS::updateAction(int mode) \ + { \ + auto act = getAction(); \ + if (act) { \ + switch (mode) { \ + case Normal: \ + act->setIcon(Gui::BitmapFactory().iconFromTheme(ICON)); \ + break; \ + case Construction: \ + act->setIcon(Gui::BitmapFactory().iconFromTheme(ICON"_Constr")); \ + break; \ + } \ + } \ + } + namespace SketcherGui { GeometryCreationMode geometryCreationMode=Normal; } @@ -113,26 +130,14 @@ CmdSketcherCreateLine::CmdSketcherCreateLine() eType = ForEdit; } +CONSTRUCTION_UPDATE_ACTION(CmdSketcherCreateLine,"Sketcher_CreateLine") + void CmdSketcherCreateLine::activated(int iMsg) { Q_UNUSED(iMsg); ActivateHandler(getActiveGuiDocument(),new DrawSketchHandlerLine() ); } -void CmdSketcherCreateLine::updateAction(int mode) -{ - switch (mode) { - case Normal: - if (getAction()) - getAction()->setIcon(Gui::BitmapFactory().iconFromTheme("Sketcher_CreateLine")); - break; - case Construction: - if (getAction()) - getAction()->setIcon(Gui::BitmapFactory().iconFromTheme("Sketcher_CreateLine_Constr")); - break; - } -} - bool CmdSketcherCreateLine::isActive(void) { return isCommandActive(getActiveGuiDocument()); @@ -157,26 +162,14 @@ CmdSketcherCreateRectangle::CmdSketcherCreateRectangle() eType = ForEdit; } +CONSTRUCTION_UPDATE_ACTION(CmdSketcherCreateRectangle,"Sketcher_CreateRectangle") + void CmdSketcherCreateRectangle::activated(int iMsg) { Q_UNUSED(iMsg); ActivateHandler(getActiveGuiDocument(),new DrawSketchHandlerBox(DrawSketchHandlerBox::Diagonal) ); } -void CmdSketcherCreateRectangle::updateAction(int mode) -{ - switch (mode) { - case Normal: - if (getAction()) - getAction()->setIcon(Gui::BitmapFactory().iconFromTheme("Sketcher_CreateRectangle")); - break; - case Construction: - if (getAction()) - getAction()->setIcon(Gui::BitmapFactory().iconFromTheme("Sketcher_CreateRectangle_Constr")); - break; - } -} - bool CmdSketcherCreateRectangle::isActive(void) { return isCommandActive(getActiveGuiDocument()); @@ -198,26 +191,14 @@ CmdSketcherCreateRectangleCenter::CmdSketcherCreateRectangleCenter() eType = ForEdit; } +CONSTRUCTION_UPDATE_ACTION(CmdSketcherCreateRectangleCenter,"Sketcher_CreateRectangle_Center") + void CmdSketcherCreateRectangleCenter::activated(int iMsg) { Q_UNUSED(iMsg); ActivateHandler(getActiveGuiDocument(),new DrawSketchHandlerBox(DrawSketchHandlerBox::CenterAndCorner) ); } -void CmdSketcherCreateRectangleCenter::updateAction(int mode) -{ - switch (mode) { - case Normal: - if (getAction()) - getAction()->setIcon(Gui::BitmapFactory().iconFromTheme("Sketcher_CreateRectangle_Center")); - break; - case Construction: - if (getAction()) - getAction()->setIcon(Gui::BitmapFactory().iconFromTheme("Sketcher_CreateRectangle_Center_Constr")); - break; - } -} - bool CmdSketcherCreateRectangleCenter::isActive(void) { return isCommandActive(getActiveGuiDocument()); @@ -242,26 +223,14 @@ CmdSketcherCreateOblong::CmdSketcherCreateOblong() eType = ForEdit; } +CONSTRUCTION_UPDATE_ACTION(CmdSketcherCreateOblong,"Sketcher_CreateOblong") + void CmdSketcherCreateOblong::activated(int iMsg) { Q_UNUSED(iMsg); ActivateHandler(getActiveGuiDocument(), new DrawSketchHandlerOblong()); } -void CmdSketcherCreateOblong::updateAction(int mode) -{ - switch (mode) { - case Normal: - if (getAction()) - getAction()->setIcon(Gui::BitmapFactory().iconFromTheme("Sketcher_CreateOblong")); - break; - case Construction: - if (getAction()) - getAction()->setIcon(Gui::BitmapFactory().iconFromTheme("Sketcher_CreateOblong_Constr")); - break; - } -} - bool CmdSketcherCreateOblong::isActive(void) { return isCommandActive(getActiveGuiDocument()); @@ -396,26 +365,14 @@ CmdSketcherCreatePolyline::CmdSketcherCreatePolyline() eType = ForEdit; } +CONSTRUCTION_UPDATE_ACTION(CmdSketcherCreatePolyline,"Sketcher_CreatePolyline") + void CmdSketcherCreatePolyline::activated(int iMsg) { Q_UNUSED(iMsg); ActivateHandler(getActiveGuiDocument(),new DrawSketchHandlerLineSet() ); } -void CmdSketcherCreatePolyline::updateAction(int mode) -{ - switch (mode) { - case Normal: - if (getAction()) - getAction()->setIcon(Gui::BitmapFactory().iconFromTheme("Sketcher_CreatePolyline")); - break; - case Construction: - if (getAction()) - getAction()->setIcon(Gui::BitmapFactory().iconFromTheme("Sketcher_CreatePolyline_Constr")); - break; - } -} - bool CmdSketcherCreatePolyline::isActive(void) { return isCommandActive(getActiveGuiDocument()); @@ -424,7 +381,7 @@ bool CmdSketcherCreatePolyline::isActive(void) // ====================================================================================== -DEF_STD_CMD_A(CmdSketcherCreateArc) +DEF_STD_CMD_AU(CmdSketcherCreateArc) CmdSketcherCreateArc::CmdSketcherCreateArc() : Command("Sketcher_CreateArc") @@ -440,6 +397,8 @@ CmdSketcherCreateArc::CmdSketcherCreateArc() eType = ForEdit; } +CONSTRUCTION_UPDATE_ACTION(CmdSketcherCreateArc,"Sketcher_CreateArc") + void CmdSketcherCreateArc::activated(int iMsg) { Q_UNUSED(iMsg); @@ -454,7 +413,7 @@ bool CmdSketcherCreateArc::isActive(void) // ====================================================================================== -DEF_STD_CMD_A(CmdSketcherCreate3PointArc) +DEF_STD_CMD_AU(CmdSketcherCreate3PointArc) CmdSketcherCreate3PointArc::CmdSketcherCreate3PointArc() : Command("Sketcher_Create3PointArc") @@ -470,6 +429,8 @@ CmdSketcherCreate3PointArc::CmdSketcherCreate3PointArc() eType = ForEdit; } +CONSTRUCTION_UPDATE_ACTION(CmdSketcherCreate3PointArc,"Sketcher_Create3PointArc") + void CmdSketcherCreate3PointArc::activated(int iMsg) { Q_UNUSED(iMsg); @@ -585,7 +546,7 @@ bool CmdSketcherCompCreateArc::isActive(void) // ====================================================================================== -DEF_STD_CMD_A(CmdSketcherCreateCircle) +DEF_STD_CMD_AU(CmdSketcherCreateCircle) CmdSketcherCreateCircle::CmdSketcherCreateCircle() : Command("Sketcher_CreateCircle") @@ -601,6 +562,8 @@ CmdSketcherCreateCircle::CmdSketcherCreateCircle() eType = ForEdit; } +CONSTRUCTION_UPDATE_ACTION(CmdSketcherCreateCircle,"Sketcher_CreateCircle") + void CmdSketcherCreateCircle::activated(int iMsg) { Q_UNUSED(iMsg); @@ -614,7 +577,7 @@ bool CmdSketcherCreateCircle::isActive(void) // ====================================================================================== /// @brief Macro that declares a new sketcher command class 'CmdSketcherCreateEllipseByCenter' -DEF_STD_CMD_A(CmdSketcherCreateEllipseByCenter) +DEF_STD_CMD_AU(CmdSketcherCreateEllipseByCenter) /** * @brief ctor @@ -628,11 +591,13 @@ CmdSketcherCreateEllipseByCenter::CmdSketcherCreateEllipseByCenter() sToolTipText = QT_TR_NOOP("Create an ellipse by center in the sketch"); sWhatsThis = "Sketcher_CreateEllipseByCenter"; sStatusTip = sToolTipText; - sPixmap = "Sketcher_Conics_Ellipse_Center"; + sPixmap = "Sketcher_CreateEllipse"; //FIXME: icon link sAccel = "G, E, E"; eType = ForEdit; } +CONSTRUCTION_UPDATE_ACTION(CmdSketcherCreateEllipseByCenter,"Sketcher_CreateEllipse") //FIXME: icon link + void CmdSketcherCreateEllipseByCenter::activated(int iMsg) { Q_UNUSED(iMsg); @@ -645,7 +610,7 @@ bool CmdSketcherCreateEllipseByCenter::isActive(void) } /// @brief Macro that declares a new sketcher command class 'CmdSketcherCreateEllipseBy3Points' -DEF_STD_CMD_A(CmdSketcherCreateEllipseBy3Points) +DEF_STD_CMD_AU(CmdSketcherCreateEllipseBy3Points) /** * @brief ctor @@ -664,6 +629,8 @@ CmdSketcherCreateEllipseBy3Points::CmdSketcherCreateEllipseBy3Points() eType = ForEdit; } +CONSTRUCTION_UPDATE_ACTION(CmdSketcherCreateEllipseBy3Points,"Sketcher_CreateEllipse_3points") + void CmdSketcherCreateEllipseBy3Points::activated(int iMsg) { Q_UNUSED(iMsg); @@ -675,7 +642,7 @@ bool CmdSketcherCreateEllipseBy3Points::isActive(void) return isCommandActive(getActiveGuiDocument()); } -DEF_STD_CMD_A(CmdSketcherCreateArcOfEllipse) +DEF_STD_CMD_AU(CmdSketcherCreateArcOfEllipse) CmdSketcherCreateArcOfEllipse::CmdSketcherCreateArcOfEllipse() : Command("Sketcher_CreateArcOfEllipse") @@ -691,6 +658,8 @@ CmdSketcherCreateArcOfEllipse::CmdSketcherCreateArcOfEllipse() eType = ForEdit; } +CONSTRUCTION_UPDATE_ACTION(CmdSketcherCreateArcOfEllipse,"Sketcher_CreateElliptical_Arc") + void CmdSketcherCreateArcOfEllipse::activated(int iMsg) { Q_UNUSED(iMsg); @@ -702,7 +671,7 @@ bool CmdSketcherCreateArcOfEllipse::isActive(void) return isCommandActive(getActiveGuiDocument()); } -DEF_STD_CMD_A(CmdSketcherCreateArcOfHyperbola) +DEF_STD_CMD_AU(CmdSketcherCreateArcOfHyperbola) CmdSketcherCreateArcOfHyperbola::CmdSketcherCreateArcOfHyperbola() : Command("Sketcher_CreateArcOfHyperbola") @@ -718,6 +687,8 @@ CmdSketcherCreateArcOfHyperbola::CmdSketcherCreateArcOfHyperbola() eType = ForEdit; } +CONSTRUCTION_UPDATE_ACTION(CmdSketcherCreateArcOfHyperbola,"Sketcher_CreateHyperbolic_Arc") + void CmdSketcherCreateArcOfHyperbola::activated(int /*iMsg*/) { ActivateHandler(getActiveGuiDocument(),new DrawSketchHandlerArcOfHyperbola() ); @@ -728,7 +699,7 @@ bool CmdSketcherCreateArcOfHyperbola::isActive(void) return isCommandActive(getActiveGuiDocument()); } -DEF_STD_CMD_A(CmdSketcherCreateArcOfParabola) +DEF_STD_CMD_AU(CmdSketcherCreateArcOfParabola) CmdSketcherCreateArcOfParabola::CmdSketcherCreateArcOfParabola() : Command("Sketcher_CreateArcOfParabola") @@ -744,6 +715,8 @@ CmdSketcherCreateArcOfParabola::CmdSketcherCreateArcOfParabola() eType = ForEdit; } +CONSTRUCTION_UPDATE_ACTION(CmdSketcherCreateArcOfParabola,"Sketcher_CreateParabolic_Arc") + void CmdSketcherCreateArcOfParabola::activated(int /*iMsg*/) { ActivateHandler(getActiveGuiDocument(),new DrawSketchHandlerArcOfParabola() ); @@ -902,7 +875,7 @@ bool CmdSketcherCompCreateConic::isActive(void) // ====================================================================================== -DEF_STD_CMD_A(CmdSketcherCreateBSpline) +DEF_STD_CMD_AU(CmdSketcherCreateBSpline) CmdSketcherCreateBSpline::CmdSketcherCreateBSpline() : Command("Sketcher_CreateBSpline") @@ -918,33 +891,21 @@ CmdSketcherCreateBSpline::CmdSketcherCreateBSpline() eType = ForEdit; } +CONSTRUCTION_UPDATE_ACTION(CmdSketcherCreateBSpline,"Sketcher_CreateBSpline") + void CmdSketcherCreateBSpline::activated(int iMsg) { Q_UNUSED(iMsg); ActivateHandler(getActiveGuiDocument(),new DrawSketchHandlerBSpline(0) ); } -/*void CmdSketcherCreateBSpline::updateAction(int mode) -{ - switch (mode) { - case Normal: - if (getAction()) - getAction()->setIcon(Gui::BitmapFactory().iconFromTheme("Sketcher_CreateBSpline")); - break; - case Construction: - if (getAction()) - getAction()->setIcon(Gui::BitmapFactory().iconFromTheme("Sketcher_CreateBSpline_Constr")); - break; - } -}*/ - bool CmdSketcherCreateBSpline::isActive(void) { return isCommandActive(getActiveGuiDocument()); } /// @brief Macro that declares a new sketcher command class 'CmdSketcherCreateBSpline' -DEF_STD_CMD_A(CmdSketcherCreatePeriodicBSpline) +DEF_STD_CMD_AU(CmdSketcherCreatePeriodicBSpline) /** * @brief ctor @@ -963,6 +924,8 @@ CmdSketcherCreatePeriodicBSpline::CmdSketcherCreatePeriodicBSpline() eType = ForEdit; } +CONSTRUCTION_UPDATE_ACTION(CmdSketcherCreatePeriodicBSpline,"Sketcher_Create_Periodic_BSpline") + void CmdSketcherCreatePeriodicBSpline::activated(int iMsg) { Q_UNUSED(iMsg); @@ -1088,7 +1051,7 @@ bool CmdSketcherCompCreateBSpline::isActive(void) // ====================================================================================== -DEF_STD_CMD_A(CmdSketcherCreate3PointCircle) +DEF_STD_CMD_AU(CmdSketcherCreate3PointCircle) CmdSketcherCreate3PointCircle::CmdSketcherCreate3PointCircle() : Command("Sketcher_Create3PointCircle") @@ -1104,6 +1067,8 @@ CmdSketcherCreate3PointCircle::CmdSketcherCreate3PointCircle() eType = ForEdit; } +CONSTRUCTION_UPDATE_ACTION(CmdSketcherCreate3PointCircle,"Sketcher_Create3PointCircle") + void CmdSketcherCreate3PointCircle::activated(int iMsg) { Q_UNUSED(iMsg); @@ -1541,6 +1506,8 @@ CmdSketcherCarbonCopy::CmdSketcherCarbonCopy() eType = ForEdit; } +CONSTRUCTION_UPDATE_ACTION(CmdSketcherCarbonCopy,"Sketcher_CarbonCopy") + void CmdSketcherCarbonCopy::activated(int iMsg) { Q_UNUSED(iMsg); @@ -1552,20 +1519,6 @@ bool CmdSketcherCarbonCopy::isActive(void) return isCommandActive(getActiveGuiDocument()); } -void CmdSketcherCarbonCopy::updateAction(int mode) -{ - switch (mode) { - case Normal: - if (getAction()) - getAction()->setIcon(Gui::BitmapFactory().iconFromTheme("Sketcher_CarbonCopy")); - break; - case Construction: - if (getAction()) - getAction()->setIcon(Gui::BitmapFactory().iconFromTheme("Sketcher_CarbonCopy_Constr")); - break; - } -} - /** * Create Slot @@ -1587,26 +1540,14 @@ CmdSketcherCreateSlot::CmdSketcherCreateSlot() eType = ForEdit; } +CONSTRUCTION_UPDATE_ACTION(CmdSketcherCreateSlot,"Sketcher_CreateSlot") + void CmdSketcherCreateSlot::activated(int iMsg) { Q_UNUSED(iMsg); ActivateHandler(getActiveGuiDocument(), new DrawSketchHandlerSlot()); } -void CmdSketcherCreateSlot::updateAction(int mode) -{ - switch (mode) { - case Normal: - if (getAction()) - getAction()->setIcon(Gui::BitmapFactory().iconFromTheme("Sketcher_CreateSlot")); - break; - case Construction: - if (getAction()) - getAction()->setIcon(Gui::BitmapFactory().iconFromTheme("Sketcher_CreateSlot_Constr")); - break; - } -} - bool CmdSketcherCreateSlot::isActive(void) { return isCommandActive(getActiveGuiDocument()); @@ -1614,7 +1555,7 @@ bool CmdSketcherCreateSlot::isActive(void) /* Create Regular Polygon ==============================================*/ -DEF_STD_CMD_A(CmdSketcherCreateTriangle) +DEF_STD_CMD_AU(CmdSketcherCreateTriangle) CmdSketcherCreateTriangle::CmdSketcherCreateTriangle() : Command("Sketcher_CreateTriangle") @@ -1630,6 +1571,8 @@ CmdSketcherCreateTriangle::CmdSketcherCreateTriangle() eType = ForEdit; } +CONSTRUCTION_UPDATE_ACTION(CmdSketcherCreateTriangle,"Sketcher_CreateTriangle") + void CmdSketcherCreateTriangle::activated(int iMsg) { Q_UNUSED(iMsg); @@ -1641,7 +1584,7 @@ bool CmdSketcherCreateTriangle::isActive(void) return isCommandActive(getActiveGuiDocument()); } -DEF_STD_CMD_A(CmdSketcherCreateSquare) +DEF_STD_CMD_AU(CmdSketcherCreateSquare) CmdSketcherCreateSquare::CmdSketcherCreateSquare() : Command("Sketcher_CreateSquare") @@ -1657,6 +1600,8 @@ CmdSketcherCreateSquare::CmdSketcherCreateSquare() eType = ForEdit; } +CONSTRUCTION_UPDATE_ACTION(CmdSketcherCreateSquare,"Sketcher_CreateSquare") + void CmdSketcherCreateSquare::activated(int iMsg) { Q_UNUSED(iMsg); @@ -1668,7 +1613,7 @@ bool CmdSketcherCreateSquare::isActive(void) return isCommandActive(getActiveGuiDocument()); } -DEF_STD_CMD_A(CmdSketcherCreatePentagon) +DEF_STD_CMD_AU(CmdSketcherCreatePentagon) CmdSketcherCreatePentagon::CmdSketcherCreatePentagon() : Command("Sketcher_CreatePentagon") @@ -1684,6 +1629,8 @@ CmdSketcherCreatePentagon::CmdSketcherCreatePentagon() eType = ForEdit; } +CONSTRUCTION_UPDATE_ACTION(CmdSketcherCreatePentagon,"Sketcher_CreatePentagon") + void CmdSketcherCreatePentagon::activated(int iMsg) { Q_UNUSED(iMsg); @@ -1696,7 +1643,7 @@ bool CmdSketcherCreatePentagon::isActive(void) } -DEF_STD_CMD_A(CmdSketcherCreateHexagon) +DEF_STD_CMD_AU(CmdSketcherCreateHexagon) CmdSketcherCreateHexagon::CmdSketcherCreateHexagon() : Command("Sketcher_CreateHexagon") @@ -1712,6 +1659,8 @@ CmdSketcherCreateHexagon::CmdSketcherCreateHexagon() eType = ForEdit; } +CONSTRUCTION_UPDATE_ACTION(CmdSketcherCreateHexagon,"Sketcher_CreateHexagon") + void CmdSketcherCreateHexagon::activated(int iMsg) { Q_UNUSED(iMsg); @@ -1723,7 +1672,7 @@ bool CmdSketcherCreateHexagon::isActive(void) return isCommandActive(getActiveGuiDocument()); } -DEF_STD_CMD_A(CmdSketcherCreateHeptagon) +DEF_STD_CMD_AU(CmdSketcherCreateHeptagon) CmdSketcherCreateHeptagon::CmdSketcherCreateHeptagon() : Command("Sketcher_CreateHeptagon") @@ -1739,6 +1688,8 @@ CmdSketcherCreateHeptagon::CmdSketcherCreateHeptagon() eType = ForEdit; } +CONSTRUCTION_UPDATE_ACTION(CmdSketcherCreateHeptagon,"Sketcher_CreateHeptagon") + void CmdSketcherCreateHeptagon::activated(int iMsg) { Q_UNUSED(iMsg); @@ -1750,7 +1701,7 @@ bool CmdSketcherCreateHeptagon::isActive(void) return isCommandActive(getActiveGuiDocument()); } -DEF_STD_CMD_A(CmdSketcherCreateOctagon) +DEF_STD_CMD_AU(CmdSketcherCreateOctagon) CmdSketcherCreateOctagon::CmdSketcherCreateOctagon() : Command("Sketcher_CreateOctagon") @@ -1766,6 +1717,8 @@ CmdSketcherCreateOctagon::CmdSketcherCreateOctagon() eType = ForEdit; } +CONSTRUCTION_UPDATE_ACTION(CmdSketcherCreateOctagon,"Sketcher_CreateOctagon") + void CmdSketcherCreateOctagon::activated(int iMsg) { Q_UNUSED(iMsg); @@ -1777,7 +1730,7 @@ bool CmdSketcherCreateOctagon::isActive(void) return isCommandActive(getActiveGuiDocument()); } -DEF_STD_CMD_A(CmdSketcherCreateRegularPolygon) +DEF_STD_CMD_AU(CmdSketcherCreateRegularPolygon) CmdSketcherCreateRegularPolygon::CmdSketcherCreateRegularPolygon() : Command("Sketcher_CreateRegularPolygon") @@ -1793,6 +1746,8 @@ CmdSketcherCreateRegularPolygon::CmdSketcherCreateRegularPolygon() eType = ForEdit; } +CONSTRUCTION_UPDATE_ACTION(CmdSketcherCreateRegularPolygon,"Sketcher_CreateRegularPolygon") + void CmdSketcherCreateRegularPolygon::activated(int iMsg) { Q_UNUSED(iMsg);