Skip to content

Commit f7d78d3

Browse files
Make axis use key name Ctrl instead of Control for shortcut presentation
The user visible strings should use Ctrl as this is the lettering on the keyboard.
1 parent 074d46f commit f7d78d3

2 files changed

Lines changed: 9 additions & 9 deletions

File tree

share/axis/tcl/axis.tcl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -516,7 +516,7 @@ setup_widget_accel .toolbar.file_open {}
516516

517517
Button .toolbar.reload \
518518
-command { reload_file } \
519-
-helptext [_ "Reopen current file \[Control-R\]"] \
519+
-helptext [_ "Reopen current file \[Ctrl-R\]"] \
520520
-image [load_image tool_reload] \
521521
-relief link \
522522
-takefocus 0
@@ -2257,7 +2257,7 @@ DynamicHelp::add $_tabs_manual.flood -text [_ "Turn flood on or off \[F8\]"]
22572257
DynamicHelp::add $_tabs_manual.mist -text [_ "Turn mist on or off \[F7\]"]
22582258
DynamicHelp::add $_tabs_manual.jogf.zerohome.home -text [_ "Send active axis home \[Home\]"]
22592259
DynamicHelp::add $_tabs_manual.jogf.zerohome.zero -text [_ "Set G54 offset for active axis \[End\]"]
2260-
DynamicHelp::add $_tabs_manual.jogf.zerohome.tooltouch -text [_ "Set tool offset for loaded tool \[Control-End\]"]
2260+
DynamicHelp::add $_tabs_manual.jogf.zerohome.tooltouch -text [_ "Set tool offset for loaded tool \[Ctrl-End\]"]
22612261
DynamicHelp::add $_tabs_manual.axes.axisx -text [_ "Activate axis \[X\]"]
22622262
DynamicHelp::add $_tabs_manual.axes.axisy -text [_ "Activate axis \[Y\]"]
22632263
DynamicHelp::add $_tabs_manual.axes.axisz -text [_ "Activate axis \[Z\]"]

src/emc/usr_intf/axis/scripts/axis.py

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -216,20 +216,20 @@ def General_Halt():
216216
(_("Right Button"), _("Zoom view")),
217217
(_("Wheel Button"), _("Rotate view")),
218218
(_("Rotate Wheel"), _("Zoom view")),
219-
(_("Control+Left Button"), _("Zoom view")),
219+
(_("Ctrl+Left Button"), _("Zoom view")),
220220
]
221221
help2 = [
222222
("F3", _("Manual control")),
223223
("F5", _("Code entry (MDI)")),
224-
(_("Control-M"), _("Clear MDI history")),
225-
(_("Control-H"), _("Copy selected MDI history elements")),
224+
(_("Ctrl-M"), _("Clear MDI history")),
225+
(_("Ctrl-H"), _("Copy selected MDI history elements")),
226226
("", _("to clipboard")),
227-
(_("Control-Shift-H"), _("Paste clipboard to MDI history")),
227+
(_("Ctrl-Shift-H"), _("Paste clipboard to MDI history")),
228228
("L", _("Override Limits")),
229229
("", ""),
230230
("O", _("Open program")),
231-
(_("Control-R"), _("Reload program")),
232-
(_("Control-S"), _("Save G-code as")),
231+
(_("Ctrl-R"), _("Reload program")),
232+
(_("Ctrl-S"), _("Save G-code as")),
233233
("R", _("Run program")),
234234
("T", _("Step program")),
235235
("P", _("Pause program")),
@@ -245,7 +245,7 @@ def General_Halt():
245245
("F10", _("Turn spindle counterclockwise")),
246246
("F11", _("Turn spindle more slowly")),
247247
("F12", _("Turn spindle more quickly")),
248-
(_("Control-K"), _("Clear live plot")),
248+
(_("Ctrl-K"), _("Clear live plot")),
249249
("V", _("Cycle among preset views")),
250250
("F4", _("Cycle among preview, DRO, and user tabs")),
251251
("@", _("toggle Actual/Commanded")),

0 commit comments

Comments
 (0)