From 0a75c772ed898c52c0975d1656c33fa75f9002b6 Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Mon, 28 Jun 2021 17:02:37 +0200 Subject: [PATCH] Unrevert new icon set for all of Cura's interface We created a new set of icons for Cura. These icons had to be reverted though because they weren't working out in the interface for the last release yet. This unreverts them, basically adding them back hoping that we'll get them fixed in time for the next release. Contributes to issue CURA-8342. Revert "Revert "Fix merge conflict"" This reverts commit bb20e3307f43edc1ff53cb154d2351ddfe39e158. Revert "Revert "Merge pull request #9716 from Ultimaker/CURA-8010_new_icons"" This reverts commit 70e4e9640e561e18a12870f30c905203ce8ccee7. Revert "Revert "Fix typo in icon name"" This reverts commit 38ce22ba7c3f40b971bc6e1e0a8e776ca9d51512. Revert "Revert "Add list for deprecated icons"" This reverts commit 119a957e7f978dbf1ddbcb3b0005bf38e8fed943. Revert "Revert "Add Function icon"" This reverts commit 760726cf0bb953bb1b0fc277b448f419d4bd2544. Revert "Revert "Switch out inherit icon"" This reverts commit 26afff609381e2004d194c280f504b6226859bd3. Revert "Revert "Merge branch 'CURA-8205_Introduce_new_icons_in_Cura' of github.com:Ultimaker/Cura"" This reverts commit 6483db3d47ee052c1a966cdee3af7190577a5769. Revert "Fix incorrect icons" This reverts commit 02a4ade2a50a943ff36fd4895bdc9261cf2133eb. --- plugins/3MFReader/WorkspaceDialog.qml | 2 +- .../src/qml/components/BackupListFooter.qml | 4 +- .../src/qml/components/BackupListItem.qml | 4 +- .../qml/components/BackupListItemDetails.qml | 12 +- plugins/MonitorStage/MonitorMain.qml | 2 +- .../PerObjectCategory.qml | 2 +- .../PerObjectSettingsPanel.qml | 10 +- plugins/PerObjectSettingsTool/__init__.py | 2 +- plugins/PerObjectSettingsTool/tool_icon.svg | 22 -- .../PostProcessingPlugin.qml | 10 +- plugins/PostProcessingPlugin/Script.svg | 10 + .../PostProcessingPlugin/postprocessing.svg | 47 --- plugins/PrepareStage/PrepareMenu.qml | 2 +- .../SimulationViewMainComponent.qml | 4 +- .../SimulationViewMenuComponent.qml | 2 +- plugins/SimulationView/resources/Pause.svg | 5 + plugins/SimulationView/resources/Play.svg | 6 + .../resources/simulation_pause.svg | 79 ----- .../resources/simulation_resume.svg | 78 ----- plugins/SupportEraser/__init__.py | 2 +- plugins/SupportEraser/tool_icon.svg | 14 - plugins/Toolbox/resources/images/Shop.svg | 7 + plugins/Toolbox/resources/images/shop.svg | 3 - .../qml/components/ToolboxBackColumn.qml | 2 +- .../qml/components/ToolboxHeader.qml | 2 +- .../qml/MonitorBuildplateConfiguration.qml | 2 +- .../resources/qml/MonitorCarousel.qml | 4 +- .../resources/qml/MonitorIconExtruder.qml | 2 +- .../resources/qml/MonitorPrintJobPreview.qml | 12 +- .../resources/qml/MonitorPrinterCard.qml | 4 +- .../resources/qml/MonitorQueue.qml | 2 +- .../resources/qml/PrinterVideoStream.qml | 2 +- .../resources/svg/Camera.svg | 6 + .../resources/svg/CancelCircle.svg | 7 + .../resources/svg/Check.svg | 5 + .../resources/svg/CheckCircle.svg | 9 + .../resources/svg/PauseCircle.svg | 10 + .../resources/svg/Prohibition.svg | 7 + .../resources/svg/Warning.svg | 6 + .../resources/svg/aborted-icon.svg | 1 - .../resources/svg/action-required-icon.svg | 10 - .../resources/svg/approved-icon.svg | 1 - .../resources/svg/blocked-icon.svg | 6 - .../resources/svg/camera-icon.svg | 8 - .../resources/svg/checkmark-icon.svg | 3 - .../resources/svg/icons/Buildplate.svg | 6 +- .../resources/svg/icons/CameraPhoto.svg | 8 + .../resources/svg/icons/Extruder.svg | 15 + .../resources/svg/icons/buildplate.svg | 5 - .../resources/svg/icons/camera.svg | 5 - .../resources/svg/icons/extruder.svg | 5 - .../resources/svg/paused-icon.svg | 1 - .../resources/svg/warning-icon.svg | 4 - resources/definitions/fdmextruder.def.json | 4 +- resources/definitions/fdmprinter.def.json | 30 +- resources/qml/Account/AvatarImage.qml | 2 +- resources/qml/Account/SyncState.qml | 8 +- .../ActionPanel/OutputDevicesActionButton.qml | 4 +- .../qml/ActionPanel/OutputProcessWidget.qml | 6 +- .../ActionPanel/PrintInformationWidget.qml | 4 +- .../qml/ActionPanel/SliceProcessWidget.qml | 2 +- resources/qml/CheckBoxWithTooltip.qml | 2 +- resources/qml/ExpandableComponent.qml | 2 +- resources/qml/ExpandableComponentHeader.qml | 4 +- resources/qml/ExpandablePopup.qml | 2 +- resources/qml/ExtruderIcon.qml | 11 +- resources/qml/JobSpecs.qml | 2 +- .../ConfigurationMenu/ConfigurationItem.qml | 2 +- .../ConfigurationListView.qml | 2 +- .../ConfigurationMenu/ConfigurationMenu.qml | 4 +- .../ConfigurationMenu/CustomConfiguration.qml | 4 +- resources/qml/ObjectItemButton.qml | 8 +- resources/qml/ObjectSelector.qml | 2 +- .../Materials/MaterialsBrandSection.qml | 4 +- .../Preferences/Materials/MaterialsSlot.qml | 4 +- .../Materials/MaterialsTypeSection.qml | 4 +- .../Custom/CustomPrintSetup.qml | 4 +- .../qml/PrintSetupSelector/NoIntentIcon.qml | 4 +- .../PrintSetupSelectorContents.qml | 8 +- .../PrintSetupSelectorHeader.qml | 10 +- .../RecommendedAdhesionSelector.qml | 4 +- .../RecommendedInfillDensitySelector.qml | 14 +- .../RecommendedQualityProfileSelector.qml | 6 +- .../RecommendedSupportSelector.qml | 10 +- .../PrinterOutput/ManualPrinterControl.qml | 16 +- .../qml/PrinterSelector/MachineSelector.qml | 24 +- resources/qml/Settings/SettingCategory.qml | 6 +- resources/qml/Settings/SettingCheckBox.qml | 2 +- resources/qml/Settings/SettingExtruder.qml | 6 +- resources/qml/Settings/SettingItem.qml | 6 +- .../qml/Settings/SettingOptionalExtruder.qml | 6 +- resources/qml/Settings/SettingView.qml | 6 +- resources/qml/ViewOrientationControls.qml | 10 +- .../AddLocalPrinterScrollView.qml | 2 +- .../AddNetworkPrinterScrollView.qml | 2 +- resources/qml/WelcomePages/CloudContent.qml | 6 +- resources/qml/WelcomePages/DropDownHeader.qml | 2 +- resources/qml/WelcomePages/DropDownWidget.qml | 2 +- resources/qml/Widgets/CheckBox.qml | 2 +- resources/qml/Widgets/ComboBox.qml | 2 +- .../icons/sign_in_to_cloud.svg | 16 - .../cura-dark/icons/sign_in_to_cloud.svg | 16 - .../icons/sign_in_to_cloud.svg | 16 - .../themes/cura-light/icons/application.svg | 7 - .../themes/cura-light/icons/arrow_bottom.svg | 3 - .../themes/cura-light/icons/arrow_left.svg | 3 - .../themes/cura-light/icons/arrow_right.svg | 3 - .../themes/cura-light/icons/arrow_top.svg | 3 - resources/themes/cura-light/icons/basic.svg | 3 - .../themes/cura-light/icons/buildplate.svg | 9 - .../cura-light/icons/category_adhesion.svg | 8 - .../cura-light/icons/category_blackmagic.svg | 11 - .../themes/cura-light/icons/category_cool.svg | 7 - .../themes/cura-light/icons/category_dual.svg | 7 - .../icons/category_experimental.svg | 7 - .../cura-light/icons/category_fixes.svg | 7 - .../cura-light/icons/category_infill.svg | 7 - .../icons/category_layer_height.svg | 7 - .../cura-light/icons/category_machine.svg | 3 - .../cura-light/icons/category_material.svg | 7 - .../cura-light/icons/category_shell.svg | 8 - .../cura-light/icons/category_shield.svg | 8 - .../cura-light/icons/category_speed.svg | 20 -- .../cura-light/icons/category_support.svg | 8 - .../cura-light/icons/category_topbottom.svg | 7 - .../cura-light/icons/category_travel.svg | 7 - .../cura-light/icons/category_unknown.svg | 7 - resources/themes/cura-light/icons/check.svg | 3 - resources/themes/cura-light/icons/checked.svg | 12 - resources/themes/cura-light/icons/clock.svg | 53 --- resources/themes/cura-light/icons/cross1.svg | 7 - resources/themes/cura-light/icons/cross2.svg | 4 - .../cura-light/icons/default/Adhesion.svg | 13 + .../icons/default/ArrowDoubleCircleRight.svg | 6 + .../cura-light/icons/default/ArrowFourWay.svg | 7 + .../cura-light/icons/default/ArrowReset.svg | 6 + .../cura-light/icons/default/Bandage.svg | 7 + .../cura-light/icons/default/BlackMagic.svg | 8 + .../icons/default/BlockSupportOverlaps.svg | 1 + .../cura-light/icons/default/Cancel.svg | 6 + .../cura-light/icons/default/CancelBlock.svg | 8 + .../cura-light/icons/default/CancelCircle.svg | 7 + .../themes/cura-light/icons/default/Check.svg | 5 + .../cura-light/icons/default/CheckCircle.svg | 9 + .../icons/default/ChevronSingleDown.svg | 5 + .../icons/default/ChevronSingleLeft.svg | 5 + .../icons/default/ChevronSingleRight.svg | 5 + .../icons/default/ChevronSingleUp.svg | 5 + .../CircleOutline.svg} | 0 .../themes/cura-light/icons/default/Clock.svg | 6 + .../themes/cura-light/icons/default/Cloud.svg | 7 + .../icons/default/DualExtrusion.svg | 10 + .../cura-light/icons/default/Experiment.svg | 8 + .../themes/cura-light/icons/default/Eye.svg | 7 + .../themes/cura-light/icons/default/Fan.svg | 9 + .../cura-light/icons/default/Folder.svg | 6 + .../cura-light/icons/default/Formula.svg | 9 + .../cura-light/icons/default/Function.svg | 1 + .../themes/cura-light/icons/default/Guide.svg | 9 + .../cura-light/icons/default/Hamburger.svg | 9 + .../themes/cura-light/icons/default/House.svg | 6 + .../cura-light/icons/default/Infill0.svg | 5 + .../cura-light/icons/default/Infill1.svg | 9 + .../cura-light/icons/default/Infill2.svg | 8 + .../cura-light/icons/default/Infill3.svg | 6 + .../icons/default/InfillGradual.svg | 7 + .../cura-light/icons/default/Information.svg | 6 + .../cura-light/icons/default/LayFlat.svg | 9 + .../icons/default/LayFlatOnFace.svg | 6 + .../cura-light/icons/default/Layers.svg | 10 + .../cura-light/icons/default/Lightning.svg | 10 + .../themes/cura-light/icons/default/Link.svg | 9 + .../cura-light/icons/default/LinkExternal.svg | 6 + .../cura-light/icons/default/Magnifier.svg | 6 + .../cura-light/icons/default/MeshType.svg | 12 + .../icons/default/MeshTypeIntersect.svg | 5 + .../icons/default/MeshTypeNormal.svg | 5 + .../icons/default/MeshTypeSupport.svg | 11 + .../themes/cura-light/icons/default/Minus.svg | 5 + .../cura-light/icons/default/Mirror.svg | 13 + .../themes/cura-light/icons/default/Pen.svg | 5 + .../cura-light/icons/default/Plugin.svg | 6 + .../themes/cura-light/icons/default/Plus.svg | 5 + .../cura-light/icons/default/PrintQuality.svg | 9 + .../cura-light/icons/default/PrintShell.svg | 16 + .../icons/default/PrintTopBottom.svg | 10 + .../cura-light/icons/default/PrintTravel.svg | 9 + .../cura-light/icons/default/Printer.svg | 5 + .../icons/default/PrinterTriple.svg | 10 + .../themes/cura-light/icons/default/Quick.svg | 16 + .../cura-light/icons/default/Rotate.svg | 18 ++ .../themes/cura-light/icons/default/Scale.svg | 8 + .../cura-light/icons/default/ScaleMax.svg | 8 + .../cura-light/icons/default/Shield.svg | 6 + .../cura-light/icons/default/Sliders.svg | 9 + .../icons/{solid.svg => default/Solid.svg} | 0 .../cura-light/icons/default/SpeedOMeter.svg | 8 + .../themes/cura-light/icons/default/Spool.svg | 8 + .../cura-light/icons/default/Sputnik.svg | 10 + .../themes/cura-light/icons/default/Star.svg | 6 + .../cura-light/icons/default/StarFilled.svg | 5 + .../cura-light/icons/default/Support.svg | 13 + .../icons/default/SupportBlocker.svg | 12 + .../cura-light/icons/default/ThreeDots.svg | 5 + .../icons/default/UltimakerCura.svg | 8 + .../cura-light/icons/default/View3D.svg | 7 + .../cura-light/icons/default/ViewFront.svg | 6 + .../cura-light/icons/default/ViewLeft.svg | 6 + .../cura-light/icons/default/ViewRight.svg | 6 + .../cura-light/icons/default/ViewTop.svg | 6 + .../cura-light/icons/default/Warning.svg | 6 + resources/themes/cura-light/icons/dense.svg | 5 - .../cura-light/icons/deprecated_icons.json | 306 ++++++++++++++++++ .../cura-light/icons/drop_down_button.svg | 4 - .../themes/cura-light/icons/external_link.svg | 8 - .../cura-light/icons/extruder_button.svg | 9 - .../cura-light/icons/favorites_star_empty.svg | 8 - .../cura-light/icons/favorites_star_full.svg | 6 - resources/themes/cura-light/icons/formula.svg | 53 --- resources/themes/cura-light/icons/gradual.svg | 102 ------ resources/themes/cura-light/icons/group.svg | 12 - resources/themes/cura-light/icons/hollow.svg | 4 - resources/themes/cura-light/icons/home.svg | 3 - resources/themes/cura-light/icons/info.svg | 13 - resources/themes/cura-light/icons/link.svg | 3 - resources/themes/cura-light/icons/load.svg | 7 - .../cura-light/icons/low/CheckBlueBG.svg | 8 + .../cura-light/icons/low/CloudBlueBG.svg | 9 + .../cura-light/icons/low/CloudGreyBG.svg | 9 + .../cura-light/icons/{dot.svg => low/Dot.svg} | 0 .../cura-light/icons/material_spool.svg | 8 - .../cura-light/icons/medium/Extruder.svg | 14 + .../cura-light/icons/medium/PrinterTriple.svg | 14 + resources/themes/cura-light/icons/menu.svg | 3 - resources/themes/cura-light/icons/minus.svg | 3 - resources/themes/cura-light/icons/mirror.svg | 7 - resources/themes/cura-light/icons/notice.svg | 4 - resources/themes/cura-light/icons/pencil.svg | 3 - resources/themes/cura-light/icons/play.svg | 4 - resources/themes/cura-light/icons/plugin.svg | 7 - resources/themes/cura-light/icons/plus.svg | 3 - .../icons/pos_modify_dont_support_overlap.svg | 26 -- .../cura-light/icons/pos_modify_overlaps.svg | 17 - .../themes/cura-light/icons/pos_normal.svg | 9 - .../cura-light/icons/pos_print_as_support.svg | 14 - .../themes/cura-light/icons/print_time.svg | 7 - .../icons/printer_cloud_connected.svg | 11 - .../icons/printer_cloud_not_available.svg | 18 -- .../cura-light/icons/printer_connected.svg | 13 - .../themes/cura-light/icons/printer_group.svg | 20 -- .../cura-light/icons/printer_single.svg | 13 - .../cura-light/icons/printing_guideline.svg | 9 - .../themes/cura-light/icons/printsetup.svg | 7 - resources/themes/cura-light/icons/quick.svg | 3 - resources/themes/cura-light/icons/reset.svg | 7 - resources/themes/cura-light/icons/resize.svg | 15 - resources/themes/cura-light/icons/rotate.svg | 7 - .../cura-light/icons/rotate_face_layflat.svg | 12 - .../cura-light/icons/rotate_layflat.svg | 7 - .../themes/cura-light/icons/rotate_reset.svg | 7 - resources/themes/cura-light/icons/scale.svg | 7 - .../themes/cura-light/icons/scale_max.svg | 8 - .../themes/cura-light/icons/scale_reset.svg | 8 - resources/themes/cura-light/icons/search.svg | 21 -- .../cura-light/icons/setting_per_object.svg | 3 - .../themes/cura-light/icons/settings.svg | 3 - resources/themes/cura-light/icons/sparse.svg | 6 - resources/themes/cura-light/icons/spool.svg | 7 - resources/themes/cura-light/icons/star.svg | 3 - .../themes/cura-light/icons/star_empty.svg | 11 - .../themes/cura-light/icons/star_filled.svg | 11 - .../themes/cura-light/icons/translate.svg | 3 - resources/themes/cura-light/icons/ulti.svg | 3 - resources/themes/cura-light/icons/update.svg | 12 - resources/themes/cura-light/icons/view_3d.svg | 14 - .../themes/cura-light/icons/view_front.svg | 19 -- .../themes/cura-light/icons/view_layer.svg | 9 - .../themes/cura-light/icons/view_left.svg | 21 -- .../themes/cura-light/icons/view_normal.svg | 7 - .../themes/cura-light/icons/view_right.svg | 21 -- .../themes/cura-light/icons/view_top.svg | 21 -- .../themes/cura-light/icons/view_xray.svg | 7 - .../themes/cura-light/icons/viewmode.svg | 4 - resources/themes/cura-light/icons/warning.svg | 11 - .../themes/cura-light/icons/warning_light.svg | 13 - resources/themes/cura-light/styles.qml | 6 +- 286 files changed, 1249 insertions(+), 1521 deletions(-) delete mode 100644 plugins/PerObjectSettingsTool/tool_icon.svg create mode 100755 plugins/PostProcessingPlugin/Script.svg delete mode 100644 plugins/PostProcessingPlugin/postprocessing.svg create mode 100755 plugins/SimulationView/resources/Pause.svg create mode 100755 plugins/SimulationView/resources/Play.svg delete mode 100644 plugins/SimulationView/resources/simulation_pause.svg delete mode 100644 plugins/SimulationView/resources/simulation_resume.svg delete mode 100644 plugins/SupportEraser/tool_icon.svg create mode 100755 plugins/Toolbox/resources/images/Shop.svg delete mode 100644 plugins/Toolbox/resources/images/shop.svg create mode 100755 plugins/UM3NetworkPrinting/resources/svg/Camera.svg create mode 100755 plugins/UM3NetworkPrinting/resources/svg/CancelCircle.svg create mode 100755 plugins/UM3NetworkPrinting/resources/svg/Check.svg create mode 100755 plugins/UM3NetworkPrinting/resources/svg/CheckCircle.svg create mode 100755 plugins/UM3NetworkPrinting/resources/svg/PauseCircle.svg create mode 100755 plugins/UM3NetworkPrinting/resources/svg/Prohibition.svg create mode 100755 plugins/UM3NetworkPrinting/resources/svg/Warning.svg delete mode 100644 plugins/UM3NetworkPrinting/resources/svg/aborted-icon.svg delete mode 100644 plugins/UM3NetworkPrinting/resources/svg/action-required-icon.svg delete mode 100644 plugins/UM3NetworkPrinting/resources/svg/approved-icon.svg delete mode 100644 plugins/UM3NetworkPrinting/resources/svg/blocked-icon.svg delete mode 100644 plugins/UM3NetworkPrinting/resources/svg/camera-icon.svg delete mode 100644 plugins/UM3NetworkPrinting/resources/svg/checkmark-icon.svg rename resources/themes/cura-light/icons/package.svg => plugins/UM3NetworkPrinting/resources/svg/icons/Buildplate.svg (50%) mode change 100644 => 100755 create mode 100755 plugins/UM3NetworkPrinting/resources/svg/icons/CameraPhoto.svg create mode 100644 plugins/UM3NetworkPrinting/resources/svg/icons/Extruder.svg delete mode 100644 plugins/UM3NetworkPrinting/resources/svg/icons/buildplate.svg delete mode 100644 plugins/UM3NetworkPrinting/resources/svg/icons/camera.svg delete mode 100644 plugins/UM3NetworkPrinting/resources/svg/icons/extruder.svg delete mode 100644 plugins/UM3NetworkPrinting/resources/svg/paused-icon.svg delete mode 100644 plugins/UM3NetworkPrinting/resources/svg/warning-icon.svg delete mode 100644 resources/themes/cura-dark-colorblind/icons/sign_in_to_cloud.svg delete mode 100644 resources/themes/cura-dark/icons/sign_in_to_cloud.svg delete mode 100644 resources/themes/cura-light-colorblind/icons/sign_in_to_cloud.svg delete mode 100644 resources/themes/cura-light/icons/application.svg delete mode 100644 resources/themes/cura-light/icons/arrow_bottom.svg delete mode 100644 resources/themes/cura-light/icons/arrow_left.svg delete mode 100644 resources/themes/cura-light/icons/arrow_right.svg delete mode 100644 resources/themes/cura-light/icons/arrow_top.svg delete mode 100644 resources/themes/cura-light/icons/basic.svg delete mode 100644 resources/themes/cura-light/icons/buildplate.svg delete mode 100644 resources/themes/cura-light/icons/category_adhesion.svg delete mode 100644 resources/themes/cura-light/icons/category_blackmagic.svg delete mode 100644 resources/themes/cura-light/icons/category_cool.svg delete mode 100644 resources/themes/cura-light/icons/category_dual.svg delete mode 100644 resources/themes/cura-light/icons/category_experimental.svg delete mode 100644 resources/themes/cura-light/icons/category_fixes.svg delete mode 100644 resources/themes/cura-light/icons/category_infill.svg delete mode 100644 resources/themes/cura-light/icons/category_layer_height.svg delete mode 100644 resources/themes/cura-light/icons/category_machine.svg delete mode 100644 resources/themes/cura-light/icons/category_material.svg delete mode 100644 resources/themes/cura-light/icons/category_shell.svg delete mode 100644 resources/themes/cura-light/icons/category_shield.svg delete mode 100644 resources/themes/cura-light/icons/category_speed.svg delete mode 100644 resources/themes/cura-light/icons/category_support.svg delete mode 100644 resources/themes/cura-light/icons/category_topbottom.svg delete mode 100644 resources/themes/cura-light/icons/category_travel.svg delete mode 100644 resources/themes/cura-light/icons/category_unknown.svg delete mode 100644 resources/themes/cura-light/icons/check.svg delete mode 100644 resources/themes/cura-light/icons/checked.svg delete mode 100644 resources/themes/cura-light/icons/clock.svg delete mode 100644 resources/themes/cura-light/icons/cross1.svg delete mode 100644 resources/themes/cura-light/icons/cross2.svg create mode 100755 resources/themes/cura-light/icons/default/Adhesion.svg create mode 100755 resources/themes/cura-light/icons/default/ArrowDoubleCircleRight.svg create mode 100755 resources/themes/cura-light/icons/default/ArrowFourWay.svg create mode 100755 resources/themes/cura-light/icons/default/ArrowReset.svg create mode 100755 resources/themes/cura-light/icons/default/Bandage.svg create mode 100755 resources/themes/cura-light/icons/default/BlackMagic.svg create mode 100644 resources/themes/cura-light/icons/default/BlockSupportOverlaps.svg create mode 100755 resources/themes/cura-light/icons/default/Cancel.svg create mode 100755 resources/themes/cura-light/icons/default/CancelBlock.svg create mode 100755 resources/themes/cura-light/icons/default/CancelCircle.svg create mode 100755 resources/themes/cura-light/icons/default/Check.svg create mode 100755 resources/themes/cura-light/icons/default/CheckCircle.svg create mode 100755 resources/themes/cura-light/icons/default/ChevronSingleDown.svg create mode 100755 resources/themes/cura-light/icons/default/ChevronSingleLeft.svg create mode 100755 resources/themes/cura-light/icons/default/ChevronSingleRight.svg create mode 100755 resources/themes/cura-light/icons/default/ChevronSingleUp.svg rename resources/themes/cura-light/icons/{circle_outline.svg => default/CircleOutline.svg} (100%) create mode 100755 resources/themes/cura-light/icons/default/Clock.svg create mode 100755 resources/themes/cura-light/icons/default/Cloud.svg create mode 100755 resources/themes/cura-light/icons/default/DualExtrusion.svg create mode 100755 resources/themes/cura-light/icons/default/Experiment.svg create mode 100755 resources/themes/cura-light/icons/default/Eye.svg create mode 100755 resources/themes/cura-light/icons/default/Fan.svg create mode 100755 resources/themes/cura-light/icons/default/Folder.svg create mode 100755 resources/themes/cura-light/icons/default/Formula.svg create mode 100644 resources/themes/cura-light/icons/default/Function.svg create mode 100755 resources/themes/cura-light/icons/default/Guide.svg create mode 100755 resources/themes/cura-light/icons/default/Hamburger.svg create mode 100755 resources/themes/cura-light/icons/default/House.svg create mode 100755 resources/themes/cura-light/icons/default/Infill0.svg create mode 100755 resources/themes/cura-light/icons/default/Infill1.svg create mode 100755 resources/themes/cura-light/icons/default/Infill2.svg create mode 100755 resources/themes/cura-light/icons/default/Infill3.svg create mode 100755 resources/themes/cura-light/icons/default/InfillGradual.svg create mode 100755 resources/themes/cura-light/icons/default/Information.svg create mode 100755 resources/themes/cura-light/icons/default/LayFlat.svg create mode 100755 resources/themes/cura-light/icons/default/LayFlatOnFace.svg create mode 100755 resources/themes/cura-light/icons/default/Layers.svg create mode 100644 resources/themes/cura-light/icons/default/Lightning.svg create mode 100755 resources/themes/cura-light/icons/default/Link.svg create mode 100755 resources/themes/cura-light/icons/default/LinkExternal.svg create mode 100755 resources/themes/cura-light/icons/default/Magnifier.svg create mode 100755 resources/themes/cura-light/icons/default/MeshType.svg create mode 100755 resources/themes/cura-light/icons/default/MeshTypeIntersect.svg create mode 100755 resources/themes/cura-light/icons/default/MeshTypeNormal.svg create mode 100755 resources/themes/cura-light/icons/default/MeshTypeSupport.svg create mode 100755 resources/themes/cura-light/icons/default/Minus.svg create mode 100755 resources/themes/cura-light/icons/default/Mirror.svg create mode 100755 resources/themes/cura-light/icons/default/Pen.svg create mode 100755 resources/themes/cura-light/icons/default/Plugin.svg create mode 100755 resources/themes/cura-light/icons/default/Plus.svg create mode 100755 resources/themes/cura-light/icons/default/PrintQuality.svg create mode 100755 resources/themes/cura-light/icons/default/PrintShell.svg create mode 100644 resources/themes/cura-light/icons/default/PrintTopBottom.svg create mode 100755 resources/themes/cura-light/icons/default/PrintTravel.svg create mode 100755 resources/themes/cura-light/icons/default/Printer.svg create mode 100755 resources/themes/cura-light/icons/default/PrinterTriple.svg create mode 100755 resources/themes/cura-light/icons/default/Quick.svg create mode 100755 resources/themes/cura-light/icons/default/Rotate.svg create mode 100755 resources/themes/cura-light/icons/default/Scale.svg create mode 100755 resources/themes/cura-light/icons/default/ScaleMax.svg create mode 100755 resources/themes/cura-light/icons/default/Shield.svg create mode 100755 resources/themes/cura-light/icons/default/Sliders.svg rename resources/themes/cura-light/icons/{solid.svg => default/Solid.svg} (100%) create mode 100755 resources/themes/cura-light/icons/default/SpeedOMeter.svg create mode 100755 resources/themes/cura-light/icons/default/Spool.svg create mode 100755 resources/themes/cura-light/icons/default/Sputnik.svg create mode 100755 resources/themes/cura-light/icons/default/Star.svg create mode 100755 resources/themes/cura-light/icons/default/StarFilled.svg create mode 100755 resources/themes/cura-light/icons/default/Support.svg create mode 100755 resources/themes/cura-light/icons/default/SupportBlocker.svg create mode 100755 resources/themes/cura-light/icons/default/ThreeDots.svg create mode 100755 resources/themes/cura-light/icons/default/UltimakerCura.svg create mode 100755 resources/themes/cura-light/icons/default/View3D.svg create mode 100755 resources/themes/cura-light/icons/default/ViewFront.svg create mode 100755 resources/themes/cura-light/icons/default/ViewLeft.svg create mode 100755 resources/themes/cura-light/icons/default/ViewRight.svg create mode 100755 resources/themes/cura-light/icons/default/ViewTop.svg create mode 100755 resources/themes/cura-light/icons/default/Warning.svg delete mode 100644 resources/themes/cura-light/icons/dense.svg create mode 100644 resources/themes/cura-light/icons/deprecated_icons.json delete mode 100644 resources/themes/cura-light/icons/drop_down_button.svg delete mode 100644 resources/themes/cura-light/icons/external_link.svg delete mode 100644 resources/themes/cura-light/icons/extruder_button.svg delete mode 100644 resources/themes/cura-light/icons/favorites_star_empty.svg delete mode 100644 resources/themes/cura-light/icons/favorites_star_full.svg delete mode 100644 resources/themes/cura-light/icons/formula.svg delete mode 100644 resources/themes/cura-light/icons/gradual.svg delete mode 100644 resources/themes/cura-light/icons/group.svg delete mode 100644 resources/themes/cura-light/icons/hollow.svg delete mode 100644 resources/themes/cura-light/icons/home.svg delete mode 100644 resources/themes/cura-light/icons/info.svg delete mode 100644 resources/themes/cura-light/icons/link.svg delete mode 100644 resources/themes/cura-light/icons/load.svg create mode 100644 resources/themes/cura-light/icons/low/CheckBlueBG.svg create mode 100644 resources/themes/cura-light/icons/low/CloudBlueBG.svg create mode 100644 resources/themes/cura-light/icons/low/CloudGreyBG.svg rename resources/themes/cura-light/icons/{dot.svg => low/Dot.svg} (100%) delete mode 100644 resources/themes/cura-light/icons/material_spool.svg create mode 100644 resources/themes/cura-light/icons/medium/Extruder.svg create mode 100644 resources/themes/cura-light/icons/medium/PrinterTriple.svg delete mode 100644 resources/themes/cura-light/icons/menu.svg delete mode 100644 resources/themes/cura-light/icons/minus.svg delete mode 100644 resources/themes/cura-light/icons/mirror.svg delete mode 100644 resources/themes/cura-light/icons/notice.svg delete mode 100644 resources/themes/cura-light/icons/pencil.svg delete mode 100644 resources/themes/cura-light/icons/play.svg delete mode 100644 resources/themes/cura-light/icons/plugin.svg delete mode 100644 resources/themes/cura-light/icons/plus.svg delete mode 100644 resources/themes/cura-light/icons/pos_modify_dont_support_overlap.svg delete mode 100644 resources/themes/cura-light/icons/pos_modify_overlaps.svg delete mode 100644 resources/themes/cura-light/icons/pos_normal.svg delete mode 100644 resources/themes/cura-light/icons/pos_print_as_support.svg delete mode 100644 resources/themes/cura-light/icons/print_time.svg delete mode 100644 resources/themes/cura-light/icons/printer_cloud_connected.svg delete mode 100644 resources/themes/cura-light/icons/printer_cloud_not_available.svg delete mode 100644 resources/themes/cura-light/icons/printer_connected.svg delete mode 100644 resources/themes/cura-light/icons/printer_group.svg delete mode 100644 resources/themes/cura-light/icons/printer_single.svg delete mode 100644 resources/themes/cura-light/icons/printing_guideline.svg delete mode 100644 resources/themes/cura-light/icons/printsetup.svg delete mode 100644 resources/themes/cura-light/icons/quick.svg delete mode 100644 resources/themes/cura-light/icons/reset.svg delete mode 100644 resources/themes/cura-light/icons/resize.svg delete mode 100644 resources/themes/cura-light/icons/rotate.svg delete mode 100644 resources/themes/cura-light/icons/rotate_face_layflat.svg delete mode 100644 resources/themes/cura-light/icons/rotate_layflat.svg delete mode 100644 resources/themes/cura-light/icons/rotate_reset.svg delete mode 100644 resources/themes/cura-light/icons/scale.svg delete mode 100644 resources/themes/cura-light/icons/scale_max.svg delete mode 100644 resources/themes/cura-light/icons/scale_reset.svg delete mode 100644 resources/themes/cura-light/icons/search.svg delete mode 100644 resources/themes/cura-light/icons/setting_per_object.svg delete mode 100644 resources/themes/cura-light/icons/settings.svg delete mode 100644 resources/themes/cura-light/icons/sparse.svg delete mode 100644 resources/themes/cura-light/icons/spool.svg delete mode 100644 resources/themes/cura-light/icons/star.svg delete mode 100644 resources/themes/cura-light/icons/star_empty.svg delete mode 100644 resources/themes/cura-light/icons/star_filled.svg delete mode 100644 resources/themes/cura-light/icons/translate.svg delete mode 100644 resources/themes/cura-light/icons/ulti.svg delete mode 100644 resources/themes/cura-light/icons/update.svg delete mode 100644 resources/themes/cura-light/icons/view_3d.svg delete mode 100644 resources/themes/cura-light/icons/view_front.svg delete mode 100644 resources/themes/cura-light/icons/view_layer.svg delete mode 100644 resources/themes/cura-light/icons/view_left.svg delete mode 100644 resources/themes/cura-light/icons/view_normal.svg delete mode 100644 resources/themes/cura-light/icons/view_right.svg delete mode 100644 resources/themes/cura-light/icons/view_top.svg delete mode 100644 resources/themes/cura-light/icons/view_xray.svg delete mode 100644 resources/themes/cura-light/icons/viewmode.svg delete mode 100644 resources/themes/cura-light/icons/warning.svg delete mode 100644 resources/themes/cura-light/icons/warning_light.svg diff --git a/plugins/3MFReader/WorkspaceDialog.qml b/plugins/3MFReader/WorkspaceDialog.qml index 1fd20a3534..450f01fbd5 100644 --- a/plugins/3MFReader/WorkspaceDialog.qml +++ b/plugins/3MFReader/WorkspaceDialog.qml @@ -419,7 +419,7 @@ UM.Dialog width: warningLabel.height height: width - source: UM.Theme.getIcon("notice") + source: UM.Theme.getIcon("Information") color: palette.text } diff --git a/plugins/CuraDrive/src/qml/components/BackupListFooter.qml b/plugins/CuraDrive/src/qml/components/BackupListFooter.qml index 8decdc5c27..15af7521ed 100644 --- a/plugins/CuraDrive/src/qml/components/BackupListFooter.qml +++ b/plugins/CuraDrive/src/qml/components/BackupListFooter.qml @@ -20,7 +20,7 @@ RowLayout { id: infoButton text: catalog.i18nc("@button", "Want more?") - iconSource: UM.Theme.getIcon("info") + iconSource: UM.Theme.getIcon("Information") onClicked: Qt.openUrlExternally("https://goo.gl/forms/QACEP8pP3RV60QYG2") visible: backupListFooter.showInfoButton } @@ -29,7 +29,7 @@ RowLayout { id: createBackupButton text: catalog.i18nc("@button", "Backup Now") - iconSource: UM.Theme.getIcon("plus") + iconSource: UM.Theme.getIcon("Plus") enabled: !CuraDrive.isCreatingBackup && !CuraDrive.isRestoringBackup onClicked: CuraDrive.createBackup() busy: CuraDrive.isCreatingBackup diff --git a/plugins/CuraDrive/src/qml/components/BackupListItem.qml b/plugins/CuraDrive/src/qml/components/BackupListItem.qml index 7b539b03b9..e35c8351b7 100644 --- a/plugins/CuraDrive/src/qml/components/BackupListItem.qml +++ b/plugins/CuraDrive/src/qml/components/BackupListItem.qml @@ -38,7 +38,7 @@ Item height: UM.Theme.getSize("section_icon").height color: UM.Theme.getColor("small_button_text") hoverColor: UM.Theme.getColor("small_button_text_hover") - iconSource: UM.Theme.getIcon("info") + iconSource: UM.Theme.getIcon("Information") onClicked: backupListItem.showDetails = !backupListItem.showDetails } @@ -80,7 +80,7 @@ Item height: UM.Theme.getSize("message_close").height color: UM.Theme.getColor("small_button_text") hoverColor: UM.Theme.getColor("small_button_text_hover") - iconSource: UM.Theme.getIcon("cross1") + iconSource: UM.Theme.getIcon("Cancel") onClicked: confirmDeleteDialog.visible = true } } diff --git a/plugins/CuraDrive/src/qml/components/BackupListItemDetails.qml b/plugins/CuraDrive/src/qml/components/BackupListItemDetails.qml index 4da15c6f16..a4f30edd19 100644 --- a/plugins/CuraDrive/src/qml/components/BackupListItemDetails.qml +++ b/plugins/CuraDrive/src/qml/components/BackupListItemDetails.qml @@ -1,4 +1,4 @@ -// Copyright (c) 2018 Ultimaker B.V. +// Copyright (c) 2021 Ultimaker B.V. // Cura is released under the terms of the LGPLv3 or higher. import QtQuick 2.7 @@ -17,7 +17,7 @@ ColumnLayout // Cura version BackupListItemDetailsRow { - iconSource: UM.Theme.getIcon("application") + iconSource: UM.Theme.getIcon("UltimakerCura") label: catalog.i18nc("@backuplist:label", "Cura Version") value: backupDetailsData.metadata.cura_release } @@ -25,7 +25,7 @@ ColumnLayout // Machine count. BackupListItemDetailsRow { - iconSource: UM.Theme.getIcon("printer_single") + iconSource: UM.Theme.getIcon("Printer") label: catalog.i18nc("@backuplist:label", "Machines") value: backupDetailsData.metadata.machine_count } @@ -33,7 +33,7 @@ ColumnLayout // Material count BackupListItemDetailsRow { - iconSource: UM.Theme.getIcon("category_material") + iconSource: UM.Theme.getIcon("Spool") label: catalog.i18nc("@backuplist:label", "Materials") value: backupDetailsData.metadata.material_count } @@ -41,7 +41,7 @@ ColumnLayout // Profile count. BackupListItemDetailsRow { - iconSource: UM.Theme.getIcon("settings") + iconSource: UM.Theme.getIcon("Sliders") label: catalog.i18nc("@backuplist:label", "Profiles") value: backupDetailsData.metadata.profile_count } @@ -49,7 +49,7 @@ ColumnLayout // Plugin count. BackupListItemDetailsRow { - iconSource: UM.Theme.getIcon("plugin") + iconSource: UM.Theme.getIcon("Plugin") label: catalog.i18nc("@backuplist:label", "Plugins") value: backupDetailsData.metadata.plugin_count } diff --git a/plugins/MonitorStage/MonitorMain.qml b/plugins/MonitorStage/MonitorMain.qml index d5fdb66c89..cb16b91cb8 100644 --- a/plugins/MonitorStage/MonitorMain.qml +++ b/plugins/MonitorStage/MonitorMain.qml @@ -137,7 +137,7 @@ Rectangle id: externalLinkIcon anchors.verticalCenter: parent.verticalCenter color: UM.Theme.getColor("text_link") - source: UM.Theme.getIcon("external_link") + source: UM.Theme.getIcon("LinkExternal") width: UM.Theme.getSize("monitor_external_link_icon").width height: UM.Theme.getSize("monitor_external_link_icon").height } diff --git a/plugins/PerObjectSettingsTool/PerObjectCategory.qml b/plugins/PerObjectSettingsTool/PerObjectCategory.qml index 4ca12f657e..58192f0acd 100644 --- a/plugins/PerObjectSettingsTool/PerObjectCategory.qml +++ b/plugins/PerObjectSettingsTool/PerObjectCategory.qml @@ -24,7 +24,7 @@ Button { anchors.verticalCenter: parent.verticalCenter height: (label.height / 2) | 0 width: height - source: control.checked ? UM.Theme.getIcon("arrow_bottom") : UM.Theme.getIcon("arrow_right"); + source: control.checked ? UM.Theme.getIcon("ChevronSingleDown") : UM.Theme.getIcon("ChevronSingleRight"); color: control.hovered ? palette.highlight : palette.buttonText } UM.RecolorImage diff --git a/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml b/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml index 7ab4bdb1a1..e96337e6bb 100644 --- a/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml +++ b/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml @@ -80,7 +80,7 @@ Item { id: normalButton text: catalog.i18nc("@label", "Normal model") - iconSource: UM.Theme.getIcon("pos_normal"); + iconSource: UM.Theme.getIcon("Infill0"); property bool needBorder: true checkable: true onClicked: setMeshType(normalMeshType); @@ -92,7 +92,7 @@ Item { id: supportMeshButton text: catalog.i18nc("@label", "Print as support") - iconSource: UM.Theme.getIcon("pos_print_as_support"); + iconSource: UM.Theme.getIcon("MeshTypeSupport"); property bool needBorder: true checkable:true onClicked: setMeshType(supportMeshType) @@ -104,7 +104,7 @@ Item { id: overlapMeshButton text: catalog.i18nc("@label", "Modify settings for overlaps") - iconSource: UM.Theme.getIcon("pos_modify_overlaps"); + iconSource: UM.Theme.getIcon("MeshTypeIntersect"); property bool needBorder: true checkable:true onClicked: setMeshType(infillMeshType) @@ -116,7 +116,7 @@ Item { id: antiOverhangMeshButton text: catalog.i18nc("@label", "Don't support overlaps") - iconSource: UM.Theme.getIcon("pos_modify_dont_support_overlap"); + iconSource: UM.Theme.getIcon("BlockSupportOverlaps"); property bool needBorder: true checkable: true onClicked: setMeshType(antiOverhangMeshType) @@ -306,7 +306,7 @@ Item height: width sourceSize.height: width color: control.hovered ? UM.Theme.getColor("setting_control_button_hover") : UM.Theme.getColor("setting_control_button") - source: UM.Theme.getIcon("minus") + source: UM.Theme.getIcon("Minus") } } } diff --git a/plugins/PerObjectSettingsTool/__init__.py b/plugins/PerObjectSettingsTool/__init__.py index acfc35815e..d3c6d236ef 100644 --- a/plugins/PerObjectSettingsTool/__init__.py +++ b/plugins/PerObjectSettingsTool/__init__.py @@ -13,7 +13,7 @@ def getMetaData(): "tool": { "name": i18n_catalog.i18nc("@label", "Per Model Settings"), "description": i18n_catalog.i18nc("@info:tooltip", "Configure Per Model Settings"), - "icon": "tool_icon.svg", + "icon": "MeshType", "tool_panel": "PerObjectSettingsPanel.qml", "weight": 3 }, diff --git a/plugins/PerObjectSettingsTool/tool_icon.svg b/plugins/PerObjectSettingsTool/tool_icon.svg deleted file mode 100644 index 41e49cae07..0000000000 --- a/plugins/PerObjectSettingsTool/tool_icon.svg +++ /dev/null @@ -1,22 +0,0 @@ - - - - per_model_settings - Created with Sketch. - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/plugins/PostProcessingPlugin/PostProcessingPlugin.qml b/plugins/PostProcessingPlugin/PostProcessingPlugin.qml index 2b3a141aa0..7397ec8196 100644 --- a/plugins/PostProcessingPlugin/PostProcessingPlugin.qml +++ b/plugins/PostProcessingPlugin/PostProcessingPlugin.qml @@ -154,7 +154,7 @@ UM.Dialog height: Math.round(control.height / 2.7) sourceSize.height: width color: palette.text - source: UM.Theme.getIcon("cross1") + source: UM.Theme.getIcon("Cancel") } } } @@ -188,7 +188,7 @@ UM.Dialog height: Math.round(control.height / 2.5) sourceSize.height: width color: control.enabled ? palette.text : disabledPalette.text - source: UM.Theme.getIcon("arrow_bottom") + source: UM.Theme.getIcon("ChevronSingleDown") } } } @@ -222,7 +222,7 @@ UM.Dialog height: Math.round(control.height / 2.5) sourceSize.height: width color: control.enabled ? palette.text : disabledPalette.text - source: UM.Theme.getIcon("arrow_top") + source: UM.Theme.getIcon("ChevronSingleUp") } } } @@ -517,7 +517,7 @@ UM.Dialog } toolTipContentAlignment: Cura.ToolTip.ContentAlignment.AlignLeft onClicked: dialog.show() - iconSource: "postprocessing.svg" + iconSource: "Script.svg" fixedWidthMode: false } @@ -536,4 +536,4 @@ UM.Dialog labelText: activeScriptsList.count } } -} \ No newline at end of file +} diff --git a/plugins/PostProcessingPlugin/Script.svg b/plugins/PostProcessingPlugin/Script.svg new file mode 100755 index 0000000000..6bf481deef --- /dev/null +++ b/plugins/PostProcessingPlugin/Script.svg @@ -0,0 +1,10 @@ + + + + + + + + + diff --git a/plugins/PostProcessingPlugin/postprocessing.svg b/plugins/PostProcessingPlugin/postprocessing.svg deleted file mode 100644 index f55face4a9..0000000000 --- a/plugins/PostProcessingPlugin/postprocessing.svg +++ /dev/null @@ -1,47 +0,0 @@ - - - -image/svg+xml \ No newline at end of file diff --git a/plugins/PrepareStage/PrepareMenu.qml b/plugins/PrepareStage/PrepareMenu.qml index 87d7c5f35c..93ecb49677 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("load") + source: UM.Theme.getIcon("Folder") 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 00497a57c8..9232516673 100644 --- a/plugins/SimulationView/SimulationViewMainComponent.qml +++ b/plugins/SimulationView/SimulationViewMainComponent.qml @@ -78,7 +78,7 @@ Item UM.SimpleButton { id: playButton - iconSource: !isSimulationPlaying ? "./resources/simulation_resume.svg": "./resources/simulation_pause.svg" + iconSource: !isSimulationPlaying ? "./resources/Play.svg": "./resources/Pause.svg" width: UM.Theme.getSize("small_button").width height: UM.Theme.getSize("small_button").height hoverColor: UM.Theme.getColor("slider_handle_active") @@ -241,4 +241,4 @@ Item layerSlider.setUpperValue(UM.SimulationView.currentLayer) } } -} \ No newline at end of file +} diff --git a/plugins/SimulationView/SimulationViewMenuComponent.qml b/plugins/SimulationView/SimulationViewMenuComponent.qml index a9108c9d42..86e686e0fc 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_button") + source: UM.Theme.getIcon("Extruder", "medium") color: model.color } diff --git a/plugins/SimulationView/resources/Pause.svg b/plugins/SimulationView/resources/Pause.svg new file mode 100755 index 0000000000..1e155a783f --- /dev/null +++ b/plugins/SimulationView/resources/Pause.svg @@ -0,0 +1,5 @@ + + + + diff --git a/plugins/SimulationView/resources/Play.svg b/plugins/SimulationView/resources/Play.svg new file mode 100755 index 0000000000..36bbe99c10 --- /dev/null +++ b/plugins/SimulationView/resources/Play.svg @@ -0,0 +1,6 @@ + + + + diff --git a/plugins/SimulationView/resources/simulation_pause.svg b/plugins/SimulationView/resources/simulation_pause.svg deleted file mode 100644 index 652434bd44..0000000000 --- a/plugins/SimulationView/resources/simulation_pause.svg +++ /dev/null @@ -1,79 +0,0 @@ - - - - - - - - - - image/svg+xml - - - - - - - - - - - - diff --git a/plugins/SimulationView/resources/simulation_resume.svg b/plugins/SimulationView/resources/simulation_resume.svg deleted file mode 100644 index 912a2ac418..0000000000 --- a/plugins/SimulationView/resources/simulation_resume.svg +++ /dev/null @@ -1,78 +0,0 @@ - - - - - - - - - - image/svg+xml - - - - - - - - - diff --git a/plugins/SupportEraser/__init__.py b/plugins/SupportEraser/__init__.py index 2ed7521808..30b6fe4a52 100644 --- a/plugins/SupportEraser/__init__.py +++ b/plugins/SupportEraser/__init__.py @@ -11,7 +11,7 @@ def getMetaData(): "tool": { "name": i18n_catalog.i18nc("@label", "Support Blocker"), "description": i18n_catalog.i18nc("@info:tooltip", "Create a volume in which supports are not printed."), - "icon": "tool_icon.svg", + "icon": "SupportBlocker", "weight": 4 } } diff --git a/plugins/SupportEraser/tool_icon.svg b/plugins/SupportEraser/tool_icon.svg deleted file mode 100644 index fee69e0715..0000000000 --- a/plugins/SupportEraser/tool_icon.svg +++ /dev/null @@ -1,14 +0,0 @@ - - - - support_blocker - Created with Sketch. - - - - - - - - - \ No newline at end of file diff --git a/plugins/Toolbox/resources/images/Shop.svg b/plugins/Toolbox/resources/images/Shop.svg new file mode 100755 index 0000000000..a93d6d4cfb --- /dev/null +++ b/plugins/Toolbox/resources/images/Shop.svg @@ -0,0 +1,7 @@ + + + + diff --git a/plugins/Toolbox/resources/images/shop.svg b/plugins/Toolbox/resources/images/shop.svg deleted file mode 100644 index 64862834b0..0000000000 --- a/plugins/Toolbox/resources/images/shop.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/plugins/Toolbox/resources/qml/components/ToolboxBackColumn.qml b/plugins/Toolbox/resources/qml/components/ToolboxBackColumn.qml index 5514e555eb..9874a977f5 100644 --- a/plugins/Toolbox/resources/qml/components/ToolboxBackColumn.qml +++ b/plugins/Toolbox/resources/qml/components/ToolboxBackColumn.qml @@ -41,7 +41,7 @@ Item height: height } color: button.enabled ? (button.hovered ? UM.Theme.getColor("primary") : UM.Theme.getColor("text")) : UM.Theme.getColor("text_inactive") - source: UM.Theme.getIcon("arrow_left") + source: UM.Theme.getIcon("ChevronSingleLeft") } width: UM.Theme.getSize("toolbox_back_button").width height: UM.Theme.getSize("toolbox_back_button").height diff --git a/plugins/Toolbox/resources/qml/components/ToolboxHeader.qml b/plugins/Toolbox/resources/qml/components/ToolboxHeader.qml index 0c57e5fc5c..1bdfa80b79 100644 --- a/plugins/Toolbox/resources/qml/components/ToolboxHeader.qml +++ b/plugins/Toolbox/resources/qml/components/ToolboxHeader.qml @@ -95,7 +95,7 @@ Item UM.RecolorImage { id: cloudMarketplaceButton - source: "../../images/shop.svg" + source: "../../images/Shop.svg" color: UM.Theme.getColor(webMarketplaceButtonTooltipArea.containsMouse ? "primary" : "text") height: parent.height / 2 width: height diff --git a/plugins/UM3NetworkPrinting/resources/qml/MonitorBuildplateConfiguration.qml b/plugins/UM3NetworkPrinting/resources/qml/MonitorBuildplateConfiguration.qml index 2034c23abe..f3002fd25b 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 56e39bd477..a42dc0d12a 100644 --- a/plugins/UM3NetworkPrinting/resources/qml/MonitorCarousel.qml +++ b/plugins/UM3NetworkPrinting/resources/qml/MonitorCarousel.qml @@ -98,7 +98,7 @@ Item sourceSize.width: width // TODO: Theme! sourceSize.height: width // TODO: Theme! color: UM.Theme.getColor("text") - source: UM.Theme.getIcon("arrow_left") + source: UM.Theme.getIcon("ChevronSingleLeft") } } } @@ -177,7 +177,7 @@ Item sourceSize.width: width // TODO: Theme! sourceSize.height: width // TODO: Theme! color: UM.Theme.getColor("text") - source: UM.Theme.getIcon("arrow_right") + source: UM.Theme.getIcon("ChevronSingleRight") } } } diff --git a/plugins/UM3NetworkPrinting/resources/qml/MonitorIconExtruder.qml b/plugins/UM3NetworkPrinting/resources/qml/MonitorIconExtruder.qml index 8c6f28d3e1..79bc0ec25b 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 7492b4e8e4..cf2239201f 100644 --- a/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobPreview.qml +++ b/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobPreview.qml @@ -71,20 +71,20 @@ Item } if (printJob.configurationChanges.length > 0) { - return "../svg/warning-icon.svg" + return "../svg/Warning.svg" } switch(printJob.state) { case "error": - return "../svg/aborted-icon.svg" + return "../svg/CancelCircle.svg" case "wait_cleanup": - return printJob.timeTotal > printJob.timeElapsed ? "../svg/aborted-icon.svg" : "" + return printJob.timeTotal > printJob.timeElapsed ? "../svg/CancelCircle.svg" : "" case "pausing": - return "../svg/paused-icon.svg" + return "../svg/PauseCircle.svg" case "paused": - return "../svg/paused-icon.svg" + return "../svg/PauseCircle.svg" case "resuming": - return "../svg/paused-icon.svg" + return "../svg/PauseCircle.svg" default: return "" } diff --git a/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml b/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml index 05ad8d9929..7dbb78e8fb 100644 --- a/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml +++ b/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml @@ -164,7 +164,7 @@ Item verticalCenter: managePrinterText.verticalCenter } color: UM.Theme.getColor("text_link") - source: UM.Theme.getIcon("external_link") + source: UM.Theme.getIcon("LinkExternal") width: 12 * screenScaleFactor height: 12 * screenScaleFactor } @@ -265,7 +265,7 @@ Item bottom: parent.bottom bottomMargin: 20 * screenScaleFactor // TODO: Theme! } - iconSource: "../svg/icons/camera.svg" + iconSource: "../svg/icons/CameraPhoto.svg" enabled: !cloudConnection visible: printer } diff --git a/plugins/UM3NetworkPrinting/resources/qml/MonitorQueue.qml b/plugins/UM3NetworkPrinting/resources/qml/MonitorQueue.qml index 9f159102e2..1b94625bf0 100644 --- a/plugins/UM3NetworkPrinting/resources/qml/MonitorQueue.qml +++ b/plugins/UM3NetworkPrinting/resources/qml/MonitorQueue.qml @@ -48,7 +48,7 @@ Item id: externalLinkIcon anchors.verticalCenter: manageQueueLabel.verticalCenter color: UM.Theme.getColor("text_link") - source: UM.Theme.getIcon("external_link") + source: UM.Theme.getIcon("LinkExternal") width: 16 * screenScaleFactor // TODO: Theme! (Y U NO USE 18 LIKE ALL OTHER ICONS?!) height: 16 * screenScaleFactor // TODO: Theme! (Y U NO USE 18 LIKE ALL OTHER ICONS?!) } diff --git a/plugins/UM3NetworkPrinting/resources/qml/PrinterVideoStream.qml b/plugins/UM3NetworkPrinting/resources/qml/PrinterVideoStream.qml index cfbb30fdfb..291e2a14f5 100644 --- a/plugins/UM3NetworkPrinting/resources/qml/PrinterVideoStream.qml +++ b/plugins/UM3NetworkPrinting/resources/qml/PrinterVideoStream.qml @@ -30,7 +30,7 @@ Item { top: cameraImage.top topMargin: UM.Theme.getSize("default_margin").height } - iconSource: UM.Theme.getIcon("cross1"); + iconSource: UM.Theme.getIcon("Cancel"); z: 999; } diff --git a/plugins/UM3NetworkPrinting/resources/svg/Camera.svg b/plugins/UM3NetworkPrinting/resources/svg/Camera.svg new file mode 100755 index 0000000000..ae6a67fc0b --- /dev/null +++ b/plugins/UM3NetworkPrinting/resources/svg/Camera.svg @@ -0,0 +1,6 @@ + + + + diff --git a/plugins/UM3NetworkPrinting/resources/svg/CancelCircle.svg b/plugins/UM3NetworkPrinting/resources/svg/CancelCircle.svg new file mode 100755 index 0000000000..dc541f2d54 --- /dev/null +++ b/plugins/UM3NetworkPrinting/resources/svg/CancelCircle.svg @@ -0,0 +1,7 @@ + + + + diff --git a/plugins/UM3NetworkPrinting/resources/svg/Check.svg b/plugins/UM3NetworkPrinting/resources/svg/Check.svg new file mode 100755 index 0000000000..17e290a38b --- /dev/null +++ b/plugins/UM3NetworkPrinting/resources/svg/Check.svg @@ -0,0 +1,5 @@ + + + + diff --git a/plugins/UM3NetworkPrinting/resources/svg/CheckCircle.svg b/plugins/UM3NetworkPrinting/resources/svg/CheckCircle.svg new file mode 100755 index 0000000000..aac1a50b95 --- /dev/null +++ b/plugins/UM3NetworkPrinting/resources/svg/CheckCircle.svg @@ -0,0 +1,9 @@ + + + + + + + diff --git a/plugins/UM3NetworkPrinting/resources/svg/PauseCircle.svg b/plugins/UM3NetworkPrinting/resources/svg/PauseCircle.svg new file mode 100755 index 0000000000..b010624979 --- /dev/null +++ b/plugins/UM3NetworkPrinting/resources/svg/PauseCircle.svg @@ -0,0 +1,10 @@ + + + + + + + + diff --git a/plugins/UM3NetworkPrinting/resources/svg/Prohibition.svg b/plugins/UM3NetworkPrinting/resources/svg/Prohibition.svg new file mode 100755 index 0000000000..d4dc842551 --- /dev/null +++ b/plugins/UM3NetworkPrinting/resources/svg/Prohibition.svg @@ -0,0 +1,7 @@ + + + + diff --git a/plugins/UM3NetworkPrinting/resources/svg/Warning.svg b/plugins/UM3NetworkPrinting/resources/svg/Warning.svg new file mode 100755 index 0000000000..6105030fe6 --- /dev/null +++ b/plugins/UM3NetworkPrinting/resources/svg/Warning.svg @@ -0,0 +1,6 @@ + + + + diff --git a/plugins/UM3NetworkPrinting/resources/svg/aborted-icon.svg b/plugins/UM3NetworkPrinting/resources/svg/aborted-icon.svg deleted file mode 100644 index 7ef82c8911..0000000000 --- a/plugins/UM3NetworkPrinting/resources/svg/aborted-icon.svg +++ /dev/null @@ -1 +0,0 @@ -aborted-icon \ No newline at end of file diff --git a/plugins/UM3NetworkPrinting/resources/svg/action-required-icon.svg b/plugins/UM3NetworkPrinting/resources/svg/action-required-icon.svg deleted file mode 100644 index e7768849c6..0000000000 --- a/plugins/UM3NetworkPrinting/resources/svg/action-required-icon.svg +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - - diff --git a/plugins/UM3NetworkPrinting/resources/svg/approved-icon.svg b/plugins/UM3NetworkPrinting/resources/svg/approved-icon.svg deleted file mode 100644 index 671957d709..0000000000 --- a/plugins/UM3NetworkPrinting/resources/svg/approved-icon.svg +++ /dev/null @@ -1 +0,0 @@ -approved-icon \ No newline at end of file diff --git a/plugins/UM3NetworkPrinting/resources/svg/blocked-icon.svg b/plugins/UM3NetworkPrinting/resources/svg/blocked-icon.svg deleted file mode 100644 index eba3efdab9..0000000000 --- a/plugins/UM3NetworkPrinting/resources/svg/blocked-icon.svg +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - diff --git a/plugins/UM3NetworkPrinting/resources/svg/camera-icon.svg b/plugins/UM3NetworkPrinting/resources/svg/camera-icon.svg deleted file mode 100644 index 66bed04508..0000000000 --- a/plugins/UM3NetworkPrinting/resources/svg/camera-icon.svg +++ /dev/null @@ -1,8 +0,0 @@ - - - Created with Sketch. - - - - - \ No newline at end of file diff --git a/plugins/UM3NetworkPrinting/resources/svg/checkmark-icon.svg b/plugins/UM3NetworkPrinting/resources/svg/checkmark-icon.svg deleted file mode 100644 index 9d4507e551..0000000000 --- a/plugins/UM3NetworkPrinting/resources/svg/checkmark-icon.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/resources/themes/cura-light/icons/package.svg b/plugins/UM3NetworkPrinting/resources/svg/icons/Buildplate.svg old mode 100644 new mode 100755 similarity index 50% rename from resources/themes/cura-light/icons/package.svg rename to plugins/UM3NetworkPrinting/resources/svg/icons/Buildplate.svg index 4f74a43c42..79fdc06c07 --- a/resources/themes/cura-light/icons/package.svg +++ b/plugins/UM3NetworkPrinting/resources/svg/icons/Buildplate.svg @@ -1,7 +1,7 @@ - + viewBox="0 0 24 24" style="enable-background:new 0 0 24 24;" xml:space="preserve"> + diff --git a/plugins/UM3NetworkPrinting/resources/svg/icons/CameraPhoto.svg b/plugins/UM3NetworkPrinting/resources/svg/icons/CameraPhoto.svg new file mode 100755 index 0000000000..01f9c67c4e --- /dev/null +++ b/plugins/UM3NetworkPrinting/resources/svg/icons/CameraPhoto.svg @@ -0,0 +1,8 @@ + + + + + diff --git a/plugins/UM3NetworkPrinting/resources/svg/icons/Extruder.svg b/plugins/UM3NetworkPrinting/resources/svg/icons/Extruder.svg new file mode 100644 index 0000000000..3a2cf1147b --- /dev/null +++ b/plugins/UM3NetworkPrinting/resources/svg/icons/Extruder.svg @@ -0,0 +1,15 @@ + + + + + + + + + + + + + diff --git a/plugins/UM3NetworkPrinting/resources/svg/icons/buildplate.svg b/plugins/UM3NetworkPrinting/resources/svg/icons/buildplate.svg deleted file mode 100644 index bcb278a8ca..0000000000 --- a/plugins/UM3NetworkPrinting/resources/svg/icons/buildplate.svg +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/plugins/UM3NetworkPrinting/resources/svg/icons/camera.svg b/plugins/UM3NetworkPrinting/resources/svg/icons/camera.svg deleted file mode 100644 index 2eaebb812d..0000000000 --- a/plugins/UM3NetworkPrinting/resources/svg/icons/camera.svg +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/plugins/UM3NetworkPrinting/resources/svg/icons/extruder.svg b/plugins/UM3NetworkPrinting/resources/svg/icons/extruder.svg deleted file mode 100644 index 235cb432e9..0000000000 --- a/plugins/UM3NetworkPrinting/resources/svg/icons/extruder.svg +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/plugins/UM3NetworkPrinting/resources/svg/paused-icon.svg b/plugins/UM3NetworkPrinting/resources/svg/paused-icon.svg deleted file mode 100644 index a66217d662..0000000000 --- a/plugins/UM3NetworkPrinting/resources/svg/paused-icon.svg +++ /dev/null @@ -1 +0,0 @@ -paused-icon \ No newline at end of file diff --git a/plugins/UM3NetworkPrinting/resources/svg/warning-icon.svg b/plugins/UM3NetworkPrinting/resources/svg/warning-icon.svg deleted file mode 100644 index 064d0783e0..0000000000 --- a/plugins/UM3NetworkPrinting/resources/svg/warning-icon.svg +++ /dev/null @@ -1,4 +0,0 @@ - - warning-icon - - \ No newline at end of file diff --git a/resources/definitions/fdmextruder.def.json b/resources/definitions/fdmextruder.def.json index 67d28392b3..7dbd775b49 100644 --- a/resources/definitions/fdmextruder.def.json +++ b/resources/definitions/fdmextruder.def.json @@ -197,7 +197,7 @@ { "label": "Build Plate Adhesion", "type": "category", - "icon": "category_adhesion", + "icon": "Adhesion", "description": "Adhesion", "children": { @@ -232,7 +232,7 @@ "material": { "label": "Material", - "icon": "category_material", + "icon": "Spool", "description": "Material", "type": "category", "children": diff --git a/resources/definitions/fdmprinter.def.json b/resources/definitions/fdmprinter.def.json index de74ee1bc4..dca63aaa5e 100644 --- a/resources/definitions/fdmprinter.def.json +++ b/resources/definitions/fdmprinter.def.json @@ -28,7 +28,7 @@ "label": "Machine", "type": "category", "description": "Machine specific settings", - "icon": "category_machine", + "icon": "Printer", "children": { "machine_name": @@ -765,7 +765,7 @@ { "label": "Quality", "type": "category", - "icon": "category_layer_height", + "icon": "PrintQuality", "description": "All settings that influence the resolution of the print. These settings have a large impact on the quality (and print time)", "children": { @@ -1001,7 +1001,7 @@ "shell": { "label": "Walls", - "icon": "category_shell", + "icon": "PrintShell", "description": "Shell", "type": "category", "children": @@ -1346,7 +1346,7 @@ "top_bottom": { "label": "Top/Bottom", - "icon": "category_topbottom", + "icon": "PrintTopBottom", "description": "Top/Bottom", "type": "category", "children": @@ -1822,7 +1822,7 @@ "infill": { "label": "Infill", - "icon": "category_infill", + "icon": "Infill1", "description": "Infill", "type": "category", "children": @@ -2161,7 +2161,7 @@ "material": { "label": "Material", - "icon": "category_material", + "icon": "Spool", "description": "Material", "type": "category", "children": @@ -2766,7 +2766,7 @@ "speed": { "label": "Speed", - "icon": "category_speed", + "icon": "SpeedOMeter", "description": "Speed", "type": "category", "children": @@ -3672,7 +3672,7 @@ "travel": { "label": "Travel", - "icon": "category_travel", + "icon": "PrintTravel", "description": "travel", "type": "category", "children": @@ -3977,7 +3977,7 @@ "cooling": { "label": "Cooling", - "icon": "category_cool", + "icon": "Fan", "description": "Cooling", "type": "category", "children": @@ -4127,7 +4127,7 @@ { "label": "Support", "type": "category", - "icon": "category_support", + "icon": "Support", "description": "Support", "children": { @@ -5167,7 +5167,7 @@ { "label": "Build Plate Adhesion", "type": "category", - "icon": "category_adhesion", + "icon": "Adhesion", "description": "Adhesion", "children": { @@ -5821,7 +5821,7 @@ { "label": "Dual Extrusion", "type": "category", - "icon": "category_dual", + "icon": "DualExtrusion", "description": "Settings used for printing with multiple extruders.", "children": { @@ -6036,7 +6036,7 @@ { "label": "Mesh Fixes", "type": "category", - "icon": "category_fixes", + "icon": "Bandage", "description": "Make the meshes more suited for 3D printing.", "children": { @@ -6162,7 +6162,7 @@ { "label": "Special Modes", "type": "category", - "icon": "category_blackmagic", + "icon": "BlackMagic", "description": "Non-traditional ways to print your models.", "children": { @@ -6335,7 +6335,7 @@ { "label": "Experimental", "type": "category", - "icon": "category_experimental", + "icon": "Experiment", "description": "Features that haven't completely been fleshed out yet.", "children": { diff --git a/resources/qml/Account/AvatarImage.qml b/resources/qml/Account/AvatarImage.qml index 120173366f..58c39e5065 100644 --- a/resources/qml/Account/AvatarImage.qml +++ b/resources/qml/Account/AvatarImage.qml @@ -52,7 +52,7 @@ Item width: parent.width + 2 height: parent.height + 2 visible: hasAvatar - source: UM.Theme.getIcon("circle_outline") + source: UM.Theme.getIcon("CircleOutline") sourceSize: Qt.size(parent.width, parent.height) color: UM.Theme.getColor("account_widget_outline_active") } diff --git a/resources/qml/Account/SyncState.qml b/resources/qml/Account/SyncState.qml index f7630b500a..d5a9d392e2 100644 --- a/resources/qml/Account/SyncState.qml +++ b/resources/qml/Account/SyncState.qml @@ -18,27 +18,27 @@ Row // Sync state icon + message { name: "idle" when: syncState == Cura.AccountSyncState.IDLE - PropertyChanges { target: icon; source: UM.Theme.getIcon("update")} + PropertyChanges { target: icon; source: UM.Theme.getIcon("ArrowDoubleCircleRight")} }, State { name: "syncing" when: syncState == Cura.AccountSyncState.SYNCING - PropertyChanges { target: icon; source: UM.Theme.getIcon("update") } + PropertyChanges { target: icon; source: UM.Theme.getIcon("ArrowDoubleCircleRight") } PropertyChanges { target: stateLabel; text: catalog.i18nc("@label", "Checking...")} }, State { name: "up_to_date" when: syncState == Cura.AccountSyncState.SUCCESS - PropertyChanges { target: icon; source: UM.Theme.getIcon("checked") } + PropertyChanges { target: icon; source: UM.Theme.getIcon("CheckCircle") } PropertyChanges { target: stateLabel; text: catalog.i18nc("@label", "Account synced")} }, State { name: "error" when: syncState == Cura.AccountSyncState.ERROR - PropertyChanges { target: icon; source: UM.Theme.getIcon("warning_light") } + PropertyChanges { target: icon; source: UM.Theme.getIcon("Warning") } PropertyChanges { target: stateLabel; text: catalog.i18nc("@label", "Something went wrong...")} } ] diff --git a/resources/qml/ActionPanel/OutputDevicesActionButton.qml b/resources/qml/ActionPanel/OutputDevicesActionButton.qml index 866b8cc627..6d1a1d83dd 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("arrow_top") : UM.Theme.getIcon("arrow_bottom") + iconSource: popup.opened ? UM.Theme.getIcon("ChevronSingleUp") : UM.Theme.getIcon("ChevronSingleDown") 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 be6d68de4f..6e412c9a04 100644 --- a/resources/qml/ActionPanel/OutputProcessWidget.qml +++ b/resources/qml/ActionPanel/OutputProcessWidget.qml @@ -57,7 +57,7 @@ Column width: parent.width text: preSlicedData ? catalog.i18nc("@label", "No time estimation available") : PrintInformation.currentPrintTime.getDisplayString(UM.DurationFormat.Long) - source: UM.Theme.getIcon("clock") + source: UM.Theme.getIcon("Clock") font: UM.Theme.getFont("medium_bold") } @@ -99,7 +99,7 @@ Column } return totalWeights + "g · " + totalLengths.toFixed(2) + "m" } - source: UM.Theme.getIcon("spool") + source: UM.Theme.getIcon("Spool") font: UM.Theme.getFont("default") } } @@ -142,4 +142,4 @@ Column height: UM.Theme.getSize("action_button").height } } -} \ No newline at end of file +} diff --git a/resources/qml/ActionPanel/PrintInformationWidget.qml b/resources/qml/ActionPanel/PrintInformationWidget.qml index 097f281946..d9923ce4e8 100644 --- a/resources/qml/ActionPanel/PrintInformationWidget.qml +++ b/resources/qml/ActionPanel/PrintInformationWidget.qml @@ -11,7 +11,7 @@ UM.RecolorImage { id: widget - source: UM.Theme.getIcon("info") + source: UM.Theme.getIcon("Information") width: visible ? UM.Theme.getSize("section_icon").width : 0 height: UM.Theme.getSize("section_icon").height @@ -58,4 +58,4 @@ UM.RecolorImage arrowSize: UM.Theme.getSize("default_arrow").width } } -} \ No newline at end of file +} diff --git a/resources/qml/ActionPanel/SliceProcessWidget.qml b/resources/qml/ActionPanel/SliceProcessWidget.qml index dbbfe784ef..42df08560a 100644 --- a/resources/qml/ActionPanel/SliceProcessWidget.qml +++ b/resources/qml/ActionPanel/SliceProcessWidget.qml @@ -65,7 +65,7 @@ Column visible: widget.backendState == UM.Backend.Error text: catalog.i18nc("@label:PrintjobStatus", "Unable to slice") - source: UM.Theme.getIcon("warning") + source: UM.Theme.getIcon("Warning") iconColor: UM.Theme.getColor("warning") } diff --git a/resources/qml/CheckBoxWithTooltip.qml b/resources/qml/CheckBoxWithTooltip.qml index 403efb4d7b..e17940014a 100644 --- a/resources/qml/CheckBoxWithTooltip.qml +++ b/resources/qml/CheckBoxWithTooltip.qml @@ -32,7 +32,7 @@ CheckBox height: Math.round(parent.height / 2.5) sourceSize.height: width color: UM.Theme.getColor("checkbox_mark") - source: UM.Theme.getIcon("check") + source: UM.Theme.getIcon("Check") opacity: checkbox.checked Behavior on opacity { NumberAnimation { duration: 100; } } } diff --git a/resources/qml/ExpandableComponent.qml b/resources/qml/ExpandableComponent.qml index f637cccdbb..58719eb1fe 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("pencil") + source: UM.Theme.getIcon("Pen") 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 cd6ccfb825..7dd1aa358a 100644 --- a/resources/qml/ExpandableComponentHeader.qml +++ b/resources/qml/ExpandableComponentHeader.qml @@ -59,11 +59,11 @@ Cura.RoundedRectangle anchors.fill: parent sourceSize.width: width color: closeButton.hovered ? UM.Theme.getColor("small_button_text_hover") : UM.Theme.getColor("small_button_text") - source: UM.Theme.getIcon("cross1") + source: UM.Theme.getIcon("Cancel") } background: Item {} onClicked: toggleContent() // Will hide the popup item } -} \ No newline at end of file +} diff --git a/resources/qml/ExpandablePopup.qml b/resources/qml/ExpandablePopup.qml index 7829093e8d..b490ad5bc4 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("arrow_bottom") : UM.Theme.getIcon("arrow_left") + source: expanded ? UM.Theme.getIcon("ChevronSingleDown") : UM.Theme.getIcon("ChevronSingleLeft") 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 015ebea52e..1c93966519 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_button") + source: UM.Theme.getIcon("Extruder", "medium") color: extruderEnabled ? materialColor: UM.Theme.getColor("disabled") } @@ -32,15 +32,14 @@ Item width: height height: Math.round(parent.height / 2) - radius: Math.round(width / 2) + radius: Math.round(width) color: UM.Theme.getColor("toolbar_background") anchors { horizontalCenter: parent.horizontalCenter top: parent.top - // The circle needs to be slightly off center (so it sits in the middle of the square bit of the icon) - topMargin: (parent.height - height) / 2 - 0.1 * parent.height + topMargin: (parent.height - height) / 2 } Label @@ -64,9 +63,9 @@ Item anchors.fill: parent anchors.margins: UM.Theme.getSize("thick_lining").width sourceSize.height: width - source: UM.Theme.getIcon("cross1") + source: UM.Theme.getIcon("Cancel") visible: !extruderEnabled color: UM.Theme.getColor("text") } } -} \ No newline at end of file +} diff --git a/resources/qml/JobSpecs.qml b/resources/qml/JobSpecs.qml index c1989c4c95..4aa5fa8bd5 100644 --- a/resources/qml/JobSpecs.qml +++ b/resources/qml/JobSpecs.qml @@ -66,7 +66,7 @@ Item sourceSize.width: width sourceSize.height: width color: control.hovered ? UM.Theme.getColor("small_button_text_hover") : UM.Theme.getColor("small_button_text") - source: UM.Theme.getIcon("pencil") + source: UM.Theme.getIcon("Pen") } } } diff --git a/resources/qml/Menus/ConfigurationMenu/ConfigurationItem.qml b/resources/qml/Menus/ConfigurationMenu/ConfigurationItem.qml index 2e2dd0820a..92b88d3c09 100644 --- a/resources/qml/Menus/ConfigurationMenu/ConfigurationItem.qml +++ b/resources/qml/Menus/ConfigurationMenu/ConfigurationItem.qml @@ -93,7 +93,7 @@ Button id: icon anchors.verticalCenter: unknownMaterialMessage.verticalCenter - source: UM.Theme.getIcon("warning") + source: UM.Theme.getIcon("Warning") color: UM.Theme.getColor("warning") width: UM.Theme.getSize("section_icon").width height: width diff --git a/resources/qml/Menus/ConfigurationMenu/ConfigurationListView.qml b/resources/qml/Menus/ConfigurationMenu/ConfigurationListView.qml index 3350b29580..ab1d66f0e1 100644 --- a/resources/qml/Menus/ConfigurationMenu/ConfigurationListView.qml +++ b/resources/qml/Menus/ConfigurationMenu/ConfigurationListView.qml @@ -39,7 +39,7 @@ Item anchors.left: parent.left anchors.verticalCenter: label.verticalCenter - source: UM.Theme.getIcon("warning") + source: UM.Theme.getIcon("Warning") color: UM.Theme.getColor("warning") width: UM.Theme.getSize("section_icon").width height: width diff --git a/resources/qml/Menus/ConfigurationMenu/ConfigurationMenu.qml b/resources/qml/Menus/ConfigurationMenu/ConfigurationMenu.qml index d388bd7a7e..ad4911404a 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("arrow_right") + iconSource: UM.Theme.getIcon("ChevronSingleRight") 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("arrow_left") + iconSource: UM.Theme.getIcon("ChevronSingleLeft") onClicked: { diff --git a/resources/qml/Menus/ConfigurationMenu/CustomConfiguration.qml b/resources/qml/Menus/ConfigurationMenu/CustomConfiguration.qml index 30f6d1b68f..7d1393151f 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("printing_guideline") + source: UM.Theme.getIcon("Guide") color: instructionButton.hovered ? UM.Theme.getColor("primary") : UM.Theme.getColor("icon") } visible: selectors.instructionLink != "" @@ -388,7 +388,7 @@ Item { id: warningImage anchors.left: parent.left - source: UM.Theme.getIcon("warning") + source: UM.Theme.getIcon("Warning") width: UM.Theme.getSize("section_icon").width height: UM.Theme.getSize("section_icon").height sourceSize.width: width diff --git a/resources/qml/ObjectItemButton.qml b/resources/qml/ObjectItemButton.qml index 5867a1c544..7d8988fde4 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_button") + source: UM.Theme.getIcon("Extruder", "medium") color: extruderColor visible: showExtruderSwatches && extruderColor != "" } @@ -168,12 +168,12 @@ Button { switch (meshType) { case "support_mesh": - return UM.Theme.getIcon("pos_print_as_support"); + return UM.Theme.getIcon("MeshTypeSupport"); case "cutting_mesh": case "infill_mesh": - return UM.Theme.getIcon("pos_modify_overlaps"); + return UM.Theme.getIcon("MeshTypeIntersect"); case "anti_overhang_mesh": - return UM.Theme.getIcon("pos_modify_dont_support_overlap"); + return UM.Theme.getIcon("BlockSupportOverlaps"); } return ""; } diff --git a/resources/qml/ObjectSelector.qml b/resources/qml/ObjectSelector.qml index 15cb476e08..0cdc2b3f80 100644 --- a/resources/qml/ObjectSelector.qml +++ b/resources/qml/ObjectSelector.qml @@ -48,7 +48,7 @@ Item sourceSize.width: width anchors.left: parent.left color: openCloseButton.hovered ? UM.Theme.getColor("small_button_text_hover") : UM.Theme.getColor("small_button_text") - source: objectSelector.opened ? UM.Theme.getIcon("arrow_bottom") : UM.Theme.getIcon("arrow_top") + source: objectSelector.opened ? UM.Theme.getIcon("ChevronSingleDown") : UM.Theme.getIcon("ChevronSingleUp") } Label diff --git a/resources/qml/Preferences/Materials/MaterialsBrandSection.qml b/resources/qml/Preferences/Materials/MaterialsBrandSection.qml index 606acc2950..dc8be9563b 100644 --- a/resources/qml/Preferences/Materials/MaterialsBrandSection.qml +++ b/resources/qml/Preferences/Materials/MaterialsBrandSection.qml @@ -66,7 +66,7 @@ Item width: UM.Theme.getSize("standard_arrow").width height: UM.Theme.getSize("standard_arrow").height color: "black" - source: brand_section.expanded ? UM.Theme.getIcon("arrow_bottom") : UM.Theme.getIcon("arrow_left") + source: brand_section.expanded ? UM.Theme.getIcon("ChevronSingleDown") : UM.Theme.getIcon("ChevronSingleLeft") } } } @@ -144,4 +144,4 @@ Item expanded = materialList.expandedBrands.indexOf(sectionName) > -1 } } -} \ No newline at end of file +} diff --git a/resources/qml/Preferences/Materials/MaterialsSlot.qml b/resources/qml/Preferences/Materials/MaterialsSlot.qml index 81bb8759ff..840c636196 100644 --- a/resources/qml/Preferences/Materials/MaterialsSlot.qml +++ b/resources/qml/Preferences/Materials/MaterialsSlot.qml @@ -122,7 +122,7 @@ Rectangle } } } - source: materialSlot.is_favorite ? UM.Theme.getIcon("favorites_star_full") : UM.Theme.getIcon("favorites_star_empty") + source: materialSlot.is_favorite ? UM.Theme.getIcon("StarFilled") : UM.Theme.getIcon("Star") } } -} \ No newline at end of file +} diff --git a/resources/qml/Preferences/Materials/MaterialsTypeSection.qml b/resources/qml/Preferences/Materials/MaterialsTypeSection.qml index 7219cb7b89..09f9964604 100644 --- a/resources/qml/Preferences/Materials/MaterialsTypeSection.qml +++ b/resources/qml/Preferences/Materials/MaterialsTypeSection.qml @@ -78,7 +78,7 @@ Item width: UM.Theme.getSize("standard_arrow").width height: UM.Theme.getSize("standard_arrow").height color: "black" - source: material_type_section.expanded ? UM.Theme.getIcon("arrow_bottom") : UM.Theme.getIcon("arrow_left") + source: material_type_section.expanded ? UM.Theme.getIcon("ChevronSingleDown") : UM.Theme.getIcon("ChevronSingleLeft") } } @@ -134,4 +134,4 @@ Item expanded = materialList.expandedTypes.indexOf(materialBrand + "_" + materialName) > -1 } } -} \ No newline at end of file +} diff --git a/resources/qml/PrintSetupSelector/Custom/CustomPrintSetup.qml b/resources/qml/PrintSetupSelector/Custom/CustomPrintSetup.qml index d18febfc5f..92cbd7dd89 100644 --- a/resources/qml/PrintSetupSelector/Custom/CustomPrintSetup.qml +++ b/resources/qml/PrintSetupSelector/Custom/CustomPrintSetup.qml @@ -158,7 +158,7 @@ Item anchors.rightMargin: UM.Theme.getSize("default_margin").width color: hovered ? UM.Theme.getColor("setting_control_button_hover") : UM.Theme.getColor("setting_control_button"); - iconSource: UM.Theme.getIcon("star") + iconSource: UM.Theme.getIcon("StarFilled") onClicked: { @@ -176,7 +176,7 @@ Item { id: downArrow - source: UM.Theme.getIcon("arrow_bottom") + source: UM.Theme.getIcon("ChevronSingleDown") width: UM.Theme.getSize("standard_arrow").width height: UM.Theme.getSize("standard_arrow").height diff --git a/resources/qml/PrintSetupSelector/NoIntentIcon.qml b/resources/qml/PrintSetupSelector/NoIntentIcon.qml index 7943a05ab4..6fc883fdef 100644 --- a/resources/qml/PrintSetupSelector/NoIntentIcon.qml +++ b/resources/qml/PrintSetupSelector/NoIntentIcon.qml @@ -18,7 +18,7 @@ Item UM.RecolorImage { - source: UM.Theme.getIcon("info") + source: UM.Theme.getIcon("Information") color: UM.Theme.getColor("icon") anchors.fill: parent } @@ -33,4 +33,4 @@ Item } onExited: base.hideTooltip() } -} \ No newline at end of file +} diff --git a/resources/qml/PrintSetupSelector/PrintSetupSelectorContents.qml b/resources/qml/PrintSetupSelector/PrintSetupSelectorContents.qml index 81b752eef6..0a5a466780 100644 --- a/resources/qml/PrintSetupSelector/PrintSetupSelectorContents.qml +++ b/resources/qml/PrintSetupSelector/PrintSetupSelectorContents.qml @@ -142,7 +142,7 @@ Item leftPadding: UM.Theme.getSize("default_margin").width rightPadding: UM.Theme.getSize("default_margin").width text: catalog.i18nc("@button", "Recommended") - iconSource: UM.Theme.getIcon("arrow_left") + iconSource: UM.Theme.getIcon("ChevronSingleLeft") visible: currentModeIndex == PrintSetupSelectorContents.Mode.Custom onClicked: currentModeIndex = PrintSetupSelectorContents.Mode.Recommended } @@ -156,7 +156,7 @@ Item leftPadding: UM.Theme.getSize("default_margin").width rightPadding: UM.Theme.getSize("default_margin").width text: catalog.i18nc("@button", "Custom") - iconSource: UM.Theme.getIcon("arrow_right") + iconSource: UM.Theme.getIcon("ChevronSingleRight") isIconOnRightSide: true visible: currentModeIndex == PrintSetupSelectorContents.Mode.Recommended onClicked: @@ -233,10 +233,10 @@ Item height: UM.Theme.getSize("drag_icon").height anchors.centerIn: parent - source: UM.Theme.getIcon("resize") + source: UM.Theme.getIcon("ThreeDots") color: UM.Theme.getColor("small_button_text") } } } } -} \ No newline at end of file +} diff --git a/resources/qml/PrintSetupSelector/PrintSetupSelectorHeader.qml b/resources/qml/PrintSetupSelector/PrintSetupSelectorHeader.qml index 1a15980693..ff9204655f 100644 --- a/resources/qml/PrintSetupSelector/PrintSetupSelectorHeader.qml +++ b/resources/qml/PrintSetupSelector/PrintSetupSelectorHeader.qml @@ -15,7 +15,7 @@ RowLayout Cura.IconWithText { - source: UM.Theme.getIcon("category_layer_height") + source: UM.Theme.getIcon("PrintQuality") text: { if (Cura.MachineManager.activeStack) @@ -50,7 +50,7 @@ RowLayout Cura.IconWithText { - source: UM.Theme.getIcon("category_infill") + source: UM.Theme.getIcon("Infill1") text: Cura.MachineManager.activeStack ? parseInt(infillDensity.properties.value) + "%" : "0%" font: UM.Theme.getFont("medium") @@ -65,7 +65,7 @@ RowLayout Cura.IconWithText { - source: UM.Theme.getIcon("category_support") + source: UM.Theme.getIcon("Support") text: supportEnabled.properties.value == "True" ? enabledText : disabledText font: UM.Theme.getFont("medium") @@ -80,7 +80,7 @@ RowLayout Cura.IconWithText { - source: UM.Theme.getIcon("category_adhesion") + source: UM.Theme.getIcon("Adhesion") text: platformAdhesionType.properties.value != "skirt" && platformAdhesionType.properties.value != "none" ? enabledText : disabledText font: UM.Theme.getFont("medium") @@ -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 1ae265ab47..df2c1bfae6 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("category_adhesion") + source: UM.Theme.getIcon("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 19f199fea6..8da97437cf 100644 --- a/resources/qml/PrintSetupSelector/Recommended/RecommendedInfillDensitySelector.qml +++ b/resources/qml/PrintSetupSelector/Recommended/RecommendedInfillDensitySelector.qml @@ -29,21 +29,21 @@ Item var density = parseInt(infillDensity.properties.value) if (parseInt(infillSteps.properties.value) != 0) { - return UM.Theme.getIcon("gradual") + return UM.Theme.getIcon("InfillGradual") } if (density <= 0) { - return UM.Theme.getIcon("hollow") + return UM.Theme.getIcon("Infill0") } if (density < 40) { - return UM.Theme.getIcon("sparse") + return UM.Theme.getIcon("Infill3") } if (density < 90) { - return UM.Theme.getIcon("dense") + return UM.Theme.getIcon("Infill2") } - return UM.Theme.getIcon("solid") + return UM.Theme.getIcon("Solid") } } @@ -61,7 +61,7 @@ Item id: infillRowTitle anchors.top: parent.top anchors.left: parent.left - source: UM.Theme.getIcon("category_infill") + source: UM.Theme.getIcon("Infill1") text: catalog.i18nc("@label", "Infill") + " (%)" font: UM.Theme.getFont("medium") width: labelColumnWidth @@ -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 337aff573f..a8e19c7357 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("category_layer_height") + source: UM.Theme.getIcon("PrintQuality") 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("reset") + iconSource: UM.Theme.getIcon("ArrowReset") 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 aadee43c36..924dcd5ec4 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("category_support") + source: UM.Theme.getIcon("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("arrow_bottom") + source: UM.Theme.getIcon("ChevronSingleDown") width: UM.Theme.getSize("standard_arrow").width height: UM.Theme.getSize("standard_arrow").height sourceSize.width: width + 5 * screenScaleFactor @@ -229,7 +229,7 @@ Item sourceSize.width: width sourceSize.height: height - source: UM.Theme.getIcon("extruder_button") + source: UM.Theme.getIcon("Extruder", "medium") color: supportExtruderCombobox.color } } @@ -299,7 +299,7 @@ Item sourceSize.width: width sourceSize.height: height - source: UM.Theme.getIcon("extruder_button") + source: UM.Theme.getIcon("Extruder", "medium") 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 e8947bfdf4..3213f1ace8 100644 --- a/resources/qml/PrinterOutput/ManualPrinterControl.qml +++ b/resources/qml/PrinterOutput/ManualPrinterControl.qml @@ -102,7 +102,7 @@ Item Layout.column: 1 Layout.preferredWidth: width Layout.preferredHeight: height - iconSource: UM.Theme.getIcon("arrow_top"); + iconSource: UM.Theme.getIcon("ChevronSingleUp"); style: UM.Theme.styles.monitor_button_style width: height height: UM.Theme.getSize("setting_control").height @@ -119,7 +119,7 @@ Item Layout.column: 0 Layout.preferredWidth: width Layout.preferredHeight: height - iconSource: UM.Theme.getIcon("arrow_left"); + iconSource: UM.Theme.getIcon("ChevronSingleLeft"); style: UM.Theme.styles.monitor_button_style width: height height: UM.Theme.getSize("setting_control").height @@ -136,7 +136,7 @@ Item Layout.column: 2 Layout.preferredWidth: width Layout.preferredHeight: height - iconSource: UM.Theme.getIcon("arrow_right"); + iconSource: UM.Theme.getIcon("ChevronSingleRight"); style: UM.Theme.styles.monitor_button_style width: height height: UM.Theme.getSize("setting_control").height @@ -153,7 +153,7 @@ Item Layout.column: 1 Layout.preferredWidth: width Layout.preferredHeight: height - iconSource: UM.Theme.getIcon("arrow_bottom"); + iconSource: UM.Theme.getIcon("ChevronSingleDown"); style: UM.Theme.styles.monitor_button_style width: height height: UM.Theme.getSize("setting_control").height @@ -170,7 +170,7 @@ Item Layout.column: 1 Layout.preferredWidth: width Layout.preferredHeight: height - iconSource: UM.Theme.getIcon("home"); + iconSource: UM.Theme.getIcon("House"); style: UM.Theme.styles.monitor_button_style width: height height: UM.Theme.getSize("setting_control").height @@ -200,7 +200,7 @@ Item Button { - iconSource: UM.Theme.getIcon("arrow_top"); + iconSource: UM.Theme.getIcon("ChevronSingleUp"); style: UM.Theme.styles.monitor_button_style width: height height: UM.Theme.getSize("setting_control").height @@ -213,7 +213,7 @@ Item Button { - iconSource: UM.Theme.getIcon("home"); + iconSource: UM.Theme.getIcon("House"); style: UM.Theme.styles.monitor_button_style width: height height: UM.Theme.getSize("setting_control").height @@ -226,7 +226,7 @@ Item Button { - iconSource: UM.Theme.getIcon("arrow_bottom"); + iconSource: UM.Theme.getIcon("ChevronSingleDown"); style: UM.Theme.styles.monitor_button_style width: height height: UM.Theme.getSize("setting_control").height diff --git a/resources/qml/PrinterSelector/MachineSelector.qml b/resources/qml/PrinterSelector/MachineSelector.qml index 17bb80906a..7c74be1605 100644 --- a/resources/qml/PrinterSelector/MachineSelector.qml +++ b/resources/qml/PrinterSelector/MachineSelector.qml @@ -93,11 +93,11 @@ Cura.ExpandablePopup { if (isGroup) { - return UM.Theme.getIcon("printer_group") + return UM.Theme.getIcon("PrinterTriple") } else if (isNetworkPrinter || isCloudRegistered) { - return UM.Theme.getIcon("printer_single") + return UM.Theme.getIcon("Printer") } else { @@ -118,7 +118,25 @@ Cura.ExpandablePopup leftMargin: UM.Theme.getSize("thick_margin").width } - source: UM.Theme.getIcon(connectionStatus) + 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 "" + } + } 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 e3e12d7753..a42db9cdcb 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("arrow_bottom") : UM.Theme.getIcon("arrow_left") + source: definition.expanded ? UM.Theme.getIcon("ChevronSingleDown") : UM.Theme.getIcon("ChevronSingleLeft") } } @@ -154,7 +154,7 @@ Button color: UM.Theme.getColor("setting_control_button") hoverColor: UM.Theme.getColor("setting_control_button_hover") - iconSource: UM.Theme.getIcon("settings") + iconSource: UM.Theme.getIcon("Sliders") onClicked: Cura.Actions.configureSettingVisibility.trigger(definition) } @@ -195,7 +195,7 @@ Button color: UM.Theme.getColor("setting_control_button") hoverColor: UM.Theme.getColor("setting_control_button_hover") - iconSource: UM.Theme.getIcon("notice") + iconSource: UM.Theme.getIcon("Information") onEntered: base.showTooltip(catalog.i18nc("@label","Some hidden settings use values different from their normal calculated value.\n\nClick to make these settings visible.")) diff --git a/resources/qml/Settings/SettingCheckBox.qml b/resources/qml/Settings/SettingCheckBox.qml index e3de6e219d..20693b92e3 100644 --- a/resources/qml/Settings/SettingCheckBox.qml +++ b/resources/qml/Settings/SettingCheckBox.qml @@ -151,7 +151,7 @@ SettingItem height: Math.round(parent.height / 2.5) sourceSize.height: width color: !enabled ? UM.Theme.getColor("setting_control_disabled_text") : UM.Theme.getColor("setting_control_text"); - source: UM.Theme.getIcon("check") + source: UM.Theme.getIcon("Check") opacity: control.checked ? 1 : 0 Behavior on opacity { NumberAnimation { duration: 100; } } } diff --git a/resources/qml/Settings/SettingExtruder.qml b/resources/qml/Settings/SettingExtruder.qml index 2bf9e24b3d..995e1103f3 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("arrow_bottom") + source: UM.Theme.getIcon("ChevronSingleDown") width: UM.Theme.getSize("standard_arrow").width height: UM.Theme.getSize("standard_arrow").height sourceSize.width: width + 5 * screenScaleFactor @@ -171,7 +171,7 @@ SettingItem sourceSize.width: width sourceSize.height: height - source: UM.Theme.getIcon("extruder_button") + source: UM.Theme.getIcon("Extruder", "medium") color: control.color } } @@ -240,7 +240,7 @@ SettingItem sourceSize.width: width sourceSize.height: height - source: UM.Theme.getIcon("extruder_button") + source: UM.Theme.getIcon("Extruder", "medium") color: control.model.getItem(index).color } } diff --git a/resources/qml/Settings/SettingItem.qml b/resources/qml/Settings/SettingItem.qml index f0c748d190..a377d08cfc 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("reset") + iconSource: UM.Theme.getIcon("ArrowReset") 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("Function") onEntered: { hoverTimer.stop(); base.showTooltip(catalog.i18nc("@label", "This setting is normally calculated, but it currently has an absolute value set.\n\nClick to restore the calculated value.")) } onExited: base.showTooltip(base.createTooltipText()) diff --git a/resources/qml/Settings/SettingOptionalExtruder.qml b/resources/qml/Settings/SettingOptionalExtruder.qml index ce078551d8..5b1da6b785 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("arrow_bottom") + source: UM.Theme.getIcon("ChevronSingleDown") width: UM.Theme.getSize("standard_arrow").width height: UM.Theme.getSize("standard_arrow").height sourceSize.width: width + 5 * screenScaleFactor @@ -172,7 +172,7 @@ SettingItem sourceSize.width: width sourceSize.height: height - source: UM.Theme.getIcon("extruder_button") + source: UM.Theme.getIcon("Extruder", "medium") color: control.color } } @@ -237,7 +237,7 @@ SettingItem sourceSize.width: width sourceSize.height: height - source: UM.Theme.getIcon("extruder_button") + source: UM.Theme.getIcon("Extruder", "medium") color: control.model.getItem(index).color } } diff --git a/resources/qml/Settings/SettingView.qml b/resources/qml/Settings/SettingView.qml index 9506e70b4b..f038d15ca3 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("cross1") + iconSource: UM.Theme.getIcon("Cancel") 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("menu") + source: UM.Theme.getIcon("Hamburger") } } label: Label {} diff --git a/resources/qml/ViewOrientationControls.qml b/resources/qml/ViewOrientationControls.qml index 97f2bb9400..fc0f20fa77 100644 --- a/resources/qml/ViewOrientationControls.qml +++ b/resources/qml/ViewOrientationControls.qml @@ -18,7 +18,7 @@ Row ViewOrientationButton { - iconSource: UM.Theme.getIcon("view_3d") + iconSource: UM.Theme.getIcon("View3D") onClicked: Cura.Actions.view3DCamera.trigger() UM.TooltipArea @@ -31,7 +31,7 @@ Row ViewOrientationButton { - iconSource: UM.Theme.getIcon("view_front") + iconSource: UM.Theme.getIcon("ViewFront") onClicked: Cura.Actions.viewFrontCamera.trigger() UM.TooltipArea @@ -44,7 +44,7 @@ Row ViewOrientationButton { - iconSource: UM.Theme.getIcon("view_top") + iconSource: UM.Theme.getIcon("ViewTop") onClicked: Cura.Actions.viewTopCamera.trigger() UM.TooltipArea @@ -57,7 +57,7 @@ Row ViewOrientationButton { - iconSource: UM.Theme.getIcon("view_left") + iconSource: UM.Theme.getIcon("ViewLeft") onClicked: Cura.Actions.viewLeftSideCamera.trigger() UM.TooltipArea @@ -70,7 +70,7 @@ Row ViewOrientationButton { - iconSource: UM.Theme.getIcon("view_right") + iconSource: UM.Theme.getIcon("ViewRight") onClicked: Cura.Actions.viewRightSideCamera.trigger() UM.TooltipArea diff --git a/resources/qml/WelcomePages/AddLocalPrinterScrollView.qml b/resources/qml/WelcomePages/AddLocalPrinterScrollView.qml index 68ee482b5c..fb809426f4 100644 --- a/resources/qml/WelcomePages/AddLocalPrinterScrollView.qml +++ b/resources/qml/WelcomePages/AddLocalPrinterScrollView.qml @@ -143,7 +143,7 @@ Item sourceSize.width: width sourceSize.height: height color: UM.Theme.getColor("text") - source: base.currentSection == section ? UM.Theme.getIcon("arrow_bottom") : UM.Theme.getIcon("arrow_right") + source: base.currentSection == section ? UM.Theme.getIcon("ChevronSingleDown") : UM.Theme.getIcon("ChevronSingleRight") } Label diff --git a/resources/qml/WelcomePages/AddNetworkPrinterScrollView.qml b/resources/qml/WelcomePages/AddNetworkPrinterScrollView.qml index 9d79c421bd..5334a15974 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("external_link") + source: UM.Theme.getIcon("LinkExternal") } Label diff --git a/resources/qml/WelcomePages/CloudContent.qml b/resources/qml/WelcomePages/CloudContent.qml index 692ad12a29..26e3a2f87c 100644 --- a/resources/qml/WelcomePages/CloudContent.qml +++ b/resources/qml/WelcomePages/CloudContent.qml @@ -112,7 +112,7 @@ Item anchors.horizontalCenter: parent.horizontalCenter fillMode: Image.PreserveAspectFit width: UM.Theme.getSize("welcome_wizard_cloud_content_image").width - source: UM.Theme.getIcon("package") + source: UM.Theme.getIcon("Plugin") sourceSize.width: width sourceSize.height: height } @@ -142,7 +142,7 @@ Item anchors.horizontalCenter: parent.horizontalCenter fillMode: Image.PreserveAspectFit width: UM.Theme.getSize("welcome_wizard_cloud_content_image").width - source: UM.Theme.getIcon("material_spool") + source: UM.Theme.getIcon("Spool") sourceSize.width: width sourceSize.height: height } @@ -172,7 +172,7 @@ Item anchors.horizontalCenter: communityColumn.horizontalCenter fillMode: Image.PreserveAspectFit width: UM.Theme.getSize("welcome_wizard_cloud_content_image").width - source: UM.Theme.getIcon("group") + source: UM.Theme.getIcon("PrinterTriple", "medium") sourceSize.width: width sourceSize.height: height } diff --git a/resources/qml/WelcomePages/DropDownHeader.qml b/resources/qml/WelcomePages/DropDownHeader.qml index 88da32c879..cb41ca808b 100644 --- a/resources/qml/WelcomePages/DropDownHeader.qml +++ b/resources/qml/WelcomePages/DropDownHeader.qml @@ -27,7 +27,7 @@ Cura.RoundedRectangle cornerSide: contentShown ? Cura.RoundedRectangle.Direction.Up : Cura.RoundedRectangle.Direction.All property string title: "" - property url rightIconSource: UM.Theme.getIcon("arrow_bottom") + property url rightIconSource: UM.Theme.getIcon("ChevronSingleDown") // If the tab is under hovering state property bool hovered: false diff --git a/resources/qml/WelcomePages/DropDownWidget.qml b/resources/qml/WelcomePages/DropDownWidget.qml index 7ec6860c89..b129673905 100644 --- a/resources/qml/WelcomePages/DropDownWidget.qml +++ b/resources/qml/WelcomePages/DropDownWidget.qml @@ -49,7 +49,7 @@ Item anchors.left: parent.left anchors.right: parent.right height: UM.Theme.getSize("expandable_component_content_header").height - rightIconSource: contentShown ? UM.Theme.getIcon("arrow_bottom") : UM.Theme.getIcon("arrow_left") + rightIconSource: contentShown ? UM.Theme.getIcon("ChevronSingleDown") : UM.Theme.getIcon("ChevronSingleLeft") contentShown: base.contentShown } diff --git a/resources/qml/Widgets/CheckBox.qml b/resources/qml/Widgets/CheckBox.qml index f79dc1620e..295283d76e 100644 --- a/resources/qml/Widgets/CheckBox.qml +++ b/resources/qml/Widgets/CheckBox.qml @@ -58,7 +58,7 @@ CheckBox height: Math.round(parent.height / 2.5) sourceSize.height: width color: !enabled ? UM.Theme.getColor("setting_control_disabled_text") : UM.Theme.getColor("setting_control_text") - source: UM.Theme.getIcon("check") + source: UM.Theme.getIcon("Check") opacity: control.checked ? 1 : 0 Behavior on opacity { NumberAnimation { duration: 100; } } } diff --git a/resources/qml/Widgets/ComboBox.qml b/resources/qml/Widgets/ComboBox.qml index 7eb366f0a3..f0ee3bdc00 100644 --- a/resources/qml/Widgets/ComboBox.qml +++ b/resources/qml/Widgets/ComboBox.qml @@ -62,7 +62,7 @@ ComboBox x: control.width - width - control.rightPadding y: control.topPadding + Math.round((control.availableHeight - height) / 2) - source: UM.Theme.getIcon("arrow_bottom") + source: UM.Theme.getIcon("ChevronSingleDown") width: UM.Theme.getSize("standard_arrow").width height: UM.Theme.getSize("standard_arrow").height sourceSize.width: width + 5 * screenScaleFactor diff --git a/resources/themes/cura-dark-colorblind/icons/sign_in_to_cloud.svg b/resources/themes/cura-dark-colorblind/icons/sign_in_to_cloud.svg deleted file mode 100644 index 09ba300b6a..0000000000 --- a/resources/themes/cura-dark-colorblind/icons/sign_in_to_cloud.svg +++ /dev/null @@ -1,16 +0,0 @@ - - - - Group-cloud Copy - Created with Sketch. - - - - - - - - - - - \ No newline at end of file diff --git a/resources/themes/cura-dark/icons/sign_in_to_cloud.svg b/resources/themes/cura-dark/icons/sign_in_to_cloud.svg deleted file mode 100644 index 09ba300b6a..0000000000 --- a/resources/themes/cura-dark/icons/sign_in_to_cloud.svg +++ /dev/null @@ -1,16 +0,0 @@ - - - - Group-cloud Copy - Created with Sketch. - - - - - - - - - - - \ No newline at end of file diff --git a/resources/themes/cura-light-colorblind/icons/sign_in_to_cloud.svg b/resources/themes/cura-light-colorblind/icons/sign_in_to_cloud.svg deleted file mode 100644 index 09ba300b6a..0000000000 --- a/resources/themes/cura-light-colorblind/icons/sign_in_to_cloud.svg +++ /dev/null @@ -1,16 +0,0 @@ - - - - Group-cloud Copy - Created with Sketch. - - - - - - - - - - - \ No newline at end of file diff --git a/resources/themes/cura-light/icons/application.svg b/resources/themes/cura-light/icons/application.svg deleted file mode 100644 index a76323a7d4..0000000000 --- a/resources/themes/cura-light/icons/application.svg +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/resources/themes/cura-light/icons/arrow_bottom.svg b/resources/themes/cura-light/icons/arrow_bottom.svg deleted file mode 100644 index 102f7b54a2..0000000000 --- a/resources/themes/cura-light/icons/arrow_bottom.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/resources/themes/cura-light/icons/arrow_left.svg b/resources/themes/cura-light/icons/arrow_left.svg deleted file mode 100644 index e48cece556..0000000000 --- a/resources/themes/cura-light/icons/arrow_left.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/resources/themes/cura-light/icons/arrow_right.svg b/resources/themes/cura-light/icons/arrow_right.svg deleted file mode 100644 index 6562a3e80b..0000000000 --- a/resources/themes/cura-light/icons/arrow_right.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/resources/themes/cura-light/icons/arrow_top.svg b/resources/themes/cura-light/icons/arrow_top.svg deleted file mode 100644 index 7af5913a32..0000000000 --- a/resources/themes/cura-light/icons/arrow_top.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/resources/themes/cura-light/icons/basic.svg b/resources/themes/cura-light/icons/basic.svg deleted file mode 100644 index b30d0669b3..0000000000 --- a/resources/themes/cura-light/icons/basic.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/resources/themes/cura-light/icons/buildplate.svg b/resources/themes/cura-light/icons/buildplate.svg deleted file mode 100644 index 7505c8204e..0000000000 --- a/resources/themes/cura-light/icons/buildplate.svg +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git a/resources/themes/cura-light/icons/category_adhesion.svg b/resources/themes/cura-light/icons/category_adhesion.svg deleted file mode 100644 index dc119d889a..0000000000 --- a/resources/themes/cura-light/icons/category_adhesion.svg +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - diff --git a/resources/themes/cura-light/icons/category_blackmagic.svg b/resources/themes/cura-light/icons/category_blackmagic.svg deleted file mode 100644 index d4e2b89ba4..0000000000 --- a/resources/themes/cura-light/icons/category_blackmagic.svg +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - ? - - - - - diff --git a/resources/themes/cura-light/icons/category_cool.svg b/resources/themes/cura-light/icons/category_cool.svg deleted file mode 100644 index db74322a2c..0000000000 --- a/resources/themes/cura-light/icons/category_cool.svg +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/resources/themes/cura-light/icons/category_dual.svg b/resources/themes/cura-light/icons/category_dual.svg deleted file mode 100644 index 2a53292379..0000000000 --- a/resources/themes/cura-light/icons/category_dual.svg +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/resources/themes/cura-light/icons/category_experimental.svg b/resources/themes/cura-light/icons/category_experimental.svg deleted file mode 100644 index 9fc7d74880..0000000000 --- a/resources/themes/cura-light/icons/category_experimental.svg +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/resources/themes/cura-light/icons/category_fixes.svg b/resources/themes/cura-light/icons/category_fixes.svg deleted file mode 100644 index 963338088a..0000000000 --- a/resources/themes/cura-light/icons/category_fixes.svg +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/resources/themes/cura-light/icons/category_infill.svg b/resources/themes/cura-light/icons/category_infill.svg deleted file mode 100644 index e1660ca8e2..0000000000 --- a/resources/themes/cura-light/icons/category_infill.svg +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/resources/themes/cura-light/icons/category_layer_height.svg b/resources/themes/cura-light/icons/category_layer_height.svg deleted file mode 100644 index 474e81f14e..0000000000 --- a/resources/themes/cura-light/icons/category_layer_height.svg +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/resources/themes/cura-light/icons/category_machine.svg b/resources/themes/cura-light/icons/category_machine.svg deleted file mode 100644 index 25c84aa4f2..0000000000 --- a/resources/themes/cura-light/icons/category_machine.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/resources/themes/cura-light/icons/category_material.svg b/resources/themes/cura-light/icons/category_material.svg deleted file mode 100644 index 0d8ae42d9d..0000000000 --- a/resources/themes/cura-light/icons/category_material.svg +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/resources/themes/cura-light/icons/category_shell.svg b/resources/themes/cura-light/icons/category_shell.svg deleted file mode 100644 index 61e112d88c..0000000000 --- a/resources/themes/cura-light/icons/category_shell.svg +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - diff --git a/resources/themes/cura-light/icons/category_shield.svg b/resources/themes/cura-light/icons/category_shield.svg deleted file mode 100644 index 99a245936d..0000000000 --- a/resources/themes/cura-light/icons/category_shield.svg +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - diff --git a/resources/themes/cura-light/icons/category_speed.svg b/resources/themes/cura-light/icons/category_speed.svg deleted file mode 100644 index 36d1b3f2e1..0000000000 --- a/resources/themes/cura-light/icons/category_speed.svg +++ /dev/null @@ -1,20 +0,0 @@ - - - - - - - - diff --git a/resources/themes/cura-light/icons/category_support.svg b/resources/themes/cura-light/icons/category_support.svg deleted file mode 100644 index 693e1f5f37..0000000000 --- a/resources/themes/cura-light/icons/category_support.svg +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - diff --git a/resources/themes/cura-light/icons/category_topbottom.svg b/resources/themes/cura-light/icons/category_topbottom.svg deleted file mode 100644 index 7efefbd4bb..0000000000 --- a/resources/themes/cura-light/icons/category_topbottom.svg +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/resources/themes/cura-light/icons/category_travel.svg b/resources/themes/cura-light/icons/category_travel.svg deleted file mode 100644 index 67f5713671..0000000000 --- a/resources/themes/cura-light/icons/category_travel.svg +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/resources/themes/cura-light/icons/category_unknown.svg b/resources/themes/cura-light/icons/category_unknown.svg deleted file mode 100644 index 67f5713671..0000000000 --- a/resources/themes/cura-light/icons/category_unknown.svg +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/resources/themes/cura-light/icons/check.svg b/resources/themes/cura-light/icons/check.svg deleted file mode 100644 index 62b6993763..0000000000 --- a/resources/themes/cura-light/icons/check.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/resources/themes/cura-light/icons/checked.svg b/resources/themes/cura-light/icons/checked.svg deleted file mode 100644 index 22d1278667..0000000000 --- a/resources/themes/cura-light/icons/checked.svg +++ /dev/null @@ -1,12 +0,0 @@ - - - - checked - Created with Sketch. - - - - - - - \ No newline at end of file diff --git a/resources/themes/cura-light/icons/clock.svg b/resources/themes/cura-light/icons/clock.svg deleted file mode 100644 index 0b6cb78881..0000000000 --- a/resources/themes/cura-light/icons/clock.svg +++ /dev/null @@ -1,53 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/resources/themes/cura-light/icons/cross1.svg b/resources/themes/cura-light/icons/cross1.svg deleted file mode 100644 index 63b7a6951c..0000000000 --- a/resources/themes/cura-light/icons/cross1.svg +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/resources/themes/cura-light/icons/cross2.svg b/resources/themes/cura-light/icons/cross2.svg deleted file mode 100644 index 7d4a3a878d..0000000000 --- a/resources/themes/cura-light/icons/cross2.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/resources/themes/cura-light/icons/default/Adhesion.svg b/resources/themes/cura-light/icons/default/Adhesion.svg new file mode 100755 index 0000000000..f43ccdb030 --- /dev/null +++ b/resources/themes/cura-light/icons/default/Adhesion.svg @@ -0,0 +1,13 @@ + + + + + + + + + + + + diff --git a/resources/themes/cura-light/icons/default/ArrowDoubleCircleRight.svg b/resources/themes/cura-light/icons/default/ArrowDoubleCircleRight.svg new file mode 100755 index 0000000000..9c3699e040 --- /dev/null +++ b/resources/themes/cura-light/icons/default/ArrowDoubleCircleRight.svg @@ -0,0 +1,6 @@ + + + + diff --git a/resources/themes/cura-light/icons/default/ArrowFourWay.svg b/resources/themes/cura-light/icons/default/ArrowFourWay.svg new file mode 100755 index 0000000000..5470443441 --- /dev/null +++ b/resources/themes/cura-light/icons/default/ArrowFourWay.svg @@ -0,0 +1,7 @@ + + + + diff --git a/resources/themes/cura-light/icons/default/ArrowReset.svg b/resources/themes/cura-light/icons/default/ArrowReset.svg new file mode 100755 index 0000000000..0283cf67b6 --- /dev/null +++ b/resources/themes/cura-light/icons/default/ArrowReset.svg @@ -0,0 +1,6 @@ + + + + diff --git a/resources/themes/cura-light/icons/default/Bandage.svg b/resources/themes/cura-light/icons/default/Bandage.svg new file mode 100755 index 0000000000..abb13320ca --- /dev/null +++ b/resources/themes/cura-light/icons/default/Bandage.svg @@ -0,0 +1,7 @@ + + + + diff --git a/resources/themes/cura-light/icons/default/BlackMagic.svg b/resources/themes/cura-light/icons/default/BlackMagic.svg new file mode 100755 index 0000000000..f53f54f3dd --- /dev/null +++ b/resources/themes/cura-light/icons/default/BlackMagic.svg @@ -0,0 +1,8 @@ + + + + diff --git a/resources/themes/cura-light/icons/default/BlockSupportOverlaps.svg b/resources/themes/cura-light/icons/default/BlockSupportOverlaps.svg new file mode 100644 index 0000000000..a6d250c80a --- /dev/null +++ b/resources/themes/cura-light/icons/default/BlockSupportOverlaps.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/resources/themes/cura-light/icons/default/Cancel.svg b/resources/themes/cura-light/icons/default/Cancel.svg new file mode 100755 index 0000000000..2646952ce1 --- /dev/null +++ b/resources/themes/cura-light/icons/default/Cancel.svg @@ -0,0 +1,6 @@ + + + + diff --git a/resources/themes/cura-light/icons/default/CancelBlock.svg b/resources/themes/cura-light/icons/default/CancelBlock.svg new file mode 100755 index 0000000000..605839e0bf --- /dev/null +++ b/resources/themes/cura-light/icons/default/CancelBlock.svg @@ -0,0 +1,8 @@ + + + + + + + diff --git a/resources/themes/cura-light/icons/default/CancelCircle.svg b/resources/themes/cura-light/icons/default/CancelCircle.svg new file mode 100755 index 0000000000..dc541f2d54 --- /dev/null +++ b/resources/themes/cura-light/icons/default/CancelCircle.svg @@ -0,0 +1,7 @@ + + + + diff --git a/resources/themes/cura-light/icons/default/Check.svg b/resources/themes/cura-light/icons/default/Check.svg new file mode 100755 index 0000000000..17e290a38b --- /dev/null +++ b/resources/themes/cura-light/icons/default/Check.svg @@ -0,0 +1,5 @@ + + + + diff --git a/resources/themes/cura-light/icons/default/CheckCircle.svg b/resources/themes/cura-light/icons/default/CheckCircle.svg new file mode 100755 index 0000000000..aac1a50b95 --- /dev/null +++ b/resources/themes/cura-light/icons/default/CheckCircle.svg @@ -0,0 +1,9 @@ + + + + + + + diff --git a/resources/themes/cura-light/icons/default/ChevronSingleDown.svg b/resources/themes/cura-light/icons/default/ChevronSingleDown.svg new file mode 100755 index 0000000000..3d6018ada0 --- /dev/null +++ b/resources/themes/cura-light/icons/default/ChevronSingleDown.svg @@ -0,0 +1,5 @@ + + + + diff --git a/resources/themes/cura-light/icons/default/ChevronSingleLeft.svg b/resources/themes/cura-light/icons/default/ChevronSingleLeft.svg new file mode 100755 index 0000000000..25d41e2ef5 --- /dev/null +++ b/resources/themes/cura-light/icons/default/ChevronSingleLeft.svg @@ -0,0 +1,5 @@ + + + + diff --git a/resources/themes/cura-light/icons/default/ChevronSingleRight.svg b/resources/themes/cura-light/icons/default/ChevronSingleRight.svg new file mode 100755 index 0000000000..099ca58e67 --- /dev/null +++ b/resources/themes/cura-light/icons/default/ChevronSingleRight.svg @@ -0,0 +1,5 @@ + + + + diff --git a/resources/themes/cura-light/icons/default/ChevronSingleUp.svg b/resources/themes/cura-light/icons/default/ChevronSingleUp.svg new file mode 100755 index 0000000000..1575d25ed5 --- /dev/null +++ b/resources/themes/cura-light/icons/default/ChevronSingleUp.svg @@ -0,0 +1,5 @@ + + + + diff --git a/resources/themes/cura-light/icons/circle_outline.svg b/resources/themes/cura-light/icons/default/CircleOutline.svg similarity index 100% rename from resources/themes/cura-light/icons/circle_outline.svg rename to resources/themes/cura-light/icons/default/CircleOutline.svg diff --git a/resources/themes/cura-light/icons/default/Clock.svg b/resources/themes/cura-light/icons/default/Clock.svg new file mode 100755 index 0000000000..9bdc8252aa --- /dev/null +++ b/resources/themes/cura-light/icons/default/Clock.svg @@ -0,0 +1,6 @@ + + + + diff --git a/resources/themes/cura-light/icons/default/Cloud.svg b/resources/themes/cura-light/icons/default/Cloud.svg new file mode 100755 index 0000000000..df0a4560c8 --- /dev/null +++ b/resources/themes/cura-light/icons/default/Cloud.svg @@ -0,0 +1,7 @@ + + + + diff --git a/resources/themes/cura-light/icons/default/DualExtrusion.svg b/resources/themes/cura-light/icons/default/DualExtrusion.svg new file mode 100755 index 0000000000..18b991ad44 --- /dev/null +++ b/resources/themes/cura-light/icons/default/DualExtrusion.svg @@ -0,0 +1,10 @@ + + + + + + + + + diff --git a/resources/themes/cura-light/icons/default/Experiment.svg b/resources/themes/cura-light/icons/default/Experiment.svg new file mode 100755 index 0000000000..75201d92f7 --- /dev/null +++ b/resources/themes/cura-light/icons/default/Experiment.svg @@ -0,0 +1,8 @@ + + + + + + diff --git a/resources/themes/cura-light/icons/default/Eye.svg b/resources/themes/cura-light/icons/default/Eye.svg new file mode 100755 index 0000000000..a45a0fed40 --- /dev/null +++ b/resources/themes/cura-light/icons/default/Eye.svg @@ -0,0 +1,7 @@ + + + + diff --git a/resources/themes/cura-light/icons/default/Fan.svg b/resources/themes/cura-light/icons/default/Fan.svg new file mode 100755 index 0000000000..7e984250b9 --- /dev/null +++ b/resources/themes/cura-light/icons/default/Fan.svg @@ -0,0 +1,9 @@ + + + + diff --git a/resources/themes/cura-light/icons/default/Folder.svg b/resources/themes/cura-light/icons/default/Folder.svg new file mode 100755 index 0000000000..32ffd27cfe --- /dev/null +++ b/resources/themes/cura-light/icons/default/Folder.svg @@ -0,0 +1,6 @@ + + + + diff --git a/resources/themes/cura-light/icons/default/Formula.svg b/resources/themes/cura-light/icons/default/Formula.svg new file mode 100755 index 0000000000..2d89dd7df0 --- /dev/null +++ b/resources/themes/cura-light/icons/default/Formula.svg @@ -0,0 +1,9 @@ + + + + + + + diff --git a/resources/themes/cura-light/icons/default/Function.svg b/resources/themes/cura-light/icons/default/Function.svg new file mode 100644 index 0000000000..8c3e9c883d --- /dev/null +++ b/resources/themes/cura-light/icons/default/Function.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/resources/themes/cura-light/icons/default/Guide.svg b/resources/themes/cura-light/icons/default/Guide.svg new file mode 100755 index 0000000000..358a8864a4 --- /dev/null +++ b/resources/themes/cura-light/icons/default/Guide.svg @@ -0,0 +1,9 @@ + + + + + + diff --git a/resources/themes/cura-light/icons/default/Hamburger.svg b/resources/themes/cura-light/icons/default/Hamburger.svg new file mode 100755 index 0000000000..ed83977773 --- /dev/null +++ b/resources/themes/cura-light/icons/default/Hamburger.svg @@ -0,0 +1,9 @@ + + + + + + + + diff --git a/resources/themes/cura-light/icons/default/House.svg b/resources/themes/cura-light/icons/default/House.svg new file mode 100755 index 0000000000..b44362a061 --- /dev/null +++ b/resources/themes/cura-light/icons/default/House.svg @@ -0,0 +1,6 @@ + + + + diff --git a/resources/themes/cura-light/icons/default/Infill0.svg b/resources/themes/cura-light/icons/default/Infill0.svg new file mode 100755 index 0000000000..d33ab09dda --- /dev/null +++ b/resources/themes/cura-light/icons/default/Infill0.svg @@ -0,0 +1,5 @@ + + + + diff --git a/resources/themes/cura-light/icons/default/Infill1.svg b/resources/themes/cura-light/icons/default/Infill1.svg new file mode 100755 index 0000000000..1d31070389 --- /dev/null +++ b/resources/themes/cura-light/icons/default/Infill1.svg @@ -0,0 +1,9 @@ + + + + diff --git a/resources/themes/cura-light/icons/default/Infill2.svg b/resources/themes/cura-light/icons/default/Infill2.svg new file mode 100755 index 0000000000..67de5e5eec --- /dev/null +++ b/resources/themes/cura-light/icons/default/Infill2.svg @@ -0,0 +1,8 @@ + + + + diff --git a/resources/themes/cura-light/icons/default/Infill3.svg b/resources/themes/cura-light/icons/default/Infill3.svg new file mode 100755 index 0000000000..19292cd230 --- /dev/null +++ b/resources/themes/cura-light/icons/default/Infill3.svg @@ -0,0 +1,6 @@ + + + + diff --git a/resources/themes/cura-light/icons/default/InfillGradual.svg b/resources/themes/cura-light/icons/default/InfillGradual.svg new file mode 100755 index 0000000000..28ad18fbf7 --- /dev/null +++ b/resources/themes/cura-light/icons/default/InfillGradual.svg @@ -0,0 +1,7 @@ + + + + diff --git a/resources/themes/cura-light/icons/default/Information.svg b/resources/themes/cura-light/icons/default/Information.svg new file mode 100755 index 0000000000..980167c73f --- /dev/null +++ b/resources/themes/cura-light/icons/default/Information.svg @@ -0,0 +1,6 @@ + + + + diff --git a/resources/themes/cura-light/icons/default/LayFlat.svg b/resources/themes/cura-light/icons/default/LayFlat.svg new file mode 100755 index 0000000000..d66062da43 --- /dev/null +++ b/resources/themes/cura-light/icons/default/LayFlat.svg @@ -0,0 +1,9 @@ + + + + + + + diff --git a/resources/themes/cura-light/icons/default/LayFlatOnFace.svg b/resources/themes/cura-light/icons/default/LayFlatOnFace.svg new file mode 100755 index 0000000000..1f2b42f6fe --- /dev/null +++ b/resources/themes/cura-light/icons/default/LayFlatOnFace.svg @@ -0,0 +1,6 @@ + + + + diff --git a/resources/themes/cura-light/icons/default/Layers.svg b/resources/themes/cura-light/icons/default/Layers.svg new file mode 100755 index 0000000000..b4f488f007 --- /dev/null +++ b/resources/themes/cura-light/icons/default/Layers.svg @@ -0,0 +1,10 @@ + + + + + + + diff --git a/resources/themes/cura-light/icons/default/Lightning.svg b/resources/themes/cura-light/icons/default/Lightning.svg new file mode 100644 index 0000000000..544fe86df1 --- /dev/null +++ b/resources/themes/cura-light/icons/default/Lightning.svg @@ -0,0 +1,10 @@ + + + + + + + + diff --git a/resources/themes/cura-light/icons/default/Link.svg b/resources/themes/cura-light/icons/default/Link.svg new file mode 100755 index 0000000000..477d977f50 --- /dev/null +++ b/resources/themes/cura-light/icons/default/Link.svg @@ -0,0 +1,9 @@ + + + + diff --git a/resources/themes/cura-light/icons/default/LinkExternal.svg b/resources/themes/cura-light/icons/default/LinkExternal.svg new file mode 100755 index 0000000000..57e9079a30 --- /dev/null +++ b/resources/themes/cura-light/icons/default/LinkExternal.svg @@ -0,0 +1,6 @@ + + + + diff --git a/resources/themes/cura-light/icons/default/Magnifier.svg b/resources/themes/cura-light/icons/default/Magnifier.svg new file mode 100755 index 0000000000..5edba462f1 --- /dev/null +++ b/resources/themes/cura-light/icons/default/Magnifier.svg @@ -0,0 +1,6 @@ + + + + diff --git a/resources/themes/cura-light/icons/default/MeshType.svg b/resources/themes/cura-light/icons/default/MeshType.svg new file mode 100755 index 0000000000..fa164ef885 --- /dev/null +++ b/resources/themes/cura-light/icons/default/MeshType.svg @@ -0,0 +1,12 @@ + + + + + + + + + + + diff --git a/resources/themes/cura-light/icons/default/MeshTypeIntersect.svg b/resources/themes/cura-light/icons/default/MeshTypeIntersect.svg new file mode 100755 index 0000000000..0f98747442 --- /dev/null +++ b/resources/themes/cura-light/icons/default/MeshTypeIntersect.svg @@ -0,0 +1,5 @@ + + + + diff --git a/resources/themes/cura-light/icons/default/MeshTypeNormal.svg b/resources/themes/cura-light/icons/default/MeshTypeNormal.svg new file mode 100755 index 0000000000..d33ab09dda --- /dev/null +++ b/resources/themes/cura-light/icons/default/MeshTypeNormal.svg @@ -0,0 +1,5 @@ + + + + diff --git a/resources/themes/cura-light/icons/default/MeshTypeSupport.svg b/resources/themes/cura-light/icons/default/MeshTypeSupport.svg new file mode 100755 index 0000000000..e9a6d5b095 --- /dev/null +++ b/resources/themes/cura-light/icons/default/MeshTypeSupport.svg @@ -0,0 +1,11 @@ + + + + + + + + + + diff --git a/resources/themes/cura-light/icons/default/Minus.svg b/resources/themes/cura-light/icons/default/Minus.svg new file mode 100755 index 0000000000..ebb380a3fa --- /dev/null +++ b/resources/themes/cura-light/icons/default/Minus.svg @@ -0,0 +1,5 @@ + + + + diff --git a/resources/themes/cura-light/icons/default/Mirror.svg b/resources/themes/cura-light/icons/default/Mirror.svg new file mode 100755 index 0000000000..cec1fddc84 --- /dev/null +++ b/resources/themes/cura-light/icons/default/Mirror.svg @@ -0,0 +1,13 @@ + + + + + + + + + + + + diff --git a/resources/themes/cura-light/icons/default/Pen.svg b/resources/themes/cura-light/icons/default/Pen.svg new file mode 100755 index 0000000000..bf57f90e6f --- /dev/null +++ b/resources/themes/cura-light/icons/default/Pen.svg @@ -0,0 +1,5 @@ + + + + diff --git a/resources/themes/cura-light/icons/default/Plugin.svg b/resources/themes/cura-light/icons/default/Plugin.svg new file mode 100755 index 0000000000..95db5e876a --- /dev/null +++ b/resources/themes/cura-light/icons/default/Plugin.svg @@ -0,0 +1,6 @@ + + + + diff --git a/resources/themes/cura-light/icons/default/Plus.svg b/resources/themes/cura-light/icons/default/Plus.svg new file mode 100755 index 0000000000..ec8319b336 --- /dev/null +++ b/resources/themes/cura-light/icons/default/Plus.svg @@ -0,0 +1,5 @@ + + + + diff --git a/resources/themes/cura-light/icons/default/PrintQuality.svg b/resources/themes/cura-light/icons/default/PrintQuality.svg new file mode 100755 index 0000000000..59eeb25c1e --- /dev/null +++ b/resources/themes/cura-light/icons/default/PrintQuality.svg @@ -0,0 +1,9 @@ + + + + + + + + diff --git a/resources/themes/cura-light/icons/default/PrintShell.svg b/resources/themes/cura-light/icons/default/PrintShell.svg new file mode 100755 index 0000000000..66291153a2 --- /dev/null +++ b/resources/themes/cura-light/icons/default/PrintShell.svg @@ -0,0 +1,16 @@ + + + + + + + + + + + + + + diff --git a/resources/themes/cura-light/icons/default/PrintTopBottom.svg b/resources/themes/cura-light/icons/default/PrintTopBottom.svg new file mode 100644 index 0000000000..2ac2e241e0 --- /dev/null +++ b/resources/themes/cura-light/icons/default/PrintTopBottom.svg @@ -0,0 +1,10 @@ + + + + + + + + + + diff --git a/resources/themes/cura-light/icons/default/PrintTravel.svg b/resources/themes/cura-light/icons/default/PrintTravel.svg new file mode 100755 index 0000000000..cd2f5a8602 --- /dev/null +++ b/resources/themes/cura-light/icons/default/PrintTravel.svg @@ -0,0 +1,9 @@ + + + + + + + diff --git a/resources/themes/cura-light/icons/default/Printer.svg b/resources/themes/cura-light/icons/default/Printer.svg new file mode 100755 index 0000000000..f5f1a50cce --- /dev/null +++ b/resources/themes/cura-light/icons/default/Printer.svg @@ -0,0 +1,5 @@ + + + + diff --git a/resources/themes/cura-light/icons/default/PrinterTriple.svg b/resources/themes/cura-light/icons/default/PrinterTriple.svg new file mode 100755 index 0000000000..4530fad98e --- /dev/null +++ b/resources/themes/cura-light/icons/default/PrinterTriple.svg @@ -0,0 +1,10 @@ + + + + + + + + + diff --git a/resources/themes/cura-light/icons/default/Quick.svg b/resources/themes/cura-light/icons/default/Quick.svg new file mode 100755 index 0000000000..25a5ee0af5 --- /dev/null +++ b/resources/themes/cura-light/icons/default/Quick.svg @@ -0,0 +1,16 @@ + + + + + + + + + + + + + + + diff --git a/resources/themes/cura-light/icons/default/Rotate.svg b/resources/themes/cura-light/icons/default/Rotate.svg new file mode 100755 index 0000000000..0b294e399b --- /dev/null +++ b/resources/themes/cura-light/icons/default/Rotate.svg @@ -0,0 +1,18 @@ + + + + + + + + + + + + diff --git a/resources/themes/cura-light/icons/default/Scale.svg b/resources/themes/cura-light/icons/default/Scale.svg new file mode 100755 index 0000000000..35ae3ceb86 --- /dev/null +++ b/resources/themes/cura-light/icons/default/Scale.svg @@ -0,0 +1,8 @@ + + + + + + + diff --git a/resources/themes/cura-light/icons/default/ScaleMax.svg b/resources/themes/cura-light/icons/default/ScaleMax.svg new file mode 100755 index 0000000000..ea264786d3 --- /dev/null +++ b/resources/themes/cura-light/icons/default/ScaleMax.svg @@ -0,0 +1,8 @@ + + + + + + + diff --git a/resources/themes/cura-light/icons/default/Shield.svg b/resources/themes/cura-light/icons/default/Shield.svg new file mode 100755 index 0000000000..d44cf8ea73 --- /dev/null +++ b/resources/themes/cura-light/icons/default/Shield.svg @@ -0,0 +1,6 @@ + + + + diff --git a/resources/themes/cura-light/icons/default/Sliders.svg b/resources/themes/cura-light/icons/default/Sliders.svg new file mode 100755 index 0000000000..3b81f79e2b --- /dev/null +++ b/resources/themes/cura-light/icons/default/Sliders.svg @@ -0,0 +1,9 @@ + + + + diff --git a/resources/themes/cura-light/icons/solid.svg b/resources/themes/cura-light/icons/default/Solid.svg similarity index 100% rename from resources/themes/cura-light/icons/solid.svg rename to resources/themes/cura-light/icons/default/Solid.svg diff --git a/resources/themes/cura-light/icons/default/SpeedOMeter.svg b/resources/themes/cura-light/icons/default/SpeedOMeter.svg new file mode 100755 index 0000000000..334ccb2309 --- /dev/null +++ b/resources/themes/cura-light/icons/default/SpeedOMeter.svg @@ -0,0 +1,8 @@ + + + + diff --git a/resources/themes/cura-light/icons/default/Spool.svg b/resources/themes/cura-light/icons/default/Spool.svg new file mode 100755 index 0000000000..aee874de6b --- /dev/null +++ b/resources/themes/cura-light/icons/default/Spool.svg @@ -0,0 +1,8 @@ + + + + diff --git a/resources/themes/cura-light/icons/default/Sputnik.svg b/resources/themes/cura-light/icons/default/Sputnik.svg new file mode 100755 index 0000000000..4b8341b0c5 --- /dev/null +++ b/resources/themes/cura-light/icons/default/Sputnik.svg @@ -0,0 +1,10 @@ + + + + diff --git a/resources/themes/cura-light/icons/default/Star.svg b/resources/themes/cura-light/icons/default/Star.svg new file mode 100755 index 0000000000..3a23b9a1f3 --- /dev/null +++ b/resources/themes/cura-light/icons/default/Star.svg @@ -0,0 +1,6 @@ + + + + diff --git a/resources/themes/cura-light/icons/default/StarFilled.svg b/resources/themes/cura-light/icons/default/StarFilled.svg new file mode 100755 index 0000000000..a0c7256800 --- /dev/null +++ b/resources/themes/cura-light/icons/default/StarFilled.svg @@ -0,0 +1,5 @@ + + + + diff --git a/resources/themes/cura-light/icons/default/Support.svg b/resources/themes/cura-light/icons/default/Support.svg new file mode 100755 index 0000000000..095e29547d --- /dev/null +++ b/resources/themes/cura-light/icons/default/Support.svg @@ -0,0 +1,13 @@ + + + + + + + + + + + diff --git a/resources/themes/cura-light/icons/default/SupportBlocker.svg b/resources/themes/cura-light/icons/default/SupportBlocker.svg new file mode 100755 index 0000000000..cd00c2c985 --- /dev/null +++ b/resources/themes/cura-light/icons/default/SupportBlocker.svg @@ -0,0 +1,12 @@ + + + + + + + + + + diff --git a/resources/themes/cura-light/icons/default/ThreeDots.svg b/resources/themes/cura-light/icons/default/ThreeDots.svg new file mode 100755 index 0000000000..51e7214cbb --- /dev/null +++ b/resources/themes/cura-light/icons/default/ThreeDots.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/resources/themes/cura-light/icons/default/UltimakerCura.svg b/resources/themes/cura-light/icons/default/UltimakerCura.svg new file mode 100755 index 0000000000..d691f27bdd --- /dev/null +++ b/resources/themes/cura-light/icons/default/UltimakerCura.svg @@ -0,0 +1,8 @@ + + + + + + + diff --git a/resources/themes/cura-light/icons/default/View3D.svg b/resources/themes/cura-light/icons/default/View3D.svg new file mode 100755 index 0000000000..5dd5146a24 --- /dev/null +++ b/resources/themes/cura-light/icons/default/View3D.svg @@ -0,0 +1,7 @@ + + + + diff --git a/resources/themes/cura-light/icons/default/ViewFront.svg b/resources/themes/cura-light/icons/default/ViewFront.svg new file mode 100755 index 0000000000..8161a687b3 --- /dev/null +++ b/resources/themes/cura-light/icons/default/ViewFront.svg @@ -0,0 +1,6 @@ + + + + diff --git a/resources/themes/cura-light/icons/default/ViewLeft.svg b/resources/themes/cura-light/icons/default/ViewLeft.svg new file mode 100755 index 0000000000..db84384ae9 --- /dev/null +++ b/resources/themes/cura-light/icons/default/ViewLeft.svg @@ -0,0 +1,6 @@ + + + + diff --git a/resources/themes/cura-light/icons/default/ViewRight.svg b/resources/themes/cura-light/icons/default/ViewRight.svg new file mode 100755 index 0000000000..2212dc9ee1 --- /dev/null +++ b/resources/themes/cura-light/icons/default/ViewRight.svg @@ -0,0 +1,6 @@ + + + + diff --git a/resources/themes/cura-light/icons/default/ViewTop.svg b/resources/themes/cura-light/icons/default/ViewTop.svg new file mode 100755 index 0000000000..c70e3f0d81 --- /dev/null +++ b/resources/themes/cura-light/icons/default/ViewTop.svg @@ -0,0 +1,6 @@ + + + + diff --git a/resources/themes/cura-light/icons/default/Warning.svg b/resources/themes/cura-light/icons/default/Warning.svg new file mode 100755 index 0000000000..6105030fe6 --- /dev/null +++ b/resources/themes/cura-light/icons/default/Warning.svg @@ -0,0 +1,6 @@ + + + + diff --git a/resources/themes/cura-light/icons/dense.svg b/resources/themes/cura-light/icons/dense.svg deleted file mode 100644 index a8f65fecc7..0000000000 --- a/resources/themes/cura-light/icons/dense.svg +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/resources/themes/cura-light/icons/deprecated_icons.json b/resources/themes/cura-light/icons/deprecated_icons.json new file mode 100644 index 0000000000..df286cffc7 --- /dev/null +++ b/resources/themes/cura-light/icons/deprecated_icons.json @@ -0,0 +1,306 @@ +{ + "notice": { + "new_icon": "Information", + "size": "default" + }, + "info": { + "new_icon": "Information", + "size": "default" + }, + "plus": { + "new_icon": "Plus", + "size": "default" + }, + "cross1": { + "new_icon": "Cancel", + "size": "default" + }, + "application": { + "new_icon": "UltimakerCura", + "size": "default" + }, + "printer_single": { + "new_icon": "Printer", + "size": "default" + }, + "category_material": { + "new_icon": "Spool", + "size": "default" + }, + "settings": { + "new_icon": "Sliders", + "size": "default" + }, + "plugin": { + "new_icon": "Plugin", + "size": "default" + }, + "external_link": { + "new_icon": "LinkExternal", + "size": "default" + }, + "arrow_top": { + "new_icon": "ChevronSingleUp", + "size": "default" + }, + "arrow_bottom": { + "new_icon": "ChevronSingleDown", + "size": "default" + }, + "arrow_right": { + "new_icon": "ChevronSingleRight", + "size": "default" + }, + "pos_normal": { + "new_icon": "Infill0", + "size": "default" + }, + "pos_print_as_support": { + "new_icon": "MeshTypeSupport", + "size": "default" + }, + "pos_modify_overlaps": { + "new_icon": "MeshTypeIntersect", + "size": "default" + }, + "pos_modify_dont_support_overlap": { + "new_icon": "BlockSupportOverlaps", + "size": "default" + }, + "minus": { + "new_icon": "Minus", + "size": "default" + }, + "load": { + "new_icon": "Folder", + "size": "default" + }, + "extruder_button": { + "new_icon": "Extruder", + "size": "medium" + }, + "category_adhesion": { + "new_icon": "Adhesion", + "size": "default" + }, + "category_machine": { + "new_icon": "Printer", + "size": "default" + }, + "category_layer_height": { + "new_icon": "PrintQuality", + "size": "default" + }, + "category_shell": { + "new_icon": "PrintShell", + "size": "default" + }, + "category_topbottom": { + "new_icon": "PrintTopBottom", + "size": "default" + }, + "category_infill": { + "new_icon": "Infill1", + "size": "default" + }, + "category_speed": { + "new_icon": "SpeedOMeter", + "size": "default" + }, + "category_travel": { + "new_icon": "PrintTravel", + "size": "default" + }, + "category_cool": { + "new_icon": "Fan", + "size": "default" + }, + "category_support": { + "new_icon": "Support", + "size": "default" + }, + "category_dual": { + "new_icon": "DualExtrusion", + "size": "default" + }, + "category_fixes": { + "new_icon": "Bandage", + "size": "default" + }, + "category_blackmagic": { + "new_icon": "BlackMagic", + "size": "default" + }, + "category_experimental": { + "new_icon": "Experiment", + "size": "default" + }, + "circle_outline": { + "new_icon": "CircleOutline", + "size": "default" + }, + "update": { + "new_icon": "ArrowDoubleCircleRight", + "size": "default" + }, + "checked": { + "new_icon": "CheckCircle", + "size": "default" + }, + "warning_light": { + "new_icon": "Warning", + "size": "default" + }, + "clock": { + "new_icon": "Clock", + "size": "default" + }, + "spool": { + "new_icon": "Spool", + "size": "default" + }, + "warning": { + "new_icon": "Warning", + "size": "default" + }, + "check": { + "new_icon": "Check", + "size": "default" + }, + "pencil": { + "new_icon": "Pencil", + "size": "default" + }, + "printing_guideline": { + "new_icon": "Guide", + "size": "default" + }, + "favorites_star_full": { + "new_icon": "StarFilled", + "size": "default" + }, + "favorites_star_empty": { + "new_icon": "Star", + "size": "default" + }, + "resize": { + "new_icon": "ThreeDots", + "size": "default" + }, + "gradual": { + "new_icon": "InfillGradual", + "size": "default" + }, + "hollow": { + "new_icon": "Infill0", + "size": "default" + }, + "sparse": { + "new_icon": "Infill3", + "size": "default" + }, + "dense": { + "new_icon": "Infill2", + "size": "default" + }, + "solid": { + "new_icon": "Solid", + "size": "default" + }, + "reset": { + "new_icon": "ArrowReset", + "size": "default" + }, + "arrow_left": { + "new_icon": "ChevronSingleLeft", + "size": "default" + }, + "home": { + "new_icon": "House", + "size": "default" + }, + "printer_group": { + "new_icon": "PrinterTriple", + "size": "medium" + }, + "formula": { + "new_icon": "Function", + "size": "default" + }, + "search": { + "new_icon": "Magnifier", + "size": "default" + }, + "menu": { + "new_icon": "Hamburger", + "size": "default" + }, + "view_3d": { + "new_icon": "View3D", + "size": "default" + }, + "view_layer": { + "new_icon": "Layers", + "size": "default" + }, + "view_front": { + "new_icon": "ViewFront", + "size": "default" + }, + "view_top": { + "new_icon": "ViewTop", + "size": "default" + }, + "view_left": { + "new_icon": "ViewLeft", + "size": "default" + }, + "view_right": { + "new_icon": "ViewRight", + "size": "default" + }, + "package": { + "new_icon": "Plugin", + "size": "default" + }, + "material_spool": { + "new_icon": "Spool", + "size": "default" + }, + "dot": { + "new_icon": "Dot", + "size": "low" + }, + "mirror": { + "new_icon": "Mirror", + "size": "default" + }, + "rotate_reset": { + "new_icon": "ArrowReset", + "size": "default" + }, + "rotate_layflat": { + "new_icon": "LayFlat", + "size": "default" + }, + "rotate_face_layflat": { + "new_icon": "LayFlatOnFace", + "size": "default" + }, + "rotate": { + "new_icon": "Rotate", + "size": "default" + }, + "scale_reset": { + "new_icon": "ArrowReset", + "size": "default" + }, + "scale": { + "new_icon": "Scale", + "size": "default" + }, + "translate": { + "new_icon": "ArrowFourWay", + "size": "default" + } +} \ No newline at end of file diff --git a/resources/themes/cura-light/icons/drop_down_button.svg b/resources/themes/cura-light/icons/drop_down_button.svg deleted file mode 100644 index 18748e6d70..0000000000 --- a/resources/themes/cura-light/icons/drop_down_button.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file diff --git a/resources/themes/cura-light/icons/external_link.svg b/resources/themes/cura-light/icons/external_link.svg deleted file mode 100644 index a2130fb97b..0000000000 --- a/resources/themes/cura-light/icons/external_link.svg +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/resources/themes/cura-light/icons/extruder_button.svg b/resources/themes/cura-light/icons/extruder_button.svg deleted file mode 100644 index c79ba5c5df..0000000000 --- a/resources/themes/cura-light/icons/extruder_button.svg +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git a/resources/themes/cura-light/icons/favorites_star_empty.svg b/resources/themes/cura-light/icons/favorites_star_empty.svg deleted file mode 100644 index bb1205e7a7..0000000000 --- a/resources/themes/cura-light/icons/favorites_star_empty.svg +++ /dev/null @@ -1,8 +0,0 @@ - - - - - diff --git a/resources/themes/cura-light/icons/favorites_star_full.svg b/resources/themes/cura-light/icons/favorites_star_full.svg deleted file mode 100644 index aad45c5d02..0000000000 --- a/resources/themes/cura-light/icons/favorites_star_full.svg +++ /dev/null @@ -1,6 +0,0 @@ - - - - - diff --git a/resources/themes/cura-light/icons/formula.svg b/resources/themes/cura-light/icons/formula.svg deleted file mode 100644 index ae810bc014..0000000000 --- a/resources/themes/cura-light/icons/formula.svg +++ /dev/null @@ -1,53 +0,0 @@ - - - - - - image/svg+xml - - - - - - - - diff --git a/resources/themes/cura-light/icons/gradual.svg b/resources/themes/cura-light/icons/gradual.svg deleted file mode 100644 index ed7f301e18..0000000000 --- a/resources/themes/cura-light/icons/gradual.svg +++ /dev/null @@ -1,102 +0,0 @@ - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - diff --git a/resources/themes/cura-light/icons/group.svg b/resources/themes/cura-light/icons/group.svg deleted file mode 100644 index 0debb0f300..0000000000 --- a/resources/themes/cura-light/icons/group.svg +++ /dev/null @@ -1,12 +0,0 @@ - - - - - diff --git a/resources/themes/cura-light/icons/hollow.svg b/resources/themes/cura-light/icons/hollow.svg deleted file mode 100644 index a63bfd9bfc..0000000000 --- a/resources/themes/cura-light/icons/hollow.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/resources/themes/cura-light/icons/home.svg b/resources/themes/cura-light/icons/home.svg deleted file mode 100644 index a355aa07f6..0000000000 --- a/resources/themes/cura-light/icons/home.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/resources/themes/cura-light/icons/info.svg b/resources/themes/cura-light/icons/info.svg deleted file mode 100644 index 9896b3dac8..0000000000 --- a/resources/themes/cura-light/icons/info.svg +++ /dev/null @@ -1,13 +0,0 @@ - - - - Icon/ info - Created with Sketch. - - - - - - - - \ No newline at end of file diff --git a/resources/themes/cura-light/icons/link.svg b/resources/themes/cura-light/icons/link.svg deleted file mode 100644 index 12b3abbe73..0000000000 --- a/resources/themes/cura-light/icons/link.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/resources/themes/cura-light/icons/load.svg b/resources/themes/cura-light/icons/load.svg deleted file mode 100644 index 7b3e966634..0000000000 --- a/resources/themes/cura-light/icons/load.svg +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/resources/themes/cura-light/icons/low/CheckBlueBG.svg b/resources/themes/cura-light/icons/low/CheckBlueBG.svg new file mode 100644 index 0000000000..a4c403598a --- /dev/null +++ b/resources/themes/cura-light/icons/low/CheckBlueBG.svg @@ -0,0 +1,8 @@ + + + + + diff --git a/resources/themes/cura-light/icons/low/CloudBlueBG.svg b/resources/themes/cura-light/icons/low/CloudBlueBG.svg new file mode 100644 index 0000000000..7a43843dfd --- /dev/null +++ b/resources/themes/cura-light/icons/low/CloudBlueBG.svg @@ -0,0 +1,9 @@ + + + + + diff --git a/resources/themes/cura-light/icons/low/CloudGreyBG.svg b/resources/themes/cura-light/icons/low/CloudGreyBG.svg new file mode 100644 index 0000000000..aa2bba0467 --- /dev/null +++ b/resources/themes/cura-light/icons/low/CloudGreyBG.svg @@ -0,0 +1,9 @@ + + + + + diff --git a/resources/themes/cura-light/icons/dot.svg b/resources/themes/cura-light/icons/low/Dot.svg similarity index 100% rename from resources/themes/cura-light/icons/dot.svg rename to resources/themes/cura-light/icons/low/Dot.svg diff --git a/resources/themes/cura-light/icons/material_spool.svg b/resources/themes/cura-light/icons/material_spool.svg deleted file mode 100644 index 66cc02a57b..0000000000 --- a/resources/themes/cura-light/icons/material_spool.svg +++ /dev/null @@ -1,8 +0,0 @@ - - - - - diff --git a/resources/themes/cura-light/icons/medium/Extruder.svg b/resources/themes/cura-light/icons/medium/Extruder.svg new file mode 100644 index 0000000000..1849e8bfdd --- /dev/null +++ b/resources/themes/cura-light/icons/medium/Extruder.svg @@ -0,0 +1,14 @@ + + + + + + + + + + + + diff --git a/resources/themes/cura-light/icons/medium/PrinterTriple.svg b/resources/themes/cura-light/icons/medium/PrinterTriple.svg new file mode 100644 index 0000000000..9226bdfe11 --- /dev/null +++ b/resources/themes/cura-light/icons/medium/PrinterTriple.svg @@ -0,0 +1,14 @@ + + + + + + + + + + + + + diff --git a/resources/themes/cura-light/icons/menu.svg b/resources/themes/cura-light/icons/menu.svg deleted file mode 100644 index 85fbfb072c..0000000000 --- a/resources/themes/cura-light/icons/menu.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/resources/themes/cura-light/icons/minus.svg b/resources/themes/cura-light/icons/minus.svg deleted file mode 100644 index 22f2d2910d..0000000000 --- a/resources/themes/cura-light/icons/minus.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/resources/themes/cura-light/icons/mirror.svg b/resources/themes/cura-light/icons/mirror.svg deleted file mode 100644 index 2a53292379..0000000000 --- a/resources/themes/cura-light/icons/mirror.svg +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/resources/themes/cura-light/icons/notice.svg b/resources/themes/cura-light/icons/notice.svg deleted file mode 100644 index 36154d6729..0000000000 --- a/resources/themes/cura-light/icons/notice.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file diff --git a/resources/themes/cura-light/icons/pencil.svg b/resources/themes/cura-light/icons/pencil.svg deleted file mode 100644 index d17c09884d..0000000000 --- a/resources/themes/cura-light/icons/pencil.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/resources/themes/cura-light/icons/play.svg b/resources/themes/cura-light/icons/play.svg deleted file mode 100644 index 04aea11a9b..0000000000 --- a/resources/themes/cura-light/icons/play.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file diff --git a/resources/themes/cura-light/icons/plugin.svg b/resources/themes/cura-light/icons/plugin.svg deleted file mode 100644 index 5773c906ee..0000000000 --- a/resources/themes/cura-light/icons/plugin.svg +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/resources/themes/cura-light/icons/plus.svg b/resources/themes/cura-light/icons/plus.svg deleted file mode 100644 index 211cdf6d23..0000000000 --- a/resources/themes/cura-light/icons/plus.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/resources/themes/cura-light/icons/pos_modify_dont_support_overlap.svg b/resources/themes/cura-light/icons/pos_modify_dont_support_overlap.svg deleted file mode 100644 index 124e95f558..0000000000 --- a/resources/themes/cura-light/icons/pos_modify_dont_support_overlap.svg +++ /dev/null @@ -1,26 +0,0 @@ - - - - pms_modify_dont_support_overlap - Created with Sketch. - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/resources/themes/cura-light/icons/pos_modify_overlaps.svg b/resources/themes/cura-light/icons/pos_modify_overlaps.svg deleted file mode 100644 index a664e820a6..0000000000 --- a/resources/themes/cura-light/icons/pos_modify_overlaps.svg +++ /dev/null @@ -1,17 +0,0 @@ - - - - pms_modify_overlaps - Created with Sketch. - - - - - - - - - - - - \ No newline at end of file diff --git a/resources/themes/cura-light/icons/pos_normal.svg b/resources/themes/cura-light/icons/pos_normal.svg deleted file mode 100644 index 8a49ef3a00..0000000000 --- a/resources/themes/cura-light/icons/pos_normal.svg +++ /dev/null @@ -1,9 +0,0 @@ - - - - pms_Normal - Created with Sketch. - - - - \ No newline at end of file diff --git a/resources/themes/cura-light/icons/pos_print_as_support.svg b/resources/themes/cura-light/icons/pos_print_as_support.svg deleted file mode 100644 index 3562ca1fe0..0000000000 --- a/resources/themes/cura-light/icons/pos_print_as_support.svg +++ /dev/null @@ -1,14 +0,0 @@ - - - - pms_printassupport - Created with Sketch. - - - - - - - - - \ No newline at end of file diff --git a/resources/themes/cura-light/icons/print_time.svg b/resources/themes/cura-light/icons/print_time.svg deleted file mode 100644 index 0c5d4ed6a2..0000000000 --- a/resources/themes/cura-light/icons/print_time.svg +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/resources/themes/cura-light/icons/printer_cloud_connected.svg b/resources/themes/cura-light/icons/printer_cloud_connected.svg deleted file mode 100644 index 3bc94a05e7..0000000000 --- a/resources/themes/cura-light/icons/printer_cloud_connected.svg +++ /dev/null @@ -1,11 +0,0 @@ - - - - Artboard Copy 2 - Created with Sketch. - - - - - - \ No newline at end of file diff --git a/resources/themes/cura-light/icons/printer_cloud_not_available.svg b/resources/themes/cura-light/icons/printer_cloud_not_available.svg deleted file mode 100644 index 248df27338..0000000000 --- a/resources/themes/cura-light/icons/printer_cloud_not_available.svg +++ /dev/null @@ -1,18 +0,0 @@ - - - - Artboard Copy 4 - Created with Sketch. - - - - - - - - - - - - - \ No newline at end of file diff --git a/resources/themes/cura-light/icons/printer_connected.svg b/resources/themes/cura-light/icons/printer_connected.svg deleted file mode 100644 index a8ff015a9d..0000000000 --- a/resources/themes/cura-light/icons/printer_connected.svg +++ /dev/null @@ -1,13 +0,0 @@ - - - - Connected - Created with Sketch. - - - - - - - - \ No newline at end of file diff --git a/resources/themes/cura-light/icons/printer_group.svg b/resources/themes/cura-light/icons/printer_group.svg deleted file mode 100644 index 5e439faca4..0000000000 --- a/resources/themes/cura-light/icons/printer_group.svg +++ /dev/null @@ -1,20 +0,0 @@ - - - - Icon/ group printer/ disconnected - Created with Sketch. - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/resources/themes/cura-light/icons/printer_single.svg b/resources/themes/cura-light/icons/printer_single.svg deleted file mode 100644 index 69c4e212bc..0000000000 --- a/resources/themes/cura-light/icons/printer_single.svg +++ /dev/null @@ -1,13 +0,0 @@ - - - - Icon/ single printer/ disconnected - Created with Sketch. - - - - - - - - \ No newline at end of file diff --git a/resources/themes/cura-light/icons/printing_guideline.svg b/resources/themes/cura-light/icons/printing_guideline.svg deleted file mode 100644 index d306d046f9..0000000000 --- a/resources/themes/cura-light/icons/printing_guideline.svg +++ /dev/null @@ -1,9 +0,0 @@ - - - - Icon/ guideline on hover - Created with Sketch. - - - - \ No newline at end of file diff --git a/resources/themes/cura-light/icons/printsetup.svg b/resources/themes/cura-light/icons/printsetup.svg deleted file mode 100644 index 67f5713671..0000000000 --- a/resources/themes/cura-light/icons/printsetup.svg +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/resources/themes/cura-light/icons/quick.svg b/resources/themes/cura-light/icons/quick.svg deleted file mode 100644 index f5261e1e5b..0000000000 --- a/resources/themes/cura-light/icons/quick.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/resources/themes/cura-light/icons/reset.svg b/resources/themes/cura-light/icons/reset.svg deleted file mode 100644 index df95e2c554..0000000000 --- a/resources/themes/cura-light/icons/reset.svg +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/resources/themes/cura-light/icons/resize.svg b/resources/themes/cura-light/icons/resize.svg deleted file mode 100644 index d6a16649e1..0000000000 --- a/resources/themes/cura-light/icons/resize.svg +++ /dev/null @@ -1,15 +0,0 @@ - - - - Group - Created with Sketch. - - - - - - - - - - \ No newline at end of file diff --git a/resources/themes/cura-light/icons/rotate.svg b/resources/themes/cura-light/icons/rotate.svg deleted file mode 100644 index 5944ad7ce9..0000000000 --- a/resources/themes/cura-light/icons/rotate.svg +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/resources/themes/cura-light/icons/rotate_face_layflat.svg b/resources/themes/cura-light/icons/rotate_face_layflat.svg deleted file mode 100644 index 261a624cf0..0000000000 --- a/resources/themes/cura-light/icons/rotate_face_layflat.svg +++ /dev/null @@ -1,12 +0,0 @@ - - - - select face lay flat - Created with Sketch. - - - - - - - \ No newline at end of file diff --git a/resources/themes/cura-light/icons/rotate_layflat.svg b/resources/themes/cura-light/icons/rotate_layflat.svg deleted file mode 100644 index b2fe5c84b8..0000000000 --- a/resources/themes/cura-light/icons/rotate_layflat.svg +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/resources/themes/cura-light/icons/rotate_reset.svg b/resources/themes/cura-light/icons/rotate_reset.svg deleted file mode 100644 index c953bceffa..0000000000 --- a/resources/themes/cura-light/icons/rotate_reset.svg +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/resources/themes/cura-light/icons/scale.svg b/resources/themes/cura-light/icons/scale.svg deleted file mode 100644 index 2db809b7e7..0000000000 --- a/resources/themes/cura-light/icons/scale.svg +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/resources/themes/cura-light/icons/scale_max.svg b/resources/themes/cura-light/icons/scale_max.svg deleted file mode 100644 index f3bb75b399..0000000000 --- a/resources/themes/cura-light/icons/scale_max.svg +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - diff --git a/resources/themes/cura-light/icons/scale_reset.svg b/resources/themes/cura-light/icons/scale_reset.svg deleted file mode 100644 index 77210be8c5..0000000000 --- a/resources/themes/cura-light/icons/scale_reset.svg +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - diff --git a/resources/themes/cura-light/icons/search.svg b/resources/themes/cura-light/icons/search.svg deleted file mode 100644 index a9ccb612fd..0000000000 --- a/resources/themes/cura-light/icons/search.svg +++ /dev/null @@ -1,21 +0,0 @@ - - - - Shape - Created with Sketch. - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/resources/themes/cura-light/icons/setting_per_object.svg b/resources/themes/cura-light/icons/setting_per_object.svg deleted file mode 100644 index f4cfb3b145..0000000000 --- a/resources/themes/cura-light/icons/setting_per_object.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/resources/themes/cura-light/icons/settings.svg b/resources/themes/cura-light/icons/settings.svg deleted file mode 100644 index b96970307e..0000000000 --- a/resources/themes/cura-light/icons/settings.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/resources/themes/cura-light/icons/sparse.svg b/resources/themes/cura-light/icons/sparse.svg deleted file mode 100644 index 91f8858326..0000000000 --- a/resources/themes/cura-light/icons/sparse.svg +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - diff --git a/resources/themes/cura-light/icons/spool.svg b/resources/themes/cura-light/icons/spool.svg deleted file mode 100644 index 0d8ae42d9d..0000000000 --- a/resources/themes/cura-light/icons/spool.svg +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/resources/themes/cura-light/icons/star.svg b/resources/themes/cura-light/icons/star.svg deleted file mode 100644 index f6f91238e4..0000000000 --- a/resources/themes/cura-light/icons/star.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/resources/themes/cura-light/icons/star_empty.svg b/resources/themes/cura-light/icons/star_empty.svg deleted file mode 100644 index 39b5791e91..0000000000 --- a/resources/themes/cura-light/icons/star_empty.svg +++ /dev/null @@ -1,11 +0,0 @@ - - - - Star Copy 8 - Created with Sketch. - - - - - - \ No newline at end of file diff --git a/resources/themes/cura-light/icons/star_filled.svg b/resources/themes/cura-light/icons/star_filled.svg deleted file mode 100644 index d4e161f6c6..0000000000 --- a/resources/themes/cura-light/icons/star_filled.svg +++ /dev/null @@ -1,11 +0,0 @@ - - - - Star Copy 7 - Created with Sketch. - - - - - - \ No newline at end of file diff --git a/resources/themes/cura-light/icons/translate.svg b/resources/themes/cura-light/icons/translate.svg deleted file mode 100644 index 6a76ef4614..0000000000 --- a/resources/themes/cura-light/icons/translate.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/resources/themes/cura-light/icons/ulti.svg b/resources/themes/cura-light/icons/ulti.svg deleted file mode 100644 index b30d0669b3..0000000000 --- a/resources/themes/cura-light/icons/ulti.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/resources/themes/cura-light/icons/update.svg b/resources/themes/cura-light/icons/update.svg deleted file mode 100644 index 0a6e8fee5a..0000000000 --- a/resources/themes/cura-light/icons/update.svg +++ /dev/null @@ -1,12 +0,0 @@ - - - - update - Created with Sketch. - - - - - - - \ No newline at end of file diff --git a/resources/themes/cura-light/icons/view_3d.svg b/resources/themes/cura-light/icons/view_3d.svg deleted file mode 100644 index cfe394e65d..0000000000 --- a/resources/themes/cura-light/icons/view_3d.svg +++ /dev/null @@ -1,14 +0,0 @@ - - - - icn_perspectives_white - Created with Sketch. - - - - - - - - - \ No newline at end of file diff --git a/resources/themes/cura-light/icons/view_front.svg b/resources/themes/cura-light/icons/view_front.svg deleted file mode 100644 index 7de9abe0af..0000000000 --- a/resources/themes/cura-light/icons/view_front.svg +++ /dev/null @@ -1,19 +0,0 @@ - - - - icn_front_white - Created with Sketch. - - - - - - - - - - - - - - \ No newline at end of file diff --git a/resources/themes/cura-light/icons/view_layer.svg b/resources/themes/cura-light/icons/view_layer.svg deleted file mode 100644 index 3e4bf8e074..0000000000 --- a/resources/themes/cura-light/icons/view_layer.svg +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - diff --git a/resources/themes/cura-light/icons/view_left.svg b/resources/themes/cura-light/icons/view_left.svg deleted file mode 100644 index 1770da4c81..0000000000 --- a/resources/themes/cura-light/icons/view_left.svg +++ /dev/null @@ -1,21 +0,0 @@ - - - - icn_left_white - Created with Sketch. - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/resources/themes/cura-light/icons/view_normal.svg b/resources/themes/cura-light/icons/view_normal.svg deleted file mode 100644 index 676031dbbd..0000000000 --- a/resources/themes/cura-light/icons/view_normal.svg +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/resources/themes/cura-light/icons/view_right.svg b/resources/themes/cura-light/icons/view_right.svg deleted file mode 100644 index 5e0628e60e..0000000000 --- a/resources/themes/cura-light/icons/view_right.svg +++ /dev/null @@ -1,21 +0,0 @@ - - - - icn_right_white - Created with Sketch. - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/resources/themes/cura-light/icons/view_top.svg b/resources/themes/cura-light/icons/view_top.svg deleted file mode 100644 index 3eb32e9878..0000000000 --- a/resources/themes/cura-light/icons/view_top.svg +++ /dev/null @@ -1,21 +0,0 @@ - - - - icn_top_white - Created with Sketch. - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/resources/themes/cura-light/icons/view_xray.svg b/resources/themes/cura-light/icons/view_xray.svg deleted file mode 100644 index 5983c92c2f..0000000000 --- a/resources/themes/cura-light/icons/view_xray.svg +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/resources/themes/cura-light/icons/viewmode.svg b/resources/themes/cura-light/icons/viewmode.svg deleted file mode 100644 index a21df01f37..0000000000 --- a/resources/themes/cura-light/icons/viewmode.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file diff --git a/resources/themes/cura-light/icons/warning.svg b/resources/themes/cura-light/icons/warning.svg deleted file mode 100644 index 14b7d797d0..0000000000 --- a/resources/themes/cura-light/icons/warning.svg +++ /dev/null @@ -1,11 +0,0 @@ - - - - Icon/warning-s - Created with Sketch. - - - - - - \ No newline at end of file diff --git a/resources/themes/cura-light/icons/warning_light.svg b/resources/themes/cura-light/icons/warning_light.svg deleted file mode 100644 index f9ca90f6a9..0000000000 --- a/resources/themes/cura-light/icons/warning_light.svg +++ /dev/null @@ -1,13 +0,0 @@ - - - - warning - Created with Sketch. - - - - - - - - \ No newline at end of file diff --git a/resources/themes/cura-light/styles.qml b/resources/themes/cura-light/styles.qml index 28aa352834..de15866f1a 100755 --- a/resources/themes/cura-light/styles.qml +++ b/resources/themes/cura-light/styles.qml @@ -76,7 +76,7 @@ QtObject height: UM.Theme.getSize("standard_arrow").height sourceSize.height: width color: control.enabled ? UM.Theme.getColor("setting_control_button") : UM.Theme.getColor("setting_category_disabled_text") - source: UM.Theme.getIcon("arrow_bottom") + source: UM.Theme.getIcon("ChevronSingleDown") } Label { @@ -384,7 +384,7 @@ QtObject anchors.rightMargin: UM.Theme.getSize("default_lining").width * 2 anchors.verticalCenter: parent.verticalCenter - source: UM.Theme.getIcon("arrow_bottom") + source: UM.Theme.getIcon("ChevronSingleDown") width: UM.Theme.getSize("standard_arrow").width height: UM.Theme.getSize("standard_arrow").height sourceSize.width: width + 5 * screenScaleFactor @@ -422,7 +422,7 @@ QtObject height: Math.round(parent.height / 2.5) sourceSize.height: width color: UM.Theme.getColor("checkbox_mark") - source: control.exclusiveGroup ? UM.Theme.getIcon("dot") : UM.Theme.getIcon("check") + source: control.exclusiveGroup ? UM.Theme.getIcon("Dot") : UM.Theme.getIcon("Check") opacity: control.checked Behavior on opacity { NumberAnimation { duration: 100; } } }