From e53e62ccab47e81aac180fa4c2cf3cf951f5524a Mon Sep 17 00:00:00 2001
From: Mark <mark.suurmond@gmail.com>
Date: Thu, 12 Jul 2018 14:54:10 +0200
Subject: [PATCH 1/2] CURA-5458 Use Save and Export

---
 resources/qml/Cura.qml | 42 ++++++++++++++++++++++--------------------
 1 file changed, 22 insertions(+), 20 deletions(-)

diff --git a/resources/qml/Cura.qml b/resources/qml/Cura.qml
index 20638e8850..eb89160c7a 100644
--- a/resources/qml/Cura.qml
+++ b/resources/qml/Cura.qml
@@ -122,29 +122,10 @@ UM.MainWindow
 
                 MenuSeparator { }
 
-                MenuItem
-                {
-                    text: catalog.i18nc("@action:inmenu menubar:file", "&Save Selection to File");
-                    enabled: UM.Selection.hasSelection;
-                    iconName: "document-save-as";
-                    onTriggered: UM.OutputDeviceManager.requestWriteSelectionToDevice("local_file", PrintInformation.jobName, { "filter_by_machine": false, "preferred_mimetype": "application/vnd.ms-package.3dmanufacturing-3dmodel+xml"});
-                }
-
-                MenuItem
-                {
-                    id: saveAsMenu
-                    text: catalog.i18nc("@title:menu menubar:file", "Save &As...")
-                    onTriggered:
-                    {
-                        var localDeviceId = "local_file";
-                        UM.OutputDeviceManager.requestWriteToDevice(localDeviceId, PrintInformation.jobName, { "filter_by_machine": false, "preferred_mimetype": "application/vnd.ms-package.3dmanufacturing-3dmodel+xml"});
-                    }
-                }
-
                 MenuItem
                 {
                     id: saveWorkspaceMenu
-                    text: catalog.i18nc("@title:menu menubar:file","Save &Project...")
+                    text: catalog.i18nc("@title:menu menubar:file","&Save..")
                     onTriggered:
                     {
                         var args = { "filter_by_machine": false, "file_type": "workspace", "preferred_mimetype": "application/x-curaproject+xml" };
@@ -160,6 +141,27 @@ UM.MainWindow
                     }
                 }
 
+                MenuItem
+                {
+                    id: saveAsMenu
+                    text: catalog.i18nc("@title:menu menubar:file", "&Export..")
+                    onTriggered:
+                    {
+                        var localDeviceId = "local_file";
+                        UM.OutputDeviceManager.requestWriteToDevice(localDeviceId, PrintInformation.jobName, { "filter_by_machine": false, "preferred_mimetype": "application/vnd.ms-package.3dmanufacturing-3dmodel+xml"});
+                    }
+                }
+
+                MenuItem
+                {
+                    text: catalog.i18nc("@action:inmenu menubar:file", "Export Selection to File");
+                    enabled: UM.Selection.hasSelection;
+                    iconName: "document-save-as";
+                    onTriggered: UM.OutputDeviceManager.requestWriteSelectionToDevice("local_file", PrintInformation.jobName, { "filter_by_machine": false, "preferred_mimetype": "application/vnd.ms-package.3dmanufacturing-3dmodel+xml"});
+                }
+
+                MenuSeparator { }
+
                 MenuItem { action: Cura.Actions.reloadAll; }
 
                 MenuSeparator { }

From 395c5d3a8bb9aaf6d301df5b49c2178e28a99d45 Mon Sep 17 00:00:00 2001
From: Diego Prado Gesto <d.pradogesto@ultimaker.com>
Date: Thu, 12 Jul 2018 15:16:01 +0200
Subject: [PATCH 2/2] CURA-5458 Add three dots in the options that will open a
 new window. Add the Save option together with the New and Open, and then
 separate it from the Export options.

---
 resources/qml/Cura.qml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/resources/qml/Cura.qml b/resources/qml/Cura.qml
index eb89160c7a..7b4f3c613b 100644
--- a/resources/qml/Cura.qml
+++ b/resources/qml/Cura.qml
@@ -120,12 +120,10 @@ UM.MainWindow
 
                 RecentFilesMenu { }
 
-                MenuSeparator { }
-
                 MenuItem
                 {
                     id: saveWorkspaceMenu
-                    text: catalog.i18nc("@title:menu menubar:file","&Save..")
+                    text: catalog.i18nc("@title:menu menubar:file","&Save...")
                     onTriggered:
                     {
                         var args = { "filter_by_machine": false, "file_type": "workspace", "preferred_mimetype": "application/x-curaproject+xml" };
@@ -141,10 +139,12 @@ UM.MainWindow
                     }
                 }
 
+                MenuSeparator { }
+
                 MenuItem
                 {
                     id: saveAsMenu
-                    text: catalog.i18nc("@title:menu menubar:file", "&Export..")
+                    text: catalog.i18nc("@title:menu menubar:file", "&Export...")
                     onTriggered:
                     {
                         var localDeviceId = "local_file";
@@ -154,7 +154,7 @@ UM.MainWindow
 
                 MenuItem
                 {
-                    text: catalog.i18nc("@action:inmenu menubar:file", "Export Selection to File");
+                    text: catalog.i18nc("@action:inmenu menubar:file", "Export Selection...");
                     enabled: UM.Selection.hasSelection;
                     iconName: "document-save-as";
                     onTriggered: UM.OutputDeviceManager.requestWriteSelectionToDevice("local_file", PrintInformation.jobName, { "filter_by_machine": false, "preferred_mimetype": "application/vnd.ms-package.3dmanufacturing-3dmodel+xml"});