3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-20 21:27:50 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Merge remote-tracking branch 'origin/CURA-8587_disable_update_install_and_uninstall' into CURA-8587_disable_update_install_and_uninstall

Browse source 
# Conflicts:
#	plugins/Marketplace/resources/qml/PackageCard.qml
#	plugins/Marketplace/resources/qml/PackagePage.qml
This commit is contained in:
casper 2021-12-08 20:01:55 +01:00
commit 8708fd0f3a
6 changed files with 128 additions and 196 deletions
Download patch file Download diff file Expand all files Collapse all files

106
plugins/Marketplace/resources/qml/PackageCardHeader.qml
View file

@ -181,34 +181,16 @@ Item
ManageButton
{
id: enableManageButton
visible: !(installManageButton.confirmed || updateManageButton.confirmed) || enableManageButton.confirmed
visible: showManageButtons && !(installManageButton.confirmed || updateManageButton.confirmed)
enabled: !(installManageButton.busy || updateManageButton.busy)
busy: false
confirmed: false
button_style: packageData.stateManageEnableButton
Layout.alignment: Qt.AlignTop
busy: packageData.enableManageButton == "busy"
confirmed: packageData.enableManageButton == "confirmed"
text: {
switch (packageData.stateManageEnableButton) {
case "primary":
return catalog.i18nc("@button", "Enable");
case "secondary":
return catalog.i18nc("@button", "Disable");
case "busy":
if (packageData.installationStatus) {
return catalog.i18nc("@button", "Enabling...");
} else {
return catalog.i18nc("@button", "Disabling...");
}
case "confirmed":
if (packageData.installationStatus) {
return catalog.i18nc("@button", "Enabled");
} else {
return catalog.i18nc("@button", "Disabled");
}
default:
return "";
}
}
enabled: !installManageButton.busy && !updateManageButton.busy
text: packageData.stateManageEnableButton ? catalog.i18nc("@button", "Enable") : catalog.i18nc("@button", "Disable")
onClicked:
{
@ -226,34 +208,31 @@ Item
ManageButton
{
id: installManageButton
visible: (showManageButtons || installManageButton.confirmed) && !(enableManageButton.confirmed || updateManageButton.confirmed)
visible: (showManageButtons || confirmed) && ((packageData.isBundled && packageData.canDowngrade) || !packageData.isBundled || !updateManageButton.confirmed)
enabled: !packageData.isUpdating
busy: packageData.isInstalling
confirmed: packageData.isInstalled || packageData.isUninstalled
button_style: packageData.stateManageInstallButton
busy: packageData.stateManageInstallButton == "busy"
confirmed: packageData.stateManageInstallButton == "confirmed"
Layout.alignment: Qt.AlignTop
text: {
switch (packageData.stateManageInstallButton) {
case "primary":
return catalog.i18nc("@button", "Install");
case "secondary":
return catalog.i18nc("@button", "Uninstall");
case "busy":
if (packageData.installationStatus) {
return catalog.i18nc("@button", "Installing...");
} else {
return catalog.i18nc("@button", "Uninstalling...");
}
case "confirmed":
if (packageData.installationStatus) {
return catalog.i18nc("@button", "Installed");
} else {
return catalog.i18nc("@button", "Uninstalled");
}
default:
return "";
text:
{
if (packageData.stateManageInstallButton)
{
if (packageData.isInstalling) { return catalog.i18nc("@button", "Installing..."); }
else if (packageData.isInstalled) { return catalog.i18nc("@button", "Installed"); }
else { return catalog.i18nc("@button", "Install"); }
}
else
{
if (packageData.isInstalling) { return catalog.i18nc("@button", "Uninstalling..."); }
else if (packageData.isUninstalled) { return catalog.i18nc("@button", "Uninstalled"); }
else { return catalog.i18nc("@button", "Uninstall"); }
}
}
enabled: !enableManageButton.busy && !updateManageButton.busy
onClicked:
{
@ -271,25 +250,20 @@ Item
ManageButton
{
id: updateManageButton
visible: showManageButtons && (!installManageButton.confirmed || updateManageButton.confirmed)
visible: (showManageButtons && confirmed) && !installManageButton.confirmed
enabled: !installManageButton.busy
button_style: packageData.stateManageUpdateButton
busy: packageData.stateManageUpdateButton == "busy"
confirmed: packageData.stateManageUpdateButton == "confirmed"
busy: packageData.isUpdating
confirmed: packageData.isUpdated
button_style: true
Layout.alignment: Qt.AlignTop
enabled: !installManageButton.busy && !enableManageButton.busy
text: {
switch (packageData.stateManageInstallButton) {
case "primary":
return catalog.i18nc("@button", "Update");
case "busy":
return catalog.i18nc("@button", "Updating...");
case "confirmed":
return catalog.i18nc("@button", "Updated");
default:
return "";
}
text:
{
if (packageData.isUpdating) { return catalog.i18nc("@button", "Updating..."); }
else if (packageData.isUpdated) { return catalog.i18nc("@button", "Updated"); }
else { return catalog.i18nc("@button", "Update"); }
}
onClicked: packageData.updatePackageTriggered(packageData.packageId)