3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-23 22:54:01 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Merge branch 'master' into full_screen_test

Browse source
This commit is contained in:
Jaime van Kessel 2018-09-28 11:24:22 +02:00 • committed by GitHub
commit c2f0a33b42
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
226 changed files with 85323 additions and 17316 deletions
Download patch file Download diff file Expand all files Collapse all files

18
resources/qml/Actions.qml
View file

@ -76,7 +76,7 @@ Item
{
id:toggleFullScreenAction
shortcut: StandardKey.FullScreen;
text: catalog.i18nc("@action:inmenu","Toggle Fu&ll Screen");
text: catalog.i18nc("@action:inmenu","Toggle Full Screen");
iconName: "view-fullscreen";
}
@ -223,7 +223,7 @@ Item
Action
{
id: aboutAction;
text: catalog.i18nc("@action:inmenu menubar:help","&About...");
text: catalog.i18nc("@action:inmenu menubar:help","About...");
iconName: "help-about";
}
@ -237,16 +237,6 @@ Item
onTriggered: CuraActions.deleteSelection();
}
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
text: catalog.i18ncp("@action:inmenu menubar:edit", "Delete Selected Model", "Delete Selected Models", UM.Selection.selectionCount)
enabled: UM.Controller.toolsEnabled && UM.Selection.hasSelection
iconName: "edit-delete"
shortcut: StandardKey.Backspace
onTriggered: CuraActions.deleteSelection()
}
Action
{
id: centerSelectionAction;
@ -339,7 +329,7 @@ Item
Action
{
id: deleteAllAction;
text: catalog.i18nc("@action:inmenu menubar:edit","&Clear Build Plate");
text: catalog.i18nc("@action:inmenu menubar:edit","Clear Build Plate");
enabled: UM.Controller.toolsEnabled;
iconName: "edit-delete";
shortcut: "Ctrl+D";
@ -349,7 +339,7 @@ Item
Action
{
id: reloadAllAction;
text: catalog.i18nc("@action:inmenu menubar:file","Re&load All Models");
text: catalog.i18nc("@action:inmenu menubar:file","Reload All Models");
iconName: "document-revert";
shortcut: "F5"
onTriggered: CuraApplication.reloadAll();