GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-08-12 21:48:58 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #13983 from Ultimaker/CURA-9347_part_2b

Browse Source 
[CURA-9347] part 2b: last changes(?) [reset and save buttons]
This commit is contained in:
Remco Burema 2022-12-07 09:16:04 +01:00 committed by GitHub
commit 71fb23516e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 16 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
resources/qml/PrintSetupSelector/Custom/CustomPrintSetup.qml
View File

@ -52,9 +52,13 @@ Item
id: intentSelection
onClicked: menu.opened ? menu.close() : menu.open()
anchors.right: profileWarningReset.left
anchors.rightMargin: UM.Theme.getSize("narrow_margin").width
width: UM.Theme.getSize("print_setup_big_item").width - profileWarningReset.width
// Anchoring to the right makes much more sense here, but for some reason this component compresses from the right
// and then expands from the left afterwards. This pushes it left by profileWarningReset.width
// The solution is to anchor from the other direction so this does not happen.
anchors.left: parent.left
// This leftMargin gives us the same spacing as anchoring to the right on profileWarningReset
anchors.leftMargin: parent.width - UM.Theme.getSize("print_setup_big_item").width
width: profileWarningReset.visible ? UM.Theme.getSize("print_setup_big_item").width - profileWarningReset.width - UM.Theme.getSize("default_margin").width : UM.Theme.getSize("print_setup_big_item").width
height: textLabel.contentHeight + 2 * UM.Theme.getSize("narrow_margin").height
hoverEnabled: true

15
resources/qml/PrintSetupSelector/ProfileWarningReset.qml
View File

@ -13,7 +13,8 @@ Item
property bool fullWarning: true // <- Can you see the warning icon and the text, or is it just the buttons?
height: visible ? UM.Theme.getSize("action_button_icon").height : 0
visible: Cura.MachineManager.hasUserSettings || Cura.MachineManager.hasCustomQuality
width: visible ? childrenRect.width: 0
visible: Cura.MachineManager.hasUserSettings || (fullWarning && Cura.MachineManager.hasCustomQuality)
Rectangle
{
@ -46,7 +47,7 @@ Item
{
left: warningIcon.right
verticalCenter: parent.verticalCenter
leftMargin: UM.Theme.getSize("thin_margin").width
leftMargin: visible ? UM.Theme.getSize("thin_margin").width : 0
}
wrapMode: Text.WordWrap
@ -113,7 +114,7 @@ Item
{
id: resetToDefaultQualityButton
height: UM.Theme.getSize("action_button_icon").height
width: height
width: visible ? height : 0
iconSource: UM.Theme.getIcon("ArrowReset")
anchors
{
@ -121,10 +122,11 @@ Item
verticalCenter: parent.verticalCenter
}
visible: enabled
color: enabled ? UM.Theme.getColor("accent_1") : UM.Theme.getColor("disabled")
hoverColor: UM.Theme.getColor("primary_hover")
enabled: Cura.MachineManager.hasCustomQuality || Cura.MachineManager.hasUserSettings
enabled: (fullWarning && Cura.MachineManager.hasCustomQuality) || Cura.MachineManager.hasUserSettings
onClicked: Cura.MachineManager.resetToUseDefaultQuality()
UM.ToolTip
@ -140,7 +142,7 @@ Item
Item
{
id: buttonsSpacer
width: UM.Theme.getSize("default_margin").width
width: compareAndSaveButton.visible ? UM.Theme.getSize("default_margin").width : 0
anchors.right: compareAndSaveButton.left
}
@ -148,7 +150,7 @@ Item
{
id: compareAndSaveButton
height: UM.Theme.getSize("action_button_icon").height
width: height
width: visible ? height : 0
iconSource: UM.Theme.getIcon("Save")
anchors
{
@ -156,6 +158,7 @@ Item
verticalCenter: parent.verticalCenter
}
visible: enabled
color: enabled ? UM.Theme.getColor("accent_1") : UM.Theme.getColor("disabled")
hoverColor: UM.Theme.getColor("primary_hover")