From a1d8949194262033eff8ff332e6c5cb18fcf8d75 Mon Sep 17 00:00:00 2001 From: Florian Foinant-Willig Date: Mon, 14 Aug 2023 22:12:18 +0200 Subject: [PATCH] Fix menu and ressource file --- src/Mod/Sketcher/Gui/Resources/Sketcher.qrc | 75 +++++++++++++-------- src/Mod/Sketcher/Gui/Workbench.cpp | 35 +++++----- 2 files changed, 63 insertions(+), 47 deletions(-) diff --git a/src/Mod/Sketcher/Gui/Resources/Sketcher.qrc b/src/Mod/Sketcher/Gui/Resources/Sketcher.qrc index ae46a831bc..52f4638e45 100644 --- a/src/Mod/Sketcher/Gui/Resources/Sketcher.qrc +++ b/src/Mod/Sketcher/Gui/Resources/Sketcher.qrc @@ -1,7 +1,10 @@ - icons/SketcherWorkbench.svg icons/Sketcher_Sketch.svg + icons/SketcherWorkbench.svg + icons/SketcherWorkbench.svg + + icons/constraints/Constraint_Block.svg icons/constraints/Constraint_Concentric.svg icons/constraints/Constraint_Diameter.svg @@ -34,10 +37,10 @@ icons/constraints/Constraint_PointOnPoint.svg icons/constraints/Constraint_PointOnStart.svg icons/constraints/Constraint_PointToObject.svg - icons/constraints/Constraint_Radiam.svg - icons/constraints/Constraint_Radiam_Driven.svg icons/constraints/Constraint_Radius.svg icons/constraints/Constraint_Radius_Driven.svg + icons/constraints/Constraint_Radiam.svg + icons/constraints/Constraint_Radiam_Driven.svg icons/constraints/Constraint_SnellsLaw.svg icons/constraints/Constraint_SnellsLaw_Driven.svg icons/constraints/Constraint_Symmetric.svg @@ -52,7 +55,8 @@ icons/constraints/Sketcher_ToggleConstraint.svg icons/constraints/Sketcher_Toggle_Constraint_Driven.svg icons/constraints/Sketcher_Toggle_Constraint_Driving.svg - icons/dialogs/Sketcher_Settings.svg + + icons/elements/Sketcher_Element_Arc_Edge.svg icons/elements/Sketcher_Element_Arc_EndPoint.svg icons/elements/Sketcher_Element_Arc_MidPoint.svg @@ -87,24 +91,28 @@ icons/elements/Sketcher_Element_Parabolic_Arc_Start_Point.svg icons/elements/Sketcher_Element_Point_StartingPoint.svg icons/elements/Sketcher_Element_SelectionTypeInvalid.svg + + icons/general/Sketcher_EditSketch.svg - icons/general/Sketcher_GridToggle.svg - icons/general/Sketcher_GridToggle_Deactivated.svg icons/general/Sketcher_LeaveSketch.svg icons/general/Sketcher_MapSketch.svg icons/general/Sketcher_MergeSketch.svg icons/general/Sketcher_MirrorSketch.svg icons/general/Sketcher_NewSketch.svg - icons/general/Sketcher_RenderingOrder_Construction.svg - icons/general/Sketcher_RenderingOrder_External.svg - icons/general/Sketcher_RenderingOrder_Normal.svg icons/general/Sketcher_ReorientSketch.svg - icons/general/Sketcher_Snap.svg - icons/general/Sketcher_Snap_Deactivated.svg icons/general/Sketcher_SwitchVirtualSpace.svg icons/general/Sketcher_ValidateSketch.svg icons/general/Sketcher_ViewSection.svg icons/general/Sketcher_ViewSketch.svg + icons/general/Sketcher_GridToggle.svg + icons/general/Sketcher_GridToggle_Deactivated.svg + icons/general/Sketcher_RenderingOrder_Construction.svg + icons/general/Sketcher_RenderingOrder_External.svg + icons/general/Sketcher_RenderingOrder_Normal.svg + icons/general/Sketcher_Snap.svg + icons/general/Sketcher_Snap_Deactivated.svg + + icons/geometry/Sketcher_AlterFillet.svg icons/geometry/Sketcher_CarbonCopy.svg icons/geometry/Sketcher_CarbonCopy_Constr.svg @@ -119,18 +127,21 @@ icons/geometry/Sketcher_CreateArc.svg icons/geometry/Sketcher_CreateArc_Constr.svg icons/geometry/Sketcher_CreateBSpline.svg + icons/geometry/Sketcher_CreateBSpline_Constr.svg icons/geometry/Sketcher_CreateBSplineByInterpolation.svg icons/geometry/Sketcher_CreateBSplineByInterpolation_Constr.svg - icons/geometry/Sketcher_CreateBSpline_Constr.svg + icons/geometry/Sketcher_Create_Periodic_BSplineByInterpolation.svg + icons/geometry/Sketcher_Create_Periodic_BSplineByInterpolation_Constr.svg icons/geometry/Sketcher_CreateCircle.svg icons/geometry/Sketcher_CreateCircle_Constr.svg - icons/geometry/Sketcher_CreateEllipseByCenter.svg - icons/geometry/Sketcher_CreateEllipseByCenter_Constr.svg icons/geometry/Sketcher_CreateEllipse_3points.svg icons/geometry/Sketcher_CreateEllipse_3points_Constr.svg + icons/geometry/Sketcher_CreateEllipseByCenter.svg + icons/geometry/Sketcher_CreateEllipseByCenter_Constr.svg icons/geometry/Sketcher_CreateElliptical_Arc.svg icons/geometry/Sketcher_CreateElliptical_Arc_Constr.svg icons/geometry/Sketcher_CreateFillet.svg + icons/geometry/Sketcher_CreatePointFillet.svg icons/geometry/Sketcher_CreateHeptagon.svg icons/geometry/Sketcher_CreateHeptagon_Constr.svg icons/geometry/Sketcher_CreateHexagon.svg @@ -147,14 +158,15 @@ icons/geometry/Sketcher_CreateParabolic_Arc_Constr.svg icons/geometry/Sketcher_CreatePentagon.svg icons/geometry/Sketcher_CreatePentagon_Constr.svg + icons/geometry/Sketcher_Create_Periodic_BSpline.svg + icons/geometry/Sketcher_Create_Periodic_BSpline_Constr.svg icons/geometry/Sketcher_CreatePoint.svg - icons/geometry/Sketcher_CreatePointFillet.svg icons/geometry/Sketcher_CreatePolyline.svg icons/geometry/Sketcher_CreatePolyline_Constr.svg icons/geometry/Sketcher_CreateRectangle.svg + icons/geometry/Sketcher_CreateRectangle_Constr.svg icons/geometry/Sketcher_CreateRectangle_Center.svg icons/geometry/Sketcher_CreateRectangle_Center_Constr.svg - icons/geometry/Sketcher_CreateRectangle_Constr.svg icons/geometry/Sketcher_CreateRegularPolygon.svg icons/geometry/Sketcher_CreateRegularPolygon_Constr.svg icons/geometry/Sketcher_CreateSlot.svg @@ -164,15 +176,13 @@ icons/geometry/Sketcher_CreateText.svg icons/geometry/Sketcher_CreateTriangle.svg icons/geometry/Sketcher_CreateTriangle_Constr.svg - icons/geometry/Sketcher_Create_Periodic_BSpline.svg - icons/geometry/Sketcher_Create_Periodic_BSplineByInterpolation.svg - icons/geometry/Sketcher_Create_Periodic_BSplineByInterpolation_Constr.svg - icons/geometry/Sketcher_Create_Periodic_BSpline_Constr.svg icons/geometry/Sketcher_Extend.svg icons/geometry/Sketcher_External.svg icons/geometry/Sketcher_Split.svg icons/geometry/Sketcher_ToggleConstruction.svg icons/geometry/Sketcher_Trimming.svg + + icons/obsolete/Sketcher_ConstrainCoincident_old.svg icons/obsolete/Sketcher_ConstrainDistance_old.svg icons/obsolete/Sketcher_ConstrainHorizontal_old.svg @@ -182,12 +192,8 @@ icons/obsolete/Sketcher_ProfilesHexagon1.svg icons/obsolete/Sketcher_ToggleConstruction_old.svg icons/obsolete/Sketcher_ToggleNormal.svg - icons/overlay/Sketcher_ArcOverlay.svg - icons/overlay/Sketcher_BSplineComb.svg - icons/overlay/Sketcher_BSplineDegree.svg - icons/overlay/Sketcher_BSplineKnotMultiplicity.svg - icons/overlay/Sketcher_BSplinePoleWeight.svg - icons/overlay/Sketcher_BSplinePolygon.svg + + icons/pointers/Sketcher_Pointer_CarbonCopy.svg icons/pointers/Sketcher_Pointer_Create_3PointArc.svg icons/pointers/Sketcher_Pointer_Create_3PointCircle.svg @@ -195,8 +201,8 @@ icons/pointers/Sketcher_Pointer_Create_ArcOfEllipse.svg icons/pointers/Sketcher_Pointer_Create_ArcOfHyperbola.svg icons/pointers/Sketcher_Pointer_Create_ArcOfParabola.svg - icons/pointers/Sketcher_Pointer_Create_BSpline.svg icons/pointers/Sketcher_Pointer_Create_Box.svg + icons/pointers/Sketcher_Pointer_Create_BSpline.svg icons/pointers/Sketcher_Pointer_Create_Circle.svg icons/pointers/Sketcher_Pointer_Create_Ellipse.svg icons/pointers/Sketcher_Pointer_Create_Fillet.svg @@ -211,6 +217,8 @@ icons/pointers/Sketcher_Pointer_Slot.svg icons/pointers/Sketcher_Pointer_Splitting.svg icons/pointers/Sketcher_Pointer_Trimming.svg + + icons/splines/Sketcher_BSplineApproximate.svg icons/splines/Sketcher_BSplineDecreaseDegree.svg icons/splines/Sketcher_BSplineDecreaseKnotMultiplicity.svg @@ -218,6 +226,16 @@ icons/splines/Sketcher_BSplineIncreaseKnotMultiplicity.svg icons/splines/Sketcher_BSplineInsertKnot.svg icons/splines/Sketcher_JoinCurves.svg + + + icons/overlay/Sketcher_BSplineComb.svg + icons/overlay/Sketcher_BSplineDegree.svg + icons/overlay/Sketcher_BSplineKnotMultiplicity.svg + icons/overlay/Sketcher_BSplinePoleWeight.svg + icons/overlay/Sketcher_BSplinePolygon.svg + icons/overlay/Sketcher_ArcOverlay.svg + + icons/tools/Sketcher_Clone.svg icons/tools/Sketcher_Copy.svg icons/tools/Sketcher_DeleteConstraints.svg @@ -235,4 +253,7 @@ icons/tools/Sketcher_SelectVerticalAxis.svg icons/tools/Sketcher_Symmetry.svg + + icons/dialogs/Sketcher_Settings.svg + diff --git a/src/Mod/Sketcher/Gui/Workbench.cpp b/src/Mod/Sketcher/Gui/Workbench.cpp index 09dbdddf9f..7f8456ec46 100644 --- a/src/Mod/Sketcher/Gui/Workbench.cpp +++ b/src/Mod/Sketcher/Gui/Workbench.cpp @@ -134,10 +134,10 @@ Gui::ToolBarItem* Workbench::setupToolBars() const bspline->setCommand("Sketcher B-spline tools"); addSketcherWorkbenchBSplines(*bspline); - Gui::ToolBarItem* virtualspace = + Gui::ToolBarItem* visual = new Gui::ToolBarItem(root, Gui::ToolBarItem::DefaultVisibility::Unavailable); - virtualspace->setCommand("Sketcher virtual space"); - addSketcherWorkbenchVirtualSpace(*virtualspace); + visual->setCommand("Sketcher visual"); + addSketcherWorkbenchVisual(*visual); Gui::ToolBarItem* edittools = new Gui::ToolBarItem(root, Gui::ToolBarItem::DefaultVisibility::Unavailable); @@ -500,12 +500,7 @@ inline void SketcherAddWorkbenchBSplines(T& bspline); template<> inline void SketcherAddWorkbenchBSplines(Gui::MenuItem& bspline) { - bspline << "Sketcher_BSplineDegree" - << "Sketcher_BSplinePolygon" - << "Sketcher_BSplineComb" - << "Sketcher_BSplineKnotMultiplicity" - << "Sketcher_BSplinePoleWeight" - << "Sketcher_BSplineConvertToNURBS" + bspline << "Sketcher_BSplineConvertToNURBS" << "Sketcher_BSplineIncreaseDegree" << "Sketcher_BSplineDecreaseDegree" << "Sketcher_BSplineIncreaseKnotMultiplicity" @@ -526,22 +521,22 @@ inline void SketcherAddWorkbenchBSplines(Gui::ToolBarItem& bsp } template -inline void SketcherAddWorkbenchVirtualSpace(T& virtualspace); +inline void SketcherAddWorkbenchVisual(T& visual); template<> -inline void SketcherAddWorkbenchVirtualSpace(Gui::MenuItem& virtualspace) +inline void SketcherAddWorkbenchVisual(Gui::MenuItem& visual) { - virtualspace << "Sketcher_SwitchVirtualSpace" - << "Sketcher_CompBSplineShowHideGeometryInformation" - << "Sketcher_ArcOverlay"; + visual << "Sketcher_SwitchVirtualSpace" + << "Sketcher_CompBSplineShowHideGeometryInformation" + << "Sketcher_ArcOverlay"; } template<> -inline void SketcherAddWorkbenchVirtualSpace(Gui::ToolBarItem& virtualspace) +inline void SketcherAddWorkbenchVisual(Gui::ToolBarItem& visual) { - virtualspace << "Sketcher_SwitchVirtualSpace" - << "Sketcher_CompBSplineShowHideGeometryInformation" - << "Sketcher_ArcOverlay"; + visual << "Sketcher_SwitchVirtualSpace" + << "Sketcher_CompBSplineShowHideGeometryInformation" + << "Sketcher_ArcOverlay"; } template @@ -585,9 +580,9 @@ void addSketcherWorkbenchBSplines(Gui::MenuItem& bspline) SketcherAddWorkbenchBSplines(bspline); } -void addSketcherWorkbenchVirtualSpace(Gui::MenuItem& virtualspace) +void addSketcherWorkbenchVisual(Gui::MenuItem& visual) { - SketcherAddWorkbenchVirtualSpace(virtualspace); + SketcherAddWorkbenchVisual(visual); } void addSketcherWorkbenchSketchActions(Gui::ToolBarItem& sketch)