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

Open separate license dialog with each plugin install

Browse source 
Previously the license dialog was instanciated once and re-used for each
install. As the dialog is only shown after the plugin is downloaded it
was possible to click install for multiple plugins. Plugins that finish
downloading later would override the dialog of earlier downloaded
plugins. Clicking "accept" would then only install the latest downloaded
plugin.

Now for each install a separate dialog is shown. Accepting the license
agreement would only install the recently accepted plugin.

Note: in the current form the license agreement does not show any
identification to what plugin triggered the dialog. As multiple dialogs
can be shown at once this might be unclear.

cura 8587
This commit is contained in:
casper 2021-12-06 19:34:02 +01:00
parent 20fb08145d
commit 71a43060a6
3 changed files with 35 additions and 61 deletions
Download patch file Download diff file Expand all files Collapse all files

59
plugins/Marketplace/PackageList.py
View file

@ -20,7 +20,6 @@ from cura.UltimakerCloud.UltimakerCloudScope import UltimakerCloudScope # To ma
from .PackageModel import PackageModel
from .Constants import USER_PACKAGES_URL
from .LicenseModel import LicenseModel
if TYPE_CHECKING:
from PyQt5.QtCore import QObject
@ -52,19 +51,7 @@ class PackageList(ListModel):
self._ongoing_request: Optional[HttpRequestData] = None
self._scope = JsonDecoratorScope(UltimakerCloudScope(CuraApplication.getInstance()))
self._license_model = LicenseModel()
plugin_path = self._plugin_registry.getPluginPath("Marketplace")
if plugin_path is None:
plugin_path = os.path.dirname(__file__)
# create a QML component for the license dialog
license_dialog_component_path = os.path.join(plugin_path, "resources", "qml", "LicenseDialog.qml")
self._license_dialog = CuraApplication.getInstance().createQmlComponent(license_dialog_component_path, {
"licenseModel": self._license_model,
"handler": self
})
self._license_dialogs: Dict[str, QObject] = {}
@pyqtSlot()
def updatePackages(self) -> None:
@ -137,24 +124,42 @@ class PackageList(ListModel):
canInstallChanged = pyqtSignal(str, bool)
def _openLicenseDialog(self, plugin_name: str, license_content: str) -> None:
Logger.debug(f"Prompting license for {plugin_name}")
self._license_model.setPackageId(plugin_name)
self._license_model.setLicenseText(license_content)
self._license_dialog.show()
def _openLicenseDialog(self, package_id: str, license_content: str) -> None:
Logger.debug(f"Prompting license for {package_id}")
@pyqtSlot()
def onLicenseAccepted(self) -> None:
package_id = self._license_model.packageId
plugin_path = self._plugin_registry.getPluginPath("Marketplace")
if plugin_path is None:
plugin_path = os.path.dirname(__file__)
# create a QML component for the license dialog
license_dialog_component_path = os.path.join(plugin_path, "resources", "qml", "LicenseDialog.qml")
dialog = CuraApplication.getInstance().createQmlComponent(license_dialog_component_path, {
"licenseContent": license_content,
"packageId": package_id,
"handler": self
})
dialog.show()
# place dialog in class such that it does not get remove by garbage collector
self._license_dialogs[package_id] = dialog
@pyqtSlot(str)
def onLicenseAccepted(self, package_id: str) -> None:
Logger.debug(f"Accepted license for {package_id}")
self._license_dialog.close()
# close dialog
dialog = self._license_dialogs.pop(package_id)
if dialog is not None:
dialog.deleteLater()
# install relevant package
self._install(package_id)
@pyqtSlot()
def onLicenseDeclined(self) -> None:
package_id = self._license_model.packageId
@pyqtSlot(str)
def onLicenseDeclined(self, package_id: str) -> None:
Logger.debug(f"Declined license for {package_id}")
self._license_dialog.close()
# close dialog
dialog = self._license_dialogs.pop(package_id)
if dialog is not None:
dialog.deleteLater()
# reset package card
package = self.getPackageModel(package_id)
package.is_installing = False