Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/Ultimaker/Cura.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJaime van Kessel <nallath@gmail.com>2021-12-13 17:17:19 +0300
committerJaime van Kessel <nallath@gmail.com>2021-12-13 17:17:19 +0300
commit08eba9f21a97192513783fd93024d2862885d178 (patch)
tree90edd49491c23c39f85a364dc2539bb67d6aa200 /plugins
parentd50dc59aacb66ebeb2f82333e40f589898997414 (diff)
Fix updating package
CURA-8587
Diffstat (limited to 'plugins')
-rw-r--r--plugins/Marketplace/PackageModel.py16
-rw-r--r--plugins/Marketplace/resources/qml/PackageCardHeader.qml2
2 files changed, 1 insertions, 17 deletions
diff --git a/plugins/Marketplace/PackageModel.py b/plugins/Marketplace/PackageModel.py
index 2d9b013f72..8b7b800dec 100644
--- a/plugins/Marketplace/PackageModel.py
+++ b/plugins/Marketplace/PackageModel.py
@@ -75,11 +75,6 @@ class PackageModel(QObject):
self.enablePackageTriggered.connect(self._plugin_registry.enablePlugin)
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._package_manager.packageInstalled.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:
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)
def isInstalled(self) -> bool:
return self._package_id in self._package_manager.local_packages_ids
diff --git a/plugins/Marketplace/resources/qml/PackageCardHeader.qml b/plugins/Marketplace/resources/qml/PackageCardHeader.qml
index 5a661e32fb..9124998ccc 100644
--- a/plugins/Marketplace/resources/qml/PackageCardHeader.qml
+++ b/plugins/Marketplace/resources/qml/PackageCardHeader.qml
@@ -233,7 +233,7 @@ Item
text: busy ? catalog.i18nc("@button", "Updating..."): catalog.i18nc("@button", "Update")
- onClicked: packageData.updatePackageTriggered(packageData.packageId);
+ onClicked: packageData.install()
}
}
}