From 6694b7ac8186bc2ad429eaade6dd7e8bd8c14588 Mon Sep 17 00:00:00 2001 From: Diego Prado Gesto Date: Fri, 27 Jul 2018 15:56:29 +0200 Subject: [PATCH 1/2] CURA-5541 Change is_enabled field to is_active field to be consistent with the fields in the PackageManager. --- plugins/Toolbox/src/PackagesModel.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/plugins/Toolbox/src/PackagesModel.py b/plugins/Toolbox/src/PackagesModel.py index 23aa639bde..8b9199b127 100644 --- a/plugins/Toolbox/src/PackagesModel.py +++ b/plugins/Toolbox/src/PackagesModel.py @@ -28,7 +28,7 @@ class PackagesModel(ListModel): self.addRoleName(Qt.UserRole + 11, "download_url") self.addRoleName(Qt.UserRole + 12, "last_updated") self.addRoleName(Qt.UserRole + 13, "is_bundled") - self.addRoleName(Qt.UserRole + 14, "is_enabled") + self.addRoleName(Qt.UserRole + 14, "is_active") self.addRoleName(Qt.UserRole + 15, "is_installed") # Scheduled pkgs are included in the model but should not be marked as actually installed self.addRoleName(Qt.UserRole + 16, "has_configs") self.addRoleName(Qt.UserRole + 17, "supported_configs") @@ -75,7 +75,7 @@ class PackagesModel(ListModel): "download_url": package["download_url"] if "download_url" 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, - "is_enabled": package["is_enabled"] if "is_enabled" in package else False, + "is_active": package["is_active"] if "is_active" in package else False, "is_installed": package["is_installed"] if "is_installed" in package else False, "has_configs": has_configs, "supported_configs": configs_model, From 9418b241d19093229fa39917105b61d7988255fb Mon Sep 17 00:00:00 2001 From: Diego Prado Gesto Date: Fri, 27 Jul 2018 16:04:36 +0200 Subject: [PATCH 2/2] CURA-5541 Remove duplicated bundled packages. Packages that belong to Uranium must stay in the Uranium's file. --- resources/bundled_packages.json | 272 -------------------------------- 1 file changed, 272 deletions(-) diff --git a/resources/bundled_packages.json b/resources/bundled_packages.json index f281d0d01a..40ed0a9aa2 100644 --- a/resources/bundled_packages.json +++ b/resources/bundled_packages.json @@ -1384,276 +1384,4 @@ } } }, - "ConsoleLogger": { - "package_info": { - "package_id": "ConsoleLogger", - "package_type": "plugin", - "display_name": "Console Logger", - "description": "Outputs log information to the console.", - "package_version": "1.0.0", - "sdk_version": 4, - "website": "https://ultimaker.com", - "author": { - "author_id": "Ultimaker", - "display_name": "Ultimaker B.V.", - "email": "plugins@ultimaker.com", - "website": "https://ultimaker.com" - } - } - }, - "OBJReader": { - "package_info": { - "package_id": "OBJReader", - "package_type": "plugin", - "display_name": "Wavefront OBJ Reader", - "description": "Makes it possible to read Wavefront OBJ files.", - "package_version": "1.0.0", - "sdk_version": 4, - "website": "https://ultimaker.com", - "author": { - "author_id": "Ultimaker", - "display_name": "Ultimaker B.V.", - "email": "plugins@ultimaker.com", - "website": "https://ultimaker.com" - } - } - }, - "OBJWriter": { - "package_info": { - "package_id": "OBJWriter", - "package_type": "plugin", - "display_name": "Wavefront OBJ Writer", - "description": "Makes it possible to write Wavefront OBJ files.", - "package_version": "1.0.0", - "sdk_version": 4, - "website": "https://ultimaker.com", - "author": { - "author_id": "Ultimaker", - "display_name": "Ultimaker B.V.", - "email": "plugins@ultimaker.com", - "website": "https://ultimaker.com" - } - } - }, - "STLReader": { - "package_info": { - "package_id": "STLReader", - "package_type": "plugin", - "display_name": "STL Reader", - "description": "Provides support for reading STL files.", - "package_version": "1.0.0", - "sdk_version": 4, - "website": "https://ultimaker.com", - "author": { - "author_id": "Ultimaker", - "display_name": "Ultimaker B.V.", - "email": "plugins@ultimaker.com", - "website": "https://ultimaker.com" - } - } - }, - "STLWriter": { - "package_info": { - "package_id": "STLWriter", - "package_type": "plugin", - "display_name": "STL Writer", - "description": "Provides support for writing STL files.", - "package_version": "1.0.0", - "sdk_version": 4, - "website": "https://ultimaker.com", - "author": { - "author_id": "Ultimaker", - "display_name": "Ultimaker B.V.", - "email": "plugins@ultimaker.com", - "website": "https://ultimaker.com" - } - } - }, - "FileLogger": { - "package_info": { - "package_id": "FileLogger", - "package_type": "plugin", - "display_name": "File Logger", - "description": "Outputs log information to a file in your settings folder.", - "package_version": "1.0.0", - "sdk_version": 4, - "website": "https://ultimaker.com", - "author": { - "author_id": "Ultimaker", - "display_name": "Ultimaker B.V.", - "email": "plugins@ultimaker.com", - "website": "https://ultimaker.com" - } - } - }, - "LocalContainerProvider": { - "package_info": { - "package_id": "LocalContainerProvider", - "package_type": "plugin", - "display_name": "Local Container Provider", - "description": "Provides built-in setting containers that come with the installation of the application.", - "package_version": "1.0.0", - "sdk_version": 4, - "website": "https://ultimaker.com", - "author": { - "author_id": "Ultimaker", - "display_name": "Ultimaker B.V.", - "email": "plugins@ultimaker.com", - "website": "https://ultimaker.com" - } - } - }, - "LocalFileOutputDevice": { - "package_info": { - "package_id": "LocalFileOutputDevice", - "package_type": "plugin", - "display_name": "Local File Output Device", - "description": "Enables saving to local files.", - "package_version": "1.0.0", - "sdk_version": 4, - "website": "https://ultimaker.com", - "author": { - "author_id": "Ultimaker", - "display_name": "Ultimaker B.V.", - "email": "plugins@ultimaker.com", - "website": "https://ultimaker.com" - } - } - }, - "CameraTool": { - "package_info": { - "package_id": "CameraTool", - "package_type": "plugin", - "display_name": "Camera Tool", - "description": "Provides the tool to manipulate the camera.", - "package_version": "1.0.0", - "sdk_version": 4, - "website": "https://ultimaker.com", - "author": { - "author_id": "Ultimaker", - "display_name": "Ultimaker B.V.", - "email": "plugins@ultimaker.com", - "website": "https://ultimaker.com" - } - } - }, - "MirrorTool": { - "package_info": { - "package_id": "MirrorTool", - "package_type": "plugin", - "display_name": "Mirror Tool", - "description": "Provides the Mirror tool.", - "package_version": "1.0.0", - "sdk_version": 4, - "website": "https://ultimaker.com", - "author": { - "author_id": "Ultimaker", - "display_name": "Ultimaker B.V.", - "email": "plugins@ultimaker.com", - "website": "https://ultimaker.com" - } - } - }, - "RotateTool": { - "package_info": { - "package_id": "RotateTool", - "package_type": "plugin", - "display_name": "Rotate Tool", - "description": "Provides the Rotate tool.", - "package_version": "1.0.0", - "sdk_version": 4, - "website": "https://ultimaker.com", - "author": { - "author_id": "Ultimaker", - "display_name": "Ultimaker B.V.", - "email": "plugins@ultimaker.com", - "website": "https://ultimaker.com" - } - } - }, - "ScaleTool": { - "package_info": { - "package_id": "ScaleTool", - "package_type": "plugin", - "display_name": "Scale Tool", - "description": "Provides the Scale tool.", - "package_version": "1.0.0", - "sdk_version": 4, - "website": "https://ultimaker.com", - "author": { - "author_id": "Ultimaker", - "display_name": "Ultimaker B.V.", - "email": "plugins@ultimaker.com", - "website": "https://ultimaker.com" - } - } - }, - "SelectionTool": { - "package_info": { - "package_id": "SelectionTool", - "package_type": "plugin", - "display_name": "Selection Tool", - "description": "Provides the Selection tool.", - "package_version": "1.0.0", - "sdk_version": 4, - "website": "https://ultimaker.com", - "author": { - "author_id": "Ultimaker", - "display_name": "Ultimaker B.V.", - "email": "plugins@ultimaker.com", - "website": "https://ultimaker.com" - } - } - }, - "TranslateTool": { - "package_info": { - "package_id": "TranslateTool", - "package_type": "plugin", - "display_name": "Move Tool", - "description": "Provides the Move tool.", - "package_version": "1.0.0", - "sdk_version": 4, - "website": "https://ultimaker.com", - "author": { - "author_id": "Ultimaker", - "display_name": "Ultimaker B.V.", - "email": "plugins@ultimaker.com", - "website": "https://ultimaker.com" - } - } - }, - "UpdateChecker": { - "package_info": { - "package_id": "UpdateChecker", - "package_type": "plugin", - "display_name": "Update Checker", - "description": "Checks for updates of the software.", - "package_version": "1.0.0", - "sdk_version": 4, - "website": "https://ultimaker.com", - "author": { - "author_id": "Ultimaker", - "display_name": "Ultimaker B.V.", - "email": "plugins@ultimaker.com", - "website": "https://ultimaker.com" - } - } - }, - "SimpleView": { - "package_info": { - "package_id": "SimpleView", - "package_type": "plugin", - "display_name": "Simple View", - "description": "Provides a simple solid mesh view.", - "package_version": "1.0.0", - "sdk_version": 4, - "website": "https://ultimaker.com", - "author": { - "author_id": "Ultimaker", - "display_name": "Ultimaker B.V.", - "email": "plugins@ultimaker.com", - "website": "https://ultimaker.com" - } - } - } }