Sketcher: Default Shortcuts

=========================== Following: https://forum.freecadweb.org/viewtopic.php?p=539914#p539914 Following requests from OpenBrain and ChrisB: https://forum.freecadweb.org/viewtopic.php?p=540015#p540015 Following request from M4X: Recomendation to use "L" and "I" for vertical and horizontal distance constraints and "R" for radius. https://forum.freecadweb.org/viewtopic.php?p=540049#p540049 https://forum.freecadweb.org/viewtopic.php?p=540011#p540011
sebjf · Oct 16, 2021 · 0926a41 · 0926a41
1 parent 837de28
commit 0926a41
Show file tree

Hide file tree

Showing 6 changed files with 75 additions and 54 deletions.
diff --git a/src/Mod/Sketcher/Gui/Command.cpp b/src/Mod/Sketcher/Gui/Command.cpp
@@ -621,7 +621,7 @@ void CmdSketcherMapSketch::activated(int iMsg)
                                      items,
                                      bCurIncompatible ? iSugg : iCurr,
                                      false,
-                                     &ok, 
+                                     &ok,
                                      Qt::MSWindowsFixedSizeDialogHint);
         // * collect dialog result
         if (!ok)
@@ -683,6 +683,7 @@ CmdSketcherViewSketch::CmdSketcherViewSketch()
     sWhatsThis      = "Sketcher_ViewSketch";
     sStatusTip      = sToolTipText;
     sPixmap         = "Sketcher_ViewSketch";
+    sAccel          = "Q, P";
     eType           = 0;
 }
 
@@ -951,6 +952,7 @@ CmdSketcherViewSection::CmdSketcherViewSection()
     sWhatsThis      = "Sketcher_ViewSection";
     sStatusTip      = sToolTipText;
     sPixmap         = "Sketcher_ViewSection";
+    sAccel          = "Q, S";
     eType           = 0;
 }
 

diff --git a/src/Mod/Sketcher/Gui/CommandAlterGeometry.cpp b/src/Mod/Sketcher/Gui/CommandAlterGeometry.cpp
@@ -76,7 +76,7 @@ CmdSketcherToggleConstruction::CmdSketcherToggleConstruction()
     sWhatsThis      = "Sketcher_ToggleConstruction";
     sStatusTip      = sToolTipText;
     sPixmap         = "Sketcher_ToggleConstruction";
-    sAccel          = "C,M";
+    sAccel          = "G, N";
     eType           = ForEdit;
 
     // list of toggle construction commands

diff --git a/src/Mod/Sketcher/Gui/CommandConstraints.cpp b/src/Mod/Sketcher/Gui/CommandConstraints.cpp
@@ -1575,6 +1575,7 @@ CmdSketcherConstrainLock::CmdSketcherConstrainLock()
     sWhatsThis      = "Sketcher_ConstrainLock";
     sStatusTip      = sToolTipText;
     sPixmap         = "Constraint_Lock";
+    sAccel          = "K, L";
     eType           = ForEdit;
 
     allowedSelSequences = {{SelVertex}};
@@ -1798,6 +1799,7 @@ CmdSketcherConstrainBlock::CmdSketcherConstrainBlock()
     sWhatsThis      = "Sketcher_ConstrainBlock";
     sStatusTip      = sToolTipText;
     sPixmap         = "Constraint_Block";
+    sAccel          = "K, B";
     eType           = ForEdit;
 
     allowedSelSequences = {{SelEdge}};
@@ -2317,7 +2319,7 @@ CmdSketcherConstrainDistance::CmdSketcherConstrainDistance()
     sWhatsThis      = "Sketcher_ConstrainDistance";
     sStatusTip      = sToolTipText;
     sPixmap         = "Constraint_Length";
-    sAccel          = "SHIFT+D";
+    sAccel          = "K, D";
     eType           = ForEdit;
 
     allowedSelSequences = {{SelVertex, SelVertexOrRoot}, {SelRoot, SelVertex},
@@ -2666,7 +2668,7 @@ CmdSketcherConstrainPointOnObject::CmdSketcherConstrainPointOnObject()
     sWhatsThis      = "Sketcher_ConstrainPointOnObject";
     sStatusTip      = sToolTipText;
     sPixmap         = "Constraint_PointOnObject";
-    sAccel          = "SHIFT+O";
+    sAccel          = "O";
     eType           = ForEdit;
 
     allowedSelSequences = {{SelVertex, SelEdgeOrAxis}, {SelRoot, SelEdge},
@@ -2915,7 +2917,7 @@ CmdSketcherConstrainDistanceX::CmdSketcherConstrainDistanceX()
     sWhatsThis      = "Sketcher_ConstrainDistanceX";
     sStatusTip      = sToolTipText;
     sPixmap         = "Constraint_HorizontalDistance";
-    sAccel          = "SHIFT+H";
+    sAccel          = "L";
     eType           = ForEdit;
 
     // Can't do single vertex because its a prefix for 2 vertices
@@ -3168,7 +3170,7 @@ CmdSketcherConstrainDistanceY::CmdSketcherConstrainDistanceY()
     sWhatsThis      = "Sketcher_ConstrainDistanceY";
     sStatusTip      = sToolTipText;
     sPixmap         = "Constraint_VerticalDistance";
-    sAccel          = "SHIFT+V";
+    sAccel          = "I";
     eType           = ForEdit;
 
     // Can't do single vertex because its a prefix for 2 vertices
@@ -3414,7 +3416,7 @@ CmdSketcherConstrainParallel::CmdSketcherConstrainParallel()
     sWhatsThis      = "Sketcher_ConstrainParallel";
     sStatusTip      = sToolTipText;
     sPixmap         = "Constraint_Parallel";
-    sAccel          = "SHIFT+P";
+    sAccel          = "P";
     eType           = ForEdit;
 
     // TODO: Also needed: ExternalEdges
@@ -4910,7 +4912,7 @@ CmdSketcherConstrainRadius::CmdSketcherConstrainRadius()
     sWhatsThis      = "Sketcher_ConstrainRadius";
     sStatusTip      = sToolTipText;
     sPixmap         = "Constraint_Radius";
-    sAccel          = "";
+    sAccel          = "K, R";
     eType           = ForEdit;
 
     allowedSelSequences = {{SelEdge}, {SelExternalEdge}};
@@ -5212,7 +5214,7 @@ CmdSketcherConstrainDiameter::CmdSketcherConstrainDiameter()
     sWhatsThis      = "Sketcher_ConstrainDiameter";
     sStatusTip      = sToolTipText;
     sPixmap         = "Constraint_Diameter";
-    sAccel          = "";
+    sAccel          = "K, O";
     eType           = ForEdit;
 
     allowedSelSequences = {{SelEdge}, {SelExternalEdge}};
@@ -5488,7 +5490,7 @@ CmdSketcherConstrainRadiam::CmdSketcherConstrainRadiam()
     sWhatsThis      = "Sketcher_ConstrainRadiam";
     sStatusTip      = sToolTipText;
     sPixmap         = "Constraint_Radiam";
-    sAccel          = "";
+    sAccel          = "K, S";
     eType           = ForEdit;
 
     allowedSelSequences = {{SelEdge}, {SelExternalEdge}};
@@ -5791,7 +5793,7 @@ CmdSketcherCompConstrainRadDia::CmdSketcherCompConstrainRadDia()
     sToolTipText    = QT_TR_NOOP("Constrain an arc or a circle");
     sWhatsThis      = "Sketcher_CompCreateCircle";
     sStatusTip      = sToolTipText;
-    sAccel          = "SHIFT+R";
+    sAccel          = "R";
     eType           = ForEdit;
 }
 
@@ -5936,7 +5938,7 @@ CmdSketcherConstrainAngle::CmdSketcherConstrainAngle()
     sWhatsThis      = "Sketcher_ConstrainAngle";
     sStatusTip      = sToolTipText;
     sPixmap         = "Constraint_InternalAngle";
-    sAccel          = "A";
+    sAccel          = "K, A";
     eType           = ForEdit;
 
     allowedSelSequences = {{SelEdge, SelEdgeOrAxis}, {SelEdgeOrAxis, SelEdge},
@@ -6982,7 +6984,7 @@ CmdSketcherConstrainSnellsLaw::CmdSketcherConstrainSnellsLaw()
     sWhatsThis      = "Sketcher_ConstrainSnellsLaw";
     sStatusTip      = sToolTipText;
     sPixmap         = "Constraint_SnellsLaw";
-    sAccel          = "";
+    sAccel          = "K, W";
     eType           = ForEdit;
 }
 
@@ -7134,6 +7136,8 @@ bool CmdSketcherConstrainSnellsLaw::isActive(void)
 
 DEF_STD_CMD_A(CmdSketcherConstrainInternalAlignment)
 
+// NOTE: This command is deprecated. Nobody seriously uses today manual creation of an internal alignment constraint
+// The only reason this code remains is the extremelly unlikely scenario that some user macro may rely on it.
 CmdSketcherConstrainInternalAlignment::CmdSketcherConstrainInternalAlignment()
     :Command("Sketcher_ConstrainInternalAlignment")
 {
@@ -7145,7 +7149,6 @@ CmdSketcherConstrainInternalAlignment::CmdSketcherConstrainInternalAlignment()
     sWhatsThis      = "Sketcher_ConstrainInternalAlignment";
     sStatusTip      = sToolTipText;
     sPixmap         = "Constraint_InternalAlignment";
-    sAccel          = "Ctrl+A";
     eType           = ForEdit;
 }
 
@@ -7607,7 +7610,7 @@ CmdSketcherToggleDrivingConstraint::CmdSketcherToggleDrivingConstraint()
     sWhatsThis      = "Sketcher_ToggleDrivingConstraint";
     sStatusTip      = sToolTipText;
     sPixmap         = "Sketcher_ToggleConstraint";
-    sAccel          = "";
+    sAccel          = "K, X";
     eType           = ForEdit;
 
     // list of toggle driving constraint commands
@@ -7733,7 +7736,7 @@ CmdSketcherToggleActiveConstraint::CmdSketcherToggleActiveConstraint()
     sWhatsThis      = "Sketcher_ToggleActiveConstraint";
     sStatusTip      = sToolTipText;
     sPixmap         = "Sketcher_ToggleActiveConstraint";
-    sAccel          = "";
+    sAccel          = "K, Z";
     eType           = ForEdit;
 }