3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-06 22:47:29 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge remote-tracking branch 'origin/CURA-8684_QtControls_replacement_Buttons,_Actions_&_'Exclusivity'' into CURA-8684_QtControls_replacement_Buttons,_Actions_&_'Exclusivity'

Browse source
This commit is contained in:
casper 2022-01-25 16:06:05 +01:00
commit 24a8e8b761
2 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
plugins/PerObjectSettingsTool/ToolBarButton.qml
View file

@ -54,7 +54,7 @@ Button
} }
return UM.Theme.getColor("toolbar_background") return UM.Theme.getColor("toolbar_background")
} }
Behavior on color { ColorAnimation { duration: 50; } } Behavior on color { ColorAnimation { duration: 50 } }
border.width: (base.hasOwnProperty("needBorder") && base.needBorder) ? UM.Theme.getSize("default_lining").width : 0 border.width: (base.hasOwnProperty("needBorder") && base.needBorder) ? UM.Theme.getSize("default_lining").width : 0
border.color: base.checked ? UM.Theme.getColor("icon") : UM.Theme.getColor("lining") border.color: base.checked ? UM.Theme.getColor("icon") : UM.Theme.getColor("lining")

2
resources/qml/Preferences/MachinesPage.qml
View file

@ -38,7 +38,7 @@ UM.ManagementPage
{ {
id: activateMenuButton id: activateMenuButton
text: catalog.i18nc("@action:button", "Activate"); text: catalog.i18nc("@action:button", "Activate");
icon.name: "list-activate"; icon.name: "list-activate"
enabled: base.currentItem != null && base.currentItem.id != Cura.MachineManager.activeMachine.id enabled: base.currentItem != null && base.currentItem.id != Cura.MachineManager.activeMachine.id
onClicked: Cura.MachineManager.setActiveMachine(base.currentItem.id) onClicked: Cura.MachineManager.setActiveMachine(base.currentItem.id)
}, },