GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-08-12 19:39:03 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix updating package

Browse Source 
CURA-8587
This commit is contained in:
Jaime van Kessel 2021-12-13 15:17:19 +01:00
parent d50dc59aac
commit 08eba9f21a
2 changed files with 1 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
plugins/Marketplace/PackageModel.py
View File

@ -75,11 +75,6 @@ class PackageModel(QObject):
self.enablePackageTriggered.connect(self._plugin_registry.enablePlugin) self.enablePackageTriggered.connect(self._plugin_registry.enablePlugin)
self.disablePackageTriggered.connect(self._plugin_registry.disablePlugin) self.disablePackageTriggered.connect(self._plugin_registry.disablePlugin)
self._is_recently_updated = self._getRecentlyUpdated()
self._is_recently_installed = self._getRecentlyInstalled()
self.updatePackageTriggered.connect(lambda pkg: self._setIsUpdating(True))
self._plugin_registry.hasPluginsEnabledOrDisabledChanged.connect(self.stateManageButtonChanged) self._plugin_registry.hasPluginsEnabledOrDisabledChanged.connect(self.stateManageButtonChanged)
self._package_manager.packageInstalled.connect(lambda pkg_id: self._packageInstalled(pkg_id)) self._package_manager.packageInstalled.connect(lambda pkg_id: self._packageInstalled(pkg_id))
self._package_manager.packageUninstalled.connect(lambda pkg_id: self._packageInstalled(pkg_id)) self._package_manager.packageUninstalled.connect(lambda pkg_id: self._packageInstalled(pkg_id))
@ -354,17 +349,6 @@ class PackageModel(QObject):
except RuntimeError: except RuntimeError:
pass pass
def _getRecentlyInstalled(self) -> bool:
return (self._package_id in self._package_manager.getPackagesToInstall() or self._package_id in self._package_manager.getPackagesToRemove()) \
and self._package_id not in self._package_manager.package_infosWithUpdate
def _getRecentlyUpdated(self) -> bool:
return self._package_id in self._package_manager.package_infosWithUpdate and self._package_id in self._package_manager.getPackagesToInstall()
@pyqtProperty(bool, constant = True)
def isRecentlyUpdatedChanged(self) -> bool:
return self._is_recently_updated
@pyqtProperty(bool, notify = stateManageButtonChanged) @pyqtProperty(bool, notify = stateManageButtonChanged)
def isInstalled(self) -> bool: def isInstalled(self) -> bool:
return self._package_id in self._package_manager.local_packages_ids return self._package_id in self._package_manager.local_packages_ids

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

@ -233,7 +233,7 @@ Item
text: busy ? catalog.i18nc("@button", "Updating..."): catalog.i18nc("@button", "Update") text: busy ? catalog.i18nc("@button", "Updating..."): catalog.i18nc("@button", "Update")
onClicked: packageData.updatePackageTriggered(packageData.packageId); onClicked: packageData.install()
} }
} }
} }