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

Correctly handle actions from marketplace license prompt

Browse source 
Install package on accept
And stop spinner on decline

cura 8587
This commit is contained in:
casper 2021-12-06 15:45:27 +01:00
parent 09e221d64a
commit c3665d7440
1 changed files with 32 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

36
plugins/Marketplace/PackageList.py
View file

@ -60,7 +60,8 @@ class PackageList(ListModel):
# create a QML component for the license dialog # create a QML component for the license dialog
license_dialog_component_path = os.path.join(plugin_path, "resources", "qml", "LicenseDialog.qml") license_dialog_component_path = os.path.join(plugin_path, "resources", "qml", "LicenseDialog.qml")
self._license_dialog = CuraApplication.getInstance().createQmlComponent(license_dialog_component_path, { self._license_dialog = CuraApplication.getInstance().createQmlComponent(license_dialog_component_path, {
"licenseModel": self._license_model "licenseModel": self._license_model,
"handler": self
}) })
@pyqtSlot() @pyqtSlot()
@ -135,11 +136,32 @@ class PackageList(ListModel):
canInstallChanged = pyqtSignal(str, bool) canInstallChanged = pyqtSignal(str, bool)
def _openLicenseDialog(self, plugin_name: str, license_content: str, icon_url: str) -> None: def _openLicenseDialog(self, plugin_name: str, license_content: str, icon_url: str) -> None:
Logger.debug(f"Prompting license for {plugin_name}")
self._license_model.setIconUrl(icon_url) self._license_model.setIconUrl(icon_url)
self._license_model.setPackageName(plugin_name) self._license_model.setPackageName(plugin_name)
self._license_model.setLicenseText(license_content) self._license_model.setLicenseText(license_content)
self._license_dialog.show() self._license_dialog.show()
@pyqtSlot()
def onLicenseAccepted(self) -> None:
package_id = self._to_be_installed_package_id
package_path = self._to_be_installed_package_path
del self._to_be_installed_package_id
del self._to_be_installed_package_path
Logger.debug(f"Accepted license for {package_id}")
self._license_dialog.close()
self._install(package_id, package_path)
@pyqtSlot()
def onLicenseDeclined(self) -> None:
package_id = self._to_be_installed_package_id
del self._to_be_installed_package_id
del self._to_be_installed_package_path
Logger.debug(f"Declined license for {package_id}")
self._license_dialog.close()
package = self.getPackageModel(package_id)
package.is_installing = False
def _requestInstall(self, package_id: str, update: bool = False) -> None: def _requestInstall(self, package_id: str, update: bool = False) -> None:
Logger.debug(f"Request installing {package_id}") Logger.debug(f"Request installing {package_id}")
@ -147,17 +169,23 @@ class PackageList(ListModel):
license_content = self._manager.getPackageLicense(package_path) license_content = self._manager.getPackageLicense(package_path)
if not update and license_content is not None: if not update and license_content is not None:
# If installation is not and update, and the packages contains a license then
# open dialog, prompting the using to accept the plugin license # open dialog, prompting the using to accept the plugin license
# Store some properties that are needed after the dialog is closed
self._to_be_installed_package_id = package_id
self._to_be_installed_package_path = package_path
# Open actual dialog
package = self.getPackageModel(package_id) package = self.getPackageModel(package_id)
plugin_name = package.displayName plugin_name = package.displayName
icon_url = package.iconUrl icon_url = package.iconUrl
self._openLicenseDialog(plugin_name, license_content, icon_url) self._openLicenseDialog(plugin_name, license_content, icon_url)
else: else:
# Otherwise continue the installation # Otherwise continue the installation
self._install(package_id, update) self._install(package_id, package_path, update)
def _install(self, package_id: str, update: bool = False) -> None: def _install(self, package_id: str, package_path: str, update: bool = False) -> None:
package_path = self._to_install.pop(package_id)
Logger.debug(f"Installing {package_id}") Logger.debug(f"Installing {package_id}")
to_be_installed = self._manager.installPackage(package_path) is not None to_be_installed = self._manager.installPackage(package_path) is not None
package = self.getPackageModel(package_id) package = self.getPackageModel(package_id)