diff options
| author | Remco Burema <r.burema@ultimaker.com> | 2021-12-07 23:23:54 +0300 |
|---|---|---|
| committer | Remco Burema <r.burema@ultimaker.com> | 2021-12-07 23:23:54 +0300 |
| commit | a61c3e9eff66eae187101f559e96aa264bef2c17 (patch) | |
| tree | 71e36bd6a2fe145cf9668d696e7870dc5fdd9c7f /plugins/Marketplace/resources | |
| parent | 3be6747e5dc9d0129878e9fe57556bb8be8df53a (diff) | |
Peristance of 'Installed' text.
part of CURA-8587
Diffstat (limited to 'plugins/Marketplace/resources')
| -rw-r--r-- | plugins/Marketplace/resources/qml/ManageButton.qml | 2 | ||||
| -rw-r--r-- | plugins/Marketplace/resources/qml/PackageCard.qml | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/plugins/Marketplace/resources/qml/ManageButton.qml b/plugins/Marketplace/resources/qml/ManageButton.qml index a423e90ff6..b2a3ec7f1b 100644 --- a/plugins/Marketplace/resources/qml/ManageButton.qml +++ b/plugins/Marketplace/resources/qml/ManageButton.qml @@ -19,6 +19,7 @@ RowLayout property string confirmedSecondaryText: confirmedMessageText.text property bool busy property bool confirmed + property bool confirmedTextChoice: true signal clicked(bool primary_action) @@ -228,6 +229,7 @@ RowLayout { target: confirmedMessage visible: true + text: manageButton.confirmedTextChoice ? manageButton.confirmedPrimaryText : manageButton.confirmedSecondaryText } } ] diff --git a/plugins/Marketplace/resources/qml/PackageCard.qml b/plugins/Marketplace/resources/qml/PackageCard.qml index 667c645c61..b43ea580ba 100644 --- a/plugins/Marketplace/resources/qml/PackageCard.qml +++ b/plugins/Marketplace/resources/qml/PackageCard.qml @@ -361,10 +361,9 @@ Rectangle secondaryText: catalog.i18nc("@button", "Uninstall") busySecondaryText: catalog.i18nc("@button", "Uninstalling...") confirmedSecondaryText: catalog.i18nc("@button", "Uninstalled") + confirmedTextChoice: packageData.isRecentlyInstalled enabled: !(enableManageButton.busy || updateManageButton.busy) - onStateChanged: print(packageData.displayName + " " + state) // TODO: Cleanup once you find out why this happens - onClicked: { if (primary_action) |