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

Fixed state of manage buttons

Browse source 
Contributes to: CURA-8587
This commit is contained in:
Jelle Spijker 2021-12-06 09:14:40 +01:00
parent a51b29cdf6
commit 863e92d0d2
No known key found for this signature in database
GPG key ID: 6662DC033BE6B99A
5 changed files with 227 additions and 138 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -17,7 +17,7 @@ RowLayout
property string busySecondaryText: busyMessageText.text
property string mainState: "primary"
property bool enabled: true
property bool busy: false
property bool busy
signal clicked(bool primary_action)

10
plugins/Marketplace/resources/qml/PackageCard.qml
View file

@ -355,12 +355,12 @@ Rectangle
ManageButton
{
id: enableManageButton
state: packageData.stateManageEnableButton
Layout.alignment: Qt.AlignTop
primaryText: catalog.i18nc("@button", "Enable")
busyPrimaryText: catalog.i18nc("@button", "enabling...")
secondaryText: catalog.i18nc("@button", "Disable")
busySecondaryText: catalog.i18nc("@button", "disabling...")
mainState: packageData.manageEnableState
enabled: !(installManageButton.busy || updateManageButton.busy)
}
Connections
@ -382,13 +382,12 @@ Rectangle
ManageButton
{
id: installManageButton
state: packageData.stateManageInstallButton
Layout.alignment: Qt.AlignTop
primaryText: catalog.i18nc("@button", "Install")
busyPrimaryText: catalog.i18nc("@button", "installing...")
secondaryText: catalog.i18nc("@button", "Uninstall")
busySecondaryText: catalog.i18nc("@button", "uninstalling...")
mainState: packageData.manageInstallState
busy: packageData.isInstalling
enabled: !(enableManageButton.busy || updateManageButton.busy)
}
Connections
@ -396,7 +395,6 @@ Rectangle
target: installManageButton
function onClicked(primary_action)
{
packageData.isInstalling = true
if (primary_action)
{
packageData.installPackageTriggered(packageData.packageId)
@ -411,11 +409,10 @@ Rectangle
ManageButton
{
id: updateManageButton
state: packageData.stateManageUpdateButton
Layout.alignment: Qt.AlignTop
primaryText: catalog.i18nc("@button", "Update")
busyPrimaryText: catalog.i18nc("@button", "updating...")
mainState: packageData.manageUpdateState
busy: packageData.isUpdating
enabled: !(installManageButton.busy || enableManageButton.busy)
}
Connections
@ -423,7 +420,6 @@ Rectangle
target: updateManageButton
function onClicked(primary_action)
{
packageData.isUpdating = true
packageData.updatePackageTriggered(packageData.packageId)
}
}