3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-24 15:13:56 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

Revert "Remove double shortcut buttons"

Browse source 
CURA-5642

This breaks translations and doesn't fix the shortcut key problem.
This commit is contained in:
Lipu Fei 2018-08-31 15:13:44 +02:00
parent 8a507c34a3
commit 6cceebb117
2 changed files with 10 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

18
resources/qml/Actions.qml
View file

@ -110,35 +110,35 @@ Item
Action Action
{ {
id: view3DCameraAction; id: view3DCameraAction;
text: catalog.i18nc("@action:inmenu menubar:view","3D View"); text: catalog.i18nc("@action:inmenu menubar:view","&3D View");
onTriggered: UM.Controller.rotateView("3d", 0); onTriggered: UM.Controller.rotateView("3d", 0);
} }
Action Action
{ {
id: viewFrontCameraAction; id: viewFrontCameraAction;
text: catalog.i18nc("@action:inmenu menubar:view","Front View"); text: catalog.i18nc("@action:inmenu menubar:view","&Front View");
onTriggered: UM.Controller.rotateView("home", 0); onTriggered: UM.Controller.rotateView("home", 0);
} }
Action Action
{ {
id: viewTopCameraAction; id: viewTopCameraAction;
text: catalog.i18nc("@action:inmenu menubar:view","Top View"); text: catalog.i18nc("@action:inmenu menubar:view","&Top View");
onTriggered: UM.Controller.rotateView("y", 90); onTriggered: UM.Controller.rotateView("y", 90);
} }
Action Action
{ {
id: viewLeftSideCameraAction; id: viewLeftSideCameraAction;
text: catalog.i18nc("@action:inmenu menubar:view","Left Side View"); text: catalog.i18nc("@action:inmenu menubar:view","&Left Side View");
onTriggered: UM.Controller.rotateView("x", 90); onTriggered: UM.Controller.rotateView("x", 90);
} }
Action Action
{ {
id: viewRightSideCameraAction; id: viewRightSideCameraAction;
text: catalog.i18nc("@action:inmenu menubar:view","Right Side View"); text: catalog.i18nc("@action:inmenu menubar:view","&Right Side View");
onTriggered: UM.Controller.rotateView("x", -90); onTriggered: UM.Controller.rotateView("x", -90);
} }
@ -229,7 +229,7 @@ Item
Action Action
{ {
id: deleteSelectionAction; id: deleteSelectionAction;
text: catalog.i18ncp("@action:inmenu menubar:edit", "Delete Selected Model", "Delete Selected Models", UM.Selection.selectionCount); text: catalog.i18ncp("@action:inmenu menubar:edit", "Delete &Selected Model", "Delete &Selected Models", UM.Selection.selectionCount);
enabled: UM.Controller.toolsEnabled && UM.Selection.hasSelection; enabled: UM.Controller.toolsEnabled && UM.Selection.hasSelection;
iconName: "edit-delete"; iconName: "edit-delete";
shortcut: StandardKey.Delete; shortcut: StandardKey.Delete;
@ -239,7 +239,7 @@ Item
Action //Also add backspace as the same function as delete because on Macintosh keyboards the button called "delete" is actually a backspace, and the user expects it to function as a delete. Action //Also add backspace as the same function as delete because on Macintosh keyboards the button called "delete" is actually a backspace, and the user expects it to function as a delete.
{ {
id: backspaceSelectionAction id: backspaceSelectionAction
text: catalog.i18ncp("@action:inmenu menubar:edit", "Delete Selected Model", "Delete Selected Models", UM.Selection.selectionCount) text: catalog.i18ncp("@action:inmenu menubar:edit", "Delete &Selected Model", "Delete &Selected Models", UM.Selection.selectionCount)
enabled: UM.Controller.toolsEnabled && UM.Selection.hasSelection enabled: UM.Controller.toolsEnabled && UM.Selection.hasSelection
iconName: "edit-delete" iconName: "edit-delete"
shortcut: StandardKey.Backspace shortcut: StandardKey.Backspace
@ -328,7 +328,7 @@ Item
Action Action
{ {
id: selectAllAction; id: selectAllAction;
text: catalog.i18nc("@action:inmenu menubar:edit","Select All Models"); text: catalog.i18nc("@action:inmenu menubar:edit","&Select All Models");
enabled: UM.Controller.toolsEnabled; enabled: UM.Controller.toolsEnabled;
iconName: "edit-select-all"; iconName: "edit-select-all";
shortcut: "Ctrl+A"; shortcut: "Ctrl+A";
@ -386,7 +386,7 @@ Item
Action Action
{ {
id: resetAllAction; id: resetAllAction;
text: catalog.i18nc("@action:inmenu menubar:edit","Reset All Model Transformations"); text: catalog.i18nc("@action:inmenu menubar:edit","Reset All Model &Transformations");
onTriggered: CuraApplication.resetAll(); onTriggered: CuraApplication.resetAll();
} }

2
resources/qml/Cura.qml
View file

@ -117,7 +117,7 @@ UM.MainWindow
MenuItem MenuItem
{ {
id: saveWorkspaceMenu id: saveWorkspaceMenu
text: catalog.i18nc("@title:menu menubar:file","Save...") text: catalog.i18nc("@title:menu menubar:file","&Save...")
onTriggered: onTriggered:
{ {
var args = { "filter_by_machine": false, "file_type": "workspace", "preferred_mimetypes": "application/vnd.ms-package.3dmanufacturing-3dmodel+xml" }; var args = { "filter_by_machine": false, "file_type": "workspace", "preferred_mimetypes": "application/vnd.ms-package.3dmanufacturing-3dmodel+xml" };