diff --git a/plugins/3MFReader/WorkspaceDialog.qml b/plugins/3MFReader/WorkspaceDialog.qml index 450f01fbd5..1fd20a3534 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("Information") + source: UM.Theme.getIcon("notice") color: palette.text } diff --git a/plugins/CuraDrive/src/qml/components/BackupListFooter.qml b/plugins/CuraDrive/src/qml/components/BackupListFooter.qml index 15af7521ed..8decdc5c27 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("Information") + iconSource: UM.Theme.getIcon("info") 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 fb4e086983..5cdb500b4e 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("Information") + iconSource: UM.Theme.getIcon("info") onClicked: backupListItem.showDetails = !backupListItem.showDetails } @@ -79,7 +79,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("Cancel") + iconSource: UM.Theme.getIcon("cross1") onClicked: confirmDeleteDialog.visible = true } } diff --git a/plugins/CuraDrive/src/qml/components/BackupListItemDetails.qml b/plugins/CuraDrive/src/qml/components/BackupListItemDetails.qml index 33c16853c5..4da15c6f16 100644 --- a/plugins/CuraDrive/src/qml/components/BackupListItemDetails.qml +++ b/plugins/CuraDrive/src/qml/components/BackupListItemDetails.qml @@ -1,4 +1,4 @@ -// Copyright (c) 2021 Ultimaker B.V. +// Copyright (c) 2018 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("UltimakeCura") + iconSource: UM.Theme.getIcon("application") 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") + iconSource: UM.Theme.getIcon("printer_single") label: catalog.i18nc("@backuplist:label", "Machines") value: backupDetailsData.metadata.machine_count } @@ -33,7 +33,7 @@ ColumnLayout // Material count BackupListItemDetailsRow { - iconSource: UM.Theme.getIcon("Spool") + iconSource: UM.Theme.getIcon("category_material") label: catalog.i18nc("@backuplist:label", "Materials") value: backupDetailsData.metadata.material_count } @@ -41,7 +41,7 @@ ColumnLayout // Profile count. BackupListItemDetailsRow { - iconSource: UM.Theme.getIcon("Sliders") + iconSource: UM.Theme.getIcon("settings") 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/MonitorStage/MonitorMain.qml b/plugins/MonitorStage/MonitorMain.qml index cb16b91cb8..d5fdb66c89 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("LinkExternal") + source: UM.Theme.getIcon("external_link") 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 58192f0acd..4ca12f657e 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("ChevronSingleDown") : UM.Theme.getIcon("ChevronSingleRight"); + source: control.checked ? UM.Theme.getIcon("arrow_bottom") : UM.Theme.getIcon("arrow_right"); color: control.hovered ? palette.highlight : palette.buttonText } UM.RecolorImage diff --git a/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml b/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml index c0c4e252ed..05507fc4a2 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("Infill0"); + iconSource: UM.Theme.getIcon("pos_normal"); 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("MeshTypeSupport"); + iconSource: UM.Theme.getIcon("pos_print_as_support"); 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("MeshTypeIntersect"); + iconSource: UM.Theme.getIcon("pos_modify_overlaps"); 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("MeshTypeExclude"); + iconSource: UM.Theme.getIcon("pos_modify_dont_support_overlap"); property bool needBorder: true checkable: true onClicked: setMeshType(antiOverhangMeshType) @@ -304,7 +304,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/__init__.py b/plugins/PerObjectSettingsTool/__init__.py index d3c6d236ef..acfc35815e 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": "MeshType", + "icon": "tool_icon.svg", "tool_panel": "PerObjectSettingsPanel.qml", "weight": 3 }, diff --git a/plugins/PerObjectSettingsTool/tool_icon.svg b/plugins/PerObjectSettingsTool/tool_icon.svg new file mode 100644 index 0000000000..41e49cae07 --- /dev/null +++ b/plugins/PerObjectSettingsTool/tool_icon.svg @@ -0,0 +1,22 @@ + + + + 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 7397ec8196..2b3a141aa0 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("Cancel") + source: UM.Theme.getIcon("cross1") } } } @@ -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("ChevronSingleDown") + source: UM.Theme.getIcon("arrow_bottom") } } } @@ -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("ChevronSingleUp") + source: UM.Theme.getIcon("arrow_top") } } } @@ -517,7 +517,7 @@ UM.Dialog } toolTipContentAlignment: Cura.ToolTip.ContentAlignment.AlignLeft onClicked: dialog.show() - iconSource: "Script.svg" + iconSource: "postprocessing.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 deleted file mode 100755 index 6bf481deef..0000000000 --- a/plugins/PostProcessingPlugin/Script.svg +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - diff --git a/plugins/PostProcessingPlugin/postprocessing.svg b/plugins/PostProcessingPlugin/postprocessing.svg new file mode 100644 index 0000000000..f55face4a9 --- /dev/null +++ b/plugins/PostProcessingPlugin/postprocessing.svg @@ -0,0 +1,47 @@ + + + +image/svg+xml \ No newline at end of file diff --git a/plugins/PrepareStage/PrepareMenu.qml b/plugins/PrepareStage/PrepareMenu.qml index 93ecb49677..87d7c5f35c 100644 --- a/plugins/PrepareStage/PrepareMenu.qml +++ b/plugins/PrepareStage/PrepareMenu.qml @@ -106,7 +106,7 @@ Item { id: buttonIcon anchors.centerIn: parent - source: UM.Theme.getIcon("Folder") + source: UM.Theme.getIcon("load") width: UM.Theme.getSize("button_icon").width height: UM.Theme.getSize("button_icon").height color: UM.Theme.getColor("icon") diff --git a/plugins/SimulationView/SimulationViewMainComponent.qml b/plugins/SimulationView/SimulationViewMainComponent.qml index 9232516673..00497a57c8 100644 --- a/plugins/SimulationView/SimulationViewMainComponent.qml +++ b/plugins/SimulationView/SimulationViewMainComponent.qml @@ -78,7 +78,7 @@ Item UM.SimpleButton { id: playButton - iconSource: !isSimulationPlaying ? "./resources/Play.svg": "./resources/Pause.svg" + iconSource: !isSimulationPlaying ? "./resources/simulation_resume.svg": "./resources/simulation_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 86e686e0fc..a9108c9d42 100644 --- a/plugins/SimulationView/SimulationViewMenuComponent.qml +++ b/plugins/SimulationView/SimulationViewMenuComponent.qml @@ -211,7 +211,7 @@ Cura.ExpandableComponent 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", "medium") + source: UM.Theme.getIcon("extruder_button") color: model.color } diff --git a/plugins/SimulationView/resources/Pause.svg b/plugins/SimulationView/resources/Pause.svg deleted file mode 100755 index 1e155a783f..0000000000 --- a/plugins/SimulationView/resources/Pause.svg +++ /dev/null @@ -1,5 +0,0 @@ - - - - diff --git a/plugins/SimulationView/resources/Play.svg b/plugins/SimulationView/resources/Play.svg deleted file mode 100755 index 36bbe99c10..0000000000 --- a/plugins/SimulationView/resources/Play.svg +++ /dev/null @@ -1,6 +0,0 @@ - - - - diff --git a/plugins/SimulationView/resources/simulation_pause.svg b/plugins/SimulationView/resources/simulation_pause.svg new file mode 100644 index 0000000000..652434bd44 --- /dev/null +++ b/plugins/SimulationView/resources/simulation_pause.svg @@ -0,0 +1,79 @@ + + + + + + + + + + image/svg+xml + + + + + + + + + + + + diff --git a/plugins/SimulationView/resources/simulation_resume.svg b/plugins/SimulationView/resources/simulation_resume.svg new file mode 100644 index 0000000000..912a2ac418 --- /dev/null +++ b/plugins/SimulationView/resources/simulation_resume.svg @@ -0,0 +1,78 @@ + + + + + + + + + + image/svg+xml + + + + + + + + + diff --git a/plugins/SupportEraser/__init__.py b/plugins/SupportEraser/__init__.py index 30b6fe4a52..2ed7521808 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": "SupportBlocker", + "icon": "tool_icon.svg", "weight": 4 } } diff --git a/plugins/SupportEraser/tool_icon.svg b/plugins/SupportEraser/tool_icon.svg new file mode 100644 index 0000000000..fee69e0715 --- /dev/null +++ b/plugins/SupportEraser/tool_icon.svg @@ -0,0 +1,14 @@ + + + + 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 deleted file mode 100755 index a93d6d4cfb..0000000000 --- a/plugins/Toolbox/resources/images/Shop.svg +++ /dev/null @@ -1,7 +0,0 @@ - - - - diff --git a/plugins/Toolbox/resources/images/shop.svg b/plugins/Toolbox/resources/images/shop.svg new file mode 100644 index 0000000000..64862834b0 --- /dev/null +++ b/plugins/Toolbox/resources/images/shop.svg @@ -0,0 +1,3 @@ + + + diff --git a/plugins/Toolbox/resources/qml/components/ToolboxBackColumn.qml b/plugins/Toolbox/resources/qml/components/ToolboxBackColumn.qml index 9874a977f5..5514e555eb 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("ChevronSingleLeft") + source: UM.Theme.getIcon("arrow_left") } width: UM.Theme.getSize("toolbox_back_button").width height: UM.Theme.getSize("toolbox_back_button").height diff --git a/plugins/Toolbox/resources/qml/components/ToolboxHeader.qml b/plugins/Toolbox/resources/qml/components/ToolboxHeader.qml index 1bdfa80b79..0c57e5fc5c 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/MonitorBuildplateConfiguration.qml b/plugins/UM3NetworkPrinting/resources/qml/MonitorBuildplateConfiguration.qml index f3002fd25b..2034c23abe 100644 --- a/plugins/UM3NetworkPrinting/resources/qml/MonitorBuildplateConfiguration.qml +++ b/plugins/UM3NetworkPrinting/resources/qml/MonitorBuildplateConfiguration.qml @@ -51,7 +51,7 @@ Item anchors.centerIn: parent color: UM.Theme.getColor("monitor_icon_primary") height: parent.height - source: "../svg/icons/Buildplate.svg" + 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 a42dc0d12a..56e39bd477 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("ChevronSingleLeft") + source: UM.Theme.getIcon("arrow_left") } } } @@ -177,7 +177,7 @@ Item sourceSize.width: width // TODO: Theme! sourceSize.height: width // TODO: Theme! color: UM.Theme.getColor("text") - source: UM.Theme.getIcon("ChevronSingleRight") + source: UM.Theme.getIcon("arrow_right") } } } diff --git a/plugins/UM3NetworkPrinting/resources/qml/MonitorIconExtruder.qml b/plugins/UM3NetworkPrinting/resources/qml/MonitorIconExtruder.qml index 79bc0ec25b..8c6f28d3e1 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 diff --git a/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobPreview.qml b/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobPreview.qml index cf2239201f..7492b4e8e4 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.svg" + return "../svg/warning-icon.svg" } switch(printJob.state) { case "error": - return "../svg/CancelCircle.svg" + return "../svg/aborted-icon.svg" case "wait_cleanup": - return printJob.timeTotal > printJob.timeElapsed ? "../svg/CancelCircle.svg" : "" + return printJob.timeTotal > printJob.timeElapsed ? "../svg/aborted-icon.svg" : "" case "pausing": - return "../svg/PauseCircle.svg" + return "../svg/paused-icon.svg" case "paused": - return "../svg/PauseCircle.svg" + return "../svg/paused-icon.svg" case "resuming": - return "../svg/PauseCircle.svg" + return "../svg/paused-icon.svg" default: return "" } diff --git a/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml b/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml index 7dbb78e8fb..05ad8d9929 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("LinkExternal") + source: UM.Theme.getIcon("external_link") width: 12 * screenScaleFactor height: 12 * screenScaleFactor } @@ -265,7 +265,7 @@ Item bottom: parent.bottom bottomMargin: 20 * screenScaleFactor // TODO: Theme! } - iconSource: "../svg/icons/CameraPhoto.svg" + iconSource: "../svg/icons/camera.svg" enabled: !cloudConnection visible: printer } diff --git a/plugins/UM3NetworkPrinting/resources/qml/MonitorQueue.qml b/plugins/UM3NetworkPrinting/resources/qml/MonitorQueue.qml index 1b94625bf0..9f159102e2 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("LinkExternal") + source: UM.Theme.getIcon("external_link") 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/PrinterVideoStream.qml b/plugins/UM3NetworkPrinting/resources/qml/PrinterVideoStream.qml index 291e2a14f5..cfbb30fdfb 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("Cancel"); + iconSource: UM.Theme.getIcon("cross1"); z: 999; } diff --git a/plugins/UM3NetworkPrinting/resources/svg/Camera.svg b/plugins/UM3NetworkPrinting/resources/svg/Camera.svg deleted file mode 100755 index ae6a67fc0b..0000000000 --- a/plugins/UM3NetworkPrinting/resources/svg/Camera.svg +++ /dev/null @@ -1,6 +0,0 @@ - - - - diff --git a/plugins/UM3NetworkPrinting/resources/svg/CancelCircle.svg b/plugins/UM3NetworkPrinting/resources/svg/CancelCircle.svg deleted file mode 100755 index dc541f2d54..0000000000 --- a/plugins/UM3NetworkPrinting/resources/svg/CancelCircle.svg +++ /dev/null @@ -1,7 +0,0 @@ - - - - diff --git a/plugins/UM3NetworkPrinting/resources/svg/Check.svg b/plugins/UM3NetworkPrinting/resources/svg/Check.svg deleted file mode 100755 index 17e290a38b..0000000000 --- a/plugins/UM3NetworkPrinting/resources/svg/Check.svg +++ /dev/null @@ -1,5 +0,0 @@ - - - - diff --git a/plugins/UM3NetworkPrinting/resources/svg/CheckCircle.svg b/plugins/UM3NetworkPrinting/resources/svg/CheckCircle.svg deleted file mode 100755 index aac1a50b95..0000000000 --- a/plugins/UM3NetworkPrinting/resources/svg/CheckCircle.svg +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - diff --git a/plugins/UM3NetworkPrinting/resources/svg/PauseCircle.svg b/plugins/UM3NetworkPrinting/resources/svg/PauseCircle.svg deleted file mode 100755 index b010624979..0000000000 --- a/plugins/UM3NetworkPrinting/resources/svg/PauseCircle.svg +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - diff --git a/plugins/UM3NetworkPrinting/resources/svg/Prohibition.svg b/plugins/UM3NetworkPrinting/resources/svg/Prohibition.svg deleted file mode 100755 index d4dc842551..0000000000 --- a/plugins/UM3NetworkPrinting/resources/svg/Prohibition.svg +++ /dev/null @@ -1,7 +0,0 @@ - - - - diff --git a/plugins/UM3NetworkPrinting/resources/svg/Warning.svg b/plugins/UM3NetworkPrinting/resources/svg/Warning.svg deleted file mode 100755 index 6105030fe6..0000000000 --- a/plugins/UM3NetworkPrinting/resources/svg/Warning.svg +++ /dev/null @@ -1,6 +0,0 @@ - - - - diff --git a/plugins/UM3NetworkPrinting/resources/svg/aborted-icon.svg b/plugins/UM3NetworkPrinting/resources/svg/aborted-icon.svg new file mode 100644 index 0000000000..7ef82c8911 --- /dev/null +++ b/plugins/UM3NetworkPrinting/resources/svg/aborted-icon.svg @@ -0,0 +1 @@ +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 new file mode 100644 index 0000000000..e7768849c6 --- /dev/null +++ b/plugins/UM3NetworkPrinting/resources/svg/action-required-icon.svg @@ -0,0 +1,10 @@ + + + + + + + + + + diff --git a/plugins/UM3NetworkPrinting/resources/svg/approved-icon.svg b/plugins/UM3NetworkPrinting/resources/svg/approved-icon.svg new file mode 100644 index 0000000000..671957d709 --- /dev/null +++ b/plugins/UM3NetworkPrinting/resources/svg/approved-icon.svg @@ -0,0 +1 @@ +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 new file mode 100644 index 0000000000..eba3efdab9 --- /dev/null +++ b/plugins/UM3NetworkPrinting/resources/svg/blocked-icon.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/plugins/UM3NetworkPrinting/resources/svg/camera-icon.svg b/plugins/UM3NetworkPrinting/resources/svg/camera-icon.svg new file mode 100644 index 0000000000..66bed04508 --- /dev/null +++ b/plugins/UM3NetworkPrinting/resources/svg/camera-icon.svg @@ -0,0 +1,8 @@ + + + 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 new file mode 100644 index 0000000000..9d4507e551 --- /dev/null +++ b/plugins/UM3NetworkPrinting/resources/svg/checkmark-icon.svg @@ -0,0 +1,3 @@ + + + diff --git a/plugins/UM3NetworkPrinting/resources/svg/icons/CameraPhoto.svg b/plugins/UM3NetworkPrinting/resources/svg/icons/CameraPhoto.svg deleted file mode 100755 index 01f9c67c4e..0000000000 --- a/plugins/UM3NetworkPrinting/resources/svg/icons/CameraPhoto.svg +++ /dev/null @@ -1,8 +0,0 @@ - - - - - diff --git a/plugins/UM3NetworkPrinting/resources/svg/icons/Extruder.svg b/plugins/UM3NetworkPrinting/resources/svg/icons/Extruder.svg deleted file mode 100644 index 3a2cf1147b..0000000000 --- a/plugins/UM3NetworkPrinting/resources/svg/icons/Extruder.svg +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - - - - - - - - diff --git a/plugins/UM3NetworkPrinting/resources/svg/icons/buildplate.svg b/plugins/UM3NetworkPrinting/resources/svg/icons/buildplate.svg new file mode 100644 index 0000000000..bcb278a8ca --- /dev/null +++ b/plugins/UM3NetworkPrinting/resources/svg/icons/buildplate.svg @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/plugins/UM3NetworkPrinting/resources/svg/icons/camera.svg b/plugins/UM3NetworkPrinting/resources/svg/icons/camera.svg new file mode 100644 index 0000000000..2eaebb812d --- /dev/null +++ b/plugins/UM3NetworkPrinting/resources/svg/icons/camera.svg @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/plugins/UM3NetworkPrinting/resources/svg/icons/extruder.svg b/plugins/UM3NetworkPrinting/resources/svg/icons/extruder.svg new file mode 100644 index 0000000000..235cb432e9 --- /dev/null +++ b/plugins/UM3NetworkPrinting/resources/svg/icons/extruder.svg @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/plugins/UM3NetworkPrinting/resources/svg/paused-icon.svg b/plugins/UM3NetworkPrinting/resources/svg/paused-icon.svg new file mode 100644 index 0000000000..a66217d662 --- /dev/null +++ b/plugins/UM3NetworkPrinting/resources/svg/paused-icon.svg @@ -0,0 +1 @@ +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 new file mode 100644 index 0000000000..064d0783e0 --- /dev/null +++ b/plugins/UM3NetworkPrinting/resources/svg/warning-icon.svg @@ -0,0 +1,4 @@ + + warning-icon + + \ No newline at end of file diff --git a/resources/definitions/fdmextruder.def.json b/resources/definitions/fdmextruder.def.json index 7dbd775b49..67d28392b3 100644 --- a/resources/definitions/fdmextruder.def.json +++ b/resources/definitions/fdmextruder.def.json @@ -197,7 +197,7 @@ { "label": "Build Plate Adhesion", "type": "category", - "icon": "Adhesion", + "icon": "category_adhesion", "description": "Adhesion", "children": { @@ -232,7 +232,7 @@ "material": { "label": "Material", - "icon": "Spool", + "icon": "category_material", "description": "Material", "type": "category", "children": diff --git a/resources/definitions/fdmprinter.def.json b/resources/definitions/fdmprinter.def.json index 52c753c397..37607504e0 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": "Printer", + "icon": "category_machine", "children": { "machine_name": @@ -765,7 +765,7 @@ { "label": "Quality", "type": "category", - "icon": "PrintQuality", + "icon": "category_layer_height", "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": "PrintShell", + "icon": "category_shell", "description": "Shell", "type": "category", "children": @@ -1346,7 +1346,7 @@ "top_bottom": { "label": "Top/Bottom", - "icon": "PrintTopBottom", + "icon": "category_topbottom", "description": "Top/Bottom", "type": "category", "children": @@ -1822,7 +1822,7 @@ "infill": { "label": "Infill", - "icon": "Infill1", + "icon": "category_infill", "description": "Infill", "type": "category", "children": @@ -2161,7 +2161,7 @@ "material": { "label": "Material", - "icon": "Spool", + "icon": "category_material", "description": "Material", "type": "category", "children": @@ -2766,7 +2766,7 @@ "speed": { "label": "Speed", - "icon": "SpeedOMeter", + "icon": "category_speed", "description": "Speed", "type": "category", "children": @@ -3672,7 +3672,7 @@ "travel": { "label": "Travel", - "icon": "PrintTravel", + "icon": "category_travel", "description": "travel", "type": "category", "children": @@ -3977,7 +3977,7 @@ "cooling": { "label": "Cooling", - "icon": "Fan", + "icon": "category_cool", "description": "Cooling", "type": "category", "children": @@ -4127,7 +4127,7 @@ { "label": "Support", "type": "category", - "icon": "Support", + "icon": "category_support", "description": "Support", "children": { @@ -5167,7 +5167,7 @@ { "label": "Build Plate Adhesion", "type": "category", - "icon": "Adhesion", + "icon": "category_adhesion", "description": "Adhesion", "children": { @@ -5821,7 +5821,7 @@ { "label": "Dual Extrusion", "type": "category", - "icon": "DualExtrusion", + "icon": "category_dual", "description": "Settings used for printing with multiple extruders.", "children": { @@ -6036,7 +6036,7 @@ { "label": "Mesh Fixes", "type": "category", - "icon": "Bandage", + "icon": "category_fixes", "description": "Make the meshes more suited for 3D printing.", "children": { @@ -6162,7 +6162,7 @@ { "label": "Special Modes", "type": "category", - "icon": "BlackMagic", + "icon": "category_blackmagic", "description": "Non-traditional ways to print your models.", "children": { @@ -6335,7 +6335,7 @@ { "label": "Experimental", "type": "category", - "icon": "Experiment", + "icon": "category_experimental", "description": "Features that haven't completely been fleshed out yet.", "children": { diff --git a/resources/qml/Account/AvatarImage.qml b/resources/qml/Account/AvatarImage.qml index 58c39e5065..120173366f 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("CircleOutline") + source: UM.Theme.getIcon("circle_outline") 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 d5a9d392e2..f7630b500a 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("ArrowDoubleCircleRight")} + PropertyChanges { target: icon; source: UM.Theme.getIcon("update")} }, State { name: "syncing" when: syncState == Cura.AccountSyncState.SYNCING - PropertyChanges { target: icon; source: UM.Theme.getIcon("ArrowDoubleCircleRight") } + PropertyChanges { target: icon; source: UM.Theme.getIcon("update") } 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("CheckCircle") } + PropertyChanges { target: icon; source: UM.Theme.getIcon("checked") } 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") } + PropertyChanges { target: icon; source: UM.Theme.getIcon("warning_light") } PropertyChanges { target: stateLabel; text: catalog.i18nc("@label", "Something went wrong...")} } ] diff --git a/resources/qml/ActionPanel/OutputDevicesActionButton.qml b/resources/qml/ActionPanel/OutputDevicesActionButton.qml index 6d1a1d83dd..866b8cc627 100644 --- a/resources/qml/ActionPanel/OutputDevicesActionButton.qml +++ b/resources/qml/ActionPanel/OutputDevicesActionButton.qml @@ -60,7 +60,7 @@ 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("ChevronSingleUp") : UM.Theme.getIcon("ChevronSingleDown") + iconSource: popup.opened ? UM.Theme.getIcon("arrow_top") : UM.Theme.getIcon("arrow_bottom") color: UM.Theme.getColor("action_panel_secondary") visible: (devicesModel.deviceCount > 1) @@ -113,4 +113,4 @@ Item } 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 6e412c9a04..be6d68de4f 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 d9923ce4e8..097f281946 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("Information") + source: UM.Theme.getIcon("info") 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 42df08560a..dbbfe784ef 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/CheckBoxWithTooltip.qml b/resources/qml/CheckBoxWithTooltip.qml index e17940014a..403efb4d7b 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/ExpandableComponent.qml b/resources/qml/ExpandableComponent.qml index 58719eb1fe..f637cccdbb 100644 --- a/resources/qml/ExpandableComponent.qml +++ b/resources/qml/ExpandableComponent.qml @@ -165,7 +165,7 @@ Item verticalCenter: parent.verticalCenter margins: background.padding } - source: UM.Theme.getIcon("Pen") + source: UM.Theme.getIcon("pencil") visible: source != "" width: UM.Theme.getSize("standard_arrow").width height: UM.Theme.getSize("standard_arrow").height diff --git a/resources/qml/ExpandableComponentHeader.qml b/resources/qml/ExpandableComponentHeader.qml index 7dd1aa358a..cd6ccfb825 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("Cancel") + source: UM.Theme.getIcon("cross1") } 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 b490ad5bc4..7829093e8d 100644 --- a/resources/qml/ExpandablePopup.qml +++ b/resources/qml/ExpandablePopup.qml @@ -178,7 +178,7 @@ Item verticalCenter: parent.verticalCenter margins: background.padding } - source: expanded ? UM.Theme.getIcon("ChevronSingleDown") : UM.Theme.getIcon("ChevronSingleLeft") + source: expanded ? UM.Theme.getIcon("arrow_bottom") : UM.Theme.getIcon("arrow_left") visible: source != "" width: UM.Theme.getSize("standard_arrow").width height: UM.Theme.getSize("standard_arrow").height diff --git a/resources/qml/ExtruderIcon.qml b/resources/qml/ExtruderIcon.qml index 1c93966519..015ebea52e 100644 --- a/resources/qml/ExtruderIcon.qml +++ b/resources/qml/ExtruderIcon.qml @@ -22,7 +22,7 @@ Item id: mainIcon anchors.fill: parent - source: UM.Theme.getIcon("Extruder", "medium") + source: UM.Theme.getIcon("extruder_button") color: extruderEnabled ? materialColor: UM.Theme.getColor("disabled") } @@ -32,14 +32,15 @@ Item width: height height: Math.round(parent.height / 2) - radius: Math.round(width) + radius: Math.round(width / 2) color: UM.Theme.getColor("toolbar_background") anchors { horizontalCenter: parent.horizontalCenter top: parent.top - topMargin: (parent.height - height) / 2 + // 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 } Label @@ -63,9 +64,9 @@ Item anchors.fill: parent anchors.margins: UM.Theme.getSize("thick_lining").width sourceSize.height: width - source: UM.Theme.getIcon("Cancel") + 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 4aa5fa8bd5..c1989c4c95 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("Pen") + source: UM.Theme.getIcon("pencil") } } } diff --git a/resources/qml/Menus/ConfigurationMenu/ConfigurationItem.qml b/resources/qml/Menus/ConfigurationMenu/ConfigurationItem.qml index 92b88d3c09..2e2dd0820a 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 ab1d66f0e1..3350b29580 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 ad4911404a..d388bd7a7e 100644 --- a/resources/qml/Menus/ConfigurationMenu/ConfigurationMenu.qml +++ b/resources/qml/Menus/ConfigurationMenu/ConfigurationMenu.qml @@ -206,7 +206,7 @@ Cura.ExpandablePopup anchors.right: parent.right - iconSource: UM.Theme.getIcon("ChevronSingleRight") + iconSource: UM.Theme.getIcon("arrow_right") isIconOnRightSide: true onClicked: @@ -222,7 +222,7 @@ Cura.ExpandablePopup visible: popupItem.configuration_method == ConfigurationMenu.ConfigurationMethod.Custom text: catalog.i18nc("@label", "Configurations") - iconSource: UM.Theme.getIcon("ChevronSingleLeft") + iconSource: UM.Theme.getIcon("arrow_left") onClicked: { diff --git a/resources/qml/Menus/ConfigurationMenu/CustomConfiguration.qml b/resources/qml/Menus/ConfigurationMenu/CustomConfiguration.qml index 7d1393151f..30f6d1b68f 100644 --- a/resources/qml/Menus/ConfigurationMenu/CustomConfiguration.qml +++ b/resources/qml/Menus/ConfigurationMenu/CustomConfiguration.qml @@ -314,7 +314,7 @@ Item anchors.centerIn: parent background: UM.RecolorImage { - source: UM.Theme.getIcon("Guide") + source: UM.Theme.getIcon("printing_guideline") 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 2b998e0438..5867a1c544 100644 --- a/resources/qml/ObjectItemButton.qml +++ b/resources/qml/ObjectItemButton.qml @@ -53,7 +53,7 @@ Button anchors.left: parent.left width: height height: parent.height - UM.Theme.getSize("narrow_margin").height - source: UM.Theme.getIcon("Extruder", "medium") + source: UM.Theme.getIcon("extruder_button") color: extruderColor visible: showExtruderSwatches && extruderColor != "" } @@ -168,12 +168,12 @@ Button { switch (meshType) { case "support_mesh": - return UM.Theme.getIcon("MeshTypeSupport"); + return UM.Theme.getIcon("pos_print_as_support"); case "cutting_mesh": case "infill_mesh": - return UM.Theme.getIcon("MeshTypeIntersect"); + return UM.Theme.getIcon("pos_modify_overlaps"); case "anti_overhang_mesh": - return UM.Theme.getIcon("MeshTypeExclude"); + return UM.Theme.getIcon("pos_modify_dont_support_overlap"); } return ""; } diff --git a/resources/qml/ObjectSelector.qml b/resources/qml/ObjectSelector.qml index 0cdc2b3f80..15cb476e08 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("ChevronSingleDown") : UM.Theme.getIcon("ChevronSingleUp") + source: objectSelector.opened ? UM.Theme.getIcon("arrow_bottom") : UM.Theme.getIcon("arrow_top") } Label diff --git a/resources/qml/Preferences/Materials/MaterialsBrandSection.qml b/resources/qml/Preferences/Materials/MaterialsBrandSection.qml index dc8be9563b..606acc2950 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("ChevronSingleDown") : UM.Theme.getIcon("ChevronSingleLeft") + source: brand_section.expanded ? UM.Theme.getIcon("arrow_bottom") : UM.Theme.getIcon("arrow_left") } } } @@ -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 840c636196..81bb8759ff 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("StarFilled") : UM.Theme.getIcon("Star") + source: materialSlot.is_favorite ? UM.Theme.getIcon("favorites_star_full") : UM.Theme.getIcon("favorites_star_empty") } } -} +} \ No newline at end of file diff --git a/resources/qml/Preferences/Materials/MaterialsTypeSection.qml b/resources/qml/Preferences/Materials/MaterialsTypeSection.qml index 09f9964604..7219cb7b89 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("ChevronSingleDown") : UM.Theme.getIcon("ChevronSingleLeft") + source: material_type_section.expanded ? UM.Theme.getIcon("arrow_bottom") : UM.Theme.getIcon("arrow_left") } } @@ -134,4 +134,4 @@ Item expanded = materialList.expandedTypes.indexOf(materialBrand + "_" + materialName) > -1 } } -} +} \ No newline at end of file diff --git a/resources/qml/PrintSetupSelector/Custom/CustomPrintSetup.qml b/resources/qml/PrintSetupSelector/Custom/CustomPrintSetup.qml index 92cbd7dd89..d18febfc5f 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("StarFilled") + iconSource: UM.Theme.getIcon("star") onClicked: { @@ -176,7 +176,7 @@ Item { id: downArrow - source: UM.Theme.getIcon("ChevronSingleDown") + source: UM.Theme.getIcon("arrow_bottom") width: UM.Theme.getSize("standard_arrow").width height: UM.Theme.getSize("standard_arrow").height diff --git a/resources/qml/PrintSetupSelector/NoIntentIcon.qml b/resources/qml/PrintSetupSelector/NoIntentIcon.qml index 6fc883fdef..7943a05ab4 100644 --- a/resources/qml/PrintSetupSelector/NoIntentIcon.qml +++ b/resources/qml/PrintSetupSelector/NoIntentIcon.qml @@ -18,7 +18,7 @@ Item UM.RecolorImage { - source: UM.Theme.getIcon("Information") + source: UM.Theme.getIcon("info") 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 0a5a466780..81b752eef6 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("ChevronSingleLeft") + iconSource: UM.Theme.getIcon("arrow_left") 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("ChevronSingleRight") + iconSource: UM.Theme.getIcon("arrow_right") 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("ThreeDots") + source: UM.Theme.getIcon("resize") 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 ff9204655f..1a15980693 100644 --- a/resources/qml/PrintSetupSelector/PrintSetupSelectorHeader.qml +++ b/resources/qml/PrintSetupSelector/PrintSetupSelectorHeader.qml @@ -15,7 +15,7 @@ RowLayout Cura.IconWithText { - source: UM.Theme.getIcon("PrintQuality") + source: UM.Theme.getIcon("category_layer_height") text: { if (Cura.MachineManager.activeStack) @@ -50,7 +50,7 @@ RowLayout Cura.IconWithText { - source: UM.Theme.getIcon("Infill1") + source: UM.Theme.getIcon("category_infill") text: Cura.MachineManager.activeStack ? parseInt(infillDensity.properties.value) + "%" : "0%" font: UM.Theme.getFont("medium") @@ -65,7 +65,7 @@ RowLayout Cura.IconWithText { - source: UM.Theme.getIcon("Support") + source: UM.Theme.getIcon("category_support") text: supportEnabled.properties.value == "True" ? enabledText : disabledText font: UM.Theme.getFont("medium") @@ -80,7 +80,7 @@ RowLayout Cura.IconWithText { - source: UM.Theme.getIcon("Adhesion") + source: UM.Theme.getIcon("category_adhesion") text: platformAdhesionType.properties.value != "skirt" && platformAdhesionType.properties.value != "none" ? enabledText : disabledText font: UM.Theme.getFont("medium") @@ -92,4 +92,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 df2c1bfae6..1ae265ab47 100644 --- a/resources/qml/PrintSetupSelector/Recommended/RecommendedAdhesionSelector.qml +++ b/resources/qml/PrintSetupSelector/Recommended/RecommendedAdhesionSelector.qml @@ -25,7 +25,7 @@ Item id: enableAdhesionRowTitle anchors.top: parent.top anchors.left: parent.left - source: UM.Theme.getIcon("Adhesion") + source: UM.Theme.getIcon("category_adhesion") text: catalog.i18nc("@label", "Adhesion") font: UM.Theme.getFont("medium") width: labelColumnWidth @@ -87,4 +87,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 8da97437cf..19f199fea6 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("InfillGradual") + return UM.Theme.getIcon("gradual") } if (density <= 0) { - return UM.Theme.getIcon("Infill0") + return UM.Theme.getIcon("hollow") } if (density < 40) { - return UM.Theme.getIcon("Infill3") + return UM.Theme.getIcon("sparse") } if (density < 90) { - return UM.Theme.getIcon("Infill2") + return UM.Theme.getIcon("dense") } - return UM.Theme.getIcon("Solid") + return UM.Theme.getIcon("solid") } } @@ -61,7 +61,7 @@ Item id: infillRowTitle anchors.top: parent.top anchors.left: parent.left - source: UM.Theme.getIcon("Infill1") + source: UM.Theme.getIcon("category_infill") text: catalog.i18nc("@label", "Infill") + " (%)" font: UM.Theme.getFont("medium") width: labelColumnWidth @@ -252,4 +252,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 a8e19c7357..337aff573f 100644 --- a/resources/qml/PrintSetupSelector/Recommended/RecommendedQualityProfileSelector.qml +++ b/resources/qml/PrintSetupSelector/Recommended/RecommendedQualityProfileSelector.qml @@ -48,7 +48,7 @@ Item Cura.IconWithText { id: profileLabel - source: UM.Theme.getIcon("PrintQuality") + source: UM.Theme.getIcon("category_layer_height") text: catalog.i18nc("@label", "Profiles") font: UM.Theme.getFont("medium") width: labelColumnWidth @@ -69,7 +69,7 @@ Item } color: hovered ? UM.Theme.getColor("setting_control_button_hover") : UM.Theme.getColor("setting_control_button") - iconSource: UM.Theme.getIcon("ArrowReset") + iconSource: UM.Theme.getIcon("reset") onClicked: { @@ -198,4 +198,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 924dcd5ec4..aadee43c36 100644 --- a/resources/qml/PrintSetupSelector/Recommended/RecommendedSupportSelector.qml +++ b/resources/qml/PrintSetupSelector/Recommended/RecommendedSupportSelector.qml @@ -26,7 +26,7 @@ Item anchors.top: parent.top anchors.left: parent.left visible: enableSupportCheckBox.visible - source: UM.Theme.getIcon("Support") + source: UM.Theme.getIcon("category_support") text: catalog.i18nc("@label", "Support") font: UM.Theme.getFont("medium") width: labelColumnWidth @@ -162,7 +162,7 @@ Item x: supportExtruderCombobox.width - width - supportExtruderCombobox.rightPadding y: supportExtruderCombobox.topPadding + Math.round((supportExtruderCombobox.availableHeight - height) / 2) - source: UM.Theme.getIcon("ChevronSingleDown") + source: UM.Theme.getIcon("arrow_bottom") width: UM.Theme.getSize("standard_arrow").width height: UM.Theme.getSize("standard_arrow").height sourceSize.width: width + 5 * screenScaleFactor @@ -229,7 +229,7 @@ Item sourceSize.width: width sourceSize.height: height - source: UM.Theme.getIcon("Extruder", "medium") + source: UM.Theme.getIcon("extruder_button") color: supportExtruderCombobox.color } } @@ -299,7 +299,7 @@ Item sourceSize.width: width sourceSize.height: height - source: UM.Theme.getIcon("Extruder", "medium") + source: UM.Theme.getIcon("extruder_button") color: supportExtruderCombobox.model.getItem(index).color } } @@ -342,4 +342,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 3213f1ace8..e8947bfdf4 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("ChevronSingleUp"); + iconSource: UM.Theme.getIcon("arrow_top"); 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("ChevronSingleLeft"); + iconSource: UM.Theme.getIcon("arrow_left"); 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("ChevronSingleRight"); + iconSource: UM.Theme.getIcon("arrow_right"); 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("ChevronSingleDown"); + iconSource: UM.Theme.getIcon("arrow_bottom"); 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("House"); + iconSource: UM.Theme.getIcon("home"); 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("ChevronSingleUp"); + iconSource: UM.Theme.getIcon("arrow_top"); 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("House"); + iconSource: UM.Theme.getIcon("home"); 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("ChevronSingleDown"); + iconSource: UM.Theme.getIcon("arrow_bottom"); 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 7c74be1605..17bb80906a 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("PrinterTriple") + return UM.Theme.getIcon("printer_group") } else if (isNetworkPrinter || isCloudRegistered) { - return UM.Theme.getIcon("Printer") + return UM.Theme.getIcon("printer_single") } else { @@ -118,25 +118,7 @@ Cura.ExpandablePopup leftMargin: UM.Theme.getSize("thick_margin").width } - source: - { - if (connectionStatus == "printer_connected") - { - return UM.Theme.getIcon("CheckBlueBG", "low") - } - else if (connectionStatus == "printer_cloud_connected") - { - return UM.Theme.getIcon("CloudBlueBG", "low") - } - else if (connectionStatus == "printer_cloud_not_available") - { - return UM.Theme.getIcon("CloudGreyBG", "low") - } - else - { - return "" - } - } + source: UM.Theme.getIcon(connectionStatus) width: UM.Theme.getSize("printer_status_icon").width height: UM.Theme.getSize("printer_status_icon").height diff --git a/resources/qml/Settings/SettingCategory.qml b/resources/qml/Settings/SettingCategory.qml index a42db9cdcb..e3e12d7753 100644 --- a/resources/qml/Settings/SettingCategory.qml +++ b/resources/qml/Settings/SettingCategory.qml @@ -93,7 +93,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("ChevronSingleDown") : UM.Theme.getIcon("ChevronSingleLeft") + source: definition.expanded ? UM.Theme.getIcon("arrow_bottom") : UM.Theme.getIcon("arrow_left") } } @@ -154,7 +154,7 @@ Button color: UM.Theme.getColor("setting_control_button") hoverColor: UM.Theme.getColor("setting_control_button_hover") - iconSource: UM.Theme.getIcon("Sliders") + iconSource: UM.Theme.getIcon("settings") onClicked: Cura.Actions.configureSettingVisibility.trigger(definition) } @@ -195,7 +195,7 @@ Button color: UM.Theme.getColor("setting_control_button") hoverColor: UM.Theme.getColor("setting_control_button_hover") - iconSource: UM.Theme.getIcon("Information") + iconSource: UM.Theme.getIcon("notice") 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 20693b92e3..e3de6e219d 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 995e1103f3..2bf9e24b3d 100644 --- a/resources/qml/Settings/SettingExtruder.qml +++ b/resources/qml/Settings/SettingExtruder.qml @@ -104,7 +104,7 @@ SettingItem x: control.width - width - control.rightPadding y: control.topPadding + Math.round((control.availableHeight - height) / 2) - source: UM.Theme.getIcon("ChevronSingleDown") + source: UM.Theme.getIcon("arrow_bottom") width: UM.Theme.getSize("standard_arrow").width height: UM.Theme.getSize("standard_arrow").height sourceSize.width: width + 5 * screenScaleFactor @@ -171,7 +171,7 @@ SettingItem sourceSize.width: width sourceSize.height: height - source: UM.Theme.getIcon("Extruder", "medium") + source: UM.Theme.getIcon("extruder_button") color: control.color } } @@ -240,7 +240,7 @@ SettingItem sourceSize.width: width sourceSize.height: height - source: UM.Theme.getIcon("Extruder", "medium") + 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 56f07f51af..f0c748d190 100644 --- a/resources/qml/Settings/SettingItem.qml +++ b/resources/qml/Settings/SettingItem.qml @@ -179,7 +179,7 @@ Item 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: { @@ -208,7 +208,7 @@ Item color: UM.Theme.getColor("setting_control_button") hoverColor: UM.Theme.getColor("setting_control_button_hover") - iconSource: UM.Theme.getIcon("ArrowReset") + iconSource: UM.Theme.getIcon("reset") onClicked: { @@ -324,7 +324,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("formula") 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 5b1da6b785..ce078551d8 100644 --- a/resources/qml/Settings/SettingOptionalExtruder.qml +++ b/resources/qml/Settings/SettingOptionalExtruder.qml @@ -105,7 +105,7 @@ SettingItem x: control.width - width - control.rightPadding y: control.topPadding + Math.round((control.availableHeight - height) / 2) - source: UM.Theme.getIcon("ChevronSingleDown") + source: UM.Theme.getIcon("arrow_bottom") width: UM.Theme.getSize("standard_arrow").width height: UM.Theme.getSize("standard_arrow").height sourceSize.width: width + 5 * screenScaleFactor @@ -172,7 +172,7 @@ SettingItem sourceSize.width: width sourceSize.height: height - source: UM.Theme.getIcon("Extruder", "medium") + source: UM.Theme.getIcon("extruder_button") color: control.color } } @@ -237,7 +237,7 @@ SettingItem sourceSize.width: width sourceSize.height: height - source: UM.Theme.getIcon("Extruder", "medium") + 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 fe73f55c09..b31e7e4508 100644 --- a/resources/qml/Settings/SettingView.qml +++ b/resources/qml/Settings/SettingView.qml @@ -65,7 +65,7 @@ Item anchors.right: clearFilterButton.left anchors.rightMargin: Math.round(UM.Theme.getSize("thick_margin").width) - placeholderText: "" + "
" + catalog.i18nc("@label:textbox", "Search settings") + placeholderText: "" + "
" + catalog.i18nc("@label:textbox", "Search settings") style: TextFieldStyle { @@ -133,7 +133,7 @@ Item UM.SimpleButton { id: clearFilterButton - iconSource: UM.Theme.getIcon("Cancel") + iconSource: UM.Theme.getIcon("cross1") visible: findingSettings height: Math.round(parent.height * 0.4) @@ -193,7 +193,7 @@ Item 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("Hamburger") + source: UM.Theme.getIcon("menu") } } label: Label {} diff --git a/resources/qml/ViewOrientationControls.qml b/resources/qml/ViewOrientationControls.qml index fc0f20fa77..97f2bb9400 100644 --- a/resources/qml/ViewOrientationControls.qml +++ b/resources/qml/ViewOrientationControls.qml @@ -18,7 +18,7 @@ Row ViewOrientationButton { - iconSource: UM.Theme.getIcon("View3D") + iconSource: UM.Theme.getIcon("view_3d") onClicked: Cura.Actions.view3DCamera.trigger() UM.TooltipArea @@ -31,7 +31,7 @@ Row ViewOrientationButton { - iconSource: UM.Theme.getIcon("ViewFront") + iconSource: UM.Theme.getIcon("view_front") onClicked: Cura.Actions.viewFrontCamera.trigger() UM.TooltipArea @@ -44,7 +44,7 @@ Row ViewOrientationButton { - iconSource: UM.Theme.getIcon("ViewTop") + iconSource: UM.Theme.getIcon("view_top") onClicked: Cura.Actions.viewTopCamera.trigger() UM.TooltipArea @@ -57,7 +57,7 @@ Row ViewOrientationButton { - iconSource: UM.Theme.getIcon("ViewLeft") + iconSource: UM.Theme.getIcon("view_left") onClicked: Cura.Actions.viewLeftSideCamera.trigger() UM.TooltipArea @@ -70,7 +70,7 @@ Row ViewOrientationButton { - iconSource: UM.Theme.getIcon("ViewRight") + iconSource: UM.Theme.getIcon("view_right") onClicked: Cura.Actions.viewRightSideCamera.trigger() UM.TooltipArea diff --git a/resources/qml/WelcomePages/AddLocalPrinterScrollView.qml b/resources/qml/WelcomePages/AddLocalPrinterScrollView.qml index fb809426f4..68ee482b5c 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("ChevronSingleDown") : UM.Theme.getIcon("ChevronSingleRight") + source: base.currentSection == section ? UM.Theme.getIcon("arrow_bottom") : UM.Theme.getIcon("arrow_right") } Label diff --git a/resources/qml/WelcomePages/AddNetworkPrinterScrollView.qml b/resources/qml/WelcomePages/AddNetworkPrinterScrollView.qml index 5334a15974..9d79c421bd 100644 --- a/resources/qml/WelcomePages/AddNetworkPrinterScrollView.qml +++ b/resources/qml/WelcomePages/AddNetworkPrinterScrollView.qml @@ -229,7 +229,7 @@ Item width: height sourceSize.height: width color: UM.Theme.getColor("text_link") - source: UM.Theme.getIcon("LinkExternal") + source: UM.Theme.getIcon("external_link") } Label diff --git a/resources/qml/WelcomePages/CloudContent.qml b/resources/qml/WelcomePages/CloudContent.qml index 26e3a2f87c..692ad12a29 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("Plugin") + source: UM.Theme.getIcon("package") 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("Spool") + source: UM.Theme.getIcon("material_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("PrinterTriple", "medium") + source: UM.Theme.getIcon("group") sourceSize.width: width sourceSize.height: height } diff --git a/resources/qml/WelcomePages/DropDownHeader.qml b/resources/qml/WelcomePages/DropDownHeader.qml index cb41ca808b..88da32c879 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("ChevronSingleDown") + property url rightIconSource: UM.Theme.getIcon("arrow_bottom") // 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 b129673905..7ec6860c89 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("ChevronSingleDown") : UM.Theme.getIcon("ChevronSingleLeft") + rightIconSource: contentShown ? UM.Theme.getIcon("arrow_bottom") : UM.Theme.getIcon("arrow_left") contentShown: base.contentShown } diff --git a/resources/qml/Widgets/CheckBox.qml b/resources/qml/Widgets/CheckBox.qml index 295283d76e..f79dc1620e 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 f0ee3bdc00..7eb366f0a3 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("ChevronSingleDown") + source: UM.Theme.getIcon("arrow_bottom") width: UM.Theme.getSize("standard_arrow").width height: UM.Theme.getSize("standard_arrow").height sourceSize.width: width + 5 * screenScaleFactor 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 new file mode 100644 index 0000000000..09ba300b6a --- /dev/null +++ b/resources/themes/cura-dark-colorblind/icons/sign_in_to_cloud.svg @@ -0,0 +1,16 @@ + + + + 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 new file mode 100644 index 0000000000..09ba300b6a --- /dev/null +++ b/resources/themes/cura-dark/icons/sign_in_to_cloud.svg @@ -0,0 +1,16 @@ + + + + Group-cloud Copy + Created with Sketch. + + + + + + + + + + + \ No newline at end of file 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 new file mode 100644 index 0000000000..09ba300b6a --- /dev/null +++ b/resources/themes/cura-light-colorblind/icons/sign_in_to_cloud.svg @@ -0,0 +1,16 @@ + + + + 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 new file mode 100644 index 0000000000..a76323a7d4 --- /dev/null +++ b/resources/themes/cura-light/icons/application.svg @@ -0,0 +1,7 @@ + + + + + + + diff --git a/resources/themes/cura-light/icons/arrow_bottom.svg b/resources/themes/cura-light/icons/arrow_bottom.svg new file mode 100644 index 0000000000..102f7b54a2 --- /dev/null +++ b/resources/themes/cura-light/icons/arrow_bottom.svg @@ -0,0 +1,3 @@ + + + diff --git a/resources/themes/cura-light/icons/arrow_left.svg b/resources/themes/cura-light/icons/arrow_left.svg new file mode 100644 index 0000000000..e48cece556 --- /dev/null +++ b/resources/themes/cura-light/icons/arrow_left.svg @@ -0,0 +1,3 @@ + + + diff --git a/resources/themes/cura-light/icons/arrow_right.svg b/resources/themes/cura-light/icons/arrow_right.svg new file mode 100644 index 0000000000..6562a3e80b --- /dev/null +++ b/resources/themes/cura-light/icons/arrow_right.svg @@ -0,0 +1,3 @@ + + + diff --git a/resources/themes/cura-light/icons/arrow_top.svg b/resources/themes/cura-light/icons/arrow_top.svg new file mode 100644 index 0000000000..7af5913a32 --- /dev/null +++ b/resources/themes/cura-light/icons/arrow_top.svg @@ -0,0 +1,3 @@ + + + diff --git a/resources/themes/cura-light/icons/basic.svg b/resources/themes/cura-light/icons/basic.svg new file mode 100644 index 0000000000..b30d0669b3 --- /dev/null +++ b/resources/themes/cura-light/icons/basic.svg @@ -0,0 +1,3 @@ + + + diff --git a/resources/themes/cura-light/icons/buildplate.svg b/resources/themes/cura-light/icons/buildplate.svg new file mode 100644 index 0000000000..7505c8204e --- /dev/null +++ b/resources/themes/cura-light/icons/buildplate.svg @@ -0,0 +1,9 @@ + + + + + + + + + \ 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 new file mode 100644 index 0000000000..dc119d889a --- /dev/null +++ b/resources/themes/cura-light/icons/category_adhesion.svg @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/resources/themes/cura-light/icons/category_blackmagic.svg b/resources/themes/cura-light/icons/category_blackmagic.svg new file mode 100644 index 0000000000..d4e2b89ba4 --- /dev/null +++ b/resources/themes/cura-light/icons/category_blackmagic.svg @@ -0,0 +1,11 @@ + + + + + + ? + + + + + diff --git a/resources/themes/cura-light/icons/category_cool.svg b/resources/themes/cura-light/icons/category_cool.svg new file mode 100644 index 0000000000..db74322a2c --- /dev/null +++ b/resources/themes/cura-light/icons/category_cool.svg @@ -0,0 +1,7 @@ + + + + + + + diff --git a/resources/themes/cura-light/icons/category_dual.svg b/resources/themes/cura-light/icons/category_dual.svg new file mode 100644 index 0000000000..2a53292379 --- /dev/null +++ b/resources/themes/cura-light/icons/category_dual.svg @@ -0,0 +1,7 @@ + + + + + + + diff --git a/resources/themes/cura-light/icons/category_experimental.svg b/resources/themes/cura-light/icons/category_experimental.svg new file mode 100644 index 0000000000..9fc7d74880 --- /dev/null +++ b/resources/themes/cura-light/icons/category_experimental.svg @@ -0,0 +1,7 @@ + + + + + + + diff --git a/resources/themes/cura-light/icons/category_fixes.svg b/resources/themes/cura-light/icons/category_fixes.svg new file mode 100644 index 0000000000..963338088a --- /dev/null +++ b/resources/themes/cura-light/icons/category_fixes.svg @@ -0,0 +1,7 @@ + + + + + + + diff --git a/resources/themes/cura-light/icons/category_infill.svg b/resources/themes/cura-light/icons/category_infill.svg new file mode 100644 index 0000000000..e1660ca8e2 --- /dev/null +++ b/resources/themes/cura-light/icons/category_infill.svg @@ -0,0 +1,7 @@ + + + + + + + diff --git a/resources/themes/cura-light/icons/category_layer_height.svg b/resources/themes/cura-light/icons/category_layer_height.svg new file mode 100644 index 0000000000..474e81f14e --- /dev/null +++ b/resources/themes/cura-light/icons/category_layer_height.svg @@ -0,0 +1,7 @@ + + + + + + + diff --git a/resources/themes/cura-light/icons/category_machine.svg b/resources/themes/cura-light/icons/category_machine.svg new file mode 100644 index 0000000000..25c84aa4f2 --- /dev/null +++ b/resources/themes/cura-light/icons/category_machine.svg @@ -0,0 +1,3 @@ + + + diff --git a/resources/themes/cura-light/icons/category_material.svg b/resources/themes/cura-light/icons/category_material.svg new file mode 100644 index 0000000000..0d8ae42d9d --- /dev/null +++ b/resources/themes/cura-light/icons/category_material.svg @@ -0,0 +1,7 @@ + + + + + + + diff --git a/resources/themes/cura-light/icons/category_shell.svg b/resources/themes/cura-light/icons/category_shell.svg new file mode 100644 index 0000000000..61e112d88c --- /dev/null +++ b/resources/themes/cura-light/icons/category_shell.svg @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/resources/themes/cura-light/icons/category_shield.svg b/resources/themes/cura-light/icons/category_shield.svg new file mode 100644 index 0000000000..99a245936d --- /dev/null +++ b/resources/themes/cura-light/icons/category_shield.svg @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/resources/themes/cura-light/icons/category_speed.svg b/resources/themes/cura-light/icons/category_speed.svg new file mode 100644 index 0000000000..36d1b3f2e1 --- /dev/null +++ b/resources/themes/cura-light/icons/category_speed.svg @@ -0,0 +1,20 @@ + + + + + + + + diff --git a/resources/themes/cura-light/icons/category_support.svg b/resources/themes/cura-light/icons/category_support.svg new file mode 100644 index 0000000000..693e1f5f37 --- /dev/null +++ b/resources/themes/cura-light/icons/category_support.svg @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/resources/themes/cura-light/icons/category_topbottom.svg b/resources/themes/cura-light/icons/category_topbottom.svg new file mode 100644 index 0000000000..7efefbd4bb --- /dev/null +++ b/resources/themes/cura-light/icons/category_topbottom.svg @@ -0,0 +1,7 @@ + + + + + + + \ 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 new file mode 100644 index 0000000000..67f5713671 --- /dev/null +++ b/resources/themes/cura-light/icons/category_travel.svg @@ -0,0 +1,7 @@ + + + + + + + diff --git a/resources/themes/cura-light/icons/category_unknown.svg b/resources/themes/cura-light/icons/category_unknown.svg new file mode 100644 index 0000000000..67f5713671 --- /dev/null +++ b/resources/themes/cura-light/icons/category_unknown.svg @@ -0,0 +1,7 @@ + + + + + + + diff --git a/resources/themes/cura-light/icons/check.svg b/resources/themes/cura-light/icons/check.svg new file mode 100644 index 0000000000..62b6993763 --- /dev/null +++ b/resources/themes/cura-light/icons/check.svg @@ -0,0 +1,3 @@ + + + diff --git a/resources/themes/cura-light/icons/checked.svg b/resources/themes/cura-light/icons/checked.svg new file mode 100644 index 0000000000..22d1278667 --- /dev/null +++ b/resources/themes/cura-light/icons/checked.svg @@ -0,0 +1,12 @@ + + + + checked + Created with Sketch. + + + + + + + \ No newline at end of file diff --git a/resources/themes/cura-light/icons/default/CircleOutline.svg b/resources/themes/cura-light/icons/circle_outline.svg similarity index 100% rename from resources/themes/cura-light/icons/default/CircleOutline.svg rename to resources/themes/cura-light/icons/circle_outline.svg diff --git a/resources/themes/cura-light/icons/clock.svg b/resources/themes/cura-light/icons/clock.svg new file mode 100644 index 0000000000..0b6cb78881 --- /dev/null +++ b/resources/themes/cura-light/icons/clock.svg @@ -0,0 +1,53 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/resources/themes/cura-light/icons/cross1.svg b/resources/themes/cura-light/icons/cross1.svg new file mode 100644 index 0000000000..63b7a6951c --- /dev/null +++ b/resources/themes/cura-light/icons/cross1.svg @@ -0,0 +1,7 @@ + + + + + + + diff --git a/resources/themes/cura-light/icons/cross2.svg b/resources/themes/cura-light/icons/cross2.svg new file mode 100644 index 0000000000..7d4a3a878d --- /dev/null +++ b/resources/themes/cura-light/icons/cross2.svg @@ -0,0 +1,4 @@ + + + + diff --git a/resources/themes/cura-light/icons/default/Adhesion.svg b/resources/themes/cura-light/icons/default/Adhesion.svg deleted file mode 100755 index f43ccdb030..0000000000 --- a/resources/themes/cura-light/icons/default/Adhesion.svg +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - diff --git a/resources/themes/cura-light/icons/default/ArrowDoubleCircleRight.svg b/resources/themes/cura-light/icons/default/ArrowDoubleCircleRight.svg deleted file mode 100755 index 9c3699e040..0000000000 --- a/resources/themes/cura-light/icons/default/ArrowDoubleCircleRight.svg +++ /dev/null @@ -1,6 +0,0 @@ - - - - diff --git a/resources/themes/cura-light/icons/default/ArrowFourWay.svg b/resources/themes/cura-light/icons/default/ArrowFourWay.svg deleted file mode 100755 index 5470443441..0000000000 --- a/resources/themes/cura-light/icons/default/ArrowFourWay.svg +++ /dev/null @@ -1,7 +0,0 @@ - - - - diff --git a/resources/themes/cura-light/icons/default/ArrowReset.svg b/resources/themes/cura-light/icons/default/ArrowReset.svg deleted file mode 100755 index 0283cf67b6..0000000000 --- a/resources/themes/cura-light/icons/default/ArrowReset.svg +++ /dev/null @@ -1,6 +0,0 @@ - - - - diff --git a/resources/themes/cura-light/icons/default/Bandage.svg b/resources/themes/cura-light/icons/default/Bandage.svg deleted file mode 100755 index abb13320ca..0000000000 --- a/resources/themes/cura-light/icons/default/Bandage.svg +++ /dev/null @@ -1,7 +0,0 @@ - - - - diff --git a/resources/themes/cura-light/icons/default/BlackMagic.svg b/resources/themes/cura-light/icons/default/BlackMagic.svg deleted file mode 100755 index f53f54f3dd..0000000000 --- a/resources/themes/cura-light/icons/default/BlackMagic.svg +++ /dev/null @@ -1,8 +0,0 @@ - - - - diff --git a/resources/themes/cura-light/icons/default/Cancel.svg b/resources/themes/cura-light/icons/default/Cancel.svg deleted file mode 100755 index 2646952ce1..0000000000 --- a/resources/themes/cura-light/icons/default/Cancel.svg +++ /dev/null @@ -1,6 +0,0 @@ - - - - diff --git a/resources/themes/cura-light/icons/default/CancelBlock.svg b/resources/themes/cura-light/icons/default/CancelBlock.svg deleted file mode 100755 index 605839e0bf..0000000000 --- a/resources/themes/cura-light/icons/default/CancelBlock.svg +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - diff --git a/resources/themes/cura-light/icons/default/CancelCircle.svg b/resources/themes/cura-light/icons/default/CancelCircle.svg deleted file mode 100755 index dc541f2d54..0000000000 --- a/resources/themes/cura-light/icons/default/CancelCircle.svg +++ /dev/null @@ -1,7 +0,0 @@ - - - - diff --git a/resources/themes/cura-light/icons/default/Check.svg b/resources/themes/cura-light/icons/default/Check.svg deleted file mode 100755 index 17e290a38b..0000000000 --- a/resources/themes/cura-light/icons/default/Check.svg +++ /dev/null @@ -1,5 +0,0 @@ - - - - diff --git a/resources/themes/cura-light/icons/default/CheckCircle.svg b/resources/themes/cura-light/icons/default/CheckCircle.svg deleted file mode 100755 index aac1a50b95..0000000000 --- a/resources/themes/cura-light/icons/default/CheckCircle.svg +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - diff --git a/resources/themes/cura-light/icons/default/ChevronSingleDown.svg b/resources/themes/cura-light/icons/default/ChevronSingleDown.svg deleted file mode 100755 index 3d6018ada0..0000000000 --- a/resources/themes/cura-light/icons/default/ChevronSingleDown.svg +++ /dev/null @@ -1,5 +0,0 @@ - - - - diff --git a/resources/themes/cura-light/icons/default/ChevronSingleLeft.svg b/resources/themes/cura-light/icons/default/ChevronSingleLeft.svg deleted file mode 100755 index 25d41e2ef5..0000000000 --- a/resources/themes/cura-light/icons/default/ChevronSingleLeft.svg +++ /dev/null @@ -1,5 +0,0 @@ - - - - diff --git a/resources/themes/cura-light/icons/default/ChevronSingleRight.svg b/resources/themes/cura-light/icons/default/ChevronSingleRight.svg deleted file mode 100755 index 099ca58e67..0000000000 --- a/resources/themes/cura-light/icons/default/ChevronSingleRight.svg +++ /dev/null @@ -1,5 +0,0 @@ - - - - diff --git a/resources/themes/cura-light/icons/default/ChevronSingleUp.svg b/resources/themes/cura-light/icons/default/ChevronSingleUp.svg deleted file mode 100755 index 1575d25ed5..0000000000 --- a/resources/themes/cura-light/icons/default/ChevronSingleUp.svg +++ /dev/null @@ -1,5 +0,0 @@ - - - - diff --git a/resources/themes/cura-light/icons/default/Clock.svg b/resources/themes/cura-light/icons/default/Clock.svg deleted file mode 100755 index 9bdc8252aa..0000000000 --- a/resources/themes/cura-light/icons/default/Clock.svg +++ /dev/null @@ -1,6 +0,0 @@ - - - - diff --git a/resources/themes/cura-light/icons/default/Cloud.svg b/resources/themes/cura-light/icons/default/Cloud.svg deleted file mode 100755 index df0a4560c8..0000000000 --- a/resources/themes/cura-light/icons/default/Cloud.svg +++ /dev/null @@ -1,7 +0,0 @@ - - - - diff --git a/resources/themes/cura-light/icons/default/DualExtrusion.svg b/resources/themes/cura-light/icons/default/DualExtrusion.svg deleted file mode 100755 index 18b991ad44..0000000000 --- a/resources/themes/cura-light/icons/default/DualExtrusion.svg +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - diff --git a/resources/themes/cura-light/icons/default/Experiment.svg b/resources/themes/cura-light/icons/default/Experiment.svg deleted file mode 100755 index 75201d92f7..0000000000 --- a/resources/themes/cura-light/icons/default/Experiment.svg +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - diff --git a/resources/themes/cura-light/icons/default/Eye.svg b/resources/themes/cura-light/icons/default/Eye.svg deleted file mode 100755 index a45a0fed40..0000000000 --- a/resources/themes/cura-light/icons/default/Eye.svg +++ /dev/null @@ -1,7 +0,0 @@ - - - - diff --git a/resources/themes/cura-light/icons/default/Fan.svg b/resources/themes/cura-light/icons/default/Fan.svg deleted file mode 100755 index 7e984250b9..0000000000 --- a/resources/themes/cura-light/icons/default/Fan.svg +++ /dev/null @@ -1,9 +0,0 @@ - - - - diff --git a/resources/themes/cura-light/icons/default/Folder.svg b/resources/themes/cura-light/icons/default/Folder.svg deleted file mode 100755 index 32ffd27cfe..0000000000 --- a/resources/themes/cura-light/icons/default/Folder.svg +++ /dev/null @@ -1,6 +0,0 @@ - - - - diff --git a/resources/themes/cura-light/icons/default/Formula.svg b/resources/themes/cura-light/icons/default/Formula.svg deleted file mode 100755 index 2d89dd7df0..0000000000 --- a/resources/themes/cura-light/icons/default/Formula.svg +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - diff --git a/resources/themes/cura-light/icons/default/Guide.svg b/resources/themes/cura-light/icons/default/Guide.svg deleted file mode 100755 index 358a8864a4..0000000000 --- a/resources/themes/cura-light/icons/default/Guide.svg +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - diff --git a/resources/themes/cura-light/icons/default/Hamburger.svg b/resources/themes/cura-light/icons/default/Hamburger.svg deleted file mode 100755 index ed83977773..0000000000 --- a/resources/themes/cura-light/icons/default/Hamburger.svg +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - diff --git a/resources/themes/cura-light/icons/default/House.svg b/resources/themes/cura-light/icons/default/House.svg deleted file mode 100755 index b44362a061..0000000000 --- a/resources/themes/cura-light/icons/default/House.svg +++ /dev/null @@ -1,6 +0,0 @@ - - - - diff --git a/resources/themes/cura-light/icons/default/Infill0.svg b/resources/themes/cura-light/icons/default/Infill0.svg deleted file mode 100755 index d33ab09dda..0000000000 --- a/resources/themes/cura-light/icons/default/Infill0.svg +++ /dev/null @@ -1,5 +0,0 @@ - - - - diff --git a/resources/themes/cura-light/icons/default/Infill1.svg b/resources/themes/cura-light/icons/default/Infill1.svg deleted file mode 100755 index 1d31070389..0000000000 --- a/resources/themes/cura-light/icons/default/Infill1.svg +++ /dev/null @@ -1,9 +0,0 @@ - - - - diff --git a/resources/themes/cura-light/icons/default/Infill2.svg b/resources/themes/cura-light/icons/default/Infill2.svg deleted file mode 100755 index 67de5e5eec..0000000000 --- a/resources/themes/cura-light/icons/default/Infill2.svg +++ /dev/null @@ -1,8 +0,0 @@ - - - - diff --git a/resources/themes/cura-light/icons/default/Infill3.svg b/resources/themes/cura-light/icons/default/Infill3.svg deleted file mode 100755 index 19292cd230..0000000000 --- a/resources/themes/cura-light/icons/default/Infill3.svg +++ /dev/null @@ -1,6 +0,0 @@ - - - - diff --git a/resources/themes/cura-light/icons/default/InfillGradual.svg b/resources/themes/cura-light/icons/default/InfillGradual.svg deleted file mode 100755 index 28ad18fbf7..0000000000 --- a/resources/themes/cura-light/icons/default/InfillGradual.svg +++ /dev/null @@ -1,7 +0,0 @@ - - - - diff --git a/resources/themes/cura-light/icons/default/Information.svg b/resources/themes/cura-light/icons/default/Information.svg deleted file mode 100755 index 980167c73f..0000000000 --- a/resources/themes/cura-light/icons/default/Information.svg +++ /dev/null @@ -1,6 +0,0 @@ - - - - diff --git a/resources/themes/cura-light/icons/default/LayFlat.svg b/resources/themes/cura-light/icons/default/LayFlat.svg deleted file mode 100755 index d66062da43..0000000000 --- a/resources/themes/cura-light/icons/default/LayFlat.svg +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - diff --git a/resources/themes/cura-light/icons/default/LayFlatOnFace.svg b/resources/themes/cura-light/icons/default/LayFlatOnFace.svg deleted file mode 100755 index 1f2b42f6fe..0000000000 --- a/resources/themes/cura-light/icons/default/LayFlatOnFace.svg +++ /dev/null @@ -1,6 +0,0 @@ - - - - diff --git a/resources/themes/cura-light/icons/default/Layers.svg b/resources/themes/cura-light/icons/default/Layers.svg deleted file mode 100755 index b4f488f007..0000000000 --- a/resources/themes/cura-light/icons/default/Layers.svg +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - diff --git a/resources/themes/cura-light/icons/default/Lightning.svg b/resources/themes/cura-light/icons/default/Lightning.svg deleted file mode 100644 index 544fe86df1..0000000000 --- a/resources/themes/cura-light/icons/default/Lightning.svg +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - diff --git a/resources/themes/cura-light/icons/default/Link.svg b/resources/themes/cura-light/icons/default/Link.svg deleted file mode 100755 index 477d977f50..0000000000 --- a/resources/themes/cura-light/icons/default/Link.svg +++ /dev/null @@ -1,9 +0,0 @@ - - - - diff --git a/resources/themes/cura-light/icons/default/LinkExternal.svg b/resources/themes/cura-light/icons/default/LinkExternal.svg deleted file mode 100755 index 57e9079a30..0000000000 --- a/resources/themes/cura-light/icons/default/LinkExternal.svg +++ /dev/null @@ -1,6 +0,0 @@ - - - - diff --git a/resources/themes/cura-light/icons/default/Magnifier.svg b/resources/themes/cura-light/icons/default/Magnifier.svg deleted file mode 100755 index 5edba462f1..0000000000 --- a/resources/themes/cura-light/icons/default/Magnifier.svg +++ /dev/null @@ -1,6 +0,0 @@ - - - - diff --git a/resources/themes/cura-light/icons/default/MeshType.svg b/resources/themes/cura-light/icons/default/MeshType.svg deleted file mode 100755 index fa164ef885..0000000000 --- a/resources/themes/cura-light/icons/default/MeshType.svg +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - diff --git a/resources/themes/cura-light/icons/default/MeshTypeExclude.svg b/resources/themes/cura-light/icons/default/MeshTypeExclude.svg deleted file mode 100755 index f31de41aad..0000000000 --- a/resources/themes/cura-light/icons/default/MeshTypeExclude.svg +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - diff --git a/resources/themes/cura-light/icons/default/MeshTypeIntersect.svg b/resources/themes/cura-light/icons/default/MeshTypeIntersect.svg deleted file mode 100755 index 0f98747442..0000000000 --- a/resources/themes/cura-light/icons/default/MeshTypeIntersect.svg +++ /dev/null @@ -1,5 +0,0 @@ - - - - diff --git a/resources/themes/cura-light/icons/default/MeshTypeNormal.svg b/resources/themes/cura-light/icons/default/MeshTypeNormal.svg deleted file mode 100755 index d33ab09dda..0000000000 --- a/resources/themes/cura-light/icons/default/MeshTypeNormal.svg +++ /dev/null @@ -1,5 +0,0 @@ - - - - diff --git a/resources/themes/cura-light/icons/default/MeshTypeSupport.svg b/resources/themes/cura-light/icons/default/MeshTypeSupport.svg deleted file mode 100755 index e9a6d5b095..0000000000 --- a/resources/themes/cura-light/icons/default/MeshTypeSupport.svg +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - diff --git a/resources/themes/cura-light/icons/default/Minus.svg b/resources/themes/cura-light/icons/default/Minus.svg deleted file mode 100755 index ebb380a3fa..0000000000 --- a/resources/themes/cura-light/icons/default/Minus.svg +++ /dev/null @@ -1,5 +0,0 @@ - - - - diff --git a/resources/themes/cura-light/icons/default/Mirror.svg b/resources/themes/cura-light/icons/default/Mirror.svg deleted file mode 100755 index cec1fddc84..0000000000 --- a/resources/themes/cura-light/icons/default/Mirror.svg +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - diff --git a/resources/themes/cura-light/icons/default/Pen.svg b/resources/themes/cura-light/icons/default/Pen.svg deleted file mode 100755 index bf57f90e6f..0000000000 --- a/resources/themes/cura-light/icons/default/Pen.svg +++ /dev/null @@ -1,5 +0,0 @@ - - - - diff --git a/resources/themes/cura-light/icons/default/Plugin.svg b/resources/themes/cura-light/icons/default/Plugin.svg deleted file mode 100755 index 95db5e876a..0000000000 --- a/resources/themes/cura-light/icons/default/Plugin.svg +++ /dev/null @@ -1,6 +0,0 @@ - - - - diff --git a/resources/themes/cura-light/icons/default/Plus.svg b/resources/themes/cura-light/icons/default/Plus.svg deleted file mode 100755 index ec8319b336..0000000000 --- a/resources/themes/cura-light/icons/default/Plus.svg +++ /dev/null @@ -1,5 +0,0 @@ - - - - diff --git a/resources/themes/cura-light/icons/default/PrintQuality.svg b/resources/themes/cura-light/icons/default/PrintQuality.svg deleted file mode 100755 index 59eeb25c1e..0000000000 --- a/resources/themes/cura-light/icons/default/PrintQuality.svg +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - diff --git a/resources/themes/cura-light/icons/default/PrintShell.svg b/resources/themes/cura-light/icons/default/PrintShell.svg deleted file mode 100755 index 66291153a2..0000000000 --- a/resources/themes/cura-light/icons/default/PrintShell.svg +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - - - - - - - - - diff --git a/resources/themes/cura-light/icons/default/PrintTopBottom.svg b/resources/themes/cura-light/icons/default/PrintTopBottom.svg deleted file mode 100644 index 2ac2e241e0..0000000000 --- a/resources/themes/cura-light/icons/default/PrintTopBottom.svg +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - - diff --git a/resources/themes/cura-light/icons/default/PrintTravel.svg b/resources/themes/cura-light/icons/default/PrintTravel.svg deleted file mode 100755 index cd2f5a8602..0000000000 --- a/resources/themes/cura-light/icons/default/PrintTravel.svg +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - diff --git a/resources/themes/cura-light/icons/default/Printer.svg b/resources/themes/cura-light/icons/default/Printer.svg deleted file mode 100755 index f5f1a50cce..0000000000 --- a/resources/themes/cura-light/icons/default/Printer.svg +++ /dev/null @@ -1,5 +0,0 @@ - - - - diff --git a/resources/themes/cura-light/icons/default/PrinterTriple.svg b/resources/themes/cura-light/icons/default/PrinterTriple.svg deleted file mode 100755 index 4530fad98e..0000000000 --- a/resources/themes/cura-light/icons/default/PrinterTriple.svg +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - diff --git a/resources/themes/cura-light/icons/default/Quick.svg b/resources/themes/cura-light/icons/default/Quick.svg deleted file mode 100755 index 25a5ee0af5..0000000000 --- a/resources/themes/cura-light/icons/default/Quick.svg +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - - - - - - - - - - diff --git a/resources/themes/cura-light/icons/default/Rotate.svg b/resources/themes/cura-light/icons/default/Rotate.svg deleted file mode 100755 index 0b294e399b..0000000000 --- a/resources/themes/cura-light/icons/default/Rotate.svg +++ /dev/null @@ -1,18 +0,0 @@ - - - - - - - - - - - - diff --git a/resources/themes/cura-light/icons/default/Scale.svg b/resources/themes/cura-light/icons/default/Scale.svg deleted file mode 100755 index 35ae3ceb86..0000000000 --- a/resources/themes/cura-light/icons/default/Scale.svg +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - diff --git a/resources/themes/cura-light/icons/default/ScaleMax.svg b/resources/themes/cura-light/icons/default/ScaleMax.svg deleted file mode 100755 index ea264786d3..0000000000 --- a/resources/themes/cura-light/icons/default/ScaleMax.svg +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - diff --git a/resources/themes/cura-light/icons/default/Shield.svg b/resources/themes/cura-light/icons/default/Shield.svg deleted file mode 100755 index d44cf8ea73..0000000000 --- a/resources/themes/cura-light/icons/default/Shield.svg +++ /dev/null @@ -1,6 +0,0 @@ - - - - diff --git a/resources/themes/cura-light/icons/default/Sliders.svg b/resources/themes/cura-light/icons/default/Sliders.svg deleted file mode 100755 index 3b81f79e2b..0000000000 --- a/resources/themes/cura-light/icons/default/Sliders.svg +++ /dev/null @@ -1,9 +0,0 @@ - - - - diff --git a/resources/themes/cura-light/icons/default/SpeedOMeter.svg b/resources/themes/cura-light/icons/default/SpeedOMeter.svg deleted file mode 100755 index 334ccb2309..0000000000 --- a/resources/themes/cura-light/icons/default/SpeedOMeter.svg +++ /dev/null @@ -1,8 +0,0 @@ - - - - diff --git a/resources/themes/cura-light/icons/default/Spool.svg b/resources/themes/cura-light/icons/default/Spool.svg deleted file mode 100755 index aee874de6b..0000000000 --- a/resources/themes/cura-light/icons/default/Spool.svg +++ /dev/null @@ -1,8 +0,0 @@ - - - - diff --git a/resources/themes/cura-light/icons/default/Sputnik.svg b/resources/themes/cura-light/icons/default/Sputnik.svg deleted file mode 100755 index 4b8341b0c5..0000000000 --- a/resources/themes/cura-light/icons/default/Sputnik.svg +++ /dev/null @@ -1,10 +0,0 @@ - - - - diff --git a/resources/themes/cura-light/icons/default/Star.svg b/resources/themes/cura-light/icons/default/Star.svg deleted file mode 100755 index 3a23b9a1f3..0000000000 --- a/resources/themes/cura-light/icons/default/Star.svg +++ /dev/null @@ -1,6 +0,0 @@ - - - - diff --git a/resources/themes/cura-light/icons/default/StarFilled.svg b/resources/themes/cura-light/icons/default/StarFilled.svg deleted file mode 100755 index a0c7256800..0000000000 --- a/resources/themes/cura-light/icons/default/StarFilled.svg +++ /dev/null @@ -1,5 +0,0 @@ - - - - diff --git a/resources/themes/cura-light/icons/default/Support.svg b/resources/themes/cura-light/icons/default/Support.svg deleted file mode 100755 index 095e29547d..0000000000 --- a/resources/themes/cura-light/icons/default/Support.svg +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - diff --git a/resources/themes/cura-light/icons/default/SupportBlocker.svg b/resources/themes/cura-light/icons/default/SupportBlocker.svg deleted file mode 100755 index cd00c2c985..0000000000 --- a/resources/themes/cura-light/icons/default/SupportBlocker.svg +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - diff --git a/resources/themes/cura-light/icons/default/ThreeDots.svg b/resources/themes/cura-light/icons/default/ThreeDots.svg deleted file mode 100755 index 51e7214cbb..0000000000 --- a/resources/themes/cura-light/icons/default/ThreeDots.svg +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/resources/themes/cura-light/icons/default/UltimakerCura.svg b/resources/themes/cura-light/icons/default/UltimakerCura.svg deleted file mode 100755 index d691f27bdd..0000000000 --- a/resources/themes/cura-light/icons/default/UltimakerCura.svg +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - diff --git a/resources/themes/cura-light/icons/default/View3D.svg b/resources/themes/cura-light/icons/default/View3D.svg deleted file mode 100755 index 5dd5146a24..0000000000 --- a/resources/themes/cura-light/icons/default/View3D.svg +++ /dev/null @@ -1,7 +0,0 @@ - - - - diff --git a/resources/themes/cura-light/icons/default/ViewFront.svg b/resources/themes/cura-light/icons/default/ViewFront.svg deleted file mode 100755 index 8161a687b3..0000000000 --- a/resources/themes/cura-light/icons/default/ViewFront.svg +++ /dev/null @@ -1,6 +0,0 @@ - - - - diff --git a/resources/themes/cura-light/icons/default/ViewLeft.svg b/resources/themes/cura-light/icons/default/ViewLeft.svg deleted file mode 100755 index db84384ae9..0000000000 --- a/resources/themes/cura-light/icons/default/ViewLeft.svg +++ /dev/null @@ -1,6 +0,0 @@ - - - - diff --git a/resources/themes/cura-light/icons/default/ViewRight.svg b/resources/themes/cura-light/icons/default/ViewRight.svg deleted file mode 100755 index 2212dc9ee1..0000000000 --- a/resources/themes/cura-light/icons/default/ViewRight.svg +++ /dev/null @@ -1,6 +0,0 @@ - - - - diff --git a/resources/themes/cura-light/icons/default/ViewTop.svg b/resources/themes/cura-light/icons/default/ViewTop.svg deleted file mode 100755 index c70e3f0d81..0000000000 --- a/resources/themes/cura-light/icons/default/ViewTop.svg +++ /dev/null @@ -1,6 +0,0 @@ - - - - diff --git a/resources/themes/cura-light/icons/default/Warning.svg b/resources/themes/cura-light/icons/default/Warning.svg deleted file mode 100755 index 6105030fe6..0000000000 --- a/resources/themes/cura-light/icons/default/Warning.svg +++ /dev/null @@ -1,6 +0,0 @@ - - - - diff --git a/resources/themes/cura-light/icons/dense.svg b/resources/themes/cura-light/icons/dense.svg new file mode 100644 index 0000000000..a8f65fecc7 --- /dev/null +++ b/resources/themes/cura-light/icons/dense.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/resources/themes/cura-light/icons/low/Dot.svg b/resources/themes/cura-light/icons/dot.svg similarity index 100% rename from resources/themes/cura-light/icons/low/Dot.svg rename to resources/themes/cura-light/icons/dot.svg diff --git a/resources/themes/cura-light/icons/drop_down_button.svg b/resources/themes/cura-light/icons/drop_down_button.svg new file mode 100644 index 0000000000..18748e6d70 --- /dev/null +++ b/resources/themes/cura-light/icons/drop_down_button.svg @@ -0,0 +1,4 @@ + + + + \ 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 new file mode 100644 index 0000000000..a2130fb97b --- /dev/null +++ b/resources/themes/cura-light/icons/external_link.svg @@ -0,0 +1,8 @@ + + + + + + + + \ 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 new file mode 100644 index 0000000000..c79ba5c5df --- /dev/null +++ b/resources/themes/cura-light/icons/extruder_button.svg @@ -0,0 +1,9 @@ + + + + + + + + + \ 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 new file mode 100644 index 0000000000..bb1205e7a7 --- /dev/null +++ b/resources/themes/cura-light/icons/favorites_star_empty.svg @@ -0,0 +1,8 @@ + + + + + diff --git a/resources/themes/cura-light/icons/favorites_star_full.svg b/resources/themes/cura-light/icons/favorites_star_full.svg new file mode 100644 index 0000000000..aad45c5d02 --- /dev/null +++ b/resources/themes/cura-light/icons/favorites_star_full.svg @@ -0,0 +1,6 @@ + + + + + diff --git a/resources/themes/cura-light/icons/formula.svg b/resources/themes/cura-light/icons/formula.svg new file mode 100644 index 0000000000..ae810bc014 --- /dev/null +++ b/resources/themes/cura-light/icons/formula.svg @@ -0,0 +1,53 @@ + + + + + + image/svg+xml + + + + + + + + diff --git a/resources/themes/cura-light/icons/gradual.svg b/resources/themes/cura-light/icons/gradual.svg new file mode 100644 index 0000000000..ed7f301e18 --- /dev/null +++ b/resources/themes/cura-light/icons/gradual.svg @@ -0,0 +1,102 @@ + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + diff --git a/resources/themes/cura-light/icons/group.svg b/resources/themes/cura-light/icons/group.svg new file mode 100644 index 0000000000..0debb0f300 --- /dev/null +++ b/resources/themes/cura-light/icons/group.svg @@ -0,0 +1,12 @@ + + + + + diff --git a/resources/themes/cura-light/icons/hollow.svg b/resources/themes/cura-light/icons/hollow.svg new file mode 100644 index 0000000000..a63bfd9bfc --- /dev/null +++ b/resources/themes/cura-light/icons/hollow.svg @@ -0,0 +1,4 @@ + + + + diff --git a/resources/themes/cura-light/icons/home.svg b/resources/themes/cura-light/icons/home.svg new file mode 100644 index 0000000000..a355aa07f6 --- /dev/null +++ b/resources/themes/cura-light/icons/home.svg @@ -0,0 +1,3 @@ + + + diff --git a/resources/themes/cura-light/icons/info.svg b/resources/themes/cura-light/icons/info.svg new file mode 100644 index 0000000000..9896b3dac8 --- /dev/null +++ b/resources/themes/cura-light/icons/info.svg @@ -0,0 +1,13 @@ + + + + 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 new file mode 100644 index 0000000000..12b3abbe73 --- /dev/null +++ b/resources/themes/cura-light/icons/link.svg @@ -0,0 +1,3 @@ + + + diff --git a/resources/themes/cura-light/icons/load.svg b/resources/themes/cura-light/icons/load.svg new file mode 100644 index 0000000000..7b3e966634 --- /dev/null +++ b/resources/themes/cura-light/icons/load.svg @@ -0,0 +1,7 @@ + + + + + + + diff --git a/resources/themes/cura-light/icons/low/CheckBlueBG.svg b/resources/themes/cura-light/icons/low/CheckBlueBG.svg deleted file mode 100644 index a4c403598a..0000000000 --- a/resources/themes/cura-light/icons/low/CheckBlueBG.svg +++ /dev/null @@ -1,8 +0,0 @@ - - - - - diff --git a/resources/themes/cura-light/icons/low/CloudBlueBG.svg b/resources/themes/cura-light/icons/low/CloudBlueBG.svg deleted file mode 100644 index 7a43843dfd..0000000000 --- a/resources/themes/cura-light/icons/low/CloudBlueBG.svg +++ /dev/null @@ -1,9 +0,0 @@ - - - - - diff --git a/resources/themes/cura-light/icons/low/CloudGreyBG.svg b/resources/themes/cura-light/icons/low/CloudGreyBG.svg deleted file mode 100644 index aa2bba0467..0000000000 --- a/resources/themes/cura-light/icons/low/CloudGreyBG.svg +++ /dev/null @@ -1,9 +0,0 @@ - - - - - diff --git a/resources/themes/cura-light/icons/material_spool.svg b/resources/themes/cura-light/icons/material_spool.svg new file mode 100644 index 0000000000..66cc02a57b --- /dev/null +++ b/resources/themes/cura-light/icons/material_spool.svg @@ -0,0 +1,8 @@ + + + + + diff --git a/resources/themes/cura-light/icons/medium/Extruder.svg b/resources/themes/cura-light/icons/medium/Extruder.svg deleted file mode 100644 index 1849e8bfdd..0000000000 --- a/resources/themes/cura-light/icons/medium/Extruder.svg +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - - - - - - diff --git a/resources/themes/cura-light/icons/medium/PrinterTriple.svg b/resources/themes/cura-light/icons/medium/PrinterTriple.svg deleted file mode 100644 index 9226bdfe11..0000000000 --- a/resources/themes/cura-light/icons/medium/PrinterTriple.svg +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - - - - - - - diff --git a/resources/themes/cura-light/icons/menu.svg b/resources/themes/cura-light/icons/menu.svg new file mode 100644 index 0000000000..85fbfb072c --- /dev/null +++ b/resources/themes/cura-light/icons/menu.svg @@ -0,0 +1,3 @@ + + + diff --git a/resources/themes/cura-light/icons/minus.svg b/resources/themes/cura-light/icons/minus.svg new file mode 100644 index 0000000000..22f2d2910d --- /dev/null +++ b/resources/themes/cura-light/icons/minus.svg @@ -0,0 +1,3 @@ + + + diff --git a/resources/themes/cura-light/icons/mirror.svg b/resources/themes/cura-light/icons/mirror.svg new file mode 100644 index 0000000000..2a53292379 --- /dev/null +++ b/resources/themes/cura-light/icons/mirror.svg @@ -0,0 +1,7 @@ + + + + + + + diff --git a/resources/themes/cura-light/icons/notice.svg b/resources/themes/cura-light/icons/notice.svg new file mode 100644 index 0000000000..36154d6729 --- /dev/null +++ b/resources/themes/cura-light/icons/notice.svg @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/plugins/UM3NetworkPrinting/resources/svg/icons/Buildplate.svg b/resources/themes/cura-light/icons/package.svg old mode 100755 new mode 100644 similarity index 50% rename from plugins/UM3NetworkPrinting/resources/svg/icons/Buildplate.svg rename to resources/themes/cura-light/icons/package.svg index 79fdc06c07..4f74a43c42 --- a/plugins/UM3NetworkPrinting/resources/svg/icons/Buildplate.svg +++ b/resources/themes/cura-light/icons/package.svg @@ -1,7 +1,7 @@ - + viewBox="0 0 48 48" style="enable-background:new 0 0 48 48;" xml:space="preserve"> + diff --git a/resources/themes/cura-light/icons/pencil.svg b/resources/themes/cura-light/icons/pencil.svg new file mode 100644 index 0000000000..d17c09884d --- /dev/null +++ b/resources/themes/cura-light/icons/pencil.svg @@ -0,0 +1,3 @@ + + + diff --git a/resources/themes/cura-light/icons/play.svg b/resources/themes/cura-light/icons/play.svg new file mode 100644 index 0000000000..04aea11a9b --- /dev/null +++ b/resources/themes/cura-light/icons/play.svg @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/resources/themes/cura-light/icons/plugin.svg b/resources/themes/cura-light/icons/plugin.svg new file mode 100644 index 0000000000..5773c906ee --- /dev/null +++ b/resources/themes/cura-light/icons/plugin.svg @@ -0,0 +1,7 @@ + + + + + + + diff --git a/resources/themes/cura-light/icons/plus.svg b/resources/themes/cura-light/icons/plus.svg new file mode 100644 index 0000000000..211cdf6d23 --- /dev/null +++ b/resources/themes/cura-light/icons/plus.svg @@ -0,0 +1,3 @@ + + + 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 new file mode 100644 index 0000000000..124e95f558 --- /dev/null +++ b/resources/themes/cura-light/icons/pos_modify_dont_support_overlap.svg @@ -0,0 +1,26 @@ + + + + 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 new file mode 100644 index 0000000000..a664e820a6 --- /dev/null +++ b/resources/themes/cura-light/icons/pos_modify_overlaps.svg @@ -0,0 +1,17 @@ + + + + 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 new file mode 100644 index 0000000000..8a49ef3a00 --- /dev/null +++ b/resources/themes/cura-light/icons/pos_normal.svg @@ -0,0 +1,9 @@ + + + + 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 new file mode 100644 index 0000000000..3562ca1fe0 --- /dev/null +++ b/resources/themes/cura-light/icons/pos_print_as_support.svg @@ -0,0 +1,14 @@ + + + + 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 new file mode 100644 index 0000000000..0c5d4ed6a2 --- /dev/null +++ b/resources/themes/cura-light/icons/print_time.svg @@ -0,0 +1,7 @@ + + + + + + + diff --git a/resources/themes/cura-light/icons/printer_cloud_connected.svg b/resources/themes/cura-light/icons/printer_cloud_connected.svg new file mode 100644 index 0000000000..3bc94a05e7 --- /dev/null +++ b/resources/themes/cura-light/icons/printer_cloud_connected.svg @@ -0,0 +1,11 @@ + + + + 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 new file mode 100644 index 0000000000..248df27338 --- /dev/null +++ b/resources/themes/cura-light/icons/printer_cloud_not_available.svg @@ -0,0 +1,18 @@ + + + + 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 new file mode 100644 index 0000000000..a8ff015a9d --- /dev/null +++ b/resources/themes/cura-light/icons/printer_connected.svg @@ -0,0 +1,13 @@ + + + + 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 new file mode 100644 index 0000000000..5e439faca4 --- /dev/null +++ b/resources/themes/cura-light/icons/printer_group.svg @@ -0,0 +1,20 @@ + + + + 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 new file mode 100644 index 0000000000..69c4e212bc --- /dev/null +++ b/resources/themes/cura-light/icons/printer_single.svg @@ -0,0 +1,13 @@ + + + + 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 new file mode 100644 index 0000000000..d306d046f9 --- /dev/null +++ b/resources/themes/cura-light/icons/printing_guideline.svg @@ -0,0 +1,9 @@ + + + + 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 new file mode 100644 index 0000000000..67f5713671 --- /dev/null +++ b/resources/themes/cura-light/icons/printsetup.svg @@ -0,0 +1,7 @@ + + + + + + + diff --git a/resources/themes/cura-light/icons/quick.svg b/resources/themes/cura-light/icons/quick.svg new file mode 100644 index 0000000000..f5261e1e5b --- /dev/null +++ b/resources/themes/cura-light/icons/quick.svg @@ -0,0 +1,3 @@ + + + diff --git a/resources/themes/cura-light/icons/reset.svg b/resources/themes/cura-light/icons/reset.svg new file mode 100644 index 0000000000..df95e2c554 --- /dev/null +++ b/resources/themes/cura-light/icons/reset.svg @@ -0,0 +1,7 @@ + + + + + + + diff --git a/resources/themes/cura-light/icons/resize.svg b/resources/themes/cura-light/icons/resize.svg new file mode 100644 index 0000000000..d6a16649e1 --- /dev/null +++ b/resources/themes/cura-light/icons/resize.svg @@ -0,0 +1,15 @@ + + + + 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 new file mode 100644 index 0000000000..5944ad7ce9 --- /dev/null +++ b/resources/themes/cura-light/icons/rotate.svg @@ -0,0 +1,7 @@ + + + + + + + diff --git a/resources/themes/cura-light/icons/rotate_face_layflat.svg b/resources/themes/cura-light/icons/rotate_face_layflat.svg new file mode 100644 index 0000000000..261a624cf0 --- /dev/null +++ b/resources/themes/cura-light/icons/rotate_face_layflat.svg @@ -0,0 +1,12 @@ + + + + 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 new file mode 100644 index 0000000000..b2fe5c84b8 --- /dev/null +++ b/resources/themes/cura-light/icons/rotate_layflat.svg @@ -0,0 +1,7 @@ + + + + + + + diff --git a/resources/themes/cura-light/icons/rotate_reset.svg b/resources/themes/cura-light/icons/rotate_reset.svg new file mode 100644 index 0000000000..c953bceffa --- /dev/null +++ b/resources/themes/cura-light/icons/rotate_reset.svg @@ -0,0 +1,7 @@ + + + + + + + diff --git a/resources/themes/cura-light/icons/scale.svg b/resources/themes/cura-light/icons/scale.svg new file mode 100644 index 0000000000..2db809b7e7 --- /dev/null +++ b/resources/themes/cura-light/icons/scale.svg @@ -0,0 +1,7 @@ + + + + + + + diff --git a/resources/themes/cura-light/icons/scale_max.svg b/resources/themes/cura-light/icons/scale_max.svg new file mode 100644 index 0000000000..f3bb75b399 --- /dev/null +++ b/resources/themes/cura-light/icons/scale_max.svg @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/resources/themes/cura-light/icons/scale_reset.svg b/resources/themes/cura-light/icons/scale_reset.svg new file mode 100644 index 0000000000..77210be8c5 --- /dev/null +++ b/resources/themes/cura-light/icons/scale_reset.svg @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/resources/themes/cura-light/icons/search.svg b/resources/themes/cura-light/icons/search.svg new file mode 100644 index 0000000000..a9ccb612fd --- /dev/null +++ b/resources/themes/cura-light/icons/search.svg @@ -0,0 +1,21 @@ + + + + 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 new file mode 100644 index 0000000000..f4cfb3b145 --- /dev/null +++ b/resources/themes/cura-light/icons/setting_per_object.svg @@ -0,0 +1,3 @@ + + + diff --git a/resources/themes/cura-light/icons/settings.svg b/resources/themes/cura-light/icons/settings.svg new file mode 100644 index 0000000000..b96970307e --- /dev/null +++ b/resources/themes/cura-light/icons/settings.svg @@ -0,0 +1,3 @@ + + + diff --git a/resources/themes/cura-light/icons/default/Solid.svg b/resources/themes/cura-light/icons/solid.svg similarity index 100% rename from resources/themes/cura-light/icons/default/Solid.svg rename to resources/themes/cura-light/icons/solid.svg diff --git a/resources/themes/cura-light/icons/sparse.svg b/resources/themes/cura-light/icons/sparse.svg new file mode 100644 index 0000000000..91f8858326 --- /dev/null +++ b/resources/themes/cura-light/icons/sparse.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/resources/themes/cura-light/icons/spool.svg b/resources/themes/cura-light/icons/spool.svg new file mode 100644 index 0000000000..0d8ae42d9d --- /dev/null +++ b/resources/themes/cura-light/icons/spool.svg @@ -0,0 +1,7 @@ + + + + + + + diff --git a/resources/themes/cura-light/icons/star.svg b/resources/themes/cura-light/icons/star.svg new file mode 100644 index 0000000000..f6f91238e4 --- /dev/null +++ b/resources/themes/cura-light/icons/star.svg @@ -0,0 +1,3 @@ + + + diff --git a/resources/themes/cura-light/icons/star_empty.svg b/resources/themes/cura-light/icons/star_empty.svg new file mode 100644 index 0000000000..39b5791e91 --- /dev/null +++ b/resources/themes/cura-light/icons/star_empty.svg @@ -0,0 +1,11 @@ + + + + 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 new file mode 100644 index 0000000000..d4e161f6c6 --- /dev/null +++ b/resources/themes/cura-light/icons/star_filled.svg @@ -0,0 +1,11 @@ + + + + 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 new file mode 100644 index 0000000000..6a76ef4614 --- /dev/null +++ b/resources/themes/cura-light/icons/translate.svg @@ -0,0 +1,3 @@ + + + diff --git a/resources/themes/cura-light/icons/ulti.svg b/resources/themes/cura-light/icons/ulti.svg new file mode 100644 index 0000000000..b30d0669b3 --- /dev/null +++ b/resources/themes/cura-light/icons/ulti.svg @@ -0,0 +1,3 @@ + + + diff --git a/resources/themes/cura-light/icons/update.svg b/resources/themes/cura-light/icons/update.svg new file mode 100644 index 0000000000..0a6e8fee5a --- /dev/null +++ b/resources/themes/cura-light/icons/update.svg @@ -0,0 +1,12 @@ + + + + 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 new file mode 100644 index 0000000000..cfe394e65d --- /dev/null +++ b/resources/themes/cura-light/icons/view_3d.svg @@ -0,0 +1,14 @@ + + + + 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 new file mode 100644 index 0000000000..7de9abe0af --- /dev/null +++ b/resources/themes/cura-light/icons/view_front.svg @@ -0,0 +1,19 @@ + + + + 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 new file mode 100644 index 0000000000..3e4bf8e074 --- /dev/null +++ b/resources/themes/cura-light/icons/view_layer.svg @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/resources/themes/cura-light/icons/view_left.svg b/resources/themes/cura-light/icons/view_left.svg new file mode 100644 index 0000000000..1770da4c81 --- /dev/null +++ b/resources/themes/cura-light/icons/view_left.svg @@ -0,0 +1,21 @@ + + + + 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 new file mode 100644 index 0000000000..676031dbbd --- /dev/null +++ b/resources/themes/cura-light/icons/view_normal.svg @@ -0,0 +1,7 @@ + + + + + + + diff --git a/resources/themes/cura-light/icons/view_right.svg b/resources/themes/cura-light/icons/view_right.svg new file mode 100644 index 0000000000..5e0628e60e --- /dev/null +++ b/resources/themes/cura-light/icons/view_right.svg @@ -0,0 +1,21 @@ + + + + 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 new file mode 100644 index 0000000000..3eb32e9878 --- /dev/null +++ b/resources/themes/cura-light/icons/view_top.svg @@ -0,0 +1,21 @@ + + + + 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 new file mode 100644 index 0000000000..5983c92c2f --- /dev/null +++ b/resources/themes/cura-light/icons/view_xray.svg @@ -0,0 +1,7 @@ + + + + + + + diff --git a/resources/themes/cura-light/icons/viewmode.svg b/resources/themes/cura-light/icons/viewmode.svg new file mode 100644 index 0000000000..a21df01f37 --- /dev/null +++ b/resources/themes/cura-light/icons/viewmode.svg @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/resources/themes/cura-light/icons/warning.svg b/resources/themes/cura-light/icons/warning.svg new file mode 100644 index 0000000000..14b7d797d0 --- /dev/null +++ b/resources/themes/cura-light/icons/warning.svg @@ -0,0 +1,11 @@ + + + + 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 new file mode 100644 index 0000000000..f9ca90f6a9 --- /dev/null +++ b/resources/themes/cura-light/icons/warning_light.svg @@ -0,0 +1,13 @@ + + + + warning + Created with Sketch. + + + + + + + + \ No newline at end of file