diff --git a/src/Mod/Sketcher/Gui/DrawSketchHandlerBSpline.h b/src/Mod/Sketcher/Gui/DrawSketchHandlerBSpline.h index 1cf608168c..65ab45d998 100644 --- a/src/Mod/Sketcher/Gui/DrawSketchHandlerBSpline.h +++ b/src/Mod/Sketcher/Gui/DrawSketchHandlerBSpline.h @@ -395,7 +395,12 @@ private: QString getCrosshairCursorSVGName() const override { - return QString::fromLatin1("Sketcher_Pointer_Create_BSpline"); + if (SketcherGui::DrawSketchHandlerBSpline::ConstrMethod == 1) { + return QString::fromLatin1("Sketcher_Pointer_Create_Periodic_BSpline"); + } + else { + return QString::fromLatin1("Sketcher_Pointer_Create_BSpline"); + } } void addSugConstraint() diff --git a/src/Mod/Sketcher/Gui/DrawSketchHandlerBSplineByInterpolation.h b/src/Mod/Sketcher/Gui/DrawSketchHandlerBSplineByInterpolation.h index f919d98bd6..593c5f9cf9 100644 --- a/src/Mod/Sketcher/Gui/DrawSketchHandlerBSplineByInterpolation.h +++ b/src/Mod/Sketcher/Gui/DrawSketchHandlerBSplineByInterpolation.h @@ -392,7 +392,12 @@ private: QString getCrosshairCursorSVGName() const override { - return QString::fromLatin1("Sketcher_Pointer_Create_BSpline"); + if (SketcherGui::DrawSketchHandlerBSplineByInterpolation::ConstrMethod == 1) { + return QString::fromLatin1("Sketcher_Pointer_Create_Periodic_BSplineByInterpolation"); + } + else { + return QString::fromLatin1("Sketcher_Pointer_Create_BSplineByInterpolation"); + } } void addSugConstraint() diff --git a/src/Mod/Sketcher/Gui/DrawSketchHandlerEllipse.h b/src/Mod/Sketcher/Gui/DrawSketchHandlerEllipse.h index 7477b284f8..7819ba46e4 100644 --- a/src/Mod/Sketcher/Gui/DrawSketchHandlerEllipse.h +++ b/src/Mod/Sketcher/Gui/DrawSketchHandlerEllipse.h @@ -261,7 +261,12 @@ private: QString getCrosshairCursorSVGName() const override { - return QString::fromLatin1("Sketcher_Pointer_Create_Ellipse"); + if (constructionMethod() == DrawSketchHandlerEllipse::ConstructionMethod::Center) { + return QString::fromLatin1("Sketcher_Pointer_Create_EllipseByCenter"); + } + else { + return QString::fromLatin1("Sketcher_Pointer_Create_Ellipse_3points"); + } } std::unique_ptr createWidget() const override diff --git a/src/Mod/Sketcher/Gui/DrawSketchHandlerFillet.h b/src/Mod/Sketcher/Gui/DrawSketchHandlerFillet.h index ed2685a507..b6c5aa1366 100644 --- a/src/Mod/Sketcher/Gui/DrawSketchHandlerFillet.h +++ b/src/Mod/Sketcher/Gui/DrawSketchHandlerFillet.h @@ -333,7 +333,12 @@ private: { Gui::Selection().rmvSelectionGate(); Gui::Selection().addSelectionGate(new FilletSelection(sketchgui->getObject())); - return QString::fromLatin1("Sketcher_Pointer_Create_Fillet"); + if (filletType == SimpleFillet) { + return QString::fromLatin1("Sketcher_Pointer_Create_Fillet"); + } + else { + return QString::fromLatin1("Sketcher_Pointer_Create_PointFillet"); + } } protected: diff --git a/src/Mod/Sketcher/Gui/DrawSketchHandlerRectangle.h b/src/Mod/Sketcher/Gui/DrawSketchHandlerRectangle.h index 77e717ddca..dacbdbbec8 100644 --- a/src/Mod/Sketcher/Gui/DrawSketchHandlerRectangle.h +++ b/src/Mod/Sketcher/Gui/DrawSketchHandlerRectangle.h @@ -535,6 +535,12 @@ private: if (constructionMethod() == ConstructionMethod::CenterAndCorner) { return QString::fromLatin1("Sketcher_Pointer_Create_Box_Center"); } + else if (constructionMethod() == ConstructionMethod::ThreePoints) { + return QString::fromLatin1("Sketcher_Pointer_Create_Box_3Points"); + } + else if (constructionMethod() == ConstructionMethod::CenterAnd3Points) { + return QString::fromLatin1("Sketcher_Pointer_Create_Box_3Points_Center"); + } else { return QString::fromLatin1("Sketcher_Pointer_Create_Box"); } diff --git a/src/Mod/Sketcher/Gui/Resources/Sketcher.qrc b/src/Mod/Sketcher/Gui/Resources/Sketcher.qrc index 06ce2b83e6..c7cac047a7 100644 --- a/src/Mod/Sketcher/Gui/Resources/Sketcher.qrc +++ b/src/Mod/Sketcher/Gui/Resources/Sketcher.qrc @@ -224,18 +224,27 @@ icons/pointers/Sketcher_Pointer_Create_ArcSlot.svg icons/pointers/Sketcher_Pointer_Create_Box.svg icons/pointers/Sketcher_Pointer_Create_Box_Center.svg + icons/pointers/Sketcher_Pointer_Create_Box_3Points.svg + icons/pointers/Sketcher_Pointer_Create_Box_3Points_Center.svg icons/pointers/Sketcher_Pointer_Create_BSpline.svg + icons/pointers/Sketcher_Pointer_Create_BSplineByInterpolation.svg icons/pointers/Sketcher_Pointer_Create_Circle.svg - icons/pointers/Sketcher_Pointer_Create_Ellipse.svg + icons/pointers/Sketcher_Pointer_Create_EllipseByCenter.svg + icons/pointers/Sketcher_Pointer_Create_Ellipse_3points.svg icons/pointers/Sketcher_Pointer_Create_Fillet.svg icons/pointers/Sketcher_Pointer_Create_Line.svg icons/pointers/Sketcher_Pointer_Create_Line_Polar.svg icons/pointers/Sketcher_Pointer_Create_Lineset.svg + icons/pointers/Sketcher_Pointer_Create_Periodic_BSpline.svg + icons/pointers/Sketcher_Pointer_Create_Periodic_BSplineByInterpolation.svg icons/pointers/Sketcher_Pointer_Create_Point.svg + icons/pointers/Sketcher_Pointer_Create_PointFillet.svg icons/pointers/Sketcher_Pointer_Create_Offset.svg icons/pointers/Sketcher_Pointer_Create_Rotate.svg icons/pointers/Sketcher_Pointer_Extension.svg icons/pointers/Sketcher_Pointer_External.svg + icons/pointers/Sketcher_Pointer_Heptagon.svg + icons/pointers/Sketcher_Pointer_Hexagon.svg icons/pointers/Sketcher_Pointer_InsertKnot.svg icons/pointers/Sketcher_Pointer_Create_Frame.svg icons/pointers/Sketcher_Pointer_Create_Frame_Center.svg @@ -243,10 +252,14 @@ icons/pointers/Sketcher_Pointer_Oblong_Center.svg icons/pointers/Sketcher_Pointer_Oblong_Frame.svg icons/pointers/Sketcher_Pointer_Oblong_Frame_Center.svg + icons/pointers/Sketcher_Pointer_Octagon.svg + icons/pointers/Sketcher_Pointer_Pentagon.svg icons/pointers/Sketcher_Pointer_Regular_Polygon.svg icons/pointers/Sketcher_Pointer_Create_RectangleSlot.svg icons/pointers/Sketcher_Pointer_Slot.svg icons/pointers/Sketcher_Pointer_Splitting.svg + icons/pointers/Sketcher_Pointer_Text.svg + icons/pointers/Sketcher_Pointer_Triangle.svg icons/pointers/Sketcher_Pointer_Trimming.svg diff --git a/src/Mod/Sketcher/Gui/Resources/icons/pointers/Sketcher_Pointer_CarbonCopy.svg b/src/Mod/Sketcher/Gui/Resources/icons/pointers/Sketcher_Pointer_CarbonCopy.svg index 9c827cc794..2e4e71510d 100644 --- a/src/Mod/Sketcher/Gui/Resources/icons/pointers/Sketcher_Pointer_CarbonCopy.svg +++ b/src/Mod/Sketcher/Gui/Resources/icons/pointers/Sketcher_Pointer_CarbonCopy.svg @@ -1,23 +1,127 @@ - - + + + - + image/svg+xml - + - - - - - - - - + + + + + + + + + + + + + - - + + diff --git a/src/Mod/Sketcher/Gui/Resources/icons/pointers/Sketcher_Pointer_Create_3PointArc.svg b/src/Mod/Sketcher/Gui/Resources/icons/pointers/Sketcher_Pointer_Create_3PointArc.svg index 6d1b7407b6..037404206a 100644 --- a/src/Mod/Sketcher/Gui/Resources/icons/pointers/Sketcher_Pointer_Create_3PointArc.svg +++ b/src/Mod/Sketcher/Gui/Resources/icons/pointers/Sketcher_Pointer_Create_3PointArc.svg @@ -1,13 +1,70 @@ - - - - - - - + + + + + + + + + + - - + + diff --git a/src/Mod/Sketcher/Gui/Resources/icons/pointers/Sketcher_Pointer_Create_3PointCircle.svg b/src/Mod/Sketcher/Gui/Resources/icons/pointers/Sketcher_Pointer_Create_3PointCircle.svg index 6d1b7407b6..0abd306932 100644 --- a/src/Mod/Sketcher/Gui/Resources/icons/pointers/Sketcher_Pointer_Create_3PointCircle.svg +++ b/src/Mod/Sketcher/Gui/Resources/icons/pointers/Sketcher_Pointer_Create_3PointCircle.svg @@ -1,13 +1,118 @@ - - - - - - - + + + + + + + + + + + + + + + + + + + + - - + + diff --git a/src/Mod/Sketcher/Gui/Resources/icons/pointers/Sketcher_Pointer_Create_Arc.svg b/src/Mod/Sketcher/Gui/Resources/icons/pointers/Sketcher_Pointer_Create_Arc.svg index af59020561..f0fa808c09 100644 --- a/src/Mod/Sketcher/Gui/Resources/icons/pointers/Sketcher_Pointer_Create_Arc.svg +++ b/src/Mod/Sketcher/Gui/Resources/icons/pointers/Sketcher_Pointer_Create_Arc.svg @@ -1,12 +1,70 @@ - - - - - - + + + + + + + + + + - - + + diff --git a/src/Mod/Sketcher/Gui/Resources/icons/pointers/Sketcher_Pointer_Create_ArcOfEllipse.svg b/src/Mod/Sketcher/Gui/Resources/icons/pointers/Sketcher_Pointer_Create_ArcOfEllipse.svg index b44749ecad..ee53c8f182 100644 --- a/src/Mod/Sketcher/Gui/Resources/icons/pointers/Sketcher_Pointer_Create_ArcOfEllipse.svg +++ b/src/Mod/Sketcher/Gui/Resources/icons/pointers/Sketcher_Pointer_Create_ArcOfEllipse.svg @@ -1,11 +1,73 @@ - - - - - + + + + + + + + + - - + + diff --git a/src/Mod/Sketcher/Gui/Resources/icons/pointers/Sketcher_Pointer_Create_ArcOfHyperbola.svg b/src/Mod/Sketcher/Gui/Resources/icons/pointers/Sketcher_Pointer_Create_ArcOfHyperbola.svg index bdebb02f20..2eb0be82df 100644 --- a/src/Mod/Sketcher/Gui/Resources/icons/pointers/Sketcher_Pointer_Create_ArcOfHyperbola.svg +++ b/src/Mod/Sketcher/Gui/Resources/icons/pointers/Sketcher_Pointer_Create_ArcOfHyperbola.svg @@ -1,11 +1,54 @@ - - - - - + + + + + + + + - - + + diff --git a/src/Mod/Sketcher/Gui/Resources/icons/pointers/Sketcher_Pointer_Create_ArcOfParabola.svg b/src/Mod/Sketcher/Gui/Resources/icons/pointers/Sketcher_Pointer_Create_ArcOfParabola.svg index b44749ecad..7a138cd18a 100644 --- a/src/Mod/Sketcher/Gui/Resources/icons/pointers/Sketcher_Pointer_Create_ArcOfParabola.svg +++ b/src/Mod/Sketcher/Gui/Resources/icons/pointers/Sketcher_Pointer_Create_ArcOfParabola.svg @@ -1,11 +1,58 @@ - - - - - + + + + + + + + + + - - + + diff --git a/src/Mod/Sketcher/Gui/Resources/icons/pointers/Sketcher_Pointer_Create_ArcSlot.svg b/src/Mod/Sketcher/Gui/Resources/icons/pointers/Sketcher_Pointer_Create_ArcSlot.svg index 833d82cc20..83711f6579 100644 --- a/src/Mod/Sketcher/Gui/Resources/icons/pointers/Sketcher_Pointer_Create_ArcSlot.svg +++ b/src/Mod/Sketcher/Gui/Resources/icons/pointers/Sketcher_Pointer_Create_ArcSlot.svg @@ -1,73 +1,67 @@ + inkscape:current-layer="g6" /> - - - - - - - - + id="g6" + transform="translate(0,2)"> + + + + + + + + diff --git a/src/Mod/Sketcher/Gui/Resources/icons/pointers/Sketcher_Pointer_Create_BSpline.svg b/src/Mod/Sketcher/Gui/Resources/icons/pointers/Sketcher_Pointer_Create_BSpline.svg index 99ff413da2..51200fdb4b 100644 --- a/src/Mod/Sketcher/Gui/Resources/icons/pointers/Sketcher_Pointer_Create_BSpline.svg +++ b/src/Mod/Sketcher/Gui/Resources/icons/pointers/Sketcher_Pointer_Create_BSpline.svg @@ -1,14 +1,95 @@ - - - - - - - - + + + + + + + + + + + + + + + - - + + diff --git a/src/Mod/Sketcher/Gui/Resources/icons/pointers/Sketcher_Pointer_Create_BSplineByInterpolation.svg b/src/Mod/Sketcher/Gui/Resources/icons/pointers/Sketcher_Pointer_Create_BSplineByInterpolation.svg new file mode 100644 index 0000000000..10473790c5 --- /dev/null +++ b/src/Mod/Sketcher/Gui/Resources/icons/pointers/Sketcher_Pointer_Create_BSplineByInterpolation.svg @@ -0,0 +1,94 @@ + + + + + + + + + + + + + + + + + + + + + diff --git a/src/Mod/Sketcher/Gui/Resources/icons/pointers/Sketcher_Pointer_Create_Box.svg b/src/Mod/Sketcher/Gui/Resources/icons/pointers/Sketcher_Pointer_Create_Box.svg index 3d1092e863..dc2a8f3f01 100644 --- a/src/Mod/Sketcher/Gui/Resources/icons/pointers/Sketcher_Pointer_Create_Box.svg +++ b/src/Mod/Sketcher/Gui/Resources/icons/pointers/Sketcher_Pointer_Create_Box.svg @@ -1,12 +1,64 @@ - - - - - - + + + + + + + - - + + diff --git a/src/Mod/Sketcher/Gui/Resources/icons/pointers/Sketcher_Pointer_Create_Box_3Points.svg b/src/Mod/Sketcher/Gui/Resources/icons/pointers/Sketcher_Pointer_Create_Box_3Points.svg new file mode 100644 index 0000000000..516f695980 --- /dev/null +++ b/src/Mod/Sketcher/Gui/Resources/icons/pointers/Sketcher_Pointer_Create_Box_3Points.svg @@ -0,0 +1,74 @@ + + + + + + + + + + + + + + diff --git a/src/Mod/Sketcher/Gui/Resources/icons/pointers/Sketcher_Pointer_Create_Box_3Points_Center.svg b/src/Mod/Sketcher/Gui/Resources/icons/pointers/Sketcher_Pointer_Create_Box_3Points_Center.svg new file mode 100644 index 0000000000..107f7d2e9c --- /dev/null +++ b/src/Mod/Sketcher/Gui/Resources/icons/pointers/Sketcher_Pointer_Create_Box_3Points_Center.svg @@ -0,0 +1,74 @@ + + + + + + + + + + + + + + diff --git a/src/Mod/Sketcher/Gui/Resources/icons/pointers/Sketcher_Pointer_Create_Box_Center.svg b/src/Mod/Sketcher/Gui/Resources/icons/pointers/Sketcher_Pointer_Create_Box_Center.svg index b272bb2be3..c2ae617b39 100644 --- a/src/Mod/Sketcher/Gui/Resources/icons/pointers/Sketcher_Pointer_Create_Box_Center.svg +++ b/src/Mod/Sketcher/Gui/Resources/icons/pointers/Sketcher_Pointer_Create_Box_Center.svg @@ -1,52 +1,64 @@ - - - - image/svg+xml - - - - - + width="64" + id="svg12" + sodipodi:docname="Sketcher_Pointer_Create_Box_Center.svg" + inkscape:version="1.3.2 (091e20e, 2023-11-25, custom)" + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" + xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" + xmlns="http://www.w3.org/2000/svg" + xmlns:svg="http://www.w3.org/2000/svg"> + - - - + id="symbol" + style="fill:none;stroke:#cc0000;stroke-width:1.92924" + transform="matrix(1.0366786,0,0,1.0366786,-0.1467704,-6.1737144)"> + + + + + + d="m16,3v9m0,8v9m-13-13h9m8,0h9" + id="path9" /> diff --git a/src/Mod/Sketcher/Gui/Resources/icons/pointers/Sketcher_Pointer_Create_Circle.svg b/src/Mod/Sketcher/Gui/Resources/icons/pointers/Sketcher_Pointer_Create_Circle.svg index 339240dd73..3ae1c1ef18 100644 --- a/src/Mod/Sketcher/Gui/Resources/icons/pointers/Sketcher_Pointer_Create_Circle.svg +++ b/src/Mod/Sketcher/Gui/Resources/icons/pointers/Sketcher_Pointer_Create_Circle.svg @@ -1,11 +1,61 @@ - - - - - + + + + + + + - - + + diff --git a/src/Mod/Sketcher/Gui/Resources/icons/pointers/Sketcher_Pointer_Create_Ellipse.svg b/src/Mod/Sketcher/Gui/Resources/icons/pointers/Sketcher_Pointer_Create_Ellipse.svg deleted file mode 100644 index e0ba46c7d9..0000000000 --- a/src/Mod/Sketcher/Gui/Resources/icons/pointers/Sketcher_Pointer_Create_Ellipse.svg +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - diff --git a/src/Mod/Sketcher/Gui/Resources/icons/pointers/Sketcher_Pointer_Create_EllipseByCenter.svg b/src/Mod/Sketcher/Gui/Resources/icons/pointers/Sketcher_Pointer_Create_EllipseByCenter.svg new file mode 100644 index 0000000000..be85d09e28 --- /dev/null +++ b/src/Mod/Sketcher/Gui/Resources/icons/pointers/Sketcher_Pointer_Create_EllipseByCenter.svg @@ -0,0 +1,72 @@ + + + + + + + + + + + + + + diff --git a/src/Mod/Sketcher/Gui/Resources/icons/pointers/Sketcher_Pointer_Create_Ellipse_3points.svg b/src/Mod/Sketcher/Gui/Resources/icons/pointers/Sketcher_Pointer_Create_Ellipse_3points.svg new file mode 100644 index 0000000000..db02ec9fef --- /dev/null +++ b/src/Mod/Sketcher/Gui/Resources/icons/pointers/Sketcher_Pointer_Create_Ellipse_3points.svg @@ -0,0 +1,72 @@ + + + + + + + + + + + + + + diff --git a/src/Mod/Sketcher/Gui/Resources/icons/pointers/Sketcher_Pointer_Create_Fillet.svg b/src/Mod/Sketcher/Gui/Resources/icons/pointers/Sketcher_Pointer_Create_Fillet.svg index e6c9104f3d..0e342ecb38 100644 --- a/src/Mod/Sketcher/Gui/Resources/icons/pointers/Sketcher_Pointer_Create_Fillet.svg +++ b/src/Mod/Sketcher/Gui/Resources/icons/pointers/Sketcher_Pointer_Create_Fillet.svg @@ -1,11 +1,154 @@ - - - - - + + + + + + + + + + + + + + + + + + + + + + - - + + diff --git a/src/Mod/Sketcher/Gui/Resources/icons/pointers/Sketcher_Pointer_Create_Frame.svg b/src/Mod/Sketcher/Gui/Resources/icons/pointers/Sketcher_Pointer_Create_Frame.svg index 51253a24a3..0e34480c2f 100644 --- a/src/Mod/Sketcher/Gui/Resources/icons/pointers/Sketcher_Pointer_Create_Frame.svg +++ b/src/Mod/Sketcher/Gui/Resources/icons/pointers/Sketcher_Pointer_Create_Frame.svg @@ -1,63 +1,71 @@ - - - - image/svg+xml - - - - - + width="64" + id="svg12" + sodipodi:docname="Sketcher_Pointer_Create_Frame.svg" + inkscape:version="1.3.2 (091e20e, 2023-11-25, custom)" + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" + xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" + xmlns="http://www.w3.org/2000/svg" + xmlns:svg="http://www.w3.org/2000/svg"> + - + id="symbol" + style="fill:none;stroke:#cc0000;stroke-width:1.92924" + transform="matrix(1.0366786,0,0,1.0366786,-0.1467704,-6.1737144)"> + + + + - - - - + id="crosshair" + style="stroke:#ffffff;stroke-width:2.5;stroke-linecap:round;stroke-linejoin:miter"> + diff --git a/src/Mod/Sketcher/Gui/Resources/icons/pointers/Sketcher_Pointer_Create_Frame_Center.svg b/src/Mod/Sketcher/Gui/Resources/icons/pointers/Sketcher_Pointer_Create_Frame_Center.svg index 38ddc6c53c..d2c2f37877 100644 --- a/src/Mod/Sketcher/Gui/Resources/icons/pointers/Sketcher_Pointer_Create_Frame_Center.svg +++ b/src/Mod/Sketcher/Gui/Resources/icons/pointers/Sketcher_Pointer_Create_Frame_Center.svg @@ -1,28 +1,66 @@ - - - - image/svg+xml - - - - - + id="svg12" + sodipodi:docname="Sketcher_Pointer_Create_Frame_Center.svg" + inkscape:version="1.3.2 (091e20e, 2023-11-25, custom)" + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" + xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" + xmlns="http://www.w3.org/2000/svg" + xmlns:svg="http://www.w3.org/2000/svg"> + + + + + + + @@ -30,31 +68,4 @@ d="m16,3v9m0,8v9m-13-13h9m8,0h9" id="path9" /> - - - - diff --git a/src/Mod/Sketcher/Gui/Resources/icons/pointers/Sketcher_Pointer_Create_Line.svg b/src/Mod/Sketcher/Gui/Resources/icons/pointers/Sketcher_Pointer_Create_Line.svg index 8100c3f887..86c00a33a6 100644 --- a/src/Mod/Sketcher/Gui/Resources/icons/pointers/Sketcher_Pointer_Create_Line.svg +++ b/src/Mod/Sketcher/Gui/Resources/icons/pointers/Sketcher_Pointer_Create_Line.svg @@ -1,12 +1,62 @@ - - - - - - + + + + + + + - - + + diff --git a/src/Mod/Sketcher/Gui/Resources/icons/pointers/Sketcher_Pointer_Create_Line_Polar.svg b/src/Mod/Sketcher/Gui/Resources/icons/pointers/Sketcher_Pointer_Create_Line_Polar.svg index 9a8b616772..3d9cf91ce3 100644 --- a/src/Mod/Sketcher/Gui/Resources/icons/pointers/Sketcher_Pointer_Create_Line_Polar.svg +++ b/src/Mod/Sketcher/Gui/Resources/icons/pointers/Sketcher_Pointer_Create_Line_Polar.svg @@ -1,14 +1,36 @@ + id="svg12" + sodipodi:docname="Sketcher_Pointer_Create_Line_Polar.svg" + inkscape:version="1.3.2 (091e20e, 2023-11-25, custom)" + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" + xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" + xmlns="http://www.w3.org/2000/svg" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:dc="http://purl.org/dc/elements/1.1/"> + @@ -17,7 +39,7 @@ image/svg+xml - + @@ -36,15 +58,15 @@ style="fill:none;stroke:#cc0000;stroke-width:2" id="line2" y2="28" - x2="50" + x2="54" y1="57" - x1="20" /> + x1="24" /> + cx="24" + r="4" /> @@ -53,8 +75,8 @@ id="path9" /> - - - - - - - + + + + + + + + + + + + + + + + + - - + + diff --git a/src/Mod/Sketcher/Gui/Resources/icons/pointers/Sketcher_Pointer_Create_Offset.svg b/src/Mod/Sketcher/Gui/Resources/icons/pointers/Sketcher_Pointer_Create_Offset.svg index ea332997de..51ff007ec7 100644 --- a/src/Mod/Sketcher/Gui/Resources/icons/pointers/Sketcher_Pointer_Create_Offset.svg +++ b/src/Mod/Sketcher/Gui/Resources/icons/pointers/Sketcher_Pointer_Create_Offset.svg @@ -5,7 +5,7 @@ width="64" id="svg12" sodipodi:docname="Sketcher_Pointer_Create_Offset.svg" - inkscape:version="1.1-beta1 (77e7b44db3, 2021-03-28)" + inkscape:version="1.3.2 (091e20e, 2023-11-25, custom)" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns="http://www.w3.org/2000/svg" @@ -23,14 +23,16 @@ inkscape:pagecheckerboard="0" showgrid="false" inkscape:zoom="5.8828125" - inkscape:cx="-9.9442231" + inkscape:cx="20.568393" inkscape:cy="11.89907" - inkscape:window-width="3840" - inkscape:window-height="1570" - inkscape:window-x="-9" - inkscape:window-y="-9" + inkscape:window-width="1368" + inkscape:window-height="842" + inkscape:window-x="-6" + inkscape:window-y="-6" inkscape:window-maximized="1" - inkscape:current-layer="svg12" /> + inkscape:current-layer="svg12" + inkscape:showpageshadow="2" + inkscape:deskcolor="#d1d1d1" /> diff --git a/src/Mod/Sketcher/Gui/Resources/icons/pointers/Sketcher_Pointer_Create_Periodic_BSpline.svg b/src/Mod/Sketcher/Gui/Resources/icons/pointers/Sketcher_Pointer_Create_Periodic_BSpline.svg new file mode 100644 index 0000000000..7ba00432a9 --- /dev/null +++ b/src/Mod/Sketcher/Gui/Resources/icons/pointers/Sketcher_Pointer_Create_Periodic_BSpline.svg @@ -0,0 +1,95 @@ + + + + + + + + + + + + + + + + + + + + + diff --git a/src/Mod/Sketcher/Gui/Resources/icons/pointers/Sketcher_Pointer_Create_Periodic_BSplineByInterpolation.svg b/src/Mod/Sketcher/Gui/Resources/icons/pointers/Sketcher_Pointer_Create_Periodic_BSplineByInterpolation.svg new file mode 100644 index 0000000000..54f1936828 --- /dev/null +++ b/src/Mod/Sketcher/Gui/Resources/icons/pointers/Sketcher_Pointer_Create_Periodic_BSplineByInterpolation.svg @@ -0,0 +1,95 @@ + + + + + + + + + + + + + + + + + + + + + diff --git a/src/Mod/Sketcher/Gui/Resources/icons/pointers/Sketcher_Pointer_Create_PointFillet.svg b/src/Mod/Sketcher/Gui/Resources/icons/pointers/Sketcher_Pointer_Create_PointFillet.svg new file mode 100644 index 0000000000..7684052e59 --- /dev/null +++ b/src/Mod/Sketcher/Gui/Resources/icons/pointers/Sketcher_Pointer_Create_PointFillet.svg @@ -0,0 +1,140 @@ + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/Mod/Sketcher/Gui/Resources/icons/pointers/Sketcher_Pointer_Create_RectangleSlot.svg b/src/Mod/Sketcher/Gui/Resources/icons/pointers/Sketcher_Pointer_Create_RectangleSlot.svg index 388b547624..8b33de242a 100644 --- a/src/Mod/Sketcher/Gui/Resources/icons/pointers/Sketcher_Pointer_Create_RectangleSlot.svg +++ b/src/Mod/Sketcher/Gui/Resources/icons/pointers/Sketcher_Pointer_Create_RectangleSlot.svg @@ -1,67 +1,68 @@ + inkscape:current-layer="g6" /> - - - - - - + id="g6" + transform="translate(0,2)"> + + + + + + + + diff --git a/src/Mod/Sketcher/Gui/Resources/icons/pointers/Sketcher_Pointer_Extension.svg b/src/Mod/Sketcher/Gui/Resources/icons/pointers/Sketcher_Pointer_Extension.svg index d04e456a42..2dae7bdd7b 100644 --- a/src/Mod/Sketcher/Gui/Resources/icons/pointers/Sketcher_Pointer_Extension.svg +++ b/src/Mod/Sketcher/Gui/Resources/icons/pointers/Sketcher_Pointer_Extension.svg @@ -1,12 +1,60 @@ - - - - - - + + + + + + + - - + + diff --git a/src/Mod/Sketcher/Gui/Resources/icons/pointers/Sketcher_Pointer_External.svg b/src/Mod/Sketcher/Gui/Resources/icons/pointers/Sketcher_Pointer_External.svg index dac9aa1e15..1402ab186d 100644 --- a/src/Mod/Sketcher/Gui/Resources/icons/pointers/Sketcher_Pointer_External.svg +++ b/src/Mod/Sketcher/Gui/Resources/icons/pointers/Sketcher_Pointer_External.svg @@ -1,22 +1,117 @@ - - + + + - + image/svg+xml - + - - - - - - - + + + + + + + + + + + + - - + + + + diff --git a/src/Mod/Sketcher/Gui/Resources/icons/pointers/Sketcher_Pointer_Heptagon.svg b/src/Mod/Sketcher/Gui/Resources/icons/pointers/Sketcher_Pointer_Heptagon.svg new file mode 100644 index 0000000000..1c4dc2fc85 --- /dev/null +++ b/src/Mod/Sketcher/Gui/Resources/icons/pointers/Sketcher_Pointer_Heptagon.svg @@ -0,0 +1,87 @@ + + + + + + + image/svg+xml + + + + + + + + + + + + + + diff --git a/src/Mod/Sketcher/Gui/Resources/icons/pointers/Sketcher_Pointer_Hexagon.svg b/src/Mod/Sketcher/Gui/Resources/icons/pointers/Sketcher_Pointer_Hexagon.svg new file mode 100644 index 0000000000..9bd4d5bbdf --- /dev/null +++ b/src/Mod/Sketcher/Gui/Resources/icons/pointers/Sketcher_Pointer_Hexagon.svg @@ -0,0 +1,87 @@ + + + + + + + image/svg+xml + + + + + + + + + + + + + + diff --git a/src/Mod/Sketcher/Gui/Resources/icons/pointers/Sketcher_Pointer_InsertKnot.svg b/src/Mod/Sketcher/Gui/Resources/icons/pointers/Sketcher_Pointer_InsertKnot.svg index d2b83b19af..3cf8630de2 100644 --- a/src/Mod/Sketcher/Gui/Resources/icons/pointers/Sketcher_Pointer_InsertKnot.svg +++ b/src/Mod/Sketcher/Gui/Resources/icons/pointers/Sketcher_Pointer_InsertKnot.svg @@ -4,11 +4,33 @@ height="64" width="64" id="svg10" + sodipodi:docname="Sketcher_Pointer_InsertKnot.svg" + inkscape:version="1.3.2 (091e20e, 2023-11-25, custom)" + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" + xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns="http://www.w3.org/2000/svg" xmlns:svg="http://www.w3.org/2000/svg" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/"> + Sketcher_PointerInsertKnot + id="g1" + inkscape:label="symbol"> + style="display:inline;fill:none;stroke:#cc0000;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" + d="m 53.080401,28.249148 c -1.43085,26.470727 -26.470692,0 -28.616967,28.617002" + id="path3266-9-2" /> - - - + cx="46.92411" + cy="40.59425" + id="circle8-8" + style="fill:#cc0000;stroke:#cc0000;stroke-width:2;fill-opacity:1" + r="4" /> + + diff --git a/src/Mod/Sketcher/Gui/Resources/icons/pointers/Sketcher_Pointer_Oblong.svg b/src/Mod/Sketcher/Gui/Resources/icons/pointers/Sketcher_Pointer_Oblong.svg index 34a23d34f9..1084915f03 100644 --- a/src/Mod/Sketcher/Gui/Resources/icons/pointers/Sketcher_Pointer_Oblong.svg +++ b/src/Mod/Sketcher/Gui/Resources/icons/pointers/Sketcher_Pointer_Oblong.svg @@ -1,8 +1,48 @@ - - - - + + + + + + + + - diff --git a/src/Mod/Sketcher/Gui/Resources/icons/pointers/Sketcher_Pointer_Oblong_Center.svg b/src/Mod/Sketcher/Gui/Resources/icons/pointers/Sketcher_Pointer_Oblong_Center.svg index 6a833f742f..b83cac1be3 100644 --- a/src/Mod/Sketcher/Gui/Resources/icons/pointers/Sketcher_Pointer_Oblong_Center.svg +++ b/src/Mod/Sketcher/Gui/Resources/icons/pointers/Sketcher_Pointer_Oblong_Center.svg @@ -1,48 +1,54 @@ - - - - image/svg+xml - - - - - + id="svg12" + sodipodi:docname="Sketcher_Pointer_Oblong_Center.svg" + inkscape:version="1.3.2 (091e20e, 2023-11-25, custom)" + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" + xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" + xmlns="http://www.w3.org/2000/svg" + xmlns:svg="http://www.w3.org/2000/svg"> + + id="symbol" + style="fill:none;stroke:#cc0000;stroke-width:1.92924" + transform="matrix(1.0366786,0,0,1.0366786,-0.1467704,-6.1737144)"> + id="rect3" + d="m 32.938626,32 h 13.504671 c 3.740792,0 6.752332,3.01154 6.752332,6.752332 v 13.504671 c 0,3.740792 -3.01154,6.752332 -6.752332,6.752332 H 32.938626 c -3.740791,0 -6.752331,-3.01154 -6.752331,-6.752332 V 38.752332 C 26.186295,35.01154 29.197835,32 32.938626,32 Z" /> + + + + - - diff --git a/src/Mod/Sketcher/Gui/Resources/icons/pointers/Sketcher_Pointer_Oblong_Frame.svg b/src/Mod/Sketcher/Gui/Resources/icons/pointers/Sketcher_Pointer_Oblong_Frame.svg index 97ad28f9a9..4f461aa5fa 100644 --- a/src/Mod/Sketcher/Gui/Resources/icons/pointers/Sketcher_Pointer_Oblong_Frame.svg +++ b/src/Mod/Sketcher/Gui/Resources/icons/pointers/Sketcher_Pointer_Oblong_Frame.svg @@ -1,51 +1,51 @@ - - - - image/svg+xml - - - - - + id="svg12" + sodipodi:docname="Sketcher_Pointer_Oblong_Frame.svg" + inkscape:version="1.3.2 (091e20e, 2023-11-25, custom)" + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" + xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" + xmlns="http://www.w3.org/2000/svg" + xmlns:svg="http://www.w3.org/2000/svg"> + + id="symbol" + style="fill:none;stroke:#cc0000;stroke-width:1.92924" + transform="matrix(1.0366786,0,0,1.0366786,-0.1467704,-6.1737144)"> + id="rect3" + d="m 33.903249,32 h 11.575426 c 4.275193,0 7.716954,3.441762 7.716954,7.716954 V 51.29238 c 0,4.275193 -3.441761,7.716955 -7.716954,7.716955 H 33.903249 c -4.275193,0 -7.716954,-3.441762 -7.716954,-7.716955 V 39.716954 C 26.186295,35.441762 29.628056,32 33.903249,32 Z" /> + + + + - - diff --git a/src/Mod/Sketcher/Gui/Resources/icons/pointers/Sketcher_Pointer_Oblong_Frame_Center.svg b/src/Mod/Sketcher/Gui/Resources/icons/pointers/Sketcher_Pointer_Oblong_Frame_Center.svg index 6bfb142875..7876a020e4 100644 --- a/src/Mod/Sketcher/Gui/Resources/icons/pointers/Sketcher_Pointer_Oblong_Frame_Center.svg +++ b/src/Mod/Sketcher/Gui/Resources/icons/pointers/Sketcher_Pointer_Oblong_Frame_Center.svg @@ -1,58 +1,57 @@ - - - - image/svg+xml - - - - - + width="64" + id="svg12" + sodipodi:docname="Sketcher_Pointer_Oblong_Frame_Center.svg" + inkscape:version="1.3.2 (091e20e, 2023-11-25, custom)" + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" + xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" + xmlns="http://www.w3.org/2000/svg" + xmlns:svg="http://www.w3.org/2000/svg"> + + id="symbol" + style="fill:none;stroke:#cc0000;stroke-width:1.92924" + transform="matrix(1.0366786,0,0,1.0366786,-0.1467704,-6.1737144)"> + id="rect3" + d="m 33.903245,32 h 11.575434 c 4.27519,0 7.71695,3.44176 7.71695,7.71695 v 11.575434 c 0,4.275191 -3.44176,7.716951 -7.71695,7.716951 H 33.903245 c -4.275191,0 -7.71695,-3.44176 -7.71695,-7.716951 V 39.71695 C 26.186295,35.44176 29.628054,32 33.903245,32 Z" /> + + + + + - - - diff --git a/src/Mod/Sketcher/Gui/Resources/icons/pointers/Sketcher_Pointer_Octagon.svg b/src/Mod/Sketcher/Gui/Resources/icons/pointers/Sketcher_Pointer_Octagon.svg new file mode 100644 index 0000000000..85e0212729 --- /dev/null +++ b/src/Mod/Sketcher/Gui/Resources/icons/pointers/Sketcher_Pointer_Octagon.svg @@ -0,0 +1,87 @@ + + + + + + + image/svg+xml + + + + + + + + + + + + + + diff --git a/src/Mod/Sketcher/Gui/Resources/icons/pointers/Sketcher_Pointer_Pentagon.svg b/src/Mod/Sketcher/Gui/Resources/icons/pointers/Sketcher_Pointer_Pentagon.svg new file mode 100644 index 0000000000..e4ab4be8f2 --- /dev/null +++ b/src/Mod/Sketcher/Gui/Resources/icons/pointers/Sketcher_Pointer_Pentagon.svg @@ -0,0 +1,87 @@ + + + + + + + image/svg+xml + + + + + + + + + + + + + + diff --git a/src/Mod/Sketcher/Gui/Resources/icons/pointers/Sketcher_Pointer_Regular_Polygon.svg b/src/Mod/Sketcher/Gui/Resources/icons/pointers/Sketcher_Pointer_Regular_Polygon.svg index af99e8d8a5..39289ea2dd 100644 --- a/src/Mod/Sketcher/Gui/Resources/icons/pointers/Sketcher_Pointer_Regular_Polygon.svg +++ b/src/Mod/Sketcher/Gui/Resources/icons/pointers/Sketcher_Pointer_Regular_Polygon.svg @@ -1,20 +1,87 @@ - - + + + - + image/svg+xml - + - - - - - + + + + + - - + + diff --git a/src/Mod/Sketcher/Gui/Resources/icons/pointers/Sketcher_Pointer_Slot.svg b/src/Mod/Sketcher/Gui/Resources/icons/pointers/Sketcher_Pointer_Slot.svg index eb12811fa1..5f1638433e 100644 --- a/src/Mod/Sketcher/Gui/Resources/icons/pointers/Sketcher_Pointer_Slot.svg +++ b/src/Mod/Sketcher/Gui/Resources/icons/pointers/Sketcher_Pointer_Slot.svg @@ -1,11 +1,59 @@ - - - - - + + + + + + + - - + + diff --git a/src/Mod/Sketcher/Gui/Resources/icons/pointers/Sketcher_Pointer_Splitting.svg b/src/Mod/Sketcher/Gui/Resources/icons/pointers/Sketcher_Pointer_Splitting.svg index 210cb40821..056c696a34 100644 --- a/src/Mod/Sketcher/Gui/Resources/icons/pointers/Sketcher_Pointer_Splitting.svg +++ b/src/Mod/Sketcher/Gui/Resources/icons/pointers/Sketcher_Pointer_Splitting.svg @@ -1,22 +1,101 @@ - - + + + - + image/svg+xml - + - - - + + + + + + + + + - - + + - - - - diff --git a/src/Mod/Sketcher/Gui/Resources/icons/pointers/Sketcher_Pointer_Text.svg b/src/Mod/Sketcher/Gui/Resources/icons/pointers/Sketcher_Pointer_Text.svg new file mode 100644 index 0000000000..4596bcaff6 --- /dev/null +++ b/src/Mod/Sketcher/Gui/Resources/icons/pointers/Sketcher_Pointer_Text.svg @@ -0,0 +1,85 @@ + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + diff --git a/src/Mod/Sketcher/Gui/Resources/icons/pointers/Sketcher_Pointer_Triangle.svg b/src/Mod/Sketcher/Gui/Resources/icons/pointers/Sketcher_Pointer_Triangle.svg new file mode 100644 index 0000000000..5a3bdf9975 --- /dev/null +++ b/src/Mod/Sketcher/Gui/Resources/icons/pointers/Sketcher_Pointer_Triangle.svg @@ -0,0 +1,87 @@ + + + + + + + image/svg+xml + + + + + + + + + + + + + + diff --git a/src/Mod/Sketcher/Gui/Resources/icons/pointers/Sketcher_Pointer_Trimming.svg b/src/Mod/Sketcher/Gui/Resources/icons/pointers/Sketcher_Pointer_Trimming.svg index d0cca2bd24..d8ad454b92 100644 --- a/src/Mod/Sketcher/Gui/Resources/icons/pointers/Sketcher_Pointer_Trimming.svg +++ b/src/Mod/Sketcher/Gui/Resources/icons/pointers/Sketcher_Pointer_Trimming.svg @@ -1,12 +1,65 @@ - - - - - - + + + + + + + + - - + +