From 817f2f15aaf1440ee2b9681908e11fe42506d9e2 Mon Sep 17 00:00:00 2001 From: vocx-fc Date: Fri, 25 Sep 2020 02:01:18 -0500 Subject: [PATCH] Sketcher: add two icons reorient and validate --- src/Mod/Sketcher/Gui/Command.cpp | 2 + src/Mod/Sketcher/Gui/Resources/Sketcher.qrc | 204 +++---- .../icons/Sketcher_ReorientSketch.svg | 570 ++++++++++++++++++ .../icons/Sketcher_ValidateSketch.svg | 363 +++++++++++ 4 files changed, 1034 insertions(+), 105 deletions(-) create mode 100644 src/Mod/Sketcher/Gui/Resources/icons/Sketcher_ReorientSketch.svg create mode 100644 src/Mod/Sketcher/Gui/Resources/icons/Sketcher_ValidateSketch.svg diff --git a/src/Mod/Sketcher/Gui/Command.cpp b/src/Mod/Sketcher/Gui/Command.cpp index c80bed10fc..9aaf56d6f0 100644 --- a/src/Mod/Sketcher/Gui/Command.cpp +++ b/src/Mod/Sketcher/Gui/Command.cpp @@ -378,6 +378,7 @@ CmdSketcherReorientSketch::CmdSketcherReorientSketch() sToolTipText = QT_TR_NOOP("Reorient the selected sketch"); sWhatsThis = "Sketcher_ReorientSketch"; sStatusTip = sToolTipText; + sPixmap = "Sketcher_ReorientSketch"; } void CmdSketcherReorientSketch::activated(int iMsg) @@ -658,6 +659,7 @@ CmdSketcherValidateSketch::CmdSketcherValidateSketch() sWhatsThis = "Sketcher_ValidateSketch"; sStatusTip = sToolTipText; eType = 0; + sPixmap = "Sketcher_ValidateSketch"; } void CmdSketcherValidateSketch::activated(int iMsg) diff --git a/src/Mod/Sketcher/Gui/Resources/Sketcher.qrc b/src/Mod/Sketcher/Gui/Resources/Sketcher.qrc index 87616619eb..644a5f62ce 100644 --- a/src/Mod/Sketcher/Gui/Resources/Sketcher.qrc +++ b/src/Mod/Sketcher/Gui/Resources/Sketcher.qrc @@ -1,4 +1,36 @@ + + icons/Sketcher_AlterFillet.svg + icons/Sketcher_CarbonCopy.svg + icons/Sketcher_CarbonCopy_Constr.svg + icons/Sketcher_Crosshair.svg + icons/Sketcher_DraftLine.svg + icons/Sketcher_EditSketch.svg + icons/Sketcher_Extend.svg + icons/Sketcher_External.svg + icons/Sketcher_LeaveSketch.svg + icons/Sketcher_MapSketch.svg + icons/Sketcher_MergeSketch.svg + icons/Sketcher_MirrorSketch.svg + icons/Sketcher_NewSketch.svg + icons/Sketcher_NewSketch.svg + icons/Sketcher_ProfilesHexagon1.svg + icons/Sketcher_ReorientSketch.svg + icons/Sketcher_Sketch.svg + icons/Sketcher_SwitchVirtualSpace.svg + icons/Sketcher_ToggleActiveConstraint.svg + icons/Sketcher_ToggleConstraint.svg + icons/Sketcher_Toggle_Constraint_Driven.svg + icons/Sketcher_Toggle_Constraint_Driving.svg + icons/Sketcher_ToggleConstruction.svg + icons/Sketcher_ToggleConstruction_old.svg + icons/Sketcher_ToggleNormal.svg + icons/Sketcher_Trimming.svg + icons/Sketcher_ValidateSketch.svg + icons/Sketcher_ViewSection.svg + icons/Sketcher_ViewSketch.svg + icons/SketcherWorkbench.svg + icons/constraints/Constraint_Block.svg icons/constraints/Constraint_Concentric.svg @@ -45,22 +77,40 @@ icons/constraints/Constraint_VerticalDistance_Driven.svg - icons/Sketcher_AlterFillet.svg - - - icons/splines/Sketcher_BSplineApproximate.svg - icons/splines/Sketcher_BSplineComb.svg - icons/splines/Sketcher_BSplineDecreaseDegree.svg - icons/splines/Sketcher_BSplineDecreaseKnotMultiplicity.svg - icons/splines/Sketcher_BSplineDegree.svg - icons/splines/Sketcher_BSplineIncreaseDegree.svg - icons/splines/Sketcher_BSplineIncreaseKnotMultiplicity.svg - icons/splines/Sketcher_BSplineKnotMultiplicity.svg - icons/splines/Sketcher_BSplinePolygon.svg - - - icons/Sketcher_CarbonCopy.svg - icons/Sketcher_CarbonCopy_Constr.svg + icons/elements/Sketcher_Element_Arc_Edge.svg + icons/elements/Sketcher_Element_Arc_EndPoint.svg + icons/elements/Sketcher_Element_Arc_MidPoint.svg + icons/elements/Sketcher_Element_Arc_StartingPoint.svg + icons/elements/Sketcher_Element_BSpline_Edge.svg + icons/elements/Sketcher_Element_BSpline_EndPoint.svg + icons/elements/Sketcher_Element_BSpline_StartPoint.svg + icons/elements/Sketcher_Element_Circle_Edge.svg + icons/elements/Sketcher_Element_Circle_MidPoint.svg + icons/elements/Sketcher_Element_Ellipse_All.svg + icons/elements/Sketcher_Element_Ellipse_CentrePoint.svg + icons/elements/Sketcher_Element_Ellipse_Edge_1.svg + icons/elements/Sketcher_Element_Ellipse_Edge_2.svg + icons/elements/Sketcher_Element_Ellipse_Focus1.svg + icons/elements/Sketcher_Element_Ellipse_Focus2.svg + icons/elements/Sketcher_Element_Ellipse_MajorAxis.svg + icons/elements/Sketcher_Element_Ellipse_MinorAxis.svg + icons/elements/Sketcher_Element_Elliptical_Arc_Centre_Point.svg + icons/elements/Sketcher_Element_Elliptical_Arc_Edge.svg + icons/elements/Sketcher_Element_Elliptical_Arc_End_Point.svg + icons/elements/Sketcher_Element_Elliptical_Arc_Start_Point.svg + icons/elements/Sketcher_Element_Hyperbolic_Arc_Centre_Point.svg + icons/elements/Sketcher_Element_Hyperbolic_Arc_Edge.svg + icons/elements/Sketcher_Element_Hyperbolic_Arc_End_Point.svg + icons/elements/Sketcher_Element_Hyperbolic_Arc_Start_Point.svg + icons/elements/Sketcher_Element_Line_Edge.svg + icons/elements/Sketcher_Element_Line_EndPoint.svg + icons/elements/Sketcher_Element_Line_StartingPoint.svg + icons/elements/Sketcher_Element_Parabolic_Arc_Centre_Point.svg + icons/elements/Sketcher_Element_Parabolic_Arc_Edge.svg + icons/elements/Sketcher_Element_Parabolic_Arc_End_Point.svg + icons/elements/Sketcher_Element_Parabolic_Arc_Start_Point.svg + icons/elements/Sketcher_Element_Point_StartingPoint.svg + icons/elements/Sketcher_Element_SelectionTypeInvalid.svg icons/geometry/Sketcher_Conics.svg @@ -116,55 +166,11 @@ icons/geometry/Sketcher_CreateTriangle_Constr.svg - icons/Sketcher_Crosshair.svg - icons/Sketcher_DraftLine.svg - icons/Sketcher_EditSketch.svg - - - icons/elements/Sketcher_Element_Arc_Edge.svg - icons/elements/Sketcher_Element_Arc_EndPoint.svg - icons/elements/Sketcher_Element_Arc_MidPoint.svg - icons/elements/Sketcher_Element_Arc_StartingPoint.svg - icons/elements/Sketcher_Element_BSpline_Edge.svg - icons/elements/Sketcher_Element_BSpline_EndPoint.svg - icons/elements/Sketcher_Element_BSpline_StartPoint.svg - icons/elements/Sketcher_Element_Circle_Edge.svg - icons/elements/Sketcher_Element_Circle_MidPoint.svg - icons/elements/Sketcher_Element_Ellipse_All.svg - icons/elements/Sketcher_Element_Ellipse_CentrePoint.svg - icons/elements/Sketcher_Element_Ellipse_Edge_1.svg - icons/elements/Sketcher_Element_Ellipse_Edge_2.svg - icons/elements/Sketcher_Element_Ellipse_Focus1.svg - icons/elements/Sketcher_Element_Ellipse_Focus2.svg - icons/elements/Sketcher_Element_Ellipse_MajorAxis.svg - icons/elements/Sketcher_Element_Ellipse_MinorAxis.svg - icons/elements/Sketcher_Element_Elliptical_Arc_Centre_Point.svg - icons/elements/Sketcher_Element_Elliptical_Arc_Edge.svg - icons/elements/Sketcher_Element_Elliptical_Arc_End_Point.svg - icons/elements/Sketcher_Element_Elliptical_Arc_Start_Point.svg - icons/elements/Sketcher_Element_Hyperbolic_Arc_Centre_Point.svg - icons/elements/Sketcher_Element_Hyperbolic_Arc_Edge.svg - icons/elements/Sketcher_Element_Hyperbolic_Arc_End_Point.svg - icons/elements/Sketcher_Element_Hyperbolic_Arc_Start_Point.svg - icons/elements/Sketcher_Element_Line_Edge.svg - icons/elements/Sketcher_Element_Line_EndPoint.svg - icons/elements/Sketcher_Element_Line_StartingPoint.svg - icons/elements/Sketcher_Element_Parabolic_Arc_Centre_Point.svg - icons/elements/Sketcher_Element_Parabolic_Arc_Edge.svg - icons/elements/Sketcher_Element_Parabolic_Arc_End_Point.svg - icons/elements/Sketcher_Element_Parabolic_Arc_Start_Point.svg - icons/elements/Sketcher_Element_Point_StartingPoint.svg - icons/elements/Sketcher_Element_SelectionTypeInvalid.svg - - - icons/Sketcher_Extend.svg - icons/Sketcher_External.svg - icons/Sketcher_LeaveSketch.svg - icons/Sketcher_MapSketch.svg - icons/Sketcher_MergeSketch.svg - icons/Sketcher_MirrorSketch.svg - icons/Sketcher_NewSketch.svg - icons/Sketcher_NewSketch.svg + icons/obsolete/Sketcher_ConstrainCoincident_old.svg + icons/obsolete/Sketcher_ConstrainDistance_old.svg + icons/obsolete/Sketcher_ConstrainHorizontal_old.svg + icons/obsolete/Sketcher_ConstrainParallel_old.svg + icons/obsolete/Sketcher_ConstrainVertical_old.svg icons/pointers/Sketcher_Pointer_CarbonCopy.svg @@ -188,46 +194,6 @@ icons/pointers/Sketcher_Pointer_Slot.svg icons/pointers/Sketcher_Pointer_Trimming.svg - - icons/tools/Sketcher_Clone.svg - icons/tools/Sketcher_CloseShape.svg - icons/tools/Sketcher_ConnectLines.svg - icons/tools/Sketcher_Copy.svg - icons/tools/Sketcher_Move.svg - icons/tools/Sketcher_RectangularArray.svg - icons/tools/Sketcher_SelectConflictingConstraints.svg - icons/tools/Sketcher_SelectConstraints.svg - icons/tools/Sketcher_SelectElementsAssociatedWithConstraints.svg - icons/tools/Sketcher_SelectElementsWithDoFs.svg - icons/tools/Sketcher_SelectHorizontalAxis.svg - icons/tools/Sketcher_SelectOrigin.svg - icons/tools/Sketcher_SelectRedundantConstraints.svg - icons/tools/Sketcher_SelectVerticalAxis.svg - icons/tools/Sketcher_Symmetry.svg - - - icons/Sketcher_ProfilesHexagon1.svg - icons/Sketcher_Sketch.svg - icons/Sketcher_SwitchVirtualSpace.svg - icons/Sketcher_ToggleActiveConstraint.svg - icons/Sketcher_ToggleConstraint.svg - icons/Sketcher_Toggle_Constraint_Driven.svg - icons/Sketcher_Toggle_Constraint_Driving.svg - icons/Sketcher_ToggleConstruction.svg - icons/Sketcher_ToggleConstruction_old.svg - icons/Sketcher_ToggleNormal.svg - icons/Sketcher_Trimming.svg - icons/Sketcher_ViewSection.svg - icons/Sketcher_ViewSketch.svg - icons/SketcherWorkbench.svg - - - icons/obsolete/Sketcher_ConstrainCoincident_old.svg - icons/obsolete/Sketcher_ConstrainDistance_old.svg - icons/obsolete/Sketcher_ConstrainHorizontal_old.svg - icons/obsolete/Sketcher_ConstrainParallel_old.svg - icons/obsolete/Sketcher_ConstrainVertical_old.svg - icons/small/Constraint_Block_sm.xpm icons/small/Constraint_Concentric_sm.xpm @@ -255,6 +221,34 @@ icons/small/Constraint_VerticalDistance_sm.xpm icons/small/Constraint_Vertical_sm.xpm + + icons/splines/Sketcher_BSplineApproximate.svg + icons/splines/Sketcher_BSplineComb.svg + icons/splines/Sketcher_BSplineDecreaseDegree.svg + icons/splines/Sketcher_BSplineDecreaseKnotMultiplicity.svg + icons/splines/Sketcher_BSplineDegree.svg + icons/splines/Sketcher_BSplineIncreaseDegree.svg + icons/splines/Sketcher_BSplineIncreaseKnotMultiplicity.svg + icons/splines/Sketcher_BSplineKnotMultiplicity.svg + icons/splines/Sketcher_BSplinePolygon.svg + + + icons/tools/Sketcher_Clone.svg + icons/tools/Sketcher_CloseShape.svg + icons/tools/Sketcher_ConnectLines.svg + icons/tools/Sketcher_Copy.svg + icons/tools/Sketcher_Move.svg + icons/tools/Sketcher_RectangularArray.svg + icons/tools/Sketcher_SelectConflictingConstraints.svg + icons/tools/Sketcher_SelectConstraints.svg + icons/tools/Sketcher_SelectElementsAssociatedWithConstraints.svg + icons/tools/Sketcher_SelectElementsWithDoFs.svg + icons/tools/Sketcher_SelectHorizontalAxis.svg + icons/tools/Sketcher_SelectOrigin.svg + icons/tools/Sketcher_SelectRedundantConstraints.svg + icons/tools/Sketcher_SelectVerticalAxis.svg + icons/tools/Sketcher_Symmetry.svg + translations/Sketcher_af.qm translations/Sketcher_ar.qm diff --git a/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_ReorientSketch.svg b/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_ReorientSketch.svg new file mode 100644 index 0000000000..19d20b050e --- /dev/null +++ b/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_ReorientSketch.svg @@ -0,0 +1,570 @@ + + + Sketcher_ReorientSketch + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + Sketcher_ReorientSketch + + + [vocx] + + + Sketcher_MergeSketch + 2020-09-25 + http://www.freecadweb.org/wiki/index.php?title=Artwork + + + FreeCAD + + + FreeCAD/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_ReorientSketch.svg + + + CC-BY-SA 4.0 + + + https://www.gnu.org/copyleft/lesser.html + + + [agryson] Alexander Gryson + + + A coordinate axis system with three axes (red, blue, green) and three gray planes, next to a red sketch (square and circle). It was created from the 'MergeSketch' and 'Std_CoordinateSystem' icons. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_ValidateSketch.svg b/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_ValidateSketch.svg new file mode 100644 index 0000000000..8ab8ef821a --- /dev/null +++ b/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_ValidateSketch.svg @@ -0,0 +1,363 @@ + + + Sketcher_ValidateSketch + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + Sketcher_ValidateSketch + + + [vocx] + + + Sketcher_NewSketch + 2020-09-25 + http://www.freecadweb.org/wiki/index.php?title=Artwork + + + FreeCAD + + + FreeCAD/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_ValidateSketch.svg + + + FreeCAD CC-BY-SA 4.0 + + + https://www.gnu.org/copyleft/lesser.html + + + [agryson] Alexander Gryson + + + A white page, with a red sketch (square and circle), and a green circle with a white arrow inside of it. It is composed from the 'NewSketch' icon, and the 'button_valid' icon. + + + + + + + + + + + + + + + + + + + + + + + + + + + + +