diff --git a/common/hotkey_store.cpp b/common/hotkey_store.cpp
index c24821667f..932a82cd98 100644
--- a/common/hotkey_store.cpp
+++ b/common/hotkey_store.cpp
@@ -49,7 +49,7 @@ static PSEUDO_ACTION* g_gesturePseudoActions[] = {
new PSEUDO_ACTION( _( "Finish Drawing" ), PSEUDO_WXK_DBLCLICK ),
new PSEUDO_ACTION( _( "Add to Selection" ), MD_SHIFT + PSEUDO_WXK_CLICK ),
new PSEUDO_ACTION( _( "Highlight Net" ), MD_CTRL + PSEUDO_WXK_CLICK ),
- new PSEUDO_ACTION( _( "Remove from Selection" ), MD_SHIFT + MD_CTRL + PSEUDO_WXK_CLICK ),
+ new PSEUDO_ACTION( _( "Remove from Selection" ), MD_CTRL + MD_SHIFT + PSEUDO_WXK_CLICK ),
new PSEUDO_ACTION( _( "Ignore Grid Snaps" ), MD_CTRL ),
new PSEUDO_ACTION( _( "Ignore Other Snaps" ), MD_SHIFT ),
};
diff --git a/common/tool/actions.cpp b/common/tool/actions.cpp
index a86defb500..bf1af59e19 100644
--- a/common/tool/actions.cpp
+++ b/common/tool/actions.cpp
@@ -95,7 +95,7 @@ TOOL_ACTION ACTIONS::save( TOOL_ACTION_ARGS()
TOOL_ACTION ACTIONS::saveAs( TOOL_ACTION_ARGS()
.Name( "common.Control.saveAs" )
.Scope( AS_GLOBAL )
- .DefaultHotkey( MD_SHIFT + MD_CTRL + 'S' )
+ .DefaultHotkey( MD_CTRL + MD_SHIFT + 'S' )
.LegacyHotkeyName( "Save As" )
.FriendlyName( _( "Save As..." ) )
.Tooltip( _( "Save current document to another location" ) )
@@ -194,7 +194,7 @@ TOOL_ACTION ACTIONS::redo( TOOL_ACTION_ARGS()
.Name( "common.Interactive.redo" )
.Scope( AS_GLOBAL )
#if defined( __WXMAC__ )
- .DefaultHotkey( MD_SHIFT + MD_CTRL + 'Z' )
+ .DefaultHotkey( MD_CTRL + MD_SHIFT + 'Z' )
#else
.DefaultHotkey( MD_CTRL + 'Y' )
#endif
@@ -996,7 +996,6 @@ TOOL_ACTION ACTIONS::resetLocalCoords( TOOL_ACTION_ARGS()
TOOL_ACTION ACTIONS::toggleCursor( TOOL_ACTION_ARGS()
.Name( "common.Control.toggleCursor" )
.Scope( AS_GLOBAL )
- .DefaultHotkey( MD_CTRL + MD_SHIFT + 'X' )
// Don't be tempted to remove "Modern Toolset only". It's in the legacy property name.
.LegacyHotkeyName( "Toggle Cursor Display (Modern Toolset only)" )
.FriendlyName( _( "Always Show Crosshairs" ) )
diff --git a/eeschema/tools/ee_actions.cpp b/eeschema/tools/ee_actions.cpp
index e95d574423..b6a5ff0c72 100644
--- a/eeschema/tools/ee_actions.cpp
+++ b/eeschema/tools/ee_actions.cpp
@@ -183,7 +183,7 @@ TOOL_ACTION EE_ACTIONS::editDesignBlockProperties( TOOL_ACTION_ARGS()
TOOL_ACTION EE_ACTIONS::saveLibraryAs( TOOL_ACTION_ARGS()
.Name( "eeschema.SymbolLibraryControl.saveLibraryAs" )
.Scope( AS_GLOBAL )
- .DefaultHotkey( MD_SHIFT + MD_CTRL + 'S' )
+ .DefaultHotkey( MD_CTRL + MD_SHIFT + 'S' )
.LegacyHotkeyName( "Save As" )
.FriendlyName( _( "Save Library As..." ) )
.Tooltip( _( "Save the current library to a new file" ) ) );
@@ -1121,7 +1121,7 @@ TOOL_ACTION EE_ACTIONS::drawSheetOnClipboard( TOOL_ACTION_ARGS()
TOOL_ACTION EE_ACTIONS::importGraphics( TOOL_ACTION_ARGS()
.Name( "eeschema.EditorControl.importGraphics" )
.Scope( AS_GLOBAL )
- .DefaultHotkey( MD_SHIFT + MD_CTRL + 'F' )
+ .DefaultHotkey( MD_CTRL + MD_SHIFT + 'F' )
.LegacyHotkeyName( "Place DXF" )
.FriendlyName( _( "Import Graphics..." ) )
.Tooltip( _( "Import 2D drawing file" ) )
@@ -1516,7 +1516,7 @@ TOOL_ACTION EE_ACTIONS::saveWorkbook( TOOL_ACTION_ARGS()
TOOL_ACTION EE_ACTIONS::saveWorkbookAs( TOOL_ACTION_ARGS()
.Name( "eeschema.Simulation.saveWorkbookAs" )
.Scope( AS_GLOBAL )
- .DefaultHotkey( MD_SHIFT + MD_CTRL + 'S' )
+ .DefaultHotkey( MD_CTRL + MD_SHIFT + 'S' )
.LegacyHotkeyName( "Save As" )
.FriendlyName( _( "Save Workbook As..." ) )
.Tooltip( _( "Save the current set of analysis tabs and settings to another location" ) )
diff --git a/pcbnew/tools/pcb_actions.cpp b/pcbnew/tools/pcb_actions.cpp
index 2904b8bf2b..7b2f5badef 100644
--- a/pcbnew/tools/pcb_actions.cpp
+++ b/pcbnew/tools/pcb_actions.cpp
@@ -103,7 +103,7 @@ TOOL_ACTION PCB_ACTIONS::outsetItems( TOOL_ACTION_ARGS()
TOOL_ACTION PCB_ACTIONS::drawLine( TOOL_ACTION_ARGS()
.Name( "pcbnew.InteractiveDrawing.line" )
.Scope( AS_GLOBAL )
- .DefaultHotkey( MD_SHIFT + MD_CTRL + 'L' )
+ .DefaultHotkey( MD_CTRL + MD_SHIFT + 'L' )
.LegacyHotkeyName( "Draw Line" )
.FriendlyName( _( "Draw Lines" ) )
.Icon( BITMAPS::add_graphical_segments )
@@ -112,7 +112,7 @@ TOOL_ACTION PCB_ACTIONS::drawLine( TOOL_ACTION_ARGS()
TOOL_ACTION PCB_ACTIONS::drawPolygon( TOOL_ACTION_ARGS()
.Name( "pcbnew.InteractiveDrawing.graphicPolygon" )
.Scope( AS_GLOBAL )
- .DefaultHotkey( MD_SHIFT + MD_CTRL + 'P' )
+ .DefaultHotkey( MD_CTRL + MD_SHIFT + 'P' )
.LegacyHotkeyName( "Draw Graphic Polygon" )
.FriendlyName( _( "Draw Polygons" ) )
.Icon( BITMAPS::add_graphical_polygon )
@@ -129,7 +129,7 @@ TOOL_ACTION PCB_ACTIONS::drawRectangle( TOOL_ACTION_ARGS()
TOOL_ACTION PCB_ACTIONS::drawCircle( TOOL_ACTION_ARGS()
.Name( "pcbnew.InteractiveDrawing.circle" )
.Scope( AS_GLOBAL )
- .DefaultHotkey( MD_SHIFT + MD_CTRL + 'C' )
+ .DefaultHotkey( MD_CTRL + MD_SHIFT + 'C' )
.LegacyHotkeyName( "Draw Circle" )
.FriendlyName( _( "Draw Circles" ) )
.Icon( BITMAPS::add_circle )
@@ -138,7 +138,7 @@ TOOL_ACTION PCB_ACTIONS::drawCircle( TOOL_ACTION_ARGS()
TOOL_ACTION PCB_ACTIONS::drawArc( TOOL_ACTION_ARGS()
.Name( "pcbnew.InteractiveDrawing.arc" )
.Scope( AS_GLOBAL )
- .DefaultHotkey( MD_SHIFT + MD_CTRL + 'A' )
+ .DefaultHotkey( MD_CTRL + MD_SHIFT + 'A' )
.LegacyHotkeyName( "Draw Arc" )
.FriendlyName( _( "Draw Arcs" ) )
.Icon( BITMAPS::add_arc )
@@ -147,7 +147,7 @@ TOOL_ACTION PCB_ACTIONS::drawArc( TOOL_ACTION_ARGS()
TOOL_ACTION PCB_ACTIONS::drawBezier( TOOL_ACTION_ARGS()
.Name( "pcbnew.InteractiveDrawing.bezier" )
.Scope( AS_GLOBAL )
- .DefaultHotkey( MD_SHIFT + MD_CTRL + 'B' )
+ .DefaultHotkey( MD_CTRL + MD_SHIFT + 'B' )
.FriendlyName( _( "Draw Bezier Curve" ) )
.Icon( BITMAPS::add_bezier )
.Flags( AF_ACTIVATE ) );
@@ -180,7 +180,7 @@ TOOL_ACTION PCB_ACTIONS::placeReferenceImage( TOOL_ACTION_ARGS()
TOOL_ACTION PCB_ACTIONS::placeText( TOOL_ACTION_ARGS()
.Name( "pcbnew.InteractiveDrawing.text" )
.Scope( AS_GLOBAL )
- .DefaultHotkey( MD_SHIFT + MD_CTRL + 'T' )
+ .DefaultHotkey( MD_CTRL + MD_SHIFT + 'T' )
.LegacyHotkeyName( "Add Text" )
.FriendlyName( _( "Draw Text" ) )
.Icon( BITMAPS::text )
@@ -262,7 +262,7 @@ TOOL_ACTION PCB_ACTIONS::drawRadialDimension( TOOL_ACTION_ARGS()
TOOL_ACTION PCB_ACTIONS::drawOrthogonalDimension( TOOL_ACTION_ARGS()
.Name( "pcbnew.InteractiveDrawing.orthogonalDimension" )
.Scope( AS_GLOBAL )
- .DefaultHotkey( MD_SHIFT + MD_CTRL + 'H' )
+ .DefaultHotkey( MD_CTRL + MD_SHIFT + 'H' )
.FriendlyName( _( "Draw Orthogonal Dimensions" ) )
.Icon( BITMAPS::add_orthogonal_dimension )
.Flags( AF_ACTIVATE ) );
@@ -280,7 +280,7 @@ TOOL_ACTION PCB_ACTIONS::drawZone( TOOL_ACTION_ARGS()
#ifdef __WXOSX_MAC__
.DefaultHotkey( MD_ALT + 'Z' )
#else
- .DefaultHotkey( MD_SHIFT + MD_CTRL + 'Z' )
+ .DefaultHotkey( MD_CTRL + MD_SHIFT + 'Z' )
#endif
.LegacyHotkeyName( "Add Filled Zone" )
.FriendlyName( _( "Draw Filled Zones" ) )
@@ -291,7 +291,7 @@ TOOL_ACTION PCB_ACTIONS::drawZone( TOOL_ACTION_ARGS()
TOOL_ACTION PCB_ACTIONS::drawVia( TOOL_ACTION_ARGS()
.Name( "pcbnew.InteractiveDrawing.via" )
.Scope( AS_GLOBAL )
- .DefaultHotkey( MD_SHIFT + MD_CTRL + 'V' )
+ .DefaultHotkey( MD_CTRL + MD_SHIFT + 'X' )
.LegacyHotkeyName( "Add Vias" )
.FriendlyName( _( "Place Vias" ) )
.Tooltip( _( "Place free-standing vias" ) )
@@ -301,7 +301,7 @@ TOOL_ACTION PCB_ACTIONS::drawVia( TOOL_ACTION_ARGS()
TOOL_ACTION PCB_ACTIONS::drawRuleArea( TOOL_ACTION_ARGS()
.Name( "pcbnew.InteractiveDrawing.ruleArea" )
.Scope( AS_GLOBAL )
- .DefaultHotkey( MD_SHIFT + MD_CTRL + 'K' )
+ .DefaultHotkey( MD_CTRL + MD_SHIFT + 'K' )
.LegacyHotkeyName( "Add Keepout Area" )
.FriendlyName( _( "Draw Rule Areas" ) )
.Icon( BITMAPS::add_keepout_area )
@@ -322,7 +322,7 @@ TOOL_ACTION PCB_ACTIONS::drawZoneCutout( TOOL_ACTION_ARGS()
TOOL_ACTION PCB_ACTIONS::drawSimilarZone( TOOL_ACTION_ARGS()
.Name( "pcbnew.InteractiveDrawing.similarZone" )
.Scope( AS_GLOBAL )
- .DefaultHotkey( MD_SHIFT + MD_CTRL + '.' )
+ .DefaultHotkey( MD_CTRL + MD_SHIFT + '.' )
.LegacyHotkeyName( "Add a Similar Zone" )
.FriendlyName( _( "Add a Similar Zone" ) )
.Tooltip( _( "Add a zone with the same settings as an existing zone" ) )
@@ -333,7 +333,7 @@ TOOL_ACTION PCB_ACTIONS::drawSimilarZone( TOOL_ACTION_ARGS()
TOOL_ACTION PCB_ACTIONS::placeImportedGraphics( TOOL_ACTION_ARGS()
.Name( "pcbnew.InteractiveDrawing.placeImportedGraphics" )
.Scope( AS_GLOBAL )
- .DefaultHotkey( MD_SHIFT + MD_CTRL + 'F' )
+ .DefaultHotkey( MD_CTRL + MD_SHIFT + 'F' )
.LegacyHotkeyName( "Place DXF" )
.FriendlyName( _( "Import Graphics..." ) )
.Tooltip( _( "Import 2D drawing file" ) )
@@ -343,7 +343,7 @@ TOOL_ACTION PCB_ACTIONS::placeImportedGraphics( TOOL_ACTION_ARGS()
TOOL_ACTION PCB_ACTIONS::setAnchor( TOOL_ACTION_ARGS()
.Name( "pcbnew.InteractiveDrawing.setAnchor" )
.Scope( AS_GLOBAL )
- .DefaultHotkey( MD_SHIFT + MD_CTRL + 'N' )
+ .DefaultHotkey( MD_CTRL + MD_SHIFT + 'N' )
.LegacyHotkeyName( "Place the Footprint Anchor" )
.FriendlyName( _( "Place the Footprint Anchor" ) )
.Tooltip( _( "Set the anchor point of the footprint" ) )
@@ -489,7 +489,7 @@ TOOL_ACTION PCB_ACTIONS::copyWithReference( TOOL_ACTION_ARGS()
TOOL_ACTION PCB_ACTIONS::duplicateIncrement(TOOL_ACTION_ARGS()
.Name( "pcbnew.InteractiveEdit.duplicateIncrementPads" )
.Scope( AS_GLOBAL )
- .DefaultHotkey( MD_SHIFT + MD_CTRL + 'D' )
+ .DefaultHotkey( MD_CTRL + MD_SHIFT + 'D' )
.LegacyHotkeyName( "Duplicate Item and Increment" )
.FriendlyName( _( "Duplicate and Increment" ) )
.Tooltip( _( "Duplicates the selected item(s), incrementing pad numbers" ) )