3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-19 04:37:51 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

Fixed the updating button

Browse source 
Contributes to CURA-8587
This commit is contained in:
Jelle Spijker 2021-12-16 12:37:41 +01:00
parent 8abeb24ccc
commit 23d6c2390f
No known key found for this signature in database
GPG key ID: 6662DC033BE6B99A
3 changed files with 10 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

5
plugins/Marketplace/PackageList.py
View file

@ -286,11 +286,12 @@ class PackageList(ListModel):
self._package_manager.removePackage(package_id) self._package_manager.removePackage(package_id)
self.unsunscribeUserFromPackage(package_id) self.unsunscribeUserFromPackage(package_id)
def updatePackage(self, package_id: str) -> None: def updatePackage(self, package_id: str, url: str) -> None:
"""Update a package from the Marketplace """Update a package from the Marketplace
:param package_id: the package identification string :param package_id: the package identification string
""" """
self._package_manager.removePackage(package_id, force_add = not self._package_manager.isBundledPackage(package_id)) self._package_manager.removePackage(package_id, force_add = not self._package_manager.isBundledPackage(package_id))
url = self._package_manager.package_infosWithUpdate[package_id]["download_url"] if url == "":
url = self._package_manager.package_infosWithUpdate[package_id]["download_url"]
self.download(package_id, url, True) self.download(package_id, url, True)

7
plugins/Marketplace/PackageModel.py
View file

@ -295,7 +295,7 @@ class PackageModel(QObject):
uninstallPackageTriggered = pyqtSignal(str) uninstallPackageTriggered = pyqtSignal(str)
updatePackageTriggered = pyqtSignal(str) updatePackageTriggered = pyqtSignal(str, str)
enablePackageTriggered = pyqtSignal(str) enablePackageTriggered = pyqtSignal(str)
@ -308,6 +308,11 @@ class PackageModel(QObject):
self.setBusy(True) self.setBusy(True)
self.installPackageTriggered.emit(self.packageId, self.downloadURL) self.installPackageTriggered.emit(self.packageId, self.downloadURL)
@pyqtSlot()
def update(self):
self.setBusy(True)
self.updatePackageTriggered.emit(self.packageId, self.downloadURL)
@pyqtSlot() @pyqtSlot()
def uninstall(self): def uninstall(self):
self.uninstallPackageTriggered.emit(self.packageId) self.uninstallPackageTriggered.emit(self.packageId)

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

@ -232,7 +232,7 @@ Item
text: busy ? catalog.i18nc("@button", "Updating..."): catalog.i18nc("@button", "Update") text: busy ? catalog.i18nc("@button", "Updating..."): catalog.i18nc("@button", "Update")
onClicked: packageData.install() onClicked: packageData.update()
} }
} }
} }