From fda0f59c7067e845fd752fc7bf6a1015bc3a9a2c Mon Sep 17 00:00:00 2001 From: Mark Date: Tue, 30 Oct 2018 10:27:22 +0100 Subject: [PATCH 1/2] Rename user visible entries of ToolBox to Marketplace CURA-5874 --- plugins/Toolbox/resources/qml/Toolbox.qml | 2 +- resources/qml/Actions.qml | 2 +- resources/qml/Cura.qml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/plugins/Toolbox/resources/qml/Toolbox.qml b/plugins/Toolbox/resources/qml/Toolbox.qml index 4fb8192d81..9a98c998b0 100644 --- a/plugins/Toolbox/resources/qml/Toolbox.qml +++ b/plugins/Toolbox/resources/qml/Toolbox.qml @@ -10,7 +10,7 @@ Window { id: base property var selection: null - title: catalog.i18nc("@title", "Toolbox") + title: catalog.i18nc("@title", "Marketplace") modality: Qt.ApplicationModal flags: Qt.Dialog | Qt.CustomizeWindowHint | Qt.WindowTitleHint | Qt.WindowCloseButtonHint diff --git a/resources/qml/Actions.qml b/resources/qml/Actions.qml index 7d898eed2c..161c1db342 100644 --- a/resources/qml/Actions.qml +++ b/resources/qml/Actions.qml @@ -421,7 +421,7 @@ Item Action { id: browsePackagesAction - text: catalog.i18nc("@action:menu", "Browse packages...") + text: catalog.i18nc("@action:menu", "Open Marketplace...") iconName: "plugins_browse" } diff --git a/resources/qml/Cura.qml b/resources/qml/Cura.qml index b3367471ad..76af9bfe37 100644 --- a/resources/qml/Cura.qml +++ b/resources/qml/Cura.qml @@ -283,7 +283,7 @@ UM.MainWindow Menu { id: plugin_menu - title: catalog.i18nc("@title:menu menubar:toplevel", "&Toolbox") + title: catalog.i18nc("@title:menu menubar:toplevel", "Marke&tplace") MenuItem { action: Cura.Actions.browsePackages } } From 33da50df267470cf92779eb1cf8de882ae1c7066 Mon Sep 17 00:00:00 2001 From: Diego Prado Gesto Date: Wed, 31 Oct 2018 09:45:29 +0100 Subject: [PATCH 2/2] Rename other entries of the Toolbox to Marketplace. Add a line in the Changelog indicating that the Toolbox was renamed. Contributes to CURA-5874. --- plugins/ChangeLogPlugin/ChangeLog.txt | 7 ++++-- .../qml/ToolboxDownloadsShowcaseTile.qml | 2 +- plugins/Toolbox/src/PackagesModel.py | 2 +- plugins/Toolbox/src/Toolbox.py | 24 +++++++++---------- resources/qml/Cura.qml | 2 +- 5 files changed, 20 insertions(+), 17 deletions(-) diff --git a/plugins/ChangeLogPlugin/ChangeLog.txt b/plugins/ChangeLogPlugin/ChangeLog.txt index ea3b4f9239..b92c18b2b2 100755 --- a/plugins/ChangeLogPlugin/ChangeLog.txt +++ b/plugins/ChangeLogPlugin/ChangeLog.txt @@ -26,8 +26,11 @@ Fullscreen mode can be toggled using the View menu or with the keyboard shortcut *Configuration error message In previous versions, Ultimaker Cura would display an error dialog explaining when something happened to user configuration files, including the option to reset to factory defaults. This would not warn about losing the current printer and print profile settings, so this information has been added. -*Materials in the Toolbox -A new tab has been added to the Toolbox that includes downloadable material profiles, to quickly and easily prepare models for a range of third-party materials. +*Rename Toolbox to Marketplace +The entry points to the Toolbox are now renamed to Marketplace. + +*Materials in the Marketplace +A new tab has been added to the Marketplace that includes downloadable material profiles, to quickly and easily prepare models for a range of third-party materials. *New third-party definitions New profiles added for Anycube 4MAx and Tizyx K25. diff --git a/plugins/Toolbox/resources/qml/ToolboxDownloadsShowcaseTile.qml b/plugins/Toolbox/resources/qml/ToolboxDownloadsShowcaseTile.qml index 845bbe8f91..4fb70541d2 100644 --- a/plugins/Toolbox/resources/qml/ToolboxDownloadsShowcaseTile.qml +++ b/plugins/Toolbox/resources/qml/ToolboxDownloadsShowcaseTile.qml @@ -1,5 +1,5 @@ // Copyright (c) 2018 Ultimaker B.V. -// Toolbox is released under the terms of the LGPLv3 or higher. +// Cura is released under the terms of the LGPLv3 or higher. import QtQuick 2.7 import QtQuick.Controls 1.4 diff --git a/plugins/Toolbox/src/PackagesModel.py b/plugins/Toolbox/src/PackagesModel.py index ae4cd7682d..aa5626b7f2 100644 --- a/plugins/Toolbox/src/PackagesModel.py +++ b/plugins/Toolbox/src/PackagesModel.py @@ -52,7 +52,7 @@ class PackagesModel(ListModel): items = [] if self._metadata is None: - Logger.logException("w", "Failed to load packages for Toolbox") + Logger.logException("w", "Failed to load packages for Marketplace") self.setItems(items) return diff --git a/plugins/Toolbox/src/Toolbox.py b/plugins/Toolbox/src/Toolbox.py index 3e2085277a..91eb810a70 100644 --- a/plugins/Toolbox/src/Toolbox.py +++ b/plugins/Toolbox/src/Toolbox.py @@ -245,7 +245,7 @@ class Toolbox(QObject, Extension): self._dialog = self._createDialog("Toolbox.qml") if not self._dialog: - Logger.log("e", "Unexpected error trying to create the 'Toolbox' dialog.") + Logger.log("e", "Unexpected error trying to create the 'Marketplace' dialog.") return self._dialog.show() @@ -254,7 +254,7 @@ class Toolbox(QObject, Extension): self.enabledChanged.emit() def _createDialog(self, qml_name: str) -> Optional[QObject]: - Logger.log("d", "Toolbox: Creating dialog [%s].", qml_name) + Logger.log("d", "Marketplace: Creating dialog [%s].", qml_name) plugin_path = PluginRegistry.getInstance().getPluginPath(self.getPluginId()) if not plugin_path: return None @@ -262,7 +262,7 @@ class Toolbox(QObject, Extension): dialog = self._application.createQmlComponent(path, {"toolbox": self}) if not dialog: - raise Exception("Failed to create toolbox dialog") + raise Exception("Failed to create Marketplace dialog") return dialog def _convertPluginMetadata(self, plugin: Dict[str, Any]) -> Dict[str, Any]: @@ -578,7 +578,7 @@ class Toolbox(QObject, Extension): # Make API Calls # -------------------------------------------------------------------------- def _makeRequestByType(self, type: str) -> None: - Logger.log("i", "Toolbox: Requesting %s metadata from server.", type) + Logger.log("i", "Marketplace: Requesting %s metadata from server.", type) request = QNetworkRequest(self._request_urls[type]) request.setRawHeader(*self._request_header) if self._network_manager: @@ -586,7 +586,7 @@ class Toolbox(QObject, Extension): @pyqtSlot(str) def startDownload(self, url: str) -> None: - Logger.log("i", "Toolbox: Attempting to download & install package from %s.", url) + Logger.log("i", "Marketplace: Attempting to download & install package from %s.", url) url = QUrl(url) self._download_request = QNetworkRequest(url) if hasattr(QNetworkRequest, "FollowRedirectsAttribute"): @@ -603,7 +603,7 @@ class Toolbox(QObject, Extension): @pyqtSlot() def cancelDownload(self) -> None: - Logger.log("i", "Toolbox: User cancelled the download of a package.") + Logger.log("i", "Marketplace: User cancelled the download of a package.") self.resetDownload() def resetDownload(self) -> None: @@ -690,7 +690,7 @@ class Toolbox(QObject, Extension): return except json.decoder.JSONDecodeError: - Logger.log("w", "Toolbox: Received invalid JSON for %s.", type) + Logger.log("w", "Marketplace: Received invalid JSON for %s.", type) break else: self.setViewPage("errored") @@ -717,10 +717,10 @@ class Toolbox(QObject, Extension): self._onDownloadComplete(file_path) def _onDownloadComplete(self, file_path: str) -> None: - Logger.log("i", "Toolbox: Download complete.") + Logger.log("i", "Marketplace: Download complete.") package_info = self._package_manager.getPackageInfo(file_path) if not package_info: - Logger.log("w", "Toolbox: Package file [%s] was not a valid CuraPackage.", file_path) + Logger.log("w", "Marketplace: Package file [%s] was not a valid CuraPackage.", file_path) return license_content = self._package_manager.getPackageLicense(file_path) @@ -819,7 +819,7 @@ class Toolbox(QObject, Extension): @pyqtSlot(str, str, str) def filterModelByProp(self, model_type: str, filter_type: str, parameter: str) -> None: if not self._models[model_type]: - Logger.log("w", "Toolbox: Couldn't filter %s model because it doesn't exist.", model_type) + Logger.log("w", "Marketplace: Couldn't filter %s model because it doesn't exist.", model_type) return self._models[model_type].setFilter({filter_type: parameter}) self.filterChanged.emit() @@ -827,7 +827,7 @@ class Toolbox(QObject, Extension): @pyqtSlot(str, "QVariantMap") def setFilters(self, model_type: str, filter_dict: dict) -> None: if not self._models[model_type]: - Logger.log("w", "Toolbox: Couldn't filter %s model because it doesn't exist.", model_type) + Logger.log("w", "Marketplace: Couldn't filter %s model because it doesn't exist.", model_type) return self._models[model_type].setFilter(filter_dict) self.filterChanged.emit() @@ -835,7 +835,7 @@ class Toolbox(QObject, Extension): @pyqtSlot(str) def removeFilters(self, model_type: str) -> None: if not self._models[model_type]: - Logger.log("w", "Toolbox: Couldn't remove filters on %s model because it doesn't exist.", model_type) + Logger.log("w", "Marketplace: Couldn't remove filters on %s model because it doesn't exist.", model_type) return self._models[model_type].setFilter({}) self.filterChanged.emit() diff --git a/resources/qml/Cura.qml b/resources/qml/Cura.qml index 76af9bfe37..029149f1d0 100644 --- a/resources/qml/Cura.qml +++ b/resources/qml/Cura.qml @@ -283,7 +283,7 @@ UM.MainWindow Menu { id: plugin_menu - title: catalog.i18nc("@title:menu menubar:toplevel", "Marke&tplace") + title: catalog.i18nc("@title:menu menubar:toplevel", "&Marketplace") MenuItem { action: Cura.Actions.browsePackages } }