3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-06 22:47:29 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge branch 'CURA-8587_disable_update_install_and_uninstall' into cura-8587_disable_update_install_and_update/licence_agreement

Browse source 
# Conflicts:
#	plugins/Marketplace/PackageList.py
This commit is contained in:
casper 2021-12-06 15:49:21 +01:00
commit ec58cd2d0e
8 changed files with 144 additions and 156 deletions
Download patch file Download diff file Expand all files Collapse all files

12
plugins/Marketplace/PackageList.py
View file

@ -12,7 +12,7 @@ from UM.Qt.ListModel import ListModel
from UM.TaskManagement.HttpRequestScope import JsonDecoratorScope
from UM.TaskManagement.HttpRequestManager import HttpRequestData, HttpRequestManager
from UM.Logger import Logger
from UM.PluginRegistry import PluginRegistry
from UM import PluginRegistry
from cura.CuraApplication import CuraApplication
from cura import CuraPackageManager
@ -38,6 +38,7 @@ class PackageList(ListModel):
def __init__(self, parent: Optional["QObject"] = None) -> None:
super().__init__(parent)
self._manager: CuraPackageManager = CuraApplication.getInstance().getPackageManager()
self._plugin_registry: PluginRegistry = CuraApplication.getInstance().getPluginRegistry()
self._account = CuraApplication.getInstance().getCuraAPI().account
self._error_message = ""
self.addRoleName(self.PackageRole, "package")
@ -194,7 +195,6 @@ class PackageList(ListModel):
if update:
package.is_updating = False
else:
Logger.debug(f"Setting recently installed for package: {package_id}")
package.is_recently_managed = True
package.is_installing = False
self.subscribeUserToPackage(package_id, str(package.sdk_version))
@ -258,7 +258,7 @@ class PackageList(ListModel):
def _connectManageButtonSignals(self, package: PackageModel) -> None:
package.installPackageTriggered.connect(self.installPackage)
package.uninstallPackageTriggered.connect(self.uninstallPackage)
package.updatePackageTriggered.connect(self.installPackage)
package.updatePackageTriggered.connect(self.updatePackage)
package.enablePackageTriggered.connect(self.enablePackage)
package.disablePackageTriggered.connect(self.disablePackage)
@ -294,7 +294,8 @@ class PackageList(ListModel):
package = self.getPackageModel(package_id)
package.is_enabling = True
Logger.debug(f"Enabling {package_id}")
# TODO: implement enabling functionality
self._plugin_registry.enablePlugin(package_id)
package.is_active = True
package.is_enabling = False
@pyqtSlot(str)
@ -302,5 +303,6 @@ class PackageList(ListModel):
package = self.getPackageModel(package_id)
package.is_enabling = True
Logger.debug(f"Disabling {package_id}")
# TODO: implement disabling functionality
self._plugin_registry.disablePlugin(package_id)
package.is_active = False
package.is_enabling = False