diff --git a/src/Gui/PreferencePackTemplates/Shortcuts.cfg b/src/Gui/PreferencePackTemplates/Shortcuts.cfg
index 6dc7c24db7..63db87461b 100644
--- a/src/Gui/PreferencePackTemplates/Shortcuts.cfg
+++ b/src/Gui/PreferencePackTemplates/Shortcuts.cfg
@@ -555,8 +555,8 @@
D
G, Q
- G, X
+ G, I
@@ -565,6 +565,7 @@
Z, M
+ G, X
Z, A
Z, R
diff --git a/src/Mod/Sketcher/Gui/CommandAlterGeometry.cpp b/src/Mod/Sketcher/Gui/CommandAlterGeometry.cpp
index 2a0c880c31..0cc93aea49 100644
--- a/src/Mod/Sketcher/Gui/CommandAlterGeometry.cpp
+++ b/src/Mod/Sketcher/Gui/CommandAlterGeometry.cpp
@@ -116,7 +116,7 @@ CmdSketcherToggleConstruction::CmdSketcherToggleConstruction()
rcCmdMgr.addCommandMode("ToggleConstruction", "Sketcher_CompCreateBSpline");
rcCmdMgr.addCommandMode("ToggleConstruction", "Sketcher_CarbonCopy");
rcCmdMgr.addCommandMode("ToggleConstruction", "Sketcher_CompExternal");
- rcCmdMgr.addCommandMode("ToggleConstruction", "Sketcher_External");
+ rcCmdMgr.addCommandMode("ToggleConstruction", "Sketcher_Projection");
rcCmdMgr.addCommandMode("ToggleConstruction", "Sketcher_Intersection");
rcCmdMgr.addCommandMode("ToggleConstruction", "Sketcher_ToggleConstruction");
}
diff --git a/src/Mod/Sketcher/Gui/CommandCreateGeo.cpp b/src/Mod/Sketcher/Gui/CommandCreateGeo.cpp
index c7d4649098..97b57910c9 100644
--- a/src/Mod/Sketcher/Gui/CommandCreateGeo.cpp
+++ b/src/Mod/Sketcher/Gui/CommandCreateGeo.cpp
@@ -1452,7 +1452,7 @@ public:
setCheckable(false);
- addCommand("Sketcher_External");
+ addCommand("Sketcher_Projection");
addCommand("Sketcher_Intersection");
}
@@ -1467,12 +1467,12 @@ public:
int index = pcAction->property("defaultAction").toInt();
switch (static_cast(mode)) {
case GeometryCreationMode::Normal:
- al[0]->setIcon(Gui::BitmapFactory().iconFromTheme("Sketcher_External"));
+ al[0]->setIcon(Gui::BitmapFactory().iconFromTheme("Sketcher_Projection"));
al[1]->setIcon(Gui::BitmapFactory().iconFromTheme("Sketcher_Intersection"));
getAction()->setIcon(al[index]->icon());
break;
case GeometryCreationMode::Construction:
- al[0]->setIcon(Gui::BitmapFactory().iconFromTheme("Sketcher_External_Constr"));
+ al[0]->setIcon(Gui::BitmapFactory().iconFromTheme("Sketcher_Projection_Constr"));
al[1]->setIcon(Gui::BitmapFactory().iconFromTheme("Sketcher_Intersection_Constr"));
getAction()->setIcon(al[index]->icon());
break;
@@ -1492,10 +1492,10 @@ public:
// Externals - Projection ==================================================================
-DEF_STD_CMD_AU(CmdSketcherExternal)
+DEF_STD_CMD_AU(CmdSketcherProjection)
-CmdSketcherExternal::CmdSketcherExternal()
- : Command("Sketcher_External")
+CmdSketcherProjection::CmdSketcherProjection()
+ : Command("Sketcher_Projection")
{
sAppModule = "Sketcher";
sGroup = "Sketcher";
@@ -1503,22 +1503,22 @@ CmdSketcherExternal::CmdSketcherExternal()
sToolTipText = QT_TR_NOOP("Create the projection edges of an external geometry.\n"
"External edges can be either defining or construction geometries.\n"
"You can use the toggle construction tool.");
- sWhatsThis = "Sketcher_External";
+ sWhatsThis = "Sketcher_Projection";
sStatusTip = sToolTipText;
- sPixmap = "Sketcher_External";
+ sPixmap = "Sketcher_Projection";
sAccel = "G, X";
eType = ForEdit;
}
-CONSTRUCTION_UPDATE_ACTION(CmdSketcherExternal, "Sketcher_External")
+CONSTRUCTION_UPDATE_ACTION(CmdSketcherProjection, "Sketcher_Projection")
-void CmdSketcherExternal::activated(int iMsg)
+void CmdSketcherProjection::activated(int iMsg)
{
Q_UNUSED(iMsg);
ActivateHandler(getActiveGuiDocument(), std::make_unique());
}
-bool CmdSketcherExternal::isActive()
+bool CmdSketcherProjection::isActive()
{
return isCommandActive(getActiveGuiDocument());
}
@@ -2159,7 +2159,7 @@ void CreateSketcherCommandsCreateGeo()
rcCmdMgr.addCommand(new CmdSketcherExtend());
rcCmdMgr.addCommand(new CmdSketcherSplit());
rcCmdMgr.addCommand(new CmdSketcherCompCurveEdition());
- rcCmdMgr.addCommand(new CmdSketcherExternal());
+ rcCmdMgr.addCommand(new CmdSketcherProjection());
rcCmdMgr.addCommand(new CmdSketcherIntersection());
rcCmdMgr.addCommand(new CmdSketcherCompExternal());
rcCmdMgr.addCommand(new CmdSketcherCarbonCopy());
diff --git a/src/Mod/Sketcher/Gui/Resources/Sketcher.qrc b/src/Mod/Sketcher/Gui/Resources/Sketcher.qrc
index 90bbeaa296..f20664b78a 100644
--- a/src/Mod/Sketcher/Gui/Resources/Sketcher.qrc
+++ b/src/Mod/Sketcher/Gui/Resources/Sketcher.qrc
@@ -198,8 +198,8 @@
icons/geometry/Sketcher_CreateTriangle.svg
icons/geometry/Sketcher_CreateTriangle_Constr.svg
icons/geometry/Sketcher_Extend.svg
- icons/geometry/Sketcher_External.svg
- icons/geometry/Sketcher_External_Constr.svg
+ icons/geometry/Sketcher_Projection.svg
+ icons/geometry/Sketcher_Projection_Constr.svg
icons/geometry/Sketcher_Intersection.svg
icons/geometry/Sketcher_Intersection_Constr.svg
icons/geometry/Sketcher_Split.svg
diff --git a/src/Mod/Sketcher/Gui/Resources/icons/geometry/Sketcher_External.svg b/src/Mod/Sketcher/Gui/Resources/icons/geometry/Sketcher_Projection.svg
similarity index 85%
rename from src/Mod/Sketcher/Gui/Resources/icons/geometry/Sketcher_External.svg
rename to src/Mod/Sketcher/Gui/Resources/icons/geometry/Sketcher_Projection.svg
index da8bb967f2..1343f13b1b 100644
--- a/src/Mod/Sketcher/Gui/Resources/icons/geometry/Sketcher_External.svg
+++ b/src/Mod/Sketcher/Gui/Resources/icons/geometry/Sketcher_Projection.svg
@@ -262,7 +262,7 @@
y1="37"
x2="-19"
y2="37"
- gradientTransform="rotate(15,69.468151,244.38323)" />
+ gradientTransform="rotate(15,-47.524311,105.68178)" />
+
@@ -304,50 +314,49 @@
+ transform="translate(-50.14077,-31.192563)">
+ d="m 95,61 13.71049,-6.770252 v -20 L 95,41 Z"
+ style="fill:url(#linearGradient3858);fill-opacity:1;stroke:#0b1521;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-opacity:1"
+ sodipodi:nodetypes="ccccc" />
+ d="M 63,39 79.090305,32.739708 108.71049,34.229748 95,41 Z"
+ style="fill:#729fcf;stroke:#0b1521;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-opacity:1"
+ sodipodi:nodetypes="ccccc" />
+ d="m 97.000001,57.8 9.710489,-4.803252 v -15.567 L 97,42 Z"
+ style="fill:none;stroke:#3465a4;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+ sodipodi:nodetypes="ccccc" />
+
-
-
-
+
+
+
diff --git a/src/Mod/Sketcher/Gui/Resources/icons/geometry/Sketcher_External_Constr.svg b/src/Mod/Sketcher/Gui/Resources/icons/geometry/Sketcher_Projection_Constr.svg
similarity index 58%
rename from src/Mod/Sketcher/Gui/Resources/icons/geometry/Sketcher_External_Constr.svg
rename to src/Mod/Sketcher/Gui/Resources/icons/geometry/Sketcher_Projection_Constr.svg
index a7aa4227c6..fdee350e24 100644
--- a/src/Mod/Sketcher/Gui/Resources/icons/geometry/Sketcher_External_Constr.svg
+++ b/src/Mod/Sketcher/Gui/Resources/icons/geometry/Sketcher_Projection_Constr.svg
@@ -1,18 +1,41 @@
-
-
diff --git a/src/Mod/Sketcher/Gui/ViewProviderSketch.cpp b/src/Mod/Sketcher/Gui/ViewProviderSketch.cpp
index 55a91adafa..4f1938f61e 100644
--- a/src/Mod/Sketcher/Gui/ViewProviderSketch.cpp
+++ b/src/Mod/Sketcher/Gui/ViewProviderSketch.cpp
@@ -4337,7 +4337,8 @@ void ViewProviderSketch::generateContextMenu()
<< "Sketcher_Trimming"
<< "Sketcher_Extend"
<< "Separator"
- << "Sketcher_External"
+ << "Sketcher_Projection"
+ << "Sketcher_Intersection"
<< "Separator"
<< "Sketcher_CompDimensionTools"
<< "Sketcher_CompConstrainTools"
diff --git a/src/Mod/Sketcher/Gui/Workbench.cpp b/src/Mod/Sketcher/Gui/Workbench.cpp
index e02ccb2360..67a96bad02 100644
--- a/src/Mod/Sketcher/Gui/Workbench.cpp
+++ b/src/Mod/Sketcher/Gui/Workbench.cpp
@@ -537,7 +537,7 @@ inline void SketcherAddWorkbenchTools(Gui::MenuItem& consaccel)
{
SketcherAddWorkspaceFillets(consaccel);
SketcherAddWorkspaceCurveEdition(consaccel);
- consaccel << "Sketcher_External"
+ consaccel << "Sketcher_Projection"
<< "Sketcher_Intersection"
<< "Sketcher_CarbonCopy"
<< "Separator"