diff --git a/plugins/Toolbox/Toolbox/Toolbox.py b/plugins/Toolbox/Toolbox/Toolbox.py index 9c64efc9fa..f1efcc6684 100644 --- a/plugins/Toolbox/Toolbox/Toolbox.py +++ b/plugins/Toolbox/Toolbox/Toolbox.py @@ -24,12 +24,13 @@ from cura.CuraApplication import CuraApplication i18n_catalog = i18nCatalog("cura") +## The Toolbox class is responsible of communicating with the server through the API class Toolbox(QObject, Extension): def __init__(self, parent=None): super().__init__(parent) - self._api_version = 4 - self._api_url = "http://software.ultimaker.com/cura/v%s/" % self._api_version + self._api_version = 1 + self._api_url = "https://api-staging.ultimaker.com/cura-packages/v%s/" % self._api_version self._plugin_list_request = None self._download_plugin_request = None @@ -119,18 +120,18 @@ class Toolbox(QObject, Extension): return self._is_downloading @pyqtSlot() - def browsePlugins(self): + def browsePackages(self): self._createNetworkManager() - self.requestPluginList() + self.requestPackageList() if not self._dialog: self._dialog = self._createDialog("PluginBrowser.qml") self._dialog.show() - @pyqtSlot() - def requestPluginList(self): - Logger.log("i", "Requesting plugin list") - url = QUrl(self._api_url + "plugins") + def requestPackageList(self): + cura_version = 4 + Logger.log("i", "Requesting package list") + url = QUrl(self._api_url + "packages?cura_version={version}".format(version = cura_version)) self._plugin_list_request = QNetworkRequest(url) self._plugin_list_request.setRawHeader(*self._request_header) self._network_manager.get(self._plugin_list_request) @@ -138,7 +139,6 @@ class Toolbox(QObject, Extension): def _createDialog(self, qml_name): Logger.log("d", "Creating dialog [%s]", qml_name) path = os.path.join(PluginRegistry.getInstance().getPluginPath(self.getPluginId()), "resources", "qml", qml_name) - Logger.log("d", "Creating dialog [%s]", path) dialog = Application.getInstance().createQmlComponent(path, {"manager": self}) return dialog @@ -223,7 +223,6 @@ class Toolbox(QObject, Extension): self.openRestartDialog(result["message"]) self._restart_required = True self.restartRequiredChanged.emit() - # Application.getInstance().messageBox(i18n_catalog.i18nc("@window:title", "Plugin browser"), result["message"]) @pyqtSlot(str) def removePlugin(self, plugin_id): diff --git a/resources/qml/Actions.qml b/resources/qml/Actions.qml index cb9299e69c..21e6eebf58 100644 --- a/resources/qml/Actions.qml +++ b/resources/qml/Actions.qml @@ -68,7 +68,7 @@ Item property alias configureSettingVisibility: configureSettingVisibilityAction - property alias browsePlugins: browsePluginsAction + property alias browsePackages: browsePackagesAction UM.I18nCatalog{id: catalog; name:"cura"} @@ -429,7 +429,7 @@ Item Action { - id: browsePluginsAction + id: browsePackagesAction text: catalog.i18nc("@action:menu", "Browse packages...") iconName: "plugins_browse" } diff --git a/resources/qml/Cura.qml b/resources/qml/Cura.qml index db5be5ea25..e20a29fe16 100644 --- a/resources/qml/Cura.qml +++ b/resources/qml/Cura.qml @@ -272,7 +272,7 @@ UM.MainWindow id: plugin_menu title: catalog.i18nc("@title:menu menubar:toplevel", "&Toolbox") - MenuItem { action: Cura.Actions.browsePlugins } + MenuItem { action: Cura.Actions.browsePackages } } Menu @@ -668,9 +668,9 @@ UM.MainWindow // show the plugin browser dialog Connections { - target: Cura.Actions.browsePlugins + target: Cura.Actions.browsePackages onTriggered: { - curaExtensions.callExtensionMethod("Toolbox", "browsePlugins") + curaExtensions.callExtensionMethod("Toolbox", "browsePackages") } }