GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-08-14 11:15:54 +08:00
Code Issues Packages Projects Releases Wiki Activity

Update wording to make storing/updating/discarding current settings more clear

Browse Source 
CURA-970
This commit is contained in:
fieldOfView 2016-06-09 19:18:46 +02:00
parent 598ff1e398
commit 0d7a7d9299
4 changed files with 15 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
resources/qml/Actions.qml
View File

@ -111,7 +111,7 @@ Item
{ {
id: updateProfileAction; id: updateProfileAction;
enabled: Cura.MachineManager.isGlobalStackValid && Cura.MachineManager.hasUserSettings && !Cura.MachineManager.isReadOnly(Cura.MachineManager.activeQualityId) 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() onTriggered: Cura.MachineManager.updateQualityContainerFromUserContainer()
} }
@ -119,15 +119,15 @@ Item
{ {
id: resetProfileAction; id: resetProfileAction;
enabled: Cura.MachineManager.hasUserSettings 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(); onTriggered: Cura.MachineManager.clearUserSettings();
} }
Action Action
{ {
id: addProfileAction; id: addProfileAction;
enabled: Cura.MachineManager.isGlobalStackValid enabled: Cura.MachineManager.isGlobalStackValid && Cura.MachineManager.hasUserSettings
text: catalog.i18nc("@action:inmenu menubar:profile","&Create New Profile..."); text: catalog.i18nc("@action:inmenu menubar:profile","&Create profile from current settings...");
} }
Action Action

8
resources/qml/Cura.qml
View File

@ -297,11 +297,11 @@ UM.MainWindow
MenuSeparator { id: profileMenuSeparator } MenuSeparator { id: profileMenuSeparator }
MenuItem { action: Cura.Actions.updateProfile; } MenuItem { action: Cura.Actions.addProfile }
MenuItem { action: Cura.Actions.resetProfile; } MenuItem { action: Cura.Actions.updateProfile }
MenuItem { action: Cura.Actions.addProfile; } MenuItem { action: Cura.Actions.resetProfile }
MenuSeparator { } MenuSeparator { }
MenuItem { action: Cura.Actions.manageProfiles; } MenuItem { action: Cura.Actions.manageProfiles }
} }
Menu Menu

8
resources/qml/Preferences/ProfilesPage.qml
View File

@ -13,7 +13,7 @@ UM.ManagementPage
id: base; id: base;
title: catalog.i18nc("@title:tab", "Profiles"); 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 model: UM.InstanceContainersModel
{ {
@ -116,9 +116,7 @@ UM.ManagementPage
Button Button
{ {
text: { text: {
var profileName = Cura.MachineManager.activeQualityName; return catalog.i18nc("@action:button", "Update profile with current settings");
profileName = (profileName.length > 20) ? profileName.substring(0, 20) + '...' : profileName;
return catalog.i18nc("@action:button", "Update \"%1\"".arg(profileName));
} }
enabled: Cura.MachineManager.hasUserSettings && !Cura.MachineManager.isReadOnly(Cura.MachineManager.activeQualityId) enabled: Cura.MachineManager.hasUserSettings && !Cura.MachineManager.isReadOnly(Cura.MachineManager.activeQualityId)
onClicked: Cura.MachineManager.updateQualityContainerFromUserContainer() onClicked: Cura.MachineManager.updateQualityContainerFromUserContainer()
@ -126,7 +124,7 @@ UM.ManagementPage
Button Button
{ {
text: catalog.i18nc("@action:button", "Discard changes"); text: catalog.i18nc("@action:button", "Discard current settings");
enabled: Cura.MachineManager.hasUserSettings enabled: Cura.MachineManager.hasUserSettings
onClicked: Cura.MachineManager.clearUserSettings(); onClicked: Cura.MachineManager.clearUserSettings();
} }

20
resources/qml/SidebarHeader.qml
View File

@ -401,23 +401,11 @@ Column
} }
MenuSeparator { } MenuSeparator { }
MenuItem MenuItem { action: Cura.Actions.addProfile }
{ MenuItem { action: Cura.Actions.updateProfile }
action: Cura.Actions.updateProfile; MenuItem { action: Cura.Actions.resetProfile }
}
MenuItem
{
action: Cura.Actions.resetProfile;
}
MenuItem
{
action: Cura.Actions.addProfile;
}
MenuSeparator { } MenuSeparator { }
MenuItem MenuItem { action: Cura.Actions.manageProfiles }
{
action: Cura.Actions.manageProfiles;
}
} }
UM.SimpleButton UM.SimpleButton