From 6f651b922a6852acdf59cf3ec24c8e74d1abf95f Mon Sep 17 00:00:00 2001 From: Remco Burema Date: Wed, 30 Nov 2022 19:54:41 +0100 Subject: [PATCH] Profile compare-and-save: Add (more) explanatory text(s). part of CURA-9347 --- resources/qml/Cura.qml | 23 +++++++++++++++++++ resources/qml/Dialogs/RenameDialog.qml | 18 ++++++++++++++- .../ProfileWarningReset.qml | 6 ++++- 3 files changed, 45 insertions(+), 2 deletions(-) diff --git a/resources/qml/Cura.qml b/resources/qml/Cura.qml index e63829936b..2ba14a2d95 100644 --- a/resources/qml/Cura.qml +++ b/resources/qml/Cura.qml @@ -878,6 +878,29 @@ UM.MainWindow title: catalog.i18nc("@title:window", "Save Custom Profile") object: catalog.i18nc("@textfield:placeholder", "") explanation: catalog.i18nc("@info", "Custom profile name:") + extraInfo: + [ + UM.ColorImage + { + width: UM.Theme.getSize("message_type_icon").width + height: UM.Theme.getSize("message_type_icon").height + source: UM.Theme.getIcon("Information") + color: UM.Theme.getColor("text") + }, + UM.Label + { + text: catalog.i18nc + ( + "@label %i will be replaced with a profile name", + "Only user changed settings will be saved in the custom profile.
" + + "The new custom profile will inherit properties from %1,
" + + "for materials that support it.
" + + "Learn more about Cura print profiles" + ).arg(Cura.MachineManager.activeQualityOrQualityChangesName).arg("https://support.ultimaker.com/s/article/1667337576882") + wrapMode: Text.WordWrap + } + ] + okButtonText: catalog.i18nc("@button", "Save new profile") onAccepted: CuraApplication.getQualityManagementModel().createQualityChanges(newName, true); } diff --git a/resources/qml/Dialogs/RenameDialog.qml b/resources/qml/Dialogs/RenameDialog.qml index bfb75276d4..cbc8ad8224 100644 --- a/resources/qml/Dialogs/RenameDialog.qml +++ b/resources/qml/Dialogs/RenameDialog.qml @@ -28,7 +28,7 @@ UM.Dialog title: dialogTitle backgroundColor: UM.Theme.getColor("main_background") minimumWidth: UM.Theme.getSize("small_popup_dialog").width - minimumHeight: UM.Theme.getSize("small_popup_dialog").height + minimumHeight: UM.Theme.getSize("small_popup_dialog").height + extraInfoHolder.height width: minimumWidth height: minimumHeight @@ -63,8 +63,24 @@ UM.Dialog onTextChanged: base.textChanged(text) } + // spacer + Rectangle + { + color: base.backgroundColor + height: UM.Theme.getSize("wide_margin").height + width: height + } + Row { + id: extraInfoHolder + anchors + { + left: parent.left + right: parent.right + margins: UM.Theme.getSize("default_margin").height + } + spacing: UM.Theme.getSize("default_margin").height children: extraInfo } diff --git a/resources/qml/PrintSetupSelector/ProfileWarningReset.qml b/resources/qml/PrintSetupSelector/ProfileWarningReset.qml index 17d59981fa..d703296181 100644 --- a/resources/qml/PrintSetupSelector/ProfileWarningReset.qml +++ b/resources/qml/PrintSetupSelector/ProfileWarningReset.qml @@ -83,7 +83,11 @@ Item PropertyChanges { target: warning - text: catalog.i18nc("@info", "Some settings were changed.") + text: + { + var profile_name = Cura.MachineManager.activeQualityOrQualityChangesName; + return catalog.i18nc("@info %1 is the name of a profile", "Some setting-values defined in %1 were overridden.").arg(profile_name); + } } } ]