diff --git a/README.md b/README.md index ff39e4142a..345a55d12f 100644 --- a/README.md +++ b/README.md @@ -10,9 +10,9 @@ For crashes and similar issues, please attach the following information: * (On Windows) The log as produced by dxdiag (start -> run -> dxdiag -> save output) * The Cura GUI log file, located at - * `%APPDATA%\cura\\cura.log` (Windows), or usually `C:\Users\\\AppData\Roaming\cura\\cura.log` - * `$USER/Library/Application Support/cura//cura.log` (OSX) - * `$USER/.local/share/cura//cura.log` (Ubuntu/Linux) + * `%APPDATA%\cura\\cura.log` (Windows), or usually `C:\Users\\AppData\Roaming\cura\\cura.log` + * `$HOME/Library/Application Support/cura//cura.log` (OSX) + * `$HOME/.local/share/cura//cura.log` (Ubuntu/Linux) If the Cura user interface still starts, you can also reach this directory from the application menu in Help -> Show settings folder diff --git a/cura/API/Account.py b/cura/API/Account.py index 728d0690a3..2e48a040ad 100644 --- a/cura/API/Account.py +++ b/cura/API/Account.py @@ -109,7 +109,6 @@ class Account(QObject): self._authorization_service.accessTokenChanged.connect(self._onAccessTokenChanged) self._authorization_service.loadAuthDataFromPreferences() - @pyqtProperty(int, notify=syncStateChanged) def syncState(self): return self._sync_state @@ -178,6 +177,7 @@ class Account(QObject): if error_message: if self._error_message: self._error_message.hide() + Logger.log("w", "Failed to login: %s", error_message) self._error_message = Message(error_message, title = i18n_catalog.i18nc("@info:title", "Login failed")) self._error_message.show() self._logged_in = False diff --git a/cura/Backups/Backup.py b/cura/Backups/Backup.py index 6128dac320..1f6a961733 100644 --- a/cura/Backups/Backup.py +++ b/cura/Backups/Backup.py @@ -193,14 +193,13 @@ class Backup: Logger.log("d", "Removing current data in location: %s", target_path) Resources.factoryReset() Logger.log("d", "Extracting backup to location: %s", target_path) - try: - name_list = archive.namelist() - for archive_filename in name_list: + name_list = archive.namelist() + for archive_filename in name_list: + try: archive.extract(archive_filename, target_path) - CuraApplication.getInstance().processEvents() - except (PermissionError, EnvironmentError): - Logger.logException("e", "Unable to extract the backup due to permission or file system errors.") - return False + except (PermissionError, EnvironmentError): + Logger.logException("e", f"Unable to extract the file {archive_filename} from the backup due to permission or file system errors.") + CuraApplication.getInstance().processEvents() return True def _obfuscate(self) -> Dict[str, str]: diff --git a/cura/Machines/Models/ExtrudersModel.py b/cura/Machines/Models/ExtrudersModel.py index 98865ed37e..1aba1d871a 100644 --- a/cura/Machines/Models/ExtrudersModel.py +++ b/cura/Machines/Models/ExtrudersModel.py @@ -53,6 +53,9 @@ class ExtrudersModel(ListModel): EnabledRole = Qt.UserRole + 11 """Is the extruder enabled?""" + MaterialTypeRole = Qt.UserRole + 12 + """The type of the material (e.g. PLA, ABS, PETG, etc.).""" + defaultColors = ["#ffc924", "#86ec21", "#22eeee", "#245bff", "#9124ff", "#ff24c8"] """List of colours to display if there is no material or the material has no known colour. """ @@ -75,6 +78,7 @@ class ExtrudersModel(ListModel): self.addRoleName(self.StackRole, "stack") self.addRoleName(self.MaterialBrandRole, "material_brand") self.addRoleName(self.ColorNameRole, "color_name") + self.addRoleName(self.MaterialTypeRole, "material_type") self._update_extruder_timer = QTimer() self._update_extruder_timer.setInterval(100) self._update_extruder_timer.setSingleShot(True) @@ -193,7 +197,8 @@ class ExtrudersModel(ListModel): "variant": extruder.variant.getName() if extruder.variant else "", # e.g. print core "stack": extruder, "material_brand": material_brand, - "color_name": color_name + "color_name": color_name, + "material_type": extruder.material.getMetaDataEntry("material") if extruder.material else "", } items.append(item) @@ -210,7 +215,7 @@ class ExtrudersModel(ListModel): "id": "", "name": catalog.i18nc("@menuitem", "Not overridden"), "enabled": True, - "color": "#ffffff", + "color": "transparent", "index": -1, "definition": "", "material": "", @@ -218,6 +223,7 @@ class ExtrudersModel(ListModel): "stack": None, "material_brand": "", "color_name": "", + "material_type": "", } items.append(item) if self._items != items: diff --git a/cura/OAuth2/LocalAuthorizationServer.py b/cura/OAuth2/LocalAuthorizationServer.py index ac14b00985..219191c295 100644 --- a/cura/OAuth2/LocalAuthorizationServer.py +++ b/cura/OAuth2/LocalAuthorizationServer.py @@ -54,6 +54,7 @@ class LocalAuthorizationServer: if self._web_server: # If the server is already running (because of a previously aborted auth flow), we don't have to start it. # We still inject the new verification code though. + Logger.log("d", "Auth web server was already running. Updating the verification code") self._web_server.setVerificationCode(verification_code) return @@ -85,6 +86,7 @@ class LocalAuthorizationServer: except OSError: # OS error can happen if the socket was already closed. We really don't care about that case. pass + Logger.log("d", "Local oauth2 web server was shut down") self._web_server = None self._web_server_thread = None @@ -96,12 +98,13 @@ class LocalAuthorizationServer: :return: None """ + Logger.log("d", "Local web server for authorization has started") if self._web_server: if sys.platform == "win32": try: self._web_server.serve_forever() - except OSError as e: - Logger.warning(str(e)) + except OSError: + Logger.logException("w", "An exception happened while serving the auth server") else: # Leave the default behavior in non-windows platforms self._web_server.serve_forever() diff --git a/cura/UI/TextManager.py b/cura/UI/TextManager.py index dbe7940f26..e45689936b 100644 --- a/cura/UI/TextManager.py +++ b/cura/UI/TextManager.py @@ -1,4 +1,4 @@ -# Copyright (c) 2019 Ultimaker B.V. +# Copyright (c) 2021 Ultimaker B.V. # Cura is released under the terms of the LGPLv3 or higher. import collections @@ -6,9 +6,11 @@ from typing import Optional, Dict, List, cast from PyQt5.QtCore import QObject, pyqtSlot +from UM.i18n import i18nCatalog from UM.Resources import Resources from UM.Version import Version +catalog = i18nCatalog("cura") # # This manager provides means to load texts to QML. @@ -30,30 +32,33 @@ class TextManager(QObject): # Load change log texts and organize them with a dict try: file_path = Resources.getPath(Resources.Texts, "change_log.txt") - except FileNotFoundError: + except FileNotFoundError as e: # I have no idea how / when this happens, but we're getting crash reports about it. - return "" + return catalog.i18nc("@text:window", "The release notes could not be opened.") + "
" + str(e) change_logs_dict = {} # type: Dict[Version, Dict[str, List[str]]] - with open(file_path, "r", encoding = "utf-8") as f: - open_version = None # type: Optional[Version] - open_header = "" # Initialise to an empty header in case there is no "*" in the first line of the changelog - for line in f: - line = line.replace("\n", "") - if "[" in line and "]" in line: - line = line.replace("[", "") - line = line.replace("]", "") - open_version = Version(line) - if open_version > Version([14, 99, 99]): # Bit of a hack: We released the 15.x.x versions before 2.x - open_version = Version([0, open_version.getMinor(), open_version.getRevision(), open_version.getPostfixVersion()]) - open_header = "" - change_logs_dict[open_version] = collections.OrderedDict() - elif line.startswith("*"): - open_header = line.replace("*", "") - change_logs_dict[cast(Version, open_version)][open_header] = [] - elif line != "": - if open_header not in change_logs_dict[cast(Version, open_version)]: + try: + with open(file_path, "r", encoding = "utf-8") as f: + open_version = None # type: Optional[Version] + open_header = "" # Initialise to an empty header in case there is no "*" in the first line of the changelog + for line in f: + line = line.replace("\n", "") + if "[" in line and "]" in line: + line = line.replace("[", "") + line = line.replace("]", "") + open_version = Version(line) + if open_version > Version([14, 99, 99]): # Bit of a hack: We released the 15.x.x versions before 2.x + open_version = Version([0, open_version.getMinor(), open_version.getRevision(), open_version.getPostfixVersion()]) + open_header = "" + change_logs_dict[open_version] = collections.OrderedDict() + elif line.startswith("*"): + open_header = line.replace("*", "") change_logs_dict[cast(Version, open_version)][open_header] = [] - change_logs_dict[cast(Version, open_version)][open_header].append(line) + elif line != "": + if open_header not in change_logs_dict[cast(Version, open_version)]: + change_logs_dict[cast(Version, open_version)][open_header] = [] + change_logs_dict[cast(Version, open_version)][open_header].append(line) + except EnvironmentError as e: + return catalog.i18nc("@text:window", "The release notes could not be opened.") + "
" + str(e) # Format changelog text content = "" diff --git a/cura/UI/WhatsNewPagesModel.py b/cura/UI/WhatsNewPagesModel.py index db0f4b3a74..11320a0ebb 100644 --- a/cura/UI/WhatsNewPagesModel.py +++ b/cura/UI/WhatsNewPagesModel.py @@ -29,7 +29,7 @@ class WhatsNewPagesModel(WelcomePagesModel): for filename in files: basename = os.path.basename(filename) base, ext = os.path.splitext(basename) - if ext not in include or not base.isdigit(): + if ext.lower() not in include or not base.isdigit(): continue page_no = int(base) highest = max(highest, page_no) diff --git a/plugins/3MFReader/WorkspaceDialog.qml b/plugins/3MFReader/WorkspaceDialog.qml index 1fd20a3534..450f01fbd5 100644 --- a/plugins/3MFReader/WorkspaceDialog.qml +++ b/plugins/3MFReader/WorkspaceDialog.qml @@ -419,7 +419,7 @@ UM.Dialog width: warningLabel.height height: width - source: UM.Theme.getIcon("notice") + source: UM.Theme.getIcon("Information") color: palette.text } diff --git a/plugins/CuraDrive/src/DrivePluginExtension.py b/plugins/CuraDrive/src/DrivePluginExtension.py index 6fd55d172e..3a7a59a172 100644 --- a/plugins/CuraDrive/src/DrivePluginExtension.py +++ b/plugins/CuraDrive/src/DrivePluginExtension.py @@ -81,7 +81,8 @@ class DrivePluginExtension(QObject, Extension): self._drive_window.show() def _onApplicationShuttingDown(self): - self._drive_window.hide() + if self._drive_window: + self._drive_window.hide() def _autoBackup(self) -> None: preferences = CuraApplication.getInstance().getPreferences() diff --git a/plugins/CuraDrive/src/qml/components/BackupListFooter.qml b/plugins/CuraDrive/src/qml/components/BackupListFooter.qml index 8decdc5c27..15af7521ed 100644 --- a/plugins/CuraDrive/src/qml/components/BackupListFooter.qml +++ b/plugins/CuraDrive/src/qml/components/BackupListFooter.qml @@ -20,7 +20,7 @@ RowLayout { id: infoButton text: catalog.i18nc("@button", "Want more?") - iconSource: UM.Theme.getIcon("info") + iconSource: UM.Theme.getIcon("Information") onClicked: Qt.openUrlExternally("https://goo.gl/forms/QACEP8pP3RV60QYG2") visible: backupListFooter.showInfoButton } @@ -29,7 +29,7 @@ RowLayout { id: createBackupButton text: catalog.i18nc("@button", "Backup Now") - iconSource: UM.Theme.getIcon("plus") + iconSource: UM.Theme.getIcon("Plus") enabled: !CuraDrive.isCreatingBackup && !CuraDrive.isRestoringBackup onClicked: CuraDrive.createBackup() busy: CuraDrive.isCreatingBackup diff --git a/plugins/CuraDrive/src/qml/components/BackupListItem.qml b/plugins/CuraDrive/src/qml/components/BackupListItem.qml index 7b539b03b9..e35c8351b7 100644 --- a/plugins/CuraDrive/src/qml/components/BackupListItem.qml +++ b/plugins/CuraDrive/src/qml/components/BackupListItem.qml @@ -38,7 +38,7 @@ Item height: UM.Theme.getSize("section_icon").height color: UM.Theme.getColor("small_button_text") hoverColor: UM.Theme.getColor("small_button_text_hover") - iconSource: UM.Theme.getIcon("info") + iconSource: UM.Theme.getIcon("Information") onClicked: backupListItem.showDetails = !backupListItem.showDetails } @@ -80,7 +80,7 @@ Item height: UM.Theme.getSize("message_close").height color: UM.Theme.getColor("small_button_text") hoverColor: UM.Theme.getColor("small_button_text_hover") - iconSource: UM.Theme.getIcon("cross1") + iconSource: UM.Theme.getIcon("Cancel") onClicked: confirmDeleteDialog.visible = true } } diff --git a/plugins/CuraDrive/src/qml/components/BackupListItemDetails.qml b/plugins/CuraDrive/src/qml/components/BackupListItemDetails.qml index 4da15c6f16..a4f30edd19 100644 --- a/plugins/CuraDrive/src/qml/components/BackupListItemDetails.qml +++ b/plugins/CuraDrive/src/qml/components/BackupListItemDetails.qml @@ -1,4 +1,4 @@ -// Copyright (c) 2018 Ultimaker B.V. +// Copyright (c) 2021 Ultimaker B.V. // Cura is released under the terms of the LGPLv3 or higher. import QtQuick 2.7 @@ -17,7 +17,7 @@ ColumnLayout // Cura version BackupListItemDetailsRow { - iconSource: UM.Theme.getIcon("application") + iconSource: UM.Theme.getIcon("UltimakerCura") label: catalog.i18nc("@backuplist:label", "Cura Version") value: backupDetailsData.metadata.cura_release } @@ -25,7 +25,7 @@ ColumnLayout // Machine count. BackupListItemDetailsRow { - iconSource: UM.Theme.getIcon("printer_single") + iconSource: UM.Theme.getIcon("Printer") label: catalog.i18nc("@backuplist:label", "Machines") value: backupDetailsData.metadata.machine_count } @@ -33,7 +33,7 @@ ColumnLayout // Material count BackupListItemDetailsRow { - iconSource: UM.Theme.getIcon("category_material") + iconSource: UM.Theme.getIcon("Spool") label: catalog.i18nc("@backuplist:label", "Materials") value: backupDetailsData.metadata.material_count } @@ -41,7 +41,7 @@ ColumnLayout // Profile count. BackupListItemDetailsRow { - iconSource: UM.Theme.getIcon("settings") + iconSource: UM.Theme.getIcon("Sliders") label: catalog.i18nc("@backuplist:label", "Profiles") value: backupDetailsData.metadata.profile_count } @@ -49,7 +49,7 @@ ColumnLayout // Plugin count. BackupListItemDetailsRow { - iconSource: UM.Theme.getIcon("plugin") + iconSource: UM.Theme.getIcon("Plugin") label: catalog.i18nc("@backuplist:label", "Plugins") value: backupDetailsData.metadata.plugin_count } diff --git a/plugins/CuraEngineBackend/CuraEngineBackend.py b/plugins/CuraEngineBackend/CuraEngineBackend.py index 1aa6c86dcb..fa9a8c5474 100755 --- a/plugins/CuraEngineBackend/CuraEngineBackend.py +++ b/plugins/CuraEngineBackend/CuraEngineBackend.py @@ -4,12 +4,12 @@ import argparse #To run the engine in debug mode if the front-end is in debug mode. from collections import defaultdict import os -from PyQt5.QtCore import QObject, QTimer, pyqtSlot +from PyQt5.QtCore import QObject, QTimer, QUrl, pyqtSlot import sys from time import time from typing import Any, cast, Dict, List, Optional, Set, TYPE_CHECKING -from PyQt5.QtGui import QImage +from PyQt5.QtGui import QDesktopServices, QImage from UM.Backend.Backend import Backend, BackendState from UM.Scene.SceneNode import SceneNode @@ -157,6 +157,18 @@ class CuraEngineBackend(QObject, Backend): self.determineAutoSlicing() application.getPreferences().preferenceChanged.connect(self._onPreferencesChanged) + self._slicing_error_message = Message( + text = catalog.i18nc("@message", "Slicing failed with an unexpected error. Please consider reporting a bug on our issue tracker."), + title = catalog.i18nc("@message:title", "Slicing failed") + ) + self._slicing_error_message.addAction( + action_id = "report_bug", + name = catalog.i18nc("@message:button", "Report a bug"), + description = catalog.i18nc("@message:description", "Report a bug on Ultimaker Cura's issue tracker."), + icon = "[no_icon]" + ) + self._slicing_error_message.actionTriggered.connect(self._reportBackendError) + self._snapshot = None #type: Optional[QImage] application.initializationFinished.connect(self.initialize) @@ -922,9 +934,22 @@ class CuraEngineBackend(QObject, Backend): if not self._restart: if self._process: # type: ignore - Logger.log("d", "Backend quit with return code %s. Resetting process and socket.", self._process.wait()) # type: ignore + return_code = self._process.wait() + if return_code != 0: + Logger.log("e", f"Backend exited abnormally with return code {return_code}!") + self._slicing_error_message.show() + self.setState(BackendState.Error) + self.stopSlicing() + else: + Logger.log("d", "Backend finished slicing. Resetting process and socket.") self._process = None # type: ignore + def _reportBackendError(self, _message_id: str, _action_id: str) -> None: + """ + Triggered when the user wants to report an error in the back-end. + """ + QDesktopServices.openUrl(QUrl("https://github.com/Ultimaker/Cura/issues/new/choose")) + def _onGlobalStackChanged(self) -> None: """Called when the global container stack changes""" diff --git a/plugins/DigitalLibrary/resources/images/projects_not_found.svg b/plugins/DigitalLibrary/resources/images/projects_not_found.svg new file mode 100644 index 0000000000..ba118ebc0a --- /dev/null +++ b/plugins/DigitalLibrary/resources/images/projects_not_found.svg @@ -0,0 +1,52 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/plugins/DigitalLibrary/resources/qml/CreateNewProjectPopup.qml b/plugins/DigitalLibrary/resources/qml/CreateNewProjectPopup.qml index 75fb8d5811..a7297c12fb 100644 --- a/plugins/DigitalLibrary/resources/qml/CreateNewProjectPopup.qml +++ b/plugins/DigitalLibrary/resources/qml/CreateNewProjectPopup.qml @@ -93,7 +93,7 @@ Popup } validator: RegExpValidator { - regExp: /^[^\\\/\*\?\|\[\]]{0,96}$/ + regExp: /^[^\\\/\*\?\|\[\]]{0,99}$/ } text: PrintInformation.jobName @@ -148,7 +148,7 @@ Popup anchors.bottom: parent.bottom anchors.right: parent.right text: "Create" - enabled: newProjectNameTextField.text != "" && !busy + enabled: newProjectNameTextField.text.length >= 2 && !busy onClicked: { diff --git a/plugins/DigitalLibrary/resources/qml/SaveProjectFilesPage.qml b/plugins/DigitalLibrary/resources/qml/SaveProjectFilesPage.qml index 03bd655957..30e3513019 100644 --- a/plugins/DigitalLibrary/resources/qml/SaveProjectFilesPage.qml +++ b/plugins/DigitalLibrary/resources/qml/SaveProjectFilesPage.qml @@ -63,7 +63,7 @@ Item anchors.topMargin: UM.Theme.getSize("thin_margin").height validator: RegExpValidator { - regExp: /^[^\\\/\*\?\|\[\]]{0,96}$/ + regExp: /^[\w\-\. ()]{0,255}$/ } text: PrintInformation.jobName @@ -200,7 +200,7 @@ Item anchors.bottom: parent.bottom anchors.right: parent.right text: "Save" - enabled: (asProjectCheckbox.checked || asSlicedCheckbox.checked) && dfFilenameTextfield.text != "" + enabled: (asProjectCheckbox.checked || asSlicedCheckbox.checked) && dfFilenameTextfield.text.length >= 1 onClicked: { diff --git a/plugins/DigitalLibrary/resources/qml/SelectProjectPage.qml b/plugins/DigitalLibrary/resources/qml/SelectProjectPage.qml index 2de0e78cc7..8b919e299d 100644 --- a/plugins/DigitalLibrary/resources/qml/SelectProjectPage.qml +++ b/plugins/DigitalLibrary/resources/qml/SelectProjectPage.qml @@ -1,10 +1,12 @@ // Copyright (C) 2021 Ultimaker B.V. +// Cura is released under the terms of the LGPLv3 or higher. import QtQuick 2.10 import QtQuick.Window 2.2 import QtQuick.Controls 1.4 as OldControls // TableView doesn't exist in the QtQuick Controls 2.x in 5.10, so use the old one import QtQuick.Controls 2.3 import QtQuick.Controls.Styles 1.4 +import QtQuick.Layouts 1.1 import UM 1.2 as UM import Cura 1.6 as Cura @@ -18,7 +20,7 @@ Item width: parent.width height: parent.height - property alias createNewProjectButtonVisible: createNewProjectButton.visible + property bool createNewProjectButtonVisible: true anchors { @@ -29,31 +31,58 @@ Item margins: UM.Theme.getSize("default_margin").width } - Label + RowLayout { - id: selectProjectLabel + id: headerRow - text: "Select Project" - font: UM.Theme.getFont("medium") - color: UM.Theme.getColor("small_button_text") - anchors.top: parent.top - anchors.left: parent.left - visible: projectListContainer.visible - } - - Cura.SecondaryButton - { - id: createNewProjectButton - - anchors.verticalCenter: selectProjectLabel.verticalCenter - anchors.right: parent.right - text: "New Library project" - - onClicked: + anchors { - createNewProjectPopup.open() + top: parent.top + left: parent.left + right: parent.right + } + height: childrenRect.height + spacing: UM.Theme.getSize("default_margin").width + + Cura.TextField + { + id: searchBar + Layout.fillWidth: true + implicitHeight: createNewProjectButton.height + + onTextEdited: manager.projectFilter = text //Update the search filter when editing this text field. + + leftIcon: UM.Theme.getIcon("Magnifier") + placeholderText: "Search" + } + + Cura.SecondaryButton + { + id: createNewProjectButton + + text: "New Library project" + visible: createNewProjectButtonVisible && manager.userAccountCanCreateNewLibraryProject && (manager.retrievingProjectsStatus == DF.RetrievalStatus.Success || manager.retrievingProjectsStatus == DF.RetrievalStatus.Failed) + + onClicked: + { + createNewProjectPopup.open() + } + busy: manager.creatingNewProjectStatus == DF.RetrievalStatus.InProgress + } + + + Cura.SecondaryButton + { + id: upgradePlanButton + + text: "Upgrade plan" + iconSource: UM.Theme.getIcon("LinkExternal") + visible: createNewProjectButtonVisible && !manager.userAccountCanCreateNewLibraryProject && (manager.retrievingProjectsStatus == DF.RetrievalStatus.Success || manager.retrievingProjectsStatus == DF.RetrievalStatus.Failed) + tooltip: "You have reached the maximum number of projects allowed by your subscription. Please upgrade to the Professional subscription to create more projects." + tooltipWidth: parent.width * 0.5 + + onClicked: Qt.openUrlExternally("https://ultimaker.com/software/ultimaker-essentials/sign-up-cura?utm_source=cura&utm_medium=software&utm_campaign=lib-max") } - busy: manager.creatingNewProjectStatus == DF.RetrievalStatus.InProgress } Item @@ -76,19 +105,18 @@ Item { id: digitalFactoryImage anchors.horizontalCenter: parent.horizontalCenter - source: "../images/digital_factory.svg" + source: searchBar.text === "" ? "../images/digital_factory.svg" : "../images/projects_not_found.svg" fillMode: Image.PreserveAspectFit width: parent.width - 2 * UM.Theme.getSize("thick_margin").width - sourceSize.width: width - sourceSize.height: height } Label { id: noLibraryProjectsLabel anchors.horizontalCenter: parent.horizontalCenter - text: "It appears that you don't have any projects in the Library yet." + text: searchBar.text === "" ? "It appears that you don't have any projects in the Library yet." : "No projects found that match the search query." font: UM.Theme.getFont("medium") + color: UM.Theme.getColor("text") } Cura.TertiaryButton @@ -97,6 +125,7 @@ Item anchors.horizontalCenter: parent.horizontalCenter text: "Visit Digital Library" onClicked: Qt.openUrlExternally(CuraApplication.ultimakerDigitalFactoryUrl + "/app/library") + visible: searchBar.text === "" //Show the link to Digital Library when there are no projects in the user's Library. } } } @@ -106,7 +135,7 @@ Item id: projectListContainer anchors { - top: selectProjectLabel.bottom + top: headerRow.bottom topMargin: UM.Theme.getSize("default_margin").height bottom: parent.bottom left: parent.left diff --git a/plugins/DigitalLibrary/src/DigitalFactoryApiClient.py b/plugins/DigitalLibrary/src/DigitalFactoryApiClient.py index b0e34adaba..ad87ea9b8a 100644 --- a/plugins/DigitalLibrary/src/DigitalFactoryApiClient.py +++ b/plugins/DigitalLibrary/src/DigitalFactoryApiClient.py @@ -22,6 +22,7 @@ from .DFFileUploader import DFFileUploader from .DFLibraryFileUploadRequest import DFLibraryFileUploadRequest from .DFLibraryFileUploadResponse import DFLibraryFileUploadResponse from .DFPrintJobUploadRequest import DFPrintJobUploadRequest +from .DigitalFactoryFeatureBudgetResponse import DigitalFactoryFeatureBudgetResponse from .DigitalFactoryFileResponse import DigitalFactoryFileResponse from .DigitalFactoryProjectResponse import DigitalFactoryProjectResponse from .PaginationLinks import PaginationLinks @@ -54,9 +55,67 @@ class DigitalFactoryApiClient: self._http = HttpRequestManager.getInstance() self._on_error = on_error self._file_uploader = None # type: Optional[DFFileUploader] + self._library_max_private_projects: Optional[int] = None self._projects_pagination_mgr = PaginationManager(limit = projects_limit_per_page) if projects_limit_per_page else None # type: Optional[PaginationManager] + def checkUserHasAccess(self, callback: Callable) -> None: + """Checks if the user has any sort of access to the digital library. + A user is considered to have access if the max-# of private projects is greater then 0 (or -1 for unlimited). + """ + + def callbackWrap(response: Optional[Any] = None, *args, **kwargs) -> None: + if (response is not None and isinstance(response, DigitalFactoryFeatureBudgetResponse) and + response.library_max_private_projects is not None): + callback( + response.library_max_private_projects == -1 or # Note: -1 is unlimited + response.library_max_private_projects > 0) + self._library_max_private_projects = response.library_max_private_projects + else: + Logger.warning(f"Digital Factory: Response is not a feature budget, likely an error: {str(response)}") + callback(False) + + self._http.get(f"{self.CURA_API_ROOT}/feature_budgets", + scope = self._scope, + callback = self._parseCallback(callbackWrap, DigitalFactoryFeatureBudgetResponse, callbackWrap), + error_callback = callbackWrap, + timeout = self.DEFAULT_REQUEST_TIMEOUT) + + def checkUserCanCreateNewLibraryProject(self, callback: Callable) -> None: + """ + Checks if the user is allowed to create new library projects. + A user is allowed to create new library projects if the haven't reached their maximum allowed private projects. + """ + + def callbackWrap(response: Optional[Any] = None, *args, **kwargs) -> None: + if response is not None: + if isinstance(response, DigitalFactoryProjectResponse): # The user has only one private project + callback(True) + elif isinstance(response, list) and all(isinstance(r, DigitalFactoryProjectResponse) for r in response): + callback(len(response) < cast(int, self._library_max_private_projects)) + else: + Logger.warning(f"Digital Factory: Incorrect response type received when requesting private projects: {str(response)}") + callback(False) + else: + Logger.warning(f"Digital Factory: Response is empty, likely an error: {str(response)}") + callback(False) + + if self._library_max_private_projects is not None and self._library_max_private_projects > 0: + # The user has a limit in the number of private projects they can create. Check whether they have already + # reached that limit. + # Note: Set the pagination manager to None when doing this get request, or else the next/previous links + # of the pagination will become corrupted + url = f"{self.CURA_API_ROOT}/projects?shared=false&limit={self._library_max_private_projects}" + self._http.get(url, + scope = self._scope, + callback = self._parseCallback(callbackWrap, DigitalFactoryProjectResponse, callbackWrap, pagination_manager = None), + error_callback = callbackWrap, + timeout = self.DEFAULT_REQUEST_TIMEOUT) + else: + # If the limit is -1, then the user is allowed unlimited projects. If its 0 then they are not allowed to + # create any projects + callback(self._library_max_private_projects == -1) + def getProject(self, library_project_id: str, on_finished: Callable[[DigitalFactoryProjectResponse], Any], failed: Callable) -> None: """ Retrieves a digital factory project by its library project id. @@ -73,7 +132,7 @@ class DigitalFactoryApiClient: error_callback = failed, timeout = self.DEFAULT_REQUEST_TIMEOUT) - def getProjectsFirstPage(self, on_finished: Callable[[List[DigitalFactoryProjectResponse]], Any], failed: Callable) -> None: + def getProjectsFirstPage(self, search_filter: str, on_finished: Callable[[List[DigitalFactoryProjectResponse]], Any], failed: Callable) -> None: """ Retrieves digital factory projects for the user that is currently logged in. @@ -81,13 +140,18 @@ class DigitalFactoryApiClient: according to the limit set in the pagination manager. If there is no projects pagination manager, this function leaves the project limit to the default set on the server side (999999). + :param search_filter: Text to filter the search results. If given an empty string, results are not filtered. :param on_finished: The function to be called after the result is parsed. :param failed: The function to be called if the request fails. """ - url = "{}/projects".format(self.CURA_API_ROOT) + url = f"{self.CURA_API_ROOT}/projects" + query_character = "?" if self._projects_pagination_mgr: self._projects_pagination_mgr.reset() # reset to clear all the links and response metadata - url += "?limit={}".format(self._projects_pagination_mgr.limit) + url += f"{query_character}limit={self._projects_pagination_mgr.limit}" + query_character = "&" + if search_filter != "": + url += f"{query_character}search={search_filter}" self._http.get(url, scope = self._scope, @@ -301,12 +365,10 @@ class DigitalFactoryApiClient: :param on_finished: The function to be called after the result is parsed. :param on_error: The function to be called if anything goes wrong. """ - - display_name = re.sub(r"[^a-zA-Z0-9- ./™®ö+']", " ", project_name) - Logger.log("i", "Attempt to create new DF project '{}'.".format(display_name)) + Logger.log("i", "Attempt to create new DF project '{}'.".format(project_name)) url = "{}/projects".format(self.CURA_API_ROOT) - data = json.dumps({"data": {"display_name": display_name}}).encode() + data = json.dumps({"data": {"display_name": project_name}}).encode() self._http.put(url, scope = self._scope, data = data, diff --git a/plugins/DigitalLibrary/src/DigitalFactoryController.py b/plugins/DigitalLibrary/src/DigitalFactoryController.py index 352a8c70f2..cd0f0be638 100644 --- a/plugins/DigitalLibrary/src/DigitalFactoryController.py +++ b/plugins/DigitalLibrary/src/DigitalFactoryController.py @@ -1,4 +1,6 @@ # Copyright (c) 2021 Ultimaker B.V. +# Cura is released under the terms of the LGPLv3 or higher. + import json import math import os @@ -8,7 +10,7 @@ from enum import IntEnum from pathlib import Path from typing import Optional, List, Dict, Any, cast -from PyQt5.QtCore import pyqtSignal, QObject, pyqtSlot, pyqtProperty, Q_ENUMS, QUrl +from PyQt5.QtCore import pyqtSignal, QObject, pyqtSlot, pyqtProperty, Q_ENUMS, QTimer, QUrl from PyQt5.QtNetwork import QNetworkReply from PyQt5.QtQml import qmlRegisterType, qmlRegisterUncreatableType @@ -89,6 +91,12 @@ class DigitalFactoryController(QObject): uploadFileError = Signal() uploadFileFinished = Signal() + """Signal to inform about the state of user access.""" + userAccessStateChanged = pyqtSignal(bool) + + """Signal to inform whether the user is allowed to create more Library projects.""" + userCanCreateNewLibraryProjectChanged = pyqtSignal(bool) + def __init__(self, application: CuraApplication) -> None: super().__init__(parent = None) @@ -106,12 +114,18 @@ class DigitalFactoryController(QObject): self._has_more_projects_to_load = False self._account = self._application.getInstance().getCuraAPI().account # type: Account + self._account.loginStateChanged.connect(self._onLoginStateChanged) self._current_workspace_information = CuraApplication.getInstance().getCurrentWorkspaceInformation() # Initialize the project model self._project_model = DigitalFactoryProjectModel() self._selected_project_idx = -1 self._project_creation_error_text = "Something went wrong while creating a new project. Please try again." + self._project_filter = "" + self._project_filter_change_timer = QTimer() + self._project_filter_change_timer.setInterval(200) + self._project_filter_change_timer.setSingleShot(True) + self._project_filter_change_timer.timeout.connect(self._applyProjectFilter) # Initialize the file model self._file_model = DigitalFactoryFileModel() @@ -131,6 +145,9 @@ class DigitalFactoryController(QObject): self._application.engineCreatedSignal.connect(self._onEngineCreated) self._application.initializationFinished.connect(self._applicationInitializationFinished) + self._user_has_access = False + self._user_account_can_create_new_project = False + def clear(self) -> None: self._project_model.clearProjects() self._api.clear() @@ -143,16 +160,22 @@ class DigitalFactoryController(QObject): self.setSelectedProjectIndex(-1) + def _onLoginStateChanged(self, logged_in: bool) -> None: + def callback(has_access, **kwargs): + self._user_has_access = has_access + self.userAccessStateChanged.emit(logged_in) + + self._api.checkUserHasAccess(callback) + def userAccountHasLibraryAccess(self) -> bool: """ Checks whether the currently logged in user account has access to the Digital Library :return: True if the user account has Digital Library access, else False """ - subscriptions = [] # type: List[Dict[str, Any]] - if self._account.userProfile: - subscriptions = self._account.userProfile.get("subscriptions", []) - return len(subscriptions) > 0 + if self._user_has_access: + self._api.checkUserCanCreateNewLibraryProject(callback = self.setCanCreateNewLibraryProject) + return self._user_has_access def initialize(self, preselected_project_id: Optional[str] = None) -> None: self.clear() @@ -162,7 +185,7 @@ class DigitalFactoryController(QObject): if preselected_project_id: self._api.getProject(preselected_project_id, on_finished = self.setProjectAsPreselected, failed = self._onGetProjectFailed) else: - self._api.getProjectsFirstPage(on_finished = self._onGetProjectsFirstPageFinished, failed = self._onGetProjectsFailed) + self._api.getProjectsFirstPage(search_filter = self._project_filter, on_finished = self._onGetProjectsFirstPageFinished, failed = self._onGetProjectsFailed) def setProjectAsPreselected(self, df_project: DigitalFactoryProjectResponse) -> None: """ @@ -288,6 +311,38 @@ class DigitalFactoryController(QObject): self._selected_file_indices = file_indices self.selectedFileIndicesChanged.emit(file_indices) + def setProjectFilter(self, new_filter: str) -> None: + """ + Called when the user wants to change the search filter for projects. + + The filter is not immediately applied. There is some delay to allow the user to finish typing. + :param new_filter: The new filter that the user wants to apply. + """ + self._project_filter = new_filter + self._project_filter_change_timer.start() + + """ + Signal to notify Qt that the applied filter has changed. + """ + projectFilterChanged = pyqtSignal() + + @pyqtProperty(str, notify = projectFilterChanged, fset = setProjectFilter) + def projectFilter(self) -> str: + """ + The current search filter being applied to the project list. + :return: The current search filter being applied to the project list. + """ + return self._project_filter + + def _applyProjectFilter(self) -> None: + """ + Actually apply the current filter to search for projects with the user-defined search string. + :return: + """ + self.clear() + self.projectFilterChanged.emit() + self._api.getProjectsFirstPage(search_filter = self._project_filter, on_finished = self._onGetProjectsFirstPageFinished, failed = self._onGetProjectsFailed) + @pyqtProperty(QObject, constant = True) def digitalFactoryProjectModel(self) -> "DigitalFactoryProjectModel": return self._project_model @@ -502,7 +557,8 @@ class DigitalFactoryController(QObject): # false, we also need to clean it from the projects model self._project_model.clearProjects() self.setSelectedProjectIndex(-1) - self._api.getProjectsFirstPage(on_finished = self._onGetProjectsFirstPageFinished, failed = self._onGetProjectsFailed) + self._api.getProjectsFirstPage(search_filter = self._project_filter, on_finished = self._onGetProjectsFirstPageFinished, failed = self._onGetProjectsFailed) + self._api.checkUserCanCreateNewLibraryProject(callback = self.setCanCreateNewLibraryProject) self.setRetrievingProjectsStatus(RetrievalStatus.InProgress) self._has_preselected_project = new_has_preselected_project self.preselectedProjectChanged.emit() @@ -511,6 +567,14 @@ class DigitalFactoryController(QObject): def hasPreselectedProject(self) -> bool: return self._has_preselected_project + def setCanCreateNewLibraryProject(self, can_create_new_library_project: bool) -> None: + self._user_account_can_create_new_project = can_create_new_library_project + self.userCanCreateNewLibraryProjectChanged.emit(self._user_account_can_create_new_project) + + @pyqtProperty(bool, fset = setCanCreateNewLibraryProject, notify = userCanCreateNewLibraryProjectChanged) + def userAccountCanCreateNewLibraryProject(self) -> bool: + return self._user_account_can_create_new_project + @pyqtSlot(str, "QStringList") def saveFileToSelectedProject(self, filename: str, formats: List[str]) -> None: """ diff --git a/plugins/DigitalLibrary/src/DigitalFactoryFeatureBudgetResponse.py b/plugins/DigitalLibrary/src/DigitalFactoryFeatureBudgetResponse.py new file mode 100644 index 0000000000..192f58685a --- /dev/null +++ b/plugins/DigitalLibrary/src/DigitalFactoryFeatureBudgetResponse.py @@ -0,0 +1,43 @@ +# Copyright (c) 2021 Ultimaker B.V. +# Cura is released under the terms of the LGPLv3 or higher. + +from .BaseModel import BaseModel +from typing import Optional + + +class DigitalFactoryFeatureBudgetResponse(BaseModel): + """Class representing the capabilities of a user account for Digital Library. + NOTE: For each max_..._projects fields, '-1' means unlimited! + """ + + def __init__(self, + library_can_use_business_value: Optional[bool] = False, + library_can_use_comments: Optional[bool] = False, + library_can_use_status: Optional[bool] = False, + library_can_use_tags: Optional[bool] = False, + library_can_use_technical_requirements: Optional[bool] = False, + library_max_organization_shared_projects: Optional[int] = None, # -1 means unlimited + library_max_private_projects: Optional[int] = None, # -1 means unlimited + library_max_team_shared_projects: Optional[int] = None, # -1 means unlimited + **kwargs) -> None: + + self.library_can_use_business_value = library_can_use_business_value + self.library_can_use_comments = library_can_use_comments + self.library_can_use_status = library_can_use_status + self.library_can_use_tags = library_can_use_tags + self.library_can_use_technical_requirements = library_can_use_technical_requirements + self.library_max_organization_shared_projects = library_max_organization_shared_projects # -1 means unlimited + self.library_max_private_projects = library_max_private_projects # -1 means unlimited + self.library_max_team_shared_projects = library_max_team_shared_projects # -1 means unlimited + super().__init__(**kwargs) + + def __repr__(self) -> str: + return "max private: {}, max org: {}, max team: {}".format( + self.library_max_private_projects, + self.library_max_organization_shared_projects, + self.library_max_team_shared_projects) + + # Validates the model, raising an exception if the model is invalid. + def validate(self) -> None: + super().validate() + # No validation for now, as the response can be "data: []", which should be interpreted as all False and 0's diff --git a/plugins/DigitalLibrary/src/DigitalFactoryFileProvider.py b/plugins/DigitalLibrary/src/DigitalFactoryFileProvider.py index 7a544afaa1..65a727e21a 100644 --- a/plugins/DigitalLibrary/src/DigitalFactoryFileProvider.py +++ b/plugins/DigitalLibrary/src/DigitalFactoryFileProvider.py @@ -22,7 +22,7 @@ class DigitalFactoryFileProvider(FileProvider): self._dialog = None self._account = CuraApplication.getInstance().getCuraAPI().account # type: Account - self._account.loginStateChanged.connect(self._onLoginStateChanged) + self._controller.userAccessStateChanged.connect(self._onUserAccessStateChanged) self.enabled = self._account.isLoggedIn and self._controller.userAccountHasLibraryAccess() self.priority = 10 @@ -53,7 +53,7 @@ class DigitalFactoryFileProvider(FileProvider): if not self._dialog: Logger.log("e", "Unable to create the Digital Library Open dialog.") - def _onLoginStateChanged(self, logged_in: bool) -> None: + def _onUserAccessStateChanged(self, logged_in: bool) -> None: """ Sets the enabled status of the DigitalFactoryFileProvider according to the account's login status :param logged_in: The new login status diff --git a/plugins/DigitalLibrary/src/DigitalFactoryOutputDevice.py b/plugins/DigitalLibrary/src/DigitalFactoryOutputDevice.py index 202223f9b4..70e3ac34f2 100644 --- a/plugins/DigitalLibrary/src/DigitalFactoryOutputDevice.py +++ b/plugins/DigitalLibrary/src/DigitalFactoryOutputDevice.py @@ -45,7 +45,7 @@ class DigitalFactoryOutputDevice(ProjectOutputDevice): self._writing = False self._account = CuraApplication.getInstance().getCuraAPI().account # type: Account - self._account.loginStateChanged.connect(self._onLoginStateChanged) + self._controller.userAccessStateChanged.connect(self._onUserAccessStateChanged) self.enabled = self._account.isLoggedIn and self._controller.userAccountHasLibraryAccess() self._current_workspace_information = CuraApplication.getInstance().getCurrentWorkspaceInformation() @@ -97,7 +97,7 @@ class DigitalFactoryOutputDevice(ProjectOutputDevice): if not self._dialog: Logger.log("e", "Unable to create the Digital Library Save dialog.") - def _onLoginStateChanged(self, logged_in: bool) -> None: + def _onUserAccessStateChanged(self, logged_in: bool) -> None: """ Sets the enabled status of the DigitalFactoryOutputDevice according to the account's login status :param logged_in: The new login status diff --git a/plugins/DigitalLibrary/tests/TestDigitalLibraryApiClient.py b/plugins/DigitalLibrary/tests/TestDigitalLibraryApiClient.py index ba0a0b15b4..9751838ddf 100644 --- a/plugins/DigitalLibrary/tests/TestDigitalLibraryApiClient.py +++ b/plugins/DigitalLibrary/tests/TestDigitalLibraryApiClient.py @@ -1,3 +1,6 @@ +# Copyright (c) 2021 Ultimaker B.V. +# Cura is released under the terms of the LGPLv3 or higher. + from unittest.mock import MagicMock import pytest @@ -37,7 +40,7 @@ def test_getProjectsFirstPage(api_client): failed_callback = MagicMock() # Call - api_client.getProjectsFirstPage(on_finished = finished_callback, failed = failed_callback) + api_client.getProjectsFirstPage(search_filter = "filter", on_finished = finished_callback, failed = failed_callback) # Asserts pagination_manager.reset.assert_called_once() # Should be called since we asked for new set of projects @@ -45,16 +48,16 @@ def test_getProjectsFirstPage(api_client): args = http_manager.get.call_args_list[0] # Ensure that it's called with the right limit - assert args[0][0] == "https://api.ultimaker.com/cura/v1/projects?limit=20" + assert args[0][0] == "https://api.ultimaker.com/cura/v1/projects?limit=20&search=filter" # Change the limit & try again http_manager.get.reset_mock() pagination_manager.limit = 80 - api_client.getProjectsFirstPage(on_finished = finished_callback, failed = failed_callback) + api_client.getProjectsFirstPage(search_filter = "filter", on_finished = finished_callback, failed = failed_callback) args = http_manager.get.call_args_list[0] # Ensure that it's called with the right limit - assert args[0][0] == "https://api.ultimaker.com/cura/v1/projects?limit=80" + assert args[0][0] == "https://api.ultimaker.com/cura/v1/projects?limit=80&search=filter" def test_getMoreProjects_noNewProjects(api_client): diff --git a/plugins/MonitorStage/MonitorMain.qml b/plugins/MonitorStage/MonitorMain.qml index d5fdb66c89..cb16b91cb8 100644 --- a/plugins/MonitorStage/MonitorMain.qml +++ b/plugins/MonitorStage/MonitorMain.qml @@ -137,7 +137,7 @@ Rectangle id: externalLinkIcon anchors.verticalCenter: parent.verticalCenter color: UM.Theme.getColor("text_link") - source: UM.Theme.getIcon("external_link") + source: UM.Theme.getIcon("LinkExternal") width: UM.Theme.getSize("monitor_external_link_icon").width height: UM.Theme.getSize("monitor_external_link_icon").height } diff --git a/plugins/PerObjectSettingsTool/PerObjectCategory.qml b/plugins/PerObjectSettingsTool/PerObjectCategory.qml index 4ca12f657e..58192f0acd 100644 --- a/plugins/PerObjectSettingsTool/PerObjectCategory.qml +++ b/plugins/PerObjectSettingsTool/PerObjectCategory.qml @@ -24,7 +24,7 @@ Button { anchors.verticalCenter: parent.verticalCenter height: (label.height / 2) | 0 width: height - source: control.checked ? UM.Theme.getIcon("arrow_bottom") : UM.Theme.getIcon("arrow_right"); + source: control.checked ? UM.Theme.getIcon("ChevronSingleDown") : UM.Theme.getIcon("ChevronSingleRight"); color: control.hovered ? palette.highlight : palette.buttonText } UM.RecolorImage diff --git a/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml b/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml index 7ab4bdb1a1..e96337e6bb 100644 --- a/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml +++ b/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml @@ -80,7 +80,7 @@ Item { id: normalButton text: catalog.i18nc("@label", "Normal model") - iconSource: UM.Theme.getIcon("pos_normal"); + iconSource: UM.Theme.getIcon("Infill0"); property bool needBorder: true checkable: true onClicked: setMeshType(normalMeshType); @@ -92,7 +92,7 @@ Item { id: supportMeshButton text: catalog.i18nc("@label", "Print as support") - iconSource: UM.Theme.getIcon("pos_print_as_support"); + iconSource: UM.Theme.getIcon("MeshTypeSupport"); property bool needBorder: true checkable:true onClicked: setMeshType(supportMeshType) @@ -104,7 +104,7 @@ Item { id: overlapMeshButton text: catalog.i18nc("@label", "Modify settings for overlaps") - iconSource: UM.Theme.getIcon("pos_modify_overlaps"); + iconSource: UM.Theme.getIcon("MeshTypeIntersect"); property bool needBorder: true checkable:true onClicked: setMeshType(infillMeshType) @@ -116,7 +116,7 @@ Item { id: antiOverhangMeshButton text: catalog.i18nc("@label", "Don't support overlaps") - iconSource: UM.Theme.getIcon("pos_modify_dont_support_overlap"); + iconSource: UM.Theme.getIcon("BlockSupportOverlaps"); property bool needBorder: true checkable: true onClicked: setMeshType(antiOverhangMeshType) @@ -306,7 +306,7 @@ Item height: width sourceSize.height: width color: control.hovered ? UM.Theme.getColor("setting_control_button_hover") : UM.Theme.getColor("setting_control_button") - source: UM.Theme.getIcon("minus") + source: UM.Theme.getIcon("Minus") } } } diff --git a/plugins/PerObjectSettingsTool/PerObjectSettingsTool.py b/plugins/PerObjectSettingsTool/PerObjectSettingsTool.py index ab2bcaad5b..e80acc8d94 100644 --- a/plugins/PerObjectSettingsTool/PerObjectSettingsTool.py +++ b/plugins/PerObjectSettingsTool/PerObjectSettingsTool.py @@ -1,4 +1,4 @@ -# Copyright (c) 2020 Ultimaker B.V. +# Copyright (c) 2021 Ultimaker B.V. # Cura is released under the terms of the LGPLv3 or higher. from UM.Logger import Logger @@ -103,20 +103,27 @@ class PerObjectSettingsTool(Tool): new_instance.resetState() # Ensure that the state is not seen as a user state. settings.addInstance(new_instance) - for property_key in ["top_bottom_thickness", "wall_thickness", "wall_line_count"]: + # Override some settings to ensure that the infill mesh by default adds no skin or walls. Or remove them if not an infill mesh. + specialized_settings = { + "top_bottom_thickness": 0, + "top_thickness": "=top_bottom_thickness", + "bottom_thickness": "=top_bottom_thickness", + "top_layers": "=0 if infill_sparse_density == 100 else math.ceil(round(top_thickness / resolveOrValue('layer_height'), 4))", + "bottom_layers": "=0 if infill_sparse_density == 100 else math.ceil(round(bottom_thickness / resolveOrValue('layer_height'), 4))", + "wall_thickness": 0, + "wall_line_count": "=max(1, round((wall_thickness - wall_line_width_0) / wall_line_width_x) + 1) if wall_thickness != 0 else 0" + } + for property_key in specialized_settings: if mesh_type == "infill_mesh": if settings.getInstance(property_key) is None: definition = stack.getSettingDefinition(property_key) new_instance = SettingInstance(definition, settings) - # We just want the wall_line count to be there in case it was overriden in the global stack. - # as such, we don't need to set a value. - if property_key != "wall_line_count": - new_instance.setProperty("value", 0) + new_instance.setProperty("value", specialized_settings[property_key]) new_instance.resetState() # Ensure that the state is not seen as a user state. settings.addInstance(new_instance) settings_visibility_changed = True - elif old_mesh_type == "infill_mesh" and settings.getInstance(property_key) and (settings.getProperty(property_key, "value") == 0 or property_key == "wall_line_count"): + elif old_mesh_type == "infill_mesh" and settings.getInstance(property_key) and property_key in specialized_settings: settings.removeInstance(property_key) settings_visibility_changed = True diff --git a/plugins/PerObjectSettingsTool/__init__.py b/plugins/PerObjectSettingsTool/__init__.py index acfc35815e..d3c6d236ef 100644 --- a/plugins/PerObjectSettingsTool/__init__.py +++ b/plugins/PerObjectSettingsTool/__init__.py @@ -13,7 +13,7 @@ def getMetaData(): "tool": { "name": i18n_catalog.i18nc("@label", "Per Model Settings"), "description": i18n_catalog.i18nc("@info:tooltip", "Configure Per Model Settings"), - "icon": "tool_icon.svg", + "icon": "MeshType", "tool_panel": "PerObjectSettingsPanel.qml", "weight": 3 }, diff --git a/plugins/PerObjectSettingsTool/tool_icon.svg b/plugins/PerObjectSettingsTool/tool_icon.svg deleted file mode 100644 index 41e49cae07..0000000000 --- a/plugins/PerObjectSettingsTool/tool_icon.svg +++ /dev/null @@ -1,22 +0,0 @@ - - - - per_model_settings - Created with Sketch. - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/plugins/PostProcessingPlugin/PostProcessingPlugin.qml b/plugins/PostProcessingPlugin/PostProcessingPlugin.qml index 2b3a141aa0..7397ec8196 100644 --- a/plugins/PostProcessingPlugin/PostProcessingPlugin.qml +++ b/plugins/PostProcessingPlugin/PostProcessingPlugin.qml @@ -154,7 +154,7 @@ UM.Dialog height: Math.round(control.height / 2.7) sourceSize.height: width color: palette.text - source: UM.Theme.getIcon("cross1") + source: UM.Theme.getIcon("Cancel") } } } @@ -188,7 +188,7 @@ UM.Dialog height: Math.round(control.height / 2.5) sourceSize.height: width color: control.enabled ? palette.text : disabledPalette.text - source: UM.Theme.getIcon("arrow_bottom") + source: UM.Theme.getIcon("ChevronSingleDown") } } } @@ -222,7 +222,7 @@ UM.Dialog height: Math.round(control.height / 2.5) sourceSize.height: width color: control.enabled ? palette.text : disabledPalette.text - source: UM.Theme.getIcon("arrow_top") + source: UM.Theme.getIcon("ChevronSingleUp") } } } @@ -517,7 +517,7 @@ UM.Dialog } toolTipContentAlignment: Cura.ToolTip.ContentAlignment.AlignLeft onClicked: dialog.show() - iconSource: "postprocessing.svg" + iconSource: "Script.svg" fixedWidthMode: false } @@ -536,4 +536,4 @@ UM.Dialog labelText: activeScriptsList.count } } -} \ No newline at end of file +} diff --git a/plugins/PostProcessingPlugin/Script.svg b/plugins/PostProcessingPlugin/Script.svg new file mode 100755 index 0000000000..33042b4124 --- /dev/null +++ b/plugins/PostProcessingPlugin/Script.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/plugins/PostProcessingPlugin/postprocessing.svg b/plugins/PostProcessingPlugin/postprocessing.svg deleted file mode 100644 index f55face4a9..0000000000 --- a/plugins/PostProcessingPlugin/postprocessing.svg +++ /dev/null @@ -1,47 +0,0 @@ - - - -image/svg+xml \ No newline at end of file diff --git a/plugins/PostProcessingPlugin/scripts/PauseAtHeight.py b/plugins/PostProcessingPlugin/scripts/PauseAtHeight.py index a9e570e0cb..5c28073fb1 100644 --- a/plugins/PostProcessingPlugin/scripts/PauseAtHeight.py +++ b/plugins/PostProcessingPlugin/scripts/PauseAtHeight.py @@ -1,4 +1,4 @@ -# Copyright (c) 2020 Ultimaker B.V. +# Copyright (c) 2021 Ultimaker B.V. # Cura is released under the terms of the LGPLv3 or higher. from ..Script import Script @@ -517,8 +517,13 @@ class PauseAtHeight(Script): prepend_gcode += self.putValue(M = extrusion_mode_numeric) + " ; switch back to " + extrusion_mode_string + " E values\n" - # reset extrude value to pre pause value - prepend_gcode += self.putValue(G = 92, E = current_e) + "\n" + # reset extrude value to pre pause value + prepend_gcode += self.putValue(G = 92, E = current_e) + "\n" + + elif redo_layer: + # All other options reset the E value to what it was before the pause because E things were added. + # If it's not yet reset, it still needs to be reset if there were any redo layers. + prepend_gcode += self.putValue(G = 92, E = current_e) + "\n" layer = prepend_gcode + layer diff --git a/plugins/PrepareStage/PrepareMenu.qml b/plugins/PrepareStage/PrepareMenu.qml index 87d7c5f35c..cf7665bda6 100644 --- a/plugins/PrepareStage/PrepareMenu.qml +++ b/plugins/PrepareStage/PrepareMenu.qml @@ -1,19 +1,20 @@ -// Copyright (c) 2018 Ultimaker B.V. +// Copyright (c) 2021 Ultimaker B.V. // Cura is released under the terms of the LGPLv3 or higher. -import QtQuick 2.7 +import QtQuick 2.9 import QtQuick.Layouts 1.1 import QtQuick.Controls 2.3 import UM 1.3 as UM import Cura 1.1 as Cura -import QtGraphicalEffects 1.0 // For the dropshadow Item { id: prepareMenu + property var fileProviderModel: CuraApplication.getFileProviderModel() + UM.I18nCatalog { id: catalog @@ -24,60 +25,44 @@ Item { left: parent.left right: parent.right - leftMargin: UM.Theme.getSize("wide_margin").width - rightMargin: UM.Theme.getSize("wide_margin").width + leftMargin: UM.Theme.getSize("wide_margin").width * 2 + rightMargin: UM.Theme.getSize("wide_margin").width * 2 } // Item to ensure that all of the buttons are nicely centered. Item { - anchors.horizontalCenter: parent.horizontalCenter - width: parent.width - 2 * UM.Theme.getSize("wide_margin").width - height: parent.height + anchors.fill: parent RowLayout { id: itemRow - anchors.left: openFileButton.right + anchors.left: parent.left anchors.right: parent.right - anchors.leftMargin: UM.Theme.getSize("default_margin").width + anchors.leftMargin: UM.Theme.getSize("default_margin").width + openFileButton.width + openFileMenu.width + property int machineSelectorWidth: Math.round((width - printSetupSelectorItem.width) / 3) height: parent.height - spacing: 0 + // This is a trick to make sure that the borders of the two adjacent buttons' borders overlap. Otherwise + // there will be double border (one from each button) + spacing: -UM.Theme.getSize("default_lining").width Cura.MachineSelector { id: machineSelection headerCornerSide: Cura.RoundedRectangle.Direction.Left - Layout.minimumWidth: UM.Theme.getSize("machine_selector_widget").width - Layout.maximumWidth: UM.Theme.getSize("machine_selector_widget").width + Layout.preferredWidth: parent.machineSelectorWidth Layout.fillWidth: true Layout.fillHeight: true } - // Separator line - Rectangle - { - height: parent.height - width: UM.Theme.getSize("default_lining").width - color: UM.Theme.getColor("lining") - } - Cura.ConfigurationMenu { id: printerSetup Layout.fillHeight: true Layout.fillWidth: true - Layout.preferredWidth: itemRow.width - machineSelection.width - printSetupSelectorItem.width - 2 * UM.Theme.getSize("default_lining").width - } - - // Separator line - Rectangle - { - height: parent.height - width: UM.Theme.getSize("default_lining").width - color: UM.Theme.getColor("lining") + Layout.preferredWidth: parent.machineSelectorWidth * 2 } Item @@ -91,22 +76,116 @@ Item } } + //Pop-up shown when there are multiple items to select from. + Cura.ExpandablePopup + { + id: openFileMenu + visible: prepareMenu.fileProviderModel.count > 1 + + contentAlignment: Cura.ExpandablePopup.ContentAlignment.AlignLeft + headerCornerSide: Cura.RoundedRectangle.Direction.All + headerPadding: Math.round((parent.height - UM.Theme.getSize("button_icon").height) / 2) + contentPadding: UM.Theme.getSize("default_lining").width + enabled: visible + + height: parent.height + width: visible ? (headerPadding * 3 + UM.Theme.getSize("button_icon").height + iconSize) : 0 + + headerItem: UM.RecolorImage + { + id: menuIcon + source: UM.Theme.getIcon("Folder", "medium") + color: UM.Theme.getColor("icon") + + sourceSize.height: height + } + + contentItem: Item + { + id: popup + + Column + { + id: openProviderColumn + + //The column doesn't automatically listen to its children rect if the children change internally, so we need to explicitly update the size. + onChildrenRectChanged: + { + popup.height = childrenRect.height + popup.width = childrenRect.width + } + onPositioningComplete: + { + popup.height = childrenRect.height + popup.width = childrenRect.width + } + + Repeater + { + model: prepareMenu.fileProviderModel + delegate: Button + { + leftPadding: UM.Theme.getSize("default_margin").width + rightPadding: UM.Theme.getSize("default_margin").width + width: contentItem.width + leftPadding + rightPadding + height: UM.Theme.getSize("action_button").height + hoverEnabled: true + + contentItem: Label + { + text: model.displayText + color: UM.Theme.getColor("text") + font: UM.Theme.getFont("medium") + renderType: Text.NativeRendering + verticalAlignment: Text.AlignVCenter + + width: contentWidth + height: parent.height + } + + onClicked: + { + if(model.index == 0) //The 0th element is the "From Disk" option, which should activate the open local file dialog. + { + Cura.Actions.open.trigger(); + } + else + { + prepareMenu.fileProviderModel.trigger(model.name); + } + } + + background: Rectangle + { + color: parent.hovered ? UM.Theme.getColor("action_button_hovered") : "transparent" + radius: UM.Theme.getSize("action_button_radius").width + width: popup.width + } + } + } + } + } + } + + //If there is just a single item, show a button instead that directly chooses the one option. Button { id: openFileButton - height: UM.Theme.getSize("stage_menu").height - width: UM.Theme.getSize("stage_menu").height + visible: prepareMenu.fileProviderModel.count <= 1 + + height: parent.height + width: visible ? height : 0 //Square button (and don't take up space if invisible). onClicked: Cura.Actions.open.trigger() + enabled: visible && prepareMenu.fileProviderModel.count > 0 hoverEnabled: true contentItem: Item { - anchors.fill: parent UM.RecolorImage { id: buttonIcon + source: UM.Theme.getIcon("Folder", "medium") anchors.centerIn: parent - source: UM.Theme.getIcon("load") width: UM.Theme.getSize("button_icon").width height: UM.Theme.getSize("button_icon").height color: UM.Theme.getColor("icon") @@ -118,26 +197,14 @@ Item background: Rectangle { id: background - height: UM.Theme.getSize("stage_menu").height - width: UM.Theme.getSize("stage_menu").height + height: parent.height + width: parent.width + border.color: UM.Theme.getColor("lining") + border.width: UM.Theme.getSize("default_lining").width radius: UM.Theme.getSize("default_radius").width color: openFileButton.hovered ? UM.Theme.getColor("action_button_hovered") : UM.Theme.getColor("action_button") } - - DropShadow - { - id: shadow - // Don't blur the shadow - radius: 0 - anchors.fill: background - source: background - verticalOffset: 2 - visible: true - color: UM.Theme.getColor("action_button_shadow") - // Should always be drawn behind the background. - z: background.z - 1 - } } } } diff --git a/plugins/PreviewStage/PreviewMenu.qml b/plugins/PreviewStage/PreviewMenu.qml index ff1ccff75f..9e039896c6 100644 --- a/plugins/PreviewStage/PreviewMenu.qml +++ b/plugins/PreviewStage/PreviewMenu.qml @@ -24,54 +24,36 @@ Item { left: parent.left right: parent.right - leftMargin: UM.Theme.getSize("wide_margin").width - rightMargin: UM.Theme.getSize("wide_margin").width + leftMargin: UM.Theme.getSize("wide_margin").width * 2 + rightMargin: UM.Theme.getSize("wide_margin").width * 2 } Row { id: stageMenuRow - anchors.horizontalCenter: parent.horizontalCenter - width: parent.width - 2 * UM.Theme.getSize("wide_margin").width - height: parent.height + anchors.fill: parent + // This is a trick to make sure that the borders of the two adjacent buttons' borders overlap. Otherwise + // there will be double border (one from each button) + spacing: -UM.Theme.getSize("default_lining").width Cura.ViewsSelector { id: viewsSelector height: parent.height - width: UM.Theme.getSize("views_selector").width + width: Math.max(Math.round((parent.width - printSetupSelectorItem.width) / 3), UM.Theme.getSize("views_selector").width) headerCornerSide: Cura.RoundedRectangle.Direction.Left } - // Separator line - Rectangle - { - height: parent.height - // If there is no viewPanel, we only need a single spacer, so hide this one. - visible: viewPanel.source != "" - width: visible ? UM.Theme.getSize("default_lining").width : 0 - - color: UM.Theme.getColor("lining") - } - // This component will grow freely up to complete the width of the row. Loader { id: viewPanel height: parent.height - width: source != "" ? (previewMenu.width - viewsSelector.width - printSetupSelectorItem.width - 2 * (UM.Theme.getSize("wide_margin").width + UM.Theme.getSize("default_lining").width)) : 0 + width: source != "" ? (parent.width - viewsSelector.width - printSetupSelectorItem.width) : 0 source: UM.Controller.activeView != null && UM.Controller.activeView.stageMenuComponent != null ? UM.Controller.activeView.stageMenuComponent : "" } - // Separator line - Rectangle - { - height: parent.height - width: UM.Theme.getSize("default_lining").width - color: UM.Theme.getColor("lining") - } - Item { id: printSetupSelectorItem diff --git a/plugins/SimulationView/SimulationViewMainComponent.qml b/plugins/SimulationView/SimulationViewMainComponent.qml index 00497a57c8..9232516673 100644 --- a/plugins/SimulationView/SimulationViewMainComponent.qml +++ b/plugins/SimulationView/SimulationViewMainComponent.qml @@ -78,7 +78,7 @@ Item UM.SimpleButton { id: playButton - iconSource: !isSimulationPlaying ? "./resources/simulation_resume.svg": "./resources/simulation_pause.svg" + iconSource: !isSimulationPlaying ? "./resources/Play.svg": "./resources/Pause.svg" width: UM.Theme.getSize("small_button").width height: UM.Theme.getSize("small_button").height hoverColor: UM.Theme.getColor("slider_handle_active") @@ -241,4 +241,4 @@ Item layerSlider.setUpperValue(UM.SimulationView.currentLayer) } } -} \ No newline at end of file +} diff --git a/plugins/SimulationView/SimulationViewMenuComponent.qml b/plugins/SimulationView/SimulationViewMenuComponent.qml index a9108c9d42..6dde44c8ae 100644 --- a/plugins/SimulationView/SimulationViewMenuComponent.qml +++ b/plugins/SimulationView/SimulationViewMenuComponent.qml @@ -203,16 +203,16 @@ Cura.ExpandableComponent style: UM.Theme.styles.checkbox - - UM.RecolorImage + Rectangle { id: swatch anchors.verticalCenter: parent.verticalCenter anchors.right: extrudersModelCheckBox.right width: UM.Theme.getSize("layerview_legend_size").width height: UM.Theme.getSize("layerview_legend_size").height - source: UM.Theme.getIcon("extruder_button") color: model.color + border.width: UM.Theme.getSize("default_lining").width + border.color: UM.Theme.getColor("lining") } Label diff --git a/plugins/SimulationView/resources/Pause.svg b/plugins/SimulationView/resources/Pause.svg new file mode 100755 index 0000000000..6bc491e387 --- /dev/null +++ b/plugins/SimulationView/resources/Pause.svg @@ -0,0 +1,4 @@ + + + + diff --git a/plugins/SimulationView/resources/Play.svg b/plugins/SimulationView/resources/Play.svg new file mode 100755 index 0000000000..1b2510513d --- /dev/null +++ b/plugins/SimulationView/resources/Play.svg @@ -0,0 +1,5 @@ + + + + diff --git a/plugins/SimulationView/resources/simulation_pause.svg b/plugins/SimulationView/resources/simulation_pause.svg deleted file mode 100644 index 652434bd44..0000000000 --- a/plugins/SimulationView/resources/simulation_pause.svg +++ /dev/null @@ -1,79 +0,0 @@ - - - - - - - - - - image/svg+xml - - - - - - - - - - - - diff --git a/plugins/SimulationView/resources/simulation_resume.svg b/plugins/SimulationView/resources/simulation_resume.svg deleted file mode 100644 index 912a2ac418..0000000000 --- a/plugins/SimulationView/resources/simulation_resume.svg +++ /dev/null @@ -1,78 +0,0 @@ - - - - - - - - - - image/svg+xml - - - - - - - - - diff --git a/plugins/SliceInfoPlugin/SliceInfo.py b/plugins/SliceInfoPlugin/SliceInfo.py index 5ead422d0a..02e71207e0 100755 --- a/plugins/SliceInfoPlugin/SliceInfo.py +++ b/plugins/SliceInfoPlugin/SliceInfo.py @@ -1,4 +1,4 @@ -# Copyright (c) 2020 Ultimaker B.V. +# Copyright (c) 2021 Ultimaker B.V. # Cura is released under the terms of the LGPLv3 or higher. import json @@ -87,8 +87,12 @@ class SliceInfo(QObject, Extension): return None file_path = os.path.join(plugin_path, "example_data.html") if file_path: - with open(file_path, "r", encoding = "utf-8") as f: - self._example_data_content = f.read() + try: + with open(file_path, "r", encoding = "utf-8") as f: + self._example_data_content = f.read() + except EnvironmentError as e: + Logger.error(f"Unable to read example slice info data to show to the user: {e}") + self._example_data_content = "" + catalog.i18nc("@text", "Unable to read example data file.") + "" return self._example_data_content @pyqtSlot(bool) diff --git a/plugins/SupportEraser/__init__.py b/plugins/SupportEraser/__init__.py index 2ed7521808..30b6fe4a52 100644 --- a/plugins/SupportEraser/__init__.py +++ b/plugins/SupportEraser/__init__.py @@ -11,7 +11,7 @@ def getMetaData(): "tool": { "name": i18n_catalog.i18nc("@label", "Support Blocker"), "description": i18n_catalog.i18nc("@info:tooltip", "Create a volume in which supports are not printed."), - "icon": "tool_icon.svg", + "icon": "SupportBlocker", "weight": 4 } } diff --git a/plugins/SupportEraser/tool_icon.svg b/plugins/SupportEraser/tool_icon.svg deleted file mode 100644 index fee69e0715..0000000000 --- a/plugins/SupportEraser/tool_icon.svg +++ /dev/null @@ -1,14 +0,0 @@ - - - - support_blocker - Created with Sketch. - - - - - - - - - \ No newline at end of file diff --git a/plugins/Toolbox/resources/images/Shop.svg b/plugins/Toolbox/resources/images/Shop.svg new file mode 100755 index 0000000000..5056a25c51 --- /dev/null +++ b/plugins/Toolbox/resources/images/Shop.svg @@ -0,0 +1,6 @@ + + + + diff --git a/plugins/Toolbox/resources/images/shop.svg b/plugins/Toolbox/resources/images/shop.svg deleted file mode 100644 index 64862834b0..0000000000 --- a/plugins/Toolbox/resources/images/shop.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/plugins/Toolbox/resources/qml/components/ToolboxBackColumn.qml b/plugins/Toolbox/resources/qml/components/ToolboxBackColumn.qml index 5514e555eb..9874a977f5 100644 --- a/plugins/Toolbox/resources/qml/components/ToolboxBackColumn.qml +++ b/plugins/Toolbox/resources/qml/components/ToolboxBackColumn.qml @@ -41,7 +41,7 @@ Item height: height } color: button.enabled ? (button.hovered ? UM.Theme.getColor("primary") : UM.Theme.getColor("text")) : UM.Theme.getColor("text_inactive") - source: UM.Theme.getIcon("arrow_left") + source: UM.Theme.getIcon("ChevronSingleLeft") } width: UM.Theme.getSize("toolbox_back_button").width height: UM.Theme.getSize("toolbox_back_button").height diff --git a/plugins/Toolbox/resources/qml/components/ToolboxDownloadsShowcaseTile.qml b/plugins/Toolbox/resources/qml/components/ToolboxDownloadsShowcaseTile.qml index d5b1b1a7e6..6695921126 100644 --- a/plugins/Toolbox/resources/qml/components/ToolboxDownloadsShowcaseTile.qml +++ b/plugins/Toolbox/resources/qml/components/ToolboxDownloadsShowcaseTile.qml @@ -4,7 +4,7 @@ import QtQuick 2.10 import QtQuick.Controls 1.4 import QtQuick.Controls.Styles 1.4 -import QtGraphicalEffects 1.0 + import UM 1.1 as UM Rectangle diff --git a/plugins/Toolbox/resources/qml/components/ToolboxHeader.qml b/plugins/Toolbox/resources/qml/components/ToolboxHeader.qml index 0c57e5fc5c..1bdfa80b79 100644 --- a/plugins/Toolbox/resources/qml/components/ToolboxHeader.qml +++ b/plugins/Toolbox/resources/qml/components/ToolboxHeader.qml @@ -95,7 +95,7 @@ Item UM.RecolorImage { id: cloudMarketplaceButton - source: "../../images/shop.svg" + source: "../../images/Shop.svg" color: UM.Theme.getColor(webMarketplaceButtonTooltipArea.containsMouse ? "primary" : "text") height: parent.height / 2 width: height diff --git a/plugins/UM3NetworkPrinting/resources/qml/CameraButton.qml b/plugins/UM3NetworkPrinting/resources/qml/CameraButton.qml index 2e3d17ceb0..8dca61ec38 100644 --- a/plugins/UM3NetworkPrinting/resources/qml/CameraButton.qml +++ b/plugins/UM3NetworkPrinting/resources/qml/CameraButton.qml @@ -1,23 +1,26 @@ -// Copyright (c) 2019 Ultimaker B.V. +// Copyright (c) 2021 Ultimaker B.V. // Cura is released under the terms of the LGPLv3 or higher. import QtQuick 2.3 -import QtQuick.Controls 1.4 +import QtQuick.Controls 2.4 import QtQuick.Controls.Styles 1.3 import UM 1.3 as UM import Cura 1.0 as Cura -Rectangle +Button { - id: base - - property var enabled: true - property var iconSource: null - color: enabled ? UM.Theme.getColor("monitor_icon_primary") : UM.Theme.getColor("monitor_icon_disabled") - height: width - radius: Math.round(0.5 * width) - width: 24 * screenScaleFactor + width: UM.Theme.getSize("button").width * 0.75 //Matching the size of the content of tool buttons. + height: UM.Theme.getSize("button").height * 0.75 + + hoverEnabled: true + + background: Rectangle + { + anchors.fill: parent + radius: 0.5 * width + color: parent.enabled ? (parent.hovered ? UM.Theme.getColor("monitor_secondary_button_hover") : "transparent") : UM.Theme.getColor("monitor_icon_disabled") + } UM.RecolorImage { @@ -27,30 +30,21 @@ Rectangle horizontalCenter: parent.horizontalCenter verticalCenter: parent.verticalCenter } - color: UM.Theme.getColor("monitor_icon_accent") + color: UM.Theme.getColor("primary") height: width source: iconSource width: Math.round(parent.width / 2) } - MouseArea + onClicked: { - id: clickArea - anchors.fill: parent - hoverEnabled: base.enabled - onClicked: + if (OutputDevice.activeCameraUrl != "") { - if (base.enabled) - { - if (OutputDevice.activeCameraUrl != "") - { - OutputDevice.setActiveCameraUrl("") - } - else - { - OutputDevice.setActiveCameraUrl(modelData.cameraUrl) - } - } + OutputDevice.setActiveCameraUrl("") + } + else + { + OutputDevice.setActiveCameraUrl(modelData.cameraUrl) } } } diff --git a/plugins/UM3NetworkPrinting/resources/qml/MonitorBuildplateConfiguration.qml b/plugins/UM3NetworkPrinting/resources/qml/MonitorBuildplateConfiguration.qml index 2034c23abe..0f4aec5424 100644 --- a/plugins/UM3NetworkPrinting/resources/qml/MonitorBuildplateConfiguration.qml +++ b/plugins/UM3NetworkPrinting/resources/qml/MonitorBuildplateConfiguration.qml @@ -50,8 +50,8 @@ Item id: buildplateIcon anchors.centerIn: parent color: UM.Theme.getColor("monitor_icon_primary") - height: parent.height - source: "../svg/icons/buildplate.svg" + height: UM.Theme.getSize("medium_button_icon").width + source: "../svg/icons/Buildplate.svg" width: height visible: buildplate } diff --git a/plugins/UM3NetworkPrinting/resources/qml/MonitorCarousel.qml b/plugins/UM3NetworkPrinting/resources/qml/MonitorCarousel.qml index 56e39bd477..a42dc0d12a 100644 --- a/plugins/UM3NetworkPrinting/resources/qml/MonitorCarousel.qml +++ b/plugins/UM3NetworkPrinting/resources/qml/MonitorCarousel.qml @@ -98,7 +98,7 @@ Item sourceSize.width: width // TODO: Theme! sourceSize.height: width // TODO: Theme! color: UM.Theme.getColor("text") - source: UM.Theme.getIcon("arrow_left") + source: UM.Theme.getIcon("ChevronSingleLeft") } } } @@ -177,7 +177,7 @@ Item sourceSize.width: width // TODO: Theme! sourceSize.height: width // TODO: Theme! color: UM.Theme.getColor("text") - source: UM.Theme.getIcon("arrow_right") + source: UM.Theme.getIcon("ChevronSingleRight") } } } diff --git a/plugins/UM3NetworkPrinting/resources/qml/MonitorExtruderConfiguration.qml b/plugins/UM3NetworkPrinting/resources/qml/MonitorExtruderConfiguration.qml index ac5f588db3..2720e6896a 100644 --- a/plugins/UM3NetworkPrinting/resources/qml/MonitorExtruderConfiguration.qml +++ b/plugins/UM3NetworkPrinting/resources/qml/MonitorExtruderConfiguration.qml @@ -5,6 +5,8 @@ import QtQuick 2.2 import QtQuick.Controls 2.0 import UM 1.3 as UM +import Cura 1.6 as Cura + /** * This component comprises a colored extruder icon, the material name, and the * print core name. It is used by the MonitorPrinterConfiguration component with @@ -18,10 +20,10 @@ import UM 1.3 as UM Item { // The material color - property alias color: extruderIcon.color + property alias color: extruderIcon.materialColor - // The extruder position; NOTE: Decent human beings count from 0 - property alias position: extruderIcon.position + // The extruder position + property int position // The material name property alias material: materialLabel.text @@ -32,12 +34,13 @@ Item // Height is 2 x 18px labels, plus 4px spacing between them height: 40 * screenScaleFactor // TODO: Theme! width: childrenRect.width + opacity: material != "" && material != "Empty" && position >= 0 ? 1 : 0.4 - MonitorIconExtruder + Cura.ExtruderIcon { id: extruderIcon - color: UM.Theme.getColor("monitor_skeleton_loading") - position: 0 + materialColor: UM.Theme.getColor("monitor_skeleton_loading") + anchors.verticalCenter: parent.verticalCenter } Rectangle @@ -46,16 +49,18 @@ Item anchors { left: extruderIcon.right - leftMargin: 12 * screenScaleFactor // TODO: Theme! + leftMargin: UM.Theme.getSize("default_margin").width + verticalCenter: extruderIcon.verticalCenter } color: materialLabel.visible > 0 ? "transparent" : UM.Theme.getColor("monitor_skeleton_loading") - height: 18 * screenScaleFactor // TODO: Theme! + height: childrenRect.height width: Math.max(materialLabel.contentWidth, 60 * screenScaleFactor) // TODO: Theme! radius: 2 * screenScaleFactor // TODO: Theme! Label { id: materialLabel + anchors.top: parent.top color: UM.Theme.getColor("text") elide: Text.ElideRight @@ -63,29 +68,13 @@ Item text: "" visible: text !== "" - // FIXED-LINE-HEIGHT: - height: parent.height - verticalAlignment: Text.AlignVCenter renderType: Text.NativeRendering } - } - - Rectangle - { - id: printCoreLabelWrapper - anchors - { - left: materialLabelWrapper.left - bottom: parent.bottom - } - color: printCoreLabel.visible > 0 ? "transparent" : UM.Theme.getColor("monitor_skeleton_loading") - height: 18 * screenScaleFactor // TODO: Theme! - width: Math.max(printCoreLabel.contentWidth, 36 * screenScaleFactor) // TODO: Theme! - radius: 2 * screenScaleFactor // TODO: Theme! Label { id: printCoreLabel + anchors.top: materialLabel.bottom color: UM.Theme.getColor("text") elide: Text.ElideRight @@ -93,9 +82,6 @@ Item text: "" visible: text !== "" - // FIXED-LINE-HEIGHT: - height: parent.height - verticalAlignment: Text.AlignVCenter renderType: Text.NativeRendering } } diff --git a/plugins/UM3NetworkPrinting/resources/qml/MonitorIconExtruder.qml b/plugins/UM3NetworkPrinting/resources/qml/MonitorIconExtruder.qml index 8c6f28d3e1..ad0e8a6777 100644 --- a/plugins/UM3NetworkPrinting/resources/qml/MonitorIconExtruder.qml +++ b/plugins/UM3NetworkPrinting/resources/qml/MonitorIconExtruder.qml @@ -22,7 +22,7 @@ Item property int size: 32 * screenScaleFactor // TODO: Theme! // THe extruder icon source; NOTE: This shouldn't need to be changed - property string iconSource: "../svg/icons/extruder.svg" + property string iconSource: "../svg/icons/Extruder.svg" height: size width: size @@ -38,6 +38,7 @@ Item Label { id: positionLabel + anchors.centerIn: icon font: UM.Theme.getFont("small") color: UM.Theme.getColor("text") height: Math.round(size / 2) @@ -45,8 +46,6 @@ Item text: position + 1 verticalAlignment: Text.AlignVCenter width: Math.round(size / 2) - x: Math.round(size * 0.25) - y: Math.round(size * 0.15625) visible: position >= 0 renderType: Text.NativeRendering } diff --git a/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobPreview.qml b/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobPreview.qml index 7492b4e8e4..cf2239201f 100644 --- a/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobPreview.qml +++ b/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobPreview.qml @@ -71,20 +71,20 @@ Item } if (printJob.configurationChanges.length > 0) { - return "../svg/warning-icon.svg" + return "../svg/Warning.svg" } switch(printJob.state) { case "error": - return "../svg/aborted-icon.svg" + return "../svg/CancelCircle.svg" case "wait_cleanup": - return printJob.timeTotal > printJob.timeElapsed ? "../svg/aborted-icon.svg" : "" + return printJob.timeTotal > printJob.timeElapsed ? "../svg/CancelCircle.svg" : "" case "pausing": - return "../svg/paused-icon.svg" + return "../svg/PauseCircle.svg" case "paused": - return "../svg/paused-icon.svg" + return "../svg/PauseCircle.svg" case "resuming": - return "../svg/paused-icon.svg" + return "../svg/PauseCircle.svg" default: return "" } diff --git a/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml b/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml index 05ad8d9929..7dbb78e8fb 100644 --- a/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml +++ b/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml @@ -164,7 +164,7 @@ Item verticalCenter: managePrinterText.verticalCenter } color: UM.Theme.getColor("text_link") - source: UM.Theme.getIcon("external_link") + source: UM.Theme.getIcon("LinkExternal") width: 12 * screenScaleFactor height: 12 * screenScaleFactor } @@ -265,7 +265,7 @@ Item bottom: parent.bottom bottomMargin: 20 * screenScaleFactor // TODO: Theme! } - iconSource: "../svg/icons/camera.svg" + iconSource: "../svg/icons/CameraPhoto.svg" enabled: !cloudConnection visible: printer } diff --git a/plugins/UM3NetworkPrinting/resources/qml/MonitorQueue.qml b/plugins/UM3NetworkPrinting/resources/qml/MonitorQueue.qml index 9f159102e2..1b94625bf0 100644 --- a/plugins/UM3NetworkPrinting/resources/qml/MonitorQueue.qml +++ b/plugins/UM3NetworkPrinting/resources/qml/MonitorQueue.qml @@ -48,7 +48,7 @@ Item id: externalLinkIcon anchors.verticalCenter: manageQueueLabel.verticalCenter color: UM.Theme.getColor("text_link") - source: UM.Theme.getIcon("external_link") + source: UM.Theme.getIcon("LinkExternal") width: 16 * screenScaleFactor // TODO: Theme! (Y U NO USE 18 LIKE ALL OTHER ICONS?!) height: 16 * screenScaleFactor // TODO: Theme! (Y U NO USE 18 LIKE ALL OTHER ICONS?!) } diff --git a/plugins/UM3NetworkPrinting/resources/qml/MonitorStage.qml b/plugins/UM3NetworkPrinting/resources/qml/MonitorStage.qml index dc69d89fed..5d5b3ceab4 100644 --- a/plugins/UM3NetworkPrinting/resources/qml/MonitorStage.qml +++ b/plugins/UM3NetworkPrinting/resources/qml/MonitorStage.qml @@ -6,7 +6,6 @@ import QtQuick.Controls 1.4 import QtQuick.Controls.Styles 1.4 import UM 1.3 as UM import Cura 1.0 as Cura -import QtGraphicalEffects 1.0 // This is the root component for the monitor stage. Component diff --git a/plugins/UM3NetworkPrinting/resources/qml/PrinterVideoStream.qml b/plugins/UM3NetworkPrinting/resources/qml/PrinterVideoStream.qml index cfbb30fdfb..291e2a14f5 100644 --- a/plugins/UM3NetworkPrinting/resources/qml/PrinterVideoStream.qml +++ b/plugins/UM3NetworkPrinting/resources/qml/PrinterVideoStream.qml @@ -30,7 +30,7 @@ Item { top: cameraImage.top topMargin: UM.Theme.getSize("default_margin").height } - iconSource: UM.Theme.getIcon("cross1"); + iconSource: UM.Theme.getIcon("Cancel"); z: 999; } diff --git a/plugins/UM3NetworkPrinting/resources/svg/Camera.svg b/plugins/UM3NetworkPrinting/resources/svg/Camera.svg new file mode 100755 index 0000000000..341d90e940 --- /dev/null +++ b/plugins/UM3NetworkPrinting/resources/svg/Camera.svg @@ -0,0 +1,5 @@ + + + + diff --git a/plugins/UM3NetworkPrinting/resources/svg/CancelCircle.svg b/plugins/UM3NetworkPrinting/resources/svg/CancelCircle.svg new file mode 100755 index 0000000000..40423ffd8d --- /dev/null +++ b/plugins/UM3NetworkPrinting/resources/svg/CancelCircle.svg @@ -0,0 +1,6 @@ + + + + diff --git a/plugins/UM3NetworkPrinting/resources/svg/Check.svg b/plugins/UM3NetworkPrinting/resources/svg/Check.svg new file mode 100755 index 0000000000..c64667efd8 --- /dev/null +++ b/plugins/UM3NetworkPrinting/resources/svg/Check.svg @@ -0,0 +1,4 @@ + + + + diff --git a/plugins/UM3NetworkPrinting/resources/svg/CheckCircle.svg b/plugins/UM3NetworkPrinting/resources/svg/CheckCircle.svg new file mode 100755 index 0000000000..c364a1ecb9 --- /dev/null +++ b/plugins/UM3NetworkPrinting/resources/svg/CheckCircle.svg @@ -0,0 +1,6 @@ + + + + + diff --git a/plugins/UM3NetworkPrinting/resources/svg/PauseCircle.svg b/plugins/UM3NetworkPrinting/resources/svg/PauseCircle.svg new file mode 100755 index 0000000000..3da1179f41 --- /dev/null +++ b/plugins/UM3NetworkPrinting/resources/svg/PauseCircle.svg @@ -0,0 +1,7 @@ + + + + + + diff --git a/plugins/UM3NetworkPrinting/resources/svg/Prohibition.svg b/plugins/UM3NetworkPrinting/resources/svg/Prohibition.svg new file mode 100755 index 0000000000..18e0058fed --- /dev/null +++ b/plugins/UM3NetworkPrinting/resources/svg/Prohibition.svg @@ -0,0 +1,6 @@ + + + + diff --git a/plugins/UM3NetworkPrinting/resources/svg/Warning.svg b/plugins/UM3NetworkPrinting/resources/svg/Warning.svg new file mode 100755 index 0000000000..828e866435 --- /dev/null +++ b/plugins/UM3NetworkPrinting/resources/svg/Warning.svg @@ -0,0 +1,5 @@ + + + + diff --git a/plugins/UM3NetworkPrinting/resources/svg/aborted-icon.svg b/plugins/UM3NetworkPrinting/resources/svg/aborted-icon.svg deleted file mode 100644 index 7ef82c8911..0000000000 --- a/plugins/UM3NetworkPrinting/resources/svg/aborted-icon.svg +++ /dev/null @@ -1 +0,0 @@ -aborted-icon \ No newline at end of file diff --git a/plugins/UM3NetworkPrinting/resources/svg/action-required-icon.svg b/plugins/UM3NetworkPrinting/resources/svg/action-required-icon.svg deleted file mode 100644 index e7768849c6..0000000000 --- a/plugins/UM3NetworkPrinting/resources/svg/action-required-icon.svg +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - - diff --git a/plugins/UM3NetworkPrinting/resources/svg/approved-icon.svg b/plugins/UM3NetworkPrinting/resources/svg/approved-icon.svg deleted file mode 100644 index 671957d709..0000000000 --- a/plugins/UM3NetworkPrinting/resources/svg/approved-icon.svg +++ /dev/null @@ -1 +0,0 @@ -approved-icon \ No newline at end of file diff --git a/plugins/UM3NetworkPrinting/resources/svg/blocked-icon.svg b/plugins/UM3NetworkPrinting/resources/svg/blocked-icon.svg deleted file mode 100644 index eba3efdab9..0000000000 --- a/plugins/UM3NetworkPrinting/resources/svg/blocked-icon.svg +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - diff --git a/plugins/UM3NetworkPrinting/resources/svg/camera-icon.svg b/plugins/UM3NetworkPrinting/resources/svg/camera-icon.svg deleted file mode 100644 index 66bed04508..0000000000 --- a/plugins/UM3NetworkPrinting/resources/svg/camera-icon.svg +++ /dev/null @@ -1,8 +0,0 @@ - - - Created with Sketch. - - - - - \ No newline at end of file diff --git a/plugins/UM3NetworkPrinting/resources/svg/checkmark-icon.svg b/plugins/UM3NetworkPrinting/resources/svg/checkmark-icon.svg deleted file mode 100644 index 9d4507e551..0000000000 --- a/plugins/UM3NetworkPrinting/resources/svg/checkmark-icon.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/plugins/UM3NetworkPrinting/resources/svg/icons/Buildplate.svg b/plugins/UM3NetworkPrinting/resources/svg/icons/Buildplate.svg new file mode 100755 index 0000000000..5201926675 --- /dev/null +++ b/plugins/UM3NetworkPrinting/resources/svg/icons/Buildplate.svg @@ -0,0 +1,5 @@ + + + + diff --git a/plugins/UM3NetworkPrinting/resources/svg/icons/CameraPhoto.svg b/plugins/UM3NetworkPrinting/resources/svg/icons/CameraPhoto.svg new file mode 100755 index 0000000000..b39aa7c3de --- /dev/null +++ b/plugins/UM3NetworkPrinting/resources/svg/icons/CameraPhoto.svg @@ -0,0 +1,6 @@ + + + + diff --git a/plugins/UM3NetworkPrinting/resources/svg/icons/Extruder.svg b/plugins/UM3NetworkPrinting/resources/svg/icons/Extruder.svg new file mode 100644 index 0000000000..45d2fdcf8d --- /dev/null +++ b/plugins/UM3NetworkPrinting/resources/svg/icons/Extruder.svg @@ -0,0 +1,5 @@ + + + + diff --git a/plugins/UM3NetworkPrinting/resources/svg/icons/buildplate.svg b/plugins/UM3NetworkPrinting/resources/svg/icons/buildplate.svg deleted file mode 100644 index bcb278a8ca..0000000000 --- a/plugins/UM3NetworkPrinting/resources/svg/icons/buildplate.svg +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/plugins/UM3NetworkPrinting/resources/svg/icons/camera.svg b/plugins/UM3NetworkPrinting/resources/svg/icons/camera.svg deleted file mode 100644 index 2eaebb812d..0000000000 --- a/plugins/UM3NetworkPrinting/resources/svg/icons/camera.svg +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/plugins/UM3NetworkPrinting/resources/svg/icons/extruder.svg b/plugins/UM3NetworkPrinting/resources/svg/icons/extruder.svg deleted file mode 100644 index 235cb432e9..0000000000 --- a/plugins/UM3NetworkPrinting/resources/svg/icons/extruder.svg +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/plugins/UM3NetworkPrinting/resources/svg/paused-icon.svg b/plugins/UM3NetworkPrinting/resources/svg/paused-icon.svg deleted file mode 100644 index a66217d662..0000000000 --- a/plugins/UM3NetworkPrinting/resources/svg/paused-icon.svg +++ /dev/null @@ -1 +0,0 @@ -paused-icon \ No newline at end of file diff --git a/plugins/UM3NetworkPrinting/resources/svg/warning-icon.svg b/plugins/UM3NetworkPrinting/resources/svg/warning-icon.svg deleted file mode 100644 index 064d0783e0..0000000000 --- a/plugins/UM3NetworkPrinting/resources/svg/warning-icon.svg +++ /dev/null @@ -1,4 +0,0 @@ - - warning-icon - - \ No newline at end of file diff --git a/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py b/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py index 1884efec46..9eaa133ef5 100644 --- a/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py +++ b/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py @@ -256,7 +256,16 @@ class CloudOutputDevice(UltimakerNetworkedPrinterOutputDevice): """ self._uploaded_print_job = self._pre_upload_print_job self._progress.hide() - PrintJobUploadSuccessMessage().show() + message = PrintJobUploadSuccessMessage() + message.addAction("monitor print", + name=I18N_CATALOG.i18nc("@action:button", "Monitor print"), + icon="", + description=I18N_CATALOG.i18nc("@action:tooltip", "Track the print in Ultimaker Digital Factory"), + button_align=message.ActionButtonAlignment.ALIGN_RIGHT) + df_url = f"https://digitalfactory.ultimaker.com/app/jobs/{self._cluster.cluster_id}?utm_source=cura&utm_medium=software&utm_campaign=monitor-button" + message.pyQtActionTriggered.connect(lambda message, action: (QDesktopServices.openUrl(QUrl(df_url)), message.hide())) + + message.show() self.writeFinished.emit() def _onPrintUploadSpecificError(self, reply: "QNetworkReply", _: "QNetworkReply.NetworkError"): diff --git a/plugins/UM3NetworkPrinting/src/Messages/PrintJobUploadSuccessMessage.py b/plugins/UM3NetworkPrinting/src/Messages/PrintJobUploadSuccessMessage.py index aa64f338dd..aa3d72ccd8 100644 --- a/plugins/UM3NetworkPrinting/src/Messages/PrintJobUploadSuccessMessage.py +++ b/plugins/UM3NetworkPrinting/src/Messages/PrintJobUploadSuccessMessage.py @@ -13,6 +13,5 @@ class PrintJobUploadSuccessMessage(Message): def __init__(self) -> None: super().__init__( text = I18N_CATALOG.i18nc("@info:status", "Print job was successfully sent to the printer."), - title = I18N_CATALOG.i18nc("@info:title", "Data Sent"), - lifetime = 5 + title = I18N_CATALOG.i18nc("@info:title", "Data Sent") ) diff --git a/resources/definitions/anycubic_i3_mega_s.def.json b/resources/definitions/anycubic_i3_mega_s.def.json index f0c786a393..a0e83627c4 100644 --- a/resources/definitions/anycubic_i3_mega_s.def.json +++ b/resources/definitions/anycubic_i3_mega_s.def.json @@ -115,6 +115,7 @@ "skirt_gap": { "value": 5.0 }, "skirt_line_count": { "value": 4 }, + "meshfix_maximum_deviation": { "value": 0.05 }, "support_angle": { "value": "math.floor(math.degrees(math.atan(line_width / 2.0 / layer_height)))" }, "support_pattern": { "value": "'zigzag'" }, diff --git a/resources/definitions/anycubic_kossel_linear_plus.def.json b/resources/definitions/anycubic_kossel_linear_plus.def.json index a4aeac75a0..9683cf61cf 100644 --- a/resources/definitions/anycubic_kossel_linear_plus.def.json +++ b/resources/definitions/anycubic_kossel_linear_plus.def.json @@ -5,6 +5,7 @@ "metadata": { "visible": true, "platform": "kossel_pro_build_platform.3mf", + "platform_offset": [0, -0.25, 0], "machine_extruder_trains": { "0": "anycubic_kossel_extruder_0" } diff --git a/resources/definitions/atom2.def.json b/resources/definitions/atom2.def.json new file mode 100644 index 0000000000..d7a26546d8 --- /dev/null +++ b/resources/definitions/atom2.def.json @@ -0,0 +1,35 @@ +{ + "name": "Atom 2", + "version": 2, + "inherits": "fdmprinter", + "metadata": { + "visible": true, + "author": "Victor (Yu Chieh) Lin", + "manufacturer": "Layer One", + "file_formats": "text/x-gcode", + "platform_offset": [0,0,0], + "machine_extruder_trains": { "0": "atom2_extruder_0" + } + }, + + "overrides": { + "machine_name": { "default_value": "Atom 2" }, + "machine_shape": { "default_value": "elliptic" }, + "machine_width": { "default_value": 210 }, + "machine_depth": { "default_value": 210 }, + "machine_height": { "default_value": 320 }, + "machine_extruder_count": { "default_value": 1 }, + "machine_heated_bed": { "default_value": false }, + "machine_center_is_zero": { "default_value": true }, + + "machine_start_gcode": { "default_value": "G21\nG90 \nM107\nG28\nG92 E0\nG1 F200 E3\nG92 E0" }, + "machine_end_gcode": { "default_value": "M104 S0\nG28\nG91\nG1 E-6 F300\nM84\nG90" }, + + "layer_height": { "default_value": 0.2 }, + "default_material_print_temperature": { "default_value": 210 }, + "speed_print": { "default_value": 32 }, + "optimize_wall_printing_order": { "value": "True" }, + "infill_sparse_density": { "default_value": 10 }, + "brim_width": { "default_value": 4 } + } +} diff --git a/resources/definitions/biqu_base.def.json b/resources/definitions/biqu_base.def.json index af5c2465e2..29aa69ec54 100755 --- a/resources/definitions/biqu_base.def.json +++ b/resources/definitions/biqu_base.def.json @@ -85,8 +85,8 @@ "material_flow": { "value": 100 }, "travel_compensate_overlapping_walls_0_enabled": { "value": "False" }, - "z_seam_type": { "value": "'back'" }, - "z_seam_corner": { "value": "'z_seam_corner_weighted'" }, + "z_seam_type": { "value": "'sharpest_corner'" }, + "z_seam_corner": { "value": "'z_seam_corner_inner'" }, "infill_line_width": { "value": "line_width * 1.2" }, "infill_sparse_density": { "value": "20" }, @@ -156,7 +156,7 @@ "support_interface_enable": { "value": true }, "support_interface_height": { "value": "layer_height * 4" }, - "support_interface_density": { "value": 33.333 }, + "support_interface_density": { "value": 75 }, "support_interface_pattern": { "value": "'grid'" }, "support_interface_skip_height": { "value": 0.2 }, "minimum_support_area": { "value": 2 }, diff --git a/resources/definitions/biqu_bx_abl.def.json b/resources/definitions/biqu_bx_abl.def.json new file mode 100755 index 0000000000..af4f50dec0 --- /dev/null +++ b/resources/definitions/biqu_bx_abl.def.json @@ -0,0 +1,51 @@ +{ + "name": "Biqu BX", + "version": 2, + "inherits": "biqu_base", + "metadata": { + "quality_definition": "biqu_base", + "visible": true, + "has_machine_materials": true, + "platform": "BIQU_BX_PLATE.stl", + "platform_offset": [ + 7, + -7.4, + -3 + ] + }, + "overrides": { + "coasting_enable": { "value": false }, + "retraction_amount": { "value": 1 }, + "retraction_speed": { "value": 40 }, + "retraction_extrusion_window": { "value": 1 }, + "retract_at_layer_change": { "value": true }, + "support_enable": { "value": false }, + "support_structure": { "value": "'normal'" }, + "support_type": { "value": "'buildplate'" }, + "support_angle": { "value": 45 }, + "support_infill_rate": { "value": 15 }, + "infill_overlap": { "value": 15.0 }, + "skin_overlap": { "value": 20.0 }, + "fill_outline_gaps": { "value": true }, + "filter_out_tiny_gaps": { "value": true }, + "roofing_layer_count": { "value": 2 }, + "xy_offset_layer_0": { "value": -0.1 }, + "speed_print": { "value": 50 }, + "machine_name": { "default_value": "Biqu BX" }, + "machine_width": { "value": 250 }, + "machine_depth": { "value": 250 }, + "machine_height": { "value": 250 }, + "machine_head_with_fans_polygon": { "default_value": [ + [-33, 35], + [-33, -23], + [33, -23], + [33, 35] + ] + }, + "machine_start_gcode": { + "default_value": "; BIQU BX Start G-code\r\n; For inforation on how to tune this profile and get the\r\n; most out of your BX visit: https:\/\/github.com\/looxonline\/Marlin\r\n; For the official github site visit: https:\/\/github.com\/bigtreetech\/BIQU-BX\r\n\r\nM117 Initial homing sequence. ; Home so that the probe is positioned to heat\r\nG28\r\n\r\nM117 Probe heating position\r\nG0 X65 Y5 Z1 ; Move the probe to the heating position.\r\n\r\nM117 Getting the heaters up to temp!\r\nM104 S140 ; Set Extruder temperature, no wait\r\nM140 S60 ; Set Heat Bed temperature\r\nM190 S60 ; Wait for Heat Bed temperature\r\n\r\nM117 Waiting for probe to warm! ; Wait another 90s for the probe to absorb heat.\r\nG4 S90 \r\n\r\nM117 Post warming re-home\r\nG28 ; Home all axes again after warming\r\n\r\nM117 Z-Dance of my people\r\nG34\r\n\r\nM117 ABL Probing\r\nG29\r\n\r\nM900 K0 L0 T0 ;Edit the K and L values if you have calibrated a k factor for your filament\r\nM900 T0 S0\r\n\r\nG1 Z2.0 F3000 ; Move Z Axis up little to prevent scratching of Heat Bed\r\nG1 X4.1 Y10 Z0.3 F5000.0 ; Move to start position\r\n\r\nM117 Getting the extruder up to temp\r\nM140 S{material_bed_temperature_layer_0} ; Set Heat Bed temperature\r\nM104 S{material_print_temperature_layer_0} ; Set Extruder temperature\r\nM109 S{material_print_temperature_layer_0} ; Wait for Extruder temperature\r\nM190 S{material_bed_temperature_layer_0} ; Wait for Heat Bed temperature\r\n\r\nG92 E0 ; Reset Extruder\r\nM117 Purging\r\nG1 X4.1 Y200.0 Z0.3 F1500.0 E15 ; Draw the first line\r\nG1 X4.4 Y200.0 Z0.3 F5000.0 ; Move to side a little\r\nG1 X4.4 Y20 Z0.3 F1500.0 E30 ; Draw the second line\r\nG92 E0 ; Reset Extruder\r\nM117 Lets make\r\nG1 X8 Y20 Z0.3 F5000.0 ; Move over to prevent blob squish" + }, + + "gantry_height": { "value": 27.5 } + } +} diff --git a/resources/definitions/creasee_cs20.def.json b/resources/definitions/creasee_cs20.def.json new file mode 100644 index 0000000000..ab30f3dd1c --- /dev/null +++ b/resources/definitions/creasee_cs20.def.json @@ -0,0 +1,32 @@ +{ + "version": 2, + "name": "Creasee CS20", + "inherits": "fdmprinter", + "metadata": { + "visible": true, + "manufacturer": "Creasee", + "machine_extruder_trains": + { + "0": "creasee_extruder_0" + } + }, + + "overrides": { + "machine_name": { "default_value": "Creasee CS20" }, + "machine_width": { + "default_value": 220 + }, + "machine_depth": { + "default_value": 220 + }, + "machine_height": { + "default_value": 250 + }, + "machine_start_gcode": { + "default_value": "G28 ;Home\nG1 Z15.0 F2000 ;Move the platform" + }, + "machine_end_gcode": { + "default_value": "M104 S0\nM140 S0\nG92 E0\nG1 E-10 F2000\nG28 X0 Y0\nM84" + } + } +} diff --git a/resources/definitions/creasee_cs30.def.json b/resources/definitions/creasee_cs30.def.json new file mode 100644 index 0000000000..7d6a5090bb --- /dev/null +++ b/resources/definitions/creasee_cs30.def.json @@ -0,0 +1,32 @@ +{ + "version": 2, + "name": "Creasee CS30", + "inherits": "fdmprinter", + "metadata": { + "visible": true, + "manufacturer": "Creasee", + "machine_extruder_trains": + { + "0": "creasee_extruder_1" + } + }, + + "overrides": { + "machine_name": { "default_value": "Creasee CS30" }, + "machine_width": { + "default_value": 300 + }, + "machine_depth": { + "default_value": 300 + }, + "machine_height": { + "default_value": 400 + }, + "machine_start_gcode": { + "default_value": "G28 ;Home\nG1 Z15.0 F2000 ;Move the platform" + }, + "machine_end_gcode": { + "default_value": "M104 S0\nM140 S0\nG92 E0\nG1 E-10 F2000\nG28 X0 Y0\nM84" + } + } +} diff --git a/resources/definitions/dagoma_disco.def.json b/resources/definitions/dagoma_disco.def.json index bf098b8b4a..89773d9c0e 100644 --- a/resources/definitions/dagoma_disco.def.json +++ b/resources/definitions/dagoma_disco.def.json @@ -73,6 +73,7 @@ "machine_steps_per_mm_x": { "default_value": 80 }, "machine_steps_per_mm_y": { "default_value": 80 }, "machine_steps_per_mm_z": { "default_value": 2560 }, - "machine_steps_per_mm_e": { "default_value": 98 } + "machine_steps_per_mm_e": { "default_value": 98 }, + "speed_z_hop": {"default_value": 4} } } diff --git a/resources/definitions/fdmextruder.def.json b/resources/definitions/fdmextruder.def.json index 67d28392b3..7dbd775b49 100644 --- a/resources/definitions/fdmextruder.def.json +++ b/resources/definitions/fdmextruder.def.json @@ -197,7 +197,7 @@ { "label": "Build Plate Adhesion", "type": "category", - "icon": "category_adhesion", + "icon": "Adhesion", "description": "Adhesion", "children": { @@ -232,7 +232,7 @@ "material": { "label": "Material", - "icon": "category_material", + "icon": "Spool", "description": "Material", "type": "category", "children": diff --git a/resources/definitions/fdmprinter.def.json b/resources/definitions/fdmprinter.def.json index 37607504e0..dca63aaa5e 100644 --- a/resources/definitions/fdmprinter.def.json +++ b/resources/definitions/fdmprinter.def.json @@ -28,7 +28,7 @@ "label": "Machine", "type": "category", "description": "Machine specific settings", - "icon": "category_machine", + "icon": "Printer", "children": { "machine_name": @@ -704,7 +704,7 @@ "machine_steps_per_mm_e": { "label": "Steps per Millimeter (E)", - "description": "How many steps of the stepper motors will result in one millimeter of extrusion.", + "description": "How many steps of the stepper motors will result in moving the feeder wheel by one millimeter around its circumference.", "type": "float", "default_value": 1600, "minimum_value": "0.0000001", @@ -765,7 +765,7 @@ { "label": "Quality", "type": "category", - "icon": "category_layer_height", + "icon": "PrintQuality", "description": "All settings that influence the resolution of the print. These settings have a large impact on the quality (and print time)", "children": { @@ -1001,7 +1001,7 @@ "shell": { "label": "Walls", - "icon": "category_shell", + "icon": "PrintShell", "description": "Shell", "type": "category", "children": @@ -1346,7 +1346,7 @@ "top_bottom": { "label": "Top/Bottom", - "icon": "category_topbottom", + "icon": "PrintTopBottom", "description": "Top/Bottom", "type": "category", "children": @@ -1822,7 +1822,7 @@ "infill": { "label": "Infill", - "icon": "category_infill", + "icon": "Infill1", "description": "Infill", "type": "category", "children": @@ -2161,7 +2161,7 @@ "material": { "label": "Material", - "icon": "category_material", + "icon": "Spool", "description": "Material", "type": "category", "children": @@ -2766,7 +2766,7 @@ "speed": { "label": "Speed", - "icon": "category_speed", + "icon": "SpeedOMeter", "description": "Speed", "type": "category", "children": @@ -3672,7 +3672,7 @@ "travel": { "label": "Travel", - "icon": "category_travel", + "icon": "PrintTravel", "description": "travel", "type": "category", "children": @@ -3977,7 +3977,7 @@ "cooling": { "label": "Cooling", - "icon": "category_cool", + "icon": "Fan", "description": "Cooling", "type": "category", "children": @@ -4127,7 +4127,7 @@ { "label": "Support", "type": "category", - "icon": "category_support", + "icon": "Support", "description": "Support", "children": { @@ -4696,7 +4696,7 @@ "default_value": 0.0, "minimum_value": "0", "maximum_value_warning": "5", - "enabled": "support_enable and support_structure == 'normal'", + "enabled": "(support_enable or support_meshes_present) and support_structure == 'normal'", "limit_to_extruder": "support_infill_extruder_nr", "settable_per_mesh": true }, @@ -5167,7 +5167,7 @@ { "label": "Build Plate Adhesion", "type": "category", - "icon": "category_adhesion", + "icon": "Adhesion", "description": "Adhesion", "children": { @@ -5821,7 +5821,7 @@ { "label": "Dual Extrusion", "type": "category", - "icon": "category_dual", + "icon": "DualExtrusion", "description": "Settings used for printing with multiple extruders.", "children": { @@ -6036,7 +6036,7 @@ { "label": "Mesh Fixes", "type": "category", - "icon": "category_fixes", + "icon": "Bandage", "description": "Make the meshes more suited for 3D printing.", "children": { @@ -6162,7 +6162,7 @@ { "label": "Special Modes", "type": "category", - "icon": "category_blackmagic", + "icon": "BlackMagic", "description": "Non-traditional ways to print your models.", "children": { @@ -6335,7 +6335,7 @@ { "label": "Experimental", "type": "category", - "icon": "category_experimental", + "icon": "Experiment", "description": "Features that haven't completely been fleshed out yet.", "children": { diff --git a/resources/definitions/flsun_sr.def.json b/resources/definitions/flsun_sr.def.json new file mode 100644 index 0000000000..9f68c129bd --- /dev/null +++ b/resources/definitions/flsun_sr.def.json @@ -0,0 +1,76 @@ +{ + "version": 2, + "name": "FlSun SuperRacer", + "inherits": "fdmprinter", + "metadata": { + "visible": true, + "author": "Thushan Fernando", + "manufacturer": "Flsun", + "platform": "flsun_sr.3mf", + "file_formats": "text/x-gcode", + "has_materials": true, + "has_machine_quality": false, + "preferred_quality_type": "fast", + "machine_extruder_trains": { + "0": "flsun_sr_extruder_0" + } + }, + "overrides": { + "machine_extruder_count": { + "default_value": 1 + }, + "retraction_enable": { + "default_value": true + }, + "machine_heated_bed": { + "default_value": true + }, + "machine_width": { + "default_value": 260 + }, + "machine_depth": { + "default_value": 260 + }, + "machine_height": { + "default_value": 330 + }, + "machine_center_is_zero": { + "default_value": true + }, + "machine_head_with_fans_polygon": { + "default_value": [ + [0, 0], + [0, 0], + [0, 0], + [0, 0] + ] + }, + "z_seam_type": { + "value": "'back'" + }, + "gantry_height": { + "value": "0" + }, + "machine_shape": { + "default_value": "elliptic" + }, + "machine_nozzle_size": { + "default_value": 0.4 + }, + "material_diameter": { + "default_value": 1.75 + }, + "infill_sparse_density": { + "default_value": 15 + }, + "machine_start_gcode": { + "default_value": "G21\nG90\nM82\nM107 T0\nM140 S{material_bed_temperature}\nM104 S{material_print_temperature} T0\nM190 S{material_bed_temperature}\nM109 S{material_print_temperature} T0\nG28\nG92 E0\n" + }, + "machine_end_gcode": { + "default_value": "M107 T0\nM104 S0\nM104 S0 T1\nM140 S0\nG92 E0\nG91\nG1 E-1 F300 \nG1 Z+0.5 E-5 F6000\nG28 X0 Y0\nG90 ;absolute positioning\n" + }, + "machine_gcode_flavor": { + "default_value": "RepRap (Marlin/Sprinter)" + } + } +} diff --git a/resources/definitions/flyingbear_base.def.json b/resources/definitions/flyingbear_base.def.json index 7205e25be4..a00a97deb6 100644 --- a/resources/definitions/flyingbear_base.def.json +++ b/resources/definitions/flyingbear_base.def.json @@ -22,11 +22,14 @@ "preferred_quality_type": "normal", "exclude_materials": [ + "3D-Fuel_PLA_PRO_Black", + "3D-Fuel_PLA_SnapSupport", "chromatik_pla", "dsm_arnitel2045_175", "dsm_novamid1070_175", "emotiontech_abs", "emotiontech_absx", + "emotiontech_acetate", "emotiontech_asax", "emotiontech_bvoh", "emotiontech_hips", @@ -150,9 +153,9 @@ "overrides": { "machine_name": { "default_value": "Flying Bear Base Printer" }, - "machine_start_gcode": { "default_value": "M220 S100 ;Reset Feedrate\nM221 S100 ;Reset Flowrate\n\nG28 ;Home\n\n;Code for nozzle cleaning and flow normalization\nG92 E0 ;Reset Extruder\nG1 Z2.0 F3000 ;Move Z Axis up\nG1 X10.4 Y20 Z0.28 F5000.0\nG1 X10.4 Y170.0 Z0.28 F1500.0 E15\nG1 X10.1 Y170.0 Z0.28 F5000.0\nG1 X10.1 Y40 Z0.28 F1500.0 E30\n\nG92 E0 ;Reset Extruder\nG1 Z2.0 F3000 ;Move Z Axis up" }, + "machine_start_gcode": { "default_value": "M220 S100 ;reset feedrate\nM221 S100 ;reset flowrate\nG90 ;use absolute coordinates\nM82 ;absolute extrusion mode\nG28 ;home\nG1 Z2 F1500 ;raise z\nG92 E0 ;reset extruder\n\nG1 X75 Y5 F5000 ;start position\nG1 Z0.28 F1500 ;lower z\nG1 E4 F500 ;prime the filament\nG1 X180 E10 F500 ;1st line\nG1 Y5.4 F5000\nG1 X75 E20 F500 ;2nd line\nG1 Z2 F1500 ;raise z\nG92 E0 ;reset extruder" }, - "machine_end_gcode": { "default_value": "G91 ;Relative positioning\nG1 E-2 F2700 ;Retract the filament\nG1 E-2 Z0.2 F2400 ;Retract and raise Z\nG1 X5 Y5 F3000 ;Wipe out\nG1 Z10 ;Raise Z more\nG90 ;Absolute positioning\n\nG28 X0 Y0 ;Home X and Y\n\nM106 S0 ;Turn-off fan\nM104 S0 ;Turn-off hotend\nM140 S0 ;Turn-off bed\n\nM84 X Y E ;Disable all steppers but Z" }, + "machine_end_gcode": { "default_value": "G91 ;use relative coordinates\nG1 E-4 F1500 ;retract the filament\nG1 X5 Y5 Z0.2 F5000 ;wipe\nG1 Z5 F1500 ;raise z\nG90 ;use absolute coordinates\nG1 X10 Y{machine_depth} F5000 ;park print head\n\nM107 ;turn off fan\nM104 S0 ;turn off hotend\nM140 S0 ;turn off heatbed\nM84 ;disable motors" }, "machine_heated_bed": { "default_value": true }, "machine_shape": { "default_value": "rectangular" }, diff --git a/resources/definitions/flyingbear_ghost_4s.def.json b/resources/definitions/flyingbear_ghost_4s.def.json index 17f3578c16..08bd3a2d97 100644 --- a/resources/definitions/flyingbear_ghost_4s.def.json +++ b/resources/definitions/flyingbear_ghost_4s.def.json @@ -17,7 +17,7 @@ "machine_name": { "default_value": "Flying Bear Ghost 4S" }, "machine_width": { "default_value": 255 }, "machine_depth": { "default_value": 210 }, - "machine_height": { "default_value": 210 }, + "machine_height": { "default_value": 200 }, "machine_steps_per_mm_x": { "default_value": 80 }, "machine_steps_per_mm_y": { "default_value": 80 }, diff --git a/resources/definitions/flyingbear_ghost_5.def.json b/resources/definitions/flyingbear_ghost_5.def.json index c1cb9b0d5d..cd799f8591 100644 --- a/resources/definitions/flyingbear_ghost_5.def.json +++ b/resources/definitions/flyingbear_ghost_5.def.json @@ -15,10 +15,9 @@ "overrides": { "machine_name": { "default_value": "Flying Bear Ghost 5" }, - "machine_start_gcode": { "default_value": "M220 S100 ;Reset Feedrate\nM221 S100 ;Reset Flowrate\n\nG28 ;Home\n\n;Fix X0 Y0 being outside the bed after homing\nG1 Z2.0 F3000 ;Move Z Axis up\nG1 X1.3 Y4.8 ;Place the nozzle over the bed\nG92 X0 Y0 ;Set new X0 Y0\n\n;Code for nozzle cleaning and flow normalization\nG92 E0 ;Reset Extruder\nG1 Z2.0 F3000 ;Move Z Axis up\nG1 X10.4 Y20 Z0.28 F5000.0\nG1 X10.4 Y170.0 Z0.28 F1500.0 E15\nG1 X10.1 Y170.0 Z0.28 F5000.0\nG1 X10.1 Y40 Z0.28 F1500.0 E30\n\nG92 E0 ;Reset Extruder\nG1 Z2.0 F3000 ;Move Z Axis up" }, "machine_width": { "default_value": 255 }, "machine_depth": { "default_value": 210 }, - "machine_height": { "default_value": 210 }, + "machine_height": { "default_value": 200 }, "machine_steps_per_mm_x": { "default_value": 80 }, "machine_steps_per_mm_y": { "default_value": 80 }, diff --git a/resources/definitions/geeetech_a30.def.json b/resources/definitions/geeetech_a30.def.json index 1f08d37445..d4f7df139f 100644 --- a/resources/definitions/geeetech_a30.def.json +++ b/resources/definitions/geeetech_a30.def.json @@ -4,7 +4,7 @@ "inherits": "fdmprinter", "metadata": { "author": "William & Cataldo URSO", - "manufacturer": "Shenzhen Geeetech Technology", + "manufacturer": "Geeetech", "file_formats": "text/x-gcode", "visible": true, "has_materials": true, diff --git a/resources/definitions/liquid.def.json b/resources/definitions/liquid.def.json index 256968353e..744cbb9f3c 100644 --- a/resources/definitions/liquid.def.json +++ b/resources/definitions/liquid.def.json @@ -17,7 +17,7 @@ "preferred_variant_name": "VO 0.4", "preferred_quality_type": "normal", "variants_name": "Extruder", - "supports_usb_connection": false, + "supports_usb_connection": true, "nozzle_offsetting_for_disallowed_areas": false, "weight": -1, "machine_extruder_trains": @@ -102,9 +102,9 @@ "acceleration_wall_0": { "value": "math.ceil(acceleration_wall * 500 / 1000)" }, "brim_width": { "value": "3" }, "cool_fan_full_at_height": { "value": "layer_height_0 + 4 * layer_height" }, - "cool_fan_speed": { "value": "100" }, + "cool_fan_speed": { "value": "70" }, "cool_fan_speed_max": { "value": "100" }, - "cool_min_speed": { "value": "5" }, + "cool_min_speed": { "value": "30" }, "infill_line_width": { "value": "round(line_width * 0.5 / 0.35, 2)" }, "infill_overlap": { "value": "0" }, "infill_pattern": { "value": "'triangles'" }, @@ -132,14 +132,16 @@ "raft_speed": { "value": "25" }, "raft_surface_layers": { "value": "1" }, - "retraction_amount": { "value": "5" }, + "retraction_amount": { "value": "3" }, "retraction_count_max": { "value": "10" }, "retraction_extrusion_window": { "value": "1" }, "retraction_hop": { "value": "2" }, "retraction_hop_enabled": { "value": "True" }, "retraction_hop_only_when_collides": { "value": "True" }, "retraction_min_travel": { "value": "5" }, - "retraction_prime_speed": { "value": "15" }, + "retraction_speed": { "value": "35" }, + "retraction_retract_speed": { "value": "35" }, + "retraction_prime_speed": { "value": "35" }, "skin_overlap": { "value": "10" }, "speed_equalize_flow_enabled": { "value": "True" }, diff --git a/resources/definitions/maker_made_300x.def.json b/resources/definitions/maker_made_300x.def.json index 9651aaf5f3..ae112af5d1 100644 --- a/resources/definitions/maker_made_300x.def.json +++ b/resources/definitions/maker_made_300x.def.json @@ -96,7 +96,6 @@ "speed_travel": {"value": 150}, "speed_layer_0": {"value": 10}, "speed_travel_layer_0": {"value": 50}, - "machine_max_feedrate_z": {"value": 0}, "speed_slowdown_layers": {"value": 2}, "speed_equalize_flow_enabled": {"value": false }, "acceleration_enabled": {"value": false }, diff --git a/resources/definitions/malyan_m200.def.json b/resources/definitions/malyan_m200.def.json index c853f8f772..e9980724cb 100644 --- a/resources/definitions/malyan_m200.def.json +++ b/resources/definitions/malyan_m200.def.json @@ -80,6 +80,7 @@ "retraction_amount" : { "default_value": 4.5}, "retraction_speed" : { "default_value": 40}, "coasting_enable": { "default_value": true }, - "prime_tower_enable": { "default_value": false} + "prime_tower_enable": { "default_value": false}, + "speed_z_hop": {"default_value": 1.5} } } diff --git a/resources/definitions/pbr3d_g1.def.json b/resources/definitions/pbr3d_g1.def.json new file mode 100644 index 0000000000..fbe1d5bfc6 --- /dev/null +++ b/resources/definitions/pbr3d_g1.def.json @@ -0,0 +1,45 @@ +{ + "version": 2, + "name": "PBR 3D Gen-I", + "inherits": "fdmprinter", + "metadata": { + "visible": true, + "author": "Kapil H. Sonone, Prof. Bahubali P. Fuladi", + "manufacturer": "PBR Research", + "file_formats": "text/x-gcode", + "platform": "pbr3d_g1_buildplate.stl", + "platform_offset": [0, -5, 0], + "machine_extruder_trains": + { + "0": "pbr3d_g1_extruder_0" + } + }, + + "overrides": { + "machine_name": { "default_value": "PBR 3D Gen-I" }, + "machine_heated_bed": { + "default_value": true + }, + "machine_width": { + "default_value": 200 + }, + "machine_height": { + "default_value": 200 + }, + "machine_depth": { + "default_value": 200 + }, + "machine_center_is_zero": { + "default_value": false + }, + "gantry_height": { + "value": "200" + }, + "machine_start_gcode": { + "default_value": "G28 ;Home\nG1 Z15.0 F6000 ;Move the Platform down 15mm\n;Prime the extruder\nG92 E0\nG1 F200 E3\nG92 E0" + }, + "machine_end_gcode": { + "default_value": "M104 S0\nM140 S0\n;Retract the Filament\nG92 E1\nG1 E-1 F300\nG28 X0 Y0\nM84" + } + } +} diff --git a/resources/definitions/printrbot_play.def.json b/resources/definitions/printrbot_play.def.json index e3c0c85d80..b1f7e72967 100644 --- a/resources/definitions/printrbot_play.def.json +++ b/resources/definitions/printrbot_play.def.json @@ -45,6 +45,7 @@ }, "machine_end_gcode": { "default_value": "M104 S0 ;extruder heater off\nM140 S0 ;heated bed heater off (if you have it)\nG91 ;relative positioning\nG1 E-1 F300 ;retract the filament a bit before lifting the nozzle, to release some of the pressure\nG1 Z+0.5 E-5 X-20 Y-20 F9000 ;move Z up a bit and retract filament even more\nG28 X0 Y0 ;move X/Y to min endstops, so the head is out of the way\nM84 ;steppers off\nG90 ;absolute positioning" - } + }, + "speed_z_hop": {"default_value": 5} } } diff --git a/resources/definitions/rigid3d_base.def.json b/resources/definitions/rigid3d_base.def.json index 76ed115a57..de6365c415 100644 --- a/resources/definitions/rigid3d_base.def.json +++ b/resources/definitions/rigid3d_base.def.json @@ -146,7 +146,8 @@ "adaptive_layer_height_variation_step": { "value": 0.04 }, "top_bottom_thickness": {"value": "layer_height_0 + layer_height * 3" }, - "wall_thickness": {"value": "line_width * 2" } + "wall_thickness": {"value": "line_width * 2" }, + "speed_z_hop": {"default_value": 8} } } \ No newline at end of file diff --git a/resources/definitions/strateo3d.def.json b/resources/definitions/strateo3d.def.json index 2858a859c5..9c865fe233 100644 --- a/resources/definitions/strateo3d.def.json +++ b/resources/definitions/strateo3d.def.json @@ -15,14 +15,14 @@ "preferred_material": "emotiontech_pla", "preferred_quality_type": "c", "variants_name": "Print Head", - "machine_extruder_trains": - { - "0": "strateo3d_right_extruder", + "machine_extruder_trains": + { + "0": "strateo3d_right_extruder", "1": "strateo3d_left_extruder" } }, - - "overrides": + + "overrides": { "machine_name": { "default_value": "Strateo3D" }, "machine_width": { "default_value": 600 }, @@ -35,28 +35,43 @@ "gantry_height": { "value": "40" }, "machine_extruder_count": { "default_value": 2 }, "machine_gcode_flavor": { "default_value": "Marlin" }, - "machine_start_gcode": { "default_value": "G28 \nG90 G1 X300 Y210 Z15 F6000 \nG92 E0" }, + "machine_start_gcode": { "default_value": ";M104 T0 S{material_standby_temperature, 0} \n;M104 T1 S{material_standby_temperature, 1} \n;M140 S{material_bed_temperature_layer_0} \n;M141 S{build_volume_temperature} \nG28 \nG90 \nT{initial_extruder_nr} \nG1 X0 Y0 Z15 F6000 \n;M190 S{material_bed_temperature_layer_0} \n;M109 S{material_print_temperature_layer_0, initial_extruder_nr} \nG1 Z0.3 \nG92 E0 \nG1 F300 X45 E18 \n;G1 F1500 E17 \nG1 F600 X25 \nG1 F600 Z3" }, "machine_end_gcode": { "default_value": "T1 \nM104 S0 \nT0 \nM104 S0 \nM140 S0 \nM141 S0 \nG91 \nG0 z1 \nG90 \nG28 \nM801.0 \nM84 \nM192" }, "extruder_prime_pos_y": {"minimum_value": "0", "maximum_value": "machine_depth"}, "extruder_prime_pos_x": {"minimum_value": "0", "maximum_value": "machine_width"}, "machine_heat_zone_length": { "default_value": 7 }, - "default_material_print_temperature": { "maximum_value_warning": "350" }, - "material_print_temperature": { "maximum_value_warning": "350" }, - "material_print_temperature_layer_0": { "maximum_value_warning": "350" }, - "material_bed_temperature": { "maximum_value": "130" }, - "material_bed_temperature_layer_0": { "maximum_value": "130" }, + "default_material_print_temperature": { "maximum_value_warning": "400", "maximum_value": "415" }, + "material_print_temperature": { "maximum_value_warning": "400", "maximum_value": "415" }, + "material_print_temperature_layer_0": { "maximum_value_warning": "400", "maximum_value": "415" }, + "material_initial_print_temperature": { "maximum_value_warning": "400", "maximum_value": "415" }, + "material_final_print_temperature": { "maximum_value_warning": "400", "maximum_value": "415" }, + "material_standby_temperature": { "maximum_value_warning": "material_print_temperature - 40", "maximum_value": "material_print_temperature" }, + "material_bed_temperature": { "maximum_value_warning": "140", "maximum_value": "140" }, + "material_bed_temperature_layer_0": { "maximum_value_warning": "140", "maximum_value": "140" }, "extruder_prime_pos_abs": { "default_value": true }, "machine_acceleration": { "default_value": 1500 }, + "machine_max_jerk_xy": { "default_value": 0.01 }, + "machine_max_jerk_z": { "default_value": 0}, "acceleration_enabled": { "value": false }, - "acceleration_print": { "value": "machine_acceleration" }, - "acceleration_wall": { "value": "math.ceil(acceleration_print * 1250 / acceleration_print)" }, - "acceleration_wall_0": { "value": "math.ceil(acceleration_print * 1000 / acceleration_print)" }, - "acceleration_topbottom": { "value": "math.ceil(acceleration_print * 1250 / acceleration_print)" }, - "acceleration_support": { "value": "acceleration_print" }, - "acceleration_support_interface": { "value": "acceleration_topbottom" }, - "acceleration_travel": { "value": "acceleration_print" }, - "acceleration_layer_0": { "value": "acceleration_topbottom" }, + "acceleration_print": { "value": "machine_acceleration", "maximum_value_warning": "1500" }, + "acceleration_infill": { "maximum_value_warning": "1500" }, + "acceleration_wall": { "value": "math.ceil(acceleration_print * 1250 / acceleration_print)", "maximum_value_warning": "1500" }, + "acceleration_wall_0": { "value": "math.ceil(acceleration_print * 1000 / acceleration_print)", "maximum_value_warning": "1500" }, + "acceleration_wall_x": { "maximum_value_warning": "1500" }, + "acceleration_topbottom": { "value": "math.ceil(acceleration_print * 1250 / acceleration_print)", "maximum_value_warning": "1500" }, + "acceleration_support": { "value": "acceleration_print", "maximum_value_warning": "1500" }, + "acceleration_support_infill": { "maximum_value_warning": "1500" }, + "acceleration_support_interface": { "value": "acceleration_topbottom", "maximum_value_warning": "1500" }, + "acceleration_support_roof": { "maximum_value_warning": "1500" }, + "acceleration_support_bottom": { "maximum_value_warning": "1500" }, + "acceleration_prime_tower": { "maximum_value_warning": "1500" }, + "acceleration_travel": { "value": "acceleration_print", "maximum_value_warning": "1500" }, + "acceleration_layer_0": { "value": "acceleration_topbottom", "maximum_value_warning": "1500" }, + "acceleration_print_layer_0": { "maximum_value_warning": "1500" }, + "acceleration_travel_layer_0": { "maximum_value_warning": "1500" }, + "acceleration_skirt_brim": { "maximum_value_warning": "1500" }, + "adaptive_layer_height_variation": { "default_value": 0.1 }, "adaptive_layer_height_variation_step": { "default_value": 0.05 }, "adhesion_type": { "default_value": "skirt" }, @@ -66,30 +81,39 @@ "infill_before_walls": { "default_value": false }, "infill_overlap": { "value": "0" }, "infill_wipe_dist": { "value": "0" }, - "jerk_enabled": { "value": "False" }, - "jerk_layer_0": { "value": "jerk_topbottom" }, - "jerk_prime_tower": { "value": "math.ceil(jerk_print * 15 / 25)" }, - "jerk_print": { "value": "25" }, - "jerk_support": { "value": "math.ceil(jerk_print * 15 / 25)" }, - "jerk_support_interface": { "value": "jerk_topbottom" }, - "jerk_topbottom": { "value": "math.ceil(jerk_print * 5 / 25)" }, - "jerk_wall": { "value": "math.ceil(jerk_print * 10 / 25)" }, - "jerk_wall_0": { "value": "math.ceil(jerk_wall * 5 / 10)" }, + + "jerk_enabled": { "value": "False", "maximum_value_warning": "0.01" }, + "jerk_print": { "value": "0.01", "maximum_value_warning": "0.01" }, + "jerk_infill": { "value": "0.01", "maximum_value_warning": "0.01" }, + "jerk_layer_0": { "value": "jerk_topbottom", "maximum_value_warning": "0.01" }, + "jerk_print_layer_0": { "maximum_value_warning": "0.01" }, + "jerk_travel_layer_0": { "maximum_value_warning": "0.01" }, + "jerk_skirt_brim": { "maximum_value_warning": "0.01" }, + "jerk_prime_tower": { "value": "jerk_print * 15 / 25", "maximum_value_warning": "0.01" }, + "jerk_support": { "value": "jerk_print * 15 / 25", "maximum_value_warning": "0.01" }, + "jerk_support_infill": { "maximum_value_warning": "0.01" }, + "jerk_support_interface": { "value": "jerk_topbottom", "maximum_value_warning": "0.01" }, + "jerk_support_roof": { "maximum_value_warning": "0.01" }, + "jerk_support_bottom": { "maximum_value_warning": "0.01" }, + "jerk_topbottom": { "value": "jerk_print * 5 / 25", "maximum_value_warning": "0.01" }, + "jerk_wall": { "value": "jerk_print * 5 / 25", "maximum_value_warning": "0.01" }, + "jerk_wall_0": { "value": "jerk_wall * 5 / 10", "maximum_value_warning": "0.01" }, + "jerk_wall_x": { "maximum_value_warning": "0.01" }, + "jerk_travel": { "value": "machine_max_jerk_xy", "maximum_value_warning": "0.01" }, + "layer_start_x": { "value": "sum(extruderValues('machine_extruder_start_pos_x')) / len(extruderValues('machine_extruder_start_pos_x'))" }, "layer_start_y": { "value": "sum(extruderValues('machine_extruder_start_pos_y')) / len(extruderValues('machine_extruder_start_pos_y'))" }, "machine_min_cool_heat_time_window": { "value": "15" }, "machine_nozzle_cool_down_speed": { "default_value": 0.50 }, "machine_nozzle_heat_up_speed": { "default_value": 2.25 }, - "material_final_print_temperature": { "value": "material_print_temperature - 10" }, "material_flow": { "default_value": 93 }, "material_flow_layer_0": { "value": "math.ceil(material_flow*1)" }, - "material_initial_print_temperature": { "value": "material_print_temperature - 5" }, "meshfix_maximum_resolution": { "value": "0.5" }, "meshfix_maximum_deviation": { "default_value": 0.04 }, "optimize_wall_printing_order": { "value": "True" }, "prime_blob_enable": { "enabled": false, "default_value": false }, "prime_tower_min_volume": { "default_value": 35 }, - "prime_tower_position_x": { "value": "machine_width/2 - max(extruderValue(adhesion_extruder_nr, 'brim_width') * extruderValue(adhesion_extruder_nr, 'initial_layer_line_width_factor') / 100 if adhesion_type == 'brim' else (extruderValue(adhesion_extruder_nr, 'raft_margin') if adhesion_type == 'raft' else (extruderValue(adhesion_extruder_nr, 'skirt_gap') if adhesion_type == 'skirt' else 0)), max(extruderValues('travel_avoid_distance'))) - max(extruderValues('support_offset')) - sum(extruderValues('skirt_brim_line_width')) * extruderValue(adhesion_extruder_nr, 'initial_layer_line_width_factor') / 100 - (resolveOrValue('draft_shield_dist') if resolveOrValue('draft_shield_enabled') else 0) - 1" }, + "prime_tower_position_x": { "value": "machine_width/2 + prime_tower_size/2" }, "prime_tower_position_y": { "value": "machine_depth - prime_tower_size - max(extruderValue(adhesion_extruder_nr, 'brim_width') * extruderValue(adhesion_extruder_nr, 'initial_layer_line_width_factor') / 100 if adhesion_type == 'brim' else (extruderValue(adhesion_extruder_nr, 'raft_margin') if adhesion_type == 'raft' else (extruderValue(adhesion_extruder_nr, 'skirt_gap') if adhesion_type == 'skirt' else 0)), max(extruderValues('travel_avoid_distance'))) - max(extruderValues('support_offset')) - sum(extruderValues('skirt_brim_line_width')) * extruderValue(adhesion_extruder_nr, 'initial_layer_line_width_factor') / 100 - (resolveOrValue('draft_shield_dist') if resolveOrValue('draft_shield_enabled') else 0) - 1" }, "retraction_amount": { "default_value": 1.5 }, "retraction_combing": { "default_value": "all" }, @@ -135,4 +159,4 @@ "travel_avoid_distance": { "value": "3 if extruders_enabled_count > 1 else machine_nozzle_tip_outer_diameter / 2 * 1.5" }, "wall_thickness": { "value": "wall_line_width_0 + wall_line_width_x" } } -} \ No newline at end of file +} diff --git a/resources/definitions/tevo_tarantula.def.json b/resources/definitions/tevo_tarantula.def.json index eee773cd74..8efa9c4f87 100644 --- a/resources/definitions/tevo_tarantula.def.json +++ b/resources/definitions/tevo_tarantula.def.json @@ -47,6 +47,7 @@ "machine_max_acceleration_y": { "default_value": 2650 }, "acceleration_print": { "default_value": 2650 }, "machine_start_gcode": { "default_value": "G21 ;metric values\nG90 ;absolute positioning\nM82 ;set extruder to absolute mode\nM107 ;start with the fan off\nG28 X0 Y0 ;move X/Y to min endstops\nG28 Z0 ;move Z to min endstops\nG1 Z15.0 F9000 ;move the platform down 15mm\nG92 E0 ;zero the extruded length\nG1 F200 E3 ;extrude 3mm of feed stock\nG92 E0 ;zero the extruded length again\nG1 F9000\n;Put printing message on LCD screen\nM117 Printing..." }, - "machine_end_gcode": { "default_value": "M104 S0 ;extruder heater off\nM140 S0 ;heated bed heater off (if you have it)\nG91 ;relative positioning\nG1 E-1 F300 ;retract the filament a bit before lifting the nozzle, to release some of the pressure\nG1 Z+0.5 E-5 X-20 Y-20 F9000 ;move Z up a bit and retract filament even more\nG90 ;absolute positioning\nG1 X0 Y200 F3600 ;move extruder out of the way by moving the baseplate to the front for easier access to printed object\nM84 ;steppers off" } + "machine_end_gcode": { "default_value": "M104 S0 ;extruder heater off\nM140 S0 ;heated bed heater off (if you have it)\nG91 ;relative positioning\nG1 E-1 F300 ;retract the filament a bit before lifting the nozzle, to release some of the pressure\nG1 Z+0.5 E-5 X-20 Y-20 F9000 ;move Z up a bit and retract filament even more\nG90 ;absolute positioning\nG1 X0 Y200 F3600 ;move extruder out of the way by moving the baseplate to the front for easier access to printed object\nM84 ;steppers off" }, + "speed_z_hop": {"default_value": 3} } } diff --git a/resources/definitions/voron0_120.def.json b/resources/definitions/voron0_120.def.json new file mode 100644 index 0000000000..d0bf92f0e0 --- /dev/null +++ b/resources/definitions/voron0_120.def.json @@ -0,0 +1,18 @@ +{ + "name": "Voron 0", + "version": 2, + "inherits": "voron2_base", + "metadata": + { + "visible": true, + "platform": "voron0_120_bed.stl", + "quality_definition": "voron2_base" + }, + "overrides": + { + "machine_name": { "default_value": "VORON 0" }, + "machine_width": { "default_value": 120 }, + "machine_depth": { "default_value": 120 }, + "machine_height": { "default_value": 120 } + } +} diff --git a/resources/extruders/atom2_extruder_0.def.json b/resources/extruders/atom2_extruder_0.def.json new file mode 100644 index 0000000000..be9d5782ff --- /dev/null +++ b/resources/extruders/atom2_extruder_0.def.json @@ -0,0 +1,15 @@ +{ + "version": 2, + "name": "Extruder 1", + "inherits": "fdmextruder", + "metadata": { + "machine": "atom2", + "position": "0" + }, + + "overrides": { + "extruder_nr": { "default_value": 0 }, + "machine_nozzle_size": { "default_value": 0.4 }, + "material_diameter": { "default_value": 1.75 } + } +} diff --git a/resources/extruders/creasee_extruder_0.def.json b/resources/extruders/creasee_extruder_0.def.json new file mode 100644 index 0000000000..abefa6b1c8 --- /dev/null +++ b/resources/extruders/creasee_extruder_0.def.json @@ -0,0 +1,15 @@ +{ + "version": 2, + "name": "Extruder 1", + "inherits": "fdmextruder", + "metadata": { + "machine": "creasee_cs20", + "position": "0" + }, + + "overrides": { + "extruder_nr": { "default_value": 0 }, + "machine_nozzle_size": { "default_value": 0.4 }, + "material_diameter": { "default_value": 1.75 } + } +} diff --git a/resources/extruders/creasee_extruder_1.def.json b/resources/extruders/creasee_extruder_1.def.json new file mode 100644 index 0000000000..747e1c48f8 --- /dev/null +++ b/resources/extruders/creasee_extruder_1.def.json @@ -0,0 +1,15 @@ +{ + "version": 2, + "name": "Extruder 1", + "inherits": "fdmextruder", + "metadata": { + "machine": "creasee_cs30", + "position": "0" + }, + + "overrides": { + "extruder_nr": { "default_value": 0 }, + "machine_nozzle_size": { "default_value": 0.4 }, + "material_diameter": { "default_value": 1.75 } + } +} diff --git a/resources/extruders/flsun_sr_extruder_0.def.json b/resources/extruders/flsun_sr_extruder_0.def.json new file mode 100644 index 0000000000..31880b5130 --- /dev/null +++ b/resources/extruders/flsun_sr_extruder_0.def.json @@ -0,0 +1,20 @@ +{ + "version": 2, + "name": "Extruder 1", + "inherits": "fdmextruder", + "metadata": { + "machine": "flsun_sr", + "position": "0" + }, + "overrides": { + "extruder_nr": { + "default_value": 0 + }, + "machine_nozzle_size": { + "default_value": 0.4 + }, + "material_diameter": { + "default_value": 1.75 + } + } +} diff --git a/resources/extruders/pbr3d_g1_extruder_0.def.json b/resources/extruders/pbr3d_g1_extruder_0.def.json new file mode 100644 index 0000000000..3a79fe4f20 --- /dev/null +++ b/resources/extruders/pbr3d_g1_extruder_0.def.json @@ -0,0 +1,15 @@ +{ + "version": 2, + "name": "Extruder 1", + "inherits": "fdmextruder", + "metadata": { + "machine": "pbr3d_g1", + "position": "0" + }, + + "overrides": { + "extruder_nr": { "default_value": 0 }, + "machine_nozzle_size": { "default_value": 0.4 }, + "material_diameter": { "default_value": 1.75 } + } +} diff --git a/resources/i18n/de_DE/cura.po b/resources/i18n/de_DE/cura.po index 931571e60f..fb20f85938 100644 --- a/resources/i18n/de_DE/cura.po +++ b/resources/i18n/de_DE/cura.po @@ -173,7 +173,7 @@ msgstr "Versucht, ein Cura-Backup wiederherzustellen, das eine höhere Version a #: /home/trin/Gedeeld/Projects/Cura/cura/Backups/Backup.py:157 msgctxt "@info:backup_failed" msgid "The following error occurred while trying to restore a Cura backup:" -msgstr "" +msgstr "Beim Versuch, ein Backup von Cura wiederherzustellen, trat der folgende Fehler auf:" #: /home/trin/Gedeeld/Projects/Cura/cura/BuildVolume.py:98 msgctxt "@info:status" @@ -2255,7 +2255,7 @@ msgstr "Benutzerhandbücher online anzeigen" #: /home/trin/Gedeeld/Projects/Cura/plugins/MonitorStage/MonitorMain.qml:172 msgctxt "@info" msgid "In order to monitor your print from Cura, please connect the printer." -msgstr "" +msgstr "Um Ihren Druck von Cura aus zu überwachen, schließen Sie bitte den Drucker an." #: /home/trin/Gedeeld/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:42 msgctxt "@label" @@ -2379,7 +2379,7 @@ msgstr "Linienbreite" #: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:130 msgctxt "@label:listbox" msgid "Flow" -msgstr "" +msgstr "Fluss" #: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:171 msgctxt "@label" @@ -3375,7 +3375,7 @@ msgstr "Draufsicht" #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:154 msgctxt "@action:inmenu menubar:view" msgid "Bottom View" -msgstr "" +msgstr "Ansicht von unten" #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:161 msgctxt "@action:inmenu menubar:view" @@ -4608,7 +4608,7 @@ msgstr "Export" #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:199 msgctxt "@action:button Sending materials to printers" msgid "Sync with Printers" -msgstr "" +msgstr "Mit Druckern synchronisieren" #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:248 msgctxt "@action:label" @@ -4662,7 +4662,7 @@ msgstr "Material erfolgreich nach %1 exportiert" #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:388 msgctxt "@title:window" msgid "Export All Materials" -msgstr "" +msgstr "Alle Materialien exportieren" #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:72 msgctxt "@title" @@ -5575,12 +5575,12 @@ msgstr "Cura-Profil-Writer" #: DigitalLibrary/plugin.json msgctxt "description" msgid "Connects to the Digital Library, allowing Cura to open files from and save files to the Digital Library." -msgstr "" +msgstr "Stellt eine Verbindung zur Digitalen Bibliothek her und ermöglicht es Cura, Dateien aus der Digitalen Bibliothek zu öffnen und darin zu speichern." #: DigitalLibrary/plugin.json msgctxt "name" msgid "Ultimaker Digital Library" -msgstr "" +msgstr "Digitale Bibliothek von Ultimaker" #: FirmwareUpdateChecker/plugin.json msgctxt "description" @@ -6055,22 +6055,22 @@ msgstr "Upgrade von Version 4.7 auf 4.8" #: VersionUpgrade/VersionUpgrade48to49/plugin.json msgctxt "description" msgid "Upgrades configurations from Cura 4.8 to Cura 4.9." -msgstr "" +msgstr "Upgrade der Konfigurationen von Cura 4.8 auf Cura 4.9." #: VersionUpgrade/VersionUpgrade48to49/plugin.json msgctxt "name" msgid "Version Upgrade 4.8 to 4.9" -msgstr "" +msgstr "Upgrade von Version 4.8 auf 4.9" #: VersionUpgrade/VersionUpgrade49to410/plugin.json msgctxt "description" msgid "Upgrades configurations from Cura 4.9 to Cura 4.10." -msgstr "" +msgstr "Upgrade der Konfigurationen von Cura 4.9 auf Cura 4.10." #: VersionUpgrade/VersionUpgrade49to410/plugin.json msgctxt "name" msgid "Version Upgrade 4.9 to 4.10" -msgstr "" +msgstr "Upgrade von Version 4.9 auf 4.10" #: X3DReader/plugin.json msgctxt "description" diff --git a/resources/i18n/de_DE/fdmprinter.def.json.po b/resources/i18n/de_DE/fdmprinter.def.json.po index 379a069420..3eb590b680 100644 --- a/resources/i18n/de_DE/fdmprinter.def.json.po +++ b/resources/i18n/de_DE/fdmprinter.def.json.po @@ -1177,7 +1177,7 @@ msgstr "Hinten links" #: fdmprinter.def.json msgctxt "z_seam_position option back" msgid "Back" -msgstr "Zurück" +msgstr "Hinten" #: fdmprinter.def.json msgctxt "z_seam_position option backright" @@ -3201,7 +3201,8 @@ msgstr "Max. Kammentfernung ohne Einziehen" #: fdmprinter.def.json msgctxt "retraction_combing_max_distance description" msgid "When greater than zero, combing travel moves that are longer than this distance will use retraction. If set to zero, there is no maximum and combing moves will not use retraction." -msgstr "" +msgstr "Bei Werten größer als Null verwenden die Combing-Fahrbewegungen, die weiter als über diese Distanz erfolgen, die Einzugsfunktion. Beim Wert Null gibt es" +" keine Maximalstellung, und die Combing-Fahrbewegungen verwenden die Einzugsfunktion nicht." #: fdmprinter.def.json msgctxt "travel_retract_before_outer_wall label" diff --git a/resources/i18n/es_ES/cura.po b/resources/i18n/es_ES/cura.po index 983dea8dad..08bb506928 100644 --- a/resources/i18n/es_ES/cura.po +++ b/resources/i18n/es_ES/cura.po @@ -173,7 +173,7 @@ msgstr "Se ha intentado restaurar una copia de seguridad de Cura superior a la v #: /home/trin/Gedeeld/Projects/Cura/cura/Backups/Backup.py:157 msgctxt "@info:backup_failed" msgid "The following error occurred while trying to restore a Cura backup:" -msgstr "" +msgstr "Se ha producido el siguiente error al intentar restaurar una copia de seguridad de Cura:" #: /home/trin/Gedeeld/Projects/Cura/cura/BuildVolume.py:98 msgctxt "@info:status" @@ -2256,7 +2256,7 @@ msgstr "Ver manuales de usuario en línea" #: /home/trin/Gedeeld/Projects/Cura/plugins/MonitorStage/MonitorMain.qml:172 msgctxt "@info" msgid "In order to monitor your print from Cura, please connect the printer." -msgstr "" +msgstr "Para supervisar la copia impresa desde Cura, conecte la impresora." #: /home/trin/Gedeeld/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:42 msgctxt "@label" @@ -2380,7 +2380,7 @@ msgstr "Ancho de línea" #: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:130 msgctxt "@label:listbox" msgid "Flow" -msgstr "" +msgstr "Flujo" #: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:171 msgctxt "@label" @@ -3376,7 +3376,7 @@ msgstr "Vista superior" #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:154 msgctxt "@action:inmenu menubar:view" msgid "Bottom View" -msgstr "" +msgstr "Vista inferior" #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:161 msgctxt "@action:inmenu menubar:view" @@ -4609,7 +4609,7 @@ msgstr "Exportar" #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:199 msgctxt "@action:button Sending materials to printers" msgid "Sync with Printers" -msgstr "" +msgstr "Sincronizar con las impresoras" #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:248 msgctxt "@action:label" @@ -4663,7 +4663,7 @@ msgstr "El material se ha exportado correctamente a %1" #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:388 msgctxt "@title:window" msgid "Export All Materials" -msgstr "" +msgstr "Exportar todos los materiales" #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:72 msgctxt "@title" @@ -5576,12 +5576,12 @@ msgstr "Escritor de perfiles de Cura" #: DigitalLibrary/plugin.json msgctxt "description" msgid "Connects to the Digital Library, allowing Cura to open files from and save files to the Digital Library." -msgstr "" +msgstr "Se conecta a la biblioteca digital, por lo que Cura puede abrir y guardar archivos en ella." #: DigitalLibrary/plugin.json msgctxt "name" msgid "Ultimaker Digital Library" -msgstr "" +msgstr "Ultimaker Digital Library" #: FirmwareUpdateChecker/plugin.json msgctxt "description" @@ -6056,22 +6056,22 @@ msgstr "Actualización de la versión 4.7 a la 4.8" #: VersionUpgrade/VersionUpgrade48to49/plugin.json msgctxt "description" msgid "Upgrades configurations from Cura 4.8 to Cura 4.9." -msgstr "" +msgstr "Actualiza la configuración de Cura 4.8 a Cura 4.9." #: VersionUpgrade/VersionUpgrade48to49/plugin.json msgctxt "name" msgid "Version Upgrade 4.8 to 4.9" -msgstr "" +msgstr "Actualización de la versión 4.8 a la 4.9" #: VersionUpgrade/VersionUpgrade49to410/plugin.json msgctxt "description" msgid "Upgrades configurations from Cura 4.9 to Cura 4.10." -msgstr "" +msgstr "Actualiza la configuración de Cura 4.9 a Cura 4.10." #: VersionUpgrade/VersionUpgrade49to410/plugin.json msgctxt "name" msgid "Version Upgrade 4.9 to 4.10" -msgstr "" +msgstr "Actualización de la versión 4.9 a la 4.10" #: X3DReader/plugin.json msgctxt "description" diff --git a/resources/i18n/es_ES/fdmprinter.def.json.po b/resources/i18n/es_ES/fdmprinter.def.json.po index a12430cf6c..4983fbd68b 100644 --- a/resources/i18n/es_ES/fdmprinter.def.json.po +++ b/resources/i18n/es_ES/fdmprinter.def.json.po @@ -3201,7 +3201,8 @@ msgstr "Distancia de peinada máxima sin retracción" #: fdmprinter.def.json msgctxt "retraction_combing_max_distance description" msgid "When greater than zero, combing travel moves that are longer than this distance will use retraction. If set to zero, there is no maximum and combing moves will not use retraction." -msgstr "" +msgstr "Si es mayor que cero, los movimientos de desplazamiento de peinada que sean superiores a esta distancia utilizarán retracción. Si se establece como cero," +" no hay un máximo y los movimientos de peinada no utilizarán la retracción." #: fdmprinter.def.json msgctxt "travel_retract_before_outer_wall label" diff --git a/resources/i18n/fr_FR/cura.po b/resources/i18n/fr_FR/cura.po index da009fc692..a0f3ac59cb 100644 --- a/resources/i18n/fr_FR/cura.po +++ b/resources/i18n/fr_FR/cura.po @@ -173,7 +173,7 @@ msgstr "A essayé de restaurer une sauvegarde Cura supérieure à la version act #: /home/trin/Gedeeld/Projects/Cura/cura/Backups/Backup.py:157 msgctxt "@info:backup_failed" msgid "The following error occurred while trying to restore a Cura backup:" -msgstr "" +msgstr "L'erreur suivante s'est produite lors de la restauration d'une sauvegarde Cura :" #: /home/trin/Gedeeld/Projects/Cura/cura/BuildVolume.py:98 msgctxt "@info:status" @@ -2257,7 +2257,7 @@ msgstr "Voir les manuels d'utilisation en ligne" #: /home/trin/Gedeeld/Projects/Cura/plugins/MonitorStage/MonitorMain.qml:172 msgctxt "@info" msgid "In order to monitor your print from Cura, please connect the printer." -msgstr "" +msgstr "Pour surveiller votre impression depuis Cura, veuillez connecter l'imprimante." #: /home/trin/Gedeeld/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:42 msgctxt "@label" @@ -2381,7 +2381,7 @@ msgstr "Largeur de ligne" #: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:130 msgctxt "@label:listbox" msgid "Flow" -msgstr "" +msgstr "Débit" #: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:171 msgctxt "@label" @@ -3374,7 +3374,7 @@ msgstr "Vue du dessus" #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:154 msgctxt "@action:inmenu menubar:view" msgid "Bottom View" -msgstr "" +msgstr "Vue de dessous" #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:161 msgctxt "@action:inmenu menubar:view" @@ -4607,7 +4607,7 @@ msgstr "Exporter" #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:199 msgctxt "@action:button Sending materials to printers" msgid "Sync with Printers" -msgstr "" +msgstr "Synchroniser les imprimantes" #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:248 msgctxt "@action:label" @@ -4661,7 +4661,7 @@ msgstr "Matériau exporté avec succès vers %1" #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:388 msgctxt "@title:window" msgid "Export All Materials" -msgstr "" +msgstr "Exporter tous les matériaux" #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:72 msgctxt "@title" @@ -5574,12 +5574,12 @@ msgstr "Générateur de profil Cura" #: DigitalLibrary/plugin.json msgctxt "description" msgid "Connects to the Digital Library, allowing Cura to open files from and save files to the Digital Library." -msgstr "" +msgstr "Se connecte à la Digital Library, permettant à Cura d'ouvrir des fichiers à partir de cette dernière et d'y enregistrer des fichiers." #: DigitalLibrary/plugin.json msgctxt "name" msgid "Ultimaker Digital Library" -msgstr "" +msgstr "Ultimaker Digital Library" #: FirmwareUpdateChecker/plugin.json msgctxt "description" @@ -6054,22 +6054,22 @@ msgstr "Mise à niveau de 4.7 vers 4.8" #: VersionUpgrade/VersionUpgrade48to49/plugin.json msgctxt "description" msgid "Upgrades configurations from Cura 4.8 to Cura 4.9." -msgstr "" +msgstr "Mises à niveau des configurations de Cura 4.8 vers Cura 4.9." #: VersionUpgrade/VersionUpgrade48to49/plugin.json msgctxt "name" msgid "Version Upgrade 4.8 to 4.9" -msgstr "" +msgstr "Mise à niveau de 4.8 vers 4.9" #: VersionUpgrade/VersionUpgrade49to410/plugin.json msgctxt "description" msgid "Upgrades configurations from Cura 4.9 to Cura 4.10." -msgstr "" +msgstr "Mises à niveau des configurations de Cura 4.9 vers Cura 4.10." #: VersionUpgrade/VersionUpgrade49to410/plugin.json msgctxt "name" msgid "Version Upgrade 4.9 to 4.10" -msgstr "" +msgstr "Mise à niveau de 4.9 vers 4.10" #: X3DReader/plugin.json msgctxt "description" diff --git a/resources/i18n/fr_FR/fdmprinter.def.json.po b/resources/i18n/fr_FR/fdmprinter.def.json.po index 2947e3a990..b9a95fdedb 100644 --- a/resources/i18n/fr_FR/fdmprinter.def.json.po +++ b/resources/i18n/fr_FR/fdmprinter.def.json.po @@ -3201,7 +3201,8 @@ msgstr "Distance de détour max. sans rétraction" #: fdmprinter.def.json msgctxt "retraction_combing_max_distance description" msgid "When greater than zero, combing travel moves that are longer than this distance will use retraction. If set to zero, there is no maximum and combing moves will not use retraction." -msgstr "" +msgstr "Lorsque cette distance est supérieure à zéro, les déplacements de détour qui sont plus longs que cette distance utiliseront la rétraction. Si elle est" +" définie sur zéro, il n'y a pas de maximum et les mouvements de détour n'utiliseront pas la rétraction." #: fdmprinter.def.json msgctxt "travel_retract_before_outer_wall label" diff --git a/resources/i18n/it_IT/cura.po b/resources/i18n/it_IT/cura.po index 11a5a35283..0c5eb87796 100644 --- a/resources/i18n/it_IT/cura.po +++ b/resources/i18n/it_IT/cura.po @@ -173,7 +173,7 @@ msgstr "Tentativo di ripristinare un backup di Cura di versione superiore rispet #: /home/trin/Gedeeld/Projects/Cura/cura/Backups/Backup.py:157 msgctxt "@info:backup_failed" msgid "The following error occurred while trying to restore a Cura backup:" -msgstr "" +msgstr "Nel tentativo di ripristinare un backup di Cura, si è verificato il seguente errore:" #: /home/trin/Gedeeld/Projects/Cura/cura/BuildVolume.py:98 msgctxt "@info:status" @@ -2258,7 +2258,7 @@ msgstr "Visualizza i manuali utente online" #: /home/trin/Gedeeld/Projects/Cura/plugins/MonitorStage/MonitorMain.qml:172 msgctxt "@info" msgid "In order to monitor your print from Cura, please connect the printer." -msgstr "" +msgstr "Al fine di monitorare la stampa da Cura, collegare la stampante." #: /home/trin/Gedeeld/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:42 msgctxt "@label" @@ -2382,7 +2382,7 @@ msgstr "Larghezza della linea" #: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:130 msgctxt "@label:listbox" msgid "Flow" -msgstr "" +msgstr "Flusso" #: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:171 msgctxt "@label" @@ -3377,7 +3377,7 @@ msgstr "Visualizzazione superiore" #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:154 msgctxt "@action:inmenu menubar:view" msgid "Bottom View" -msgstr "" +msgstr "Vista inferiore" #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:161 msgctxt "@action:inmenu menubar:view" @@ -4610,7 +4610,7 @@ msgstr "Esporta" #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:199 msgctxt "@action:button Sending materials to printers" msgid "Sync with Printers" -msgstr "" +msgstr "Sincronizza con le stampanti" #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:248 msgctxt "@action:label" @@ -4664,7 +4664,7 @@ msgstr "Materiale esportato correttamente su %1" #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:388 msgctxt "@title:window" msgid "Export All Materials" -msgstr "" +msgstr "Esporta tutti i materiali" #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:72 msgctxt "@title" @@ -5577,12 +5577,12 @@ msgstr "Writer profilo Cura" #: DigitalLibrary/plugin.json msgctxt "description" msgid "Connects to the Digital Library, allowing Cura to open files from and save files to the Digital Library." -msgstr "" +msgstr "Si collega alla Digital Library, consentendo a Cura di aprire file e salvare file in Digital Library." #: DigitalLibrary/plugin.json msgctxt "name" msgid "Ultimaker Digital Library" -msgstr "" +msgstr "Ultimaker Digital Library" #: FirmwareUpdateChecker/plugin.json msgctxt "description" @@ -6057,22 +6057,22 @@ msgstr "Aggiornamento della versione da 4.7 a 4.8" #: VersionUpgrade/VersionUpgrade48to49/plugin.json msgctxt "description" msgid "Upgrades configurations from Cura 4.8 to Cura 4.9." -msgstr "" +msgstr "Aggiorna le configurazioni da Cura 4.8 a Cura 4.9." #: VersionUpgrade/VersionUpgrade48to49/plugin.json msgctxt "name" msgid "Version Upgrade 4.8 to 4.9" -msgstr "" +msgstr "Aggiornamento della versione da 4.8 a 4.9" #: VersionUpgrade/VersionUpgrade49to410/plugin.json msgctxt "description" msgid "Upgrades configurations from Cura 4.9 to Cura 4.10." -msgstr "" +msgstr "Aggiorna le configurazioni da Cura 4.9 a Cura 4.10." #: VersionUpgrade/VersionUpgrade49to410/plugin.json msgctxt "name" msgid "Version Upgrade 4.9 to 4.10" -msgstr "" +msgstr "Aggiornamento della versione da 4.9 a 4.10" #: X3DReader/plugin.json msgctxt "description" diff --git a/resources/i18n/it_IT/fdmprinter.def.json.po b/resources/i18n/it_IT/fdmprinter.def.json.po index 1cf3f584ae..0754a9374c 100644 --- a/resources/i18n/it_IT/fdmprinter.def.json.po +++ b/resources/i18n/it_IT/fdmprinter.def.json.po @@ -3201,7 +3201,8 @@ msgstr "Massima distanza di combing senza retrazione" #: fdmprinter.def.json msgctxt "retraction_combing_max_distance description" msgid "When greater than zero, combing travel moves that are longer than this distance will use retraction. If set to zero, there is no maximum and combing moves will not use retraction." -msgstr "" +msgstr "Per un valore superiore a zero, le corse di spostamento in modalità combing superiori a tale distanza utilizzeranno la retrazione. Se il valore impostato" +" è zero, non è presente un valore massimo e le corse in modalità combing non utilizzeranno la retrazione." #: fdmprinter.def.json msgctxt "travel_retract_before_outer_wall label" diff --git a/resources/i18n/ja_JP/cura.po b/resources/i18n/ja_JP/cura.po index b0e78466fd..c170d3ba8e 100644 --- a/resources/i18n/ja_JP/cura.po +++ b/resources/i18n/ja_JP/cura.po @@ -173,7 +173,7 @@ msgstr "現行バージョンより上の Cura バックアップをリストア #: /home/trin/Gedeeld/Projects/Cura/cura/Backups/Backup.py:157 msgctxt "@info:backup_failed" msgid "The following error occurred while trying to restore a Cura backup:" -msgstr "" +msgstr "Curaのバックアップのリストア中に次のエラーが発生しました。" #: /home/trin/Gedeeld/Projects/Cura/cura/BuildVolume.py:98 msgctxt "@info:status" @@ -2252,7 +2252,7 @@ msgstr "ユーザーマニュアルをオンラインで見る" #: /home/trin/Gedeeld/Projects/Cura/plugins/MonitorStage/MonitorMain.qml:172 msgctxt "@info" msgid "In order to monitor your print from Cura, please connect the printer." -msgstr "" +msgstr "Cura から印刷を監視するには、プリンタを接続してください。" #: /home/trin/Gedeeld/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:42 msgctxt "@label" @@ -2375,7 +2375,7 @@ msgstr "ライン幅" #: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:130 msgctxt "@label:listbox" msgid "Flow" -msgstr "" +msgstr "フロー" #: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:171 msgctxt "@label" @@ -3370,7 +3370,7 @@ msgstr "トップビュー" #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:154 msgctxt "@action:inmenu menubar:view" msgid "Bottom View" -msgstr "" +msgstr "底面図" #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:161 msgctxt "@action:inmenu menubar:view" @@ -4600,7 +4600,7 @@ msgstr "書き出す" #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:199 msgctxt "@action:button Sending materials to printers" msgid "Sync with Printers" -msgstr "" +msgstr "プリンターと同期する" #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:248 msgctxt "@action:label" @@ -4654,7 +4654,7 @@ msgstr "フィラメントの%1への書き出しが完了 #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:388 msgctxt "@title:window" msgid "Export All Materials" -msgstr "" +msgstr "すべての材料を書き出す" #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:72 msgctxt "@title" @@ -5562,12 +5562,12 @@ msgstr "Curaプロファイルライター" #: DigitalLibrary/plugin.json msgctxt "description" msgid "Connects to the Digital Library, allowing Cura to open files from and save files to the Digital Library." -msgstr "" +msgstr "Digital Libraryに接続し、CuraでDigital Libraryからファイルを開いたりDigital Libraryにファイルを保存したりできるようにします。" #: DigitalLibrary/plugin.json msgctxt "name" msgid "Ultimaker Digital Library" -msgstr "" +msgstr "Ultimaker Digital Library" #: FirmwareUpdateChecker/plugin.json msgctxt "description" @@ -6042,22 +6042,22 @@ msgstr "バージョン4.7から4.8へのアップグレード" #: VersionUpgrade/VersionUpgrade48to49/plugin.json msgctxt "description" msgid "Upgrades configurations from Cura 4.8 to Cura 4.9." -msgstr "" +msgstr "Cura 4.8からCura 4.9に設定をアップグレードします。" #: VersionUpgrade/VersionUpgrade48to49/plugin.json msgctxt "name" msgid "Version Upgrade 4.8 to 4.9" -msgstr "" +msgstr "バージョン4.8から4.9へのアップグレード" #: VersionUpgrade/VersionUpgrade49to410/plugin.json msgctxt "description" msgid "Upgrades configurations from Cura 4.9 to Cura 4.10." -msgstr "" +msgstr "Cura 4.9からCura 4.10に設定をアップグレードします。" #: VersionUpgrade/VersionUpgrade49to410/plugin.json msgctxt "name" msgid "Version Upgrade 4.9 to 4.10" -msgstr "" +msgstr "バージョン4.9から4.10へのアップグレード" #: X3DReader/plugin.json msgctxt "description" diff --git a/resources/i18n/ja_JP/fdmprinter.def.json.po b/resources/i18n/ja_JP/fdmprinter.def.json.po index 69dc93c604..d5cc2fdc2f 100644 --- a/resources/i18n/ja_JP/fdmprinter.def.json.po +++ b/resources/i18n/ja_JP/fdmprinter.def.json.po @@ -3290,7 +3290,7 @@ msgstr "引き戻しのない最大コム距離" #: fdmprinter.def.json msgctxt "retraction_combing_max_distance description" msgid "When greater than zero, combing travel moves that are longer than this distance will use retraction. If set to zero, there is no maximum and combing moves will not use retraction." -msgstr "" +msgstr "ゼロを超える場合、この距離より長い移動量をコーミングすると、引き戻しが使用されます。ゼロに設定した場合、最大値はなく、コーミング移動では引き戻しを使用しません。" #: fdmprinter.def.json msgctxt "travel_retract_before_outer_wall label" diff --git a/resources/i18n/ko_KR/cura.po b/resources/i18n/ko_KR/cura.po index 10a2c646fa..0ae53eb3d4 100644 --- a/resources/i18n/ko_KR/cura.po +++ b/resources/i18n/ko_KR/cura.po @@ -173,7 +173,7 @@ msgstr "현재 버전보다 높은 Cura 백업을 복원하려고 시도했습 #: /home/trin/Gedeeld/Projects/Cura/cura/Backups/Backup.py:157 msgctxt "@info:backup_failed" msgid "The following error occurred while trying to restore a Cura backup:" -msgstr "" +msgstr "다음의 오류는 Cura 백업을 복원하려고 시도하는 동안 발생했습니다." #: /home/trin/Gedeeld/Projects/Cura/cura/BuildVolume.py:98 msgctxt "@info:status" @@ -2247,7 +2247,7 @@ msgstr "사용자 매뉴얼 온라인 보기" #: /home/trin/Gedeeld/Projects/Cura/plugins/MonitorStage/MonitorMain.qml:172 msgctxt "@info" msgid "In order to monitor your print from Cura, please connect the printer." -msgstr "" +msgstr "Cura에서 프린트를 모니터링하려면 프린터를 연결하십시오." #: /home/trin/Gedeeld/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:42 msgctxt "@label" @@ -2370,7 +2370,7 @@ msgstr "선 두께" #: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:130 msgctxt "@label:listbox" msgid "Flow" -msgstr "" +msgstr "유량" #: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:171 msgctxt "@label" @@ -3365,7 +3365,7 @@ msgstr "위에서 보기" #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:154 msgctxt "@action:inmenu menubar:view" msgid "Bottom View" -msgstr "" +msgstr "하단 뷰" #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:161 msgctxt "@action:inmenu menubar:view" @@ -4594,7 +4594,7 @@ msgstr "내보내기" #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:199 msgctxt "@action:button Sending materials to printers" msgid "Sync with Printers" -msgstr "" +msgstr "프린터와 동기화" #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:248 msgctxt "@action:label" @@ -4648,7 +4648,7 @@ msgstr "재료를 성공적으로 내보냈습니다" #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:388 msgctxt "@title:window" msgid "Export All Materials" -msgstr "" +msgstr "모든 재료 내보내기" #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:72 msgctxt "@title" @@ -5558,12 +5558,12 @@ msgstr "Cura 프로파일 작성자" #: DigitalLibrary/plugin.json msgctxt "description" msgid "Connects to the Digital Library, allowing Cura to open files from and save files to the Digital Library." -msgstr "" +msgstr "디지털 라이브러리와 연결하여 Cura에서 디지털 라이브러리를 통해 파일을 열고 저장할 수 있도록 합니다." #: DigitalLibrary/plugin.json msgctxt "name" msgid "Ultimaker Digital Library" -msgstr "" +msgstr "Ultimaker 디지털 라이브러리" #: FirmwareUpdateChecker/plugin.json msgctxt "description" @@ -6038,22 +6038,22 @@ msgstr "4.7에서 4.8로 버전 업그레이드" #: VersionUpgrade/VersionUpgrade48to49/plugin.json msgctxt "description" msgid "Upgrades configurations from Cura 4.8 to Cura 4.9." -msgstr "" +msgstr "Cura 4.8에서 Cura 4.9로 구성을 업그레이드합니다." #: VersionUpgrade/VersionUpgrade48to49/plugin.json msgctxt "name" msgid "Version Upgrade 4.8 to 4.9" -msgstr "" +msgstr "4.8에서 4.9로 버전 업그레이드" #: VersionUpgrade/VersionUpgrade49to410/plugin.json msgctxt "description" msgid "Upgrades configurations from Cura 4.9 to Cura 4.10." -msgstr "" +msgstr "Cura 4.9에서 Cura 4.10으로 구성을 업그레이드합니다." #: VersionUpgrade/VersionUpgrade49to410/plugin.json msgctxt "name" msgid "Version Upgrade 4.9 to 4.10" -msgstr "" +msgstr "4.9에서 4.10으로 버전 업그레이드" #: X3DReader/plugin.json msgctxt "description" diff --git a/resources/i18n/ko_KR/fdmprinter.def.json.po b/resources/i18n/ko_KR/fdmprinter.def.json.po index 827dafb416..949880ce6c 100644 --- a/resources/i18n/ko_KR/fdmprinter.def.json.po +++ b/resources/i18n/ko_KR/fdmprinter.def.json.po @@ -3202,7 +3202,7 @@ msgstr "수축이 없을 때 최대 빗질 거리" #: fdmprinter.def.json msgctxt "retraction_combing_max_distance description" msgid "When greater than zero, combing travel moves that are longer than this distance will use retraction. If set to zero, there is no maximum and combing moves will not use retraction." -msgstr "" +msgstr "0보다 큰 경우 이 거리보다 긴 combing travel은 retraction을 사용합니다. 0으로 설정한 경우 최댓값이 없으며 combing travel은 retraction을 사용하지 않습니다." #: fdmprinter.def.json msgctxt "travel_retract_before_outer_wall label" diff --git a/resources/i18n/nl_NL/cura.po b/resources/i18n/nl_NL/cura.po index 3fd6f74acb..5bb80d1116 100644 --- a/resources/i18n/nl_NL/cura.po +++ b/resources/i18n/nl_NL/cura.po @@ -173,7 +173,7 @@ msgstr "Geprobeerd een Cura-back-up te herstellen van een versie die hoger is da #: /home/trin/Gedeeld/Projects/Cura/cura/Backups/Backup.py:157 msgctxt "@info:backup_failed" msgid "The following error occurred while trying to restore a Cura backup:" -msgstr "" +msgstr "De volgende fout is opgetreden bij het herstellen van een Cura-backup:" #: /home/trin/Gedeeld/Projects/Cura/cura/BuildVolume.py:98 msgctxt "@info:status" @@ -2258,7 +2258,7 @@ msgstr "Gebruikershandleidingen online weergegeven" #: /home/trin/Gedeeld/Projects/Cura/plugins/MonitorStage/MonitorMain.qml:172 msgctxt "@info" msgid "In order to monitor your print from Cura, please connect the printer." -msgstr "" +msgstr "Sluit de printer aan om uw printopdracht vanuit Cura te volgen." #: /home/trin/Gedeeld/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:42 msgctxt "@label" @@ -2382,7 +2382,7 @@ msgstr "Lijnbreedte" #: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:130 msgctxt "@label:listbox" msgid "Flow" -msgstr "" +msgstr "Doorvoer" #: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:171 msgctxt "@label" @@ -3378,7 +3378,7 @@ msgstr "Weergave bovenzijde" #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:154 msgctxt "@action:inmenu menubar:view" msgid "Bottom View" -msgstr "" +msgstr "Aanzicht onderzijde" #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:161 msgctxt "@action:inmenu menubar:view" @@ -4611,7 +4611,7 @@ msgstr "Exporteren" #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:199 msgctxt "@action:button Sending materials to printers" msgid "Sync with Printers" -msgstr "" +msgstr "Synchroniseren met printers" #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:248 msgctxt "@action:label" @@ -4665,7 +4665,7 @@ msgstr "Materiaal is geëxporteerd naar %1" #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:388 msgctxt "@title:window" msgid "Export All Materials" -msgstr "" +msgstr "Alle materialen exporteren" #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:72 msgctxt "@title" @@ -5578,12 +5578,12 @@ msgstr "Cura-profielschrijver" #: DigitalLibrary/plugin.json msgctxt "description" msgid "Connects to the Digital Library, allowing Cura to open files from and save files to the Digital Library." -msgstr "" +msgstr "Maakt verbinding met de digitale bibliotheek, zodat Cura bestanden kan openen vanuit, en bestanden kan opslaan in, de digitale bibliotheek." #: DigitalLibrary/plugin.json msgctxt "name" msgid "Ultimaker Digital Library" -msgstr "" +msgstr "Ultimaker Digital Library" #: FirmwareUpdateChecker/plugin.json msgctxt "description" @@ -6058,22 +6058,22 @@ msgstr "Versie-upgrade van 4.7 naar 4.8" #: VersionUpgrade/VersionUpgrade48to49/plugin.json msgctxt "description" msgid "Upgrades configurations from Cura 4.8 to Cura 4.9." -msgstr "" +msgstr "Hiermee worden configuraties bijgewerkt van Cura 4.7 naar Cura 4.9." #: VersionUpgrade/VersionUpgrade48to49/plugin.json msgctxt "name" msgid "Version Upgrade 4.8 to 4.9" -msgstr "" +msgstr "Versie-upgrade van 4.8 naar 4.9" #: VersionUpgrade/VersionUpgrade49to410/plugin.json msgctxt "description" msgid "Upgrades configurations from Cura 4.9 to Cura 4.10." -msgstr "" +msgstr "Hiermee worden configuraties bijgewerkt van Cura 4.9 naar Cura 4.10." #: VersionUpgrade/VersionUpgrade49to410/plugin.json msgctxt "name" msgid "Version Upgrade 4.9 to 4.10" -msgstr "" +msgstr "Versie-upgrade 4.9 naar 4.10" #: X3DReader/plugin.json msgctxt "description" diff --git a/resources/i18n/nl_NL/fdmprinter.def.json.po b/resources/i18n/nl_NL/fdmprinter.def.json.po index 11c5493973..ee37cee494 100644 --- a/resources/i18n/nl_NL/fdmprinter.def.json.po +++ b/resources/i18n/nl_NL/fdmprinter.def.json.po @@ -3201,7 +3201,8 @@ msgstr "Max. combing-afstand zonder intrekken" #: fdmprinter.def.json msgctxt "retraction_combing_max_distance description" msgid "When greater than zero, combing travel moves that are longer than this distance will use retraction. If set to zero, there is no maximum and combing moves will not use retraction." -msgstr "" +msgstr "Wanneer dit groter dan nul is, vindt bij een combing-beweging die langer is dan deze afstand, intrekking plaats. Wanneer dit nul is, is er geen maximum" +" en vindt bij combing-bewegingen geen intrekking plaats." #: fdmprinter.def.json msgctxt "travel_retract_before_outer_wall label" diff --git a/resources/i18n/pt_BR/cura.po b/resources/i18n/pt_BR/cura.po index b65e8c425c..1e2858a8ea 100644 --- a/resources/i18n/pt_BR/cura.po +++ b/resources/i18n/pt_BR/cura.po @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: Cura 4.10\n" "Report-Msgid-Bugs-To: r.dulek@ultimaker.com\n" "POT-Creation-Date: 2021-06-10 17:35+0200\n" -"PO-Revision-Date: 2021-04-11 17:04+0200\n" +"PO-Revision-Date: 2021-06-19 06:21+0200\n" "Last-Translator: Cláudio Sampaio \n" "Language-Team: Cláudio Sampaio \n" "Language: pt_BR\n" @@ -15,14 +15,10 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" -"X-Generator: Poedit 2.4.1\n" +"X-Generator: Poedit 3.0\n" -#: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/DiscoveredPrintersModel.py:83 -#: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentCategoryModel.py:110 -#: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/QualityManagementModel.py:361 -#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/MachineManager.py:1612 -#: /home/trin/Gedeeld/Projects/Cura/plugins/Toolbox/resources/qml/pages/ToolboxDetailPage.qml:130 -#: /home/trin/Gedeeld/Projects/Cura/plugins/Toolbox/resources/qml/pages/ToolboxDetailPage.qml:171 +#: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/DiscoveredPrintersModel.py:83 /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentCategoryModel.py:110 /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/QualityManagementModel.py:361 +#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/MachineManager.py:1612 /home/trin/Gedeeld/Projects/Cura/plugins/Toolbox/resources/qml/pages/ToolboxDetailPage.qml:130 /home/trin/Gedeeld/Projects/Cura/plugins/Toolbox/resources/qml/pages/ToolboxDetailPage.qml:171 msgctxt "@label" msgid "Unknown" msgstr "Desconhecido" @@ -48,45 +44,37 @@ msgctxt "@label {0} is the name of a printer that's about to be deleted." msgid "Are you sure you wish to remove {0}? This cannot be undone!" msgstr "Tem certeza que deseja remover {0}? Isto não pode ser defeito!" -#: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentCategoryModel.py:42 -#: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentTranslations.py:11 -#: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/QualityManagementModel.py:338 +#: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentCategoryModel.py:42 /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentTranslations.py:11 /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/QualityManagementModel.py:338 msgctxt "@label" msgid "Default" msgstr "Default" -#: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentCategoryModel.py:45 -#: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentTranslations.py:14 +#: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentCategoryModel.py:45 /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentTranslations.py:14 msgctxt "@label" msgid "Visual" msgstr "Visual" -#: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentCategoryModel.py:46 -#: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentTranslations.py:15 +#: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentCategoryModel.py:46 /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentTranslations.py:15 msgctxt "@text" msgid "The visual profile is designed to print visual prototypes and models with the intent of high visual and surface quality." msgstr "O perfil visual é projetado para imprimir protótipos e modelos virtuais com o objetivo de alta qualidade visual e de superfície." -#: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentCategoryModel.py:49 -#: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentTranslations.py:18 +#: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentCategoryModel.py:49 /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentTranslations.py:18 msgctxt "@label" msgid "Engineering" msgstr "Engenharia" -#: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentCategoryModel.py:50 -#: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentTranslations.py:19 +#: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentCategoryModel.py:50 /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentTranslations.py:19 msgctxt "@text" msgid "The engineering profile is designed to print functional prototypes and end-use parts with the intent of better accuracy and for closer tolerances." msgstr "O perfil de engenharia é projetado para imprimir protótipos funcionais e partes de uso final com o objetivo de melhor precisão e tolerâncias mais estritas." -#: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentCategoryModel.py:53 -#: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentTranslations.py:22 +#: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentCategoryModel.py:53 /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentTranslations.py:22 msgctxt "@label" msgid "Draft" msgstr "Rascunho" -#: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentCategoryModel.py:54 -#: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentTranslations.py:23 +#: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentCategoryModel.py:54 /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentTranslations.py:23 msgctxt "@text" msgid "The draft profile is designed to print initial prototypes and concept validation with the intent of significant print time reduction." msgstr "O perfil de rascunho é projetado para imprimir protótipos iniciais e validações de conceito com o objetivo de redução significativa de tempo de impressão." @@ -96,8 +84,7 @@ msgctxt "@label" msgid "Custom Material" msgstr "Material Personalizado" -#: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/MaterialManagementModel.py:235 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/ConfigurationMenu/ConfigurationMenu.qml:205 +#: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/MaterialManagementModel.py:235 /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/ConfigurationMenu/ConfigurationMenu.qml:205 msgctxt "@label" msgid "Custom" msgstr "Personalizado" @@ -123,27 +110,22 @@ msgctxt "@info:title" msgid "Login failed" msgstr "Login falhou" -#: /home/trin/Gedeeld/Projects/Cura/cura/Arranging/ArrangeObjectsAllBuildPlatesJob.py:67 -#: /home/trin/Gedeeld/Projects/Cura/cura/Arranging/ArrangeObjectsJob.py:24 +#: /home/trin/Gedeeld/Projects/Cura/cura/Arranging/ArrangeObjectsAllBuildPlatesJob.py:67 /home/trin/Gedeeld/Projects/Cura/cura/Arranging/ArrangeObjectsJob.py:24 msgctxt "@info:status" msgid "Finding new location for objects" msgstr "Achando novos lugares para objetos" -#: /home/trin/Gedeeld/Projects/Cura/cura/Arranging/ArrangeObjectsAllBuildPlatesJob.py:71 -#: /home/trin/Gedeeld/Projects/Cura/cura/Arranging/ArrangeObjectsJob.py:28 +#: /home/trin/Gedeeld/Projects/Cura/cura/Arranging/ArrangeObjectsAllBuildPlatesJob.py:71 /home/trin/Gedeeld/Projects/Cura/cura/Arranging/ArrangeObjectsJob.py:28 msgctxt "@info:title" msgid "Finding Location" msgstr "Buscando Localização" -#: /home/trin/Gedeeld/Projects/Cura/cura/Arranging/ArrangeObjectsAllBuildPlatesJob.py:150 -#: /home/trin/Gedeeld/Projects/Cura/cura/Arranging/ArrangeObjectsJob.py:41 -#: /home/trin/Gedeeld/Projects/Cura/cura/MultiplyObjectsJob.py:76 +#: /home/trin/Gedeeld/Projects/Cura/cura/Arranging/ArrangeObjectsAllBuildPlatesJob.py:150 /home/trin/Gedeeld/Projects/Cura/cura/Arranging/ArrangeObjectsJob.py:41 /home/trin/Gedeeld/Projects/Cura/cura/MultiplyObjectsJob.py:76 msgctxt "@info:status" msgid "Unable to find a location within the build volume for all objects" msgstr "Não foi possível achar um lugar dentro do volume de construção para todos os objetos" -#: /home/trin/Gedeeld/Projects/Cura/cura/Arranging/ArrangeObjectsAllBuildPlatesJob.py:151 -#: /home/trin/Gedeeld/Projects/Cura/cura/Arranging/ArrangeObjectsJob.py:42 +#: /home/trin/Gedeeld/Projects/Cura/cura/Arranging/ArrangeObjectsAllBuildPlatesJob.py:151 /home/trin/Gedeeld/Projects/Cura/cura/Arranging/ArrangeObjectsJob.py:42 msgctxt "@info:title" msgid "Can't Find Location" msgstr "Não Foi Encontrada Localização" @@ -153,9 +135,7 @@ msgctxt "@info:backup_failed" msgid "Could not create archive from user data directory: {}" msgstr "Não pude criar arquivo do diretório de dados de usuário: {}" -#: /home/trin/Gedeeld/Projects/Cura/cura/Backups/Backup.py:122 -#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraDrive/src/DrivePluginExtension.py:107 -#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraDrive/src/DrivePluginExtension.py:113 +#: /home/trin/Gedeeld/Projects/Cura/cura/Backups/Backup.py:122 /home/trin/Gedeeld/Projects/Cura/plugins/CuraDrive/src/DrivePluginExtension.py:107 /home/trin/Gedeeld/Projects/Cura/plugins/CuraDrive/src/DrivePluginExtension.py:113 msgctxt "@info:title" msgid "Backup" msgstr "Backup" @@ -173,7 +153,7 @@ msgstr "Tentativa de restauração de backup do Cura de versão maior que a atua #: /home/trin/Gedeeld/Projects/Cura/cura/Backups/Backup.py:157 msgctxt "@info:backup_failed" msgid "The following error occurred while trying to restore a Cura backup:" -msgstr "" +msgstr "O seguinte erro ocorreu ao tentar restaurar um backup do Cura:" #: /home/trin/Gedeeld/Projects/Cura/cura/BuildVolume.py:98 msgctxt "@info:status" @@ -376,11 +356,8 @@ msgctxt "@info:status" msgid "Only one G-code file can be loaded at a time. Skipped importing {0}" msgstr "Somente um arquivo G-Code pode ser carregado por vez. Pulando importação de {0}" -#: /home/trin/Gedeeld/Projects/Cura/cura/CuraApplication.py:1800 -#: /home/trin/Gedeeld/Projects/Cura/cura/OAuth2/AuthorizationService.py:190 -#: /home/trin/Gedeeld/Projects/Cura/cura/OAuth2/AuthorizationService.py:244 -#: /home/trin/Gedeeld/Projects/Cura/plugins/RemovableDriveOutputDevice/RemovableDriveOutputDevice.py:153 -#: /home/trin/Gedeeld/Projects/Cura/plugins/RemovableDriveOutputDevice/RemovableDriveOutputDevice.py:165 +#: /home/trin/Gedeeld/Projects/Cura/cura/CuraApplication.py:1800 /home/trin/Gedeeld/Projects/Cura/cura/OAuth2/AuthorizationService.py:190 /home/trin/Gedeeld/Projects/Cura/cura/OAuth2/AuthorizationService.py:244 +#: /home/trin/Gedeeld/Projects/Cura/plugins/RemovableDriveOutputDevice/RemovableDriveOutputDevice.py:153 /home/trin/Gedeeld/Projects/Cura/plugins/RemovableDriveOutputDevice/RemovableDriveOutputDevice.py:165 msgctxt "@info:title" msgid "Warning" msgstr "Aviso" @@ -391,9 +368,7 @@ msgctxt "@info:status" msgid "Can't open any other file if G-code is loading. Skipped importing {0}" msgstr "Não é possível abrir nenhum outro arquivo se G-Code estiver sendo carregado. Pulando importação de {0}" -#: /home/trin/Gedeeld/Projects/Cura/cura/CuraApplication.py:1810 -#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/CuraContainerRegistry.py:146 -#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/CuraContainerRegistry.py:153 +#: /home/trin/Gedeeld/Projects/Cura/cura/CuraApplication.py:1810 /home/trin/Gedeeld/Projects/Cura/cura/Settings/CuraContainerRegistry.py:146 /home/trin/Gedeeld/Projects/Cura/cura/Settings/CuraContainerRegistry.py:153 #: /home/trin/Gedeeld/Projects/Cura/plugins/RemovableDriveOutputDevice/RemovableDriveOutputDevice.py:139 msgctxt "@info:title" msgid "Error" @@ -444,21 +419,18 @@ msgctxt "@info" msgid "Unable to reach the Ultimaker account server." msgstr "Não foi possível contactar o servidor de contas da Ultimaker." -#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/ContainerManager.py:205 -#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/CuraContainerRegistry.py:132 +#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/ContainerManager.py:205 /home/trin/Gedeeld/Projects/Cura/cura/Settings/CuraContainerRegistry.py:132 msgctxt "@title:window" msgid "File Already Exists" msgstr "O Arquivo Já Existe" -#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/ContainerManager.py:206 -#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/CuraContainerRegistry.py:133 +#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/ContainerManager.py:206 /home/trin/Gedeeld/Projects/Cura/cura/Settings/CuraContainerRegistry.py:133 #, python-brace-format msgctxt "@label Don't translate the XML tag !" msgid "The file {0} already exists. Are you sure you want to overwrite it?" msgstr "O arquivo {0} já existe. Tem certeza que quer sobrescrevê-lo?" -#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/ContainerManager.py:457 -#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/ContainerManager.py:460 +#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/ContainerManager.py:457 /home/trin/Gedeeld/Projects/Cura/cura/Settings/ContainerManager.py:460 msgctxt "@info:status" msgid "Invalid file URL:" msgstr "URL de arquivo inválida:" @@ -510,8 +482,7 @@ msgctxt "@info:status Don't translate the XML tags !" msgid "Failed to import profile from {0}:" msgstr "Erro ao importar perfil de {0}:" -#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/CuraContainerRegistry.py:235 -#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/CuraContainerRegistry.py:245 +#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/CuraContainerRegistry.py:235 /home/trin/Gedeeld/Projects/Cura/cura/Settings/CuraContainerRegistry.py:245 #, python-brace-format msgctxt "@info:status Don't translate the XML tags !" msgid "This profile {0} contains incorrect data, could not import it." @@ -583,8 +554,7 @@ msgctxt "@info:No intent profile selected" msgid "Default" msgstr "Default" -#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/MachineManager.py:713 -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/ThreeMFWorkspaceReader.py:216 +#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/MachineManager.py:713 /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/ThreeMFWorkspaceReader.py:216 msgctxt "@label" msgid "Nozzle" msgstr "Bico" @@ -604,30 +574,20 @@ msgctxt "@info:title" msgid "Extruder(s) Disabled" msgstr "Extrusor(es) Desabilitado(s)" -#: /home/trin/Gedeeld/Projects/Cura/cura/UI/AddPrinterPagesModel.py:17 -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:67 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:48 +#: /home/trin/Gedeeld/Projects/Cura/cura/UI/AddPrinterPagesModel.py:17 /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:67 /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:48 msgctxt "@action:button" msgid "Add" msgstr "Adicionar" -#: /home/trin/Gedeeld/Projects/Cura/cura/UI/AddPrinterPagesModel.py:26 -#: /home/trin/Gedeeld/Projects/Cura/cura/UI/WelcomePagesModel.py:272 +#: /home/trin/Gedeeld/Projects/Cura/cura/UI/AddPrinterPagesModel.py:26 /home/trin/Gedeeld/Projects/Cura/cura/UI/WelcomePagesModel.py:272 msgctxt "@action:button" msgid "Finish" msgstr "Finalizar" -#: /home/trin/Gedeeld/Projects/Cura/cura/UI/AddPrinterPagesModel.py:33 -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:445 -#: /home/trin/Gedeeld/Projects/Cura/plugins/ImageReader/ConfigUI.qml:234 -#: /home/trin/Gedeeld/Projects/Cura/plugins/SliceInfoPlugin/MoreInfoWindow.qml:150 -#: /home/trin/Gedeeld/Projects/Cura/plugins/Toolbox/resources/qml/components/ToolboxProgressButton.qml:19 -#: /home/trin/Gedeeld/Projects/Cura/plugins/Toolbox/resources/qml/dialogs/ToolboxConfirmUninstallResetDialog.qml:81 -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:352 -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorConfigOverrideDialog.qml:58 -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintWindow.qml:42 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/OpenFilesIncludingProjectsDialog.qml:82 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:292 +#: /home/trin/Gedeeld/Projects/Cura/cura/UI/AddPrinterPagesModel.py:33 /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:445 /home/trin/Gedeeld/Projects/Cura/plugins/ImageReader/ConfigUI.qml:234 /home/trin/Gedeeld/Projects/Cura/plugins/SliceInfoPlugin/MoreInfoWindow.qml:150 +#: /home/trin/Gedeeld/Projects/Cura/plugins/Toolbox/resources/qml/components/ToolboxProgressButton.qml:19 /home/trin/Gedeeld/Projects/Cura/plugins/Toolbox/resources/qml/dialogs/ToolboxConfirmUninstallResetDialog.qml:81 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:352 /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorConfigOverrideDialog.qml:58 /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintWindow.qml:42 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/OpenFilesIncludingProjectsDialog.qml:82 /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:292 msgctxt "@action:button" msgid "Cancel" msgstr "Cancelar" @@ -698,24 +658,18 @@ msgctxt "@tooltip" msgid "Other" msgstr "Outros" -#: /home/trin/Gedeeld/Projects/Cura/cura/UI/WelcomePagesModel.py:56 -#: /home/trin/Gedeeld/Projects/Cura/cura/UI/WelcomePagesModel.py:259 +#: /home/trin/Gedeeld/Projects/Cura/cura/UI/WelcomePagesModel.py:56 /home/trin/Gedeeld/Projects/Cura/cura/UI/WelcomePagesModel.py:259 msgctxt "@action:button" msgid "Next" msgstr "Próximo" -#: /home/trin/Gedeeld/Projects/Cura/cura/UI/WelcomePagesModel.py:268 -#: /home/trin/Gedeeld/Projects/Cura/cura/UI/WhatsNewPagesModel.py:55 +#: /home/trin/Gedeeld/Projects/Cura/cura/UI/WelcomePagesModel.py:268 /home/trin/Gedeeld/Projects/Cura/cura/UI/WhatsNewPagesModel.py:55 msgctxt "@action:button" msgid "Skip" msgstr "Pular" -#: /home/trin/Gedeeld/Projects/Cura/cura/UI/WhatsNewPagesModel.py:60 -#: /home/trin/Gedeeld/Projects/Cura/plugins/FirmwareUpdater/FirmwareUpdaterMachineAction.qml:185 -#: /home/trin/Gedeeld/Projects/Cura/plugins/PerObjectSettingsTool/SettingPickDialog.qml:128 -#: /home/trin/Gedeeld/Projects/Cura/plugins/PostProcessingPlugin/PostProcessingPlugin.qml:485 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:174 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:127 +#: /home/trin/Gedeeld/Projects/Cura/cura/UI/WhatsNewPagesModel.py:60 /home/trin/Gedeeld/Projects/Cura/plugins/FirmwareUpdater/FirmwareUpdaterMachineAction.qml:185 /home/trin/Gedeeld/Projects/Cura/plugins/PerObjectSettingsTool/SettingPickDialog.qml:128 +#: /home/trin/Gedeeld/Projects/Cura/plugins/PostProcessingPlugin/PostProcessingPlugin.qml:485 /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:174 /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:127 msgctxt "@action:button" msgid "Close" msgstr "Fechar" @@ -756,8 +710,7 @@ msgctxt "@info:error Don't translate the XML tags or !" msgid "Project file {0} is suddenly inaccessible: {1}." msgstr "O arquivo de projeto {0} tornou-se subitamente inacessível: {1}." -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/ThreeMFWorkspaceReader.py:640 -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/ThreeMFWorkspaceReader.py:647 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/ThreeMFWorkspaceReader.py:640 /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/ThreeMFWorkspaceReader.py:647 msgctxt "@info:title" msgid "Can't Open Project File" msgstr "Não Foi Possível Abrir o Arquivo de Projeto" @@ -784,8 +737,7 @@ msgctxt "@title:tab" msgid "Custom" msgstr "Personalizado" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/__init__.py:27 -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/__init__.py:33 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/__init__.py:27 /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/__init__.py:33 msgctxt "@item:inlistbox" msgid "3MF File" msgstr "Arquivo 3MF" @@ -795,8 +747,7 @@ msgctxt "@error:zip" msgid "3MF Writer plug-in is corrupt." msgstr "O complemento de Escrita 3MF está corrompido." -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFWriter/ThreeMFWorkspaceWriter.py:59 -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFWriter/ThreeMFWorkspaceWriter.py:92 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFWriter/ThreeMFWorkspaceWriter.py:59 /home/trin/Gedeeld/Projects/Cura/plugins/3MFWriter/ThreeMFWorkspaceWriter.py:92 msgctxt "@error:zip" msgid "No permission to write the workspace here." msgstr "Sem permissão para gravar o espaço de trabalho aqui." @@ -861,8 +812,7 @@ msgctxt "@error:file_size" msgid "The backup exceeds the maximum file size." msgstr "O backup excede o tamanho máximo de arquivo." -#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraDrive/src/DriveApiService.py:86 -#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraDrive/src/RestoreBackupJob.py:26 +#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraDrive/src/DriveApiService.py:86 /home/trin/Gedeeld/Projects/Cura/plugins/CuraDrive/src/RestoreBackupJob.py:26 msgctxt "@info:backup_status" msgid "There was an error trying to restore your backup." msgstr "Houve um erro ao tentar restaurar seu backup." @@ -877,12 +827,8 @@ msgctxt "@info:status" msgid "Unable to slice with the current material as it is incompatible with the selected machine or configuration." msgstr "Não foi possível fatiar com o material atual visto que é incompatível com a máquina ou configuração selecionada." -#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:382 -#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:413 -#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:437 -#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:446 -#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:455 -#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:467 +#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:382 /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:413 /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:437 +#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:446 /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:455 /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:467 msgctxt "@info:title" msgid "Unable to slice" msgstr "Não foi possível fatiar" @@ -923,8 +869,7 @@ msgstr "" "- Estão associados a um extrusor habilitado\n" "- Não estão todos configurados como malhas de modificação" -#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/ProcessSlicedLayersJob.py:52 -#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/ProcessSlicedLayersJob.py:260 +#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/ProcessSlicedLayersJob.py:52 /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/ProcessSlicedLayersJob.py:260 msgctxt "@info:status" msgid "Processing Layers" msgstr "Processando Camadas" @@ -934,8 +879,7 @@ msgctxt "@info:title" msgid "Information" msgstr "Informação" -#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraProfileReader/__init__.py:14 -#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraProfileWriter/__init__.py:14 +#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraProfileReader/__init__.py:14 /home/trin/Gedeeld/Projects/Cura/plugins/CuraProfileWriter/__init__.py:14 msgctxt "@item:inlistbox" msgid "Cura Profile" msgstr "Perfil do Cura" @@ -967,8 +911,7 @@ msgctxt "@action" msgid "Update Firmware" msgstr "Atualizar Firmware" -#: /home/trin/Gedeeld/Projects/Cura/plugins/GCodeGzReader/__init__.py:17 -#: /home/trin/Gedeeld/Projects/Cura/plugins/GCodeGzWriter/__init__.py:17 +#: /home/trin/Gedeeld/Projects/Cura/plugins/GCodeGzReader/__init__.py:17 /home/trin/Gedeeld/Projects/Cura/plugins/GCodeGzWriter/__init__.py:17 msgctxt "@item:inlistbox" msgid "Compressed G-code File" msgstr "Arquivo de G-Code Comprimido" @@ -978,9 +921,7 @@ msgctxt "@error:not supported" msgid "GCodeGzWriter does not support text mode." msgstr "O GCodeGzWriter não suporta modo binário." -#: /home/trin/Gedeeld/Projects/Cura/plugins/GCodeProfileReader/__init__.py:14 -#: /home/trin/Gedeeld/Projects/Cura/plugins/GCodeReader/__init__.py:14 -#: /home/trin/Gedeeld/Projects/Cura/plugins/GCodeWriter/__init__.py:16 +#: /home/trin/Gedeeld/Projects/Cura/plugins/GCodeProfileReader/__init__.py:14 /home/trin/Gedeeld/Projects/Cura/plugins/GCodeReader/__init__.py:14 /home/trin/Gedeeld/Projects/Cura/plugins/GCodeWriter/__init__.py:16 msgctxt "@item:inlistbox" msgid "G-code File" msgstr "Arquivo G-Code" @@ -990,8 +931,7 @@ msgctxt "@info:status" msgid "Parsing G-code" msgstr "Interpretando G-Code" -#: /home/trin/Gedeeld/Projects/Cura/plugins/GCodeReader/FlavorParser.py:349 -#: /home/trin/Gedeeld/Projects/Cura/plugins/GCodeReader/FlavorParser.py:503 +#: /home/trin/Gedeeld/Projects/Cura/plugins/GCodeReader/FlavorParser.py:349 /home/trin/Gedeeld/Projects/Cura/plugins/GCodeReader/FlavorParser.py:503 msgctxt "@info:title" msgid "G-code Details" msgstr "Detalhes do G-Code" @@ -1011,8 +951,7 @@ msgctxt "@error:not supported" msgid "GCodeWriter does not support non-text mode." msgstr "O GCodeWriter não suporta modo binário." -#: /home/trin/Gedeeld/Projects/Cura/plugins/GCodeWriter/GCodeWriter.py:80 -#: /home/trin/Gedeeld/Projects/Cura/plugins/GCodeWriter/GCodeWriter.py:96 +#: /home/trin/Gedeeld/Projects/Cura/plugins/GCodeWriter/GCodeWriter.py:80 /home/trin/Gedeeld/Projects/Cura/plugins/GCodeWriter/GCodeWriter.py:96 msgctxt "@warning:status" msgid "Please prepare G-code before exporting." msgstr "Por favor prepare o G-Code antes de exportar." @@ -1098,8 +1037,7 @@ msgctxt "@item:inlistbox" msgid "Save to Removable Drive {0}" msgstr "Salvar em Unidade Removível {0}" -#: /home/trin/Gedeeld/Projects/Cura/plugins/RemovableDriveOutputDevice/RemovableDriveOutputDevice.py:66 -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/src/MeshFormatHandler.py:118 +#: /home/trin/Gedeeld/Projects/Cura/plugins/RemovableDriveOutputDevice/RemovableDriveOutputDevice.py:66 /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/src/MeshFormatHandler.py:118 msgctxt "@info:status" msgid "There are no file formats available to write with!" msgstr "Não há formatos de arquivo disponíveis com os quais escrever!" @@ -1115,8 +1053,7 @@ msgctxt "@info:title" msgid "Saving" msgstr "Salvando" -#: /home/trin/Gedeeld/Projects/Cura/plugins/RemovableDriveOutputDevice/RemovableDriveOutputDevice.py:106 -#: /home/trin/Gedeeld/Projects/Cura/plugins/RemovableDriveOutputDevice/RemovableDriveOutputDevice.py:109 +#: /home/trin/Gedeeld/Projects/Cura/plugins/RemovableDriveOutputDevice/RemovableDriveOutputDevice.py:106 /home/trin/Gedeeld/Projects/Cura/plugins/RemovableDriveOutputDevice/RemovableDriveOutputDevice.py:109 #, python-brace-format msgctxt "@info:status Don't translate the XML tags or !" msgid "Could not save to {0}: {1}" @@ -1128,8 +1065,7 @@ msgctxt "@info:status Don't translate the tag {device}!" msgid "Could not find a file name when trying to write to {device}." msgstr "Não foi possível encontrar nome de arquivo ao tentar escrever em {device}." -#: /home/trin/Gedeeld/Projects/Cura/plugins/RemovableDriveOutputDevice/RemovableDriveOutputDevice.py:138 -#: /home/trin/Gedeeld/Projects/Cura/plugins/RemovableDriveOutputDevice/RemovableDriveOutputDevice.py:153 +#: /home/trin/Gedeeld/Projects/Cura/plugins/RemovableDriveOutputDevice/RemovableDriveOutputDevice.py:138 /home/trin/Gedeeld/Projects/Cura/plugins/RemovableDriveOutputDevice/RemovableDriveOutputDevice.py:153 #, python-brace-format msgctxt "@info:status" msgid "Could not save to removable drive {0}: {1}" @@ -1199,8 +1135,7 @@ msgctxt "@info:title" msgid "No layers to show" msgstr "Não há camadas a exibir" -#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationView.py:131 -#: /home/trin/Gedeeld/Projects/Cura/plugins/SolidView/SolidView.py:74 +#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationView.py:131 /home/trin/Gedeeld/Projects/Cura/plugins/SolidView/SolidView.py:74 msgctxt "@info:option_text" msgid "Do not show this message again" msgstr "Não mostrar essa mensagem novamente" @@ -1245,8 +1180,7 @@ msgctxt "@info:generic" msgid "Do you want to sync material and software packages with your account?" msgstr "Você quer sincronizar os pacotes de material e software com sua conta?" -#: /home/trin/Gedeeld/Projects/Cura/plugins/Toolbox/src/CloudSync/CloudPackageChecker.py:143 -#: /home/trin/Gedeeld/Projects/Cura/plugins/Toolbox/src/CloudSync/DownloadPresenter.py:93 +#: /home/trin/Gedeeld/Projects/Cura/plugins/Toolbox/src/CloudSync/CloudPackageChecker.py:143 /home/trin/Gedeeld/Projects/Cura/plugins/Toolbox/src/CloudSync/DownloadPresenter.py:93 msgctxt "@info:title" msgid "Changes detected from your Ultimaker account" msgstr "Alterações detectadas de sua conta Ultimaker" @@ -1266,8 +1200,7 @@ msgctxt "@button" msgid "Decline" msgstr "Recusar" -#: /home/trin/Gedeeld/Projects/Cura/plugins/Toolbox/src/CloudSync/LicenseModel.py:10 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/UserAgreementContent.qml:56 +#: /home/trin/Gedeeld/Projects/Cura/plugins/Toolbox/src/CloudSync/LicenseModel.py:10 /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/UserAgreementContent.qml:56 msgctxt "@button" msgid "Agree" msgstr "Concordar" @@ -1322,16 +1255,12 @@ msgctxt "@item:inlistbox" msgid "Compressed COLLADA Digital Asset Exchange" msgstr "Câmbio de Ativos Digitais COLLADA Comprimido" -#: /home/trin/Gedeeld/Projects/Cura/plugins/UFPReader/__init__.py:22 -#: /home/trin/Gedeeld/Projects/Cura/plugins/UFPWriter/__init__.py:28 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UFPReader/__init__.py:22 /home/trin/Gedeeld/Projects/Cura/plugins/UFPWriter/__init__.py:28 msgctxt "@item:inlistbox" msgid "Ultimaker Format Package" msgstr "Pacote de Formato da Ultimaker" -#: /home/trin/Gedeeld/Projects/Cura/plugins/UFPWriter/UFPWriter.py:57 -#: /home/trin/Gedeeld/Projects/Cura/plugins/UFPWriter/UFPWriter.py:72 -#: /home/trin/Gedeeld/Projects/Cura/plugins/UFPWriter/UFPWriter.py:94 -#: /home/trin/Gedeeld/Projects/Cura/plugins/UFPWriter/UFPWriter.py:149 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UFPWriter/UFPWriter.py:57 /home/trin/Gedeeld/Projects/Cura/plugins/UFPWriter/UFPWriter.py:72 /home/trin/Gedeeld/Projects/Cura/plugins/UFPWriter/UFPWriter.py:94 /home/trin/Gedeeld/Projects/Cura/plugins/UFPWriter/UFPWriter.py:149 #: /home/trin/Gedeeld/Projects/Cura/plugins/UFPWriter/UFPWriter.py:159 msgctxt "@info:error" msgid "Can't write to UFP file:" @@ -1408,8 +1337,7 @@ msgid_plural "These printers are not linked to the Digital Factory:" msgstr[0] "Esta impressora não está ligada à Digital Factory:" msgstr[1] "Estas impressoras não estão ligadas à Digital Factory:" -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDeviceManager.py:329 -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDeviceManager.py:419 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDeviceManager.py:329 /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDeviceManager.py:419 msgctxt "info:name" msgid "Ultimaker Digital Factory" msgstr "Ultimaker Digital Factory" @@ -1675,14 +1603,12 @@ msgctxt "@action:ComboBox Save settings in a new profile" msgid "Create new" msgstr "Criar novos" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:75 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:69 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:75 /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:69 msgctxt "@action:title" msgid "Summary - Cura Project" msgstr "Resumo - Projeto do Cura" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:97 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:93 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:97 /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:93 msgctxt "@action:label" msgid "Printer settings" msgstr "Ajustes da impressora" @@ -1692,20 +1618,17 @@ msgctxt "@info:tooltip" msgid "How should the conflict in the machine be resolved?" msgstr "Como o conflito na máquina deve ser resolvido?" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:167 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:102 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:167 /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:102 msgctxt "@action:label" msgid "Type" msgstr "Tipo" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:183 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:117 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:183 /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:117 msgctxt "@action:label" msgid "Printer Group" msgstr "Grupo de Impressora" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:205 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:218 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:205 /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:218 msgctxt "@action:label" msgid "Profile settings" msgstr "Ajustes de perfil" @@ -1715,28 +1638,23 @@ msgctxt "@info:tooltip" msgid "How should the conflict in the profile be resolved?" msgstr "Como o conflito no perfil deve ser resolvido?" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:242 -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:353 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:117 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:242 /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:353 /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:117 #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:242 msgctxt "@action:label" msgid "Name" msgstr "Nome" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:258 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:259 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:258 /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:259 msgctxt "@action:label" msgid "Intent" msgstr "Objetivo" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:274 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:226 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:274 /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:226 msgctxt "@action:label" msgid "Not in profile" msgstr "Ausente no perfil" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:279 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:231 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:279 /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:231 msgctxt "@action:label" msgid "%1 override" msgid_plural "%1 overrides" @@ -1890,9 +1808,7 @@ msgctxt "@description" msgid "Backup and synchronize your Cura settings." msgstr "Fazer backup e sincronizar os ajustes do Cura." -#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraDrive/src/qml/pages/WelcomePage.qml:51 -#: /home/trin/Gedeeld/Projects/Cura/plugins/Toolbox/resources/qml/pages/WelcomePage.qml:39 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Account/GeneralOperations.qml:53 +#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraDrive/src/qml/pages/WelcomePage.qml:51 /home/trin/Gedeeld/Projects/Cura/plugins/Toolbox/resources/qml/pages/WelcomePage.qml:39 /home/trin/Gedeeld/Projects/Cura/resources/qml/Account/GeneralOperations.qml:53 #: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/CloudContent.qml:199 msgctxt "@button" msgid "Sign in" @@ -2043,8 +1959,7 @@ msgctxt "@item:inlistbox" msgid "Linear" msgstr "Linear" -#: /home/trin/Gedeeld/Projects/Cura/plugins/ImageReader/ConfigUI.qml:161 -#: /home/trin/Gedeeld/Projects/Cura/plugins/ImageReader/ConfigUI.qml:172 +#: /home/trin/Gedeeld/Projects/Cura/plugins/ImageReader/ConfigUI.qml:161 /home/trin/Gedeeld/Projects/Cura/plugins/ImageReader/ConfigUI.qml:172 msgctxt "@item:inlistbox" msgid "Translucency" msgstr "Translucidez" @@ -2069,9 +1984,7 @@ msgctxt "@action:label" msgid "Smoothing" msgstr "Suavização" -#: /home/trin/Gedeeld/Projects/Cura/plugins/ImageReader/ConfigUI.qml:227 -#: /home/trin/Gedeeld/Projects/Cura/plugins/SliceInfoPlugin/MoreInfoWindow.qml:139 -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:361 +#: /home/trin/Gedeeld/Projects/Cura/plugins/ImageReader/ConfigUI.qml:227 /home/trin/Gedeeld/Projects/Cura/plugins/SliceInfoPlugin/MoreInfoWindow.qml:139 /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:361 msgctxt "@action:button" msgid "OK" msgstr "Ok" @@ -2091,18 +2004,10 @@ msgctxt "@label" msgid "Nozzle size" msgstr "Tamanho do bico" -#: /home/trin/Gedeeld/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsExtruderTab.qml:79 -#: /home/trin/Gedeeld/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsExtruderTab.qml:93 -#: /home/trin/Gedeeld/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsExtruderTab.qml:109 -#: /home/trin/Gedeeld/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsExtruderTab.qml:124 -#: /home/trin/Gedeeld/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:74 -#: /home/trin/Gedeeld/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:89 -#: /home/trin/Gedeeld/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:104 -#: /home/trin/Gedeeld/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:205 -#: /home/trin/Gedeeld/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:225 -#: /home/trin/Gedeeld/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:245 -#: /home/trin/Gedeeld/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:265 -#: /home/trin/Gedeeld/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:283 +#: /home/trin/Gedeeld/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsExtruderTab.qml:79 /home/trin/Gedeeld/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsExtruderTab.qml:93 /home/trin/Gedeeld/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsExtruderTab.qml:109 +#: /home/trin/Gedeeld/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsExtruderTab.qml:124 /home/trin/Gedeeld/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:74 /home/trin/Gedeeld/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:89 +#: /home/trin/Gedeeld/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:104 /home/trin/Gedeeld/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:205 /home/trin/Gedeeld/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:225 +#: /home/trin/Gedeeld/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:245 /home/trin/Gedeeld/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:265 /home/trin/Gedeeld/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:283 msgctxt "@label" msgid "mm" msgstr "mm" @@ -2258,7 +2163,7 @@ msgstr "Ver manuais de usuário online" #: /home/trin/Gedeeld/Projects/Cura/plugins/MonitorStage/MonitorMain.qml:172 msgctxt "@info" msgid "In order to monitor your print from Cura, please connect the printer." -msgstr "" +msgstr "Para monitorar sua impressão pelo Cura, por favor conecte a impressora." #: /home/trin/Gedeeld/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:42 msgctxt "@label" @@ -2305,8 +2210,7 @@ msgctxt "@title:window" msgid "Select Settings to Customize for this model" msgstr "Selecionar Ajustes a Personalizar para este modelo" -#: /home/trin/Gedeeld/Projects/Cura/plugins/PerObjectSettingsTool/SettingPickDialog.qml:55 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/SettingVisibilityPage.qml:96 +#: /home/trin/Gedeeld/Projects/Cura/plugins/PerObjectSettingsTool/SettingPickDialog.qml:55 /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/SettingVisibilityPage.qml:96 msgctxt "@label:textbox" msgid "Filter..." msgstr "Filtrar..." @@ -2348,8 +2252,7 @@ msgid_plural "The following scripts are active:" msgstr[0] "O seguinte script está ativo:" msgstr[1] "Os seguintes scripts estão ativos:" -#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:20 -#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:49 +#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:20 /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:49 msgctxt "@label" msgid "Color scheme" msgstr "Esquema de Cores" @@ -2382,7 +2285,7 @@ msgstr "Largura de Extrusão" #: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:130 msgctxt "@label:listbox" msgid "Flow" -msgstr "" +msgstr "Fluxo" #: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:171 msgctxt "@label" @@ -2404,8 +2307,7 @@ msgctxt "@label" msgid "Shell" msgstr "Perímetro" -#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:263 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/PrintSetupSelector/Recommended/RecommendedInfillDensitySelector.qml:65 +#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:263 /home/trin/Gedeeld/Projects/Cura/resources/qml/PrintSetupSelector/Recommended/RecommendedInfillDensitySelector.qml:65 msgctxt "@label" msgid "Infill" msgstr "Preenchimento" @@ -2515,8 +2417,7 @@ msgctxt "@action:label" msgid "Website" msgstr "Sítio Web" -#: /home/trin/Gedeeld/Projects/Cura/plugins/Toolbox/resources/qml/components/ToolboxDetailTileActions.qml:46 -#: /home/trin/Gedeeld/Projects/Cura/plugins/Toolbox/resources/qml/components/ToolboxProgressButton.qml:20 +#: /home/trin/Gedeeld/Projects/Cura/plugins/Toolbox/resources/qml/components/ToolboxDetailTileActions.qml:46 /home/trin/Gedeeld/Projects/Cura/plugins/Toolbox/resources/qml/components/ToolboxProgressButton.qml:20 msgctxt "@action:button" msgid "Installed" msgstr "Instalado" @@ -2531,20 +2432,17 @@ msgctxt "@label:The string between and is the highlighted link" msgid "Buy material spools" msgstr "Comprar rolos de material" -#: /home/trin/Gedeeld/Projects/Cura/plugins/Toolbox/resources/qml/components/ToolboxDetailTileActions.qml:96 -#: /home/trin/Gedeeld/Projects/Cura/plugins/Toolbox/resources/qml/components/ToolboxInstalledTileActions.qml:34 +#: /home/trin/Gedeeld/Projects/Cura/plugins/Toolbox/resources/qml/components/ToolboxDetailTileActions.qml:96 /home/trin/Gedeeld/Projects/Cura/plugins/Toolbox/resources/qml/components/ToolboxInstalledTileActions.qml:34 msgctxt "@action:button" msgid "Update" msgstr "Atualizar" -#: /home/trin/Gedeeld/Projects/Cura/plugins/Toolbox/resources/qml/components/ToolboxDetailTileActions.qml:97 -#: /home/trin/Gedeeld/Projects/Cura/plugins/Toolbox/resources/qml/components/ToolboxInstalledTileActions.qml:35 +#: /home/trin/Gedeeld/Projects/Cura/plugins/Toolbox/resources/qml/components/ToolboxDetailTileActions.qml:97 /home/trin/Gedeeld/Projects/Cura/plugins/Toolbox/resources/qml/components/ToolboxInstalledTileActions.qml:35 msgctxt "@action:button" msgid "Updating" msgstr "Atualizando" -#: /home/trin/Gedeeld/Projects/Cura/plugins/Toolbox/resources/qml/components/ToolboxDetailTileActions.qml:98 -#: /home/trin/Gedeeld/Projects/Cura/plugins/Toolbox/resources/qml/components/ToolboxInstalledTileActions.qml:36 +#: /home/trin/Gedeeld/Projects/Cura/plugins/Toolbox/resources/qml/components/ToolboxDetailTileActions.qml:98 /home/trin/Gedeeld/Projects/Cura/plugins/Toolbox/resources/qml/components/ToolboxInstalledTileActions.qml:36 msgctxt "@action:button" msgid "Updated" msgstr "Atualizado" @@ -2554,8 +2452,7 @@ msgctxt "@label" msgid "Premium" msgstr "Premium" -#: /home/trin/Gedeeld/Projects/Cura/plugins/Toolbox/resources/qml/components/ToolboxDownloadsShowcase.qml:39 -#: /home/trin/Gedeeld/Projects/Cura/plugins/Toolbox/resources/qml/components/ToolboxHeader.qml:86 +#: /home/trin/Gedeeld/Projects/Cura/plugins/Toolbox/resources/qml/components/ToolboxDownloadsShowcase.qml:39 /home/trin/Gedeeld/Projects/Cura/plugins/Toolbox/resources/qml/components/ToolboxHeader.qml:86 msgctxt "@info:tooltip" msgid "Go to Web Marketplace" msgstr "Ir ao Mercado Web" @@ -2580,9 +2477,7 @@ msgctxt "@title:tab" msgid "Plugins" msgstr "Complementos" -#: /home/trin/Gedeeld/Projects/Cura/plugins/Toolbox/resources/qml/components/ToolboxHeader.qml:44 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:457 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:89 +#: /home/trin/Gedeeld/Projects/Cura/plugins/Toolbox/resources/qml/components/ToolboxHeader.qml:44 /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:457 /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:89 msgctxt "@title:tab" msgid "Materials" msgstr "Materiais" @@ -2627,9 +2522,7 @@ msgctxt "@button" msgid "Dismiss" msgstr "Dispensar" -#: /home/trin/Gedeeld/Projects/Cura/plugins/Toolbox/resources/qml/dialogs/CompatibilityDialog.qml:23 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/DataCollectionsContent.qml:123 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/FirstStartMachineActionsContent.qml:77 +#: /home/trin/Gedeeld/Projects/Cura/plugins/Toolbox/resources/qml/dialogs/CompatibilityDialog.qml:23 /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/DataCollectionsContent.qml:123 /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/FirstStartMachineActionsContent.qml:77 #: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/WhatsNewContent.qml:178 msgctxt "@button" msgid "Next" @@ -2695,8 +2588,7 @@ msgctxt "@label" msgid "Last updated" msgstr "Última atualização" -#: /home/trin/Gedeeld/Projects/Cura/plugins/Toolbox/resources/qml/pages/ToolboxDetailPage.qml:103 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:138 +#: /home/trin/Gedeeld/Projects/Cura/plugins/Toolbox/resources/qml/pages/ToolboxDetailPage.qml:103 /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:138 msgctxt "@label" msgid "Brand" msgstr "Marca" @@ -2826,9 +2718,7 @@ msgctxt "@action:button" msgid "Edit" msgstr "Editar" -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:88 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:55 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:156 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:88 /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:55 /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:156 #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:138 msgctxt "@action:button" msgid "Remove" @@ -2844,20 +2734,17 @@ msgctxt "@label" msgid "If your printer is not listed, read the network printing troubleshooting guide" msgstr "Se sua impressora não está listada, leia o guia de resolução de problemas de impressão em rede" -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:205 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/AddPrinterByIpContent.qml:263 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:205 /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/AddPrinterByIpContent.qml:263 msgctxt "@label" msgid "Type" msgstr "Tipo" -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:225 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/AddPrinterByIpContent.qml:279 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:225 /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/AddPrinterByIpContent.qml:279 msgctxt "@label" msgid "Firmware version" msgstr "Versão do firmware" -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:239 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/AddPrinterByIpContent.qml:295 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:239 /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/AddPrinterByIpContent.qml:295 msgctxt "@label" msgid "Address" msgstr "Endereço" @@ -2887,8 +2774,7 @@ msgctxt "@title:window" msgid "Invalid IP address" msgstr "Endereço IP inválido" -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:297 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/AddPrinterByIpContent.qml:146 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:297 /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/AddPrinterByIpContent.qml:146 msgctxt "@text" msgid "Please enter a valid IP address." msgstr "Por favor entre um endereço IP válido." @@ -2898,8 +2784,7 @@ msgctxt "@title:window" msgid "Printer Address" msgstr "Endereço da Impressora" -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:331 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/AddPrinterByIpContent.qml:102 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:331 /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/AddPrinterByIpContent.qml:102 msgctxt "@label" msgid "Enter the IP address of your printer on the network." msgstr "Entre o endereço IP da sua impressora na rede." @@ -2951,8 +2836,7 @@ msgctxt "@label" msgid "Override will use the specified settings with the existing printer configuration. This may result in a failed print." msgstr "Sobrepor irá usar os ajustes especificados com a configuração existente da impressora. Isto pode causar falha da impressão." -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorConfigOverrideDialog.qml:153 -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:191 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorConfigOverrideDialog.qml:153 /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:191 #: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobCard.qml:184 msgctxt "@label" msgid "Glass" @@ -2973,8 +2857,7 @@ msgctxt "@label" msgid "Delete" msgstr "Remover" -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorContextMenu.qml:100 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/MonitorButton.qml:290 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorContextMenu.qml:100 /home/trin/Gedeeld/Projects/Cura/resources/qml/MonitorButton.qml:290 msgctxt "@label" msgid "Resume" msgstr "Continuar" @@ -2989,9 +2872,7 @@ msgctxt "@label" msgid "Resuming..." msgstr "Continuando..." -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorContextMenu.qml:106 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/MonitorButton.qml:285 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/MonitorButton.qml:294 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorContextMenu.qml:106 /home/trin/Gedeeld/Projects/Cura/resources/qml/MonitorButton.qml:285 /home/trin/Gedeeld/Projects/Cura/resources/qml/MonitorButton.qml:294 msgctxt "@label" msgid "Pause" msgstr "Pausar" @@ -3031,8 +2912,7 @@ msgctxt "@label %1 is the name of a print job." msgid "Are you sure you want to abort %1?" msgstr "Você tem certeza que quer abortar %1?" -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorContextMenu.qml:164 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/MonitorButton.qml:336 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorContextMenu.qml:164 /home/trin/Gedeeld/Projects/Cura/resources/qml/MonitorButton.qml:336 msgctxt "@window:title" msgid "Abort print" msgstr "Abortar impressão" @@ -3042,9 +2922,7 @@ msgctxt "@label link to Connect and Cloud interfaces" msgid "Manage printer" msgstr "Gerir Impressora" -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:254 -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:523 -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobCard.qml:250 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:254 /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:523 /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobCard.qml:250 msgctxt "@info" msgid "Please update your printer's firmware to manage the queue remotely." msgstr "Por favor atualize o firmware de sua impressora parar gerir a fila remotamente." @@ -3069,8 +2947,7 @@ msgctxt "@label:status" msgid "Idle" msgstr "Ocioso" -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:364 -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:84 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:364 /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:84 #: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:86 msgctxt "@label:status" msgid "Preparing..." @@ -3111,14 +2988,12 @@ msgctxt "@label" msgid "First available" msgstr "Primeira disponível" -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:78 -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:90 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:78 /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:90 msgctxt "@label:status" msgid "Aborted" msgstr "Abortado" -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:80 -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:82 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:80 /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:82 msgctxt "@label:status" msgid "Finished" msgstr "Finalizado" @@ -3203,8 +3078,7 @@ msgctxt "@action:button" msgid "Sign in" msgstr "Entrar" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Account/GeneralOperations.qml:20 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/CloudContent.qml:64 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Account/GeneralOperations.qml:20 /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/CloudContent.qml:64 msgctxt "@label" msgid "Sign in to the Ultimaker platform" msgstr "Entre na plataforma Ultimaker" @@ -3378,7 +3252,7 @@ msgstr "Visão Superior" #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:154 msgctxt "@action:inmenu menubar:view" msgid "Bottom View" -msgstr "" +msgstr "Visão de Baixo" #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:161 msgctxt "@action:inmenu menubar:view" @@ -3555,8 +3429,7 @@ msgctxt "@action:inmenu menubar:help" msgid "Show Configuration Folder" msgstr "Exibir Pasta de Configuração" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:453 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Settings/SettingView.qml:550 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:453 /home/trin/Gedeeld/Projects/Cura/resources/qml/Settings/SettingView.qml:550 msgctxt "@action:menu" msgid "Configure setting visibility..." msgstr "Configurar a visibilidade dos ajustes..." @@ -3571,8 +3444,7 @@ msgctxt "@label" msgid "This package will be installed after restarting." msgstr "Este pacote será instalado após o reinício." -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:450 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:17 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:450 /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:17 msgctxt "@title:tab" msgid "General" msgstr "Geral" @@ -3582,14 +3454,12 @@ msgctxt "@title:tab" msgid "Settings" msgstr "Ajustes" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:455 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:16 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:455 /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:16 msgctxt "@title:tab" msgid "Printers" msgstr "Impressoras" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:459 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:34 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:459 /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:34 msgctxt "@title:tab" msgid "Profiles" msgstr "Perfis" @@ -3599,14 +3469,12 @@ msgctxt "@title:window %1 is the application name" msgid "Closing %1" msgstr "Fechando %1" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:577 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:589 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:577 /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:589 msgctxt "@label %1 is the application name" msgid "Are you sure you want to exit %1?" msgstr "Tem certeza que quer sair de %1?" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:627 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/OpenFilesIncludingProjectsDialog.qml:19 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:627 /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/OpenFilesIncludingProjectsDialog.qml:19 msgctxt "@title:window" msgid "Open file(s)" msgstr "Abrir arquivo(s)" @@ -3760,8 +3628,7 @@ msgctxt "@Label" msgid "Static type checker for Python" msgstr "Verificador de tipos estáticos para Python" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:156 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:157 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:156 /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:157 msgctxt "@Label" msgid "Root Certificates for validating SSL trustworthiness" msgstr "Certificados raiz para validar confiança de SSL" @@ -3857,8 +3724,7 @@ msgctxt "@title:column" msgid "Current changes" msgstr "Alterações atuais" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/DiscardOrKeepProfileChangesDialog.qml:158 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:733 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/DiscardOrKeepProfileChangesDialog.qml:158 /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:733 msgctxt "@option:discardOrKeep" msgid "Always ask me this" msgstr "Sempre perguntar" @@ -3935,8 +3801,7 @@ msgctxt "@text Print job name" msgid "Untitled" msgstr "Sem Título" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/MainWindow/ApplicationMenu.qml:27 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/FileMenu.qml:13 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/MainWindow/ApplicationMenu.qml:27 /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/FileMenu.qml:13 msgctxt "@title:menu menubar:toplevel" msgid "&File" msgstr "Arquivo (&F)" @@ -3946,14 +3811,12 @@ msgctxt "@title:menu menubar:toplevel" msgid "&Edit" msgstr "&Editar" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/MainWindow/ApplicationMenu.qml:49 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/ViewMenu.qml:12 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/MainWindow/ApplicationMenu.qml:49 /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/ViewMenu.qml:12 msgctxt "@title:menu menubar:toplevel" msgid "&View" msgstr "&Ver" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/MainWindow/ApplicationMenu.qml:51 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/SettingsMenu.qml:13 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/MainWindow/ApplicationMenu.qml:51 /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/SettingsMenu.qml:13 msgctxt "@title:menu menubar:toplevel" msgid "&Settings" msgstr "Aju&stes" @@ -4522,8 +4385,7 @@ msgctxt "@info:tooltip" msgid "When you have made changes to a profile and switched to a different one, a dialog will be shown asking whether you want to keep your modifications or not, or you can choose a default behaviour and never show that dialog again." msgstr "Quando você faz alterações em um perfil e troca para um diferent, um diálogo aparecerá perguntando se você quer manter ou aplicar suas modificações, ou você pode forçar um comportamento default e não ter o diálogo." -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:714 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/PrintSetupSelector/Recommended/RecommendedQualityProfileSelector.qml:52 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:714 /home/trin/Gedeeld/Projects/Cura/resources/qml/PrintSetupSelector/Recommended/RecommendedQualityProfileSelector.qml:52 msgctxt "@label" msgid "Profiles" msgstr "Perfis" @@ -4573,15 +4435,12 @@ msgctxt "@action:button" msgid "More information" msgstr "Mais informações" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:40 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:108 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:84 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:40 /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:108 /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:84 msgctxt "@action:button" msgid "Activate" msgstr "Ativar" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:63 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:152 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:63 /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:152 msgctxt "@action:button" msgid "Rename" msgstr "Renomear" @@ -4596,14 +4455,12 @@ msgctxt "@action:button" msgid "Duplicate" msgstr "Duplicar" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:171 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:167 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:171 /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:167 msgctxt "@action:button" msgid "Import" msgstr "Importar" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:185 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:179 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:185 /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:179 msgctxt "@action:button" msgid "Export" msgstr "Exportar" @@ -4611,27 +4468,24 @@ msgstr "Exportar" #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:199 msgctxt "@action:button Sending materials to printers" msgid "Sync with Printers" -msgstr "" +msgstr "Sincronizar com Impressoras" #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:248 msgctxt "@action:label" msgid "Printer" msgstr "Impressora" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:312 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:277 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:312 /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:277 msgctxt "@title:window" msgid "Confirm Remove" msgstr "Confirmar Remoção" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:315 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:278 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:315 /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:278 msgctxt "@label (%1 is object name)" msgid "Are you sure you wish to remove %1? This cannot be undone!" msgstr "Tem certeza que deseja remover %1? Isto não poderá ser desfeito!" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:329 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:337 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:329 /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:337 msgctxt "@title:window" msgid "Import Material" msgstr "Importar Material" @@ -4646,8 +4500,7 @@ msgctxt "@info:status Don't translate the XML tag !" msgid "Successfully imported material %1" msgstr "Material %1 importado com sucesso" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:360 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:368 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:360 /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:368 msgctxt "@title:window" msgid "Export Material" msgstr "Exportar Material" @@ -4665,7 +4518,7 @@ msgstr "Material exportado para %1 com sucesso" #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:388 msgctxt "@title:window" msgid "Export All Materials" -msgstr "" +msgstr "Exportar Todos Os Materiais" #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:72 msgctxt "@title" @@ -4752,8 +4605,7 @@ msgctxt "@label" msgid "Adhesion Information" msgstr "Informação sobre Aderência" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:374 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/PrintSetupSelector/PrintSetupSelector.qml:19 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:374 /home/trin/Gedeeld/Projects/Cura/resources/qml/PrintSetupSelector/PrintSetupSelector.qml:19 msgctxt "@label" msgid "Print settings" msgstr "Ajustes de impressão" @@ -4808,8 +4660,7 @@ msgctxt "@action:button" msgid "Update profile with current settings/overrides" msgstr "Atualizar perfil com ajustes/sobreposições atuais" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:564 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/PrintSetupSelector/Custom/QualitiesWithIntentMenu.qml:244 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:564 /home/trin/Gedeeld/Projects/Cura/resources/qml/PrintSetupSelector/Custom/QualitiesWithIntentMenu.qml:244 msgctxt "@action:button" msgid "Discard current changes" msgstr "Descartar ajustes atuais" @@ -4884,14 +4735,12 @@ msgctxt "@tooltip of temperature input" msgid "The temperature to pre-heat the hotend to." msgstr "A temperatura com a qual pré-aquecer o hotend." -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/PrinterOutput/ExtruderBox.qml:341 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/PrinterOutput/HeatedBedBox.qml:332 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/PrinterOutput/ExtruderBox.qml:341 /home/trin/Gedeeld/Projects/Cura/resources/qml/PrinterOutput/HeatedBedBox.qml:332 msgctxt "@button Cancel pre-heating" msgid "Cancel" msgstr "Cancelar" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/PrinterOutput/ExtruderBox.qml:344 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/PrinterOutput/HeatedBedBox.qml:335 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/PrinterOutput/ExtruderBox.qml:344 /home/trin/Gedeeld/Projects/Cura/resources/qml/PrinterOutput/HeatedBedBox.qml:335 msgctxt "@button" msgid "Pre-heat" msgstr "Pré-aquecer" @@ -5357,8 +5206,7 @@ msgctxt "@label" msgid "Could not connect to device." msgstr "Não foi possível conectar ao dispositivo." -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/AddPrinterByIpContent.qml:207 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/AddPrinterByIpContent.qml:212 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/AddPrinterByIpContent.qml:207 /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/AddPrinterByIpContent.qml:212 msgctxt "@label" msgid "Can't connect to your Ultimaker printer?" msgstr "Não consegue conectar à sua impressora Ultimaker?" @@ -5576,12 +5424,12 @@ msgstr "Gravador de Perfis do Cura" #: DigitalLibrary/plugin.json msgctxt "description" msgid "Connects to the Digital Library, allowing Cura to open files from and save files to the Digital Library." -msgstr "" +msgstr "Conecta-se à Digital Library, permitindo ao Cura abrir arquivos dela e gravar arquivos nela." #: DigitalLibrary/plugin.json msgctxt "name" msgid "Ultimaker Digital Library" -msgstr "" +msgstr "Digital Library da Ultimaker" #: FirmwareUpdateChecker/plugin.json msgctxt "description" @@ -6056,22 +5904,22 @@ msgstr "Atualização de Versão de 4.7 para 4.8" #: VersionUpgrade/VersionUpgrade48to49/plugin.json msgctxt "description" msgid "Upgrades configurations from Cura 4.8 to Cura 4.9." -msgstr "" +msgstr "Atualiza configurações do Cura 4.8 para o Cura 4.9." #: VersionUpgrade/VersionUpgrade48to49/plugin.json msgctxt "name" msgid "Version Upgrade 4.8 to 4.9" -msgstr "" +msgstr "Atualização de Versão de 4.8 para 4.9" #: VersionUpgrade/VersionUpgrade49to410/plugin.json msgctxt "description" msgid "Upgrades configurations from Cura 4.9 to Cura 4.10." -msgstr "" +msgstr "Atualiza configurações do Cura 4.9 para o Cura 4.10." #: VersionUpgrade/VersionUpgrade49to410/plugin.json msgctxt "name" msgid "Version Upgrade 4.9 to 4.10" -msgstr "" +msgstr "Atualização de Versão de 4.9 para 4.10" #: X3DReader/plugin.json msgctxt "description" @@ -6940,7 +6788,8 @@ msgstr "Visão de Raios-X" #~ "\n" #~ "Select your printer from the list below:" #~ msgstr "" -#~ "Para imprimir diretamente para sua impressora pela rede, por favor se certifique que a impressora esteja conectada na rede usando um cabo de rede ou conectando sua impressora na rede WIFI. Se você não conectar o Cura à sua impressora, você ainda pode usar uma unidade USB para transferir arquivos G-Code para sua impressora.\n" +#~ "Para imprimir diretamente para sua impressora pela rede, por favor se certifique que a impressora esteja conectada na rede usando um cabo de rede ou conectando sua impressora na rede WIFI. Se você não conectar o Cura à sua impressora, você ainda pode usar uma unidade USB para transferir arquivos G-" +#~ "Code para sua impressora.\n" #~ "\n" #~ "Selecione sua impressora da lista abaixo:" diff --git a/resources/i18n/pt_BR/fdmprinter.def.json.po b/resources/i18n/pt_BR/fdmprinter.def.json.po index fd629b1b05..fea811aac4 100644 --- a/resources/i18n/pt_BR/fdmprinter.def.json.po +++ b/resources/i18n/pt_BR/fdmprinter.def.json.po @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: Cura 4.10\n" "Report-Msgid-Bugs-To: r.dulek@ultimaker.com\n" "POT-Creation-Date: 2021-06-10 17:35+0000\n" -"PO-Revision-Date: 2021-04-11 17:33+0200\n" +"PO-Revision-Date: 2021-06-19 06:31+0200\n" "Last-Translator: Cláudio Sampaio \n" "Language-Team: Cláudio Sampaio \n" "Language: pt_BR\n" @@ -15,7 +15,7 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" -"X-Generator: Poedit 2.4.1\n" +"X-Generator: Poedit 3.0\n" #: fdmprinter.def.json msgctxt "machine_settings label" @@ -3202,7 +3202,7 @@ msgstr "Máxima Distância de Combing Sem Retração" #: fdmprinter.def.json msgctxt "retraction_combing_max_distance description" msgid "When greater than zero, combing travel moves that are longer than this distance will use retraction. If set to zero, there is no maximum and combing moves will not use retraction." -msgstr "" +msgstr "Quando maior que zero, os movimentos de percurso de combing que forem maiores que essa distância usarão retração. Se deixado em zero, não haverá máximo e os movimentos de combing não usarão retração." #: fdmprinter.def.json msgctxt "travel_retract_before_outer_wall label" diff --git a/resources/i18n/pt_PT/cura.po b/resources/i18n/pt_PT/cura.po index f2e906db96..e5a738b4f8 100644 --- a/resources/i18n/pt_PT/cura.po +++ b/resources/i18n/pt_PT/cura.po @@ -176,7 +176,7 @@ msgstr "Tentativa de reposição de uma cópia de segurança do Cura que é supe #: /home/trin/Gedeeld/Projects/Cura/cura/Backups/Backup.py:157 msgctxt "@info:backup_failed" msgid "The following error occurred while trying to restore a Cura backup:" -msgstr "" +msgstr "O seguinte erro ocorreu ao tentar restaurar uma cópia de segurança do Cura:" #: /home/trin/Gedeeld/Projects/Cura/cura/BuildVolume.py:98 msgctxt "@info:status" @@ -2273,7 +2273,7 @@ msgstr "Ver manuais do utilizador online" #: /home/trin/Gedeeld/Projects/Cura/plugins/MonitorStage/MonitorMain.qml:172 msgctxt "@info" msgid "In order to monitor your print from Cura, please connect the printer." -msgstr "" +msgstr "Para monitorizar a sua impressão a partir do Cura, ligue a impressora." #: /home/trin/Gedeeld/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:42 msgctxt "@label" @@ -2397,7 +2397,7 @@ msgstr "Diâmetro da Linha" #: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:130 msgctxt "@label:listbox" msgid "Flow" -msgstr "" +msgstr "Fluxo" #: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:171 msgctxt "@label" @@ -3398,7 +3398,7 @@ msgstr "Vista Cima" #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:154 msgctxt "@action:inmenu menubar:view" msgid "Bottom View" -msgstr "" +msgstr "Vista Inferior" #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:161 msgctxt "@action:inmenu menubar:view" @@ -4640,7 +4640,7 @@ msgstr "Exportar" #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:199 msgctxt "@action:button Sending materials to printers" msgid "Sync with Printers" -msgstr "" +msgstr "Sincronizar com Impressoras" #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:248 msgctxt "@action:label" @@ -4694,7 +4694,7 @@ msgstr "Material exportado com êxito para %1" #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:388 msgctxt "@title:window" msgid "Export All Materials" -msgstr "" +msgstr "Exportar Todos os Materiais" #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:72 msgctxt "@title" @@ -5625,12 +5625,12 @@ msgstr "Gravador de perfis Cura" #: DigitalLibrary/plugin.json msgctxt "description" msgid "Connects to the Digital Library, allowing Cura to open files from and save files to the Digital Library." -msgstr "" +msgstr "Liga à Biblioteca Digital, permitindo ao Cura abrir ficheiros da Biblioteca Digital e guardar ficheiros na mesma." #: DigitalLibrary/plugin.json msgctxt "name" msgid "Ultimaker Digital Library" -msgstr "" +msgstr "Biblioteca Digital Ultimaker" #: FirmwareUpdateChecker/plugin.json msgctxt "description" @@ -6106,22 +6106,22 @@ msgstr "Atualização da versão 4.7 para 4.8" #: VersionUpgrade/VersionUpgrade48to49/plugin.json msgctxt "description" msgid "Upgrades configurations from Cura 4.8 to Cura 4.9." -msgstr "" +msgstr "Atualiza as configurações do Cura 4.8 para o Cura 4.9." #: VersionUpgrade/VersionUpgrade48to49/plugin.json msgctxt "name" msgid "Version Upgrade 4.8 to 4.9" -msgstr "" +msgstr "Atualização da versão 4.8 para 4.9" #: VersionUpgrade/VersionUpgrade49to410/plugin.json msgctxt "description" msgid "Upgrades configurations from Cura 4.9 to Cura 4.10." -msgstr "" +msgstr "Atualiza as configurações do Cura 4.9 para o Cura 4.10." #: VersionUpgrade/VersionUpgrade49to410/plugin.json msgctxt "name" msgid "Version Upgrade 4.9 to 4.10" -msgstr "" +msgstr "Atualização da versão 4.9 para 4.10" #: X3DReader/plugin.json msgctxt "description" diff --git a/resources/i18n/pt_PT/fdmprinter.def.json.po b/resources/i18n/pt_PT/fdmprinter.def.json.po index 05c9c92282..cd8849efd5 100644 --- a/resources/i18n/pt_PT/fdmprinter.def.json.po +++ b/resources/i18n/pt_PT/fdmprinter.def.json.po @@ -3305,7 +3305,8 @@ msgstr "Distância Max. de Combing sem Retração" #: fdmprinter.def.json msgctxt "retraction_combing_max_distance description" msgid "When greater than zero, combing travel moves that are longer than this distance will use retraction. If set to zero, there is no maximum and combing moves will not use retraction." -msgstr "" +msgstr "Os movimentos de deslocação de Combing com uma distância maior que este valor, quando este é superior a zero, utilizam retrações. Se o valor for definido" +" como zero, não existirá qualquer valor máximo e os movimentos Combing não utilizarão retrações." #: fdmprinter.def.json msgctxt "travel_retract_before_outer_wall label" diff --git a/resources/i18n/ru_RU/cura.po b/resources/i18n/ru_RU/cura.po index 16fe4452c1..cf2eb14327 100644 --- a/resources/i18n/ru_RU/cura.po +++ b/resources/i18n/ru_RU/cura.po @@ -173,7 +173,7 @@ msgstr "Выполнена попытка восстановить резерв #: /home/trin/Gedeeld/Projects/Cura/cura/Backups/Backup.py:157 msgctxt "@info:backup_failed" msgid "The following error occurred while trying to restore a Cura backup:" -msgstr "" +msgstr "При попытке восстановить резервную копию Cura произошла следующая ошибка:" #: /home/trin/Gedeeld/Projects/Cura/cura/BuildVolume.py:98 msgctxt "@info:status" @@ -2265,7 +2265,7 @@ msgstr "Просмотр руководств пользователей онл #: /home/trin/Gedeeld/Projects/Cura/plugins/MonitorStage/MonitorMain.qml:172 msgctxt "@info" msgid "In order to monitor your print from Cura, please connect the printer." -msgstr "" +msgstr "Чтобы отслеживать задания печати при помощи Cura, подключите принтер." #: /home/trin/Gedeeld/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:42 msgctxt "@label" @@ -2390,7 +2390,7 @@ msgstr "Ширина линии" #: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:130 msgctxt "@label:listbox" msgid "Flow" -msgstr "" +msgstr "Поток" #: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:171 msgctxt "@label" @@ -3387,7 +3387,7 @@ msgstr "Вид сверху" #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:154 msgctxt "@action:inmenu menubar:view" msgid "Bottom View" -msgstr "" +msgstr "Вид снизу" #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:161 msgctxt "@action:inmenu menubar:view" @@ -4624,7 +4624,7 @@ msgstr "Экспорт" #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:199 msgctxt "@action:button Sending materials to printers" msgid "Sync with Printers" -msgstr "" +msgstr "Синхронизация с принтерами" #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:248 msgctxt "@action:label" @@ -4678,7 +4678,7 @@ msgstr "Материал успешно экспортирован в #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:388 msgctxt "@title:window" msgid "Export All Materials" -msgstr "" +msgstr "Экспорт всех материалов" #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:72 msgctxt "@title" @@ -5592,12 +5592,12 @@ msgstr "Запись профиля Cura" #: DigitalLibrary/plugin.json msgctxt "description" msgid "Connects to the Digital Library, allowing Cura to open files from and save files to the Digital Library." -msgstr "" +msgstr "Подключается к цифровой библиотеке, позволяя Cura открывать файлы из цифровой библиотеки и сохранять файлы в нее." #: DigitalLibrary/plugin.json msgctxt "name" msgid "Ultimaker Digital Library" -msgstr "" +msgstr "Цифровая библиотека Ultimaker" #: FirmwareUpdateChecker/plugin.json msgctxt "description" @@ -6072,22 +6072,22 @@ msgstr "Обновление версии 4.7 до 4.8" #: VersionUpgrade/VersionUpgrade48to49/plugin.json msgctxt "description" msgid "Upgrades configurations from Cura 4.8 to Cura 4.9." -msgstr "" +msgstr "Обновляет конфигурации Cura 4.8 до Cura 4.9." #: VersionUpgrade/VersionUpgrade48to49/plugin.json msgctxt "name" msgid "Version Upgrade 4.8 to 4.9" -msgstr "" +msgstr "Обновление версии 4.8 до 4.9" #: VersionUpgrade/VersionUpgrade49to410/plugin.json msgctxt "description" msgid "Upgrades configurations from Cura 4.9 to Cura 4.10." -msgstr "" +msgstr "Обновляет конфигурации Cura 4.9 до Cura 4.10." #: VersionUpgrade/VersionUpgrade49to410/plugin.json msgctxt "name" msgid "Version Upgrade 4.9 to 4.10" -msgstr "" +msgstr "Обновление версии 4.9 до 4.10" #: X3DReader/plugin.json msgctxt "description" diff --git a/resources/i18n/ru_RU/fdmprinter.def.json.po b/resources/i18n/ru_RU/fdmprinter.def.json.po index aa69be549a..f0bd5a6feb 100644 --- a/resources/i18n/ru_RU/fdmprinter.def.json.po +++ b/resources/i18n/ru_RU/fdmprinter.def.json.po @@ -3202,7 +3202,8 @@ msgstr "Макс. расстояние комб. без отката" #: fdmprinter.def.json msgctxt "retraction_combing_max_distance description" msgid "When greater than zero, combing travel moves that are longer than this distance will use retraction. If set to zero, there is no maximum and combing moves will not use retraction." -msgstr "" +msgstr "При значении параметра выше нуля перемещения комбинга, превышающие заданное расстояние, будут выполняться с откатом. Когда значение параметра равно нулю," +" то максимума нет и перемещения комбинга выполняются без отката." #: fdmprinter.def.json msgctxt "travel_retract_before_outer_wall label" diff --git a/resources/i18n/tr_TR/cura.po b/resources/i18n/tr_TR/cura.po index 9a4e5c7545..7f356a3702 100644 --- a/resources/i18n/tr_TR/cura.po +++ b/resources/i18n/tr_TR/cura.po @@ -173,7 +173,7 @@ msgstr "Geçerli sürümünüzden yüksek bir sürüme sahip bir Cura yedeği ge #: /home/trin/Gedeeld/Projects/Cura/cura/Backups/Backup.py:157 msgctxt "@info:backup_failed" msgid "The following error occurred while trying to restore a Cura backup:" -msgstr "" +msgstr "Cura yedeklemesi geri yüklenmeye çalışılırken aşağıdaki hata oluştu:" #: /home/trin/Gedeeld/Projects/Cura/cura/BuildVolume.py:98 msgctxt "@info:status" @@ -2258,7 +2258,7 @@ msgstr "Kullanım kılavuzlarını çevrimiçi olarak görüntüle" #: /home/trin/Gedeeld/Projects/Cura/plugins/MonitorStage/MonitorMain.qml:172 msgctxt "@info" msgid "In order to monitor your print from Cura, please connect the printer." -msgstr "" +msgstr "Baskınızı Cura üzerinden izlemek için lütfen yazıcıyı bağlayın." #: /home/trin/Gedeeld/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:42 msgctxt "@label" @@ -2382,7 +2382,7 @@ msgstr "Hat Genişliği" #: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:130 msgctxt "@label:listbox" msgid "Flow" -msgstr "" +msgstr "Akış" #: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:171 msgctxt "@label" @@ -3378,7 +3378,7 @@ msgstr "Yukarıdan Görünüm" #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:154 msgctxt "@action:inmenu menubar:view" msgid "Bottom View" -msgstr "" +msgstr "Alttan Görünüm" #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:161 msgctxt "@action:inmenu menubar:view" @@ -4611,7 +4611,7 @@ msgstr "Dışa Aktar" #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:199 msgctxt "@action:button Sending materials to printers" msgid "Sync with Printers" -msgstr "" +msgstr "Yazıcılarla Senkronize Et" #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:248 msgctxt "@action:label" @@ -4665,7 +4665,7 @@ msgstr "Malzeme %1 dosyasına başarıyla dışa aktarıld #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:388 msgctxt "@title:window" msgid "Export All Materials" -msgstr "" +msgstr "Tüm Malzemeleri Dışa Aktar" #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:72 msgctxt "@title" @@ -5578,12 +5578,12 @@ msgstr "Cura Profili Yazıcı" #: DigitalLibrary/plugin.json msgctxt "description" msgid "Connects to the Digital Library, allowing Cura to open files from and save files to the Digital Library." -msgstr "" +msgstr "Digital Library'ye bağlanarak Cura'nın Digital Library'deki dosyaları açmasına ve kaydetmesine olanak tanır." #: DigitalLibrary/plugin.json msgctxt "name" msgid "Ultimaker Digital Library" -msgstr "" +msgstr "Ultimaker Digital Library" #: FirmwareUpdateChecker/plugin.json msgctxt "description" @@ -6058,22 +6058,22 @@ msgstr "4.7'den 4.8'e Sürüm Yükseltme" #: VersionUpgrade/VersionUpgrade48to49/plugin.json msgctxt "description" msgid "Upgrades configurations from Cura 4.8 to Cura 4.9." -msgstr "" +msgstr "Yapılandırmaları Cura 4.8'den Cura 4.9'a yükseltir." #: VersionUpgrade/VersionUpgrade48to49/plugin.json msgctxt "name" msgid "Version Upgrade 4.8 to 4.9" -msgstr "" +msgstr "4.8'den 4.9'a Sürüm Yükseltme" #: VersionUpgrade/VersionUpgrade49to410/plugin.json msgctxt "description" msgid "Upgrades configurations from Cura 4.9 to Cura 4.10." -msgstr "" +msgstr "Yapılandırmaları Cura 4.9'dan Cura 4.10'a yükseltir." #: VersionUpgrade/VersionUpgrade49to410/plugin.json msgctxt "name" msgid "Version Upgrade 4.9 to 4.10" -msgstr "" +msgstr "4.9'dan 4.10'a Sürüm Yükseltme" #: X3DReader/plugin.json msgctxt "description" diff --git a/resources/i18n/tr_TR/fdmprinter.def.json.po b/resources/i18n/tr_TR/fdmprinter.def.json.po index 77848dbf55..ed189efda7 100644 --- a/resources/i18n/tr_TR/fdmprinter.def.json.po +++ b/resources/i18n/tr_TR/fdmprinter.def.json.po @@ -3201,7 +3201,8 @@ msgstr "Geri Çekmesiz Maks. Tarama Mesafesi" #: fdmprinter.def.json msgctxt "retraction_combing_max_distance description" msgid "When greater than zero, combing travel moves that are longer than this distance will use retraction. If set to zero, there is no maximum and combing moves will not use retraction." -msgstr "" +msgstr "Sıfırdan büyük olduğunda, bu mesafeden daha uzun tarama mesafelerinde geri çekme yapılır. Sıfıra ayarlandığında, bir maksimum belirlenmez ve tarama hareketlerinde" +" geri çekme kullanılmaz." #: fdmprinter.def.json msgctxt "travel_retract_before_outer_wall label" diff --git a/resources/i18n/zh_CN/cura.po b/resources/i18n/zh_CN/cura.po index e587e8bec9..6ef1643c6f 100644 --- a/resources/i18n/zh_CN/cura.po +++ b/resources/i18n/zh_CN/cura.po @@ -173,7 +173,7 @@ msgstr "尝试恢复的 Cura 备份版本高于当前版本。" #: /home/trin/Gedeeld/Projects/Cura/cura/Backups/Backup.py:157 msgctxt "@info:backup_failed" msgid "The following error occurred while trying to restore a Cura backup:" -msgstr "" +msgstr "尝试恢复 Cura 备份时出现以下错误：" #: /home/trin/Gedeeld/Projects/Cura/cura/BuildVolume.py:98 msgctxt "@info:status" @@ -2249,7 +2249,7 @@ msgstr "查看联机用户手册" #: /home/trin/Gedeeld/Projects/Cura/plugins/MonitorStage/MonitorMain.qml:172 msgctxt "@info" msgid "In order to monitor your print from Cura, please connect the printer." -msgstr "" +msgstr "为了从 Cura 监控您的打印，请连接打印机。" #: /home/trin/Gedeeld/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:42 msgctxt "@label" @@ -2372,7 +2372,7 @@ msgstr "走线宽度" #: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:130 msgctxt "@label:listbox" msgid "Flow" -msgstr "" +msgstr "流量" #: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:171 msgctxt "@label" @@ -3367,7 +3367,7 @@ msgstr "顶视图" #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:154 msgctxt "@action:inmenu menubar:view" msgid "Bottom View" -msgstr "" +msgstr "仰视图" #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:161 msgctxt "@action:inmenu menubar:view" @@ -4596,7 +4596,7 @@ msgstr "导出" #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:199 msgctxt "@action:button Sending materials to printers" msgid "Sync with Printers" -msgstr "" +msgstr "与打印机同步" #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:248 msgctxt "@action:label" @@ -4650,7 +4650,7 @@ msgstr "成功导出材料至： %1" #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:388 msgctxt "@title:window" msgid "Export All Materials" -msgstr "" +msgstr "导出所有材料" #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:72 msgctxt "@title" @@ -5562,12 +5562,12 @@ msgstr "Cura 配置文件写入器" #: DigitalLibrary/plugin.json msgctxt "description" msgid "Connects to the Digital Library, allowing Cura to open files from and save files to the Digital Library." -msgstr "" +msgstr "连接到 Digital Library，以允许 Cura 从 Digital Library 打开文件并将文件保存到其中。" #: DigitalLibrary/plugin.json msgctxt "name" msgid "Ultimaker Digital Library" -msgstr "" +msgstr "Ultimaker Digital Library" #: FirmwareUpdateChecker/plugin.json msgctxt "description" @@ -6042,22 +6042,22 @@ msgstr "将版本从 4.7 升级到 4.8" #: VersionUpgrade/VersionUpgrade48to49/plugin.json msgctxt "description" msgid "Upgrades configurations from Cura 4.8 to Cura 4.9." -msgstr "" +msgstr "将配置从 Cura 4.8 升级到 Cura 4.9。" #: VersionUpgrade/VersionUpgrade48to49/plugin.json msgctxt "name" msgid "Version Upgrade 4.8 to 4.9" -msgstr "" +msgstr "版本从 4.8 升级到 4.9" #: VersionUpgrade/VersionUpgrade49to410/plugin.json msgctxt "description" msgid "Upgrades configurations from Cura 4.9 to Cura 4.10." -msgstr "" +msgstr "将配置从 Cura 4.9 升级到 Cura 4.10。" #: VersionUpgrade/VersionUpgrade49to410/plugin.json msgctxt "name" msgid "Version Upgrade 4.9 to 4.10" -msgstr "" +msgstr "版本从 4.9 升级到 4.10" #: X3DReader/plugin.json msgctxt "description" diff --git a/resources/i18n/zh_CN/fdmprinter.def.json.po b/resources/i18n/zh_CN/fdmprinter.def.json.po index 686fc86c73..5ab5e2533b 100644 --- a/resources/i18n/zh_CN/fdmprinter.def.json.po +++ b/resources/i18n/zh_CN/fdmprinter.def.json.po @@ -3202,7 +3202,7 @@ msgstr "最大梳距，无收缩" #: fdmprinter.def.json msgctxt "retraction_combing_max_distance description" msgid "When greater than zero, combing travel moves that are longer than this distance will use retraction. If set to zero, there is no maximum and combing moves will not use retraction." -msgstr "" +msgstr "当大于零时，比这段距离更长的梳理空驶将会使用回抽。如果设置为零，则没有最大值，梳理空驶将不会使用回抽。" #: fdmprinter.def.json msgctxt "travel_retract_before_outer_wall label" diff --git a/resources/i18n/zh_TW/cura.po b/resources/i18n/zh_TW/cura.po index 1f7eddc0c4..37610a8a1d 100644 --- a/resources/i18n/zh_TW/cura.po +++ b/resources/i18n/zh_TW/cura.po @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: Cura 4.10\n" "Report-Msgid-Bugs-To: r.dulek@ultimaker.com\n" "POT-Creation-Date: 2021-06-10 17:35+0200\n" -"PO-Revision-Date: 2021-04-16 20:13+0200\n" +"PO-Revision-Date: 2021-06-12 11:31+0800\n" "Last-Translator: Valen Chang \n" "Language-Team: Valen Chang / Leo Hsu\n" "Language: zh_TW\n" @@ -16,14 +16,10 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" -"X-Generator: Poedit 2.4.1\n" +"X-Generator: Poedit 2.4.2\n" -#: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/DiscoveredPrintersModel.py:83 -#: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentCategoryModel.py:110 -#: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/QualityManagementModel.py:361 -#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/MachineManager.py:1612 -#: /home/trin/Gedeeld/Projects/Cura/plugins/Toolbox/resources/qml/pages/ToolboxDetailPage.qml:130 -#: /home/trin/Gedeeld/Projects/Cura/plugins/Toolbox/resources/qml/pages/ToolboxDetailPage.qml:171 +#: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/DiscoveredPrintersModel.py:83 /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentCategoryModel.py:110 /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/QualityManagementModel.py:361 +#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/MachineManager.py:1612 /home/trin/Gedeeld/Projects/Cura/plugins/Toolbox/resources/qml/pages/ToolboxDetailPage.qml:130 /home/trin/Gedeeld/Projects/Cura/plugins/Toolbox/resources/qml/pages/ToolboxDetailPage.qml:171 msgctxt "@label" msgid "Unknown" msgstr "未知" @@ -49,45 +45,37 @@ msgctxt "@label {0} is the name of a printer that's about to be deleted." msgid "Are you sure you wish to remove {0}? This cannot be undone!" msgstr "你確定要移除 {0} 嗎？這動作無法復原!" -#: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentCategoryModel.py:42 -#: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentTranslations.py:11 -#: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/QualityManagementModel.py:338 +#: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentCategoryModel.py:42 /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentTranslations.py:11 /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/QualityManagementModel.py:338 msgctxt "@label" msgid "Default" msgstr "預設值" -#: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentCategoryModel.py:45 -#: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentTranslations.py:14 +#: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentCategoryModel.py:45 /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentTranslations.py:14 msgctxt "@label" msgid "Visual" msgstr "外觀" -#: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentCategoryModel.py:46 -#: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentTranslations.py:15 +#: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentCategoryModel.py:46 /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentTranslations.py:15 msgctxt "@text" msgid "The visual profile is designed to print visual prototypes and models with the intent of high visual and surface quality." msgstr "外觀參數是設計來列印較高品質形狀和表面的視覺性原型和模型。" -#: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentCategoryModel.py:49 -#: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentTranslations.py:18 +#: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentCategoryModel.py:49 /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentTranslations.py:18 msgctxt "@label" msgid "Engineering" msgstr "工程" -#: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentCategoryModel.py:50 -#: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentTranslations.py:19 +#: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentCategoryModel.py:50 /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentTranslations.py:19 msgctxt "@text" msgid "The engineering profile is designed to print functional prototypes and end-use parts with the intent of better accuracy and for closer tolerances." msgstr "工程參數是設計來列印較高精度和較小公差的功能性原型和實際使用零件。" -#: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentCategoryModel.py:53 -#: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentTranslations.py:22 +#: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentCategoryModel.py:53 /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentTranslations.py:22 msgctxt "@label" msgid "Draft" msgstr "草稿" -#: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentCategoryModel.py:54 -#: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentTranslations.py:23 +#: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentCategoryModel.py:54 /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/IntentTranslations.py:23 msgctxt "@text" msgid "The draft profile is designed to print initial prototypes and concept validation with the intent of significant print time reduction." msgstr "草稿參數是設計來縮短時間，快速列印初始原型和概念驗證。" @@ -97,8 +85,7 @@ msgctxt "@label" msgid "Custom Material" msgstr "自訂線材" -#: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/MaterialManagementModel.py:235 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/ConfigurationMenu/ConfigurationMenu.qml:205 +#: /home/trin/Gedeeld/Projects/Cura/cura/Machines/Models/MaterialManagementModel.py:235 /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/ConfigurationMenu/ConfigurationMenu.qml:205 msgctxt "@label" msgid "Custom" msgstr "自訂" @@ -124,27 +111,22 @@ msgctxt "@info:title" msgid "Login failed" msgstr "登入失敗" -#: /home/trin/Gedeeld/Projects/Cura/cura/Arranging/ArrangeObjectsAllBuildPlatesJob.py:67 -#: /home/trin/Gedeeld/Projects/Cura/cura/Arranging/ArrangeObjectsJob.py:24 +#: /home/trin/Gedeeld/Projects/Cura/cura/Arranging/ArrangeObjectsAllBuildPlatesJob.py:67 /home/trin/Gedeeld/Projects/Cura/cura/Arranging/ArrangeObjectsJob.py:24 msgctxt "@info:status" msgid "Finding new location for objects" msgstr "正在為物件尋找新位置" -#: /home/trin/Gedeeld/Projects/Cura/cura/Arranging/ArrangeObjectsAllBuildPlatesJob.py:71 -#: /home/trin/Gedeeld/Projects/Cura/cura/Arranging/ArrangeObjectsJob.py:28 +#: /home/trin/Gedeeld/Projects/Cura/cura/Arranging/ArrangeObjectsAllBuildPlatesJob.py:71 /home/trin/Gedeeld/Projects/Cura/cura/Arranging/ArrangeObjectsJob.py:28 msgctxt "@info:title" msgid "Finding Location" msgstr "尋找位置中" -#: /home/trin/Gedeeld/Projects/Cura/cura/Arranging/ArrangeObjectsAllBuildPlatesJob.py:150 -#: /home/trin/Gedeeld/Projects/Cura/cura/Arranging/ArrangeObjectsJob.py:41 -#: /home/trin/Gedeeld/Projects/Cura/cura/MultiplyObjectsJob.py:76 +#: /home/trin/Gedeeld/Projects/Cura/cura/Arranging/ArrangeObjectsAllBuildPlatesJob.py:150 /home/trin/Gedeeld/Projects/Cura/cura/Arranging/ArrangeObjectsJob.py:41 /home/trin/Gedeeld/Projects/Cura/cura/MultiplyObjectsJob.py:76 msgctxt "@info:status" msgid "Unable to find a location within the build volume for all objects" msgstr "無法在列印範圍內放下全部物件" -#: /home/trin/Gedeeld/Projects/Cura/cura/Arranging/ArrangeObjectsAllBuildPlatesJob.py:151 -#: /home/trin/Gedeeld/Projects/Cura/cura/Arranging/ArrangeObjectsJob.py:42 +#: /home/trin/Gedeeld/Projects/Cura/cura/Arranging/ArrangeObjectsAllBuildPlatesJob.py:151 /home/trin/Gedeeld/Projects/Cura/cura/Arranging/ArrangeObjectsJob.py:42 msgctxt "@info:title" msgid "Can't Find Location" msgstr "無法找到位置" @@ -154,9 +136,7 @@ msgctxt "@info:backup_failed" msgid "Could not create archive from user data directory: {}" msgstr "無法從使用者資料目錄建立備份檔：{}" -#: /home/trin/Gedeeld/Projects/Cura/cura/Backups/Backup.py:122 -#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraDrive/src/DrivePluginExtension.py:107 -#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraDrive/src/DrivePluginExtension.py:113 +#: /home/trin/Gedeeld/Projects/Cura/cura/Backups/Backup.py:122 /home/trin/Gedeeld/Projects/Cura/plugins/CuraDrive/src/DrivePluginExtension.py:107 /home/trin/Gedeeld/Projects/Cura/plugins/CuraDrive/src/DrivePluginExtension.py:113 msgctxt "@info:title" msgid "Backup" msgstr "備份" @@ -164,17 +144,17 @@ msgstr "備份" #: /home/trin/Gedeeld/Projects/Cura/cura/Backups/Backup.py:135 msgctxt "@info:backup_failed" msgid "Tried to restore a Cura backup without having proper data or meta data." -msgstr "嘗試復原沒有正確資料或 meta data 的 Cura 備份。" +msgstr "嘗試復原Cura 備份(若無proper data或meta data)。" #: /home/trin/Gedeeld/Projects/Cura/cura/Backups/Backup.py:146 msgctxt "@info:backup_failed" msgid "Tried to restore a Cura backup that is higher than the current version." -msgstr "嘗試復原的 Cura 備份的版本比目前的軟體版本新。" +msgstr "嘗試復原新版本的Cura備份。" #: /home/trin/Gedeeld/Projects/Cura/cura/Backups/Backup.py:157 msgctxt "@info:backup_failed" msgid "The following error occurred while trying to restore a Cura backup:" -msgstr "" +msgstr "恢復Cura備份時，出現下列錯誤:" #: /home/trin/Gedeeld/Projects/Cura/cura/BuildVolume.py:98 msgctxt "@info:status" @@ -377,11 +357,8 @@ msgctxt "@info:status" msgid "Only one G-code file can be loaded at a time. Skipped importing {0}" msgstr "一次只能載入一個 G-code 檔案。{0} 已跳過匯入" -#: /home/trin/Gedeeld/Projects/Cura/cura/CuraApplication.py:1800 -#: /home/trin/Gedeeld/Projects/Cura/cura/OAuth2/AuthorizationService.py:190 -#: /home/trin/Gedeeld/Projects/Cura/cura/OAuth2/AuthorizationService.py:244 -#: /home/trin/Gedeeld/Projects/Cura/plugins/RemovableDriveOutputDevice/RemovableDriveOutputDevice.py:153 -#: /home/trin/Gedeeld/Projects/Cura/plugins/RemovableDriveOutputDevice/RemovableDriveOutputDevice.py:165 +#: /home/trin/Gedeeld/Projects/Cura/cura/CuraApplication.py:1800 /home/trin/Gedeeld/Projects/Cura/cura/OAuth2/AuthorizationService.py:190 /home/trin/Gedeeld/Projects/Cura/cura/OAuth2/AuthorizationService.py:244 +#: /home/trin/Gedeeld/Projects/Cura/plugins/RemovableDriveOutputDevice/RemovableDriveOutputDevice.py:153 /home/trin/Gedeeld/Projects/Cura/plugins/RemovableDriveOutputDevice/RemovableDriveOutputDevice.py:165 msgctxt "@info:title" msgid "Warning" msgstr "警告" @@ -392,9 +369,7 @@ msgctxt "@info:status" msgid "Can't open any other file if G-code is loading. Skipped importing {0}" msgstr "如果載入 G-code，則無法開啟其他任何檔案。{0} 已跳過匯入" -#: /home/trin/Gedeeld/Projects/Cura/cura/CuraApplication.py:1810 -#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/CuraContainerRegistry.py:146 -#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/CuraContainerRegistry.py:153 +#: /home/trin/Gedeeld/Projects/Cura/cura/CuraApplication.py:1810 /home/trin/Gedeeld/Projects/Cura/cura/Settings/CuraContainerRegistry.py:146 /home/trin/Gedeeld/Projects/Cura/cura/Settings/CuraContainerRegistry.py:153 #: /home/trin/Gedeeld/Projects/Cura/plugins/RemovableDriveOutputDevice/RemovableDriveOutputDevice.py:139 msgctxt "@info:title" msgid "Error" @@ -445,21 +420,18 @@ msgctxt "@info" msgid "Unable to reach the Ultimaker account server." msgstr "無法連上 Ultimaker 帳號伺服器。" -#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/ContainerManager.py:205 -#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/CuraContainerRegistry.py:132 +#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/ContainerManager.py:205 /home/trin/Gedeeld/Projects/Cura/cura/Settings/CuraContainerRegistry.py:132 msgctxt "@title:window" msgid "File Already Exists" msgstr "檔案已經存在" -#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/ContainerManager.py:206 -#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/CuraContainerRegistry.py:133 +#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/ContainerManager.py:206 /home/trin/Gedeeld/Projects/Cura/cura/Settings/CuraContainerRegistry.py:133 #, python-brace-format msgctxt "@label Don't translate the XML tag !" msgid "The file {0} already exists. Are you sure you want to overwrite it?" msgstr "檔案 {0} 已存在。你確定要覆蓋掉它嗎？" -#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/ContainerManager.py:457 -#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/ContainerManager.py:460 +#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/ContainerManager.py:457 /home/trin/Gedeeld/Projects/Cura/cura/Settings/ContainerManager.py:460 msgctxt "@info:status" msgid "Invalid file URL:" msgstr "無效的檔案網址：" @@ -511,8 +483,7 @@ msgctxt "@info:status Don't translate the XML tags !" msgid "Failed to import profile from {0}:" msgstr "從 {0} 匯入列印參數失敗：" -#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/CuraContainerRegistry.py:235 -#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/CuraContainerRegistry.py:245 +#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/CuraContainerRegistry.py:235 /home/trin/Gedeeld/Projects/Cura/cura/Settings/CuraContainerRegistry.py:245 #, python-brace-format msgctxt "@info:status Don't translate the XML tags !" msgid "This profile {0} contains incorrect data, could not import it." @@ -584,8 +555,7 @@ msgctxt "@info:No intent profile selected" msgid "Default" msgstr "預設值" -#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/MachineManager.py:713 -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/ThreeMFWorkspaceReader.py:216 +#: /home/trin/Gedeeld/Projects/Cura/cura/Settings/MachineManager.py:713 /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/ThreeMFWorkspaceReader.py:216 msgctxt "@label" msgid "Nozzle" msgstr "噴頭" @@ -605,30 +575,20 @@ msgctxt "@info:title" msgid "Extruder(s) Disabled" msgstr "擠出機已停用" -#: /home/trin/Gedeeld/Projects/Cura/cura/UI/AddPrinterPagesModel.py:17 -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:67 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:48 +#: /home/trin/Gedeeld/Projects/Cura/cura/UI/AddPrinterPagesModel.py:17 /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:67 /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:48 msgctxt "@action:button" msgid "Add" msgstr "增加" -#: /home/trin/Gedeeld/Projects/Cura/cura/UI/AddPrinterPagesModel.py:26 -#: /home/trin/Gedeeld/Projects/Cura/cura/UI/WelcomePagesModel.py:272 +#: /home/trin/Gedeeld/Projects/Cura/cura/UI/AddPrinterPagesModel.py:26 /home/trin/Gedeeld/Projects/Cura/cura/UI/WelcomePagesModel.py:272 msgctxt "@action:button" msgid "Finish" msgstr "完成" -#: /home/trin/Gedeeld/Projects/Cura/cura/UI/AddPrinterPagesModel.py:33 -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:445 -#: /home/trin/Gedeeld/Projects/Cura/plugins/ImageReader/ConfigUI.qml:234 -#: /home/trin/Gedeeld/Projects/Cura/plugins/SliceInfoPlugin/MoreInfoWindow.qml:150 -#: /home/trin/Gedeeld/Projects/Cura/plugins/Toolbox/resources/qml/components/ToolboxProgressButton.qml:19 -#: /home/trin/Gedeeld/Projects/Cura/plugins/Toolbox/resources/qml/dialogs/ToolboxConfirmUninstallResetDialog.qml:81 -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:352 -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorConfigOverrideDialog.qml:58 -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintWindow.qml:42 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/OpenFilesIncludingProjectsDialog.qml:82 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:292 +#: /home/trin/Gedeeld/Projects/Cura/cura/UI/AddPrinterPagesModel.py:33 /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:445 /home/trin/Gedeeld/Projects/Cura/plugins/ImageReader/ConfigUI.qml:234 /home/trin/Gedeeld/Projects/Cura/plugins/SliceInfoPlugin/MoreInfoWindow.qml:150 +#: /home/trin/Gedeeld/Projects/Cura/plugins/Toolbox/resources/qml/components/ToolboxProgressButton.qml:19 /home/trin/Gedeeld/Projects/Cura/plugins/Toolbox/resources/qml/dialogs/ToolboxConfirmUninstallResetDialog.qml:81 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:352 /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorConfigOverrideDialog.qml:58 /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/PrintWindow.qml:42 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/OpenFilesIncludingProjectsDialog.qml:82 /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:292 msgctxt "@action:button" msgid "Cancel" msgstr "取消" @@ -699,24 +659,18 @@ msgctxt "@tooltip" msgid "Other" msgstr "其它" -#: /home/trin/Gedeeld/Projects/Cura/cura/UI/WelcomePagesModel.py:56 -#: /home/trin/Gedeeld/Projects/Cura/cura/UI/WelcomePagesModel.py:259 +#: /home/trin/Gedeeld/Projects/Cura/cura/UI/WelcomePagesModel.py:56 /home/trin/Gedeeld/Projects/Cura/cura/UI/WelcomePagesModel.py:259 msgctxt "@action:button" msgid "Next" msgstr "下一步" -#: /home/trin/Gedeeld/Projects/Cura/cura/UI/WelcomePagesModel.py:268 -#: /home/trin/Gedeeld/Projects/Cura/cura/UI/WhatsNewPagesModel.py:55 +#: /home/trin/Gedeeld/Projects/Cura/cura/UI/WelcomePagesModel.py:268 /home/trin/Gedeeld/Projects/Cura/cura/UI/WhatsNewPagesModel.py:55 msgctxt "@action:button" msgid "Skip" msgstr "略過" -#: /home/trin/Gedeeld/Projects/Cura/cura/UI/WhatsNewPagesModel.py:60 -#: /home/trin/Gedeeld/Projects/Cura/plugins/FirmwareUpdater/FirmwareUpdaterMachineAction.qml:185 -#: /home/trin/Gedeeld/Projects/Cura/plugins/PerObjectSettingsTool/SettingPickDialog.qml:128 -#: /home/trin/Gedeeld/Projects/Cura/plugins/PostProcessingPlugin/PostProcessingPlugin.qml:485 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:174 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:127 +#: /home/trin/Gedeeld/Projects/Cura/cura/UI/WhatsNewPagesModel.py:60 /home/trin/Gedeeld/Projects/Cura/plugins/FirmwareUpdater/FirmwareUpdaterMachineAction.qml:185 /home/trin/Gedeeld/Projects/Cura/plugins/PerObjectSettingsTool/SettingPickDialog.qml:128 +#: /home/trin/Gedeeld/Projects/Cura/plugins/PostProcessingPlugin/PostProcessingPlugin.qml:485 /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:174 /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:127 msgctxt "@action:button" msgid "Close" msgstr "關閉" @@ -757,8 +711,7 @@ msgctxt "@info:error Don't translate the XML tags or !" msgid "Project file {0} is suddenly inaccessible: {1}." msgstr "專案檔案 {0} 無法存取：{1}。" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/ThreeMFWorkspaceReader.py:640 -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/ThreeMFWorkspaceReader.py:647 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/ThreeMFWorkspaceReader.py:640 /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/ThreeMFWorkspaceReader.py:647 msgctxt "@info:title" msgid "Can't Open Project File" msgstr "無法開啟專案檔案" @@ -785,8 +738,7 @@ msgctxt "@title:tab" msgid "Custom" msgstr "自訂選項" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/__init__.py:27 -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/__init__.py:33 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/__init__.py:27 /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/__init__.py:33 msgctxt "@item:inlistbox" msgid "3MF File" msgstr "3MF 檔案" @@ -796,8 +748,7 @@ msgctxt "@error:zip" msgid "3MF Writer plug-in is corrupt." msgstr "3MF 寫入器外掛已損壞。" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFWriter/ThreeMFWorkspaceWriter.py:59 -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFWriter/ThreeMFWorkspaceWriter.py:92 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFWriter/ThreeMFWorkspaceWriter.py:59 /home/trin/Gedeeld/Projects/Cura/plugins/3MFWriter/ThreeMFWorkspaceWriter.py:92 msgctxt "@error:zip" msgid "No permission to write the workspace here." msgstr "沒有寫入此處工作區的權限。" @@ -862,8 +813,7 @@ msgctxt "@error:file_size" msgid "The backup exceeds the maximum file size." msgstr "備份超過了最大檔案大小。" -#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraDrive/src/DriveApiService.py:86 -#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraDrive/src/RestoreBackupJob.py:26 +#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraDrive/src/DriveApiService.py:86 /home/trin/Gedeeld/Projects/Cura/plugins/CuraDrive/src/RestoreBackupJob.py:26 msgctxt "@info:backup_status" msgid "There was an error trying to restore your backup." msgstr "嘗試恢復備份時發生錯誤。" @@ -878,12 +828,8 @@ msgctxt "@info:status" msgid "Unable to slice with the current material as it is incompatible with the selected machine or configuration." msgstr "無法使用目前線材切片，因為它與所選機器或設定不相容。" -#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:382 -#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:413 -#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:437 -#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:446 -#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:455 -#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:467 +#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:382 /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:413 /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:437 +#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:446 /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:455 /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:467 msgctxt "@info:title" msgid "Unable to slice" msgstr "無法切片" @@ -924,8 +870,7 @@ msgstr "" "- 分配了一個已啟用的擠出機\n" "- 沒有全部設定成修改網格" -#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/ProcessSlicedLayersJob.py:52 -#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/ProcessSlicedLayersJob.py:260 +#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/ProcessSlicedLayersJob.py:52 /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/ProcessSlicedLayersJob.py:260 msgctxt "@info:status" msgid "Processing Layers" msgstr "正在處理層" @@ -935,8 +880,7 @@ msgctxt "@info:title" msgid "Information" msgstr "資訊" -#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraProfileReader/__init__.py:14 -#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraProfileWriter/__init__.py:14 +#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraProfileReader/__init__.py:14 /home/trin/Gedeeld/Projects/Cura/plugins/CuraProfileWriter/__init__.py:14 msgctxt "@item:inlistbox" msgid "Cura Profile" msgstr "Cura 列印參數" @@ -968,8 +912,7 @@ msgctxt "@action" msgid "Update Firmware" msgstr "更新韌體" -#: /home/trin/Gedeeld/Projects/Cura/plugins/GCodeGzReader/__init__.py:17 -#: /home/trin/Gedeeld/Projects/Cura/plugins/GCodeGzWriter/__init__.py:17 +#: /home/trin/Gedeeld/Projects/Cura/plugins/GCodeGzReader/__init__.py:17 /home/trin/Gedeeld/Projects/Cura/plugins/GCodeGzWriter/__init__.py:17 msgctxt "@item:inlistbox" msgid "Compressed G-code File" msgstr "壓縮 G-code 檔案" @@ -979,9 +922,7 @@ msgctxt "@error:not supported" msgid "GCodeGzWriter does not support text mode." msgstr "G-code GZ 寫入器不支援非文字模式。" -#: /home/trin/Gedeeld/Projects/Cura/plugins/GCodeProfileReader/__init__.py:14 -#: /home/trin/Gedeeld/Projects/Cura/plugins/GCodeReader/__init__.py:14 -#: /home/trin/Gedeeld/Projects/Cura/plugins/GCodeWriter/__init__.py:16 +#: /home/trin/Gedeeld/Projects/Cura/plugins/GCodeProfileReader/__init__.py:14 /home/trin/Gedeeld/Projects/Cura/plugins/GCodeReader/__init__.py:14 /home/trin/Gedeeld/Projects/Cura/plugins/GCodeWriter/__init__.py:16 msgctxt "@item:inlistbox" msgid "G-code File" msgstr "G-code 檔案" @@ -991,8 +932,7 @@ msgctxt "@info:status" msgid "Parsing G-code" msgstr "正在解析 G-code" -#: /home/trin/Gedeeld/Projects/Cura/plugins/GCodeReader/FlavorParser.py:349 -#: /home/trin/Gedeeld/Projects/Cura/plugins/GCodeReader/FlavorParser.py:503 +#: /home/trin/Gedeeld/Projects/Cura/plugins/GCodeReader/FlavorParser.py:349 /home/trin/Gedeeld/Projects/Cura/plugins/GCodeReader/FlavorParser.py:503 msgctxt "@info:title" msgid "G-code Details" msgstr "G-code 細項設定" @@ -1012,8 +952,7 @@ msgctxt "@error:not supported" msgid "GCodeWriter does not support non-text mode." msgstr "G-code 寫入器不支援非文字模式。" -#: /home/trin/Gedeeld/Projects/Cura/plugins/GCodeWriter/GCodeWriter.py:80 -#: /home/trin/Gedeeld/Projects/Cura/plugins/GCodeWriter/GCodeWriter.py:96 +#: /home/trin/Gedeeld/Projects/Cura/plugins/GCodeWriter/GCodeWriter.py:80 /home/trin/Gedeeld/Projects/Cura/plugins/GCodeWriter/GCodeWriter.py:96 msgctxt "@warning:status" msgid "Please prepare G-code before exporting." msgstr "匯出前請先將 G-code 準備好。" @@ -1099,8 +1038,7 @@ msgctxt "@item:inlistbox" msgid "Save to Removable Drive {0}" msgstr "儲存到行動裝置 {0}" -#: /home/trin/Gedeeld/Projects/Cura/plugins/RemovableDriveOutputDevice/RemovableDriveOutputDevice.py:66 -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/src/MeshFormatHandler.py:118 +#: /home/trin/Gedeeld/Projects/Cura/plugins/RemovableDriveOutputDevice/RemovableDriveOutputDevice.py:66 /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/src/MeshFormatHandler.py:118 msgctxt "@info:status" msgid "There are no file formats available to write with!" msgstr "沒有可供寫入的檔案格式！" @@ -1116,8 +1054,7 @@ msgctxt "@info:title" msgid "Saving" msgstr "儲存中" -#: /home/trin/Gedeeld/Projects/Cura/plugins/RemovableDriveOutputDevice/RemovableDriveOutputDevice.py:106 -#: /home/trin/Gedeeld/Projects/Cura/plugins/RemovableDriveOutputDevice/RemovableDriveOutputDevice.py:109 +#: /home/trin/Gedeeld/Projects/Cura/plugins/RemovableDriveOutputDevice/RemovableDriveOutputDevice.py:106 /home/trin/Gedeeld/Projects/Cura/plugins/RemovableDriveOutputDevice/RemovableDriveOutputDevice.py:109 #, python-brace-format msgctxt "@info:status Don't translate the XML tags or !" msgid "Could not save to {0}: {1}" @@ -1129,8 +1066,7 @@ msgctxt "@info:status Don't translate the tag {device}!" msgid "Could not find a file name when trying to write to {device}." msgstr "嘗試寫入到 {device} 時無法找到檔名。" -#: /home/trin/Gedeeld/Projects/Cura/plugins/RemovableDriveOutputDevice/RemovableDriveOutputDevice.py:138 -#: /home/trin/Gedeeld/Projects/Cura/plugins/RemovableDriveOutputDevice/RemovableDriveOutputDevice.py:153 +#: /home/trin/Gedeeld/Projects/Cura/plugins/RemovableDriveOutputDevice/RemovableDriveOutputDevice.py:138 /home/trin/Gedeeld/Projects/Cura/plugins/RemovableDriveOutputDevice/RemovableDriveOutputDevice.py:153 #, python-brace-format msgctxt "@info:status" msgid "Could not save to removable drive {0}: {1}" @@ -1200,8 +1136,7 @@ msgctxt "@info:title" msgid "No layers to show" msgstr "沒有列印層可顯示" -#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationView.py:131 -#: /home/trin/Gedeeld/Projects/Cura/plugins/SolidView/SolidView.py:74 +#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationView.py:131 /home/trin/Gedeeld/Projects/Cura/plugins/SolidView/SolidView.py:74 msgctxt "@info:option_text" msgid "Do not show this message again" msgstr "不要再顯示這個訊息" @@ -1247,8 +1182,7 @@ msgctxt "@info:generic" msgid "Do you want to sync material and software packages with your account?" msgstr "你要使用你的帳號同步線材資料和軟體套件嗎？" -#: /home/trin/Gedeeld/Projects/Cura/plugins/Toolbox/src/CloudSync/CloudPackageChecker.py:143 -#: /home/trin/Gedeeld/Projects/Cura/plugins/Toolbox/src/CloudSync/DownloadPresenter.py:93 +#: /home/trin/Gedeeld/Projects/Cura/plugins/Toolbox/src/CloudSync/CloudPackageChecker.py:143 /home/trin/Gedeeld/Projects/Cura/plugins/Toolbox/src/CloudSync/DownloadPresenter.py:93 msgctxt "@info:title" msgid "Changes detected from your Ultimaker account" msgstr "從你的 Ultimaker 帳號偵測到資料更動" @@ -1268,8 +1202,7 @@ msgctxt "@button" msgid "Decline" msgstr "拒絕" -#: /home/trin/Gedeeld/Projects/Cura/plugins/Toolbox/src/CloudSync/LicenseModel.py:10 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/UserAgreementContent.qml:56 +#: /home/trin/Gedeeld/Projects/Cura/plugins/Toolbox/src/CloudSync/LicenseModel.py:10 /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/UserAgreementContent.qml:56 msgctxt "@button" msgid "Agree" msgstr "同意" @@ -1324,16 +1257,12 @@ msgctxt "@item:inlistbox" msgid "Compressed COLLADA Digital Asset Exchange" msgstr "Compressed COLLADA Digital Asset Exchange" -#: /home/trin/Gedeeld/Projects/Cura/plugins/UFPReader/__init__.py:22 -#: /home/trin/Gedeeld/Projects/Cura/plugins/UFPWriter/__init__.py:28 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UFPReader/__init__.py:22 /home/trin/Gedeeld/Projects/Cura/plugins/UFPWriter/__init__.py:28 msgctxt "@item:inlistbox" msgid "Ultimaker Format Package" msgstr "Ultimaker 格式的封包" -#: /home/trin/Gedeeld/Projects/Cura/plugins/UFPWriter/UFPWriter.py:57 -#: /home/trin/Gedeeld/Projects/Cura/plugins/UFPWriter/UFPWriter.py:72 -#: /home/trin/Gedeeld/Projects/Cura/plugins/UFPWriter/UFPWriter.py:94 -#: /home/trin/Gedeeld/Projects/Cura/plugins/UFPWriter/UFPWriter.py:149 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UFPWriter/UFPWriter.py:57 /home/trin/Gedeeld/Projects/Cura/plugins/UFPWriter/UFPWriter.py:72 /home/trin/Gedeeld/Projects/Cura/plugins/UFPWriter/UFPWriter.py:94 /home/trin/Gedeeld/Projects/Cura/plugins/UFPWriter/UFPWriter.py:149 #: /home/trin/Gedeeld/Projects/Cura/plugins/UFPWriter/UFPWriter.py:159 msgctxt "@info:error" msgid "Can't write to UFP file:" @@ -1406,8 +1335,7 @@ msgid "This printer is not linked to the Digital Factory:" msgid_plural "These printers are not linked to the Digital Factory:" msgstr[0] "印表機未連到 Digital Factory：" -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDeviceManager.py:329 -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDeviceManager.py:419 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDeviceManager.py:329 /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDeviceManager.py:419 msgctxt "info:name" msgid "Ultimaker Digital Factory" msgstr "Ultimaker Digital Factory" @@ -1670,14 +1598,12 @@ msgctxt "@action:ComboBox Save settings in a new profile" msgid "Create new" msgstr "新建設定" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:75 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:69 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:75 /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:69 msgctxt "@action:title" msgid "Summary - Cura Project" msgstr "摘要 - Cura 專案" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:97 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:93 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:97 /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:93 msgctxt "@action:label" msgid "Printer settings" msgstr "印表機設定" @@ -1687,20 +1613,17 @@ msgctxt "@info:tooltip" msgid "How should the conflict in the machine be resolved?" msgstr "如何解決機器的設定衝突？" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:167 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:102 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:167 /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:102 msgctxt "@action:label" msgid "Type" msgstr "類型" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:183 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:117 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:183 /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:117 msgctxt "@action:label" msgid "Printer Group" msgstr "印表機群組" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:205 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:218 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:205 /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:218 msgctxt "@action:label" msgid "Profile settings" msgstr "列印參數設定" @@ -1710,28 +1633,23 @@ msgctxt "@info:tooltip" msgid "How should the conflict in the profile be resolved?" msgstr "如何解决列印參數中的設定衝突？" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:242 -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:353 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:117 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:242 /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:353 /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:117 #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:242 msgctxt "@action:label" msgid "Name" msgstr "名稱" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:258 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:259 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:258 /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:259 msgctxt "@action:label" msgid "Intent" msgstr "意圖" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:274 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:226 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:274 /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:226 msgctxt "@action:label" msgid "Not in profile" msgstr "不在列印參數中" -#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:279 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:231 +#: /home/trin/Gedeeld/Projects/Cura/plugins/3MFReader/WorkspaceDialog.qml:279 /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/WorkspaceSummaryDialog.qml:231 msgctxt "@action:label" msgid "%1 override" msgid_plural "%1 overrides" @@ -1883,9 +1801,7 @@ msgctxt "@description" msgid "Backup and synchronize your Cura settings." msgstr "備份並同步你的 Cura 設定。" -#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraDrive/src/qml/pages/WelcomePage.qml:51 -#: /home/trin/Gedeeld/Projects/Cura/plugins/Toolbox/resources/qml/pages/WelcomePage.qml:39 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Account/GeneralOperations.qml:53 +#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraDrive/src/qml/pages/WelcomePage.qml:51 /home/trin/Gedeeld/Projects/Cura/plugins/Toolbox/resources/qml/pages/WelcomePage.qml:39 /home/trin/Gedeeld/Projects/Cura/resources/qml/Account/GeneralOperations.qml:53 #: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/CloudContent.qml:199 msgctxt "@button" msgid "Sign in" @@ -2036,8 +1952,7 @@ msgctxt "@item:inlistbox" msgid "Linear" msgstr "線性" -#: /home/trin/Gedeeld/Projects/Cura/plugins/ImageReader/ConfigUI.qml:161 -#: /home/trin/Gedeeld/Projects/Cura/plugins/ImageReader/ConfigUI.qml:172 +#: /home/trin/Gedeeld/Projects/Cura/plugins/ImageReader/ConfigUI.qml:161 /home/trin/Gedeeld/Projects/Cura/plugins/ImageReader/ConfigUI.qml:172 msgctxt "@item:inlistbox" msgid "Translucency" msgstr "半透明" @@ -2062,9 +1977,7 @@ msgctxt "@action:label" msgid "Smoothing" msgstr "平滑" -#: /home/trin/Gedeeld/Projects/Cura/plugins/ImageReader/ConfigUI.qml:227 -#: /home/trin/Gedeeld/Projects/Cura/plugins/SliceInfoPlugin/MoreInfoWindow.qml:139 -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:361 +#: /home/trin/Gedeeld/Projects/Cura/plugins/ImageReader/ConfigUI.qml:227 /home/trin/Gedeeld/Projects/Cura/plugins/SliceInfoPlugin/MoreInfoWindow.qml:139 /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:361 msgctxt "@action:button" msgid "OK" msgstr "確定" @@ -2084,18 +1997,10 @@ msgctxt "@label" msgid "Nozzle size" msgstr "噴頭孔徑" -#: /home/trin/Gedeeld/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsExtruderTab.qml:79 -#: /home/trin/Gedeeld/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsExtruderTab.qml:93 -#: /home/trin/Gedeeld/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsExtruderTab.qml:109 -#: /home/trin/Gedeeld/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsExtruderTab.qml:124 -#: /home/trin/Gedeeld/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:74 -#: /home/trin/Gedeeld/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:89 -#: /home/trin/Gedeeld/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:104 -#: /home/trin/Gedeeld/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:205 -#: /home/trin/Gedeeld/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:225 -#: /home/trin/Gedeeld/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:245 -#: /home/trin/Gedeeld/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:265 -#: /home/trin/Gedeeld/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:283 +#: /home/trin/Gedeeld/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsExtruderTab.qml:79 /home/trin/Gedeeld/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsExtruderTab.qml:93 /home/trin/Gedeeld/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsExtruderTab.qml:109 +#: /home/trin/Gedeeld/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsExtruderTab.qml:124 /home/trin/Gedeeld/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:74 /home/trin/Gedeeld/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:89 +#: /home/trin/Gedeeld/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:104 /home/trin/Gedeeld/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:205 /home/trin/Gedeeld/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:225 +#: /home/trin/Gedeeld/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:245 /home/trin/Gedeeld/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:265 /home/trin/Gedeeld/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml:283 msgctxt "@label" msgid "mm" msgstr "mm" @@ -2251,7 +2156,7 @@ msgstr "查看線上使用者手冊" #: /home/trin/Gedeeld/Projects/Cura/plugins/MonitorStage/MonitorMain.qml:172 msgctxt "@info" msgid "In order to monitor your print from Cura, please connect the printer." -msgstr "" +msgstr "為了監控您的印表機，請連結印表機." #: /home/trin/Gedeeld/Projects/Cura/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml:42 msgctxt "@label" @@ -2298,8 +2203,7 @@ msgctxt "@title:window" msgid "Select Settings to Customize for this model" msgstr "選擇對此模型的自訂設定" -#: /home/trin/Gedeeld/Projects/Cura/plugins/PerObjectSettingsTool/SettingPickDialog.qml:55 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/SettingVisibilityPage.qml:96 +#: /home/trin/Gedeeld/Projects/Cura/plugins/PerObjectSettingsTool/SettingPickDialog.qml:55 /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/SettingVisibilityPage.qml:96 msgctxt "@label:textbox" msgid "Filter..." msgstr "篩選..." @@ -2340,8 +2244,7 @@ msgid "The following script is active:" msgid_plural "The following scripts are active:" msgstr[0] "下列為啟用中的腳本：" -#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:20 -#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:49 +#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:20 /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:49 msgctxt "@label" msgid "Color scheme" msgstr "顏色方案" @@ -2374,7 +2277,7 @@ msgstr "線寬" #: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:130 msgctxt "@label:listbox" msgid "Flow" -msgstr "" +msgstr "流動" #: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:171 msgctxt "@label" @@ -2396,8 +2299,7 @@ msgctxt "@label" msgid "Shell" msgstr "外殼" -#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:263 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/PrintSetupSelector/Recommended/RecommendedInfillDensitySelector.qml:65 +#: /home/trin/Gedeeld/Projects/Cura/plugins/SimulationView/SimulationViewMenuComponent.qml:263 /home/trin/Gedeeld/Projects/Cura/resources/qml/PrintSetupSelector/Recommended/RecommendedInfillDensitySelector.qml:65 msgctxt "@label" msgid "Infill" msgstr "填充" @@ -2507,8 +2409,7 @@ msgctxt "@action:label" msgid "Website" msgstr "網站" -#: /home/trin/Gedeeld/Projects/Cura/plugins/Toolbox/resources/qml/components/ToolboxDetailTileActions.qml:46 -#: /home/trin/Gedeeld/Projects/Cura/plugins/Toolbox/resources/qml/components/ToolboxProgressButton.qml:20 +#: /home/trin/Gedeeld/Projects/Cura/plugins/Toolbox/resources/qml/components/ToolboxDetailTileActions.qml:46 /home/trin/Gedeeld/Projects/Cura/plugins/Toolbox/resources/qml/components/ToolboxProgressButton.qml:20 msgctxt "@action:button" msgid "Installed" msgstr "已安裝" @@ -2523,20 +2424,17 @@ msgctxt "@label:The string between and is the highlighted link" msgid "Buy material spools" msgstr "購買線材線軸" -#: /home/trin/Gedeeld/Projects/Cura/plugins/Toolbox/resources/qml/components/ToolboxDetailTileActions.qml:96 -#: /home/trin/Gedeeld/Projects/Cura/plugins/Toolbox/resources/qml/components/ToolboxInstalledTileActions.qml:34 +#: /home/trin/Gedeeld/Projects/Cura/plugins/Toolbox/resources/qml/components/ToolboxDetailTileActions.qml:96 /home/trin/Gedeeld/Projects/Cura/plugins/Toolbox/resources/qml/components/ToolboxInstalledTileActions.qml:34 msgctxt "@action:button" msgid "Update" msgstr "更新" -#: /home/trin/Gedeeld/Projects/Cura/plugins/Toolbox/resources/qml/components/ToolboxDetailTileActions.qml:97 -#: /home/trin/Gedeeld/Projects/Cura/plugins/Toolbox/resources/qml/components/ToolboxInstalledTileActions.qml:35 +#: /home/trin/Gedeeld/Projects/Cura/plugins/Toolbox/resources/qml/components/ToolboxDetailTileActions.qml:97 /home/trin/Gedeeld/Projects/Cura/plugins/Toolbox/resources/qml/components/ToolboxInstalledTileActions.qml:35 msgctxt "@action:button" msgid "Updating" msgstr "更新中" -#: /home/trin/Gedeeld/Projects/Cura/plugins/Toolbox/resources/qml/components/ToolboxDetailTileActions.qml:98 -#: /home/trin/Gedeeld/Projects/Cura/plugins/Toolbox/resources/qml/components/ToolboxInstalledTileActions.qml:36 +#: /home/trin/Gedeeld/Projects/Cura/plugins/Toolbox/resources/qml/components/ToolboxDetailTileActions.qml:98 /home/trin/Gedeeld/Projects/Cura/plugins/Toolbox/resources/qml/components/ToolboxInstalledTileActions.qml:36 msgctxt "@action:button" msgid "Updated" msgstr "更新完成" @@ -2546,8 +2444,7 @@ msgctxt "@label" msgid "Premium" msgstr "付費會員" -#: /home/trin/Gedeeld/Projects/Cura/plugins/Toolbox/resources/qml/components/ToolboxDownloadsShowcase.qml:39 -#: /home/trin/Gedeeld/Projects/Cura/plugins/Toolbox/resources/qml/components/ToolboxHeader.qml:86 +#: /home/trin/Gedeeld/Projects/Cura/plugins/Toolbox/resources/qml/components/ToolboxDownloadsShowcase.qml:39 /home/trin/Gedeeld/Projects/Cura/plugins/Toolbox/resources/qml/components/ToolboxHeader.qml:86 msgctxt "@info:tooltip" msgid "Go to Web Marketplace" msgstr "前往網路市集" @@ -2572,9 +2469,7 @@ msgctxt "@title:tab" msgid "Plugins" msgstr "外掛" -#: /home/trin/Gedeeld/Projects/Cura/plugins/Toolbox/resources/qml/components/ToolboxHeader.qml:44 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:457 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:89 +#: /home/trin/Gedeeld/Projects/Cura/plugins/Toolbox/resources/qml/components/ToolboxHeader.qml:44 /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:457 /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:89 msgctxt "@title:tab" msgid "Materials" msgstr "線材" @@ -2619,9 +2514,7 @@ msgctxt "@button" msgid "Dismiss" msgstr "捨棄" -#: /home/trin/Gedeeld/Projects/Cura/plugins/Toolbox/resources/qml/dialogs/CompatibilityDialog.qml:23 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/DataCollectionsContent.qml:123 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/FirstStartMachineActionsContent.qml:77 +#: /home/trin/Gedeeld/Projects/Cura/plugins/Toolbox/resources/qml/dialogs/CompatibilityDialog.qml:23 /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/DataCollectionsContent.qml:123 /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/FirstStartMachineActionsContent.qml:77 #: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/WhatsNewContent.qml:178 msgctxt "@button" msgid "Next" @@ -2687,8 +2580,7 @@ msgctxt "@label" msgid "Last updated" msgstr "最後更新時間" -#: /home/trin/Gedeeld/Projects/Cura/plugins/Toolbox/resources/qml/pages/ToolboxDetailPage.qml:103 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:138 +#: /home/trin/Gedeeld/Projects/Cura/plugins/Toolbox/resources/qml/pages/ToolboxDetailPage.qml:103 /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:138 msgctxt "@label" msgid "Brand" msgstr "品牌" @@ -2818,9 +2710,7 @@ msgctxt "@action:button" msgid "Edit" msgstr "編輯" -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:88 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:55 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:156 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:88 /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:55 /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:156 #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:138 msgctxt "@action:button" msgid "Remove" @@ -2836,20 +2726,17 @@ msgctxt "@label" msgid "If your printer is not listed, read the network printing troubleshooting guide" msgstr "如果你的印表機未被列出，請閱讀網路列印故障排除指南" -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:205 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/AddPrinterByIpContent.qml:263 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:205 /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/AddPrinterByIpContent.qml:263 msgctxt "@label" msgid "Type" msgstr "類型" -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:225 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/AddPrinterByIpContent.qml:279 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:225 /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/AddPrinterByIpContent.qml:279 msgctxt "@label" msgid "Firmware version" msgstr "韌體版本" -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:239 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/AddPrinterByIpContent.qml:295 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:239 /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/AddPrinterByIpContent.qml:295 msgctxt "@label" msgid "Address" msgstr "位址" @@ -2879,8 +2766,7 @@ msgctxt "@title:window" msgid "Invalid IP address" msgstr "無效的 IP 位址" -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:297 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/AddPrinterByIpContent.qml:146 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:297 /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/AddPrinterByIpContent.qml:146 msgctxt "@text" msgid "Please enter a valid IP address." msgstr "請輸入有效的 IP 位址 。" @@ -2890,8 +2776,7 @@ msgctxt "@title:window" msgid "Printer Address" msgstr "印表機網路位址" -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:331 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/AddPrinterByIpContent.qml:102 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml:331 /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/AddPrinterByIpContent.qml:102 msgctxt "@label" msgid "Enter the IP address of your printer on the network." msgstr "輸入印表機的 IP 位址。" @@ -2942,8 +2827,7 @@ msgctxt "@label" msgid "Override will use the specified settings with the existing printer configuration. This may result in a failed print." msgstr "覆寫會將指定的設定套用在現有的印表機上。這可能導致列印失敗。" -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorConfigOverrideDialog.qml:153 -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:191 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorConfigOverrideDialog.qml:153 /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:191 #: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobCard.qml:184 msgctxt "@label" msgid "Glass" @@ -2964,8 +2848,7 @@ msgctxt "@label" msgid "Delete" msgstr "刪除" -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorContextMenu.qml:100 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/MonitorButton.qml:290 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorContextMenu.qml:100 /home/trin/Gedeeld/Projects/Cura/resources/qml/MonitorButton.qml:290 msgctxt "@label" msgid "Resume" msgstr "繼續" @@ -2980,9 +2863,7 @@ msgctxt "@label" msgid "Resuming..." msgstr "正在繼續..." -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorContextMenu.qml:106 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/MonitorButton.qml:285 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/MonitorButton.qml:294 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorContextMenu.qml:106 /home/trin/Gedeeld/Projects/Cura/resources/qml/MonitorButton.qml:285 /home/trin/Gedeeld/Projects/Cura/resources/qml/MonitorButton.qml:294 msgctxt "@label" msgid "Pause" msgstr "暫停" @@ -3022,8 +2903,7 @@ msgctxt "@label %1 is the name of a print job." msgid "Are you sure you want to abort %1?" msgstr "你確定要中斷 %1 嗎？" -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorContextMenu.qml:164 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/MonitorButton.qml:336 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorContextMenu.qml:164 /home/trin/Gedeeld/Projects/Cura/resources/qml/MonitorButton.qml:336 msgctxt "@window:title" msgid "Abort print" msgstr "中斷列印" @@ -3033,9 +2913,7 @@ msgctxt "@label link to Connect and Cloud interfaces" msgid "Manage printer" msgstr "管理印表機" -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:254 -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:523 -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobCard.qml:250 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:254 /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:523 /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobCard.qml:250 msgctxt "@info" msgid "Please update your printer's firmware to manage the queue remotely." msgstr "請更新你印表機的韌體以便遠端管理工作隊列。" @@ -3060,8 +2938,7 @@ msgctxt "@label:status" msgid "Idle" msgstr "閒置中" -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:364 -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:84 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:364 /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:84 #: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:86 msgctxt "@label:status" msgid "Preparing..." @@ -3102,14 +2979,12 @@ msgctxt "@label" msgid "First available" msgstr "可用的第一個" -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:78 -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:90 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:78 /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:90 msgctxt "@label:status" msgid "Aborted" msgstr "已中斷" -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:80 -#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:82 +#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:80 /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml:82 msgctxt "@label:status" msgid "Finished" msgstr "已完成" @@ -3194,8 +3069,7 @@ msgctxt "@action:button" msgid "Sign in" msgstr "登入" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Account/GeneralOperations.qml:20 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/CloudContent.qml:64 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Account/GeneralOperations.qml:20 /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/CloudContent.qml:64 msgctxt "@label" msgid "Sign in to the Ultimaker platform" msgstr "登入Ultimaker 論壇" @@ -3369,7 +3243,7 @@ msgstr "上視圖" #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:154 msgctxt "@action:inmenu menubar:view" msgid "Bottom View" -msgstr "" +msgstr "下視圖" #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:161 msgctxt "@action:inmenu menubar:view" @@ -3546,8 +3420,7 @@ msgctxt "@action:inmenu menubar:help" msgid "Show Configuration Folder" msgstr "顯示設定資料夾" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:453 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Settings/SettingView.qml:550 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Actions.qml:453 /home/trin/Gedeeld/Projects/Cura/resources/qml/Settings/SettingView.qml:550 msgctxt "@action:menu" msgid "Configure setting visibility..." msgstr "參數顯示設定..." @@ -3562,8 +3435,7 @@ msgctxt "@label" msgid "This package will be installed after restarting." msgstr "此套件將在重新啟動後安裝。" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:450 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:17 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:450 /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:17 msgctxt "@title:tab" msgid "General" msgstr "基本" @@ -3573,14 +3445,12 @@ msgctxt "@title:tab" msgid "Settings" msgstr "設定" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:455 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:16 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:455 /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:16 msgctxt "@title:tab" msgid "Printers" msgstr "印表機" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:459 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:34 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:459 /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:34 msgctxt "@title:tab" msgid "Profiles" msgstr "列印參數" @@ -3590,14 +3460,12 @@ msgctxt "@title:window %1 is the application name" msgid "Closing %1" msgstr "關閉 %1 中" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:577 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:589 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:577 /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:589 msgctxt "@label %1 is the application name" msgid "Are you sure you want to exit %1?" msgstr "是否確定要離開 %1 ？" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:627 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/OpenFilesIncludingProjectsDialog.qml:19 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Cura.qml:627 /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/OpenFilesIncludingProjectsDialog.qml:19 msgctxt "@title:window" msgid "Open file(s)" msgstr "開啟檔案" @@ -3751,8 +3619,7 @@ msgctxt "@Label" msgid "Static type checker for Python" msgstr "Python 靜態型別檢查器" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:156 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:157 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:156 /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/AboutDialog.qml:157 msgctxt "@Label" msgid "Root Certificates for validating SSL trustworthiness" msgstr "驗證 SSL 可信度用的根憑證" @@ -3848,8 +3715,7 @@ msgctxt "@title:column" msgid "Current changes" msgstr "目前更動" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/DiscardOrKeepProfileChangesDialog.qml:158 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:733 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Dialogs/DiscardOrKeepProfileChangesDialog.qml:158 /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:733 msgctxt "@option:discardOrKeep" msgid "Always ask me this" msgstr "總是詢問" @@ -3925,8 +3791,7 @@ msgctxt "@text Print job name" msgid "Untitled" msgstr "無標題" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/MainWindow/ApplicationMenu.qml:27 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/FileMenu.qml:13 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/MainWindow/ApplicationMenu.qml:27 /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/FileMenu.qml:13 msgctxt "@title:menu menubar:toplevel" msgid "&File" msgstr "檔案（&F）" @@ -3936,14 +3801,12 @@ msgctxt "@title:menu menubar:toplevel" msgid "&Edit" msgstr "編輯（&E）" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/MainWindow/ApplicationMenu.qml:49 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/ViewMenu.qml:12 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/MainWindow/ApplicationMenu.qml:49 /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/ViewMenu.qml:12 msgctxt "@title:menu menubar:toplevel" msgid "&View" msgstr "檢視（&V）" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/MainWindow/ApplicationMenu.qml:51 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/SettingsMenu.qml:13 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/MainWindow/ApplicationMenu.qml:51 /home/trin/Gedeeld/Projects/Cura/resources/qml/Menus/SettingsMenu.qml:13 msgctxt "@title:menu menubar:toplevel" msgid "&Settings" msgstr "設定（&S）" @@ -4509,8 +4372,7 @@ msgctxt "@info:tooltip" msgid "When you have made changes to a profile and switched to a different one, a dialog will be shown asking whether you want to keep your modifications or not, or you can choose a default behaviour and never show that dialog again." msgstr "當你對列印參數進行更改然後切換到其他列印參數時，將顯示一個對話框詢問你是否要保留修改。你也可以選擇預設不顯示該對話框。" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:714 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/PrintSetupSelector/Recommended/RecommendedQualityProfileSelector.qml:52 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:714 /home/trin/Gedeeld/Projects/Cura/resources/qml/PrintSetupSelector/Recommended/RecommendedQualityProfileSelector.qml:52 msgctxt "@label" msgid "Profiles" msgstr "列印參數" @@ -4560,15 +4422,12 @@ msgctxt "@action:button" msgid "More information" msgstr "更多資訊" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:40 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:108 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:84 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:40 /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:108 /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:84 msgctxt "@action:button" msgid "Activate" msgstr "啟用" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:63 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:152 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:63 /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:152 msgctxt "@action:button" msgid "Rename" msgstr "重命名" @@ -4583,14 +4442,12 @@ msgctxt "@action:button" msgid "Duplicate" msgstr "複製" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:171 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:167 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:171 /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:167 msgctxt "@action:button" msgid "Import" msgstr "匯入" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:185 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:179 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:185 /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:179 msgctxt "@action:button" msgid "Export" msgstr "匯出" @@ -4598,27 +4455,24 @@ msgstr "匯出" #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:199 msgctxt "@action:button Sending materials to printers" msgid "Sync with Printers" -msgstr "" +msgstr "同步列印機" #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:248 msgctxt "@action:label" msgid "Printer" msgstr "印表機" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:312 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:277 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:312 /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:277 msgctxt "@title:window" msgid "Confirm Remove" msgstr "移除確認" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:315 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:278 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:315 /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:278 msgctxt "@label (%1 is object name)" msgid "Are you sure you wish to remove %1? This cannot be undone!" msgstr "你確定要移除 %1 嗎？這動作無法復原！" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:329 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:337 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:329 /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:337 msgctxt "@title:window" msgid "Import Material" msgstr "匯入線材設定" @@ -4633,8 +4487,7 @@ msgctxt "@info:status Don't translate the XML tag !" msgid "Successfully imported material %1" msgstr "成功匯入線材 %1" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:360 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:368 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:360 /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:368 msgctxt "@title:window" msgid "Export Material" msgstr "匯出線材設定" @@ -4652,7 +4505,7 @@ msgstr "成功匯出線材至：%1" #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:388 msgctxt "@title:window" msgid "Export All Materials" -msgstr "" +msgstr "匯出所有線材設定" #: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:72 msgctxt "@title" @@ -4739,8 +4592,7 @@ msgctxt "@label" msgid "Adhesion Information" msgstr "附著資訊" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:374 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/PrintSetupSelector/PrintSetupSelector.qml:19 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsView.qml:374 /home/trin/Gedeeld/Projects/Cura/resources/qml/PrintSetupSelector/PrintSetupSelector.qml:19 msgctxt "@label" msgid "Print settings" msgstr "列印設定" @@ -4795,8 +4647,7 @@ msgctxt "@action:button" msgid "Update profile with current settings/overrides" msgstr "使用目前設定 / 覆寫值更新列印參數" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:564 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/PrintSetupSelector/Custom/QualitiesWithIntentMenu.qml:244 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/ProfilesPage.qml:564 /home/trin/Gedeeld/Projects/Cura/resources/qml/PrintSetupSelector/Custom/QualitiesWithIntentMenu.qml:244 msgctxt "@action:button" msgid "Discard current changes" msgstr "捨棄目前更改" @@ -4871,14 +4722,12 @@ msgctxt "@tooltip of temperature input" msgid "The temperature to pre-heat the hotend to." msgstr "加熱頭預熱溫度。" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/PrinterOutput/ExtruderBox.qml:341 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/PrinterOutput/HeatedBedBox.qml:332 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/PrinterOutput/ExtruderBox.qml:341 /home/trin/Gedeeld/Projects/Cura/resources/qml/PrinterOutput/HeatedBedBox.qml:332 msgctxt "@button Cancel pre-heating" msgid "Cancel" msgstr "取消" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/PrinterOutput/ExtruderBox.qml:344 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/PrinterOutput/HeatedBedBox.qml:335 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/PrinterOutput/ExtruderBox.qml:344 /home/trin/Gedeeld/Projects/Cura/resources/qml/PrinterOutput/HeatedBedBox.qml:335 msgctxt "@button" msgid "Pre-heat" msgstr "預熱" @@ -5343,8 +5192,7 @@ msgctxt "@label" msgid "Could not connect to device." msgstr "無法連接到裝置。" -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/AddPrinterByIpContent.qml:207 -#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/AddPrinterByIpContent.qml:212 +#: /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/AddPrinterByIpContent.qml:207 /home/trin/Gedeeld/Projects/Cura/resources/qml/WelcomePages/AddPrinterByIpContent.qml:212 msgctxt "@label" msgid "Can't connect to your Ultimaker printer?" msgstr "無法連接到 Ultimaker 印表機？" @@ -5562,12 +5410,12 @@ msgstr "Cura 列印參數寫入器" #: DigitalLibrary/plugin.json msgctxt "description" msgid "Connects to the Digital Library, allowing Cura to open files from and save files to the Digital Library." -msgstr "" +msgstr "連結至\"數位博物館\"，允許Cura從\"數位博物館\"打開或保存文件." #: DigitalLibrary/plugin.json msgctxt "name" msgid "Ultimaker Digital Library" -msgstr "" +msgstr "Ultimaker 數位博物館" #: FirmwareUpdateChecker/plugin.json msgctxt "description" @@ -6042,22 +5890,22 @@ msgstr "升級版本 4.7 到 4.8" #: VersionUpgrade/VersionUpgrade48to49/plugin.json msgctxt "description" msgid "Upgrades configurations from Cura 4.8 to Cura 4.9." -msgstr "" +msgstr "將設定從 Cura 4.8 版本升級至 4.9 版本。" #: VersionUpgrade/VersionUpgrade48to49/plugin.json msgctxt "name" msgid "Version Upgrade 4.8 to 4.9" -msgstr "" +msgstr "升級版本 4.8 到 4.9" #: VersionUpgrade/VersionUpgrade49to410/plugin.json msgctxt "description" msgid "Upgrades configurations from Cura 4.9 to Cura 4.10." -msgstr "" +msgstr "將設定從 Cura 4.9 版本升級至 4.10 版本。" #: VersionUpgrade/VersionUpgrade49to410/plugin.json msgctxt "name" msgid "Version Upgrade 4.9 to 4.10" -msgstr "" +msgstr "升級版本 4.9 到 4.10" #: X3DReader/plugin.json msgctxt "description" diff --git a/resources/i18n/zh_TW/fdmprinter.def.json.po b/resources/i18n/zh_TW/fdmprinter.def.json.po index 3a39ae67ae..8cd0dd8978 100644 --- a/resources/i18n/zh_TW/fdmprinter.def.json.po +++ b/resources/i18n/zh_TW/fdmprinter.def.json.po @@ -8,14 +8,14 @@ msgstr "" "Project-Id-Version: Cura 4.10\n" "Report-Msgid-Bugs-To: r.dulek@ultimaker.com\n" "POT-Creation-Date: 2021-06-10 17:35+0000\n" -"PO-Revision-Date: 2021-04-16 20:13+0200\n" +"PO-Revision-Date: 2021-06-14 16:21+0800\n" "Last-Translator: Valen Chang \n" "Language-Team: Valen Chang /Zhang Heh Ji \n" "Language: zh_TW\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: Poedit 2.4.1\n" +"X-Generator: Poedit 2.4.2\n" #: fdmprinter.def.json msgctxt "machine_settings label" @@ -3202,7 +3202,7 @@ msgstr "不回抽的最大梳理距離" #: fdmprinter.def.json msgctxt "retraction_combing_max_distance description" msgid "When greater than zero, combing travel moves that are longer than this distance will use retraction. If set to zero, there is no maximum and combing moves will not use retraction." -msgstr "" +msgstr "觸發回抽時之最小距離，如大於此數值，便開啟回抽；如設置為0，則關閉回抽." #: fdmprinter.def.json msgctxt "travel_retract_before_outer_wall label" diff --git a/resources/images/whats_new/0.png b/resources/images/whats_new/0.png index 77c7d6cf46..68b06eab10 100644 Binary files a/resources/images/whats_new/0.png and b/resources/images/whats_new/0.png differ diff --git a/resources/images/whats_new/2.png b/resources/images/whats_new/2.png index cfaf962d97..9be5228efb 100644 Binary files a/resources/images/whats_new/2.png and b/resources/images/whats_new/2.png differ diff --git a/resources/images/whats_new/3.PNG b/resources/images/whats_new/3.PNG new file mode 100644 index 0000000000..b37e50d72b Binary files /dev/null and b/resources/images/whats_new/3.PNG differ diff --git a/resources/images/whats_new/4.PNG b/resources/images/whats_new/4.PNG new file mode 100644 index 0000000000..a78b128aff Binary files /dev/null and b/resources/images/whats_new/4.PNG differ diff --git a/resources/meshes/BIQU_BX_PLATE.stl b/resources/meshes/BIQU_BX_PLATE.stl new file mode 100644 index 0000000000..9c1726f276 Binary files /dev/null and b/resources/meshes/BIQU_BX_PLATE.stl differ diff --git a/resources/meshes/flsun_sr.3mf b/resources/meshes/flsun_sr.3mf new file mode 100644 index 0000000000..7eba390a66 Binary files /dev/null and b/resources/meshes/flsun_sr.3mf differ diff --git a/resources/meshes/pbr3d_g1_buildplate.stl b/resources/meshes/pbr3d_g1_buildplate.stl new file mode 100644 index 0000000000..1f7b77bd78 Binary files /dev/null and b/resources/meshes/pbr3d_g1_buildplate.stl differ diff --git a/resources/meshes/voron0_120_bed.stl b/resources/meshes/voron0_120_bed.stl new file mode 100644 index 0000000000..d2cc655f25 Binary files /dev/null and b/resources/meshes/voron0_120_bed.stl differ diff --git a/resources/qml/Account/AccountWidget.qml b/resources/qml/Account/AccountWidget.qml index 48c05f8a11..ef1622daee 100644 --- a/resources/qml/Account/AccountWidget.qml +++ b/resources/qml/Account/AccountWidget.qml @@ -54,9 +54,10 @@ Item id: accountWidget anchors.verticalCenter: parent.verticalCenter + anchors.horizontalCenter: signInButton.horizontalCenter - implicitHeight: UM.Theme.getSize("main_window_header").height - implicitWidth: UM.Theme.getSize("main_window_header").height + implicitHeight: Math.round(0.5 * UM.Theme.getSize("main_window_header").height) + implicitWidth: Math.round(0.5 * UM.Theme.getSize("main_window_header").height) hoverEnabled: true @@ -68,8 +69,8 @@ Item { id: avatar - width: Math.round(0.8 * accountWidget.width) - height: Math.round(0.8 * accountWidget.height) + width: accountWidget.width + height: accountWidget.height anchors.verticalCenter: accountWidget.verticalCenter anchors.horizontalCenter: accountWidget.horizontalCenter @@ -86,7 +87,7 @@ Item { id: initialCircle anchors.centerIn: parent - width: Math.min(parent.width, parent.height) + width: Math.min(accountWidget.width, accountWidget.height) height: width radius: width color: accountWidget.hovered ? UM.Theme.getColor("primary_text") : "transparent" @@ -141,7 +142,7 @@ Item borderColor: UM.Theme.getColor("lining") borderWidth: UM.Theme.getSize("default_lining").width - target: Qt.point(width - (accountWidget.width / 2), -10) + target: Qt.point(width - (signInButton.width / 2), -10) arrowSize: UM.Theme.getSize("default_arrow").width } diff --git a/resources/qml/Account/AvatarImage.qml b/resources/qml/Account/AvatarImage.qml index 120173366f..58c39e5065 100644 --- a/resources/qml/Account/AvatarImage.qml +++ b/resources/qml/Account/AvatarImage.qml @@ -52,7 +52,7 @@ Item width: parent.width + 2 height: parent.height + 2 visible: hasAvatar - source: UM.Theme.getIcon("circle_outline") + source: UM.Theme.getIcon("CircleOutline") sourceSize: Qt.size(parent.width, parent.height) color: UM.Theme.getColor("account_widget_outline_active") } diff --git a/resources/qml/Account/SyncState.qml b/resources/qml/Account/SyncState.qml index f7630b500a..d5a9d392e2 100644 --- a/resources/qml/Account/SyncState.qml +++ b/resources/qml/Account/SyncState.qml @@ -18,27 +18,27 @@ Row // Sync state icon + message { name: "idle" when: syncState == Cura.AccountSyncState.IDLE - PropertyChanges { target: icon; source: UM.Theme.getIcon("update")} + PropertyChanges { target: icon; source: UM.Theme.getIcon("ArrowDoubleCircleRight")} }, State { name: "syncing" when: syncState == Cura.AccountSyncState.SYNCING - PropertyChanges { target: icon; source: UM.Theme.getIcon("update") } + PropertyChanges { target: icon; source: UM.Theme.getIcon("ArrowDoubleCircleRight") } PropertyChanges { target: stateLabel; text: catalog.i18nc("@label", "Checking...")} }, State { name: "up_to_date" when: syncState == Cura.AccountSyncState.SUCCESS - PropertyChanges { target: icon; source: UM.Theme.getIcon("checked") } + PropertyChanges { target: icon; source: UM.Theme.getIcon("CheckCircle") } PropertyChanges { target: stateLabel; text: catalog.i18nc("@label", "Account synced")} }, State { name: "error" when: syncState == Cura.AccountSyncState.ERROR - PropertyChanges { target: icon; source: UM.Theme.getIcon("warning_light") } + PropertyChanges { target: icon; source: UM.Theme.getIcon("Warning") } PropertyChanges { target: stateLabel; text: catalog.i18nc("@label", "Something went wrong...")} } ] diff --git a/resources/qml/Account/UserOperations.qml b/resources/qml/Account/UserOperations.qml index 19e92e0249..f5241596d5 100644 --- a/resources/qml/Account/UserOperations.qml +++ b/resources/qml/Account/UserOperations.qml @@ -9,7 +9,7 @@ import Cura 1.1 as Cura Column { - spacing: UM.Theme.getSize("narrow_margin").height + spacing: UM.Theme.getSize("default_margin").height topPadding: UM.Theme.getSize("default_margin").height bottomPadding: UM.Theme.getSize("default_margin").height width: childrenRect.width @@ -18,7 +18,7 @@ Column { id: accountInfo width: childrenRect.width - height: childrenRect.height + height: accountSyncDetailsColumn.height anchors.left: parent.left anchors.leftMargin: UM.Theme.getSize("default_margin").width AvatarImage @@ -56,6 +56,7 @@ Column Column { + id: accountSyncDetailsColumn anchors.left: avatar.right anchors.leftMargin: UM.Theme.getSize("default_margin").width spacing: UM.Theme.getSize("narrow_margin").height diff --git a/resources/qml/ActionButton.qml b/resources/qml/ActionButton.qml index 0c1be007b5..582df3d87c 100644 --- a/resources/qml/ActionButton.qml +++ b/resources/qml/ActionButton.qml @@ -1,4 +1,4 @@ -// Copyright (c) 2020 Ultimaker B.V. +// Copyright (c) 2021 Ultimaker B.V. // Cura is released under the terms of the LGPLv3 or higher. import QtQuick 2.7 @@ -18,19 +18,17 @@ Button property alias textFont: buttonText.font property alias cornerRadius: backgroundRect.radius property alias tooltip: tooltip.tooltipText - property alias cornerSide: backgroundRect.cornerSide + property alias tooltipWidth: tooltip.width property color color: UM.Theme.getColor("primary") property color hoverColor: UM.Theme.getColor("primary_hover") property color disabledColor: color property color textColor: UM.Theme.getColor("button_text") property color textHoverColor: textColor - property color textDisabledColor: textColor + property color textDisabledColor: disabledColor property color outlineColor: color - property color outlineHoverColor: hoverColor - property color outlineDisabledColor: outlineColor - property alias shadowColor: shadow.color - property alias shadowEnabled: shadow.visible + property color outlineHoverColor: outlineColor + property color outlineDisabledColor: disabledColor property alias busy: busyIndicator.visible property bool underlineTextOnHover: false @@ -46,6 +44,49 @@ Button // but it can exceed a maximum, then this value have to be set. property int maximumWidth: 0 + // These properties are deprecated. + // To (maybe) prevent a major SDK upgrade, mark them as deprecated instead of just outright removing them. + // Note, if you still want rounded corners, use (something based on) Cura.RoundedRectangle. + property alias cornerSide: deprecatedProperties.cornerSide + property alias shadowColor: deprecatedProperties.shadowColor + property alias shadowEnabled: deprecatedProperties.shadowEnabled + + Item + { + id: deprecatedProperties + + visible: false + enabled: false + width: 0 + height: 0 + + property var cornerSide: null + property var shadowColor: null + property var shadowEnabled: null + + onCornerSideChanged: + { + if (cornerSide != null) + { + CuraApplication.writeToLog("w", "'ActionButton.cornerSide' is deprecated since 4.11. Rounded corners can still be made with 'Cura.RoundedRectangle'."); + } + } + onShadowColorChanged: + { + if (shadowColor != null) + { + CuraApplication.writeToLog("w", "'ActionButton.shadowColor' is deprecated since 4.11.") + } + } + onShadowEnabledChanged: + { + if (shadowEnabled != null) + { + CuraApplication.writeToLog("w", "'ActionButton.shadowEnabled' is deprecated since 4.11.") + } + } + } + leftPadding: UM.Theme.getSize("default_margin").width rightPadding: UM.Theme.getSize("default_margin").width height: UM.Theme.getSize("action_button").height @@ -130,24 +171,13 @@ Button background: Cura.RoundedRectangle { id: backgroundRect - cornerSide: Cura.RoundedRectangle.Direction.All color: button.enabled ? (button.hovered ? button.hoverColor : button.color) : button.disabledColor - radius: UM.Theme.getSize("action_button_radius").width border.width: UM.Theme.getSize("default_lining").width border.color: button.enabled ? (button.hovered ? button.outlineHoverColor : button.outlineColor) : button.outlineDisabledColor - } - DropShadow - { - id: shadow - // Don't blur the shadow + // Disable the rounded-ness of this rectangle. We can't use a normal Rectangle here yet, as the API/SDK has only just been deprecated. radius: 0 - anchors.fill: backgroundRect - source: backgroundRect - verticalOffset: 2 - visible: false - // Should always be drawn behind the background. - z: backgroundRect.z - 1 + cornerSide: Cura.RoundedRectangle.Direction.None } Cura.ToolTip @@ -189,4 +219,4 @@ Button duration: 2500 } } -} \ No newline at end of file +} diff --git a/resources/qml/ActionPanel/OutputDevicesActionButton.qml b/resources/qml/ActionPanel/OutputDevicesActionButton.qml index 866b8cc627..48416e69fd 100644 --- a/resources/qml/ActionPanel/OutputDevicesActionButton.qml +++ b/resources/qml/ActionPanel/OutputDevicesActionButton.qml @@ -1,4 +1,4 @@ -// Copyright (c) 2018 Ultimaker B.V. +// Copyright (c) 2021 Ultimaker B.V. // Cura is released under the terms of the LGPLv3 or higher. import QtQuick 2.7 @@ -23,7 +23,6 @@ Item id: saveToButton height: parent.height fixedWidthMode: true - cornerSide: deviceSelectionMenu.visible ? Cura.RoundedRectangle.Direction.Left : Cura.RoundedRectangle.Direction.All anchors { @@ -43,15 +42,11 @@ Item } } - Cura.ActionButton + Cura.PrimaryButton { id: deviceSelectionMenu height: parent.height - shadowEnabled: true - shadowColor: UM.Theme.getColor("primary_shadow") - cornerSide: Cura.RoundedRectangle.Direction.Right - anchors { top: parent.top @@ -60,8 +55,8 @@ Item leftPadding: UM.Theme.getSize("narrow_margin").width //Need more space than usual here for wide text. rightPadding: UM.Theme.getSize("narrow_margin").width - iconSource: popup.opened ? UM.Theme.getIcon("arrow_top") : UM.Theme.getIcon("arrow_bottom") - color: UM.Theme.getColor("action_panel_secondary") + iconSource: popup.opened ? UM.Theme.getIcon("ChevronSingleUp") : UM.Theme.getIcon("ChevronSingleDown") + color: popup.opened ? hoverColor : UM.Theme.getColor("action_panel_secondary") visible: (devicesModel.deviceCount > 1) onClicked: popup.opened ? popup.close() : popup.open() @@ -70,6 +65,7 @@ Item { id: popup padding: 0 + spacing: 0 y: -height x: parent.width - width @@ -78,17 +74,16 @@ Item contentItem: ColumnLayout { + spacing: 0 + Repeater { model: devicesModel - delegate: Cura.ActionButton + delegate: Cura.PrimaryButton { text: model.description visible: model.id != UM.OutputDeviceManager.activeDevice // Don't show the active device in the list - color: "transparent" - cornerRadius: 0 - hoverColor: UM.Theme.getColor("primary") Layout.fillWidth: true // The total width of the popup should be defined by the largest button. By stating that each // button should be minimally the size of it's content (aka; implicitWidth) we can ensure that. @@ -102,15 +97,8 @@ Item } } } - - background: Rectangle - { - opacity: visible ? 1 : 0 - Behavior on opacity { NumberAnimation { duration: 100 } } - color: UM.Theme.getColor("action_panel_secondary") - } } } UM.OutputDevicesModel { id: devicesModel } -} \ No newline at end of file +} diff --git a/resources/qml/ActionPanel/OutputProcessWidget.qml b/resources/qml/ActionPanel/OutputProcessWidget.qml index be6d68de4f..6e412c9a04 100644 --- a/resources/qml/ActionPanel/OutputProcessWidget.qml +++ b/resources/qml/ActionPanel/OutputProcessWidget.qml @@ -57,7 +57,7 @@ Column width: parent.width text: preSlicedData ? catalog.i18nc("@label", "No time estimation available") : PrintInformation.currentPrintTime.getDisplayString(UM.DurationFormat.Long) - source: UM.Theme.getIcon("clock") + source: UM.Theme.getIcon("Clock") font: UM.Theme.getFont("medium_bold") } @@ -99,7 +99,7 @@ Column } return totalWeights + "g · " + totalLengths.toFixed(2) + "m" } - source: UM.Theme.getIcon("spool") + source: UM.Theme.getIcon("Spool") font: UM.Theme.getFont("default") } } @@ -142,4 +142,4 @@ Column height: UM.Theme.getSize("action_button").height } } -} \ No newline at end of file +} diff --git a/resources/qml/ActionPanel/PrintInformationWidget.qml b/resources/qml/ActionPanel/PrintInformationWidget.qml index 097f281946..d9923ce4e8 100644 --- a/resources/qml/ActionPanel/PrintInformationWidget.qml +++ b/resources/qml/ActionPanel/PrintInformationWidget.qml @@ -11,7 +11,7 @@ UM.RecolorImage { id: widget - source: UM.Theme.getIcon("info") + source: UM.Theme.getIcon("Information") width: visible ? UM.Theme.getSize("section_icon").width : 0 height: UM.Theme.getSize("section_icon").height @@ -58,4 +58,4 @@ UM.RecolorImage arrowSize: UM.Theme.getSize("default_arrow").width } } -} \ No newline at end of file +} diff --git a/resources/qml/ActionPanel/SliceProcessWidget.qml b/resources/qml/ActionPanel/SliceProcessWidget.qml index dbbfe784ef..42df08560a 100644 --- a/resources/qml/ActionPanel/SliceProcessWidget.qml +++ b/resources/qml/ActionPanel/SliceProcessWidget.qml @@ -65,7 +65,7 @@ Column visible: widget.backendState == UM.Backend.Error text: catalog.i18nc("@label:PrintjobStatus", "Unable to slice") - source: UM.Theme.getIcon("warning") + source: UM.Theme.getIcon("Warning") iconColor: UM.Theme.getColor("warning") } diff --git a/resources/qml/Actions.qml b/resources/qml/Actions.qml index 7a4a837c66..95c6778b87 100644 --- a/resources/qml/Actions.qml +++ b/resources/qml/Actions.qml @@ -1,4 +1,4 @@ -// Copyright (c) 2018 Ultimaker B.V. +// Copyright (c) 2021 Ultimaker B.V. // Cura is released under the terms of the LGPLv3 or higher. pragma Singleton @@ -122,7 +122,15 @@ Item Action { id: quitAction - text: catalog.i18nc("@action:inmenu menubar:file","&Quit") + + //On MacOS, don't translate the "Quit" word. + //Qt moves the "quit" entry to a different place, and if it got renamed can't find it again when it attempts to + //delete the item upon closing the application, causing a crash. + //In the new location, these items are translated automatically according to the system's language. + //For more information, see: + //- https://doc.qt.io/qt-5/macos-issues.html#menu-bar + //- https://doc.qt.io/qt-5/qmenubar.html#qmenubar-as-a-global-menu-bar + text: (Qt.platform.os == "osx") ? "&Quit" : catalog.i18nc("@action:inmenu menubar:file", "&Quit") iconName: "application-exit" shortcut: StandardKey.Quit } @@ -172,7 +180,14 @@ Item Action { id: preferencesAction - text: catalog.i18nc("@action:inmenu", "Configure Cura...") + //On MacOS, don't translate the "Configure" word. + //Qt moves the "configure" entry to a different place, and if it got renamed can't find it again when it + //attempts to delete the item upon closing the application, causing a crash. + //In the new location, these items are translated automatically according to the system's language. + //For more information, see: + //- https://doc.qt.io/qt-5/macos-issues.html#menu-bar + //- https://doc.qt.io/qt-5/qmenubar.html#qmenubar-as-a-global-menu-bar + text: (Qt.platform.os == "osx") ? "Configure Cura..." : catalog.i18nc("@action:inmenu", "Configure Cura...") iconName: "configure" } @@ -263,7 +278,15 @@ Item Action { id: aboutAction; - text: catalog.i18nc("@action:inmenu menubar:help", "About..."); + + //On MacOS, don't translate the "About" word. + //Qt moves the "about" entry to a different place, and if it got renamed can't find it again when it + //attempts to delete the item upon closing the application, causing a crash. + //In the new location, these items are translated automatically according to the system's language. + //For more information, see: + //- https://doc.qt.io/qt-5/macos-issues.html#menu-bar + //- https://doc.qt.io/qt-5/qmenubar.html#qmenubar-as-a-global-menu-bar + text: (Qt.platform.os == "osx") ? "About..." : catalog.i18nc("@action:inmenu menubar:help", "About..."); iconName: "help-about"; } diff --git a/resources/qml/CheckBoxWithTooltip.qml b/resources/qml/CheckBoxWithTooltip.qml index 403efb4d7b..e17940014a 100644 --- a/resources/qml/CheckBoxWithTooltip.qml +++ b/resources/qml/CheckBoxWithTooltip.qml @@ -32,7 +32,7 @@ CheckBox height: Math.round(parent.height / 2.5) sourceSize.height: width color: UM.Theme.getColor("checkbox_mark") - source: UM.Theme.getIcon("check") + source: UM.Theme.getIcon("Check") opacity: checkbox.checked Behavior on opacity { NumberAnimation { duration: 100; } } } diff --git a/resources/qml/Cura.qml b/resources/qml/Cura.qml index db910d1798..7782ace3af 100644 --- a/resources/qml/Cura.qml +++ b/resources/qml/Cura.qml @@ -417,6 +417,7 @@ UM.MainWindow Cura.PrimaryButton { text: model.name + iconSource: UM.Theme.getIcon(model.icon) height: UM.Theme.getSize("message_action_button").height } } @@ -426,6 +427,23 @@ UM.MainWindow Cura.SecondaryButton { text: model.name + iconSource: UM.Theme.getIcon(model.icon) + height: UM.Theme.getSize("message_action_button").height + } + } + link: Component + { + Cura.TertiaryButton + { + text: model.name + iconSource: + { + if (model.icon == null || model.icon == "") + { + return UM.Theme.getIcon("LinkExternal") + } + return UM.Theme.getIcon(model.icon) + } height: UM.Theme.getSize("message_action_button").height } } diff --git a/resources/qml/ExpandableComponent.qml b/resources/qml/ExpandableComponent.qml index f637cccdbb..18eb8c0fa6 100644 --- a/resources/qml/ExpandableComponent.qml +++ b/resources/qml/ExpandableComponent.qml @@ -7,8 +7,6 @@ import QtQuick.Controls 2.3 import UM 1.2 as UM import Cura 1.0 as Cura -import QtGraphicalEffects 1.0 // For the dropshadow - // The expandable component has 2 major sub components: // * The headerItem; Always visible and should hold some info about what happens if the component is expanded // * The contentItem; The content that needs to be shown if the component is expanded. @@ -56,6 +54,11 @@ Item // How much padding is needed around the header & button property alias headerPadding: background.padding + property alias headerBackgroundBorder: background.border + + // Whether or not to show the background border + property bool enableHeaderBackgroundBorder: true + // What icon should be displayed on the right. property alias iconSource: collapseButton.source @@ -73,11 +76,7 @@ Item // On what side should the header corners be shown? 1 is down, 2 is left, 3 is up and 4 is right. property alias headerCornerSide: background.cornerSide - property alias headerShadowColor: shadow.color - - property alias enableHeaderShadow: shadow.visible - - property int shadowOffset: 2 + property int popupOffset: 2 // Prefix used for the dragged position preferences. Preferences not used if empty. Don't translate! property string dragPreferencesNamePrefix: "" @@ -120,6 +119,9 @@ Item id: background property real padding: UM.Theme.getSize("default_margin").width + border.width: base.enableHeaderBackgroundBorder ? UM.Theme.getSize("default_lining").width : 0 + border.color: UM.Theme.getColor("lining") + color: base.enabled ? (base.expanded ? headerActiveColor : headerBackgroundColor) : UM.Theme.getColor("disabled") anchors.fill: parent @@ -165,7 +167,7 @@ Item verticalCenter: parent.verticalCenter margins: background.padding } - source: UM.Theme.getIcon("pencil") + source: UM.Theme.getIcon("ChevronSingleDown") visible: source != "" width: UM.Theme.getSize("standard_arrow").width height: UM.Theme.getSize("standard_arrow").height @@ -184,20 +186,6 @@ Item } } - DropShadow - { - id: shadow - // Don't blur the shadow - radius: 0 - anchors.fill: background - source: background - verticalOffset: base.shadowOffset - visible: true - color: UM.Theme.getColor("action_button_shadow") - // Should always be drawn behind the background. - z: background.z - 1 - } - Cura.RoundedRectangle { id: contentContainer @@ -209,7 +197,7 @@ Item height: childrenRect.height // Ensure that the content is located directly below the headerItem - y: dragPreferencesNamePrefix === "" ? (background.height + base.shadowOffset + base.contentSpacingY) : UM.Preferences.getValue(dragPreferencesNamePrefix + dragPreferencesNameY) + y: dragPreferencesNamePrefix === "" ? (background.height + base.popupOffset + base.contentSpacingY) : UM.Preferences.getValue(dragPreferencesNamePrefix + dragPreferencesNameY) // Make the content aligned with the rest, using the property contentAlignment to decide whether is right or left. // In case of right alignment, the 3x padding is due to left, right and padding between the button & text. @@ -228,7 +216,7 @@ Item var maxPt = base.mapFromItem(null, CuraApplication.appWidth() - (contentContainer.width + margin.width), CuraApplication.appHeight() - (contentContainer.height + margin.height)); - var initialY = background.height + base.shadowOffset + margin.height; + var initialY = background.height + base.popupOffset + margin.height; contentContainer.x = Math.max(minPt.x, Math.min(maxPt.x, posNewX)); contentContainer.y = Math.max(initialY, Math.min(maxPt.y, posNewY)); diff --git a/resources/qml/ExpandableComponentHeader.qml b/resources/qml/ExpandableComponentHeader.qml index cd6ccfb825..7dd1aa358a 100644 --- a/resources/qml/ExpandableComponentHeader.qml +++ b/resources/qml/ExpandableComponentHeader.qml @@ -59,11 +59,11 @@ Cura.RoundedRectangle anchors.fill: parent sourceSize.width: width color: closeButton.hovered ? UM.Theme.getColor("small_button_text_hover") : UM.Theme.getColor("small_button_text") - source: UM.Theme.getIcon("cross1") + source: UM.Theme.getIcon("Cancel") } background: Item {} onClicked: toggleContent() // Will hide the popup item } -} \ No newline at end of file +} diff --git a/resources/qml/ExpandablePopup.qml b/resources/qml/ExpandablePopup.qml index 7829093e8d..3bcfdbb6f8 100644 --- a/resources/qml/ExpandablePopup.qml +++ b/resources/qml/ExpandablePopup.qml @@ -7,8 +7,6 @@ import QtQuick.Controls 2.3 import UM 1.2 as UM import Cura 1.0 as Cura -import QtGraphicalEffects 1.0 // For the dropshadow - // The expandable component has 2 major sub components: // * The headerItem; Always visible and should hold some info about what happens if the component is expanded // * The contentItem; The content that needs to be shown if the component is expanded. @@ -50,6 +48,11 @@ Item // How much padding is needed around the header & button property alias headerPadding: background.padding + property alias headerBackgroundBorder: background.border + + // Whether or not to show the background border + property bool enableHeaderBackgroundBorder: true + // What icon should be displayed on the right. property alias iconSource: collapseButton.source @@ -72,11 +75,7 @@ Item // Change the contentItem close behaviour property alias contentClosePolicy : content.closePolicy - property alias headerShadowColor: shadow.color - - property alias enableHeaderShadow: shadow.visible - - property int shadowOffset: 2 + property int popupOffset: 2 onEnabledChanged: { @@ -114,6 +113,9 @@ Item id: background property real padding: UM.Theme.getSize("default_margin").width + border.width: base.enableHeaderBackgroundBorder ? UM.Theme.getSize("default_lining").width : 0 + border.color: UM.Theme.getColor("lining") + color: base.enabled ? headerBackgroundColor : UM.Theme.getColor("disabled") anchors.fill: parent @@ -178,7 +180,7 @@ Item verticalCenter: parent.verticalCenter margins: background.padding } - source: expanded ? UM.Theme.getIcon("arrow_bottom") : UM.Theme.getIcon("arrow_left") + source: UM.Theme.getIcon("ChevronSingleDown") visible: source != "" width: UM.Theme.getSize("standard_arrow").width height: UM.Theme.getSize("standard_arrow").height @@ -188,26 +190,12 @@ Item } - DropShadow - { - id: shadow - // Don't blur the shadow - radius: 0 - anchors.fill: background - source: background - verticalOffset: base.shadowOffset - visible: true - color: UM.Theme.getColor("action_button_shadow") - // Should always be drawn behind the background. - z: background.z - 1 - } - Popup { id: content // Ensure that the content is located directly below the headerItem - y: background.height + base.shadowOffset + y: background.height + base.popupOffset // Make the content aligned with the rest, using the property contentAlignment to decide whether is right or left. // In case of right alignment, the 3x padding is due to left, right and padding between the button & text. diff --git a/resources/qml/ExtruderButton.qml b/resources/qml/ExtruderButton.qml index feb399d528..b87855e25e 100644 --- a/resources/qml/ExtruderButton.qml +++ b/resources/qml/ExtruderButton.qml @@ -22,6 +22,7 @@ Cura.ToolbarButton { materialColor: extruder.color extruderEnabled: extruder.stack.isEnabled + iconVariant: "default" property int index: extruder.index } diff --git a/resources/qml/ExtruderIcon.qml b/resources/qml/ExtruderIcon.qml index 015ebea52e..f33e345b68 100644 --- a/resources/qml/ExtruderIcon.qml +++ b/resources/qml/ExtruderIcon.qml @@ -1,7 +1,7 @@ -// Copyright (c) 2018 Ultimaker B.V. +// Copyright (c) 2021 Ultimaker B.V. // Cura is released under the terms of the LGPLv3 or higher. -import QtQuick 2.7 +import QtQuick 2.11 import QtQuick.Controls 1.1 import UM 1.2 as UM @@ -16,31 +16,30 @@ Item property color materialColor property alias textColor: extruderNumberText.color property bool extruderEnabled: true + property alias iconSize: mainIcon.sourceSize + property string iconVariant: "medium" - UM.RecolorImage + Item { - id: mainIcon + opacity: extruderEnabled ? 1 : UM.Theme.getColor("extruder_disabled").a anchors.fill: parent - source: UM.Theme.getIcon("extruder_button") - color: extruderEnabled ? materialColor: UM.Theme.getColor("disabled") - } - - Rectangle - { - id: extruderNumberCircle - - width: height - height: Math.round(parent.height / 2) - radius: Math.round(width / 2) - color: UM.Theme.getColor("toolbar_background") - - anchors + UM.RecolorImage { - horizontalCenter: parent.horizontalCenter - top: parent.top - // The circle needs to be slightly off center (so it sits in the middle of the square bit of the icon) - topMargin: (parent.height - height) / 2 - 0.1 * parent.height + anchors.fill: parent + sourceSize: mainIcon.sourceSize + + source: UM.Theme.getIcon("ExtruderColor", iconVariant) + color: materialColor + } + UM.RecolorImage + { + id: mainIcon + anchors.fill: parent + sourceSize: UM.Theme.getSize("extruder_icon") + + source: UM.Theme.getIcon("Extruder", iconVariant) + color: extruderNumberText.color } Label @@ -48,25 +47,13 @@ Item id: extruderNumberText anchors.centerIn: parent text: index + 1 - font: UM.Theme.getFont("small") + font: UM.Theme.getFont("small_emphasis") color: UM.Theme.getColor("text") width: contentWidth height: contentHeight - visible: extruderEnabled renderType: Text.NativeRendering horizontalAlignment: Text.AlignHCenter verticalAlignment: Text.AlignVCenter } - - UM.RecolorImage - { - id: disabledIcon - anchors.fill: parent - anchors.margins: UM.Theme.getSize("thick_lining").width - sourceSize.height: width - source: UM.Theme.getIcon("cross1") - visible: !extruderEnabled - color: UM.Theme.getColor("text") - } } -} \ No newline at end of file +} diff --git a/resources/qml/JobSpecs.qml b/resources/qml/JobSpecs.qml index c1989c4c95..4aa5fa8bd5 100644 --- a/resources/qml/JobSpecs.qml +++ b/resources/qml/JobSpecs.qml @@ -66,7 +66,7 @@ Item sourceSize.width: width sourceSize.height: width color: control.hovered ? UM.Theme.getColor("small_button_text_hover") : UM.Theme.getColor("small_button_text") - source: UM.Theme.getIcon("pencil") + source: UM.Theme.getIcon("Pen") } } } diff --git a/resources/qml/MainWindow/ApplicationMenu.qml b/resources/qml/MainWindow/ApplicationMenu.qml index 95cea77248..62b3a71ee8 100644 --- a/resources/qml/MainWindow/ApplicationMenu.qml +++ b/resources/qml/MainWindow/ApplicationMenu.qml @@ -1,4 +1,4 @@ -// Copyright (c) 2018 Ultimaker B.V. +// Copyright (c) 2021 Ultimaker B.V. // Cura is released under the terms of the LGPLv3 or higher. import QtQuick 2.7 @@ -48,7 +48,17 @@ Item ViewMenu { title: catalog.i18nc("@title:menu menubar:toplevel", "&View") } - SettingsMenu { title: catalog.i18nc("@title:menu menubar:toplevel", "&Settings") } + SettingsMenu + { + //On MacOS, don't translate the "Settings" word. + //Qt moves the "settings" entry to a different place, and if it got renamed can't find it again when it + //attempts to delete the item upon closing the application, causing a crash. + //In the new location, these items are translated automatically according to the system's language. + //For more information, see: + //- https://doc.qt.io/qt-5/macos-issues.html#menu-bar + //- https://doc.qt.io/qt-5/qmenubar.html#qmenubar-as-a-global-menu-bar + title: (Qt.platform.os == "osx") ? "&Settings" : catalog.i18nc("@title:menu menubar:toplevel", "&Settings") + } Menu { @@ -91,7 +101,15 @@ Item Menu { id: preferencesMenu - title: catalog.i18nc("@title:menu menubar:toplevel", "P&references") + + //On MacOS, don't translate the "Preferences" word. + //Qt moves the "preferences" entry to a different place, and if it got renamed can't find it again when it + //attempts to delete the item upon closing the application, causing a crash. + //In the new location, these items are translated automatically according to the system's language. + //For more information, see: + //- https://doc.qt.io/qt-5/macos-issues.html#menu-bar + //- https://doc.qt.io/qt-5/qmenubar.html#qmenubar-as-a-global-menu-bar + title: (Qt.platform.os == "osx") ? "&Preferences" : catalog.i18nc("@title:menu menubar:toplevel", "P&references") MenuItem { action: Cura.Actions.preferences } } diff --git a/resources/qml/MainWindow/MainWindowHeader.qml b/resources/qml/MainWindow/MainWindowHeader.qml index 5d1a20c8b1..c670abb67a 100644 --- a/resources/qml/MainWindow/MainWindowHeader.qml +++ b/resources/qml/MainWindow/MainWindowHeader.qml @@ -8,7 +8,6 @@ import QtQuick.Controls.Styles 1.1 import UM 1.4 as UM import Cura 1.0 as Cura -import QtGraphicalEffects 1.0 import "../Account" @@ -63,7 +62,7 @@ Item anchors.verticalCenter: parent.verticalCenter exclusiveGroup: mainWindowHeaderMenuGroup style: UM.Theme.styles.main_window_header_tab - height: UM.Theme.getSize("main_window_header_button").height + height: Math.round(0.5 * UM.Theme.getSize("main_window_header").height) iconSource: model.stage.iconSource property color overlayColor: "transparent" diff --git a/resources/qml/Menus/ConfigurationMenu/ConfigurationItem.qml b/resources/qml/Menus/ConfigurationMenu/ConfigurationItem.qml index 2e2dd0820a..92b88d3c09 100644 --- a/resources/qml/Menus/ConfigurationMenu/ConfigurationItem.qml +++ b/resources/qml/Menus/ConfigurationMenu/ConfigurationItem.qml @@ -93,7 +93,7 @@ Button id: icon anchors.verticalCenter: unknownMaterialMessage.verticalCenter - source: UM.Theme.getIcon("warning") + source: UM.Theme.getIcon("Warning") color: UM.Theme.getColor("warning") width: UM.Theme.getSize("section_icon").width height: width diff --git a/resources/qml/Menus/ConfigurationMenu/ConfigurationListView.qml b/resources/qml/Menus/ConfigurationMenu/ConfigurationListView.qml index 3350b29580..ab1d66f0e1 100644 --- a/resources/qml/Menus/ConfigurationMenu/ConfigurationListView.qml +++ b/resources/qml/Menus/ConfigurationMenu/ConfigurationListView.qml @@ -39,7 +39,7 @@ Item anchors.left: parent.left anchors.verticalCenter: label.verticalCenter - source: UM.Theme.getIcon("warning") + source: UM.Theme.getIcon("Warning") color: UM.Theme.getColor("warning") width: UM.Theme.getSize("section_icon").width height: width diff --git a/resources/qml/Menus/ConfigurationMenu/ConfigurationMenu.qml b/resources/qml/Menus/ConfigurationMenu/ConfigurationMenu.qml index d388bd7a7e..43ccde461e 100644 --- a/resources/qml/Menus/ConfigurationMenu/ConfigurationMenu.qml +++ b/resources/qml/Menus/ConfigurationMenu/ConfigurationMenu.qml @@ -56,51 +56,76 @@ Cura.ExpandablePopup id: extruderIcon materialColor: model.color extruderEnabled: model.enabled - height: parent.height - width: height + anchors.verticalCenter: parent.verticalCenter } - // Label for the brand of the material - Label + ColumnLayout { - id: typeAndBrandNameLabel - - text: model.material_brand + " " + model.material - elide: Text.ElideRight - font: UM.Theme.getFont("default") - color: UM.Theme.getColor("text") - renderType: Text.NativeRendering - - anchors - { - top: extruderIcon.top - left: extruderIcon.right - leftMargin: UM.Theme.getSize("default_margin").width - right: parent.right - rightMargin: UM.Theme.getSize("default_margin").width - } - } - // Label that shows the name of the variant - Label - { - id: variantLabel - - visible: Cura.MachineManager.activeMachine ? Cura.MachineManager.activeMachine.hasVariants : false - - text: model.variant - elide: Text.ElideRight - font: UM.Theme.getFont("default_bold") - color: UM.Theme.getColor("text") - renderType: Text.NativeRendering - + opacity: model.enabled ? 1 : UM.Theme.getColor("extruder_disabled").a + spacing: 0 anchors { left: extruderIcon.right leftMargin: UM.Theme.getSize("default_margin").width - top: typeAndBrandNameLabel.bottom + verticalCenter: parent.verticalCenter right: parent.right rightMargin: UM.Theme.getSize("default_margin").width } + // Label for the brand of the material + Label + { + id: materialBrandColorTypeLabel + + text: model.material_brand == model.color_name ? model.color_name + " " + model.material_type : model.material_brand + " " + model.color_name + " " + model.material_type + elide: Text.ElideRight + font: UM.Theme.getFont("default") + color: UM.Theme.getColor("text") + renderType: Text.NativeRendering + width: parent.width + + visible: !truncated + } + + Label + { + id: materialColorTypeLabel + + text: model.color_name + " " + model.material_type + elide: Text.ElideRight + font: UM.Theme.getFont("default") + color: UM.Theme.getColor("text") + renderType: Text.NativeRendering + width: parent.width + + visible: !materialBrandColorTypeLabel.visible && !truncated + } + + Label + { + id: materialTypeLabel + + text: model.material_type + elide: Text.ElideRight + font: UM.Theme.getFont("default") + color: UM.Theme.getColor("text") + renderType: Text.NativeRendering + width: parent.width + visible: !materialBrandColorTypeLabel.visible && !materialColorTypeLabel.visible + } + // Label that shows the name of the variant + Label + { + id: variantLabel + + visible: Cura.MachineManager.activeMachine ? Cura.MachineManager.activeMachine.hasVariants : false + + text: model.variant + elide: Text.ElideRight + font: UM.Theme.getFont("default_bold") + color: UM.Theme.getColor("text") + renderType: Text.NativeRendering + width: parent.width + } } } } @@ -206,7 +231,7 @@ Cura.ExpandablePopup anchors.right: parent.right - iconSource: UM.Theme.getIcon("arrow_right") + iconSource: UM.Theme.getIcon("ChevronSingleRight") isIconOnRightSide: true onClicked: @@ -222,7 +247,7 @@ Cura.ExpandablePopup visible: popupItem.configuration_method == ConfigurationMenu.ConfigurationMethod.Custom text: catalog.i18nc("@label", "Configurations") - iconSource: UM.Theme.getIcon("arrow_left") + iconSource: UM.Theme.getIcon("ChevronSingleLeft") onClicked: { diff --git a/resources/qml/Menus/ConfigurationMenu/CustomConfiguration.qml b/resources/qml/Menus/ConfigurationMenu/CustomConfiguration.qml index 30f6d1b68f..8376693ad1 100644 --- a/resources/qml/Menus/ConfigurationMenu/CustomConfiguration.qml +++ b/resources/qml/Menus/ConfigurationMenu/CustomConfiguration.qml @@ -302,19 +302,19 @@ Item } Item { - width: instructionButton.width + 2 * UM.Theme.getSize("default_margin").width + width: instructionButton.width + 2 * UM.Theme.getSize("narrow_margin").width height: instructionButton.visible ? materialSelection.height: 0 Button { id: instructionButton hoverEnabled: true contentItem: Item {} - height: 0.5 * materialSelection.height - width: height + height: UM.Theme.getSize("small_button").height + width: UM.Theme.getSize("small_button").width anchors.centerIn: parent background: UM.RecolorImage { - source: UM.Theme.getIcon("printing_guideline") + source: UM.Theme.getIcon("Guide") color: instructionButton.hovered ? UM.Theme.getColor("primary") : UM.Theme.getColor("icon") } visible: selectors.instructionLink != "" @@ -388,7 +388,7 @@ Item { id: warningImage anchors.left: parent.left - source: UM.Theme.getIcon("warning") + source: UM.Theme.getIcon("Warning") width: UM.Theme.getSize("section_icon").width height: UM.Theme.getSize("section_icon").height sourceSize.width: width diff --git a/resources/qml/ObjectItemButton.qml b/resources/qml/ObjectItemButton.qml index 5867a1c544..1637b8d0cd 100644 --- a/resources/qml/ObjectItemButton.qml +++ b/resources/qml/ObjectItemButton.qml @@ -13,8 +13,6 @@ Button width: parent.width height: UM.Theme.getSize("action_button").height - leftPadding: UM.Theme.getSize("thin_margin").width - rightPadding: perObjectSettingsInfo.visible ? UM.Theme.getSize("default_lining").width : UM.Theme.getSize("thin_margin").width checkable: true hoverEnabled: true @@ -46,14 +44,14 @@ Button width: objectItemButton.width - objectItemButton.leftPadding height: UM.Theme.getSize("action_button").height - UM.RecolorImage + Rectangle { id: swatch anchors.verticalCenter: parent.verticalCenter anchors.left: parent.left - width: height - height: parent.height - UM.Theme.getSize("narrow_margin").height - source: UM.Theme.getIcon("extruder_button") + width: UM.Theme.getSize("standard_arrow").height + height: UM.Theme.getSize("standard_arrow").height + radius: Math.round(width / 2) color: extruderColor visible: showExtruderSwatches && extruderColor != "" } @@ -168,12 +166,12 @@ Button { switch (meshType) { case "support_mesh": - return UM.Theme.getIcon("pos_print_as_support"); + return UM.Theme.getIcon("MeshTypeSupport"); case "cutting_mesh": case "infill_mesh": - return UM.Theme.getIcon("pos_modify_overlaps"); + return UM.Theme.getIcon("MeshTypeIntersect"); case "anti_overhang_mesh": - return UM.Theme.getIcon("pos_modify_dont_support_overlap"); + return UM.Theme.getIcon("BlockSupportOverlaps"); } return ""; } diff --git a/resources/qml/ObjectSelector.qml b/resources/qml/ObjectSelector.qml index 15cb476e08..0cdc2b3f80 100644 --- a/resources/qml/ObjectSelector.qml +++ b/resources/qml/ObjectSelector.qml @@ -48,7 +48,7 @@ Item sourceSize.width: width anchors.left: parent.left color: openCloseButton.hovered ? UM.Theme.getColor("small_button_text_hover") : UM.Theme.getColor("small_button_text") - source: objectSelector.opened ? UM.Theme.getIcon("arrow_bottom") : UM.Theme.getIcon("arrow_top") + source: objectSelector.opened ? UM.Theme.getIcon("ChevronSingleDown") : UM.Theme.getIcon("ChevronSingleUp") } Label diff --git a/resources/qml/Preferences/Materials/MaterialsBrandSection.qml b/resources/qml/Preferences/Materials/MaterialsBrandSection.qml index 606acc2950..dc8be9563b 100644 --- a/resources/qml/Preferences/Materials/MaterialsBrandSection.qml +++ b/resources/qml/Preferences/Materials/MaterialsBrandSection.qml @@ -66,7 +66,7 @@ Item width: UM.Theme.getSize("standard_arrow").width height: UM.Theme.getSize("standard_arrow").height color: "black" - source: brand_section.expanded ? UM.Theme.getIcon("arrow_bottom") : UM.Theme.getIcon("arrow_left") + source: brand_section.expanded ? UM.Theme.getIcon("ChevronSingleDown") : UM.Theme.getIcon("ChevronSingleLeft") } } } @@ -144,4 +144,4 @@ Item expanded = materialList.expandedBrands.indexOf(sectionName) > -1 } } -} \ No newline at end of file +} diff --git a/resources/qml/Preferences/Materials/MaterialsSlot.qml b/resources/qml/Preferences/Materials/MaterialsSlot.qml index 81bb8759ff..840c636196 100644 --- a/resources/qml/Preferences/Materials/MaterialsSlot.qml +++ b/resources/qml/Preferences/Materials/MaterialsSlot.qml @@ -122,7 +122,7 @@ Rectangle } } } - source: materialSlot.is_favorite ? UM.Theme.getIcon("favorites_star_full") : UM.Theme.getIcon("favorites_star_empty") + source: materialSlot.is_favorite ? UM.Theme.getIcon("StarFilled") : UM.Theme.getIcon("Star") } } -} \ No newline at end of file +} diff --git a/resources/qml/Preferences/Materials/MaterialsTypeSection.qml b/resources/qml/Preferences/Materials/MaterialsTypeSection.qml index 7219cb7b89..09f9964604 100644 --- a/resources/qml/Preferences/Materials/MaterialsTypeSection.qml +++ b/resources/qml/Preferences/Materials/MaterialsTypeSection.qml @@ -78,7 +78,7 @@ Item width: UM.Theme.getSize("standard_arrow").width height: UM.Theme.getSize("standard_arrow").height color: "black" - source: material_type_section.expanded ? UM.Theme.getIcon("arrow_bottom") : UM.Theme.getIcon("arrow_left") + source: material_type_section.expanded ? UM.Theme.getIcon("ChevronSingleDown") : UM.Theme.getIcon("ChevronSingleLeft") } } @@ -134,4 +134,4 @@ Item expanded = materialList.expandedTypes.indexOf(materialBrand + "_" + materialName) > -1 } } -} \ No newline at end of file +} diff --git a/resources/qml/Preferences/SettingVisibilityPage.qml b/resources/qml/Preferences/SettingVisibilityPage.qml index 37149c0009..d2fd5c7e94 100644 --- a/resources/qml/Preferences/SettingVisibilityPage.qml +++ b/resources/qml/Preferences/SettingVisibilityPage.qml @@ -95,7 +95,7 @@ UM.PreferencesPage placeholderText: catalog.i18nc("@label:textbox", "Filter...") - onTextChanged: definitionsModel.filter = {"i18n_label": "*" + text} + onTextChanged: definitionsModel.filter = {"i18n_label|i18n_description": "*" + text} } NewControls.ComboBox diff --git a/resources/qml/PrimaryButton.qml b/resources/qml/PrimaryButton.qml index fca63d2cdb..52c460bde4 100644 --- a/resources/qml/PrimaryButton.qml +++ b/resources/qml/PrimaryButton.qml @@ -1,4 +1,4 @@ -// Copyright (c) 2018 Ultimaker B.V. +// Copyright (c) 2021 Ultimaker B.V. // Cura is released under the terms of the LGPLv3 or higher. import QtQuick 2.2 @@ -9,8 +9,6 @@ import Cura 1.1 as Cura Cura.ActionButton { - shadowEnabled: true - shadowColor: enabled ? UM.Theme.getColor("primary_button_shadow"): UM.Theme.getColor("action_button_disabled_shadow") color: UM.Theme.getColor("primary_button") textColor: UM.Theme.getColor("primary_button_text") outlineColor: "transparent" diff --git a/resources/qml/PrintSetupSelector/Custom/CustomPrintSetup.qml b/resources/qml/PrintSetupSelector/Custom/CustomPrintSetup.qml index d18febfc5f..cde2cd8dfc 100644 --- a/resources/qml/PrintSetupSelector/Custom/CustomPrintSetup.qml +++ b/resources/qml/PrintSetupSelector/Custom/CustomPrintSetup.qml @@ -158,7 +158,7 @@ Item anchors.rightMargin: UM.Theme.getSize("default_margin").width color: hovered ? UM.Theme.getColor("setting_control_button_hover") : UM.Theme.getColor("setting_control_button"); - iconSource: UM.Theme.getIcon("star") + iconSource: UM.Theme.getIcon("StarFilled") onClicked: { @@ -176,7 +176,7 @@ Item { id: downArrow - source: UM.Theme.getIcon("arrow_bottom") + source: UM.Theme.getIcon("ChevronSingleDown") width: UM.Theme.getSize("standard_arrow").width height: UM.Theme.getSize("standard_arrow").height @@ -226,9 +226,12 @@ Item { Cura.ExtruderIcon { - anchors.horizontalCenter: parent.horizontalCenter + anchors.centerIn: parent materialColor: model.color extruderEnabled: model.enabled + iconVariant: "default" + height: parent.height + width: height } } onClicked: diff --git a/resources/qml/PrintSetupSelector/NoIntentIcon.qml b/resources/qml/PrintSetupSelector/NoIntentIcon.qml index 7943a05ab4..6fc883fdef 100644 --- a/resources/qml/PrintSetupSelector/NoIntentIcon.qml +++ b/resources/qml/PrintSetupSelector/NoIntentIcon.qml @@ -18,7 +18,7 @@ Item UM.RecolorImage { - source: UM.Theme.getIcon("info") + source: UM.Theme.getIcon("Information") color: UM.Theme.getColor("icon") anchors.fill: parent } @@ -33,4 +33,4 @@ Item } onExited: base.hideTooltip() } -} \ No newline at end of file +} diff --git a/resources/qml/PrintSetupSelector/PrintSetupSelectorContents.qml b/resources/qml/PrintSetupSelector/PrintSetupSelectorContents.qml index 81b752eef6..0a5a466780 100644 --- a/resources/qml/PrintSetupSelector/PrintSetupSelectorContents.qml +++ b/resources/qml/PrintSetupSelector/PrintSetupSelectorContents.qml @@ -142,7 +142,7 @@ Item leftPadding: UM.Theme.getSize("default_margin").width rightPadding: UM.Theme.getSize("default_margin").width text: catalog.i18nc("@button", "Recommended") - iconSource: UM.Theme.getIcon("arrow_left") + iconSource: UM.Theme.getIcon("ChevronSingleLeft") visible: currentModeIndex == PrintSetupSelectorContents.Mode.Custom onClicked: currentModeIndex = PrintSetupSelectorContents.Mode.Recommended } @@ -156,7 +156,7 @@ Item leftPadding: UM.Theme.getSize("default_margin").width rightPadding: UM.Theme.getSize("default_margin").width text: catalog.i18nc("@button", "Custom") - iconSource: UM.Theme.getIcon("arrow_right") + iconSource: UM.Theme.getIcon("ChevronSingleRight") isIconOnRightSide: true visible: currentModeIndex == PrintSetupSelectorContents.Mode.Recommended onClicked: @@ -233,10 +233,10 @@ Item height: UM.Theme.getSize("drag_icon").height anchors.centerIn: parent - source: UM.Theme.getIcon("resize") + source: UM.Theme.getIcon("ThreeDots") color: UM.Theme.getColor("small_button_text") } } } } -} \ No newline at end of file +} diff --git a/resources/qml/PrintSetupSelector/PrintSetupSelectorHeader.qml b/resources/qml/PrintSetupSelector/PrintSetupSelectorHeader.qml index 1a15980693..3b6fc37eb4 100644 --- a/resources/qml/PrintSetupSelector/PrintSetupSelectorHeader.qml +++ b/resources/qml/PrintSetupSelector/PrintSetupSelectorHeader.qml @@ -15,7 +15,8 @@ RowLayout Cura.IconWithText { - source: UM.Theme.getIcon("category_layer_height") + source: UM.Theme.getIcon("Sliders", "medium") + iconSize: UM.Theme.getSize("button_icon").width text: { if (Cura.MachineManager.activeStack) @@ -50,9 +51,10 @@ RowLayout Cura.IconWithText { - source: UM.Theme.getIcon("category_infill") + source: UM.Theme.getIcon("Infill1") text: Cura.MachineManager.activeStack ? parseInt(infillDensity.properties.value) + "%" : "0%" font: UM.Theme.getFont("medium") + iconSize: UM.Theme.getSize("medium_button_icon").width UM.SettingPropertyProvider { @@ -65,9 +67,10 @@ RowLayout Cura.IconWithText { - source: UM.Theme.getIcon("category_support") + source: UM.Theme.getIcon("Support") text: supportEnabled.properties.value == "True" ? enabledText : disabledText font: UM.Theme.getFont("medium") + iconSize: UM.Theme.getSize("medium_button_icon").width UM.SettingPropertyProvider { @@ -80,9 +83,10 @@ RowLayout Cura.IconWithText { - source: UM.Theme.getIcon("category_adhesion") + source: UM.Theme.getIcon("Adhesion") text: platformAdhesionType.properties.value != "skirt" && platformAdhesionType.properties.value != "none" ? enabledText : disabledText font: UM.Theme.getFont("medium") + iconSize: UM.Theme.getSize("medium_button_icon").width UM.SettingPropertyProvider { @@ -92,4 +96,4 @@ RowLayout watchedProperties: [ "value"] } } -} \ No newline at end of file +} diff --git a/resources/qml/PrintSetupSelector/Recommended/RecommendedAdhesionSelector.qml b/resources/qml/PrintSetupSelector/Recommended/RecommendedAdhesionSelector.qml index 1ae265ab47..a3a5047ee9 100644 --- a/resources/qml/PrintSetupSelector/Recommended/RecommendedAdhesionSelector.qml +++ b/resources/qml/PrintSetupSelector/Recommended/RecommendedAdhesionSelector.qml @@ -25,10 +25,11 @@ Item id: enableAdhesionRowTitle anchors.top: parent.top anchors.left: parent.left - source: UM.Theme.getIcon("category_adhesion") + source: UM.Theme.getIcon("Adhesion") text: catalog.i18nc("@label", "Adhesion") font: UM.Theme.getFont("medium") width: labelColumnWidth + iconSize: UM.Theme.getSize("medium_button_icon").width } Item @@ -87,4 +88,4 @@ Item watchedProperties: [ "value", "resolve", "enabled" ] storeIndex: 0 } -} \ No newline at end of file +} diff --git a/resources/qml/PrintSetupSelector/Recommended/RecommendedInfillDensitySelector.qml b/resources/qml/PrintSetupSelector/Recommended/RecommendedInfillDensitySelector.qml index 19f199fea6..705a3e95ef 100644 --- a/resources/qml/PrintSetupSelector/Recommended/RecommendedInfillDensitySelector.qml +++ b/resources/qml/PrintSetupSelector/Recommended/RecommendedInfillDensitySelector.qml @@ -29,21 +29,21 @@ Item var density = parseInt(infillDensity.properties.value) if (parseInt(infillSteps.properties.value) != 0) { - return UM.Theme.getIcon("gradual") + return UM.Theme.getIcon("InfillGradual") } if (density <= 0) { - return UM.Theme.getIcon("hollow") + return UM.Theme.getIcon("Infill0") } if (density < 40) { - return UM.Theme.getIcon("sparse") + return UM.Theme.getIcon("Infill3") } if (density < 90) { - return UM.Theme.getIcon("dense") + return UM.Theme.getIcon("Infill2") } - return UM.Theme.getIcon("solid") + return UM.Theme.getIcon("Infill100") } } @@ -61,10 +61,11 @@ Item id: infillRowTitle anchors.top: parent.top anchors.left: parent.left - source: UM.Theme.getIcon("category_infill") + source: UM.Theme.getIcon("Infill1") text: catalog.i18nc("@label", "Infill") + " (%)" font: UM.Theme.getFont("medium") width: labelColumnWidth + iconSize: UM.Theme.getSize("medium_button_icon").width } Item @@ -119,6 +120,8 @@ Item implicitWidth: UM.Theme.getSize("print_setup_slider_handle").width implicitHeight: implicitWidth radius: Math.round(implicitWidth / 2) + border.color: UM.Theme.getColor("slider_groove_fill") + border.width: UM.Theme.getSize("default_lining").height } tickmarks: Repeater @@ -252,4 +255,4 @@ Item watchedProperties: ["value", "enabled"] storeIndex: 0 } -} \ No newline at end of file +} diff --git a/resources/qml/PrintSetupSelector/Recommended/RecommendedQualityProfileSelector.qml b/resources/qml/PrintSetupSelector/Recommended/RecommendedQualityProfileSelector.qml index 337aff573f..0823b5cb62 100644 --- a/resources/qml/PrintSetupSelector/Recommended/RecommendedQualityProfileSelector.qml +++ b/resources/qml/PrintSetupSelector/Recommended/RecommendedQualityProfileSelector.qml @@ -48,10 +48,11 @@ Item Cura.IconWithText { id: profileLabel - source: UM.Theme.getIcon("category_layer_height") + source: UM.Theme.getIcon("PrintQuality") text: catalog.i18nc("@label", "Profiles") font: UM.Theme.getFont("medium") width: labelColumnWidth + iconSize: UM.Theme.getSize("medium_button_icon").width } UM.SimpleButton { @@ -69,7 +70,7 @@ Item } color: hovered ? UM.Theme.getColor("setting_control_button_hover") : UM.Theme.getColor("setting_control_button") - iconSource: UM.Theme.getIcon("reset") + iconSource: UM.Theme.getIcon("ArrowReset") onClicked: { @@ -91,6 +92,7 @@ Item { left: profileLabel.right right: parent.right + verticalCenter: profileLabel.verticalCenter } model: Cura.QualityProfilesDropDownMenuModel @@ -198,4 +200,4 @@ Item } } -} \ No newline at end of file +} diff --git a/resources/qml/PrintSetupSelector/Recommended/RecommendedSupportSelector.qml b/resources/qml/PrintSetupSelector/Recommended/RecommendedSupportSelector.qml index aadee43c36..4e2341fb57 100644 --- a/resources/qml/PrintSetupSelector/Recommended/RecommendedSupportSelector.qml +++ b/resources/qml/PrintSetupSelector/Recommended/RecommendedSupportSelector.qml @@ -26,10 +26,11 @@ Item anchors.top: parent.top anchors.left: parent.left visible: enableSupportCheckBox.visible - source: UM.Theme.getIcon("category_support") + source: UM.Theme.getIcon("Support") text: catalog.i18nc("@label", "Support") font: UM.Theme.getFont("medium") width: labelColumnWidth + iconSize: UM.Theme.getSize("medium_button_icon").width } Item @@ -162,7 +163,7 @@ Item x: supportExtruderCombobox.width - width - supportExtruderCombobox.rightPadding y: supportExtruderCombobox.topPadding + Math.round((supportExtruderCombobox.availableHeight - height) / 2) - source: UM.Theme.getIcon("arrow_bottom") + source: UM.Theme.getIcon("ChevronSingleDown") width: UM.Theme.getSize("standard_arrow").width height: UM.Theme.getSize("standard_arrow").height sourceSize.width: width + 5 * screenScaleFactor @@ -218,18 +219,16 @@ Item elide: Text.ElideLeft verticalAlignment: Text.AlignVCenter - background: UM.RecolorImage + background: Rectangle { id: swatch height: Math.round(parent.height / 2) width: height + radius: Math.round(width / 2) anchors.right: parent.right anchors.verticalCenter: parent.verticalCenter anchors.rightMargin: UM.Theme.getSize("thin_margin").width - sourceSize.width: width - sourceSize.height: height - source: UM.Theme.getIcon("extruder_button") color: supportExtruderCombobox.color } } @@ -288,18 +287,16 @@ Item verticalAlignment: Text.AlignVCenter rightPadding: swatch.width + UM.Theme.getSize("setting_unit_margin").width - background: UM.RecolorImage + background: Rectangle { id: swatch height: Math.round(parent.height / 2) width: height + radius: Math.round(width / 2) anchors.right: parent.right anchors.verticalCenter: parent.verticalCenter anchors.rightMargin: UM.Theme.getSize("thin_margin").width - sourceSize.width: width - sourceSize.height: height - source: UM.Theme.getIcon("extruder_button") color: supportExtruderCombobox.model.getItem(index).color } } @@ -342,4 +339,4 @@ Item watchedProperties: ["value"] storeIndex: 0 } -} \ No newline at end of file +} diff --git a/resources/qml/PrinterOutput/ManualPrinterControl.qml b/resources/qml/PrinterOutput/ManualPrinterControl.qml index e8947bfdf4..3213f1ace8 100644 --- a/resources/qml/PrinterOutput/ManualPrinterControl.qml +++ b/resources/qml/PrinterOutput/ManualPrinterControl.qml @@ -102,7 +102,7 @@ Item Layout.column: 1 Layout.preferredWidth: width Layout.preferredHeight: height - iconSource: UM.Theme.getIcon("arrow_top"); + iconSource: UM.Theme.getIcon("ChevronSingleUp"); style: UM.Theme.styles.monitor_button_style width: height height: UM.Theme.getSize("setting_control").height @@ -119,7 +119,7 @@ Item Layout.column: 0 Layout.preferredWidth: width Layout.preferredHeight: height - iconSource: UM.Theme.getIcon("arrow_left"); + iconSource: UM.Theme.getIcon("ChevronSingleLeft"); style: UM.Theme.styles.monitor_button_style width: height height: UM.Theme.getSize("setting_control").height @@ -136,7 +136,7 @@ Item Layout.column: 2 Layout.preferredWidth: width Layout.preferredHeight: height - iconSource: UM.Theme.getIcon("arrow_right"); + iconSource: UM.Theme.getIcon("ChevronSingleRight"); style: UM.Theme.styles.monitor_button_style width: height height: UM.Theme.getSize("setting_control").height @@ -153,7 +153,7 @@ Item Layout.column: 1 Layout.preferredWidth: width Layout.preferredHeight: height - iconSource: UM.Theme.getIcon("arrow_bottom"); + iconSource: UM.Theme.getIcon("ChevronSingleDown"); style: UM.Theme.styles.monitor_button_style width: height height: UM.Theme.getSize("setting_control").height @@ -170,7 +170,7 @@ Item Layout.column: 1 Layout.preferredWidth: width Layout.preferredHeight: height - iconSource: UM.Theme.getIcon("home"); + iconSource: UM.Theme.getIcon("House"); style: UM.Theme.styles.monitor_button_style width: height height: UM.Theme.getSize("setting_control").height @@ -200,7 +200,7 @@ Item Button { - iconSource: UM.Theme.getIcon("arrow_top"); + iconSource: UM.Theme.getIcon("ChevronSingleUp"); style: UM.Theme.styles.monitor_button_style width: height height: UM.Theme.getSize("setting_control").height @@ -213,7 +213,7 @@ Item Button { - iconSource: UM.Theme.getIcon("home"); + iconSource: UM.Theme.getIcon("House"); style: UM.Theme.styles.monitor_button_style width: height height: UM.Theme.getSize("setting_control").height @@ -226,7 +226,7 @@ Item Button { - iconSource: UM.Theme.getIcon("arrow_bottom"); + iconSource: UM.Theme.getIcon("ChevronSingleDown"); style: UM.Theme.styles.monitor_button_style width: height height: UM.Theme.getSize("setting_control").height diff --git a/resources/qml/PrinterSelector/MachineSelector.qml b/resources/qml/PrinterSelector/MachineSelector.qml index 17bb80906a..c12e364339 100644 --- a/resources/qml/PrinterSelector/MachineSelector.qml +++ b/resources/qml/PrinterSelector/MachineSelector.qml @@ -93,11 +93,11 @@ Cura.ExpandablePopup { if (isGroup) { - return UM.Theme.getIcon("printer_group") + return UM.Theme.getIcon("PrinterTriple", "medium") } else if (isNetworkPrinter || isCloudRegistered) { - return UM.Theme.getIcon("printer_single") + return UM.Theme.getIcon("Printer", "medium") } else { @@ -114,11 +114,26 @@ Cura.ExpandablePopup anchors { bottom: parent.bottom + bottomMargin: - height * 1 / 6 left: parent.left - leftMargin: UM.Theme.getSize("thick_margin").width + leftMargin: iconSize - width * 5 / 6 } - source: UM.Theme.getIcon(connectionStatus) + source: + { + if (connectionStatus == "printer_connected") + { + return UM.Theme.getIcon("CheckBlueBG", "low") + } + else if (connectionStatus == "printer_cloud_connected" || connectionStatus == "printer_cloud_not_available") + { + return UM.Theme.getIcon("CloudBadge", "low") + } + else + { + return "" + } + } width: UM.Theme.getSize("printer_status_icon").width height: UM.Theme.getSize("printer_status_icon").height @@ -132,11 +147,10 @@ Cura.ExpandablePopup { id: iconBackground anchors.centerIn: parent - // Make it a bit bigger so there is an outline - width: parent.width + 2 * UM.Theme.getSize("default_lining").width - height: parent.height + 2 * UM.Theme.getSize("default_lining").height - radius: Math.round(width / 2) - color: UM.Theme.getColor("main_background") + width: parent.width - 1.5 //1.5 pixels smaller, (at least sqrt(2), regardless of screen pixel scale) so that the circle doesn't show up behind the icon due to anti-aliasing. + height: parent.height - 1.5 + radius: width / 2 + color: UM.Theme.getColor("connection_badge_background") z: parent.z - 1 } diff --git a/resources/qml/RadioCheckbar.qml b/resources/qml/RadioCheckbar.qml index 0b8709fe7a..5aea771a44 100644 --- a/resources/qml/RadioCheckbar.qml +++ b/resources/qml/RadioCheckbar.qml @@ -146,6 +146,7 @@ Item } radius: Math.round(width / 2) color: activeColor + border.color: defaultItemColor visible: checkbox.checked } } diff --git a/resources/qml/SecondaryButton.qml b/resources/qml/SecondaryButton.qml index f03d8acdfa..ba4e0bb2c1 100644 --- a/resources/qml/SecondaryButton.qml +++ b/resources/qml/SecondaryButton.qml @@ -1,4 +1,4 @@ -// Copyright (c) 2018 Ultimaker B.V. +// Copyright (c) 2021 Ultimaker B.V. // Cura is released under the terms of the LGPLv3 or higher. import QtQuick 2.2 @@ -9,11 +9,9 @@ import Cura 1.1 as Cura Cura.ActionButton { - shadowEnabled: true - shadowColor: enabled ? UM.Theme.getColor("secondary_button_shadow"): UM.Theme.getColor("action_button_disabled_shadow") color: UM.Theme.getColor("secondary_button") textColor: UM.Theme.getColor("secondary_button_text") - outlineColor: "transparent" + outlineColor: UM.Theme.getColor("secondary_button_text") disabledColor: UM.Theme.getColor("action_button_disabled") textDisabledColor: UM.Theme.getColor("action_button_disabled_text") hoverColor: UM.Theme.getColor("secondary_button_hover") diff --git a/resources/qml/Settings/SettingCategory.qml b/resources/qml/Settings/SettingCategory.qml index e3e12d7753..5beb6e209e 100644 --- a/resources/qml/Settings/SettingCategory.qml +++ b/resources/qml/Settings/SettingCategory.qml @@ -16,10 +16,13 @@ Button anchors.rightMargin: 2 * UM.Theme.getSize("thin_margin").width hoverEnabled: true + height: UM.Theme.getSize("section_icon_column").height + background: Rectangle { id: backgroundRectangle height: UM.Theme.getSize("section").height + anchors.verticalCenter: parent.verticalCenter color: { if (!base.enabled) @@ -93,7 +96,7 @@ Button height: UM.Theme.getSize("standard_arrow").height sourceSize.height: width color: UM.Theme.getColor("setting_control_button") - source: definition.expanded ? UM.Theme.getIcon("arrow_bottom") : UM.Theme.getIcon("arrow_left") + source: definition.expanded ? UM.Theme.getIcon("ChevronSingleDown") : UM.Theme.getIcon("ChevronSingleLeft") } } @@ -107,8 +110,8 @@ Button source: UM.Theme.getIcon(definition.icon) width: UM.Theme.getSize("section_icon").width height: UM.Theme.getSize("section_icon").height - sourceSize.width: width + 15 * screenScaleFactor - sourceSize.height: width + 15 * screenScaleFactor + sourceSize.width: width + sourceSize.height: width } onClicked: @@ -141,8 +144,8 @@ Button id: settingsButton visible: base.hovered || settingsButton.hovered - height: Math.round(base.height * 0.6) - width: Math.round(base.height * 0.6) + height: UM.Theme.getSize("small_button_icon").height + width: height anchors { @@ -154,7 +157,7 @@ Button color: UM.Theme.getColor("setting_control_button") hoverColor: UM.Theme.getColor("setting_control_button_hover") - iconSource: UM.Theme.getIcon("settings") + iconSource: UM.Theme.getIcon("Sliders") onClicked: Cura.Actions.configureSettingVisibility.trigger(definition) } @@ -184,7 +187,7 @@ Button return false } - height: Math.round(parent.height / 2) + height: UM.Theme.getSize("small_button_icon").height width: height onClicked: @@ -195,7 +198,7 @@ Button color: UM.Theme.getColor("setting_control_button") hoverColor: UM.Theme.getColor("setting_control_button_hover") - iconSource: UM.Theme.getIcon("notice") + iconSource: UM.Theme.getIcon("Information") onEntered: base.showTooltip(catalog.i18nc("@label","Some hidden settings use values different from their normal calculated value.\n\nClick to make these settings visible.")) diff --git a/resources/qml/Settings/SettingCheckBox.qml b/resources/qml/Settings/SettingCheckBox.qml index e3de6e219d..20693b92e3 100644 --- a/resources/qml/Settings/SettingCheckBox.qml +++ b/resources/qml/Settings/SettingCheckBox.qml @@ -151,7 +151,7 @@ SettingItem height: Math.round(parent.height / 2.5) sourceSize.height: width color: !enabled ? UM.Theme.getColor("setting_control_disabled_text") : UM.Theme.getColor("setting_control_text"); - source: UM.Theme.getIcon("check") + source: UM.Theme.getIcon("Check") opacity: control.checked ? 1 : 0 Behavior on opacity { NumberAnimation { duration: 100; } } } diff --git a/resources/qml/Settings/SettingExtruder.qml b/resources/qml/Settings/SettingExtruder.qml index 2bf9e24b3d..ea514eb069 100644 --- a/resources/qml/Settings/SettingExtruder.qml +++ b/resources/qml/Settings/SettingExtruder.qml @@ -77,7 +77,7 @@ SettingItem currentIndex: propertyProvider.properties.value !== undefined ? propertyProvider.properties.value : 0 - property string color: "#fff" + property string color: "transparent" Binding { @@ -85,7 +85,7 @@ SettingItem // explicit binding here otherwise we do not handle value changes after the model changes. target: control property: "color" - value: control.currentText != "" ? control.model.getItem(control.currentIndex).color : "" + value: control.currentText != "" ? control.model.getItem(control.currentIndex).color : "transparent" } Binding @@ -104,7 +104,7 @@ SettingItem x: control.width - width - control.rightPadding y: control.topPadding + Math.round((control.availableHeight - height) / 2) - source: UM.Theme.getIcon("arrow_bottom") + source: UM.Theme.getIcon("ChevronSingleDown") width: UM.Theme.getSize("standard_arrow").width height: UM.Theme.getSize("standard_arrow").height sourceSize.width: width + 5 * screenScaleFactor @@ -160,18 +160,16 @@ SettingItem elide: Text.ElideLeft verticalAlignment: Text.AlignVCenter - background: UM.RecolorImage + background: Rectangle { id: swatch height: Math.round(parent.height / 2) width: height + radius: Math.round(width / 2) anchors.right: parent.right anchors.verticalCenter: parent.verticalCenter anchors.rightMargin: UM.Theme.getSize("thin_margin").width - sourceSize.width: width - sourceSize.height: height - source: UM.Theme.getIcon("extruder_button") color: control.color } } @@ -229,18 +227,16 @@ SettingItem verticalAlignment: Text.AlignVCenter rightPadding: swatch.width + UM.Theme.getSize("setting_unit_margin").width - background: UM.RecolorImage + background: Rectangle { id: swatch height: Math.round(parent.height / 2) width: height + radius: Math.round(width / 2) anchors.right: parent.right anchors.verticalCenter: parent.verticalCenter anchors.rightMargin: UM.Theme.getSize("thin_margin").width - sourceSize.width: width - sourceSize.height: height - source: UM.Theme.getIcon("extruder_button") color: control.model.getItem(index).color } } diff --git a/resources/qml/Settings/SettingItem.qml b/resources/qml/Settings/SettingItem.qml index f0c748d190..35172fc799 100644 --- a/resources/qml/Settings/SettingItem.qml +++ b/resources/qml/Settings/SettingItem.qml @@ -156,7 +156,7 @@ Item { id: settingControls - height: UM.Theme.getSize("section_control").height + height: UM.Theme.getSize("small_button_icon").height spacing: Math.round(UM.Theme.getSize("thick_margin").height / 2) anchors @@ -174,12 +174,13 @@ Item anchors.top: parent.top anchors.bottom: parent.bottom + height: UM.Theme.getSize("small_button_icon").height width: height color: UM.Theme.getColor("setting_control_button") hoverColor: UM.Theme.getColor("setting_control_button") - iconSource: UM.Theme.getIcon("link") + iconSource: UM.Theme.getIcon("Link") onEntered: { @@ -203,12 +204,13 @@ Item anchors.top: parent.top anchors.bottom: parent.bottom + height: UM.Theme.getSize("small_button_icon").height width: height color: UM.Theme.getColor("setting_control_button") hoverColor: UM.Theme.getColor("setting_control_button_hover") - iconSource: UM.Theme.getIcon("reset") + iconSource: UM.Theme.getIcon("ArrowReset") onClicked: { @@ -286,6 +288,7 @@ Item anchors.top: parent.top anchors.bottom: parent.bottom + height: UM.Theme.getSize("small_button_icon").height width: height onClicked: @@ -324,7 +327,7 @@ Item color: UM.Theme.getColor("setting_control_button") hoverColor: UM.Theme.getColor("setting_control_button_hover") - iconSource: UM.Theme.getIcon("formula") + iconSource: UM.Theme.getIcon("Function") onEntered: { hoverTimer.stop(); base.showTooltip(catalog.i18nc("@label", "This setting is normally calculated, but it currently has an absolute value set.\n\nClick to restore the calculated value.")) } onExited: base.showTooltip(base.createTooltipText()) diff --git a/resources/qml/Settings/SettingOptionalExtruder.qml b/resources/qml/Settings/SettingOptionalExtruder.qml index ce078551d8..94df1bcc03 100644 --- a/resources/qml/Settings/SettingOptionalExtruder.qml +++ b/resources/qml/Settings/SettingOptionalExtruder.qml @@ -88,7 +88,7 @@ SettingItem when: control.model.items.length > 0 } - property string color: "#fff" + property string color: "transparent" Binding { @@ -96,7 +96,7 @@ SettingItem // explicit binding here otherwise we do not handle value changes after the model changes. target: control property: "color" - value: control.currentText != "" ? control.model.getItem(control.currentIndex).color : "" + value: control.currentText != "" ? control.model.getItem(control.currentIndex).color : "transparent" } indicator: UM.RecolorImage @@ -105,7 +105,7 @@ SettingItem x: control.width - width - control.rightPadding y: control.topPadding + Math.round((control.availableHeight - height) / 2) - source: UM.Theme.getIcon("arrow_bottom") + source: UM.Theme.getIcon("ChevronSingleDown") width: UM.Theme.getSize("standard_arrow").width height: UM.Theme.getSize("standard_arrow").height sourceSize.width: width + 5 * screenScaleFactor @@ -161,18 +161,16 @@ SettingItem elide: Text.ElideRight verticalAlignment: Text.AlignVCenter - background: UM.RecolorImage + background: Rectangle { id: swatch height: Math.round(parent.height / 2) width: height + radius: Math.round(width / 2) anchors.right: parent.right anchors.verticalCenter: parent.verticalCenter anchors.rightMargin: UM.Theme.getSize("thin_margin").width - sourceSize.width: width - sourceSize.height: height - source: UM.Theme.getIcon("extruder_button") color: control.color } } @@ -226,18 +224,16 @@ SettingItem verticalAlignment: Text.AlignVCenter rightPadding: swatch.width + UM.Theme.getSize("setting_unit_margin").width - background: UM.RecolorImage + background: Rectangle { id: swatch height: Math.round(parent.height / 2) width: height + radius: Math.round(width / 2) anchors.right: parent.right anchors.verticalCenter: parent.verticalCenter anchors.rightMargin: UM.Theme.getSize("thin_margin").width - sourceSize.width: width - sourceSize.height: height - source: UM.Theme.getIcon("extruder_button") color: control.model.getItem(index).color } } diff --git a/resources/qml/Settings/SettingView.qml b/resources/qml/Settings/SettingView.qml index 9506e70b4b..fc920a30e7 100644 --- a/resources/qml/Settings/SettingView.qml +++ b/resources/qml/Settings/SettingView.qml @@ -65,7 +65,13 @@ Item anchors.right: clearFilterButton.left anchors.rightMargin: Math.round(UM.Theme.getSize("thick_margin").width) - placeholderText: "" + "
" + catalog.i18nc("@label:textbox", "Search settings") + placeholderText: + { + var imageSize = "width='" + UM.Theme.getSize("small_button_icon").width + "' height='" + UM.Theme.getSize("small_button_icon").height + var imageSource = "' src='"+ UM.Theme.getIcon("Magnifier") + var searchPlaceholder = catalog.i18nc("@label:textbox", "Search settings") + return "" + "
" + searchPlaceholder + } style: TextFieldStyle { @@ -133,7 +139,7 @@ Item UM.SimpleButton { id: clearFilterButton - iconSource: UM.Theme.getIcon("cross1") + iconSource: UM.Theme.getIcon("Cancel") visible: findingSettings height: Math.round(parent.height * 0.4) @@ -188,12 +194,12 @@ Item { anchors.verticalCenter: parent.verticalCenter anchors.horizontalCenter: parent.horizontalCenter - width: UM.Theme.getSize("standard_arrow").width - height: UM.Theme.getSize("standard_arrow").height + width: UM.Theme.getSize("medium_button_icon").width + height: UM.Theme.getSize("medium_button_icon").height sourceSize.width: width sourceSize.height: height color: control.hovered ? UM.Theme.getColor("small_button_text_hover") : UM.Theme.getColor("small_button_text") - source: UM.Theme.getIcon("menu") + source: UM.Theme.getIcon("Hamburger") } } label: Label {} diff --git a/resources/qml/TertiaryButton.qml b/resources/qml/TertiaryButton.qml index eb714c22f6..76684b6ef2 100644 --- a/resources/qml/TertiaryButton.qml +++ b/resources/qml/TertiaryButton.qml @@ -1,4 +1,4 @@ -// Copyright (c) 2020 Ultimaker B.V. +// Copyright (c) 2021 Ultimaker B.V. // Cura is released under the terms of the LGPLv3 or higher. import QtQuick 2.2 @@ -9,8 +9,6 @@ import Cura 1.1 as Cura Cura.ActionButton { - shadowEnabled: true - shadowColor: enabled ? UM.Theme.getColor("secondary_button_shadow"): UM.Theme.getColor("action_button_disabled_shadow") color: "transparent" textColor: UM.Theme.getColor("text_link") outlineColor: "transparent" diff --git a/resources/qml/Toolbar.qml b/resources/qml/Toolbar.qml index 89d64b06ad..c948bb8242 100644 --- a/resources/qml/Toolbar.qml +++ b/resources/qml/Toolbar.qml @@ -44,7 +44,6 @@ Item anchors.top: parent.top anchors.right: parent.right - spacing: UM.Theme.getSize("default_lining").height Repeater { @@ -69,7 +68,8 @@ Item source: UM.Theme.getIcon(model.icon) != "" ? UM.Theme.getIcon(model.icon) : "file:///" + model.location + "/" + model.icon color: UM.Theme.getColor("icon") - sourceSize: UM.Theme.getSize("button_icon") + sourceSize.height: Math.round(UM.Theme.getSize("button").height / 2) + sourceSize.width: Math.round(UM.Theme.getSize("button").width / 2) } onCheckedChanged: @@ -131,7 +131,6 @@ Item anchors.topMargin: UM.Theme.getSize("default_margin").height anchors.top: toolButtons.bottom anchors.right: parent.right - spacing: UM.Theme.getSize("default_lining").height Repeater { diff --git a/resources/qml/ToolbarButton.qml b/resources/qml/ToolbarButton.qml index b3f84bba1d..206ab23dc4 100644 --- a/resources/qml/ToolbarButton.qml +++ b/resources/qml/ToolbarButton.qml @@ -25,22 +25,7 @@ Button { implicitWidth: UM.Theme.getSize("button").width implicitHeight: UM.Theme.getSize("button").height - color: - { - if (base.checked && base.hovered) - { - return UM.Theme.getColor("toolbar_button_active_hover") - } - else if (base.checked) - { - return UM.Theme.getColor("toolbar_button_active") - } - else if(base.hovered) - { - return UM.Theme.getColor("toolbar_button_hover") - } - return UM.Theme.getColor("toolbar_background") - } + color: UM.Theme.getColor("toolbar_background") radius: UM.Theme.getSize("default_radius").width Rectangle @@ -84,16 +69,35 @@ Button color: parent.color } } - - contentItem: Item + contentItem: Rectangle { opacity: parent.enabled ? 1.0 : 0.2 + implicitWidth: Math.round(UM.Theme.getSize("button").width * 0.75) + implicitHeight: Math.round(UM.Theme.getSize("button").height * 0.75) + radius: Math.round(width * 0.5) + + color: + { + if (base.checked && base.hovered) + { + return UM.Theme.getColor("toolbar_button_active_hover") + } + else if (base.checked) + { + return UM.Theme.getColor("toolbar_button_active") + } + else if(base.hovered) + { + return UM.Theme.getColor("toolbar_button_hover") + } + return UM.Theme.getColor("toolbar_background") + } Loader { id: contentItemLoader anchors.centerIn: parent - width: UM.Theme.getSize("button_icon").width - height: UM.Theme.getSize("button_icon").height + width: Math.round(UM.Theme.getSize("button").width / 2) + height: Math.round(UM.Theme.getSize("button").height / 2) } } diff --git a/resources/qml/ViewOrientationButton.qml b/resources/qml/ViewOrientationButton.qml index 5d72de9a8d..7040447b29 100644 --- a/resources/qml/ViewOrientationButton.qml +++ b/resources/qml/ViewOrientationButton.qml @@ -11,5 +11,4 @@ UM.SimpleButton height: UM.Theme.getSize("small_button").height hoverColor: UM.Theme.getColor("small_button_text_hover") color: UM.Theme.getColor("small_button_text") - iconMargin: UM.Theme.getSize("thick_lining").width } \ No newline at end of file diff --git a/resources/qml/ViewOrientationControls.qml b/resources/qml/ViewOrientationControls.qml index 97f2bb9400..fc0f20fa77 100644 --- a/resources/qml/ViewOrientationControls.qml +++ b/resources/qml/ViewOrientationControls.qml @@ -18,7 +18,7 @@ Row ViewOrientationButton { - iconSource: UM.Theme.getIcon("view_3d") + iconSource: UM.Theme.getIcon("View3D") onClicked: Cura.Actions.view3DCamera.trigger() UM.TooltipArea @@ -31,7 +31,7 @@ Row ViewOrientationButton { - iconSource: UM.Theme.getIcon("view_front") + iconSource: UM.Theme.getIcon("ViewFront") onClicked: Cura.Actions.viewFrontCamera.trigger() UM.TooltipArea @@ -44,7 +44,7 @@ Row ViewOrientationButton { - iconSource: UM.Theme.getIcon("view_top") + iconSource: UM.Theme.getIcon("ViewTop") onClicked: Cura.Actions.viewTopCamera.trigger() UM.TooltipArea @@ -57,7 +57,7 @@ Row ViewOrientationButton { - iconSource: UM.Theme.getIcon("view_left") + iconSource: UM.Theme.getIcon("ViewLeft") onClicked: Cura.Actions.viewLeftSideCamera.trigger() UM.TooltipArea @@ -70,7 +70,7 @@ Row ViewOrientationButton { - iconSource: UM.Theme.getIcon("view_right") + iconSource: UM.Theme.getIcon("ViewRight") onClicked: Cura.Actions.viewRightSideCamera.trigger() UM.TooltipArea diff --git a/resources/qml/WelcomePages/AddLocalPrinterScrollView.qml b/resources/qml/WelcomePages/AddLocalPrinterScrollView.qml index 68ee482b5c..fb809426f4 100644 --- a/resources/qml/WelcomePages/AddLocalPrinterScrollView.qml +++ b/resources/qml/WelcomePages/AddLocalPrinterScrollView.qml @@ -143,7 +143,7 @@ Item sourceSize.width: width sourceSize.height: height color: UM.Theme.getColor("text") - source: base.currentSection == section ? UM.Theme.getIcon("arrow_bottom") : UM.Theme.getIcon("arrow_right") + source: base.currentSection == section ? UM.Theme.getIcon("ChevronSingleDown") : UM.Theme.getIcon("ChevronSingleRight") } Label diff --git a/resources/qml/WelcomePages/AddNetworkOrLocalPrinterContent.qml b/resources/qml/WelcomePages/AddNetworkOrLocalPrinterContent.qml index 0ea20f052e..edf6fe5974 100644 --- a/resources/qml/WelcomePages/AddNetworkOrLocalPrinterContent.qml +++ b/resources/qml/WelcomePages/AddNetworkOrLocalPrinterContent.qml @@ -54,7 +54,7 @@ Item { id: networkPrinterScrollView - maxItemCountAtOnce: 10 // show at max 10 items at once, otherwise you need to scroll. + maxItemCountAtOnce: 9 // show at max 9 items at once, otherwise you need to scroll. onRefreshButtonClicked: { diff --git a/resources/qml/WelcomePages/AddNetworkPrinterScrollView.qml b/resources/qml/WelcomePages/AddNetworkPrinterScrollView.qml index 9d79c421bd..58cadbec37 100644 --- a/resources/qml/WelcomePages/AddNetworkPrinterScrollView.qml +++ b/resources/qml/WelcomePages/AddNetworkPrinterScrollView.qml @@ -1,4 +1,4 @@ -// Copyright (c) 2019 Ultimaker B.V. +// Copyright (c) 2021 Ultimaker B.V. // Cura is released under the terms of the LGPLv3 or higher. import QtQuick 2.10 @@ -214,22 +214,22 @@ Item id: troubleshootingButton anchors.right: parent.right - anchors.rightMargin: UM.Theme.getSize("default_margin").width + anchors.rightMargin: UM.Theme.getSize("thin_margin").width anchors.verticalCenter: parent.verticalCenter height: troubleshootingLinkIcon.height - width: troubleshootingLinkIcon.width + troubleshootingLabel.width + UM.Theme.getSize("default_margin").width + width: troubleshootingLinkIcon.width + troubleshootingLabel.width + UM.Theme.getSize("thin_margin").width UM.RecolorImage { id: troubleshootingLinkIcon anchors.right: troubleshootingLabel.left - anchors.rightMargin: UM.Theme.getSize("default_margin").width + anchors.rightMargin: UM.Theme.getSize("thin_margin").width anchors.verticalCenter: parent.verticalCenter height: troubleshootingLabel.height width: height sourceSize.height: width color: UM.Theme.getColor("text_link") - source: UM.Theme.getIcon("external_link") + source: UM.Theme.getIcon("LinkExternal") } Label diff --git a/resources/qml/WelcomePages/CloudContent.qml b/resources/qml/WelcomePages/CloudContent.qml index 692ad12a29..26e3a2f87c 100644 --- a/resources/qml/WelcomePages/CloudContent.qml +++ b/resources/qml/WelcomePages/CloudContent.qml @@ -112,7 +112,7 @@ Item anchors.horizontalCenter: parent.horizontalCenter fillMode: Image.PreserveAspectFit width: UM.Theme.getSize("welcome_wizard_cloud_content_image").width - source: UM.Theme.getIcon("package") + source: UM.Theme.getIcon("Plugin") sourceSize.width: width sourceSize.height: height } @@ -142,7 +142,7 @@ Item anchors.horizontalCenter: parent.horizontalCenter fillMode: Image.PreserveAspectFit width: UM.Theme.getSize("welcome_wizard_cloud_content_image").width - source: UM.Theme.getIcon("material_spool") + source: UM.Theme.getIcon("Spool") sourceSize.width: width sourceSize.height: height } @@ -172,7 +172,7 @@ Item anchors.horizontalCenter: communityColumn.horizontalCenter fillMode: Image.PreserveAspectFit width: UM.Theme.getSize("welcome_wizard_cloud_content_image").width - source: UM.Theme.getIcon("group") + source: UM.Theme.getIcon("PrinterTriple", "medium") sourceSize.width: width sourceSize.height: height } diff --git a/resources/qml/WelcomePages/DropDownHeader.qml b/resources/qml/WelcomePages/DropDownHeader.qml index 88da32c879..cb41ca808b 100644 --- a/resources/qml/WelcomePages/DropDownHeader.qml +++ b/resources/qml/WelcomePages/DropDownHeader.qml @@ -27,7 +27,7 @@ Cura.RoundedRectangle cornerSide: contentShown ? Cura.RoundedRectangle.Direction.Up : Cura.RoundedRectangle.Direction.All property string title: "" - property url rightIconSource: UM.Theme.getIcon("arrow_bottom") + property url rightIconSource: UM.Theme.getIcon("ChevronSingleDown") // If the tab is under hovering state property bool hovered: false diff --git a/resources/qml/WelcomePages/DropDownWidget.qml b/resources/qml/WelcomePages/DropDownWidget.qml index 7ec6860c89..b129673905 100644 --- a/resources/qml/WelcomePages/DropDownWidget.qml +++ b/resources/qml/WelcomePages/DropDownWidget.qml @@ -49,7 +49,7 @@ Item anchors.left: parent.left anchors.right: parent.right height: UM.Theme.getSize("expandable_component_content_header").height - rightIconSource: contentShown ? UM.Theme.getIcon("arrow_bottom") : UM.Theme.getIcon("arrow_left") + rightIconSource: contentShown ? UM.Theme.getIcon("ChevronSingleDown") : UM.Theme.getIcon("ChevronSingleLeft") contentShown: base.contentShown } diff --git a/resources/qml/Widgets/CheckBox.qml b/resources/qml/Widgets/CheckBox.qml index f79dc1620e..295283d76e 100644 --- a/resources/qml/Widgets/CheckBox.qml +++ b/resources/qml/Widgets/CheckBox.qml @@ -58,7 +58,7 @@ CheckBox height: Math.round(parent.height / 2.5) sourceSize.height: width color: !enabled ? UM.Theme.getColor("setting_control_disabled_text") : UM.Theme.getColor("setting_control_text") - source: UM.Theme.getIcon("check") + source: UM.Theme.getIcon("Check") opacity: control.checked ? 1 : 0 Behavior on opacity { NumberAnimation { duration: 100; } } } diff --git a/resources/qml/Widgets/ComboBox.qml b/resources/qml/Widgets/ComboBox.qml index 7eb366f0a3..f0ee3bdc00 100644 --- a/resources/qml/Widgets/ComboBox.qml +++ b/resources/qml/Widgets/ComboBox.qml @@ -62,7 +62,7 @@ ComboBox x: control.width - width - control.rightPadding y: control.topPadding + Math.round((control.availableHeight - height) / 2) - source: UM.Theme.getIcon("arrow_bottom") + source: UM.Theme.getIcon("ChevronSingleDown") width: UM.Theme.getSize("standard_arrow").width height: UM.Theme.getSize("standard_arrow").height sourceSize.width: width + 5 * screenScaleFactor diff --git a/resources/qml/Widgets/TextField.qml b/resources/qml/Widgets/TextField.qml index 28074d4415..c126c8a6e0 100644 --- a/resources/qml/Widgets/TextField.qml +++ b/resources/qml/Widgets/TextField.qml @@ -1,4 +1,4 @@ -// Copyright (c) 2019 Ultimaker B.V. +// Copyright (c) 2021 Ultimaker B.V. // Cura is released under the terms of the LGPLv3 or higher. import QtQuick 2.10 @@ -15,6 +15,8 @@ TextField { id: textField + property alias leftIcon: iconLeft.source + UM.I18nCatalog { id: catalog; name: "cura" } hoverEnabled: true @@ -22,6 +24,7 @@ TextField font: UM.Theme.getFont("default") color: UM.Theme.getColor("text") renderType: Text.NativeRendering + leftPadding: iconLeft.visible ? iconLeft.width + UM.Theme.getSize("default_margin").width * 2 : UM.Theme.getSize("thin_margin").width states: [ State @@ -52,7 +55,6 @@ TextField color: UM.Theme.getColor("main_background") - anchors.margins: Math.round(UM.Theme.getSize("default_lining").width) radius: UM.Theme.getSize("setting_control_radius").width border.color: @@ -67,5 +69,23 @@ TextField } return UM.Theme.getColor("setting_control_border") } + + //Optional icon added on the left hand side. + UM.RecolorImage + { + id: iconLeft + + anchors + { + verticalCenter: parent.verticalCenter + left: parent.left + leftMargin: UM.Theme.getSize("default_margin").width + } + + visible: source != "" + height: UM.Theme.getSize("small_button_icon").height + width: visible ? height : 0 + color: textField.color + } } } diff --git a/resources/quality/strateo3d/HT0.4/s3d_ht0.4_ABS-X_A.inst.cfg b/resources/quality/strateo3d/HT0.4/s3d_ht0.4_ABS-X_A.inst.cfg new file mode 100644 index 0000000000..76ec06262a --- /dev/null +++ b/resources/quality/strateo3d/HT0.4/s3d_ht0.4_ABS-X_A.inst.cfg @@ -0,0 +1,47 @@ +[general] +version = 4 +name = A +definition = strateo3d + +[metadata] +setting_version = 17 +type = quality +quality_type = a +weight = 1 +material = emotiontech_absx +variant = High temp 0.4 + +[values] +layer_height_0 = =round(0.5*machine_nozzle_size, 2) +line_width = =machine_nozzle_size/machine_nozzle_size*0.4 +wall_line_width = =machine_nozzle_size/machine_nozzle_size*0.35 +wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.3 +wall_0_wipe_dist = =machine_nozzle_size/2 +speed_print = 50 +speed_wall = =math.ceil(speed_print * 35/50) +speed_wall_0 = =math.ceil(speed_wall * 30/35) +speed_topbottom = =math.ceil(speed_print * 35/50) +speed_layer_0 = =math.ceil(speed_print * 20/50) +speed_slowdown_layers = 2 +cool_fan_enabled = True +cool_fan_speed = 35 +cool_fan_speed_max = 100 +cool_min_layer_time_fan_speed_max = 20 +cool_min_layer_time = 11 +cool_fan_full_at_height = =layer_height_0 + 19 * layer_height +cool_min_speed = 10 +support_angle = 65 +material_print_temperature = =default_material_print_temperature + 3 +material_print_temperature_layer_0 = =default_material_print_temperature +material_flow = 100 +retraction_extra_prime_amount = 0.1 +retraction_min_travel = =3*line_width +retraction_hop_only_when_collides = True +skin_overlap = 10 +support_z_distance = =layer_height +support_bottom_distance = =support_z_distance +support_xy_distance = =line_width * 1.7 +support_xy_distance_overhang = =wall_line_width_0 +support_offset = 1 +support_interface_density = 100 +prime_tower_enable = True diff --git a/resources/quality/strateo3d/HT0.4/s3d_ht0.4_ABS-X_B.inst.cfg b/resources/quality/strateo3d/HT0.4/s3d_ht0.4_ABS-X_B.inst.cfg new file mode 100644 index 0000000000..f3f24b3469 --- /dev/null +++ b/resources/quality/strateo3d/HT0.4/s3d_ht0.4_ABS-X_B.inst.cfg @@ -0,0 +1,47 @@ +[general] +version = 4 +name = B +definition = strateo3d + +[metadata] +setting_version = 17 +type = quality +quality_type = b +weight = 0 +material = emotiontech_absx +variant = High temp 0.4 + +[values] +layer_height_0 = =round(0.67*machine_nozzle_size, 2) +line_width = =machine_nozzle_size/machine_nozzle_size*0.4 +wall_line_width = =machine_nozzle_size/machine_nozzle_size*0.35 +wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.3 +wall_0_wipe_dist = =machine_nozzle_size/2 +speed_print = 55 +speed_wall = =math.ceil(speed_print * 37/55) +speed_wall_0 = =math.ceil(speed_wall * 33/37) +speed_topbottom = =math.ceil(speed_print * 37/55) +speed_layer_0 = =math.ceil(speed_print * 25/55) +speed_slowdown_layers = 2 +cool_fan_enabled = True +cool_fan_speed = 35 +cool_fan_speed_max = 100 +cool_min_layer_time_fan_speed_max = 20 +cool_min_layer_time = 11 +cool_fan_full_at_height = =layer_height_0 + 14 * layer_height +cool_min_speed = 10 +support_angle = 60 +material_print_temperature = =default_material_print_temperature + 5 +material_print_temperature_layer_0 = =default_material_print_temperature + 3 +material_flow = 96 +retraction_extra_prime_amount = 0.1 +retraction_min_travel = =3*line_width +retraction_hop_only_when_collides = True +skin_overlap = 15 +support_z_distance = =layer_height +support_bottom_distance = =support_z_distance +support_xy_distance = =line_width * 1.7 +support_xy_distance_overhang = =wall_line_width_0 +support_offset = 1 +support_interface_density = 100 +prime_tower_enable = True diff --git a/resources/quality/strateo3d/HT0.4/s3d_ht0.4_ABS-X_C.inst.cfg b/resources/quality/strateo3d/HT0.4/s3d_ht0.4_ABS-X_C.inst.cfg new file mode 100644 index 0000000000..1a81a07607 --- /dev/null +++ b/resources/quality/strateo3d/HT0.4/s3d_ht0.4_ABS-X_C.inst.cfg @@ -0,0 +1,47 @@ +[general] +version = 4 +name = C +definition = strateo3d + +[metadata] +setting_version = 17 +type = quality +quality_type = c +weight = -1 +material = emotiontech_absx +variant = High temp 0.4 + +[values] +layer_height_0 = =round(0.75*machine_nozzle_size, 2) +line_width = =machine_nozzle_size/machine_nozzle_size*0.4 +wall_line_width = =machine_nozzle_size/machine_nozzle_size*0.35 +wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.3 +wall_0_wipe_dist = =machine_nozzle_size/2 +speed_print = 60 +speed_wall = =math.ceil(speed_print * 40/60) +speed_wall_0 = =math.ceil(speed_wall * 35/40) +speed_topbottom = =math.ceil(speed_print * 40/60) +speed_layer_0 = =math.ceil(speed_print * 30/60) +speed_slowdown_layers = 2 +cool_fan_enabled = True +cool_fan_speed = 35 +cool_fan_speed_max = 100 +cool_min_layer_time_fan_speed_max = 20 +cool_min_layer_time = 11 +cool_fan_full_at_height = =layer_height_0 + 9 * layer_height +cool_min_speed = 10 +support_angle = 55 +material_print_temperature = =default_material_print_temperature + 10 +material_print_temperature_layer_0 = =default_material_print_temperature + 5 +material_flow = 91 +retraction_extra_prime_amount = 0.1 +retraction_min_travel = =3*line_width +retraction_hop_only_when_collides = True +skin_overlap = 20 +support_z_distance = =layer_height +support_bottom_distance = =support_z_distance +support_xy_distance = =line_width * 1.7 +support_xy_distance_overhang = =wall_line_width_0 +support_offset = 1 +support_interface_density = 100 +prime_tower_enable = True diff --git a/resources/quality/strateo3d/HT0.4/s3d_ht0.4_ABS_A.inst.cfg b/resources/quality/strateo3d/HT0.4/s3d_ht0.4_ABS_A.inst.cfg new file mode 100644 index 0000000000..ccb80ab2f1 --- /dev/null +++ b/resources/quality/strateo3d/HT0.4/s3d_ht0.4_ABS_A.inst.cfg @@ -0,0 +1,47 @@ +[general] +version = 4 +name = A +definition = strateo3d + +[metadata] +setting_version = 17 +type = quality +quality_type = a +weight = 1 +material = emotiontech_abs +variant = High temp 0.4 + +[values] +layer_height_0 = =round(0.5*machine_nozzle_size, 2) +line_width = =machine_nozzle_size/machine_nozzle_size*0.4 +wall_line_width = =machine_nozzle_size/machine_nozzle_size*0.35 +wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.3 +wall_0_wipe_dist = =machine_nozzle_size/2 +speed_print = 50 +speed_wall = =math.ceil(speed_print * 35/50) +speed_wall_0 = =math.ceil(speed_wall * 30/35) +speed_topbottom = =math.ceil(speed_print * 35/50) +speed_layer_0 = =math.ceil(speed_print * 20/50) +speed_slowdown_layers = 2 +cool_fan_enabled = True +cool_fan_speed = 35 +cool_fan_speed_max = 100 +cool_min_layer_time_fan_speed_max = 20 +cool_min_layer_time = 11 +cool_fan_full_at_height = =layer_height_0 + 19 * layer_height +cool_min_speed = 10 +support_angle = 65 +material_print_temperature = =default_material_print_temperature + 1 +material_print_temperature_layer_0 = =default_material_print_temperature +material_flow = 100 +retraction_extra_prime_amount = 0.1 +retraction_min_travel = =3*line_width +retraction_hop_only_when_collides = True +skin_overlap = 10 +support_z_distance = =layer_height +support_bottom_distance = =support_z_distance +support_xy_distance = =line_width * 1.7 +support_xy_distance_overhang = =wall_line_width_0 +support_offset = 1 +support_interface_density = 100 +prime_tower_enable = True diff --git a/resources/quality/strateo3d/HT0.4/s3d_ht0.4_ABS_B.inst.cfg b/resources/quality/strateo3d/HT0.4/s3d_ht0.4_ABS_B.inst.cfg new file mode 100644 index 0000000000..25f6aef09a --- /dev/null +++ b/resources/quality/strateo3d/HT0.4/s3d_ht0.4_ABS_B.inst.cfg @@ -0,0 +1,47 @@ +[general] +version = 4 +name = B +definition = strateo3d + +[metadata] +setting_version = 17 +type = quality +quality_type = b +weight = 0 +material = emotiontech_abs +variant = High temp 0.4 + +[values] +layer_height_0 = =round(0.67*machine_nozzle_size, 2) +line_width = =machine_nozzle_size/machine_nozzle_size*0.4 +wall_line_width = =machine_nozzle_size/machine_nozzle_size*0.35 +wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.3 +wall_0_wipe_dist = =machine_nozzle_size/2 +speed_print = 55 +speed_wall = =math.ceil(speed_print * 37/55) +speed_wall_0 = =math.ceil(speed_wall * 33/37) +speed_topbottom = =math.ceil(speed_print * 37/55) +speed_layer_0 = =math.ceil(speed_print * 25/55) +speed_slowdown_layers = 2 +cool_fan_enabled = True +cool_fan_speed = 35 +cool_fan_speed_max = 100 +cool_min_layer_time_fan_speed_max = 20 +cool_min_layer_time = 11 +cool_fan_full_at_height = =layer_height_0 + 14 * layer_height +cool_min_speed = 10 +support_angle = 60 +material_print_temperature = =default_material_print_temperature + 3 +material_print_temperature_layer_0 = =default_material_print_temperature + 1 +material_flow = 96 +retraction_extra_prime_amount = 0.1 +retraction_min_travel = =3*line_width +retraction_hop_only_when_collides = True +skin_overlap = 15 +support_z_distance = =layer_height +support_bottom_distance = =support_z_distance +support_xy_distance = =line_width * 1.7 +support_xy_distance_overhang = =wall_line_width_0 +support_offset = 1 +support_interface_density = 100 +prime_tower_enable = True diff --git a/resources/quality/strateo3d/HT0.4/s3d_ht0.4_ABS_C.inst.cfg b/resources/quality/strateo3d/HT0.4/s3d_ht0.4_ABS_C.inst.cfg new file mode 100644 index 0000000000..3413ce30aa --- /dev/null +++ b/resources/quality/strateo3d/HT0.4/s3d_ht0.4_ABS_C.inst.cfg @@ -0,0 +1,47 @@ +[general] +version = 4 +name = C +definition = strateo3d + +[metadata] +setting_version = 17 +type = quality +quality_type = c +weight = -1 +material = emotiontech_abs +variant = High temp 0.4 + +[values] +layer_height_0 = =round(0.75*machine_nozzle_size, 2) +line_width = =machine_nozzle_size/machine_nozzle_size*0.4 +wall_line_width = =machine_nozzle_size/machine_nozzle_size*0.35 +wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.3 +wall_0_wipe_dist = =machine_nozzle_size/2 +speed_print = 60 +speed_wall = =math.ceil(speed_print * 40/60) +speed_wall_0 = =math.ceil(speed_wall * 35/40) +speed_topbottom = =math.ceil(speed_print * 40/60) +speed_layer_0 = =math.ceil(speed_print * 30/60) +speed_slowdown_layers = 2 +cool_fan_enabled = True +cool_fan_speed = 35 +cool_fan_speed_max = 100 +cool_min_layer_time_fan_speed_max = 20 +cool_min_layer_time = 11 +cool_fan_full_at_height = =layer_height_0 + 9 * layer_height +cool_min_speed = 10 +support_angle = 55 +material_print_temperature = =default_material_print_temperature + 5 +material_print_temperature_layer_0 = =default_material_print_temperature +3 +material_flow = 91 +retraction_extra_prime_amount = 0.1 +retraction_min_travel = =3*line_width +retraction_hop_only_when_collides = True +skin_overlap = 20 +support_z_distance = =layer_height +support_bottom_distance = =support_z_distance +support_xy_distance = =line_width * 1.7 +support_xy_distance_overhang = =wall_line_width_0 +support_offset = 1 +support_interface_density = 100 +prime_tower_enable = True diff --git a/resources/quality/strateo3d/HT0.4/s3d_ht0.4_ACETATE_A.inst.cfg b/resources/quality/strateo3d/HT0.4/s3d_ht0.4_ACETATE_A.inst.cfg new file mode 100644 index 0000000000..739ae5bf06 --- /dev/null +++ b/resources/quality/strateo3d/HT0.4/s3d_ht0.4_ACETATE_A.inst.cfg @@ -0,0 +1,47 @@ +[general] +version = 4 +name = A +definition = strateo3d + +[metadata] +setting_version = 17 +type = quality +quality_type = a +weight = 1 +material = emotiontech_acetate +variant = High temp 0.4 + +[values] +layer_height_0 = =round(0.5*machine_nozzle_size, 2) +line_width = =machine_nozzle_size/machine_nozzle_size*0.4 +wall_line_width = =machine_nozzle_size/machine_nozzle_size*0.35 +wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.4 +wall_0_wipe_dist = =machine_nozzle_size/2 +speed_print = 50 +speed_wall = =math.ceil(speed_print * 37/50) +speed_wall_0 = =math.ceil(speed_wall * 30/37) +speed_topbottom = =math.ceil(speed_print * 33/50) +speed_layer_0 = =math.ceil(speed_print * 25/50) +speed_slowdown_layers = 2 +cool_fan_enabled = True +cool_fan_speed = 35 +cool_fan_speed_max = 100 +cool_min_layer_time_fan_speed_max = 20 +cool_min_layer_time = 11 +cool_fan_full_at_height = =layer_height_0 + 10 * layer_height +cool_min_speed = 10 +support_angle = 60 +material_print_temperature = =default_material_print_temperature +material_print_temperature_layer_0 = =default_material_print_temperature +material_flow = 98 +retraction_extra_prime_amount = 0.1 +retraction_min_travel = =3*line_width +retraction_hop_only_when_collides = True +skin_overlap = 10 +support_z_distance = =layer_height +support_bottom_distance = =support_z_distance +support_xy_distance = =line_width * 1.7 +support_xy_distance_overhang = =wall_line_width_0 +support_offset = 1 +support_interface_density = 100 +prime_tower_enable = True diff --git a/resources/quality/strateo3d/HT0.4/s3d_ht0.4_ACETATE_B.inst.cfg b/resources/quality/strateo3d/HT0.4/s3d_ht0.4_ACETATE_B.inst.cfg new file mode 100644 index 0000000000..7787def8bb --- /dev/null +++ b/resources/quality/strateo3d/HT0.4/s3d_ht0.4_ACETATE_B.inst.cfg @@ -0,0 +1,47 @@ +[general] +version = 4 +name = B +definition = strateo3d + +[metadata] +setting_version = 17 +type = quality +quality_type = b +weight = 0 +material = emotiontech_acetate +variant = High temp 0.4 + +[values] +layer_height_0 = =round(0.67*machine_nozzle_size, 2) +line_width = =machine_nozzle_size/machine_nozzle_size*0.4 +wall_line_width = =machine_nozzle_size/machine_nozzle_size*0.35 +wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.4 +wall_0_wipe_dist = =machine_nozzle_size/2 +speed_print = 55 +speed_wall = =math.ceil(speed_print * 40/55) +speed_wall_0 = =math.ceil(speed_wall * 30/40) +speed_topbottom = =math.ceil(speed_print * 37/55) +speed_layer_0 = =math.ceil(speed_print * 27/55) +speed_slowdown_layers = 2 +cool_fan_enabled = True +cool_fan_speed = 35 +cool_fan_speed_max = 100 +cool_min_layer_time_fan_speed_max = 20 +cool_min_layer_time = 11 +cool_fan_full_at_height = =layer_height_0 + 7 * layer_height +cool_min_speed = 10 +support_angle = 55 +material_print_temperature = =default_material_print_temperature + 2 +material_print_temperature_layer_0 = =default_material_print_temperature + 0 +material_flow = 95 +retraction_extra_prime_amount = 0.1 +retraction_min_travel = =3*line_width +retraction_hop_only_when_collides = True +skin_overlap = 10 +support_z_distance = =layer_height +support_bottom_distance = =support_z_distance +support_xy_distance = =line_width * 1.7 +support_xy_distance_overhang = =wall_line_width_0 +support_offset = 1 +support_interface_density = 100 +prime_tower_enable = True diff --git a/resources/quality/strateo3d/HT0.4/s3d_ht0.4_ACETATE_C.inst.cfg b/resources/quality/strateo3d/HT0.4/s3d_ht0.4_ACETATE_C.inst.cfg new file mode 100644 index 0000000000..f670bb6eb1 --- /dev/null +++ b/resources/quality/strateo3d/HT0.4/s3d_ht0.4_ACETATE_C.inst.cfg @@ -0,0 +1,47 @@ +[general] +version = 4 +name = C +definition = strateo3d + +[metadata] +setting_version = 17 +type = quality +quality_type = c +weight = -1 +material = emotiontech_acetate +variant = High temp 0.4 + +[values] +layer_height_0 = =round(0.75*machine_nozzle_size, 2) +line_width = =machine_nozzle_size/machine_nozzle_size*0.4 +wall_line_width = =machine_nozzle_size/machine_nozzle_size*0.35 +wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.4 +wall_0_wipe_dist = =machine_nozzle_size/2 +speed_print = 60 +speed_wall = =math.ceil(speed_print * 45/60) +speed_wall_0 = =math.ceil(speed_wall * 33/45) +speed_topbottom = =math.ceil(speed_print * 40/60) +speed_layer_0 = =math.ceil(speed_print * 30/60) +speed_slowdown_layers = 2 +cool_fan_enabled = True +cool_fan_speed = 35 +cool_fan_speed_max = 100 +cool_min_layer_time_fan_speed_max = 20 +cool_min_layer_time = 11 +cool_fan_full_at_height = =layer_height_0 + 5 * layer_height +cool_min_speed = 10 +support_angle = 50 +material_print_temperature = =default_material_print_temperature + 5 +material_print_temperature_layer_0 = =default_material_print_temperature + 3 +material_flow = 93 +retraction_extra_prime_amount = 0.1 +retraction_min_travel = =3*line_width +retraction_hop_only_when_collides = True +skin_overlap = 10 +support_z_distance = =layer_height +support_bottom_distance = =support_z_distance +support_xy_distance = =line_width * 1.7 +support_xy_distance_overhang = =wall_line_width_0 +support_offset = 1 +support_interface_density = 100 +prime_tower_enable = True diff --git a/resources/quality/strateo3d/HT0.4/s3d_ht0.4_ASA-X_A.inst.cfg b/resources/quality/strateo3d/HT0.4/s3d_ht0.4_ASA-X_A.inst.cfg new file mode 100644 index 0000000000..cfe30caf9f --- /dev/null +++ b/resources/quality/strateo3d/HT0.4/s3d_ht0.4_ASA-X_A.inst.cfg @@ -0,0 +1,47 @@ +[general] +version = 4 +name = A +definition = strateo3d + +[metadata] +setting_version = 17 +type = quality +quality_type = a +weight = 1 +material = emotiontech_asax +variant = High temp 0.4 + +[values] +layer_height_0 = =round(0.5*machine_nozzle_size, 2) +line_width = =machine_nozzle_size/machine_nozzle_size*0.4 +wall_line_width = =machine_nozzle_size/machine_nozzle_size*0.35 +wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.3 +wall_0_wipe_dist = =machine_nozzle_size/2 +speed_print = 50 +speed_wall = =math.ceil(speed_print * 35/50) +speed_wall_0 = =math.ceil(speed_wall * 30/35) +speed_topbottom = =math.ceil(speed_print * 35/50) +speed_layer_0 = =math.ceil(speed_print * 20/50) +speed_slowdown_layers = 2 +cool_fan_enabled = True +cool_fan_speed = 40 +cool_fan_speed_max = 75 +cool_min_layer_time_fan_speed_max = 20 +cool_min_layer_time = 11 +cool_fan_full_at_height = =layer_height_0 + 19 * layer_height +cool_min_speed = 10 +support_angle = 65 +material_print_temperature = =default_material_print_temperature + 1 +material_print_temperature_layer_0 = =default_material_print_temperature + 3 +material_flow = 100 +retraction_extra_prime_amount = 0.1 +retraction_min_travel = =3*line_width +retraction_hop_only_when_collides = True +skin_overlap = 10 +support_z_distance = =layer_height +support_bottom_distance = =support_z_distance +support_xy_distance = =line_width * 1.5 +support_xy_distance_overhang = =wall_line_width_0 +support_offset = 1 +support_interface_density = 100 +prime_tower_enable = True diff --git a/resources/quality/strateo3d/HT0.4/s3d_ht0.4_ASA-X_B.inst.cfg b/resources/quality/strateo3d/HT0.4/s3d_ht0.4_ASA-X_B.inst.cfg new file mode 100644 index 0000000000..2d113281a8 --- /dev/null +++ b/resources/quality/strateo3d/HT0.4/s3d_ht0.4_ASA-X_B.inst.cfg @@ -0,0 +1,47 @@ +[general] +version = 4 +name = B +definition = strateo3d + +[metadata] +setting_version = 17 +type = quality +quality_type = b +weight = 0 +material = emotiontech_asax +variant = High temp 0.4 + +[values] +layer_height_0 = =round(0.67*machine_nozzle_size, 2) +line_width = =machine_nozzle_size/machine_nozzle_size*0.4 +wall_line_width = =machine_nozzle_size/machine_nozzle_size*0.35 +wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.3 +wall_0_wipe_dist = =machine_nozzle_size/2 +speed_print = 55 +speed_wall = =math.ceil(speed_print * 37/55) +speed_wall_0 = =math.ceil(speed_wall * 33/37) +speed_topbottom = =math.ceil(speed_print * 37/55) +speed_layer_0 = =math.ceil(speed_print * 25/55) +speed_slowdown_layers = 2 +cool_fan_enabled = True +cool_fan_speed = 40 +cool_fan_speed_max = 75 +cool_min_layer_time_fan_speed_max = 20 +cool_min_layer_time = 11 +cool_fan_full_at_height = =layer_height_0 + 14 * layer_height +cool_min_speed = 10 +support_angle = 60 +material_print_temperature = =default_material_print_temperature + 3 +material_print_temperature_layer_0 = =default_material_print_temperature + 5 +material_flow = 96 +retraction_extra_prime_amount = 0.1 +retraction_min_travel = =3*line_width +retraction_hop_only_when_collides = True +skin_overlap = 15 +support_z_distance = =layer_height +support_bottom_distance = =support_z_distance +support_xy_distance = =line_width * 1.5 +support_xy_distance_overhang = =wall_line_width_0 +support_offset = 1 +support_interface_density = 100 +prime_tower_enable = True diff --git a/resources/quality/strateo3d/HT0.4/s3d_ht0.4_ASA-X_C.inst.cfg b/resources/quality/strateo3d/HT0.4/s3d_ht0.4_ASA-X_C.inst.cfg new file mode 100644 index 0000000000..7dc65e54da --- /dev/null +++ b/resources/quality/strateo3d/HT0.4/s3d_ht0.4_ASA-X_C.inst.cfg @@ -0,0 +1,47 @@ +[general] +version = 4 +name = C +definition = strateo3d + +[metadata] +setting_version = 17 +type = quality +quality_type = c +weight = -1 +material = emotiontech_asax +variant = High temp 0.4 + +[values] +layer_height_0 = =round(0.75*machine_nozzle_size, 2) +line_width = =machine_nozzle_size/machine_nozzle_size*0.4 +wall_line_width = =machine_nozzle_size/machine_nozzle_size*0.35 +wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.3 +wall_0_wipe_dist = =machine_nozzle_size/2 +speed_print = 60 +speed_wall = =math.ceil(speed_print * 40/60) +speed_wall_0 = =math.ceil(speed_wall * 35/40) +speed_topbottom = =math.ceil(speed_print * 40/60) +speed_layer_0 = =math.ceil(speed_print * 30/60) +speed_slowdown_layers = 2 +cool_fan_enabled = True +cool_fan_speed = 40 +cool_fan_speed_max = 75 +cool_min_layer_time_fan_speed_max = 20 +cool_min_layer_time = 11 +cool_fan_full_at_height = =layer_height_0 + 9 * layer_height +cool_min_speed = 10 +support_angle = 55 +material_print_temperature = =default_material_print_temperature + 5 +material_print_temperature_layer_0 = =default_material_print_temperature + 7 +material_flow = 91 +retraction_extra_prime_amount = 0.1 +retraction_min_travel = =3*line_width +retraction_hop_only_when_collides = True +skin_overlap = 20 +support_z_distance = =layer_height +support_bottom_distance = =support_z_distance +support_xy_distance = =line_width * 1.5 +support_xy_distance_overhang = =wall_line_width_0 +support_offset = 1 +support_interface_density = 100 +prime_tower_enable = True diff --git a/resources/quality/strateo3d/HT0.4/s3d_ht0.4_COPA_A.inst.cfg b/resources/quality/strateo3d/HT0.4/s3d_ht0.4_COPA_A.inst.cfg new file mode 100644 index 0000000000..010c252721 --- /dev/null +++ b/resources/quality/strateo3d/HT0.4/s3d_ht0.4_COPA_A.inst.cfg @@ -0,0 +1,62 @@ +[general] +version = 4 +name = A +definition = strateo3d + +[metadata] +setting_version = 17 +type = quality +quality_type = a +weight = 1 +material = emotiontech_copa +variant = High temp 0.4 + +[values] +layer_height_0 = =round(0.5*machine_nozzle_size, 2) +line_width = =machine_nozzle_size/machine_nozzle_size*0.4 +wall_line_width = =machine_nozzle_size/machine_nozzle_size*0.35 +wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.3 +wall_0_wipe_dist = =machine_nozzle_size/2 +wall_line_count = 3 +speed_print = 35 +speed_wall = =math.ceil(speed_print * 35/50) +speed_wall_0 = =math.ceil(speed_wall * 30/35) +speed_topbottom = =math.ceil(speed_print * 35/50) +speed_layer_0 = =math.ceil(speed_print * 20/50) +speed_slowdown_layers = 2 +cool_fan_enabled = True +cool_fan_speed = 20 +cool_fan_speed_max = 80 +cool_min_layer_time_fan_speed_max = 20 +cool_min_layer_time = 2 +cool_fan_full_at_height = =layer_height_0 + 2 * layer_height +cool_min_speed = 2 +cool_lift_head = True +support_angle = 45 +material_print_temperature = =default_material_print_temperature +material_print_temperature_layer_0 = =default_material_print_temperature + 5 +material_initial_print_temperature = =default_material_print_temperature +material_final_print_temperature = =default_material_print_temperature +material_flow = 91 +skin_material_flow = 92 +retraction_extra_prime_amount = 0.1 +retraction_min_travel = =3*line_width +retraction_hop_only_when_collides = True +skin_overlap = 10 +support_z_distance = =layer_height*2 +support_bottom_distance = =support_z_distance*0.5 +support_xy_distance = =line_width * 1.7 +support_xy_distance_overhang = =wall_line_width_0 +support_offset = 1 +support_interface_density = 100 +prime_tower_enable = True +bridge_settings_enabled = True +bridge_wall_coast = 50 +bridge_wall_speed = 8 +bridge_wall_material_flow = 50 +bridge_skin_speed = 8 +bridge_skin_material_flow = 60 +bridge_skin_density = 80 +bridge_fan_speed = 80 +meshfix_maximum_resolution = 0.5 +meshfix_maximum_deviation = 0.04 diff --git a/resources/quality/strateo3d/HT0.4/s3d_ht0.4_COPA_B.inst.cfg b/resources/quality/strateo3d/HT0.4/s3d_ht0.4_COPA_B.inst.cfg new file mode 100644 index 0000000000..80c7c4c6ad --- /dev/null +++ b/resources/quality/strateo3d/HT0.4/s3d_ht0.4_COPA_B.inst.cfg @@ -0,0 +1,62 @@ +[general] +version = 4 +name = B +definition = strateo3d + +[metadata] +setting_version = 17 +type = quality +quality_type = b +weight = 0 +material = emotiontech_copa +variant = High temp 0.4 + +[values] +layer_height_0 = =round(0.67*machine_nozzle_size, 2) +line_width = =machine_nozzle_size/machine_nozzle_size*0.4 +wall_line_width = =machine_nozzle_size/machine_nozzle_size*0.35 +wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.3 +wall_0_wipe_dist = =machine_nozzle_size/2 +wall_line_count = 3 +speed_print = 35 +speed_wall = =math.ceil(speed_print * 37/55) +speed_wall_0 = =math.ceil(speed_wall * 33/37) +speed_topbottom = =math.ceil(speed_print * 37/55) +speed_layer_0 = =math.ceil(speed_print * 25/55) +speed_slowdown_layers = 2 +cool_fan_enabled = True +cool_fan_speed = 20 +cool_fan_speed_max = 80 +cool_min_layer_time_fan_speed_max = 20 +cool_min_layer_time = 2 +cool_fan_full_at_height = =layer_height_0 + 2 * layer_height +cool_min_speed = 2 +cool_lift_head = True +support_angle = 60 +material_print_temperature = =default_material_print_temperature +material_print_temperature_layer_0 = =default_material_print_temperature + 5 +material_initial_print_temperature = =default_material_print_temperature +material_final_print_temperature = =default_material_print_temperature +material_flow = 91 +skin_material_flow = 92 +retraction_extra_prime_amount = 0.1 +retraction_min_travel = =3*line_width +retraction_hop_only_when_collides = True +skin_overlap = 15 +support_z_distance = =layer_height*2 +support_bottom_distance = =support_z_distance*0.5 +support_xy_distance = =line_width * 1.7 +support_xy_distance_overhang = =wall_line_width_0 +support_offset = 1 +support_interface_density = 100 +prime_tower_enable = True +bridge_settings_enabled = True +bridge_wall_coast = 50 +bridge_wall_speed = 8 +bridge_wall_material_flow = 50 +bridge_skin_speed = 8 +bridge_skin_material_flow = 60 +bridge_skin_density = 80 +bridge_fan_speed = 80 +meshfix_maximum_resolution = 0.5 +meshfix_maximum_deviation = 0.04 diff --git a/resources/quality/strateo3d/HT0.4/s3d_ht0.4_COPA_C.inst.cfg b/resources/quality/strateo3d/HT0.4/s3d_ht0.4_COPA_C.inst.cfg new file mode 100644 index 0000000000..5de7b0ea9f --- /dev/null +++ b/resources/quality/strateo3d/HT0.4/s3d_ht0.4_COPA_C.inst.cfg @@ -0,0 +1,62 @@ +[general] +version = 4 +name = C +definition = strateo3d + +[metadata] +setting_version = 17 +type = quality +quality_type = c +weight = -1 +material = emotiontech_copa +variant = High temp 0.4 + +[values] +layer_height_0 = =round(0.75*machine_nozzle_size, 2) +line_width = =machine_nozzle_size/machine_nozzle_size*0.4 +wall_line_width = =machine_nozzle_size/machine_nozzle_size*0.35 +wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.3 +wall_0_wipe_dist = =machine_nozzle_size/2 +wall_line_count = 3 +speed_print = 35 +speed_wall = =math.ceil(speed_print * 40/60) +speed_wall_0 = =math.ceil(speed_wall * 35/40) +speed_topbottom = =math.ceil(speed_print * 40/60) +speed_layer_0 = =math.ceil(speed_print * 30/60) +speed_slowdown_layers = 2 +cool_fan_enabled = True +cool_fan_speed = 20 +cool_fan_speed_max = 80 +cool_min_layer_time_fan_speed_max = 20 +cool_min_layer_time = 2 +cool_fan_full_at_height = =layer_height_0 + 2 * layer_height +cool_min_speed = 2 +cool_lift_head = True +support_angle = 60 +material_print_temperature = =default_material_print_temperature +material_print_temperature_layer_0 = =default_material_print_temperature + 5 +material_initial_print_temperature = =default_material_print_temperature +material_final_print_temperature = =default_material_print_temperature +material_flow = 91 +skin_material_flow = 92 +retraction_extra_prime_amount = 0.1 +retraction_min_travel = =3*line_width +retraction_hop_only_when_collides = True +skin_overlap = 20 +support_z_distance = =layer_height*2 +support_bottom_distance = =support_z_distance*0.5 +support_xy_distance = =line_width * 1.7 +support_xy_distance_overhang = =wall_line_width_0 +support_offset = 1 +support_interface_density = 100 +prime_tower_enable = True +bridge_settings_enabled = True +bridge_wall_coast = 50 +bridge_wall_speed = 8 +bridge_wall_material_flow = 50 +bridge_skin_speed = 8 +bridge_skin_material_flow = 60 +bridge_skin_density = 80 +bridge_fan_speed = 80 +meshfix_maximum_resolution = 0.5 +meshfix_maximum_deviation = 0.04 diff --git a/resources/quality/strateo3d/HT0.4/s3d_ht0.4_HIPS_A.inst.cfg b/resources/quality/strateo3d/HT0.4/s3d_ht0.4_HIPS_A.inst.cfg new file mode 100644 index 0000000000..cb3871fc6d --- /dev/null +++ b/resources/quality/strateo3d/HT0.4/s3d_ht0.4_HIPS_A.inst.cfg @@ -0,0 +1,50 @@ +[general] +version = 4 +name = A +definition = strateo3d + +[metadata] +setting_version = 17 +type = quality +quality_type = a +weight = 1 +material = emotiontech_hips +variant = High temp 0.4 + +[values] +layer_height_0 = =round(0.5*machine_nozzle_size, 2) +line_width = =machine_nozzle_size/machine_nozzle_size*0.4 +wall_line_width = =machine_nozzle_size/machine_nozzle_size*0.4 +wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.4 +wall_0_wipe_dist = =machine_nozzle_size/2 +speed_print = 40 +speed_wall = =math.ceil(speed_print * 30/40) +speed_wall_0 = =math.ceil(speed_wall * 30/40) +speed_topbottom = =math.ceil(speed_print * 20/40) +speed_layer_0 = =math.ceil(speed_print * 20/40) +speed_slowdown_layers = 2 +cool_fan_enabled = True +cool_fan_speed = 50 +cool_fan_speed_max = 100 +cool_min_layer_time_fan_speed_max = 20 +cool_min_layer_time = 11 +cool_fan_full_at_height = =layer_height_0 + 14 * layer_height +cool_min_speed = 10 +support_angle = 55 +material_print_temperature = =default_material_print_temperature +material_print_temperature_layer_0 = =default_material_print_temperature +material_flow = 97 +retraction_extra_prime_amount = 0.1 +retraction_min_travel = =3*line_width +retraction_hop_only_when_collides = True +skin_overlap = 10 +support_bottom_stair_step_height = 0 +support_bottom_stair_step_width = 0 +support_z_distance = =layer_height-layer_height +support_bottom_distance = =support_z_distance +support_xy_distance = =line_width * 0.5 +support_xy_distance_overhang = =line_width*0 +support_offset = 3 +support_pattern = grid +support_interface_density = 100 +prime_tower_enable = True diff --git a/resources/quality/strateo3d/HT0.4/s3d_ht0.4_HIPS_B.inst.cfg b/resources/quality/strateo3d/HT0.4/s3d_ht0.4_HIPS_B.inst.cfg new file mode 100644 index 0000000000..d29a61bae6 --- /dev/null +++ b/resources/quality/strateo3d/HT0.4/s3d_ht0.4_HIPS_B.inst.cfg @@ -0,0 +1,50 @@ +[general] +version = 4 +name = B +definition = strateo3d + +[metadata] +setting_version = 17 +type = quality +quality_type = b +weight = 0 +material = emotiontech_hips +variant = High temp 0.4 + +[values] +layer_height_0 = =round(0.67*machine_nozzle_size, 2) +line_width = =machine_nozzle_size/machine_nozzle_size*0.4 +wall_line_width = =machine_nozzle_size/machine_nozzle_size*0.4 +wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.4 +wall_0_wipe_dist = =machine_nozzle_size/2 +speed_print = 40 +speed_wall = =math.ceil(speed_print * 30/40) +speed_wall_0 = =math.ceil(speed_wall * 30/40) +speed_topbottom = =math.ceil(speed_print * 20/40) +speed_layer_0 = =math.ceil(speed_print * 20/40) +speed_slowdown_layers = 2 +cool_fan_enabled = True +cool_fan_speed = 50 +cool_fan_speed_max = 100 +cool_min_layer_time_fan_speed_max = 20 +cool_min_layer_time = 11 +cool_fan_full_at_height = =layer_height_0 + 9 * layer_height +cool_min_speed = 10 +support_angle = 55 +material_print_temperature = =default_material_print_temperature + 3 +material_print_temperature_layer_0 = =default_material_print_temperature +material_flow = 97 +retraction_extra_prime_amount = 0.1 +retraction_min_travel = =3*line_width +retraction_hop_only_when_collides = True +skin_overlap = 15 +support_bottom_stair_step_height = 0 +support_bottom_stair_step_width = 0 +support_z_distance = =layer_height-layer_height +support_bottom_distance = =support_z_distance +support_xy_distance = =line_width * 0.5 +support_xy_distance_overhang = =line_width*0 +support_offset = 3 +support_pattern = grid +support_interface_density = 100 +prime_tower_enable = True diff --git a/resources/quality/strateo3d/HT0.4/s3d_ht0.4_HIPS_C.inst.cfg b/resources/quality/strateo3d/HT0.4/s3d_ht0.4_HIPS_C.inst.cfg new file mode 100644 index 0000000000..46b30ef1a1 --- /dev/null +++ b/resources/quality/strateo3d/HT0.4/s3d_ht0.4_HIPS_C.inst.cfg @@ -0,0 +1,50 @@ +[general] +version = 4 +name = C +definition = strateo3d + +[metadata] +setting_version = 17 +type = quality +quality_type = c +weight = -1 +material = emotiontech_hips +variant = High temp 0.4 + +[values] +layer_height_0 = =round(0.75*machine_nozzle_size, 2) +line_width = =machine_nozzle_size/machine_nozzle_size*0.4 +wall_line_width = =machine_nozzle_size/machine_nozzle_size*0.4 +wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.4 +wall_0_wipe_dist = =machine_nozzle_size/2 +speed_print = 40 +speed_wall = =math.ceil(speed_print * 30/40) +speed_wall_0 = =math.ceil(speed_wall * 30/40) +speed_topbottom = =math.ceil(speed_print * 20/40) +speed_layer_0 = =math.ceil(speed_print * 20/40) +speed_slowdown_layers = 2 +cool_fan_enabled = True +cool_fan_speed = 50 +cool_fan_speed_max = 100 +cool_min_layer_time_fan_speed_max = 20 +cool_min_layer_time = 11 +cool_fan_full_at_height = =layer_height_0 + 4 * layer_height +cool_min_speed = 10 +support_angle = 55 +material_print_temperature = =default_material_print_temperature + 5 +material_print_temperature_layer_0 = =default_material_print_temperature +material_flow = 97 +retraction_extra_prime_amount = 0.1 +retraction_min_travel = =3*line_width +retraction_hop_only_when_collides = True +skin_overlap = 20 +support_bottom_stair_step_height = 0 +support_bottom_stair_step_width = 0 +support_z_distance = =layer_height-layer_height +support_bottom_distance = =support_z_distance +support_xy_distance = =line_width * 0.5 +support_xy_distance_overhang = =line_width*0 +support_offset = 3 +support_pattern = grid +support_interface_density = 100 +prime_tower_enable = True diff --git a/resources/quality/strateo3d/HT0.4/s3d_ht0.4_PC_A.inst.cfg b/resources/quality/strateo3d/HT0.4/s3d_ht0.4_PC_A.inst.cfg new file mode 100644 index 0000000000..c2065bf506 --- /dev/null +++ b/resources/quality/strateo3d/HT0.4/s3d_ht0.4_PC_A.inst.cfg @@ -0,0 +1,61 @@ +[general] +version = 4 +name = A +definition = strateo3d + +[metadata] +setting_version = 17 +type = quality +quality_type = a +weight = 1 +material = emotiontech_pc +variant = High temp 0.4 + +[values] +layer_height_0 = =round(0.5*machine_nozzle_size, 2) +line_width = =machine_nozzle_size/machine_nozzle_size*0.4 +wall_line_width = =machine_nozzle_size/machine_nozzle_size*0.35 +wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.3 +wall_0_wipe_dist = =machine_nozzle_size/2 +speed_print = 35 +speed_wall = =math.ceil(speed_print * 35/50) +speed_wall_0 = =math.ceil(speed_wall * 30/35) +speed_topbottom = =math.ceil(speed_print * 35/50) +speed_layer_0 = =math.ceil(speed_print * 20/50) +speed_slowdown_layers = 2 +cool_fan_enabled = True +cool_fan_speed = 10 +cool_fan_speed_max = 10 +cool_min_layer_time_fan_speed_max = 20 +cool_min_layer_time = 2 +cool_fan_full_at_height = =layer_height_0 + 2 * layer_height +cool_min_speed = 12 +support_angle = 60 +cool_lift_head = true +material_print_temperature = 260 +material_print_temperature_layer_0 = 265 +material_flow = 88 +wall_line_count = 3 +retraction_extra_prime_amount = 0.1 +retraction_speed = 30 +retraction_min_travel = =3*line_width +retraction_hop_only_when_collides = True +skin_overlap = 10 +support_z_distance = =layer_height +support_bottom_distance = =support_z_distance*0.5 +support_xy_distance = =line_width * 1.7 +support_xy_distance_overhang = =wall_line_width_0 +support_offset = 1 +support_interface_density = 100 +prime_tower_enable = True +adhesion_type = brim + +bridge_settings_enabled = True +bridge_wall_coast = 50 +bridge_wall_speed = 12 +bridge_wall_material_flow = 50 +bridge_skin_speed = 12.5 +bridge_skin_material_flow = 100 +bridge_skin_density = 80 +bridge_fan_speed = 100 + diff --git a/resources/quality/strateo3d/HT0.4/s3d_ht0.4_PC_B.inst.cfg b/resources/quality/strateo3d/HT0.4/s3d_ht0.4_PC_B.inst.cfg new file mode 100644 index 0000000000..e3804df9e2 --- /dev/null +++ b/resources/quality/strateo3d/HT0.4/s3d_ht0.4_PC_B.inst.cfg @@ -0,0 +1,61 @@ +[general] +version = 4 +name = B +definition = strateo3d + +[metadata] +setting_version = 17 +type = quality +quality_type = b +weight = 0 +material = emotiontech_pc +variant = High temp 0.4 + +[values] +layer_height_0 = =round(0.67*machine_nozzle_size, 2) +line_width = =machine_nozzle_size/machine_nozzle_size*0.4 +wall_line_width = =machine_nozzle_size/machine_nozzle_size*0.35 +wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.3 +wall_0_wipe_dist = =machine_nozzle_size/2 +speed_print = 35 +speed_wall = =math.ceil(speed_print * 37/55) +speed_wall_0 = =math.ceil(speed_wall * 33/37) +speed_topbottom = =math.ceil(speed_print * 37/55) +speed_layer_0 = =math.ceil(speed_print * 25/55) +speed_slowdown_layers = 2 +cool_fan_enabled = True +cool_fan_speed = 10 +cool_fan_speed_max = 10 +cool_min_layer_time_fan_speed_max = 20 +cool_min_layer_time = 2 +cool_fan_full_at_height = =layer_height_0 + 2 * layer_height +cool_min_speed = 12 +cool_lift_head = true +support_angle = 60 +material_print_temperature = 270 +material_print_temperature_layer_0 = 275 +material_flow = 88 +wall_line_count = 3 +retraction_speed = 30 +retraction_extra_prime_amount = 0.1 +retraction_min_travel = =3*line_width +retraction_hop_only_when_collides = True +skin_overlap = 15 +support_z_distance = =layer_height +support_bottom_distance = =support_z_distance*0.5 +support_xy_distance = =line_width * 1.7 +support_xy_distance_overhang = =wall_line_width_0 +support_offset = 1 +support_interface_density = 100 +prime_tower_enable = True + +adhesion_type = brim + +bridge_settings_enabled = True +bridge_wall_coast = 50 +bridge_wall_speed = 12 +bridge_wall_material_flow = 50 +bridge_skin_speed = 12.5 +bridge_skin_material_flow = 100 +bridge_skin_density = 80 +bridge_fan_speed = 100 diff --git a/resources/quality/strateo3d/HT0.4/s3d_ht0.4_PC_C.inst.cfg b/resources/quality/strateo3d/HT0.4/s3d_ht0.4_PC_C.inst.cfg new file mode 100644 index 0000000000..453c4c8700 --- /dev/null +++ b/resources/quality/strateo3d/HT0.4/s3d_ht0.4_PC_C.inst.cfg @@ -0,0 +1,61 @@ +[general] +version = 4 +name = C +definition = strateo3d + +[metadata] +setting_version = 17 +type = quality +quality_type = c +weight = -1 +material = emotiontech_pc +variant = High temp 0.4 + +[values] +layer_height_0 = =round(0.75*machine_nozzle_size, 2) +line_width = =machine_nozzle_size/machine_nozzle_size*0.4 +wall_line_width = =machine_nozzle_size/machine_nozzle_size*0.35 +wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.3 +wall_0_wipe_dist = =machine_nozzle_size/2 +speed_print = 35 +speed_wall = =math.ceil(speed_print * 40/60) +speed_wall_0 = =math.ceil(speed_wall * 35/40) +speed_topbottom = =math.ceil(speed_print * 40/60) +speed_layer_0 = =math.ceil(speed_print * 30/60) +speed_slowdown_layers = 2 +cool_fan_enabled = True +cool_fan_speed = 10 +cool_fan_speed_max = 10 +cool_min_layer_time_fan_speed_max = 20 +cool_min_layer_time = 2 +cool_fan_full_at_height = =layer_height_0 + 2 * layer_height +cool_min_speed = 12 +support_angle = 60 +cool_lift_head = true +material_print_temperature = 270 +material_print_temperature_layer_0 = 275 +material_flow = 88 +wall_line_count = 3 +retraction_speed = 30 +retraction_extra_prime_amount = 0.1 +retraction_min_travel = =3*line_width +retraction_hop_only_when_collides = True +skin_overlap = 20 +support_z_distance = =layer_height +support_bottom_distance = =support_z_distance*0.5 +support_xy_distance = =line_width * 1.7 +support_xy_distance_overhang = =wall_line_width_0 +support_offset = 1 +support_interface_density = 100 +prime_tower_enable = True + +adhesion_type = brim + +bridge_settings_enabled = True +bridge_wall_coast = 50 +bridge_wall_speed = 12 +bridge_wall_material_flow = 50 +bridge_skin_speed = 12.5 +bridge_skin_material_flow = 100 +bridge_skin_density = 80 +bridge_fan_speed = 100 diff --git a/resources/quality/strateo3d/HT0.4/s3d_ht0.4_PEKK_B.inst.cfg b/resources/quality/strateo3d/HT0.4/s3d_ht0.4_PEKK_B.inst.cfg new file mode 100644 index 0000000000..3782c7f994 --- /dev/null +++ b/resources/quality/strateo3d/HT0.4/s3d_ht0.4_PEKK_B.inst.cfg @@ -0,0 +1,58 @@ +[general] +version = 4 +name = B +definition = strateo3d + +[metadata] +setting_version = 17 +type = quality +quality_type = b +weight = 0 +material = emotiontech_pekk +variant = High temp 0.4 + +[values] +layer_height_0 = =round(0.75*machine_nozzle_size, 2) +line_width = =machine_nozzle_size/machine_nozzle_size*0.4 +wall_line_width = =machine_nozzle_size/machine_nozzle_size*0.35 +wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.3 +initial_layer_line_width_factor = 120 +material_flow_layer_0 = 120 +wall_0_wipe_dist = =machine_nozzle_size/2 +speed_print = 40 +speed_wall = =math.ceil(speed_print * 37/55) +speed_wall_0 = =math.ceil(speed_wall * 33/37) +speed_topbottom = =math.ceil(speed_print * 37/55) +speed_layer_0 = 10 +speed_travel_layer_0 = 100 +skirt_brim_speed = 5 +speed_slowdown_layers = 2 +cool_fan_enabled = True +cool_fan_speed = 30 +cool_fan_speed_max = 30 +cool_min_layer_time_fan_speed_max = 10 +cool_min_layer_time = 11 +cool_fan_full_layer = 2 +cool_min_speed = 5 +support_angle = 45 +material_print_temperature = =default_material_print_temperature +material_print_temperature_layer_0 = =default_material_print_temperature + 15 +material_flow = 105 +retraction_extra_prime_amount = 0.1 +retraction_min_travel = =3*line_width +retraction_hop_only_when_collides = True +skin_overlap = 15 +support_z_distance = =layer_height +support_bottom_distance = =support_z_distance +support_xy_distance = =line_width * 1.7 +support_xy_distance_overhang = =wall_line_width_0 +support_offset = 1 +support_interface_density = 105 +prime_tower_enable = True +bridge_settings_enabled = True +bridge_wall_speed = 5 +bridge_wall_material_flow = 185 +bridge_skin_speed = =bridge_wall_speed +bridge_skin_material_flow = =bridge_wall_material_flow +bridge_fan_speed = 100 +bridge_enable_more_layers = False diff --git a/resources/quality/strateo3d/HT0.4/s3d_ht0.4_PETG_A.inst.cfg b/resources/quality/strateo3d/HT0.4/s3d_ht0.4_PETG_A.inst.cfg new file mode 100644 index 0000000000..a5bf7374ca --- /dev/null +++ b/resources/quality/strateo3d/HT0.4/s3d_ht0.4_PETG_A.inst.cfg @@ -0,0 +1,47 @@ +[general] +version = 4 +name = A +definition = strateo3d + +[metadata] +setting_version = 17 +type = quality +quality_type = a +weight = 1 +material = emotiontech_petg +variant = High temp 0.4 + +[values] +layer_height_0 = =round(0.5*machine_nozzle_size, 2) +line_width = =machine_nozzle_size/machine_nozzle_size*0.4 +wall_line_width = =machine_nozzle_size/machine_nozzle_size*0.35 +wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.3 +wall_0_wipe_dist = =machine_nozzle_size/2 +speed_print = 50 +speed_wall = =math.ceil(speed_print * 35/50) +speed_wall_0 = =math.ceil(speed_wall * 30/35) +speed_topbottom = =math.ceil(speed_print * 35/50) +speed_layer_0 = =math.ceil(speed_print * 20/50) +speed_slowdown_layers = 2 +cool_fan_enabled = True +cool_fan_speed = 50 +cool_fan_speed_max = 100 +cool_min_layer_time_fan_speed_max = 20 +cool_min_layer_time = 11 +cool_fan_full_at_height = =layer_height_0 + 3 * layer_height +cool_min_speed = 10 +support_angle = 65 +material_print_temperature = =default_material_print_temperature +material_print_temperature_layer_0 = =default_material_print_temperature +material_flow = 98 +retraction_extra_prime_amount = 0 +retraction_min_travel = =3*line_width +retraction_hop_only_when_collides = True +skin_overlap = 10 +support_z_distance = =layer_height*2 +support_bottom_distance = =support_z_distance*0.5 +support_xy_distance = =line_width * 1.7 +support_xy_distance_overhang = =wall_line_width_0 +support_offset = 1 +support_interface_density = 100 +prime_tower_enable = True diff --git a/resources/quality/strateo3d/HT0.4/s3d_ht0.4_PETG_B.inst.cfg b/resources/quality/strateo3d/HT0.4/s3d_ht0.4_PETG_B.inst.cfg new file mode 100644 index 0000000000..91d3015b25 --- /dev/null +++ b/resources/quality/strateo3d/HT0.4/s3d_ht0.4_PETG_B.inst.cfg @@ -0,0 +1,47 @@ +[general] +version = 4 +name = B +definition = strateo3d + +[metadata] +setting_version = 17 +type = quality +quality_type = b +weight = 0 +material = emotiontech_petg +variant = High temp 0.4 + +[values] +layer_height_0 = =round(0.67*machine_nozzle_size, 2) +line_width = =machine_nozzle_size/machine_nozzle_size*0.4 +wall_line_width = =machine_nozzle_size/machine_nozzle_size*0.35 +wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.3 +wall_0_wipe_dist = =machine_nozzle_size/2 +speed_print = 55 +speed_wall = =math.ceil(speed_print * 37/55) +speed_wall_0 = =math.ceil(speed_wall * 33/37) +speed_topbottom = =math.ceil(speed_print * 37/55) +speed_layer_0 = =math.ceil(speed_print * 25/55) +speed_slowdown_layers = 2 +cool_fan_enabled = True +cool_fan_speed = 50 +cool_fan_speed_max = 100 +cool_min_layer_time_fan_speed_max = 20 +cool_min_layer_time = 11 +cool_fan_full_at_height = =layer_height_0 + 3 * layer_height +cool_min_speed = 10 +support_angle = 60 +material_print_temperature = =default_material_print_temperature + 5 +material_print_temperature_layer_0 = =default_material_print_temperature +material_flow = 95 +retraction_extra_prime_amount = 0 +retraction_min_travel = =3*line_width +retraction_hop_only_when_collides = True +skin_overlap = 15 +support_z_distance = =layer_height*2 +support_bottom_distance = =support_z_distance*0.5 +support_xy_distance = =line_width * 1.7 +support_xy_distance_overhang = =wall_line_width_0 +support_offset = 1 +support_interface_density = 100 +prime_tower_enable = True diff --git a/resources/quality/strateo3d/HT0.4/s3d_ht0.4_PETG_C.inst.cfg b/resources/quality/strateo3d/HT0.4/s3d_ht0.4_PETG_C.inst.cfg new file mode 100644 index 0000000000..77bd280b59 --- /dev/null +++ b/resources/quality/strateo3d/HT0.4/s3d_ht0.4_PETG_C.inst.cfg @@ -0,0 +1,47 @@ +[general] +version = 4 +name = C +definition = strateo3d + +[metadata] +setting_version = 17 +type = quality +quality_type = c +weight = -1 +material = emotiontech_petg +variant = High temp 0.4 + +[values] +layer_height_0 = =round(0.75*machine_nozzle_size, 2) +line_width = =machine_nozzle_size/machine_nozzle_size*0.4 +wall_line_width = =machine_nozzle_size/machine_nozzle_size*0.35 +wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.3 +wall_0_wipe_dist = =machine_nozzle_size/2 +speed_print = 60 +speed_wall = =math.ceil(speed_print * 40/60) +speed_wall_0 = =math.ceil(speed_wall * 35/40) +speed_topbottom = =math.ceil(speed_print * 40/60) +speed_layer_0 = =math.ceil(speed_print * 30/60) +speed_slowdown_layers = 2 +cool_fan_enabled = True +cool_fan_speed = 50 +cool_fan_speed_max = 100 +cool_min_layer_time_fan_speed_max = 20 +cool_min_layer_time = 11 +cool_fan_full_at_height = =layer_height_0 + 3 * layer_height +cool_min_speed = 10 +support_angle = 55 +material_print_temperature = =default_material_print_temperature + 10 +material_print_temperature_layer_0 = =default_material_print_temperature +5 +material_flow = 91 +retraction_extra_prime_amount = 0 +retraction_min_travel = =3*line_width +retraction_hop_only_when_collides = True +skin_overlap = 20 +support_z_distance = =layer_height*2 +support_bottom_distance = =support_z_distance*0.5 +support_xy_distance = =line_width * 1.7 +support_xy_distance_overhang = =wall_line_width_0 +support_offset = 1 +support_interface_density = 100 +prime_tower_enable = True diff --git a/resources/quality/strateo3d/HT0.4/s3d_ht0.4_PLA_A.inst.cfg b/resources/quality/strateo3d/HT0.4/s3d_ht0.4_PLA_A.inst.cfg new file mode 100644 index 0000000000..5ee51facb5 --- /dev/null +++ b/resources/quality/strateo3d/HT0.4/s3d_ht0.4_PLA_A.inst.cfg @@ -0,0 +1,47 @@ +[general] +version = 4 +name = A +definition = strateo3d + +[metadata] +setting_version = 17 +type = quality +quality_type = a +weight = 1 +material = emotiontech_pla +variant = High temp 0.4 + +[values] +layer_height_0 = =round(0.5*machine_nozzle_size, 2) +line_width = =machine_nozzle_size/machine_nozzle_size*0.4 +wall_line_width = =machine_nozzle_size/machine_nozzle_size*0.35 +wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.3 +wall_0_wipe_dist = =machine_nozzle_size/2 +speed_print = 50 +speed_wall = =math.ceil(speed_print * 35/50) +speed_wall_0 = =math.ceil(speed_wall * 30/35) +speed_topbottom = =math.ceil(speed_print * 35/50) +speed_layer_0 = =math.ceil(speed_print * 20/50) +speed_slowdown_layers = 2 +cool_fan_enabled = True +cool_fan_speed = 100 +cool_fan_speed_max = 100 +cool_min_layer_time_fan_speed_max = 20 +cool_min_layer_time = 11 +cool_fan_full_at_height = =layer_height_0 + 2 * layer_height +cool_min_speed = 10 +support_angle = 65 +material_print_temperature = =default_material_print_temperature +material_print_temperature_layer_0 = =default_material_print_temperature -5 +material_flow = 98 +retraction_extra_prime_amount = 0.1 +retraction_min_travel = =3*line_width +retraction_hop_only_when_collides = True +skin_overlap = 10 +support_z_distance = =layer_height*2 +support_bottom_distance = =support_z_distance*0.5 +support_xy_distance = =line_width * 1.7 +support_xy_distance_overhang = =wall_line_width_0 +support_offset = 1 +support_interface_density = 100 +prime_tower_enable = True diff --git a/resources/quality/strateo3d/HT0.4/s3d_ht0.4_PLA_B.inst.cfg b/resources/quality/strateo3d/HT0.4/s3d_ht0.4_PLA_B.inst.cfg new file mode 100644 index 0000000000..b575c4db11 --- /dev/null +++ b/resources/quality/strateo3d/HT0.4/s3d_ht0.4_PLA_B.inst.cfg @@ -0,0 +1,47 @@ +[general] +version = 4 +name = B +definition = strateo3d + +[metadata] +setting_version = 17 +type = quality +quality_type = b +weight = 0 +material = emotiontech_pla +variant = High temp 0.4 + +[values] +layer_height_0 = =round(0.67*machine_nozzle_size, 2) +line_width = =machine_nozzle_size/machine_nozzle_size*0.4 +wall_line_width = =machine_nozzle_size/machine_nozzle_size*0.35 +wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.3 +wall_0_wipe_dist = =machine_nozzle_size/2 +speed_print = 55 +speed_wall = =math.ceil(speed_print * 37/55) +speed_wall_0 = =math.ceil(speed_wall * 33/37) +speed_topbottom = =math.ceil(speed_print * 37/55) +speed_layer_0 = =math.ceil(speed_print * 25/55) +speed_slowdown_layers = 2 +cool_fan_enabled = True +cool_fan_speed = 100 +cool_fan_speed_max = 100 +cool_min_layer_time_fan_speed_max = 20 +cool_min_layer_time = 11 +cool_fan_full_at_height = =layer_height_0 + 2 * layer_height +cool_min_speed = 10 +support_angle = 60 +material_print_temperature = =default_material_print_temperature + 5 +material_print_temperature_layer_0 = =default_material_print_temperature +material_flow = 95 +retraction_extra_prime_amount = 0.1 +retraction_min_travel = =3*line_width +retraction_hop_only_when_collides = True +skin_overlap = 15 +support_z_distance = =layer_height*2 +support_bottom_distance = =support_z_distance*0.5 +support_xy_distance = =line_width * 1.7 +support_xy_distance_overhang = =wall_line_width_0 +support_offset = 1 +support_interface_density = 100 +prime_tower_enable = True diff --git a/resources/quality/strateo3d/HT0.4/s3d_ht0.4_PLA_C.inst.cfg b/resources/quality/strateo3d/HT0.4/s3d_ht0.4_PLA_C.inst.cfg new file mode 100644 index 0000000000..3dd12ec3d3 --- /dev/null +++ b/resources/quality/strateo3d/HT0.4/s3d_ht0.4_PLA_C.inst.cfg @@ -0,0 +1,47 @@ +[general] +version = 4 +name = C +definition = strateo3d + +[metadata] +setting_version = 17 +type = quality +quality_type = c +weight = -1 +material = emotiontech_pla +variant = High temp 0.4 + +[values] +layer_height_0 = =round(0.75*machine_nozzle_size, 2) +line_width = =machine_nozzle_size/machine_nozzle_size*0.4 +wall_line_width = =machine_nozzle_size/machine_nozzle_size*0.35 +wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.3 +wall_0_wipe_dist = =machine_nozzle_size/2 +speed_print = 60 +speed_wall = =math.ceil(speed_print * 40/60) +speed_wall_0 = =math.ceil(speed_wall * 35/40) +speed_topbottom = =math.ceil(speed_print * 40/60) +speed_layer_0 = =math.ceil(speed_print * 30/60) +speed_slowdown_layers = 2 +cool_fan_enabled = True +cool_fan_speed = 100 +cool_fan_speed_max = 100 +cool_min_layer_time_fan_speed_max = 20 +cool_min_layer_time = 11 +cool_fan_full_at_height = =layer_height_0 + 2 * layer_height +cool_min_speed = 10 +support_angle = 55 +material_print_temperature = =default_material_print_temperature + 10 +material_print_temperature_layer_0 = =default_material_print_temperature + 5 +material_flow = 91 +retraction_extra_prime_amount = 0.1 +retraction_min_travel = =3*line_width +retraction_hop_only_when_collides = True +skin_overlap = 20 +support_z_distance = =layer_height*2 +support_bottom_distance = =support_z_distance*0.5 +support_xy_distance = =line_width * 1.7 +support_xy_distance_overhang = =wall_line_width_0 +support_offset = 1 +support_interface_density = 100 +prime_tower_enable = True diff --git a/resources/quality/strateo3d/HT0.4/s3d_ht0.4_PLA_HT_A.inst.cfg b/resources/quality/strateo3d/HT0.4/s3d_ht0.4_PLA_HT_A.inst.cfg new file mode 100644 index 0000000000..46a34e8290 --- /dev/null +++ b/resources/quality/strateo3d/HT0.4/s3d_ht0.4_PLA_HT_A.inst.cfg @@ -0,0 +1,55 @@ +[general] +version = 4 +name = A +definition = strateo3d + +[metadata] +setting_version = 17 +type = quality +quality_type = a +weight = 1 +material = emotiontech_pla_hr_870 +variant = High temp 0.4 + +[values] +layer_height_0 = =round(0.5*machine_nozzle_size, 2) +line_width = =machine_nozzle_size/machine_nozzle_size*0.4 +wall_line_width = =machine_nozzle_size/machine_nozzle_size*0.35 +wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.3 +wall_0_wipe_dist = =machine_nozzle_size/2 +wall_line_count = 3 +speed_print = 30 +speed_wall = =math.ceil(speed_print * 35/50) +speed_wall_0 = =math.ceil(speed_wall * 30/35) +speed_topbottom = =math.ceil(speed_print * 35/50) +speed_layer_0 = =math.ceil(speed_print * 20/50) +speed_slowdown_layers = 2 +cool_fan_enabled = True +cool_fan_speed = 100 +cool_fan_speed_max = 100 +cool_min_layer_time_fan_speed_max = 20 +cool_min_layer_time = 2 +cool_fan_full_at_height = =layer_height_0 + 2 * layer_height +cool_min_speed = 4 +support_angle = 65 +material_print_temperature = =default_material_print_temperature + 5 +material_print_temperature_layer_0 = =default_material_print_temperature + 10 +material_initial_print_temperature = =default_material_print_temperature + 5 +material_final_print_temperature = =default_material_print_temperature + 5 +material_flow = 91 +skin_material_flow = 92 +retraction_amount = 2 +retraction_extra_prime_amount = 0.1 +retraction_min_travel = =3*line_width +retraction_hop_only_when_collides = True +skin_overlap = 10 +support_z_distance = =layer_height*2 +support_bottom_distance = =support_z_distance*0.5 +support_xy_distance = =line_width * 1.7 +support_xy_distance_overhang = =wall_line_width_0 +support_offset = 1 +support_interface_density = 100 +prime_tower_enable = True +meshfix_maximum_resolution = 0.5 +meshfix_maximum_deviation = 0.04 +cool_lift_head = True diff --git a/resources/quality/strateo3d/HT0.4/s3d_ht0.4_PLA_HT_B.inst.cfg b/resources/quality/strateo3d/HT0.4/s3d_ht0.4_PLA_HT_B.inst.cfg new file mode 100644 index 0000000000..504695192f --- /dev/null +++ b/resources/quality/strateo3d/HT0.4/s3d_ht0.4_PLA_HT_B.inst.cfg @@ -0,0 +1,54 @@ +[general] +version = 4 +name = B +definition = strateo3d + +[metadata] +setting_version = 17 +type = quality +quality_type = b +weight = 0 +material = emotiontech_pla_hr_870 +variant = High temp 0.4 + +[values] +layer_height_0 = =round(0.67*machine_nozzle_size, 2) +line_width = =machine_nozzle_size/machine_nozzle_size*0.4 +wall_line_width = =machine_nozzle_size/machine_nozzle_size*0.35 +wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.3 +wall_0_wipe_dist = =machine_nozzle_size/2 +speed_print = 40 +speed_wall = =math.ceil(speed_print * 37/55) +speed_wall_0 = =math.ceil(speed_wall * 33/37) +speed_topbottom = =math.ceil(speed_print * 37/55) +speed_layer_0 = =math.ceil(speed_print * 25/55) +speed_slowdown_layers = 2 +cool_fan_enabled = True +cool_fan_speed = 100 +cool_fan_speed_max = 100 +cool_min_layer_time_fan_speed_max = 20 +cool_min_layer_time = 2 +cool_fan_full_at_height = =layer_height_0 + 2 * layer_height +cool_min_speed = 4 +support_angle = 60 +material_print_temperature = =default_material_print_temperature +material_print_temperature_layer_0 = =default_material_print_temperature + 5 +material_initial_print_temperature = =default_material_print_temperature +material_final_print_temperature = =default_material_print_temperature +material_flow = 91 +skin_material_flow = 92 +retraction_amount = 2 +retraction_extra_prime_amount = 0.1 +retraction_min_travel = =3*line_width +retraction_hop_only_when_collides = True +skin_overlap = 15 +support_z_distance = =layer_height*2 +support_bottom_distance = =support_z_distance*0.5 +support_xy_distance = =line_width * 1.7 +support_xy_distance_overhang = =wall_line_width_0 +support_offset = 1 +support_interface_density = 100 +prime_tower_enable = True +meshfix_maximum_resolution = 0.5 +meshfix_maximum_deviation = 0.04 +cool_lift_head = True diff --git a/resources/quality/strateo3d/HT0.4/s3d_ht0.4_PLA_HT_C.inst.cfg b/resources/quality/strateo3d/HT0.4/s3d_ht0.4_PLA_HT_C.inst.cfg new file mode 100644 index 0000000000..1bc06df105 --- /dev/null +++ b/resources/quality/strateo3d/HT0.4/s3d_ht0.4_PLA_HT_C.inst.cfg @@ -0,0 +1,54 @@ +[general] +version = 4 +name = C +definition = strateo3d + +[metadata] +setting_version = 17 +type = quality +quality_type = c +weight = -1 +material = emotiontech_pla_hr_870 +variant = High temp 0.4 + +[values] +layer_height_0 = =round(0.75*machine_nozzle_size, 2) +line_width = =machine_nozzle_size/machine_nozzle_size*0.4 +wall_line_width = =machine_nozzle_size/machine_nozzle_size*0.35 +wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.3 +wall_0_wipe_dist = =machine_nozzle_size/2 +speed_print = 40 +speed_wall = =math.ceil(speed_print * 40/60) +speed_wall_0 = =math.ceil(speed_wall * 35/40) +speed_topbottom = =math.ceil(speed_print * 40/60) +speed_layer_0 = =math.ceil(speed_print * 30/60) +speed_slowdown_layers = 2 +cool_fan_enabled = True +cool_fan_speed = 100 +cool_fan_speed_max = 100 +cool_min_layer_time_fan_speed_max = 20 +cool_min_layer_time = 2 +cool_fan_full_at_height = =layer_height_0 + 2 * layer_height +cool_min_speed = 4 +support_angle = 55 +material_print_temperature = =default_material_print_temperature +material_print_temperature_layer_0 = =default_material_print_temperature + 5 +material_initial_print_temperature = =default_material_print_temperature +material_final_print_temperature = =default_material_print_temperature +material_flow = 91 +skin_material_flow = 92 +retraction_amount = 2 +retraction_extra_prime_amount = 0.1 +retraction_min_travel = =3*line_width +retraction_hop_only_when_collides = True +skin_overlap = 20 +support_z_distance = =layer_height*2 +support_bottom_distance = =support_z_distance*0.5 +support_xy_distance = =line_width * 1.7 +support_xy_distance_overhang = =wall_line_width_0 +support_offset = 1 +support_interface_density = 100 +prime_tower_enable = True +meshfix_maximum_resolution = 0.5 +meshfix_maximum_deviation = 0.04 +cool_lift_head = True diff --git a/resources/quality/strateo3d/HT0.4/s3d_ht0.4_TPU98A_A.inst.cfg b/resources/quality/strateo3d/HT0.4/s3d_ht0.4_TPU98A_A.inst.cfg new file mode 100644 index 0000000000..5a2e9009be --- /dev/null +++ b/resources/quality/strateo3d/HT0.4/s3d_ht0.4_TPU98A_A.inst.cfg @@ -0,0 +1,47 @@ +[general] +version = 4 +name = A +definition = strateo3d + +[metadata] +setting_version = 17 +type = quality +quality_type = a +weight = 1 +material = emotiontech_tpu98a +variant = High temp 0.4 + +[values] +layer_height_0 = =round(0.5*machine_nozzle_size, 2) +line_width = =machine_nozzle_size/machine_nozzle_size*0.38 +wall_line_width = =machine_nozzle_size/machine_nozzle_size*0.38 +wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.38 +wall_0_wipe_dist = =machine_nozzle_size/2 +speed_print = 30 +speed_wall = =math.ceil(speed_print * 30/30) +speed_wall_0 = =math.ceil(speed_print * 25/30) +speed_topbottom = =math.ceil(speed_print * 25/30) +speed_layer_0 = =math.ceil(speed_print * 20/30) +speed_slowdown_layers = 1 +cool_fan_enabled = True +cool_fan_speed = 50 +cool_fan_speed_max = 100 +cool_min_layer_time_fan_speed_max = 20 +cool_min_layer_time = 11 +cool_fan_full_at_height = =layer_height_0 + 4 * layer_height +cool_min_speed = 10 +support_angle = 50 +material_print_temperature = =default_material_print_temperature + 3 +material_print_temperature_layer_0 = =default_material_print_temperature - 3 +material_flow = 107 +retraction_extra_prime_amount = 0.2 +retraction_min_travel = =3*line_width +retraction_hop_only_when_collides = False +skin_overlap = 5 +support_z_distance = =layer_height*2 +support_bottom_distance = =support_z_distance*0.5 +support_xy_distance = =line_width * 2.5 +support_xy_distance_overhang = =wall_line_width_0 +support_offset = 0.5 +support_interface_density = 100 +prime_tower_enable = True diff --git a/resources/quality/strateo3d/HT0.4/s3d_ht0.4_TPU98A_B.inst.cfg b/resources/quality/strateo3d/HT0.4/s3d_ht0.4_TPU98A_B.inst.cfg new file mode 100644 index 0000000000..46bdc28c7e --- /dev/null +++ b/resources/quality/strateo3d/HT0.4/s3d_ht0.4_TPU98A_B.inst.cfg @@ -0,0 +1,47 @@ +[general] +version = 4 +name = B +definition = strateo3d + +[metadata] +setting_version = 17 +type = quality +quality_type = b +weight = 0 +material = emotiontech_tpu98a +variant = High temp 0.4 + +[values] +layer_height_0 = =round(0.67*machine_nozzle_size, 2) +line_width = =machine_nozzle_size/machine_nozzle_size*0.38 +wall_line_width = =machine_nozzle_size/machine_nozzle_size*0.38 +wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.38 +wall_0_wipe_dist = =machine_nozzle_size/2 +speed_print = 35 +speed_wall = =math.ceil(speed_print * 35/35) +speed_wall_0 = =math.ceil(speed_print * 27/35) +speed_topbottom = =math.ceil(speed_print * 25/35) +speed_layer_0 = =math.ceil(speed_print * 20/35) +speed_slowdown_layers = 1 +cool_fan_enabled = True +cool_fan_speed = 50 +cool_fan_speed_max = 100 +cool_min_layer_time_fan_speed_max = 20 +cool_min_layer_time = 11 +cool_fan_full_at_height = =layer_height_0 + 4 * layer_height +cool_min_speed = 10 +support_angle = 50 +material_print_temperature = =default_material_print_temperature + 5 +material_print_temperature_layer_0 = =default_material_print_temperature +material_flow = 103 +retraction_extra_prime_amount = 0.2 +retraction_min_travel = =3*line_width +retraction_hop_only_when_collides = False +skin_overlap = 5 +support_z_distance = =layer_height*2 +support_bottom_distance = =support_z_distance*0.5 +support_xy_distance = =line_width * 2.5 +support_xy_distance_overhang = =wall_line_width_0 +support_offset = 0.5 +support_interface_density = 100 +prime_tower_enable = True diff --git a/resources/quality/strateo3d/HT0.4/s3d_ht0.4_TPU98A_C.inst.cfg b/resources/quality/strateo3d/HT0.4/s3d_ht0.4_TPU98A_C.inst.cfg new file mode 100644 index 0000000000..57a47f9a3b --- /dev/null +++ b/resources/quality/strateo3d/HT0.4/s3d_ht0.4_TPU98A_C.inst.cfg @@ -0,0 +1,47 @@ +[general] +version = 4 +name = C +definition = strateo3d + +[metadata] +setting_version = 17 +type = quality +quality_type = c +weight = -1 +material = emotiontech_tpu98a +variant = High temp 0.4 + +[values] +layer_height_0 = =round(0.75*machine_nozzle_size, 2) +line_width = =machine_nozzle_size/machine_nozzle_size*0.38 +wall_line_width = =machine_nozzle_size/machine_nozzle_size*0.38 +wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.38 +wall_0_wipe_dist = =machine_nozzle_size/2 +speed_print = 40 +speed_wall = =math.ceil(speed_print * 40/40) +speed_wall_0 = =math.ceil(speed_print * 30/40) +speed_topbottom = =math.ceil(speed_print * 27/40) +speed_layer_0 = =math.ceil(speed_print * 20/40) +speed_slowdown_layers = 1 +cool_fan_enabled = True +cool_fan_speed = 50 +cool_fan_speed_max = 100 +cool_min_layer_time_fan_speed_max = 20 +cool_min_layer_time = 11 +cool_fan_full_at_height = =layer_height_0 + 4 * layer_height +cool_min_speed = 10 +support_angle = 50 +material_print_temperature = =default_material_print_temperature + 7 +material_print_temperature_layer_0 = =default_material_print_temperature + 3 +material_flow = 101 +retraction_extra_prime_amount = 0.2 +retraction_min_travel = =3*line_width +retraction_hop_only_when_collides = False +skin_overlap = 5 +support_z_distance = =layer_height*2 +support_bottom_distance = =support_z_distance*0.5 +support_xy_distance = =line_width * 2.5 +support_xy_distance_overhang = =wall_line_width_0 +support_offset = 0.5 +support_interface_density = 100 +prime_tower_enable = True diff --git a/resources/quality/ultimaker2_plus_connect/um2pc_petg_0.25_normal.inst.cfg b/resources/quality/ultimaker2_plus_connect/um2pc_petg_0.25_normal.inst.cfg index ccfddc8a4d..31c0fc677b 100644 --- a/resources/quality/ultimaker2_plus_connect/um2pc_petg_0.25_normal.inst.cfg +++ b/resources/quality/ultimaker2_plus_connect/um2pc_petg_0.25_normal.inst.cfg @@ -21,4 +21,4 @@ speed_layer_0 = 30 speed_print = 30 top_bottom_thickness = 0.72 wall_thickness = 0.88 -retraction_combing_max_distance = 50 \ No newline at end of file +retraction_combing_max_distance = 8 \ No newline at end of file diff --git a/resources/quality/ultimaker2_plus_connect/um2pc_petg_0.4_draft.inst.cfg b/resources/quality/ultimaker2_plus_connect/um2pc_petg_0.4_draft.inst.cfg index 518c0e8092..e3219b8051 100644 --- a/resources/quality/ultimaker2_plus_connect/um2pc_petg_0.4_draft.inst.cfg +++ b/resources/quality/ultimaker2_plus_connect/um2pc_petg_0.4_draft.inst.cfg @@ -27,4 +27,4 @@ speed_wall_0 = =math.ceil(speed_print * 30 / 45) speed_topbottom = =math.ceil(speed_print * 30 / 45) speed_wall_x = =math.ceil(speed_print * 40 / 45) speed_infill = =math.ceil(speed_print * 45 / 45) -retraction_combing_max_distance = 50 \ No newline at end of file +retraction_combing_max_distance = 8 \ No newline at end of file diff --git a/resources/quality/ultimaker2_plus_connect/um2pc_petg_0.4_fast.inst.cfg b/resources/quality/ultimaker2_plus_connect/um2pc_petg_0.4_fast.inst.cfg index 273bc19a5d..555228ae11 100644 --- a/resources/quality/ultimaker2_plus_connect/um2pc_petg_0.4_fast.inst.cfg +++ b/resources/quality/ultimaker2_plus_connect/um2pc_petg_0.4_fast.inst.cfg @@ -27,4 +27,4 @@ speed_wall_0 = =math.ceil(speed_print * 30 / 45) speed_topbottom = =math.ceil(speed_print * 30 / 45) speed_wall_x = =math.ceil(speed_print * 40 / 45) speed_infill = =math.ceil(speed_print * 45 / 45) -retraction_combing_max_distance = 50 \ No newline at end of file +retraction_combing_max_distance = 8 \ No newline at end of file diff --git a/resources/quality/ultimaker2_plus_connect/um2pc_petg_0.4_normal.inst.cfg b/resources/quality/ultimaker2_plus_connect/um2pc_petg_0.4_normal.inst.cfg index c1c34bb04b..5e72f44f65 100644 --- a/resources/quality/ultimaker2_plus_connect/um2pc_petg_0.4_normal.inst.cfg +++ b/resources/quality/ultimaker2_plus_connect/um2pc_petg_0.4_normal.inst.cfg @@ -22,4 +22,4 @@ speed_print = 45 speed_wall = =math.ceil(speed_print * 30 / 45) top_bottom_thickness = 0.8 wall_thickness = 1.05 -retraction_combing_max_distance = 50 \ No newline at end of file +retraction_combing_max_distance = 8 \ No newline at end of file diff --git a/resources/quality/ultimaker2_plus_connect/um2pc_petg_0.6_normal.inst.cfg b/resources/quality/ultimaker2_plus_connect/um2pc_petg_0.6_normal.inst.cfg index 7871f3cbd1..6782dc02ba 100644 --- a/resources/quality/ultimaker2_plus_connect/um2pc_petg_0.6_normal.inst.cfg +++ b/resources/quality/ultimaker2_plus_connect/um2pc_petg_0.6_normal.inst.cfg @@ -21,4 +21,4 @@ speed_layer_0 = 30 speed_print = 40 top_bottom_thickness = 1.2 wall_thickness = 1.59 -retraction_combing_max_distance = 50 \ No newline at end of file +retraction_combing_max_distance = 8 \ No newline at end of file diff --git a/resources/quality/ultimaker2_plus_connect/um2pc_petg_0.8_normal.inst.cfg b/resources/quality/ultimaker2_plus_connect/um2pc_petg_0.8_normal.inst.cfg index f43f39fd47..932ad0a5e1 100644 --- a/resources/quality/ultimaker2_plus_connect/um2pc_petg_0.8_normal.inst.cfg +++ b/resources/quality/ultimaker2_plus_connect/um2pc_petg_0.8_normal.inst.cfg @@ -21,4 +21,4 @@ speed_layer_0 = 30 speed_print = 40 top_bottom_thickness = 1.2 wall_thickness = 2.1 -retraction_combing_max_distance = 50 \ No newline at end of file +retraction_combing_max_distance = 8 \ No newline at end of file diff --git a/resources/quality/ultimaker3/um3_aa0.25_PETG_Normal_Quality.inst.cfg b/resources/quality/ultimaker3/um3_aa0.25_PETG_Normal_Quality.inst.cfg index 4b679d97c3..1a54a96772 100644 --- a/resources/quality/ultimaker3/um3_aa0.25_PETG_Normal_Quality.inst.cfg +++ b/resources/quality/ultimaker3/um3_aa0.25_PETG_Normal_Quality.inst.cfg @@ -18,5 +18,5 @@ speed_topbottom = =math.ceil(speed_print * 30 / 55) top_bottom_thickness = 0.8 wall_thickness = 0.92 material_print_temperature = =default_material_print_temperature - 5 -retraction_combing_max_distance = 40 +retraction_combing_max_distance = 8 retraction_combing = all diff --git a/resources/quality/ultimaker3/um3_aa0.4_PETG_Draft_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.4_PETG_Draft_Print.inst.cfg index cdafbb03c3..f629b0c15d 100644 --- a/resources/quality/ultimaker3/um3_aa0.4_PETG_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker3/um3_aa0.4_PETG_Draft_Print.inst.cfg @@ -23,5 +23,5 @@ speed_topbottom = =math.ceil(speed_print * 35 / 60) speed_wall = =math.ceil(speed_print * 45 / 60) speed_wall_0 = =math.ceil(speed_wall * 35 / 45) wall_thickness = 1 -retraction_combing_max_distance = 40 +retraction_combing_max_distance = 8 retraction_combing = all diff --git a/resources/quality/ultimaker3/um3_aa0.4_PETG_Fast_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.4_PETG_Fast_Print.inst.cfg index 529adbe70b..7bacf4dba5 100644 --- a/resources/quality/ultimaker3/um3_aa0.4_PETG_Fast_Print.inst.cfg +++ b/resources/quality/ultimaker3/um3_aa0.4_PETG_Fast_Print.inst.cfg @@ -23,5 +23,5 @@ speed_topbottom = =math.ceil(speed_print * 30 / 60) speed_wall = =math.ceil(speed_print * 40 / 60) speed_wall_0 = =math.ceil(speed_wall * 30 / 40) speed_infill = =math.ceil(speed_print * 50 / 60) -retraction_combing_max_distance = 40 +retraction_combing_max_distance = 8 retraction_combing = all diff --git a/resources/quality/ultimaker3/um3_aa0.4_PETG_Normal_Quality.inst.cfg b/resources/quality/ultimaker3/um3_aa0.4_PETG_Normal_Quality.inst.cfg index a9a84a5e35..ff4f8c1a05 100644 --- a/resources/quality/ultimaker3/um3_aa0.4_PETG_Normal_Quality.inst.cfg +++ b/resources/quality/ultimaker3/um3_aa0.4_PETG_Normal_Quality.inst.cfg @@ -23,5 +23,5 @@ speed_layer_0 = =math.ceil(speed_print * 20 / 55) speed_topbottom = =math.ceil(speed_print * 30 / 55) speed_wall = =math.ceil(speed_print * 30 / 55) speed_infill = =math.ceil(speed_print * 45 / 55) -retraction_combing_max_distance = 40 +retraction_combing_max_distance = 8 retraction_combing = all diff --git a/resources/quality/ultimaker3/um3_aa0.8_PETG_Draft_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.8_PETG_Draft_Print.inst.cfg index 77bd2b00f3..a52b0bf923 100644 --- a/resources/quality/ultimaker3/um3_aa0.8_PETG_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker3/um3_aa0.8_PETG_Draft_Print.inst.cfg @@ -20,5 +20,5 @@ prime_tower_enable = True speed_print = 40 speed_topbottom = =math.ceil(speed_print * 25 / 40) speed_wall = =math.ceil(speed_print * 30 / 40) -retraction_combing_max_distance = 40 +retraction_combing_max_distance = 8 retraction_combing = all diff --git a/resources/quality/ultimaker3/um3_aa0.8_PETG_Superdraft_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.8_PETG_Superdraft_Print.inst.cfg index de33f62e3b..fee09b164b 100644 --- a/resources/quality/ultimaker3/um3_aa0.8_PETG_Superdraft_Print.inst.cfg +++ b/resources/quality/ultimaker3/um3_aa0.8_PETG_Superdraft_Print.inst.cfg @@ -22,5 +22,5 @@ speed_print = 45 speed_topbottom = =math.ceil(speed_print * 30 / 45) speed_wall = =math.ceil(speed_print * 40 / 45) speed_wall_0 = =math.ceil(speed_wall * 30 / 40) -retraction_combing_max_distance = 40 +retraction_combing_max_distance = 8 retraction_combing = all diff --git a/resources/quality/ultimaker3/um3_aa0.8_PETG_Verydraft_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.8_PETG_Verydraft_Print.inst.cfg index 4255a30530..c6281c5369 100644 --- a/resources/quality/ultimaker3/um3_aa0.8_PETG_Verydraft_Print.inst.cfg +++ b/resources/quality/ultimaker3/um3_aa0.8_PETG_Verydraft_Print.inst.cfg @@ -21,5 +21,5 @@ prime_tower_enable = True speed_print = 40 speed_topbottom = =math.ceil(speed_print * 25 / 40) speed_wall = =math.ceil(speed_print * 30 / 40) -retraction_combing_max_distance = 40 +retraction_combing_max_distance = 8 retraction_combing = all diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.25_PETG_Normal_Quality.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.25_PETG_Normal_Quality.inst.cfg index e0becb7288..2617a43fbe 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.25_PETG_Normal_Quality.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.25_PETG_Normal_Quality.inst.cfg @@ -12,7 +12,7 @@ material = generic_petg variant = AA 0.25 [values] -retraction_combing_max_distance = 50 +retraction_combing_max_distance = 8 retraction_extrusion_window = 0.5 speed_infill = =math.ceil(speed_print * 40 / 55) speed_topbottom = =math.ceil(speed_print * 30 / 55) diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_PETG_Draft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_PETG_Draft_Print.inst.cfg index f8a72303a0..6b89810bf1 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.4_PETG_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_PETG_Draft_Print.inst.cfg @@ -15,7 +15,7 @@ variant = AA 0.4 material_print_temperature = =default_material_print_temperature + 5 material_initial_print_temperature = =material_print_temperature material_final_print_temperature = =material_print_temperature - 5 -retraction_combing_max_distance = 50 +retraction_combing_max_distance = 8 skin_overlap = 20 speed_print = 60 speed_layer_0 = =math.ceil(speed_print * 20 / 60) diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_PETG_Fast_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_PETG_Fast_Print.inst.cfg index e58ab92f35..5d370e4f4b 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.4_PETG_Fast_Print.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_PETG_Fast_Print.inst.cfg @@ -16,7 +16,7 @@ cool_min_speed = 7 material_print_temperature = =default_material_print_temperature material_initial_print_temperature = =material_print_temperature - 5 material_final_print_temperature = =material_print_temperature - 10 -retraction_combing_max_distance = 50 +retraction_combing_max_distance = 8 speed_print = 60 speed_layer_0 = =math.ceil(speed_print * 20 / 60) speed_topbottom = =math.ceil(speed_print * 30 / 60) diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_PETG_High_Quality.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_PETG_High_Quality.inst.cfg index 616cb9d8dc..a4c38784bc 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.4_PETG_High_Quality.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_PETG_High_Quality.inst.cfg @@ -18,7 +18,7 @@ machine_nozzle_heat_up_speed = 1.5 material_print_temperature = =default_material_print_temperature - 10 material_initial_print_temperature = =material_print_temperature - 10 material_final_print_temperature = =material_print_temperature - 15 -retraction_combing_max_distance = 50 +retraction_combing_max_distance = 8 speed_print = 50 speed_layer_0 = =math.ceil(speed_print * 20 / 50) speed_topbottom = =math.ceil(speed_print * 30 / 50) diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_PETG_Normal_Quality.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_PETG_Normal_Quality.inst.cfg index 70cd7229f7..2f48f82fa0 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.4_PETG_Normal_Quality.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_PETG_Normal_Quality.inst.cfg @@ -17,7 +17,7 @@ machine_nozzle_heat_up_speed = 1.5 material_print_temperature = =default_material_print_temperature - 5 material_initial_print_temperature = =material_print_temperature - 10 material_final_print_temperature = =material_print_temperature - 15 -retraction_combing_max_distance = 50 +retraction_combing_max_distance = 8 speed_print = 55 speed_layer_0 = =math.ceil(speed_print * 20 / 55) speed_topbottom = =math.ceil(speed_print * 30 / 55) diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.8_PETG_Draft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.8_PETG_Draft_Print.inst.cfg index ce6561daea..da6d3a34db 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.8_PETG_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.8_PETG_Draft_Print.inst.cfg @@ -17,7 +17,7 @@ line_width = =machine_nozzle_size * 0.875 material_print_temperature = =default_material_print_temperature - 5 material_standby_temperature = 100 prime_tower_enable = True -retraction_combing_max_distance = 50 +retraction_combing_max_distance = 8 speed_print = 40 speed_topbottom = =math.ceil(speed_print * 25 / 40) speed_wall = =math.ceil(speed_print * 30 / 40) diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.8_PETG_Superdraft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.8_PETG_Superdraft_Print.inst.cfg index 6ce2df3579..ca29c2e9cc 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.8_PETG_Superdraft_Print.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.8_PETG_Superdraft_Print.inst.cfg @@ -17,7 +17,7 @@ line_width = =machine_nozzle_size * 0.875 material_print_temperature = =default_material_print_temperature - 5 material_standby_temperature = 100 prime_tower_enable = True -retraction_combing_max_distance = 50 +retraction_combing_max_distance = 8 speed_print = 45 speed_topbottom = =math.ceil(speed_print * 30 / 45) speed_wall = =math.ceil(speed_print * 40 / 45) diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.8_PETG_Verydraft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.8_PETG_Verydraft_Print.inst.cfg index 1430ae3a4e..adfe9566e1 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.8_PETG_Verydraft_Print.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.8_PETG_Verydraft_Print.inst.cfg @@ -17,7 +17,7 @@ line_width = =machine_nozzle_size * 0.875 material_print_temperature = =default_material_print_temperature - 5 material_standby_temperature = 100 prime_tower_enable = True -retraction_combing_max_distance = 50 +retraction_combing_max_distance = 8 speed_print = 40 speed_topbottom = =math.ceil(speed_print * 25 / 40) speed_wall = =math.ceil(speed_print * 30 / 40) diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.25_PETG_Normal_Quality.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.25_PETG_Normal_Quality.inst.cfg index c32b858491..8c6f6adf61 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.25_PETG_Normal_Quality.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.25_PETG_Normal_Quality.inst.cfg @@ -12,7 +12,7 @@ material = generic_petg variant = AA 0.25 [values] -retraction_combing_max_distance = 50 +retraction_combing_max_distance = 8 retraction_extrusion_window = 0.5 speed_infill = =math.ceil(speed_print * 40 / 55) speed_topbottom = =math.ceil(speed_print * 30 / 55) diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_PETG_Draft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_PETG_Draft_Print.inst.cfg index 7e4fc93025..a0e9583330 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_PETG_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_PETG_Draft_Print.inst.cfg @@ -15,7 +15,7 @@ variant = AA 0.4 material_print_temperature = =default_material_print_temperature + 5 material_initial_print_temperature = =material_print_temperature material_final_print_temperature = =material_print_temperature - 5 -retraction_combing_max_distance = 50 +retraction_combing_max_distance = 8 skin_edge_support_thickness = =0.8 if infill_sparse_density < 30 else 0 skin_overlap = 20 speed_print = 60 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_PETG_Fast_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_PETG_Fast_Print.inst.cfg index 38d2dfe399..2b6713aed4 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_PETG_Fast_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_PETG_Fast_Print.inst.cfg @@ -16,7 +16,7 @@ cool_min_speed = 7 material_print_temperature = =default_material_print_temperature material_initial_print_temperature = =material_print_temperature - 5 material_final_print_temperature = =material_print_temperature - 10 -retraction_combing_max_distance = 50 +retraction_combing_max_distance = 8 speed_print = 60 speed_layer_0 = =math.ceil(speed_print * 20 / 60) speed_topbottom = =math.ceil(speed_print * 30 / 60) diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_PETG_High_Quality.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_PETG_High_Quality.inst.cfg index 41cd4ff765..8e58a3be8e 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_PETG_High_Quality.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_PETG_High_Quality.inst.cfg @@ -18,7 +18,7 @@ machine_nozzle_heat_up_speed = 1.5 material_print_temperature = =default_material_print_temperature - 10 material_initial_print_temperature = =material_print_temperature - 10 material_final_print_temperature = =material_print_temperature - 15 -retraction_combing_max_distance = 50 +retraction_combing_max_distance = 8 speed_print = 50 speed_layer_0 = =math.ceil(speed_print * 20 / 50) speed_topbottom = =math.ceil(speed_print * 30 / 50) diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_PETG_Normal_Quality.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_PETG_Normal_Quality.inst.cfg index 0bf520c116..f52b1a6023 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_PETG_Normal_Quality.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_PETG_Normal_Quality.inst.cfg @@ -17,7 +17,7 @@ machine_nozzle_heat_up_speed = 1.5 material_print_temperature = =default_material_print_temperature - 5 material_initial_print_temperature = =material_print_temperature - 10 material_final_print_temperature = =material_print_temperature - 15 -retraction_combing_max_distance = 50 +retraction_combing_max_distance = 8 speed_print = 55 speed_layer_0 = =math.ceil(speed_print * 20 / 55) speed_topbottom = =math.ceil(speed_print * 30 / 55) diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.8_PETG_Draft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.8_PETG_Draft_Print.inst.cfg index 91aa0d305f..40c7ab37b5 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.8_PETG_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.8_PETG_Draft_Print.inst.cfg @@ -17,7 +17,7 @@ line_width = =machine_nozzle_size * 0.875 material_print_temperature = =default_material_print_temperature - 5 material_standby_temperature = 100 prime_tower_enable = True -retraction_combing_max_distance = 50 +retraction_combing_max_distance = 8 speed_print = 40 speed_topbottom = =math.ceil(speed_print * 25 / 40) speed_wall = =math.ceil(speed_print * 30 / 40) diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.8_PETG_Superdraft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.8_PETG_Superdraft_Print.inst.cfg index 9d8c4720ee..5ccdde4c27 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.8_PETG_Superdraft_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.8_PETG_Superdraft_Print.inst.cfg @@ -17,7 +17,7 @@ line_width = =machine_nozzle_size * 0.875 material_print_temperature = =default_material_print_temperature - 5 material_standby_temperature = 100 prime_tower_enable = True -retraction_combing_max_distance = 50 +retraction_combing_max_distance = 8 speed_print = 45 speed_topbottom = =math.ceil(speed_print * 30 / 45) speed_wall = =math.ceil(speed_print * 40 / 45) diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.8_PETG_Verydraft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.8_PETG_Verydraft_Print.inst.cfg index eada0c7af3..1a7c642630 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.8_PETG_Verydraft_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.8_PETG_Verydraft_Print.inst.cfg @@ -17,7 +17,7 @@ line_width = =machine_nozzle_size * 0.875 material_print_temperature = =default_material_print_temperature - 5 material_standby_temperature = 100 prime_tower_enable = True -retraction_combing_max_distance = 50 +retraction_combing_max_distance = 8 speed_print = 40 speed_topbottom = =math.ceil(speed_print * 25 / 40) speed_wall = =math.ceil(speed_print * 30 / 40) diff --git a/resources/texts/change_log.txt b/resources/texts/change_log.txt index f9c407e44a..df347ef8aa 100644 --- a/resources/texts/change_log.txt +++ b/resources/texts/change_log.txt @@ -1,5 +1,5 @@ [4.10.0] -BETA +For an overview of the new features in Cura 4.10, please watch our video. *Native CAD import plugin Ultimaker Professional and Excellence subscribers can now directly import native CAD files into Ultimaker Cura. @@ -36,6 +36,8 @@ When double clicking on a file in the open project dialog in Digital Factory it - Fixed a bug when the seam was not placed in sharpest corner. - Fixed the gantry height for S-line printers. - Fixed a bug where a model is partially below build plate if center selected model is used. +- Fixed a bug where a tootip arrow appeared when the "Manage printers" button is hovered. +- Fixed a bug where assemblies were not arranged in the center of the build plate. * Printer definitions, profiles and materials. - Add CC0.4 core and materials for S3 and S5. @@ -51,6 +53,8 @@ When double clicking on a file in the open project dialog in Digital Factory it - Mingda D3, D4 and Rock3, contributed by cataclism. - JGAurora A6, contributed by CrissR. +Please, be aware that after version 4.10 Ultimaker Cura will only be supported on operating systems actively maintained by their software manufacturer or community. This means Windows 7 and MacOS 10.13 will no longer be supported. Technically this means Ultimaker will stop testing and developing for such operating systems. However, even though it is no longer supported, there is still a high likelihood the application keeps functioning. + [4.9.1] * PETG Profile update. Ultimaker PETG profiles have been added. The Generic PETG profile for 2.85mm filaments has been updated as well. diff --git a/resources/texts/whats_new/0.html b/resources/texts/whats_new/0.html index 8bbfb163e0..d0a7459099 100644 --- a/resources/texts/whats_new/0.html +++ b/resources/texts/whats_new/0.html @@ -1,3 +1,3 @@

Open native CAD files for Ultimaker Professional and Excellence

-

Ultimaker Professional and Excellence subscribers can now directly import native CAD files into Ultimaker Cura. This provides users with an even more effective workflow by boosting productivity and increasing first-time right results.
-Learn more about our enterprise software or download the Native CAD import plugin.

\ No newline at end of file +

Ultimaker Professional and Excellence subscribers can now directly import native CAD files into Ultimaker Cura. This provides users with an even more effective workflow by boosting productivity and increasing first-time right results.
+Learn more about our enterprise plans to access this feature.

\ No newline at end of file diff --git a/resources/texts/whats_new/2.html b/resources/texts/whats_new/2.html index 6b9be5771e..a6f20cb493 100644 --- a/resources/texts/whats_new/2.html +++ b/resources/texts/whats_new/2.html @@ -1,2 +1,2 @@ -

Get more information!

-

Want more information for Ultimaker Cura 4.10 beta and other exciting developments in the Ultimaker platform? Read the blog post, and don't forget to give us your feedback!

\ No newline at end of file +

Ultimaker PETG print profiles are now available for the Ultimaker 3

+

Ultimaker PETG sets the standard for industrial applications and is suitable for a wide range of use cases thanks to its ease of use and versatility. Ultimaker PETG is now fully supported on the Ultimaker 3. Find out more.

\ No newline at end of file diff --git a/resources/texts/whats_new/3.html b/resources/texts/whats_new/3.html new file mode 100644 index 0000000000..a433453bde --- /dev/null +++ b/resources/texts/whats_new/3.html @@ -0,0 +1,2 @@ +

Flow rate

+

Thanks to Khani3s, we have now added the volumetric flow rate (in mm³/s) to the preview mode color schemes. In addition, we tweaked the minimum/maximum color values, making it easier to optimize your print strategy displayed as the flow, layer thickness, line width and speed.

\ No newline at end of file diff --git a/resources/texts/whats_new/4.html b/resources/texts/whats_new/4.html new file mode 100644 index 0000000000..5997ce2408 --- /dev/null +++ b/resources/texts/whats_new/4.html @@ -0,0 +1,2 @@ +

Learn more!

+

Want more information for Ultimaker Cura 4.10? Read the blog post or watch the video, and don't forget to give us your feedback!

\ No newline at end of file diff --git a/resources/themes/cura-dark-colorblind/icons/sign_in_to_cloud.svg b/resources/themes/cura-dark-colorblind/icons/sign_in_to_cloud.svg deleted file mode 100644 index 09ba300b6a..0000000000 --- a/resources/themes/cura-dark-colorblind/icons/sign_in_to_cloud.svg +++ /dev/null @@ -1,16 +0,0 @@ - - - - Group-cloud Copy - Created with Sketch. - - - - - - - - - - - \ No newline at end of file diff --git a/resources/themes/cura-dark/icons/sign_in_to_cloud.svg b/resources/themes/cura-dark/icons/sign_in_to_cloud.svg deleted file mode 100644 index 09ba300b6a..0000000000 --- a/resources/themes/cura-dark/icons/sign_in_to_cloud.svg +++ /dev/null @@ -1,16 +0,0 @@ - - - - Group-cloud Copy - Created with Sketch. - - - - - - - - - - - \ No newline at end of file diff --git a/resources/themes/cura-dark/theme.json b/resources/themes/cura-dark/theme.json index e3266b923b..457d2092c1 100644 --- a/resources/themes/cura-dark/theme.json +++ b/resources/themes/cura-dark/theme.json @@ -16,13 +16,20 @@ "primary_text": [255, 255, 255, 204], "secondary": [95, 95, 95, 255], - "icon": [204, 204, 204, 255], + "secondary_button": [39, 44, 48, 255], + "secondary_button_hover": [85, 85, 87, 255], + "secondary_button_text": [255, 255, 255, 255], + + "icon": [255, 255, 255, 255], "toolbar_background": [39, 44, 48, 255], - "toolbar_button_active": [95, 95, 95, 255], - "toolbar_button_hover": [95, 95, 95, 255], - "toolbar_button_active_hover": [95, 95, 95, 255], + "toolbar_button_active": [57, 57, 58, 255], + "toolbar_button_hover": [57, 57, 58, 255], + "toolbar_button_active_hover": [57, 57, 58, 255], "main_window_header_button_text_inactive": [128, 128, 128, 255], + "main_window_header_background": [14, 14, 14, 255], + "main_window_header_background_gradient": [32, 32, 32, 255], + "main_window_header_button_background_hovered": [46, 46, 46, 255], "account_sync_state_icon": [255, 255, 255, 204], @@ -32,7 +39,7 @@ "text": [255, 255, 255, 204], "text_detail": [255, 255, 255, 172], - "text_link": [255, 255, 255, 127], + "text_link": [25, 110, 240, 255], "text_inactive": [255, 255, 255, 88], "text_hover": [255, 255, 255, 204], "text_pressed": [255, 255, 255, 204], @@ -87,8 +94,8 @@ "action_button_active": [39, 44, 48, 30], "action_button_active_text": [255, 255, 255, 255], "action_button_active_border": [255, 255, 255, 100], - "action_button_disabled": [19, 24, 28, 255], - "action_button_disabled_text": [200, 200, 200, 80], + "action_button_disabled": [85, 85, 87, 255], + "action_button_disabled_text": [103, 103, 104, 255], "action_button_disabled_border": [255, 255, 255, 30], "scrollbar_background": [39, 44, 48, 0], diff --git a/resources/themes/cura-light-colorblind/icons/sign_in_to_cloud.svg b/resources/themes/cura-light-colorblind/icons/sign_in_to_cloud.svg deleted file mode 100644 index 09ba300b6a..0000000000 --- a/resources/themes/cura-light-colorblind/icons/sign_in_to_cloud.svg +++ /dev/null @@ -1,16 +0,0 @@ - - - - Group-cloud Copy - Created with Sketch. - - - - - - - - - - - \ No newline at end of file diff --git a/resources/themes/cura-light/icons/application.svg b/resources/themes/cura-light/icons/application.svg deleted file mode 100644 index a76323a7d4..0000000000 --- a/resources/themes/cura-light/icons/application.svg +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/resources/themes/cura-light/icons/arrow_bottom.svg b/resources/themes/cura-light/icons/arrow_bottom.svg deleted file mode 100644 index 102f7b54a2..0000000000 --- a/resources/themes/cura-light/icons/arrow_bottom.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/resources/themes/cura-light/icons/arrow_left.svg b/resources/themes/cura-light/icons/arrow_left.svg deleted file mode 100644 index e48cece556..0000000000 --- a/resources/themes/cura-light/icons/arrow_left.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/resources/themes/cura-light/icons/arrow_right.svg b/resources/themes/cura-light/icons/arrow_right.svg deleted file mode 100644 index 6562a3e80b..0000000000 --- a/resources/themes/cura-light/icons/arrow_right.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/resources/themes/cura-light/icons/arrow_top.svg b/resources/themes/cura-light/icons/arrow_top.svg deleted file mode 100644 index 7af5913a32..0000000000 --- a/resources/themes/cura-light/icons/arrow_top.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/resources/themes/cura-light/icons/basic.svg b/resources/themes/cura-light/icons/basic.svg deleted file mode 100644 index b30d0669b3..0000000000 --- a/resources/themes/cura-light/icons/basic.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/resources/themes/cura-light/icons/buildplate.svg b/resources/themes/cura-light/icons/buildplate.svg deleted file mode 100644 index 7505c8204e..0000000000 --- a/resources/themes/cura-light/icons/buildplate.svg +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git a/resources/themes/cura-light/icons/category_adhesion.svg b/resources/themes/cura-light/icons/category_adhesion.svg deleted file mode 100644 index dc119d889a..0000000000 --- a/resources/themes/cura-light/icons/category_adhesion.svg +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - diff --git a/resources/themes/cura-light/icons/category_blackmagic.svg b/resources/themes/cura-light/icons/category_blackmagic.svg deleted file mode 100644 index d4e2b89ba4..0000000000 --- a/resources/themes/cura-light/icons/category_blackmagic.svg +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - ? - - - - - diff --git a/resources/themes/cura-light/icons/category_cool.svg b/resources/themes/cura-light/icons/category_cool.svg deleted file mode 100644 index db74322a2c..0000000000 --- a/resources/themes/cura-light/icons/category_cool.svg +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/resources/themes/cura-light/icons/category_dual.svg b/resources/themes/cura-light/icons/category_dual.svg deleted file mode 100644 index 2a53292379..0000000000 --- a/resources/themes/cura-light/icons/category_dual.svg +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/resources/themes/cura-light/icons/category_experimental.svg b/resources/themes/cura-light/icons/category_experimental.svg deleted file mode 100644 index 9fc7d74880..0000000000 --- a/resources/themes/cura-light/icons/category_experimental.svg +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/resources/themes/cura-light/icons/category_fixes.svg b/resources/themes/cura-light/icons/category_fixes.svg deleted file mode 100644 index 963338088a..0000000000 --- a/resources/themes/cura-light/icons/category_fixes.svg +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/resources/themes/cura-light/icons/category_infill.svg b/resources/themes/cura-light/icons/category_infill.svg deleted file mode 100644 index e1660ca8e2..0000000000 --- a/resources/themes/cura-light/icons/category_infill.svg +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/resources/themes/cura-light/icons/category_layer_height.svg b/resources/themes/cura-light/icons/category_layer_height.svg deleted file mode 100644 index 474e81f14e..0000000000 --- a/resources/themes/cura-light/icons/category_layer_height.svg +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/resources/themes/cura-light/icons/category_machine.svg b/resources/themes/cura-light/icons/category_machine.svg deleted file mode 100644 index 25c84aa4f2..0000000000 --- a/resources/themes/cura-light/icons/category_machine.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/resources/themes/cura-light/icons/category_material.svg b/resources/themes/cura-light/icons/category_material.svg deleted file mode 100644 index 0d8ae42d9d..0000000000 --- a/resources/themes/cura-light/icons/category_material.svg +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/resources/themes/cura-light/icons/category_shell.svg b/resources/themes/cura-light/icons/category_shell.svg deleted file mode 100644 index 61e112d88c..0000000000 --- a/resources/themes/cura-light/icons/category_shell.svg +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - diff --git a/resources/themes/cura-light/icons/category_shield.svg b/resources/themes/cura-light/icons/category_shield.svg deleted file mode 100644 index 99a245936d..0000000000 --- a/resources/themes/cura-light/icons/category_shield.svg +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - diff --git a/resources/themes/cura-light/icons/category_speed.svg b/resources/themes/cura-light/icons/category_speed.svg deleted file mode 100644 index 36d1b3f2e1..0000000000 --- a/resources/themes/cura-light/icons/category_speed.svg +++ /dev/null @@ -1,20 +0,0 @@ - - - - - - - - diff --git a/resources/themes/cura-light/icons/category_support.svg b/resources/themes/cura-light/icons/category_support.svg deleted file mode 100644 index 693e1f5f37..0000000000 --- a/resources/themes/cura-light/icons/category_support.svg +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - diff --git a/resources/themes/cura-light/icons/category_topbottom.svg b/resources/themes/cura-light/icons/category_topbottom.svg deleted file mode 100644 index 7efefbd4bb..0000000000 --- a/resources/themes/cura-light/icons/category_topbottom.svg +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/resources/themes/cura-light/icons/category_travel.svg b/resources/themes/cura-light/icons/category_travel.svg deleted file mode 100644 index 67f5713671..0000000000 --- a/resources/themes/cura-light/icons/category_travel.svg +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/resources/themes/cura-light/icons/category_unknown.svg b/resources/themes/cura-light/icons/category_unknown.svg deleted file mode 100644 index 67f5713671..0000000000 --- a/resources/themes/cura-light/icons/category_unknown.svg +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/resources/themes/cura-light/icons/check.svg b/resources/themes/cura-light/icons/check.svg deleted file mode 100644 index 62b6993763..0000000000 --- a/resources/themes/cura-light/icons/check.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/resources/themes/cura-light/icons/checked.svg b/resources/themes/cura-light/icons/checked.svg deleted file mode 100644 index 22d1278667..0000000000 --- a/resources/themes/cura-light/icons/checked.svg +++ /dev/null @@ -1,12 +0,0 @@ - - - - checked - Created with Sketch. - - - - - - - \ No newline at end of file diff --git a/resources/themes/cura-light/icons/clock.svg b/resources/themes/cura-light/icons/clock.svg deleted file mode 100644 index 0b6cb78881..0000000000 --- a/resources/themes/cura-light/icons/clock.svg +++ /dev/null @@ -1,53 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/resources/themes/cura-light/icons/cross1.svg b/resources/themes/cura-light/icons/cross1.svg deleted file mode 100644 index 63b7a6951c..0000000000 --- a/resources/themes/cura-light/icons/cross1.svg +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/resources/themes/cura-light/icons/cross2.svg b/resources/themes/cura-light/icons/cross2.svg deleted file mode 100644 index 7d4a3a878d..0000000000 --- a/resources/themes/cura-light/icons/cross2.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/resources/themes/cura-light/icons/default/Adhesion.svg b/resources/themes/cura-light/icons/default/Adhesion.svg new file mode 100755 index 0000000000..9848ccca95 --- /dev/null +++ b/resources/themes/cura-light/icons/default/Adhesion.svg @@ -0,0 +1,10 @@ + + + + + + + + + + diff --git a/resources/themes/cura-light/icons/default/ArrowDoubleCircleRight.svg b/resources/themes/cura-light/icons/default/ArrowDoubleCircleRight.svg new file mode 100755 index 0000000000..8c23b85331 --- /dev/null +++ b/resources/themes/cura-light/icons/default/ArrowDoubleCircleRight.svg @@ -0,0 +1,5 @@ + + + + diff --git a/resources/themes/cura-light/icons/default/ArrowFourWay.svg b/resources/themes/cura-light/icons/default/ArrowFourWay.svg new file mode 100755 index 0000000000..885db61589 --- /dev/null +++ b/resources/themes/cura-light/icons/default/ArrowFourWay.svg @@ -0,0 +1,6 @@ + + + + diff --git a/resources/themes/cura-light/icons/default/ArrowReset.svg b/resources/themes/cura-light/icons/default/ArrowReset.svg new file mode 100755 index 0000000000..6e54ece698 --- /dev/null +++ b/resources/themes/cura-light/icons/default/ArrowReset.svg @@ -0,0 +1,5 @@ + + + + \ No newline at end of file diff --git a/resources/themes/cura-light/icons/default/Bandage.svg b/resources/themes/cura-light/icons/default/Bandage.svg new file mode 100755 index 0000000000..74e45f009e --- /dev/null +++ b/resources/themes/cura-light/icons/default/Bandage.svg @@ -0,0 +1,6 @@ + + + + diff --git a/resources/themes/cura-light/icons/default/BlackMagic.svg b/resources/themes/cura-light/icons/default/BlackMagic.svg new file mode 100755 index 0000000000..539b341950 --- /dev/null +++ b/resources/themes/cura-light/icons/default/BlackMagic.svg @@ -0,0 +1,7 @@ + + + + diff --git a/resources/themes/cura-light/icons/default/BlockSupportOverlaps.svg b/resources/themes/cura-light/icons/default/BlockSupportOverlaps.svg new file mode 100644 index 0000000000..21d48f8e9e --- /dev/null +++ b/resources/themes/cura-light/icons/default/BlockSupportOverlaps.svg @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/resources/themes/cura-light/icons/default/Cancel.svg b/resources/themes/cura-light/icons/default/Cancel.svg new file mode 100755 index 0000000000..82992683d8 --- /dev/null +++ b/resources/themes/cura-light/icons/default/Cancel.svg @@ -0,0 +1,5 @@ + + + + diff --git a/resources/themes/cura-light/icons/default/CancelBlock.svg b/resources/themes/cura-light/icons/default/CancelBlock.svg new file mode 100755 index 0000000000..10b7917247 --- /dev/null +++ b/resources/themes/cura-light/icons/default/CancelBlock.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/resources/themes/cura-light/icons/default/CancelCircle.svg b/resources/themes/cura-light/icons/default/CancelCircle.svg new file mode 100755 index 0000000000..40423ffd8d --- /dev/null +++ b/resources/themes/cura-light/icons/default/CancelCircle.svg @@ -0,0 +1,6 @@ + + + + diff --git a/resources/themes/cura-light/icons/default/Check.svg b/resources/themes/cura-light/icons/default/Check.svg new file mode 100755 index 0000000000..c64667efd8 --- /dev/null +++ b/resources/themes/cura-light/icons/default/Check.svg @@ -0,0 +1,4 @@ + + + + diff --git a/resources/themes/cura-light/icons/default/CheckCircle.svg b/resources/themes/cura-light/icons/default/CheckCircle.svg new file mode 100755 index 0000000000..c364a1ecb9 --- /dev/null +++ b/resources/themes/cura-light/icons/default/CheckCircle.svg @@ -0,0 +1,6 @@ + + + + + diff --git a/resources/themes/cura-light/icons/default/ChevronSingleDown.svg b/resources/themes/cura-light/icons/default/ChevronSingleDown.svg new file mode 100755 index 0000000000..f39c7de600 --- /dev/null +++ b/resources/themes/cura-light/icons/default/ChevronSingleDown.svg @@ -0,0 +1,4 @@ + + + + diff --git a/resources/themes/cura-light/icons/default/ChevronSingleLeft.svg b/resources/themes/cura-light/icons/default/ChevronSingleLeft.svg new file mode 100755 index 0000000000..ad59cf483b --- /dev/null +++ b/resources/themes/cura-light/icons/default/ChevronSingleLeft.svg @@ -0,0 +1,4 @@ + + + + diff --git a/resources/themes/cura-light/icons/default/ChevronSingleRight.svg b/resources/themes/cura-light/icons/default/ChevronSingleRight.svg new file mode 100755 index 0000000000..5ee4ce7e82 --- /dev/null +++ b/resources/themes/cura-light/icons/default/ChevronSingleRight.svg @@ -0,0 +1,4 @@ + + + + diff --git a/resources/themes/cura-light/icons/default/ChevronSingleUp.svg b/resources/themes/cura-light/icons/default/ChevronSingleUp.svg new file mode 100755 index 0000000000..80d2e44ac9 --- /dev/null +++ b/resources/themes/cura-light/icons/default/ChevronSingleUp.svg @@ -0,0 +1,4 @@ + + + + diff --git a/resources/themes/cura-light/icons/circle_outline.svg b/resources/themes/cura-light/icons/default/CircleOutline.svg similarity index 81% rename from resources/themes/cura-light/icons/circle_outline.svg rename to resources/themes/cura-light/icons/default/CircleOutline.svg index 3a8fb197f3..6f7cd6aca0 100644 --- a/resources/themes/cura-light/icons/circle_outline.svg +++ b/resources/themes/cura-light/icons/default/CircleOutline.svg @@ -1,4 +1,4 @@ - + \ No newline at end of file diff --git a/resources/themes/cura-light/icons/default/Clock.svg b/resources/themes/cura-light/icons/default/Clock.svg new file mode 100755 index 0000000000..aa00d5d322 --- /dev/null +++ b/resources/themes/cura-light/icons/default/Clock.svg @@ -0,0 +1,5 @@ + + + + diff --git a/resources/themes/cura-light/icons/default/Cloud.svg b/resources/themes/cura-light/icons/default/Cloud.svg new file mode 100755 index 0000000000..97905fea55 --- /dev/null +++ b/resources/themes/cura-light/icons/default/Cloud.svg @@ -0,0 +1,6 @@ + + + + diff --git a/resources/themes/cura-light/icons/default/DualExtrusion.svg b/resources/themes/cura-light/icons/default/DualExtrusion.svg new file mode 100755 index 0000000000..b8cf505d8e --- /dev/null +++ b/resources/themes/cura-light/icons/default/DualExtrusion.svg @@ -0,0 +1,7 @@ + + + + + + + diff --git a/resources/themes/cura-light/icons/default/Experiment.svg b/resources/themes/cura-light/icons/default/Experiment.svg new file mode 100755 index 0000000000..fd40fc30c8 --- /dev/null +++ b/resources/themes/cura-light/icons/default/Experiment.svg @@ -0,0 +1,5 @@ + + + + diff --git a/resources/themes/cura-light/icons/default/Extruder.svg b/resources/themes/cura-light/icons/default/Extruder.svg new file mode 100644 index 0000000000..7c17fa67ca --- /dev/null +++ b/resources/themes/cura-light/icons/default/Extruder.svg @@ -0,0 +1,13 @@ + + + + + + + + + + + diff --git a/resources/themes/cura-light/icons/default/ExtruderColor.svg b/resources/themes/cura-light/icons/default/ExtruderColor.svg new file mode 100644 index 0000000000..ff202e7296 --- /dev/null +++ b/resources/themes/cura-light/icons/default/ExtruderColor.svg @@ -0,0 +1,14 @@ + + + + + + + + + + diff --git a/resources/themes/cura-light/icons/default/Eye.svg b/resources/themes/cura-light/icons/default/Eye.svg new file mode 100755 index 0000000000..9711c56999 --- /dev/null +++ b/resources/themes/cura-light/icons/default/Eye.svg @@ -0,0 +1,6 @@ + + + + diff --git a/resources/themes/cura-light/icons/default/Fan.svg b/resources/themes/cura-light/icons/default/Fan.svg new file mode 100755 index 0000000000..1578e91bcc --- /dev/null +++ b/resources/themes/cura-light/icons/default/Fan.svg @@ -0,0 +1,8 @@ + + + + diff --git a/resources/themes/cura-light/icons/default/Folder.svg b/resources/themes/cura-light/icons/default/Folder.svg new file mode 100755 index 0000000000..e13942ba0c --- /dev/null +++ b/resources/themes/cura-light/icons/default/Folder.svg @@ -0,0 +1,5 @@ + + + + diff --git a/resources/themes/cura-light/icons/default/Formula.svg b/resources/themes/cura-light/icons/default/Formula.svg new file mode 100755 index 0000000000..987489bf44 --- /dev/null +++ b/resources/themes/cura-light/icons/default/Formula.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/resources/themes/cura-light/icons/default/Function.svg b/resources/themes/cura-light/icons/default/Function.svg new file mode 100644 index 0000000000..4947b6d248 --- /dev/null +++ b/resources/themes/cura-light/icons/default/Function.svg @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/resources/themes/cura-light/icons/default/Guide.svg b/resources/themes/cura-light/icons/default/Guide.svg new file mode 100755 index 0000000000..2f3e7caa87 --- /dev/null +++ b/resources/themes/cura-light/icons/default/Guide.svg @@ -0,0 +1,6 @@ + + + + diff --git a/resources/themes/cura-light/icons/default/Hamburger.svg b/resources/themes/cura-light/icons/default/Hamburger.svg new file mode 100755 index 0000000000..762784cbb6 --- /dev/null +++ b/resources/themes/cura-light/icons/default/Hamburger.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/resources/themes/cura-light/icons/default/House.svg b/resources/themes/cura-light/icons/default/House.svg new file mode 100755 index 0000000000..8ee7c34f84 --- /dev/null +++ b/resources/themes/cura-light/icons/default/House.svg @@ -0,0 +1,5 @@ + + + + diff --git a/resources/themes/cura-light/icons/default/Infill0.svg b/resources/themes/cura-light/icons/default/Infill0.svg new file mode 100755 index 0000000000..3764899206 --- /dev/null +++ b/resources/themes/cura-light/icons/default/Infill0.svg @@ -0,0 +1,4 @@ + + + + diff --git a/resources/themes/cura-light/icons/default/Infill1.svg b/resources/themes/cura-light/icons/default/Infill1.svg new file mode 100755 index 0000000000..07e19a15aa --- /dev/null +++ b/resources/themes/cura-light/icons/default/Infill1.svg @@ -0,0 +1,8 @@ + + + + diff --git a/resources/themes/cura-light/icons/default/Infill100.svg b/resources/themes/cura-light/icons/default/Infill100.svg new file mode 100644 index 0000000000..d136666990 --- /dev/null +++ b/resources/themes/cura-light/icons/default/Infill100.svg @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/resources/themes/cura-light/icons/default/Infill2.svg b/resources/themes/cura-light/icons/default/Infill2.svg new file mode 100755 index 0000000000..e61aad960e --- /dev/null +++ b/resources/themes/cura-light/icons/default/Infill2.svg @@ -0,0 +1,7 @@ + + + + diff --git a/resources/themes/cura-light/icons/default/Infill3.svg b/resources/themes/cura-light/icons/default/Infill3.svg new file mode 100755 index 0000000000..3d2daa7e95 --- /dev/null +++ b/resources/themes/cura-light/icons/default/Infill3.svg @@ -0,0 +1,5 @@ + + + + diff --git a/resources/themes/cura-light/icons/default/InfillGradual.svg b/resources/themes/cura-light/icons/default/InfillGradual.svg new file mode 100755 index 0000000000..1d901a887d --- /dev/null +++ b/resources/themes/cura-light/icons/default/InfillGradual.svg @@ -0,0 +1,6 @@ + + + + diff --git a/resources/themes/cura-light/icons/default/Information.svg b/resources/themes/cura-light/icons/default/Information.svg new file mode 100755 index 0000000000..dcfee1087a --- /dev/null +++ b/resources/themes/cura-light/icons/default/Information.svg @@ -0,0 +1,5 @@ + + + + diff --git a/resources/themes/cura-light/icons/default/LayFlat.svg b/resources/themes/cura-light/icons/default/LayFlat.svg new file mode 100755 index 0000000000..3ce87cce68 --- /dev/null +++ b/resources/themes/cura-light/icons/default/LayFlat.svg @@ -0,0 +1,6 @@ + + + + + diff --git a/resources/themes/cura-light/icons/default/LayFlatOnFace.svg b/resources/themes/cura-light/icons/default/LayFlatOnFace.svg new file mode 100755 index 0000000000..1bd3a0f23a --- /dev/null +++ b/resources/themes/cura-light/icons/default/LayFlatOnFace.svg @@ -0,0 +1,5 @@ + + + + diff --git a/resources/themes/cura-light/icons/default/Layers.svg b/resources/themes/cura-light/icons/default/Layers.svg new file mode 100755 index 0000000000..2d802066a1 --- /dev/null +++ b/resources/themes/cura-light/icons/default/Layers.svg @@ -0,0 +1,7 @@ + + + + + diff --git a/resources/themes/cura-light/icons/default/Lightning.svg b/resources/themes/cura-light/icons/default/Lightning.svg new file mode 100644 index 0000000000..08c7e39e39 --- /dev/null +++ b/resources/themes/cura-light/icons/default/Lightning.svg @@ -0,0 +1,5 @@ + + + + diff --git a/resources/themes/cura-light/icons/default/Link.svg b/resources/themes/cura-light/icons/default/Link.svg new file mode 100755 index 0000000000..b0158158dd --- /dev/null +++ b/resources/themes/cura-light/icons/default/Link.svg @@ -0,0 +1,8 @@ + + + + diff --git a/resources/themes/cura-light/icons/default/LinkExternal.svg b/resources/themes/cura-light/icons/default/LinkExternal.svg new file mode 100755 index 0000000000..fd75e4ae06 --- /dev/null +++ b/resources/themes/cura-light/icons/default/LinkExternal.svg @@ -0,0 +1,5 @@ + + + + diff --git a/resources/themes/cura-light/icons/default/Magnifier.svg b/resources/themes/cura-light/icons/default/Magnifier.svg new file mode 100755 index 0000000000..dd8f0a2109 --- /dev/null +++ b/resources/themes/cura-light/icons/default/Magnifier.svg @@ -0,0 +1,5 @@ + + + + diff --git a/resources/themes/cura-light/icons/default/MeshType.svg b/resources/themes/cura-light/icons/default/MeshType.svg new file mode 100755 index 0000000000..8c440378d9 --- /dev/null +++ b/resources/themes/cura-light/icons/default/MeshType.svg @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/resources/themes/cura-light/icons/default/MeshTypeIntersect.svg b/resources/themes/cura-light/icons/default/MeshTypeIntersect.svg new file mode 100755 index 0000000000..485e4a7953 --- /dev/null +++ b/resources/themes/cura-light/icons/default/MeshTypeIntersect.svg @@ -0,0 +1,4 @@ + + + + diff --git a/resources/themes/cura-light/icons/default/MeshTypeNormal.svg b/resources/themes/cura-light/icons/default/MeshTypeNormal.svg new file mode 100755 index 0000000000..3764899206 --- /dev/null +++ b/resources/themes/cura-light/icons/default/MeshTypeNormal.svg @@ -0,0 +1,4 @@ + + + + diff --git a/resources/themes/cura-light/icons/default/MeshTypeSupport.svg b/resources/themes/cura-light/icons/default/MeshTypeSupport.svg new file mode 100755 index 0000000000..7e21d6761d --- /dev/null +++ b/resources/themes/cura-light/icons/default/MeshTypeSupport.svg @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/resources/themes/cura-light/icons/default/Minus.svg b/resources/themes/cura-light/icons/default/Minus.svg new file mode 100755 index 0000000000..c32b6d2de1 --- /dev/null +++ b/resources/themes/cura-light/icons/default/Minus.svg @@ -0,0 +1,4 @@ + + + + diff --git a/resources/themes/cura-light/icons/default/Mirror.svg b/resources/themes/cura-light/icons/default/Mirror.svg new file mode 100755 index 0000000000..5b6bcd9a42 --- /dev/null +++ b/resources/themes/cura-light/icons/default/Mirror.svg @@ -0,0 +1,10 @@ + + + + + + + + + + diff --git a/resources/themes/cura-light/icons/default/Pen.svg b/resources/themes/cura-light/icons/default/Pen.svg new file mode 100755 index 0000000000..375cfca53a --- /dev/null +++ b/resources/themes/cura-light/icons/default/Pen.svg @@ -0,0 +1,4 @@ + + + + diff --git a/resources/themes/cura-light/icons/default/Plugin.svg b/resources/themes/cura-light/icons/default/Plugin.svg new file mode 100755 index 0000000000..516fbfeda6 --- /dev/null +++ b/resources/themes/cura-light/icons/default/Plugin.svg @@ -0,0 +1,5 @@ + + + + diff --git a/resources/themes/cura-light/icons/default/Plus.svg b/resources/themes/cura-light/icons/default/Plus.svg new file mode 100755 index 0000000000..8507121d21 --- /dev/null +++ b/resources/themes/cura-light/icons/default/Plus.svg @@ -0,0 +1,4 @@ + + + + diff --git a/resources/themes/cura-light/icons/default/PrintQuality.svg b/resources/themes/cura-light/icons/default/PrintQuality.svg new file mode 100755 index 0000000000..2af638f6b5 --- /dev/null +++ b/resources/themes/cura-light/icons/default/PrintQuality.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/resources/themes/cura-light/icons/default/PrintShell.svg b/resources/themes/cura-light/icons/default/PrintShell.svg new file mode 100755 index 0000000000..b4aac134d7 --- /dev/null +++ b/resources/themes/cura-light/icons/default/PrintShell.svg @@ -0,0 +1,12 @@ + + + + + + + + + + + + diff --git a/resources/themes/cura-light/icons/default/PrintTopBottom.svg b/resources/themes/cura-light/icons/default/PrintTopBottom.svg new file mode 100644 index 0000000000..97d66fd19c --- /dev/null +++ b/resources/themes/cura-light/icons/default/PrintTopBottom.svg @@ -0,0 +1,10 @@ + + + + + + + + + + diff --git a/resources/themes/cura-light/icons/default/PrintTravel.svg b/resources/themes/cura-light/icons/default/PrintTravel.svg new file mode 100755 index 0000000000..0b7cb888d3 --- /dev/null +++ b/resources/themes/cura-light/icons/default/PrintTravel.svg @@ -0,0 +1,6 @@ + + + + + diff --git a/resources/themes/cura-light/icons/default/Printer.svg b/resources/themes/cura-light/icons/default/Printer.svg new file mode 100755 index 0000000000..3dfb91ac3f --- /dev/null +++ b/resources/themes/cura-light/icons/default/Printer.svg @@ -0,0 +1,4 @@ + + + + diff --git a/resources/themes/cura-light/icons/default/PrinterTriple.svg b/resources/themes/cura-light/icons/default/PrinterTriple.svg new file mode 100755 index 0000000000..5165aee91f --- /dev/null +++ b/resources/themes/cura-light/icons/default/PrinterTriple.svg @@ -0,0 +1,7 @@ + + + + + + + diff --git a/resources/themes/cura-light/icons/default/Quick.svg b/resources/themes/cura-light/icons/default/Quick.svg new file mode 100755 index 0000000000..a05a008393 --- /dev/null +++ b/resources/themes/cura-light/icons/default/Quick.svg @@ -0,0 +1,13 @@ + + + + + + + + + + + + + diff --git a/resources/themes/cura-light/icons/default/Rotate.svg b/resources/themes/cura-light/icons/default/Rotate.svg new file mode 100755 index 0000000000..43e4d51d5e --- /dev/null +++ b/resources/themes/cura-light/icons/default/Rotate.svg @@ -0,0 +1,15 @@ + + + + + + + + + + diff --git a/resources/themes/cura-light/icons/default/Scale.svg b/resources/themes/cura-light/icons/default/Scale.svg new file mode 100755 index 0000000000..2a31c93403 --- /dev/null +++ b/resources/themes/cura-light/icons/default/Scale.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/resources/themes/cura-light/icons/default/ScaleMax.svg b/resources/themes/cura-light/icons/default/ScaleMax.svg new file mode 100755 index 0000000000..62d9710bc8 --- /dev/null +++ b/resources/themes/cura-light/icons/default/ScaleMax.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/resources/themes/cura-light/icons/default/Shield.svg b/resources/themes/cura-light/icons/default/Shield.svg new file mode 100755 index 0000000000..a6f48919e6 --- /dev/null +++ b/resources/themes/cura-light/icons/default/Shield.svg @@ -0,0 +1,5 @@ + + + + diff --git a/resources/themes/cura-light/icons/default/Sliders.svg b/resources/themes/cura-light/icons/default/Sliders.svg new file mode 100755 index 0000000000..1f0b0f5c41 --- /dev/null +++ b/resources/themes/cura-light/icons/default/Sliders.svg @@ -0,0 +1,8 @@ + + + + diff --git a/resources/themes/cura-light/icons/default/Solid.svg b/resources/themes/cura-light/icons/default/Solid.svg new file mode 100644 index 0000000000..608a56a3e3 --- /dev/null +++ b/resources/themes/cura-light/icons/default/Solid.svg @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/resources/themes/cura-light/icons/default/SpeedOMeter.svg b/resources/themes/cura-light/icons/default/SpeedOMeter.svg new file mode 100755 index 0000000000..4f5ba6b3bd --- /dev/null +++ b/resources/themes/cura-light/icons/default/SpeedOMeter.svg @@ -0,0 +1,7 @@ + + + + diff --git a/resources/themes/cura-light/icons/default/Spool.svg b/resources/themes/cura-light/icons/default/Spool.svg new file mode 100755 index 0000000000..fcc2d19f77 --- /dev/null +++ b/resources/themes/cura-light/icons/default/Spool.svg @@ -0,0 +1,6 @@ + + + + diff --git a/resources/themes/cura-light/icons/default/Sputnik.svg b/resources/themes/cura-light/icons/default/Sputnik.svg new file mode 100755 index 0000000000..0273f611c3 --- /dev/null +++ b/resources/themes/cura-light/icons/default/Sputnik.svg @@ -0,0 +1,9 @@ + + + + diff --git a/resources/themes/cura-light/icons/default/Star.svg b/resources/themes/cura-light/icons/default/Star.svg new file mode 100755 index 0000000000..15b8776c31 --- /dev/null +++ b/resources/themes/cura-light/icons/default/Star.svg @@ -0,0 +1,5 @@ + + + + diff --git a/resources/themes/cura-light/icons/default/StarFilled.svg b/resources/themes/cura-light/icons/default/StarFilled.svg new file mode 100755 index 0000000000..2b085dd3f5 --- /dev/null +++ b/resources/themes/cura-light/icons/default/StarFilled.svg @@ -0,0 +1,4 @@ + + + + diff --git a/resources/themes/cura-light/icons/default/Support.svg b/resources/themes/cura-light/icons/default/Support.svg new file mode 100755 index 0000000000..e6afd2956d --- /dev/null +++ b/resources/themes/cura-light/icons/default/Support.svg @@ -0,0 +1,10 @@ + + + + + + + + + diff --git a/resources/themes/cura-light/icons/default/SupportBlocker.svg b/resources/themes/cura-light/icons/default/SupportBlocker.svg new file mode 100755 index 0000000000..1e170b05e9 --- /dev/null +++ b/resources/themes/cura-light/icons/default/SupportBlocker.svg @@ -0,0 +1,9 @@ + + + + + + + + diff --git a/resources/themes/cura-light/icons/default/ThreeDots.svg b/resources/themes/cura-light/icons/default/ThreeDots.svg new file mode 100755 index 0000000000..a73e40d056 --- /dev/null +++ b/resources/themes/cura-light/icons/default/ThreeDots.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/resources/themes/cura-light/icons/default/UltimakerCura.svg b/resources/themes/cura-light/icons/default/UltimakerCura.svg new file mode 100755 index 0000000000..a4f208602b --- /dev/null +++ b/resources/themes/cura-light/icons/default/UltimakerCura.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/resources/themes/cura-light/icons/default/View3D.svg b/resources/themes/cura-light/icons/default/View3D.svg new file mode 100755 index 0000000000..0a106fa98d --- /dev/null +++ b/resources/themes/cura-light/icons/default/View3D.svg @@ -0,0 +1,6 @@ + + + + diff --git a/resources/themes/cura-light/icons/default/ViewFront.svg b/resources/themes/cura-light/icons/default/ViewFront.svg new file mode 100755 index 0000000000..fdd379fcf9 --- /dev/null +++ b/resources/themes/cura-light/icons/default/ViewFront.svg @@ -0,0 +1,5 @@ + + + + diff --git a/resources/themes/cura-light/icons/default/ViewLeft.svg b/resources/themes/cura-light/icons/default/ViewLeft.svg new file mode 100755 index 0000000000..1dc50f74b7 --- /dev/null +++ b/resources/themes/cura-light/icons/default/ViewLeft.svg @@ -0,0 +1,5 @@ + + + + diff --git a/resources/themes/cura-light/icons/default/ViewRight.svg b/resources/themes/cura-light/icons/default/ViewRight.svg new file mode 100755 index 0000000000..c05bde40fa --- /dev/null +++ b/resources/themes/cura-light/icons/default/ViewRight.svg @@ -0,0 +1,5 @@ + + + + diff --git a/resources/themes/cura-light/icons/default/ViewTop.svg b/resources/themes/cura-light/icons/default/ViewTop.svg new file mode 100755 index 0000000000..dea916e669 --- /dev/null +++ b/resources/themes/cura-light/icons/default/ViewTop.svg @@ -0,0 +1,5 @@ + + + + diff --git a/resources/themes/cura-light/icons/default/Warning.svg b/resources/themes/cura-light/icons/default/Warning.svg new file mode 100755 index 0000000000..828e866435 --- /dev/null +++ b/resources/themes/cura-light/icons/default/Warning.svg @@ -0,0 +1,5 @@ + + + + diff --git a/resources/themes/cura-light/icons/dense.svg b/resources/themes/cura-light/icons/dense.svg deleted file mode 100644 index a8f65fecc7..0000000000 --- a/resources/themes/cura-light/icons/dense.svg +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/resources/themes/cura-light/icons/deprecated_icons.json b/resources/themes/cura-light/icons/deprecated_icons.json new file mode 100644 index 0000000000..df286cffc7 --- /dev/null +++ b/resources/themes/cura-light/icons/deprecated_icons.json @@ -0,0 +1,306 @@ +{ + "notice": { + "new_icon": "Information", + "size": "default" + }, + "info": { + "new_icon": "Information", + "size": "default" + }, + "plus": { + "new_icon": "Plus", + "size": "default" + }, + "cross1": { + "new_icon": "Cancel", + "size": "default" + }, + "application": { + "new_icon": "UltimakerCura", + "size": "default" + }, + "printer_single": { + "new_icon": "Printer", + "size": "default" + }, + "category_material": { + "new_icon": "Spool", + "size": "default" + }, + "settings": { + "new_icon": "Sliders", + "size": "default" + }, + "plugin": { + "new_icon": "Plugin", + "size": "default" + }, + "external_link": { + "new_icon": "LinkExternal", + "size": "default" + }, + "arrow_top": { + "new_icon": "ChevronSingleUp", + "size": "default" + }, + "arrow_bottom": { + "new_icon": "ChevronSingleDown", + "size": "default" + }, + "arrow_right": { + "new_icon": "ChevronSingleRight", + "size": "default" + }, + "pos_normal": { + "new_icon": "Infill0", + "size": "default" + }, + "pos_print_as_support": { + "new_icon": "MeshTypeSupport", + "size": "default" + }, + "pos_modify_overlaps": { + "new_icon": "MeshTypeIntersect", + "size": "default" + }, + "pos_modify_dont_support_overlap": { + "new_icon": "BlockSupportOverlaps", + "size": "default" + }, + "minus": { + "new_icon": "Minus", + "size": "default" + }, + "load": { + "new_icon": "Folder", + "size": "default" + }, + "extruder_button": { + "new_icon": "Extruder", + "size": "medium" + }, + "category_adhesion": { + "new_icon": "Adhesion", + "size": "default" + }, + "category_machine": { + "new_icon": "Printer", + "size": "default" + }, + "category_layer_height": { + "new_icon": "PrintQuality", + "size": "default" + }, + "category_shell": { + "new_icon": "PrintShell", + "size": "default" + }, + "category_topbottom": { + "new_icon": "PrintTopBottom", + "size": "default" + }, + "category_infill": { + "new_icon": "Infill1", + "size": "default" + }, + "category_speed": { + "new_icon": "SpeedOMeter", + "size": "default" + }, + "category_travel": { + "new_icon": "PrintTravel", + "size": "default" + }, + "category_cool": { + "new_icon": "Fan", + "size": "default" + }, + "category_support": { + "new_icon": "Support", + "size": "default" + }, + "category_dual": { + "new_icon": "DualExtrusion", + "size": "default" + }, + "category_fixes": { + "new_icon": "Bandage", + "size": "default" + }, + "category_blackmagic": { + "new_icon": "BlackMagic", + "size": "default" + }, + "category_experimental": { + "new_icon": "Experiment", + "size": "default" + }, + "circle_outline": { + "new_icon": "CircleOutline", + "size": "default" + }, + "update": { + "new_icon": "ArrowDoubleCircleRight", + "size": "default" + }, + "checked": { + "new_icon": "CheckCircle", + "size": "default" + }, + "warning_light": { + "new_icon": "Warning", + "size": "default" + }, + "clock": { + "new_icon": "Clock", + "size": "default" + }, + "spool": { + "new_icon": "Spool", + "size": "default" + }, + "warning": { + "new_icon": "Warning", + "size": "default" + }, + "check": { + "new_icon": "Check", + "size": "default" + }, + "pencil": { + "new_icon": "Pencil", + "size": "default" + }, + "printing_guideline": { + "new_icon": "Guide", + "size": "default" + }, + "favorites_star_full": { + "new_icon": "StarFilled", + "size": "default" + }, + "favorites_star_empty": { + "new_icon": "Star", + "size": "default" + }, + "resize": { + "new_icon": "ThreeDots", + "size": "default" + }, + "gradual": { + "new_icon": "InfillGradual", + "size": "default" + }, + "hollow": { + "new_icon": "Infill0", + "size": "default" + }, + "sparse": { + "new_icon": "Infill3", + "size": "default" + }, + "dense": { + "new_icon": "Infill2", + "size": "default" + }, + "solid": { + "new_icon": "Solid", + "size": "default" + }, + "reset": { + "new_icon": "ArrowReset", + "size": "default" + }, + "arrow_left": { + "new_icon": "ChevronSingleLeft", + "size": "default" + }, + "home": { + "new_icon": "House", + "size": "default" + }, + "printer_group": { + "new_icon": "PrinterTriple", + "size": "medium" + }, + "formula": { + "new_icon": "Function", + "size": "default" + }, + "search": { + "new_icon": "Magnifier", + "size": "default" + }, + "menu": { + "new_icon": "Hamburger", + "size": "default" + }, + "view_3d": { + "new_icon": "View3D", + "size": "default" + }, + "view_layer": { + "new_icon": "Layers", + "size": "default" + }, + "view_front": { + "new_icon": "ViewFront", + "size": "default" + }, + "view_top": { + "new_icon": "ViewTop", + "size": "default" + }, + "view_left": { + "new_icon": "ViewLeft", + "size": "default" + }, + "view_right": { + "new_icon": "ViewRight", + "size": "default" + }, + "package": { + "new_icon": "Plugin", + "size": "default" + }, + "material_spool": { + "new_icon": "Spool", + "size": "default" + }, + "dot": { + "new_icon": "Dot", + "size": "low" + }, + "mirror": { + "new_icon": "Mirror", + "size": "default" + }, + "rotate_reset": { + "new_icon": "ArrowReset", + "size": "default" + }, + "rotate_layflat": { + "new_icon": "LayFlat", + "size": "default" + }, + "rotate_face_layflat": { + "new_icon": "LayFlatOnFace", + "size": "default" + }, + "rotate": { + "new_icon": "Rotate", + "size": "default" + }, + "scale_reset": { + "new_icon": "ArrowReset", + "size": "default" + }, + "scale": { + "new_icon": "Scale", + "size": "default" + }, + "translate": { + "new_icon": "ArrowFourWay", + "size": "default" + } +} \ No newline at end of file diff --git a/resources/themes/cura-light/icons/drop_down_button.svg b/resources/themes/cura-light/icons/drop_down_button.svg deleted file mode 100644 index 18748e6d70..0000000000 --- a/resources/themes/cura-light/icons/drop_down_button.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file diff --git a/resources/themes/cura-light/icons/external_link.svg b/resources/themes/cura-light/icons/external_link.svg deleted file mode 100644 index a2130fb97b..0000000000 --- a/resources/themes/cura-light/icons/external_link.svg +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/resources/themes/cura-light/icons/extruder_button.svg b/resources/themes/cura-light/icons/extruder_button.svg deleted file mode 100644 index c79ba5c5df..0000000000 --- a/resources/themes/cura-light/icons/extruder_button.svg +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git a/resources/themes/cura-light/icons/favorites_star_empty.svg b/resources/themes/cura-light/icons/favorites_star_empty.svg deleted file mode 100644 index bb1205e7a7..0000000000 --- a/resources/themes/cura-light/icons/favorites_star_empty.svg +++ /dev/null @@ -1,8 +0,0 @@ - - - - - diff --git a/resources/themes/cura-light/icons/favorites_star_full.svg b/resources/themes/cura-light/icons/favorites_star_full.svg deleted file mode 100644 index aad45c5d02..0000000000 --- a/resources/themes/cura-light/icons/favorites_star_full.svg +++ /dev/null @@ -1,6 +0,0 @@ - - - - - diff --git a/resources/themes/cura-light/icons/formula.svg b/resources/themes/cura-light/icons/formula.svg deleted file mode 100644 index ae810bc014..0000000000 --- a/resources/themes/cura-light/icons/formula.svg +++ /dev/null @@ -1,53 +0,0 @@ - - - - - - image/svg+xml - - - - - - - - diff --git a/resources/themes/cura-light/icons/gradual.svg b/resources/themes/cura-light/icons/gradual.svg deleted file mode 100644 index ed7f301e18..0000000000 --- a/resources/themes/cura-light/icons/gradual.svg +++ /dev/null @@ -1,102 +0,0 @@ - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - diff --git a/resources/themes/cura-light/icons/group.svg b/resources/themes/cura-light/icons/group.svg deleted file mode 100644 index 0debb0f300..0000000000 --- a/resources/themes/cura-light/icons/group.svg +++ /dev/null @@ -1,12 +0,0 @@ - - - - - diff --git a/resources/themes/cura-light/icons/hollow.svg b/resources/themes/cura-light/icons/hollow.svg deleted file mode 100644 index a63bfd9bfc..0000000000 --- a/resources/themes/cura-light/icons/hollow.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/resources/themes/cura-light/icons/home.svg b/resources/themes/cura-light/icons/home.svg deleted file mode 100644 index a355aa07f6..0000000000 --- a/resources/themes/cura-light/icons/home.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/resources/themes/cura-light/icons/info.svg b/resources/themes/cura-light/icons/info.svg deleted file mode 100644 index 9896b3dac8..0000000000 --- a/resources/themes/cura-light/icons/info.svg +++ /dev/null @@ -1,13 +0,0 @@ - - - - Icon/ info - Created with Sketch. - - - - - - - - \ No newline at end of file diff --git a/resources/themes/cura-light/icons/link.svg b/resources/themes/cura-light/icons/link.svg deleted file mode 100644 index 12b3abbe73..0000000000 --- a/resources/themes/cura-light/icons/link.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/resources/themes/cura-light/icons/load.svg b/resources/themes/cura-light/icons/load.svg deleted file mode 100644 index 7b3e966634..0000000000 --- a/resources/themes/cura-light/icons/load.svg +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/resources/themes/cura-light/icons/low/CheckBlueBG.svg b/resources/themes/cura-light/icons/low/CheckBlueBG.svg new file mode 100644 index 0000000000..d4fa12a354 --- /dev/null +++ b/resources/themes/cura-light/icons/low/CheckBlueBG.svg @@ -0,0 +1,4 @@ + + + + diff --git a/resources/themes/cura-light/icons/low/CloudBadge.svg b/resources/themes/cura-light/icons/low/CloudBadge.svg new file mode 100644 index 0000000000..e37fb324d4 --- /dev/null +++ b/resources/themes/cura-light/icons/low/CloudBadge.svg @@ -0,0 +1,5 @@ + + + + diff --git a/resources/themes/cura-light/icons/dot.svg b/resources/themes/cura-light/icons/low/Dot.svg similarity index 59% rename from resources/themes/cura-light/icons/dot.svg rename to resources/themes/cura-light/icons/low/Dot.svg index 79244caea4..188a487287 100644 --- a/resources/themes/cura-light/icons/dot.svg +++ b/resources/themes/cura-light/icons/low/Dot.svg @@ -1,3 +1,3 @@ - + diff --git a/resources/themes/cura-light/icons/material_spool.svg b/resources/themes/cura-light/icons/material_spool.svg deleted file mode 100644 index 66cc02a57b..0000000000 --- a/resources/themes/cura-light/icons/material_spool.svg +++ /dev/null @@ -1,8 +0,0 @@ - - - - - diff --git a/resources/themes/cura-light/icons/medium/Extruder.svg b/resources/themes/cura-light/icons/medium/Extruder.svg new file mode 100644 index 0000000000..775505952a --- /dev/null +++ b/resources/themes/cura-light/icons/medium/Extruder.svg @@ -0,0 +1,5 @@ + + + + diff --git a/resources/themes/cura-light/icons/medium/ExtruderColor.svg b/resources/themes/cura-light/icons/medium/ExtruderColor.svg new file mode 100644 index 0000000000..cd4452b246 --- /dev/null +++ b/resources/themes/cura-light/icons/medium/ExtruderColor.svg @@ -0,0 +1,14 @@ + + + + + + + + + + diff --git a/resources/themes/cura-light/icons/medium/Folder.svg b/resources/themes/cura-light/icons/medium/Folder.svg new file mode 100644 index 0000000000..8dc9b5ea9f --- /dev/null +++ b/resources/themes/cura-light/icons/medium/Folder.svg @@ -0,0 +1,11 @@ + + + + + + + + + diff --git a/resources/themes/cura-light/icons/medium/Printer.svg b/resources/themes/cura-light/icons/medium/Printer.svg new file mode 100644 index 0000000000..ef67996d48 --- /dev/null +++ b/resources/themes/cura-light/icons/medium/Printer.svg @@ -0,0 +1,13 @@ + + + + + + + + + + + + diff --git a/resources/themes/cura-light/icons/medium/PrinterTriple.svg b/resources/themes/cura-light/icons/medium/PrinterTriple.svg new file mode 100644 index 0000000000..f036565293 --- /dev/null +++ b/resources/themes/cura-light/icons/medium/PrinterTriple.svg @@ -0,0 +1,7 @@ + + + + + + + diff --git a/resources/themes/cura-light/icons/medium/Sliders.svg b/resources/themes/cura-light/icons/medium/Sliders.svg new file mode 100644 index 0000000000..91bd9ae0fd --- /dev/null +++ b/resources/themes/cura-light/icons/medium/Sliders.svg @@ -0,0 +1,17 @@ + + + + + + + + + + + + + + + + diff --git a/resources/themes/cura-light/icons/menu.svg b/resources/themes/cura-light/icons/menu.svg deleted file mode 100644 index 85fbfb072c..0000000000 --- a/resources/themes/cura-light/icons/menu.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/resources/themes/cura-light/icons/minus.svg b/resources/themes/cura-light/icons/minus.svg deleted file mode 100644 index 22f2d2910d..0000000000 --- a/resources/themes/cura-light/icons/minus.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/resources/themes/cura-light/icons/mirror.svg b/resources/themes/cura-light/icons/mirror.svg deleted file mode 100644 index 2a53292379..0000000000 --- a/resources/themes/cura-light/icons/mirror.svg +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/resources/themes/cura-light/icons/notice.svg b/resources/themes/cura-light/icons/notice.svg deleted file mode 100644 index 36154d6729..0000000000 --- a/resources/themes/cura-light/icons/notice.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file diff --git a/resources/themes/cura-light/icons/package.svg b/resources/themes/cura-light/icons/package.svg deleted file mode 100644 index 4f74a43c42..0000000000 --- a/resources/themes/cura-light/icons/package.svg +++ /dev/null @@ -1,7 +0,0 @@ - - - - - diff --git a/resources/themes/cura-light/icons/pencil.svg b/resources/themes/cura-light/icons/pencil.svg deleted file mode 100644 index d17c09884d..0000000000 --- a/resources/themes/cura-light/icons/pencil.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/resources/themes/cura-light/icons/play.svg b/resources/themes/cura-light/icons/play.svg deleted file mode 100644 index 04aea11a9b..0000000000 --- a/resources/themes/cura-light/icons/play.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file diff --git a/resources/themes/cura-light/icons/plugin.svg b/resources/themes/cura-light/icons/plugin.svg deleted file mode 100644 index 5773c906ee..0000000000 --- a/resources/themes/cura-light/icons/plugin.svg +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/resources/themes/cura-light/icons/plus.svg b/resources/themes/cura-light/icons/plus.svg deleted file mode 100644 index 211cdf6d23..0000000000 --- a/resources/themes/cura-light/icons/plus.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/resources/themes/cura-light/icons/pos_modify_dont_support_overlap.svg b/resources/themes/cura-light/icons/pos_modify_dont_support_overlap.svg deleted file mode 100644 index 124e95f558..0000000000 --- a/resources/themes/cura-light/icons/pos_modify_dont_support_overlap.svg +++ /dev/null @@ -1,26 +0,0 @@ - - - - pms_modify_dont_support_overlap - Created with Sketch. - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/resources/themes/cura-light/icons/pos_modify_overlaps.svg b/resources/themes/cura-light/icons/pos_modify_overlaps.svg deleted file mode 100644 index a664e820a6..0000000000 --- a/resources/themes/cura-light/icons/pos_modify_overlaps.svg +++ /dev/null @@ -1,17 +0,0 @@ - - - - pms_modify_overlaps - Created with Sketch. - - - - - - - - - - - - \ No newline at end of file diff --git a/resources/themes/cura-light/icons/pos_normal.svg b/resources/themes/cura-light/icons/pos_normal.svg deleted file mode 100644 index 8a49ef3a00..0000000000 --- a/resources/themes/cura-light/icons/pos_normal.svg +++ /dev/null @@ -1,9 +0,0 @@ - - - - pms_Normal - Created with Sketch. - - - - \ No newline at end of file diff --git a/resources/themes/cura-light/icons/pos_print_as_support.svg b/resources/themes/cura-light/icons/pos_print_as_support.svg deleted file mode 100644 index 3562ca1fe0..0000000000 --- a/resources/themes/cura-light/icons/pos_print_as_support.svg +++ /dev/null @@ -1,14 +0,0 @@ - - - - pms_printassupport - Created with Sketch. - - - - - - - - - \ No newline at end of file diff --git a/resources/themes/cura-light/icons/print_time.svg b/resources/themes/cura-light/icons/print_time.svg deleted file mode 100644 index 0c5d4ed6a2..0000000000 --- a/resources/themes/cura-light/icons/print_time.svg +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/resources/themes/cura-light/icons/printer_cloud_connected.svg b/resources/themes/cura-light/icons/printer_cloud_connected.svg deleted file mode 100644 index 3bc94a05e7..0000000000 --- a/resources/themes/cura-light/icons/printer_cloud_connected.svg +++ /dev/null @@ -1,11 +0,0 @@ - - - - Artboard Copy 2 - Created with Sketch. - - - - - - \ No newline at end of file diff --git a/resources/themes/cura-light/icons/printer_cloud_not_available.svg b/resources/themes/cura-light/icons/printer_cloud_not_available.svg deleted file mode 100644 index 248df27338..0000000000 --- a/resources/themes/cura-light/icons/printer_cloud_not_available.svg +++ /dev/null @@ -1,18 +0,0 @@ - - - - Artboard Copy 4 - Created with Sketch. - - - - - - - - - - - - - \ No newline at end of file diff --git a/resources/themes/cura-light/icons/printer_connected.svg b/resources/themes/cura-light/icons/printer_connected.svg deleted file mode 100644 index a8ff015a9d..0000000000 --- a/resources/themes/cura-light/icons/printer_connected.svg +++ /dev/null @@ -1,13 +0,0 @@ - - - - Connected - Created with Sketch. - - - - - - - - \ No newline at end of file diff --git a/resources/themes/cura-light/icons/printer_group.svg b/resources/themes/cura-light/icons/printer_group.svg deleted file mode 100644 index 5e439faca4..0000000000 --- a/resources/themes/cura-light/icons/printer_group.svg +++ /dev/null @@ -1,20 +0,0 @@ - - - - Icon/ group printer/ disconnected - Created with Sketch. - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/resources/themes/cura-light/icons/printer_single.svg b/resources/themes/cura-light/icons/printer_single.svg deleted file mode 100644 index 69c4e212bc..0000000000 --- a/resources/themes/cura-light/icons/printer_single.svg +++ /dev/null @@ -1,13 +0,0 @@ - - - - Icon/ single printer/ disconnected - Created with Sketch. - - - - - - - - \ No newline at end of file diff --git a/resources/themes/cura-light/icons/printing_guideline.svg b/resources/themes/cura-light/icons/printing_guideline.svg deleted file mode 100644 index d306d046f9..0000000000 --- a/resources/themes/cura-light/icons/printing_guideline.svg +++ /dev/null @@ -1,9 +0,0 @@ - - - - Icon/ guideline on hover - Created with Sketch. - - - - \ No newline at end of file diff --git a/resources/themes/cura-light/icons/printsetup.svg b/resources/themes/cura-light/icons/printsetup.svg deleted file mode 100644 index 67f5713671..0000000000 --- a/resources/themes/cura-light/icons/printsetup.svg +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/resources/themes/cura-light/icons/quick.svg b/resources/themes/cura-light/icons/quick.svg deleted file mode 100644 index f5261e1e5b..0000000000 --- a/resources/themes/cura-light/icons/quick.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/resources/themes/cura-light/icons/reset.svg b/resources/themes/cura-light/icons/reset.svg deleted file mode 100644 index df95e2c554..0000000000 --- a/resources/themes/cura-light/icons/reset.svg +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/resources/themes/cura-light/icons/resize.svg b/resources/themes/cura-light/icons/resize.svg deleted file mode 100644 index d6a16649e1..0000000000 --- a/resources/themes/cura-light/icons/resize.svg +++ /dev/null @@ -1,15 +0,0 @@ - - - - Group - Created with Sketch. - - - - - - - - - - \ No newline at end of file diff --git a/resources/themes/cura-light/icons/rotate.svg b/resources/themes/cura-light/icons/rotate.svg deleted file mode 100644 index 5944ad7ce9..0000000000 --- a/resources/themes/cura-light/icons/rotate.svg +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/resources/themes/cura-light/icons/rotate_face_layflat.svg b/resources/themes/cura-light/icons/rotate_face_layflat.svg deleted file mode 100644 index 261a624cf0..0000000000 --- a/resources/themes/cura-light/icons/rotate_face_layflat.svg +++ /dev/null @@ -1,12 +0,0 @@ - - - - select face lay flat - Created with Sketch. - - - - - - - \ No newline at end of file diff --git a/resources/themes/cura-light/icons/rotate_layflat.svg b/resources/themes/cura-light/icons/rotate_layflat.svg deleted file mode 100644 index b2fe5c84b8..0000000000 --- a/resources/themes/cura-light/icons/rotate_layflat.svg +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/resources/themes/cura-light/icons/rotate_reset.svg b/resources/themes/cura-light/icons/rotate_reset.svg deleted file mode 100644 index c953bceffa..0000000000 --- a/resources/themes/cura-light/icons/rotate_reset.svg +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/resources/themes/cura-light/icons/scale.svg b/resources/themes/cura-light/icons/scale.svg deleted file mode 100644 index 2db809b7e7..0000000000 --- a/resources/themes/cura-light/icons/scale.svg +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/resources/themes/cura-light/icons/scale_max.svg b/resources/themes/cura-light/icons/scale_max.svg deleted file mode 100644 index f3bb75b399..0000000000 --- a/resources/themes/cura-light/icons/scale_max.svg +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - diff --git a/resources/themes/cura-light/icons/scale_reset.svg b/resources/themes/cura-light/icons/scale_reset.svg deleted file mode 100644 index 77210be8c5..0000000000 --- a/resources/themes/cura-light/icons/scale_reset.svg +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - diff --git a/resources/themes/cura-light/icons/search.svg b/resources/themes/cura-light/icons/search.svg deleted file mode 100644 index a9ccb612fd..0000000000 --- a/resources/themes/cura-light/icons/search.svg +++ /dev/null @@ -1,21 +0,0 @@ - - - - Shape - Created with Sketch. - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/resources/themes/cura-light/icons/setting_per_object.svg b/resources/themes/cura-light/icons/setting_per_object.svg deleted file mode 100644 index f4cfb3b145..0000000000 --- a/resources/themes/cura-light/icons/setting_per_object.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/resources/themes/cura-light/icons/settings.svg b/resources/themes/cura-light/icons/settings.svg deleted file mode 100644 index b96970307e..0000000000 --- a/resources/themes/cura-light/icons/settings.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/resources/themes/cura-light/icons/solid.svg b/resources/themes/cura-light/icons/solid.svg deleted file mode 100644 index ed44f367b3..0000000000 --- a/resources/themes/cura-light/icons/solid.svg +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - diff --git a/resources/themes/cura-light/icons/sparse.svg b/resources/themes/cura-light/icons/sparse.svg deleted file mode 100644 index 91f8858326..0000000000 --- a/resources/themes/cura-light/icons/sparse.svg +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - diff --git a/resources/themes/cura-light/icons/spool.svg b/resources/themes/cura-light/icons/spool.svg deleted file mode 100644 index 0d8ae42d9d..0000000000 --- a/resources/themes/cura-light/icons/spool.svg +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/resources/themes/cura-light/icons/star.svg b/resources/themes/cura-light/icons/star.svg deleted file mode 100644 index f6f91238e4..0000000000 --- a/resources/themes/cura-light/icons/star.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/resources/themes/cura-light/icons/star_empty.svg b/resources/themes/cura-light/icons/star_empty.svg deleted file mode 100644 index 39b5791e91..0000000000 --- a/resources/themes/cura-light/icons/star_empty.svg +++ /dev/null @@ -1,11 +0,0 @@ - - - - Star Copy 8 - Created with Sketch. - - - - - - \ No newline at end of file diff --git a/resources/themes/cura-light/icons/star_filled.svg b/resources/themes/cura-light/icons/star_filled.svg deleted file mode 100644 index d4e161f6c6..0000000000 --- a/resources/themes/cura-light/icons/star_filled.svg +++ /dev/null @@ -1,11 +0,0 @@ - - - - Star Copy 7 - Created with Sketch. - - - - - - \ No newline at end of file diff --git a/resources/themes/cura-light/icons/translate.svg b/resources/themes/cura-light/icons/translate.svg deleted file mode 100644 index 6a76ef4614..0000000000 --- a/resources/themes/cura-light/icons/translate.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/resources/themes/cura-light/icons/ulti.svg b/resources/themes/cura-light/icons/ulti.svg deleted file mode 100644 index b30d0669b3..0000000000 --- a/resources/themes/cura-light/icons/ulti.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/resources/themes/cura-light/icons/update.svg b/resources/themes/cura-light/icons/update.svg deleted file mode 100644 index 0a6e8fee5a..0000000000 --- a/resources/themes/cura-light/icons/update.svg +++ /dev/null @@ -1,12 +0,0 @@ - - - - update - Created with Sketch. - - - - - - - \ No newline at end of file diff --git a/resources/themes/cura-light/icons/view_3d.svg b/resources/themes/cura-light/icons/view_3d.svg deleted file mode 100644 index cfe394e65d..0000000000 --- a/resources/themes/cura-light/icons/view_3d.svg +++ /dev/null @@ -1,14 +0,0 @@ - - - - icn_perspectives_white - Created with Sketch. - - - - - - - - - \ No newline at end of file diff --git a/resources/themes/cura-light/icons/view_front.svg b/resources/themes/cura-light/icons/view_front.svg deleted file mode 100644 index 7de9abe0af..0000000000 --- a/resources/themes/cura-light/icons/view_front.svg +++ /dev/null @@ -1,19 +0,0 @@ - - - - icn_front_white - Created with Sketch. - - - - - - - - - - - - - - \ No newline at end of file diff --git a/resources/themes/cura-light/icons/view_layer.svg b/resources/themes/cura-light/icons/view_layer.svg deleted file mode 100644 index 3e4bf8e074..0000000000 --- a/resources/themes/cura-light/icons/view_layer.svg +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - diff --git a/resources/themes/cura-light/icons/view_left.svg b/resources/themes/cura-light/icons/view_left.svg deleted file mode 100644 index 1770da4c81..0000000000 --- a/resources/themes/cura-light/icons/view_left.svg +++ /dev/null @@ -1,21 +0,0 @@ - - - - icn_left_white - Created with Sketch. - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/resources/themes/cura-light/icons/view_normal.svg b/resources/themes/cura-light/icons/view_normal.svg deleted file mode 100644 index 676031dbbd..0000000000 --- a/resources/themes/cura-light/icons/view_normal.svg +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/resources/themes/cura-light/icons/view_right.svg b/resources/themes/cura-light/icons/view_right.svg deleted file mode 100644 index 5e0628e60e..0000000000 --- a/resources/themes/cura-light/icons/view_right.svg +++ /dev/null @@ -1,21 +0,0 @@ - - - - icn_right_white - Created with Sketch. - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/resources/themes/cura-light/icons/view_top.svg b/resources/themes/cura-light/icons/view_top.svg deleted file mode 100644 index 3eb32e9878..0000000000 --- a/resources/themes/cura-light/icons/view_top.svg +++ /dev/null @@ -1,21 +0,0 @@ - - - - icn_top_white - Created with Sketch. - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/resources/themes/cura-light/icons/view_xray.svg b/resources/themes/cura-light/icons/view_xray.svg deleted file mode 100644 index 5983c92c2f..0000000000 --- a/resources/themes/cura-light/icons/view_xray.svg +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/resources/themes/cura-light/icons/viewmode.svg b/resources/themes/cura-light/icons/viewmode.svg deleted file mode 100644 index a21df01f37..0000000000 --- a/resources/themes/cura-light/icons/viewmode.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file diff --git a/resources/themes/cura-light/icons/warning.svg b/resources/themes/cura-light/icons/warning.svg deleted file mode 100644 index 14b7d797d0..0000000000 --- a/resources/themes/cura-light/icons/warning.svg +++ /dev/null @@ -1,11 +0,0 @@ - - - - Icon/warning-s - Created with Sketch. - - - - - - \ No newline at end of file diff --git a/resources/themes/cura-light/icons/warning_light.svg b/resources/themes/cura-light/icons/warning_light.svg deleted file mode 100644 index f9ca90f6a9..0000000000 --- a/resources/themes/cura-light/icons/warning_light.svg +++ /dev/null @@ -1,13 +0,0 @@ - - - - warning - Created with Sketch. - - - - - - - - \ No newline at end of file diff --git a/resources/themes/cura-light/styles.qml b/resources/themes/cura-light/styles.qml index 28aa352834..1320b54f37 100755 --- a/resources/themes/cura-light/styles.qml +++ b/resources/themes/cura-light/styles.qml @@ -76,7 +76,7 @@ QtObject height: UM.Theme.getSize("standard_arrow").height sourceSize.height: width color: control.enabled ? UM.Theme.getColor("setting_control_button") : UM.Theme.getColor("setting_category_disabled_text") - source: UM.Theme.getIcon("arrow_bottom") + source: UM.Theme.getIcon("ChevronSingleDown") } Label { @@ -252,11 +252,11 @@ QtObject anchors.centerIn: parent opacity: control.enabled ? 1.0 : 0.2 source: control.iconSource - width: UM.Theme.getSize("button_icon").width - height: UM.Theme.getSize("button_icon").height + width: UM.Theme.getSize("medium_button_icon").width + height: UM.Theme.getSize("medium_button_icon").height color: UM.Theme.getColor("icon") - sourceSize: UM.Theme.getSize("button_icon") + sourceSize: UM.Theme.getSize("medium_button_icon") } } } @@ -384,7 +384,7 @@ QtObject anchors.rightMargin: UM.Theme.getSize("default_lining").width * 2 anchors.verticalCenter: parent.verticalCenter - source: UM.Theme.getIcon("arrow_bottom") + source: UM.Theme.getIcon("ChevronSingleDown") width: UM.Theme.getSize("standard_arrow").width height: UM.Theme.getSize("standard_arrow").height sourceSize.width: width + 5 * screenScaleFactor @@ -422,7 +422,7 @@ QtObject height: Math.round(parent.height / 2.5) sourceSize.height: width color: UM.Theme.getColor("checkbox_mark") - source: control.exclusiveGroup ? UM.Theme.getIcon("dot") : UM.Theme.getIcon("check") + source: control.exclusiveGroup ? UM.Theme.getIcon("Dot") : UM.Theme.getIcon("Check") opacity: control.checked Behavior on opacity { NumberAnimation { duration: 100; } } } diff --git a/resources/themes/cura-light/theme.json b/resources/themes/cura-light/theme.json index 5245d21455..a2727ec12b 100644 --- a/resources/themes/cura-light/theme.json +++ b/resources/themes/cura-light/theme.json @@ -129,24 +129,44 @@ "family": "Noto Sans" }, "small": { - "size": 0.7, + "size": 0.9, "weight": 40, "family": "Noto Sans" }, "small_ja_JP": { - "size": 0.7, + "size": 0.9, "weight": 50, "family": "Noto Sans" }, "small_zh_CN": { - "size": 0.7, + "size": 0.9, "weight": 50, "family": "Noto Sans" }, "small_zh_TW": { - "size": 0.7, + "size": 0.9, "weight": 50, "family": "Noto Sans" + }, + "small_emphasis": { + "size": 0.9, + "weight": 100, + "family": "Noto Sans" + }, + "small_emphasis_ja_JP": { + "size": 0.9, + "weight": 100, + "family": "Noto Sans" + }, + "small_emphasis_zh_CN": { + "size": 0.9, + "weight": 100, + "family": "Noto Sans" + }, + "small_emphasis_zh_TW": { + "size": 0.9, + "weight": 100, + "family": "Noto Sans" } }, @@ -168,15 +188,15 @@ "icon": [8, 7, 63, 255], - "primary_button": [38, 113, 231, 255], + "primary_button": [25, 110, 240, 255], "primary_button_shadow": [27, 95, 202, 255], - "primary_button_hover": [81, 145, 247, 255], + "primary_button_hover": [16, 70, 156, 255], "primary_button_text": [255, 255, 255, 255], - "secondary_button": [240, 240, 240, 255], + "secondary_button": [255, 255, 255, 255], "secondary_button_shadow": [216, 216, 216, 255], - "secondary_button_hover": [228, 228, 228, 255], - "secondary_button_text": [30, 102, 215, 255], + "secondary_button_hover": [232, 240, 253, 255], + "secondary_button_text": [25, 110, 240, 255], "main_window_header_background": [8, 7, 63, 255], "main_window_header_background_gradient": [25, 23, 91, 255], @@ -196,7 +216,7 @@ "machine_selector_text_active": [255, 255, 255, 255], "machine_selector_printer_icon": [8, 7, 63, 255], - "action_panel_secondary": [27, 95, 202, 255], + "action_panel_secondary": [25, 110, 240, 255], "first_run_shadow": [50, 50, 50, 255], @@ -210,7 +230,7 @@ "text": [25, 25, 25, 255], "text_detail": [174, 174, 174, 128], - "text_link": [50, 130, 255, 255], + "text_link": [25, 110, 240, 255], "text_inactive": [174, 174, 174, 255], "text_pressed": [50, 130, 255, 255], "text_subtext": [0, 0, 0, 255], @@ -250,6 +270,7 @@ "button_tooltip_text": [192, 193, 194, 255], "extruder_button_material_border": [255, 255, 255, 255], + "extruder_disabled": [255, 255, 255, 102], "rating_star": [90, 90, 90, 255], @@ -266,8 +287,8 @@ "action_button_active_text": [0, 0, 0, 255], "action_button_active_border": [50, 130, 255, 255], "action_button_disabled": [245, 245, 245, 255], - "action_button_disabled_text": [127, 127, 127, 255], - "action_button_disabled_border": [245, 245, 245, 255], + "action_button_disabled_text": [196, 196, 196, 255], + "action_button_disabled_border": [196, 196, 196, 255], "action_button_shadow": [223, 223, 223, 255], "action_button_disabled_shadow": [228, 228, 228, 255], @@ -329,7 +350,7 @@ "checkbox_hover": [255, 255, 255, 255], "checkbox_border": [199, 199, 199, 255], "checkbox_border_hover": [50, 130, 255, 255], - "checkbox_mark": [50, 130, 255, 255], + "checkbox_mark": [35, 35, 35, 255], "checkbox_disabled": [223, 223, 223, 255], "checkbox_text": [35, 35, 35, 255], @@ -416,7 +437,7 @@ "monitor_icon_accent": [255, 255, 255, 255], "monitor_icon_disabled": [238, 238, 238, 255], - "monitor_secondary_button_hover": [228, 228, 228, 255], + "monitor_secondary_button_hover": [232, 242, 252, 255], "monitor_secondary_button": [240, 240, 240, 255], "monitor_secondary_button_text": [30, 102, 215, 255], "monitor_secondary_button_shadow": [216, 216, 216, 255], @@ -445,7 +466,8 @@ "monitor_carousel_dot": [216, 216, 216, 255], "monitor_carousel_dot_current": [119, 119, 119, 255], - "cloud_unavailable": [153, 153, 153, 255] + "cloud_unavailable": [153, 153, 153, 255], + "connection_badge_background": [255, 255, 255, 255] }, "sizes": { @@ -482,9 +504,9 @@ "machine_selector_widget": [20.0, 4.0], "machine_selector_widget_content": [25.0, 32.0], - "machine_selector_icon": [2.66, 2.66], + "machine_selector_icon": [2.5, 2.5], - "views_selector": [23.0, 4.0], + "views_selector": [16.0, 4.0], "printer_type_label": [3.5, 1.5], @@ -503,12 +525,12 @@ "thin_margin": [0.71, 0.71], "narrow_margin": [0.5, 0.5], - "extruder_icon": [2.33, 2.33], + "extruder_icon": [2.5, 2.5], "section": [0.0, 2], "section_control": [0, 1], - "section_icon": [1.6, 1.6], - "section_icon_column": [2.8, 0.0], + "section_icon": [2, 2], + "section_icon_column": [2.5, 2.5], "rating_star": [1.0, 1.0], "setting": [25.0, 1.8], @@ -537,6 +559,9 @@ "small_button": [2, 2], "small_button_icon": [1.5, 1.5], + "medium_button": [2.5, 2.5], + "medium_button_icon": [2, 2], + "favorites_row": [2, 2], "favorites_button": [2, 2], "favorites_button_icon": [1.2, 1.2], @@ -589,7 +614,7 @@ "message": [30.0, 5.0], "message_close": [1, 1], "message_radius": [0.25, 0.25], - "message_action_button": [0, 2.0], + "message_action_button": [0, 2.5], "message_image": [15.0, 5.0], "infill_button_margin": [0.5, 0.5], diff --git a/resources/variants/biqu_bx_abl_0.2.inst.cfg b/resources/variants/biqu_bx_abl_0.2.inst.cfg new file mode 100755 index 0000000000..b72fdc83bb --- /dev/null +++ b/resources/variants/biqu_bx_abl_0.2.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.2mm Nozzle +version = 4 +definition = biqu_bx_abl + +[metadata] +setting_version = 17 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.2 diff --git a/resources/variants/biqu_bx_abl_0.3.inst.cfg b/resources/variants/biqu_bx_abl_0.3.inst.cfg new file mode 100755 index 0000000000..7b195c0013 --- /dev/null +++ b/resources/variants/biqu_bx_abl_0.3.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.3mm Nozzle +version = 4 +definition = biqu_bx_abl + +[metadata] +setting_version = 17 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.3 diff --git a/resources/variants/biqu_bx_abl_0.4.inst.cfg b/resources/variants/biqu_bx_abl_0.4.inst.cfg new file mode 100755 index 0000000000..106c5ea5d7 --- /dev/null +++ b/resources/variants/biqu_bx_abl_0.4.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.4mm Nozzle +version = 4 +definition = biqu_bx_abl + +[metadata] +setting_version = 17 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.4 diff --git a/resources/variants/biqu_bx_abl_0.5.inst.cfg b/resources/variants/biqu_bx_abl_0.5.inst.cfg new file mode 100755 index 0000000000..c95388e23f --- /dev/null +++ b/resources/variants/biqu_bx_abl_0.5.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.5mm Nozzle +version = 4 +definition = biqu_bx_abl + +[metadata] +setting_version = 17 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.5 diff --git a/resources/variants/biqu_bx_abl_0.6.inst.cfg b/resources/variants/biqu_bx_abl_0.6.inst.cfg new file mode 100755 index 0000000000..0116e7478f --- /dev/null +++ b/resources/variants/biqu_bx_abl_0.6.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.6mm Nozzle +version = 4 +definition = biqu_bx_abl + +[metadata] +setting_version = 17 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.6 diff --git a/resources/variants/biqu_bx_abl_0.8.inst.cfg b/resources/variants/biqu_bx_abl_0.8.inst.cfg new file mode 100755 index 0000000000..8a5747a9f7 --- /dev/null +++ b/resources/variants/biqu_bx_abl_0.8.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.8mm Nozzle +version = 4 +definition = biqu_bx_abl + +[metadata] +setting_version = 17 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.8 diff --git a/resources/variants/liquid_vo04.inst.cfg b/resources/variants/liquid_vo04.inst.cfg index 3b68a1c978..b1fd741cc7 100644 --- a/resources/variants/liquid_vo04.inst.cfg +++ b/resources/variants/liquid_vo04.inst.cfg @@ -23,7 +23,7 @@ raft_interface_thickness = =layer_height * 1.5 raft_jerk = =jerk_print raft_margin = 15 raft_surface_layers = 2 -retraction_amount = 5 +retraction_amount = 3 retraction_count_max = 25 retraction_min_travel = =line_width * 2 retraction_prime_speed = =retraction_speed diff --git a/resources/variants/liquid_vo08.inst.cfg b/resources/variants/liquid_vo08.inst.cfg index 675a84c6e7..46172aa3e8 100644 --- a/resources/variants/liquid_vo08.inst.cfg +++ b/resources/variants/liquid_vo08.inst.cfg @@ -40,7 +40,7 @@ multiple_mesh_overlap = 0 prime_tower_enable = False prime_tower_wipe_enabled = True retract_at_layer_change = =not magic_spiralize -retraction_amount = 5 +retraction_amount = 3 retraction_count_max = 25 retraction_extrusion_window = 1 retraction_hop = 2 diff --git a/resources/variants/strateo3d_high_temp_04.inst.cfg b/resources/variants/strateo3d_high_temp_04.inst.cfg new file mode 100644 index 0000000000..bb51ab03cc --- /dev/null +++ b/resources/variants/strateo3d_high_temp_04.inst.cfg @@ -0,0 +1,20 @@ +[general] +name = High temp 0.4 +version = 4 +definition = strateo3d + +[metadata] +setting_version = 17 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_id = HT0.4 +machine_nozzle_size = 0.4 +machine_nozzle_tip_outer_diameter = 1.0 +layer_height = 0.2 +layer_height_0 = 0.3 +prime_tower_enable = True +retract_at_layer_change = False +support_angle = 45 +support_use_towers = True diff --git a/resources/variants/voron0_120_v6_0.25.inst.cfg b/resources/variants/voron0_120_v6_0.25.inst.cfg new file mode 100644 index 0000000000..8fd763e739 --- /dev/null +++ b/resources/variants/voron0_120_v6_0.25.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = V6 0.25mm +version = 4 +definition = voron0_120 + +[metadata] +setting_version = 17 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.25 diff --git a/resources/variants/voron0_120_v6_0.30.inst.cfg b/resources/variants/voron0_120_v6_0.30.inst.cfg new file mode 100644 index 0000000000..65fd07de0b --- /dev/null +++ b/resources/variants/voron0_120_v6_0.30.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = V6 0.30mm +version = 4 +definition = voron0_120 + +[metadata] +setting_version = 17 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.3 diff --git a/resources/variants/voron0_120_v6_0.40.inst.cfg b/resources/variants/voron0_120_v6_0.40.inst.cfg new file mode 100644 index 0000000000..2cc9018970 --- /dev/null +++ b/resources/variants/voron0_120_v6_0.40.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = V6 0.40mm +version = 4 +definition = voron0_120 + +[metadata] +setting_version = 17 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.4 diff --git a/resources/variants/voron0_120_v6_0.50.inst.cfg b/resources/variants/voron0_120_v6_0.50.inst.cfg new file mode 100644 index 0000000000..6e30fb049b --- /dev/null +++ b/resources/variants/voron0_120_v6_0.50.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = V6 0.50mm +version = 4 +definition = voron0_120 + +[metadata] +setting_version = 17 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.5 diff --git a/resources/variants/voron0_120_v6_0.60.inst.cfg b/resources/variants/voron0_120_v6_0.60.inst.cfg new file mode 100644 index 0000000000..53fc000477 --- /dev/null +++ b/resources/variants/voron0_120_v6_0.60.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = V6 0.60mm +version = 4 +definition = voron0_120 + +[metadata] +setting_version = 17 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.6 diff --git a/resources/variants/voron0_120_v6_0.80.inst.cfg b/resources/variants/voron0_120_v6_0.80.inst.cfg new file mode 100644 index 0000000000..45e275060c --- /dev/null +++ b/resources/variants/voron0_120_v6_0.80.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = V6 0.80mm +version = 4 +definition = voron0_120 + +[metadata] +setting_version = 17 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.8