Revert "Merge pull request #9716 from Ultimaker/CURA-8010_new_icons"

This reverts commit 6120d8a054b8c04bf90b8b3d3cb219d691bece2f, reversing
changes made to 95652556fef90f70adbf25bfa9bd3b8af7220d4a.

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
 
                 }

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

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
         }
     }

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
     }

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
             }

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

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")
                                     }
                                 }
                             }

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
         },

plugins/PerObjectSettingsTool/tool_icon.svg

@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="30px" height="30px" viewBox="0 0 28 28" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <!-- Generator: Sketch 57.1 (83088) - https://sketch.com -->
+    <title>per_model_settings</title>
+    <desc>Created with Sketch.</desc>
+    <defs>
+        <path d="M9.73076923,0 L9.226,1.345 L0.449,11 L0,11 L0.639,9.084 L8.896,0 L9.73076923,0 Z M8.49,3.472 L8.907,4.721 L3.199,11 L1.647,11 L8.49,3.472 Z M9.228,5.685 L9.645,6.935 L5.949,11 L4.397,11 L9.228,5.685 Z M9.966,7.899 L10.382,9.148 L8.699,11 L7.147,11 L9.966,7.899 Z M10.704,10.112 L11,11 L9.896,11 L10.704,10.112 Z M7.698,0 L1.332,7.004 L2.23,4.308 L6.146,0 L7.698,0 Z M4.948,0 L2.344,2.866 L1.89,1.656 L3.396,0 L4.948,0 Z M2.198,0 L1.54,0.724 L1.26923077,0 L2.198,0 Z" id="path-1"></path>
+    </defs>
+    <g id="per_model_settings" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="Per-model" transform="translate(2.000000, 2.000000)">
+            <polygon id="Path-Copy-5" fill="#000" points="1.26923077 0 9.73076923 0 8.46153846 3.38461538 11 11 0 11 2.53846154 3.38461538"></polygon>
+            <polygon id="Path-Copy-8" fill="#000" points="14.2692308 13 22.7307692 13 21.4615385 16.3846154 24 24 13 24 15.5384615 16.3846154"></polygon>
+            <g id="stripe" transform="translate(13.000000, 0.000000)">
+                <mask id="mask-2" fill="white">
+                    <use xlink:href="#path-1"></use>
+                </mask>
+                <use id="Combined-Shape" fill="#000" xlink:href="#path-1"></use>
+            </g>
+            <path d="M1.990731,13.5 L3.06878027,16.374798 L0.693712943,23.5 L10.3062871,23.5 L7.93121973,16.374798 L9.009269,13.5 L1.990731,13.5 Z" id="Path-Copy-7" stroke="#000"></path>
+        </g>
+    </g>
+</svg>

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
         }
     }
-}
+}