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

CURA-5035 Better linking between Toolbox and CuraPluginManager

Browse source
This commit is contained in:
Ian Paschal 2018-04-13 16:25:01 +02:00
parent 5d395f549a
commit 523518020c
6 changed files with 183 additions and 68 deletions
Download patch file Download diff file Expand all files Collapse all files

9
cura/CuraPackageManager.py
View file

@ -96,8 +96,11 @@ class CuraPackageManager(QObject):
package_info["is_bundled"] = False package_info["is_bundled"] = False
return package_info return package_info
# TODO: get from plugin registry for section, packages in self.getAllInstalledPackagesInfo().items():
#self._plugin_registry. for package in packages:
if package["package_id"] == package_id:
package_info = package
return package_info
return None return None
@ -133,7 +136,7 @@ class CuraPackageManager(QObject):
if package_id in managed_package_id_set: if package_id in managed_package_id_set:
continue continue
plugin_package_info["is_bundled"] = True plugin_package_info["is_bundled"] = True if plugin_package_info["author"]["name"] == "Ultimaker B.V." else False
plugin_package_info["is_active"] = self._plugin_registry.isActivePlugin(package_id) plugin_package_info["is_active"] = self._plugin_registry.isActivePlugin(package_id)
package_type = "plugin" package_type = "plugin"
if package_type not in installed_packages_dict: if package_type not in installed_packages_dict:

69
plugins/Toolbox/resources/qml/ToolboxDetailTile.qml
View file

@ -9,6 +9,7 @@ import UM 1.1 as UM
Rectangle Rectangle
{ {
property bool installed: toolbox.isInstalled(model.id)
width: base.width - UM.Theme.getSize("double_margin").width width: base.width - UM.Theme.getSize("double_margin").width
height: UM.Theme.getSize("base_unit").height * 8 height: UM.Theme.getSize("base_unit").height * 8
color: "transparent" color: "transparent"
@ -48,6 +49,12 @@ Rectangle
Button { Button {
id: installButton id: installButton
text: { text: {
if (installed)
{
return catalog.i18nc("@action:button", "Installed")
}
else
{
if ( toolbox.isDownloading && toolbox.activePackage == model ) if ( toolbox.isDownloading && toolbox.activePackage == model )
{ {
return catalog.i18nc("@action:button", "Cancel") return catalog.i18nc("@action:button", "Cancel")
@ -57,8 +64,13 @@ Rectangle
return catalog.i18nc("@action:button", "Install") return catalog.i18nc("@action:button", "Install")
} }
} }
}
enabled: enabled:
{ {
if (installed)
{
return true
}
if ( toolbox.isDownloading ) if ( toolbox.isDownloading )
{ {
return toolbox.activePackage == model ? true : false return toolbox.activePackage == model ? true : false
@ -74,12 +86,47 @@ Rectangle
{ {
implicitWidth: 96 implicitWidth: 96
implicitHeight: 30 implicitHeight: 30
color: control.hovered ? UM.Theme.getColor("primary_hover") : UM.Theme.getColor("primary") color:
{
if (installed)
{
return UM.Theme.getColor("action_button_disabled")
}
else
{
if ( control.hovered )
{
return UM.Theme.getColor("primary_hover")
}
else
{
return UM.Theme.getColor("primary")
}
}
}
} }
label: Label label: Label
{ {
text: control.text text: control.text
color: control.hovered ? UM.Theme.getColor("button_text") : UM.Theme.getColor("button_text_hover") color:
{
if (installed)
{
return UM.Theme.getColor("action_button_disabled_text")
}
else
{
if ( control.hovered )
{
return UM.Theme.getColor("button_text_hover")
}
else
{
return UM.Theme.getColor("button_text")
}
}
}
verticalAlignment: Text.AlignVCenter verticalAlignment: Text.AlignVCenter
horizontalAlignment: Text.AlignHCenter horizontalAlignment: Text.AlignHCenter
font: UM.Theme.getFont("default_bold") font: UM.Theme.getFont("default_bold")
@ -87,8 +134,12 @@ Rectangle
} }
onClicked: onClicked:
{ {
console.log( "MODEL", model.id ) if (installed)
toolbox.activePackage = model {
toolbox.viewCategory = "installed"
}
else
{
// if ( toolbox.isDownloading && toolbox.activePackage == model ) // if ( toolbox.isDownloading && toolbox.activePackage == model )
if ( toolbox.isDownloading ) if ( toolbox.isDownloading )
{ {
@ -96,18 +147,21 @@ Rectangle
} }
else else
{ {
toolbox.activePackage = model
// toolbox.activePackage = model; // toolbox.activePackage = model;
if ( model.can_upgrade ) if ( model.can_upgrade )
{ {
// toolbox.downloadAndInstallPlugin( model.update_url ); // toolbox.downloadAndInstallPlugin( model.update_url );
} }
else { else
{
toolbox.startDownload( model.download_url ); toolbox.startDownload( model.download_url );
} }
} }
} }
} }
} }
}
Rectangle Rectangle
{ {
color: UM.Theme.getColor("lining") color: UM.Theme.getColor("lining")
@ -115,4 +169,9 @@ Rectangle
height: UM.Theme.getSize("default_lining").height height: UM.Theme.getSize("default_lining").height
anchors.bottom: parent.bottom anchors.bottom: parent.bottom
} }
Connections
{
target: toolbox
onInstallChanged: installed = toolbox.isInstalled(model.id)
}
} }

50
plugins/Toolbox/resources/qml/ToolboxInstalledTile.qml
View file

@ -11,6 +11,8 @@ import UM 1.1 as UM
Item Item
{ {
id: base id: base
property bool canUpdate: false
property bool isEnabled: true
height: UM.Theme.getSize("base_unit").height * 8 height: UM.Theme.getSize("base_unit").height * 8
anchors anchors
{ {
@ -27,7 +29,7 @@ Item
Column Column
{ {
id: pluginInfo id: pluginInfo
property var color: model.enabled ? UM.Theme.getColor("text") : UM.Theme.getColor("lining") property var color: isEnabled ? UM.Theme.getColor("text") : UM.Theme.getColor("lining")
height: parent.height height: parent.height
anchors anchors
{ {
@ -75,7 +77,7 @@ Item
} }
Label Label
{ {
text: "<a href=\"mailto:"+model.author_email+"?Subject=Cura: "+model.name+"\">"+model.author+"</a>" text: "<a href=\"mailto:"+model.author_email+"?Subject=Cura: "+model.name+"\">"+model.author_name+"</a>"
width: parent.width width: parent.width
height: 24 height: 24
wrapMode: Text.WordWrap wrapMode: Text.WordWrap
@ -102,8 +104,17 @@ Item
Button { Button {
id: removeButton id: removeButton
text: "Uninstall" text:
// visible: model.can_uninstall && model.status == "installed" {
if (model.is_bundled)
{
return isEnabled ? catalog.i18nc("@action:button", "Disable") : catalog.i18nc("@action:button", "Enable")
}
else
{
return catalog.i18nc("@action:button", "Uninstall")
}
}
enabled: !toolbox.isDownloading enabled: !toolbox.isDownloading
style: ButtonStyle style: ButtonStyle
{ {
@ -125,13 +136,30 @@ Item
horizontalAlignment: Text.AlignHCenter horizontalAlignment: Text.AlignHCenter
} }
} }
onClicked: toolbox.removePlugin( model.id ) onClicked:
{
if (model.is_bundled)
{
if (toolbox.isEnabled(model.id))
{
toolbox.disable(model.id)
}
else
{
toolbox.enable(model.id)
}
}
else
{
toolbox.uninstall( model.id )
}
}
} }
Button { Button {
id: updateButton id: updateButton
text: "Update" text: catalog.i18nc("@action:button", "Update")
// enabled: model.can_update visible: canUpdate
style: ButtonStyle style: ButtonStyle
{ {
background: Rectangle background: Rectangle
@ -151,7 +179,7 @@ Item
} }
onClicked: onClicked:
{ {
toolbox.updatePackage(model.id); toolbox.update(model.id);
} }
} }
ProgressBar ProgressBar
@ -177,4 +205,10 @@ Item
} }
} }
} }
Connections
{
target: toolbox
onEnabledChanged: isEnabled = toolbox.isEnabled(model.id)
onMetadataChanged: canUpdate = toolbox.canUpdate(model.id)
}
} }

2
plugins/Toolbox/resources/qml/ToolboxLicenseDialog.qml
View file

@ -59,7 +59,7 @@ UM.Dialog {
onClicked: onClicked:
{ {
licenseDialog.close(); licenseDialog.close();
toolbox.installPlugin(licenseDialog.pluginFileLocation); toolbox.install(licenseDialog.pluginFileLocation);
} }
}, },
Button Button

38
plugins/Toolbox/src/PackagesModel.py
View file

@ -12,34 +12,23 @@ from UM.Qt.ListModel import ListModel
## Model that holds cura packages. By setting the filter property the instances held by this model can be changed. ## Model that holds cura packages. By setting the filter property the instances held by this model can be changed.
class PackagesModel(ListModel): class PackagesModel(ListModel):
IdRole = Qt.UserRole + 1
TypeRole = Qt.UserRole + 2
NameRole = Qt.UserRole + 3
VersionRole = Qt.UserRole + 4
AuthorNameRole = Qt.UserRole + 5
AuthorEmailRole = Qt.UserRole + 6
DescriptionRole = Qt.UserRole + 7
IconURLRole = Qt.UserRole + 8
ImageURLsRole = Qt.UserRole + 9
DownloadURLRole = Qt.UserRole + 10
LastUpdatedRole = Qt.UserRole + 11
def __init__(self, parent = None): def __init__(self, parent = None):
super().__init__(parent) super().__init__(parent)
self._metadata = None self._metadata = None
self.addRoleName(PackagesModel.IdRole, "id") self.addRoleName(Qt.UserRole + 1, "id")
self.addRoleName(PackagesModel.TypeRole, "type") self.addRoleName(Qt.UserRole + 2, "type")
self.addRoleName(PackagesModel.NameRole, "name") self.addRoleName(Qt.UserRole + 3, "name")
self.addRoleName(PackagesModel.VersionRole, "version") self.addRoleName(Qt.UserRole + 4, "version")
self.addRoleName(PackagesModel.AuthorNameRole, "author_name") self.addRoleName(Qt.UserRole + 5, "author_name")
self.addRoleName(PackagesModel.AuthorEmailRole, "author_email") self.addRoleName(Qt.UserRole + 6, "author_email")
self.addRoleName(PackagesModel.DescriptionRole, "description") self.addRoleName(Qt.UserRole + 7, "description")
self.addRoleName(PackagesModel.IconURLRole, "icon_url") self.addRoleName(Qt.UserRole + 8, "icon_url")
self.addRoleName(PackagesModel.ImageURLsRole, "image_urls") self.addRoleName(Qt.UserRole + 9, "image_urls")
self.addRoleName(PackagesModel.DownloadURLRole, "download_url") self.addRoleName(Qt.UserRole + 10, "download_url")
self.addRoleName(PackagesModel.LastUpdatedRole, "last_updated") self.addRoleName(Qt.UserRole + 11, "last_updated")
self.addRoleName(Qt.UserRole + 12, "is_bundled")
# List of filters for queries. The result is the union of the each list of results. # List of filters for queries. The result is the union of the each list of results.
self._filter = {} # type: Dict[str, str] self._filter = {} # type: Dict[str, str]
@ -63,7 +52,8 @@ class PackagesModel(ListModel):
"icon_url": package["icon_url"] if "icon_url" in package else None, "icon_url": package["icon_url"] if "icon_url" in package else None,
"image_urls": package["image_urls"] if "image_urls" in package else None, "image_urls": package["image_urls"] if "image_urls" in package else None,
"download_url": package["download_url"] if "download_url" in package else None, "download_url": package["download_url"] if "download_url" in package else None,
"last_updated": package["last_updated"] if "last_updated" in package else None "last_updated": package["last_updated"] if "last_updated" in package else None,
"is_bundled": package["is_bundled"] if "is_bundled" in package else False
}) })
# Filter on all the key-word arguments. # Filter on all the key-word arguments.

63
plugins/Toolbox/src/Toolbox.py
View file

@ -70,6 +70,12 @@ class Toolbox(QObject, Extension):
"plugins_installed": [], "plugins_installed": [],
# TODO: Replace this with a proper API call: # TODO: Replace this with a proper API call:
"materials_showcase": [ "materials_showcase": [
{
"name": "Ultimaker",
"email": "ian.paschal@gmail.com",
"website": "ultimaker.com",
"type": "material"
},
{ {
"name": "DSM", "name": "DSM",
"email": "contact@dsm.nl", "email": "contact@dsm.nl",
@ -137,6 +143,8 @@ class Toolbox(QObject, Extension):
onDownloadProgressChanged = pyqtSignal() onDownloadProgressChanged = pyqtSignal()
onIsDownloadingChanged = pyqtSignal() onIsDownloadingChanged = pyqtSignal()
restartRequiredChanged = pyqtSignal() restartRequiredChanged = pyqtSignal()
installChanged = pyqtSignal()
enabledChanged = pyqtSignal()
# UI changes # UI changes
viewChanged = pyqtSignal() viewChanged = pyqtSignal()
@ -213,8 +221,9 @@ class Toolbox(QObject, Extension):
return dialog return dialog
@pyqtSlot(str) @pyqtSlot(str)
def installPlugin(self, file_path): def install(self, file_path):
self._package_manager.installPackage(file_path) self._package_manager.installPackage(file_path)
self.installChanged.emit()
self.metadataChanged.emit() self.metadataChanged.emit()
# TODO: Stuff # TODO: Stuff
self.openRestartDialog("TODO") self.openRestartDialog("TODO")
@ -222,7 +231,7 @@ class Toolbox(QObject, Extension):
self.restartRequiredChanged.emit() self.restartRequiredChanged.emit()
@pyqtSlot(str) @pyqtSlot(str)
def removePlugin(self, plugin_id): def uninstall(self, plugin_id):
self._package_manager.removePackage(plugin_id) self._package_manager.removePackage(plugin_id)
self.metadataChanged.emit() self.metadataChanged.emit()
self._restart_required = True self._restart_required = True
@ -231,15 +240,15 @@ class Toolbox(QObject, Extension):
Application.getInstance().messageBox(i18n_catalog.i18nc("@window:title", "Plugin browser"), "TODO") Application.getInstance().messageBox(i18n_catalog.i18nc("@window:title", "Plugin browser"), "TODO")
@pyqtSlot(str) @pyqtSlot(str)
def enablePlugin(self, plugin_id): def enable(self, plugin_id):
self._plugin_registry.setPluginEnabled(plugin_id, True) self._plugin_registry.enablePlugin(plugin_id)
self.metadataChanged.emit() self.enabledChanged.emit()
Logger.log("i", "%s was set as 'active'.", plugin_id) Logger.log("i", "%s was set as 'active'.", plugin_id)
@pyqtSlot(str) @pyqtSlot(str)
def disablePlugin(self, plugin_id): def disable(self, plugin_id):
self._plugin_registry.setPluginEnabled(plugin_id, False) self._plugin_registry.disablePlugin(plugin_id)
self.metadataChanged.emit() self.enabledChanged.emit()
Logger.log("i", "%s was set as 'deactive'.", plugin_id) Logger.log("i", "%s was set as 'deactive'.", plugin_id)
@pyqtProperty(bool, notify = metadataChanged) @pyqtProperty(bool, notify = metadataChanged)
@ -258,18 +267,30 @@ class Toolbox(QObject, Extension):
# Checks # Checks
# -------------------------------------------------------------------------- # --------------------------------------------------------------------------
def _checkCanUpgrade(self, package_id: str, version: str) -> bool: @pyqtSlot(str, result = bool)
installed_plugin_data = self._package_manager.getInstalledPackageInfo(package_id) def canUpdate(self, package_id: str) -> bool:
if installed_plugin_data is None: local_package = self._package_manager.getInstalledPackageInfo(package_id)
if local_package is None:
return False return False
installed_version = installed_plugin_data["package_version"]
return compareSemanticVersions(version, installed_version) > 0
def _checkInstalled(self, package_id: str): remote_package = None
for package in self._metadata["packages"]:
if package["package_id"] == package_id:
remote_package = package
if remote_package is None:
return False
local_version = local_package["package_version"]
remote_version = remote_package["package_version"]
return compareSemanticVersions(remote_version, local_version) > 0
@pyqtSlot(str, result = bool)
def isInstalled(self, package_id) -> bool:
return self._package_manager.isPackageInstalled(package_id) return self._package_manager.isPackageInstalled(package_id)
def _checkEnabled(self, id): @pyqtSlot(str, result = bool)
if id in self._plugin_registry.getActivePlugins(): def isEnabled(self, package_id) -> bool:
if package_id in self._plugin_registry.getActivePlugins():
return True return True
return False return False
@ -382,6 +403,12 @@ class Toolbox(QObject, Extension):
self._models["materials_showcase"] = AuthorsModel(self) self._models["materials_showcase"] = AuthorsModel(self)
# TODO: Replace this with a proper API call: # TODO: Replace this with a proper API call:
self._models["materials_showcase"].setMetadata(self._metadata["materials_showcase"]) self._models["materials_showcase"].setMetadata(self._metadata["materials_showcase"])
# This part is also needed for comparing downloaded packages to
# installed packages.
self._models["packages"].setMetadata(self._metadata["packages"])
self.metadataChanged.emit() self.metadataChanged.emit()
self.setViewPage("overview") self.setViewPage("overview")
@ -407,6 +434,8 @@ class Toolbox(QObject, Extension):
except json.decoder.JSONDecodeError: except json.decoder.JSONDecodeError:
Logger.log("w", "Toolbox: Received invalid JSON for showcase.") Logger.log("w", "Toolbox: Received invalid JSON for showcase.")
return return
else: else:
# Ignore any operation that is not a get operation # Ignore any operation that is not a get operation
pass pass
@ -440,7 +469,7 @@ class Toolbox(QObject, Extension):
self.openLicenseDialog(package_info["package_id"], license_content, file_path) self.openLicenseDialog(package_info["package_id"], license_content, file_path)
return return
self.installPlugin(file_path) self.install(file_path)
return return