From 0d7a7d9299a945a5da32445897d758b11b5d6b81 Mon Sep 17 00:00:00 2001
From: fieldOfView <aldo@fieldofview.com>
Date: Thu, 9 Jun 2016 19:18:46 +0200
Subject: [PATCH] Update wording to make storing/updating/discarding current
 settings more clear

CURA-970
---
 resources/qml/Actions.qml                  |  8 ++++----
 resources/qml/Cura.qml                     |  8 ++++----
 resources/qml/Preferences/ProfilesPage.qml |  8 +++-----
 resources/qml/SidebarHeader.qml            | 20 ++++----------------
 4 files changed, 15 insertions(+), 29 deletions(-)

diff --git a/resources/qml/Actions.qml b/resources/qml/Actions.qml
index 3ef40644d2..7e03bd7102 100644
--- a/resources/qml/Actions.qml
+++ b/resources/qml/Actions.qml
@@ -111,7 +111,7 @@ Item
     {
         id: updateProfileAction;
         enabled: Cura.MachineManager.isGlobalStackValid && Cura.MachineManager.hasUserSettings && !Cura.MachineManager.isReadOnly(Cura.MachineManager.activeQualityId)
-        text: catalog.i18nc("@action:inmenu menubar:profile","&Update Current Profile");
+        text: catalog.i18nc("@action:inmenu menubar:profile","&Update profile with current settings");
         onTriggered: Cura.MachineManager.updateQualityContainerFromUserContainer()
     }
 
@@ -119,15 +119,15 @@ Item
     {
         id: resetProfileAction;
         enabled: Cura.MachineManager.hasUserSettings
-        text: catalog.i18nc("@action:inmenu menubar:profile","&Reload Current Profile");
+        text: catalog.i18nc("@action:inmenu menubar:profile","&Discard current settings");
         onTriggered: Cura.MachineManager.clearUserSettings();
     }
 
     Action
     {
         id: addProfileAction;
-        enabled: Cura.MachineManager.isGlobalStackValid
-        text: catalog.i18nc("@action:inmenu menubar:profile","&Create New Profile...");
+        enabled: Cura.MachineManager.isGlobalStackValid && Cura.MachineManager.hasUserSettings
+        text: catalog.i18nc("@action:inmenu menubar:profile","&Create profile from current settings...");
     }
 
     Action
diff --git a/resources/qml/Cura.qml b/resources/qml/Cura.qml
index 547f05d056..c3dc95b454 100644
--- a/resources/qml/Cura.qml
+++ b/resources/qml/Cura.qml
@@ -297,11 +297,11 @@ UM.MainWindow
 
                 MenuSeparator { id: profileMenuSeparator }
 
-                MenuItem { action: Cura.Actions.updateProfile; }
-                MenuItem { action: Cura.Actions.resetProfile; }
-                MenuItem { action: Cura.Actions.addProfile; }
+                MenuItem { action: Cura.Actions.addProfile }
+                MenuItem { action: Cura.Actions.updateProfile }
+                MenuItem { action: Cura.Actions.resetProfile }
                 MenuSeparator { }
-                MenuItem { action: Cura.Actions.manageProfiles; }
+                MenuItem { action: Cura.Actions.manageProfiles }
             }
 
             Menu
diff --git a/resources/qml/Preferences/ProfilesPage.qml b/resources/qml/Preferences/ProfilesPage.qml
index 71afdd98ac..93fd8ae61f 100644
--- a/resources/qml/Preferences/ProfilesPage.qml
+++ b/resources/qml/Preferences/ProfilesPage.qml
@@ -13,7 +13,7 @@ UM.ManagementPage
     id: base;
 
     title: catalog.i18nc("@title:tab", "Profiles");
-    addText: catalog.i18nc("@label", "Duplicate")
+    addText: base.currentItem && (base.currentItem.id == Cura.MachineManager.activeQualityId) ? catalog.i18nc("@label", "Create") : catalog.i18nc("@label", "Duplicate")
 
     model: UM.InstanceContainersModel
     {
@@ -116,9 +116,7 @@ UM.ManagementPage
             Button
             {
                 text: {
-                    var profileName = Cura.MachineManager.activeQualityName;
-                    profileName = (profileName.length > 20) ? profileName.substring(0, 20) + '...' : profileName;
-                    return catalog.i18nc("@action:button", "Update \"%1\"".arg(profileName));
+                    return catalog.i18nc("@action:button", "Update profile with current settings");
                 }
                 enabled: Cura.MachineManager.hasUserSettings && !Cura.MachineManager.isReadOnly(Cura.MachineManager.activeQualityId)
                 onClicked: Cura.MachineManager.updateQualityContainerFromUserContainer()
@@ -126,7 +124,7 @@ UM.ManagementPage
 
             Button
             {
-                text: catalog.i18nc("@action:button", "Discard changes");
+                text: catalog.i18nc("@action:button", "Discard current settings");
                 enabled: Cura.MachineManager.hasUserSettings
                 onClicked: Cura.MachineManager.clearUserSettings();
             }
diff --git a/resources/qml/SidebarHeader.qml b/resources/qml/SidebarHeader.qml
index 1083496f36..282068ee2c 100644
--- a/resources/qml/SidebarHeader.qml
+++ b/resources/qml/SidebarHeader.qml
@@ -401,23 +401,11 @@ Column
                 }
 
                 MenuSeparator { }
-                MenuItem
-                {
-                    action: Cura.Actions.updateProfile;
-                }
-                MenuItem
-                {
-                    action: Cura.Actions.resetProfile;
-                }
-                MenuItem
-                {
-                    action: Cura.Actions.addProfile;
-                }
+                MenuItem { action: Cura.Actions.addProfile }
+                MenuItem { action: Cura.Actions.updateProfile }
+                MenuItem { action: Cura.Actions.resetProfile }
                 MenuSeparator { }
-                MenuItem
-                {
-                    action: Cura.Actions.manageProfiles;
-                }
+                MenuItem { action: Cura.Actions.manageProfiles }
             }
 
             UM.SimpleButton