3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-08-06 21:44:01 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

fix merge conflict

Browse source 
Contributes to: CURA-8587
This commit is contained in:
Jelle Spijker 2021-12-01 18:32:14 +01:00
parent c1cffa09fe
commit 327b434788
No known key found for this signature in database
GPG key ID: 6662DC033BE6B99A
3 changed files with 6 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
plugins/Marketplace/resources/qml/ManageButton.qml
View file

@ -17,6 +17,8 @@ RowLayout
property string busySecondaryText: busyMessageText.text
property string mainState: "primary"
signal clicked
state: mainState
Cura.PrimaryButton
@ -26,6 +28,7 @@ RowLayout
onClicked:
{
manageButton.clicked()
manageButton.state = "busy"
}
}
@ -37,6 +40,7 @@ RowLayout
onClicked:
{
manageButton.clicked()
manageButton.state = "busy"
}
}