From 2bd6f28f3a38a636d3e3a3198c368cca246828f0 Mon Sep 17 00:00:00 2001 From: jelle Spijker Date: Mon, 26 Apr 2021 19:42:17 +0200 Subject: [PATCH 1/9] Update Icons Subdivided the new icons in 3 size categories. As requested by UX Used the company naming scheme for uniformity and easy recognition. Known issues: - Top/Bottom category wasn't taken into account by UX at the time. Since this is a recent addition. Both the Walls and Top/Bottom will be updated. - Cloud/Network connection icons 12px don't render correctly. Due to the theme-ing. - Extruder Icons do not render correctly. CURA-8010_new_icons --- 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 | 7 ++ .../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 | 28 ++--- 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 | 6 +- 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/DropDownHeader.qml | 2 +- resources/qml/WelcomePages/DropDownWidget.qml | 2 +- resources/qml/Widgets/CheckBox.qml | 2 +- resources/qml/Widgets/ComboBox.qml | 2 +- .../cura-light/icons/12/CheckBlueBG.svg | 12 +++ .../cura-light/icons/12/CloudBlueBG.svg | 13 +++ .../cura-light/icons/12/CloudGreyBG.svg | 13 +++ .../cura-light/icons/{dot.svg => 12/Dot.svg} | 0 .../themes/cura-light/icons/24/Adhesion.svg | 14 +++ .../icons/24/ArrowDoubleCircleRight.svg | 7 ++ .../cura-light/icons/24/ArrowFourWay.svg | 8 ++ .../icons/{package.svg => 24/ArrowReset.svg} | 6 +- .../themes/cura-light/icons/24/Bandage.svg | 8 ++ .../themes/cura-light/icons/24/BlackMagic.svg | 9 ++ .../themes/cura-light/icons/24/Cancel.svg | 7 ++ .../cura-light/icons/24/CancelBlock.svg | 9 ++ .../cura-light/icons/24/CancelCircle.svg | 8 ++ .../themes/cura-light/icons/24/Check.svg | 6 ++ .../cura-light/icons/24/CheckCircle.svg | 10 ++ .../cura-light/icons/24/ChevronSingleDown.svg | 6 ++ .../cura-light/icons/24/ChevronSingleLeft.svg | 6 ++ .../icons/24/ChevronSingleRight.svg | 6 ++ .../cura-light/icons/24/ChevronSingleUp.svg | 6 ++ .../CircleOutline.svg} | 0 .../themes/cura-light/icons/24/Clock.svg | 7 ++ .../themes/cura-light/icons/24/Cloud.svg | 8 ++ .../cura-light/icons/24/DualExtrusion.svg | 11 ++ .../themes/cura-light/icons/24/Experiment.svg | 9 ++ .../themes/cura-light/icons/24/Extruder1.svg | 23 ++++ .../themes/cura-light/icons/24/Extruder2.svg | 19 ++++ .../cura-light/icons/24/ExtruderColor.svg | 11 ++ resources/themes/cura-light/icons/24/Eye.svg | 8 ++ resources/themes/cura-light/icons/24/Fan.svg | 10 ++ .../themes/cura-light/icons/24/Folder.svg | 7 ++ .../themes/cura-light/icons/24/Formula.svg | 10 ++ .../themes/cura-light/icons/24/Guide.svg | 10 ++ .../themes/cura-light/icons/24/Hamburger.svg | 10 ++ .../themes/cura-light/icons/24/House.svg | 7 ++ .../themes/cura-light/icons/24/Infill0.svg | 6 ++ .../themes/cura-light/icons/24/Infill1.svg | 10 ++ .../themes/cura-light/icons/24/Infill2.svg | 9 ++ .../themes/cura-light/icons/24/Infill3.svg | 7 ++ .../cura-light/icons/24/InfillGradual.svg | 8 ++ .../cura-light/icons/24/Information.svg | 7 ++ .../themes/cura-light/icons/24/LayFlat.svg | 10 ++ .../cura-light/icons/24/LayFlatOnFace.svg | 7 ++ .../themes/cura-light/icons/24/Layers.svg | 11 ++ .../themes/cura-light/icons/24/Lightning.svg | 11 ++ resources/themes/cura-light/icons/24/Link.svg | 10 ++ .../cura-light/icons/24/LinkExternal.svg | 7 ++ .../themes/cura-light/icons/24/Magnifier.svg | 7 ++ .../themes/cura-light/icons/24/MeshType.svg | 12 +++ .../cura-light/icons/24/MeshTypeExclude.svg | 8 ++ .../cura-light/icons/24/MeshTypeIntersect.svg | 6 ++ .../cura-light/icons/24/MeshTypeNormal.svg | 6 ++ .../cura-light/icons/24/MeshTypeSupport.svg | 12 +++ .../themes/cura-light/icons/24/Minus.svg | 6 ++ .../themes/cura-light/icons/24/Mirror.svg | 14 +++ resources/themes/cura-light/icons/24/Pen.svg | 6 ++ .../themes/cura-light/icons/24/Plugin.svg | 7 ++ resources/themes/cura-light/icons/24/Plus.svg | 6 ++ .../cura-light/icons/24/PrintQuality.svg | 10 ++ .../themes/cura-light/icons/24/PrintShell.svg | 17 +++ .../cura-light/icons/24/PrintTravel.svg | 10 ++ .../themes/cura-light/icons/24/Printer.svg | 6 ++ .../cura-light/icons/24/PrinterTriple.svg | 11 ++ .../themes/cura-light/icons/24/Quick.svg | 17 +++ .../themes/cura-light/icons/24/Rotate.svg | 19 ++++ .../themes/cura-light/icons/24/Scale.svg | 9 ++ .../themes/cura-light/icons/24/ScaleMax.svg | 9 ++ .../themes/cura-light/icons/24/Shield.svg | 7 ++ .../themes/cura-light/icons/24/Sliders.svg | 10 ++ .../icons/{solid.svg => 24/Solid.svg} | 0 .../cura-light/icons/24/SpeedOMeter.svg | 9 ++ .../themes/cura-light/icons/24/Spool.svg | 8 ++ .../themes/cura-light/icons/24/Sputnik.svg | 10 ++ resources/themes/cura-light/icons/24/Star.svg | 6 ++ .../themes/cura-light/icons/24/StarFilled.svg | 5 + .../themes/cura-light/icons/24/Support.svg | 13 +++ .../cura-light/icons/24/SupportBlocker.svg | 12 +++ .../themes/cura-light/icons/24/ThreeDots.svg | 5 + .../cura-light/icons/24/UltimakerCura.svg | 8 ++ .../themes/cura-light/icons/24/View3D.svg | 7 ++ .../themes/cura-light/icons/24/ViewFront.svg | 6 ++ .../themes/cura-light/icons/24/ViewLeft.svg | 6 ++ .../themes/cura-light/icons/24/ViewRight.svg | 6 ++ .../themes/cura-light/icons/24/ViewTop.svg | 6 ++ .../themes/cura-light/icons/24/Warning.svg | 6 ++ .../themes/cura-light/icons/30/Extruder.svg | 14 +++ .../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 - resources/themes/cura-light/icons/dense.svg | 5 - .../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/material_spool.svg | 8 -- 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 | 10 +- 281 files changed, 1045 insertions(+), 1468 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 create mode 100755 plugins/UM3NetworkPrinting/resources/svg/icons/Buildplate.svg 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 create mode 100644 resources/themes/cura-light/icons/12/CheckBlueBG.svg create mode 100644 resources/themes/cura-light/icons/12/CloudBlueBG.svg create mode 100644 resources/themes/cura-light/icons/12/CloudGreyBG.svg rename resources/themes/cura-light/icons/{dot.svg => 12/Dot.svg} (100%) create mode 100755 resources/themes/cura-light/icons/24/Adhesion.svg create mode 100755 resources/themes/cura-light/icons/24/ArrowDoubleCircleRight.svg create mode 100755 resources/themes/cura-light/icons/24/ArrowFourWay.svg rename resources/themes/cura-light/icons/{package.svg => 24/ArrowReset.svg} (50%) mode change 100644 => 100755 create mode 100755 resources/themes/cura-light/icons/24/Bandage.svg create mode 100755 resources/themes/cura-light/icons/24/BlackMagic.svg create mode 100755 resources/themes/cura-light/icons/24/Cancel.svg create mode 100755 resources/themes/cura-light/icons/24/CancelBlock.svg create mode 100755 resources/themes/cura-light/icons/24/CancelCircle.svg create mode 100755 resources/themes/cura-light/icons/24/Check.svg create mode 100755 resources/themes/cura-light/icons/24/CheckCircle.svg create mode 100755 resources/themes/cura-light/icons/24/ChevronSingleDown.svg create mode 100755 resources/themes/cura-light/icons/24/ChevronSingleLeft.svg create mode 100755 resources/themes/cura-light/icons/24/ChevronSingleRight.svg create mode 100755 resources/themes/cura-light/icons/24/ChevronSingleUp.svg rename resources/themes/cura-light/icons/{circle_outline.svg => 24/CircleOutline.svg} (100%) create mode 100755 resources/themes/cura-light/icons/24/Clock.svg create mode 100755 resources/themes/cura-light/icons/24/Cloud.svg create mode 100755 resources/themes/cura-light/icons/24/DualExtrusion.svg create mode 100755 resources/themes/cura-light/icons/24/Experiment.svg create mode 100644 resources/themes/cura-light/icons/24/Extruder1.svg create mode 100644 resources/themes/cura-light/icons/24/Extruder2.svg create mode 100644 resources/themes/cura-light/icons/24/ExtruderColor.svg create mode 100755 resources/themes/cura-light/icons/24/Eye.svg create mode 100755 resources/themes/cura-light/icons/24/Fan.svg create mode 100755 resources/themes/cura-light/icons/24/Folder.svg create mode 100755 resources/themes/cura-light/icons/24/Formula.svg create mode 100755 resources/themes/cura-light/icons/24/Guide.svg create mode 100755 resources/themes/cura-light/icons/24/Hamburger.svg create mode 100755 resources/themes/cura-light/icons/24/House.svg create mode 100755 resources/themes/cura-light/icons/24/Infill0.svg create mode 100755 resources/themes/cura-light/icons/24/Infill1.svg create mode 100755 resources/themes/cura-light/icons/24/Infill2.svg create mode 100755 resources/themes/cura-light/icons/24/Infill3.svg create mode 100755 resources/themes/cura-light/icons/24/InfillGradual.svg create mode 100755 resources/themes/cura-light/icons/24/Information.svg create mode 100755 resources/themes/cura-light/icons/24/LayFlat.svg create mode 100755 resources/themes/cura-light/icons/24/LayFlatOnFace.svg create mode 100755 resources/themes/cura-light/icons/24/Layers.svg create mode 100644 resources/themes/cura-light/icons/24/Lightning.svg create mode 100755 resources/themes/cura-light/icons/24/Link.svg create mode 100755 resources/themes/cura-light/icons/24/LinkExternal.svg create mode 100755 resources/themes/cura-light/icons/24/Magnifier.svg create mode 100755 resources/themes/cura-light/icons/24/MeshType.svg create mode 100755 resources/themes/cura-light/icons/24/MeshTypeExclude.svg create mode 100755 resources/themes/cura-light/icons/24/MeshTypeIntersect.svg create mode 100755 resources/themes/cura-light/icons/24/MeshTypeNormal.svg create mode 100755 resources/themes/cura-light/icons/24/MeshTypeSupport.svg create mode 100755 resources/themes/cura-light/icons/24/Minus.svg create mode 100755 resources/themes/cura-light/icons/24/Mirror.svg create mode 100755 resources/themes/cura-light/icons/24/Pen.svg create mode 100755 resources/themes/cura-light/icons/24/Plugin.svg create mode 100755 resources/themes/cura-light/icons/24/Plus.svg create mode 100755 resources/themes/cura-light/icons/24/PrintQuality.svg create mode 100755 resources/themes/cura-light/icons/24/PrintShell.svg create mode 100755 resources/themes/cura-light/icons/24/PrintTravel.svg create mode 100755 resources/themes/cura-light/icons/24/Printer.svg create mode 100755 resources/themes/cura-light/icons/24/PrinterTriple.svg create mode 100755 resources/themes/cura-light/icons/24/Quick.svg create mode 100755 resources/themes/cura-light/icons/24/Rotate.svg create mode 100755 resources/themes/cura-light/icons/24/Scale.svg create mode 100755 resources/themes/cura-light/icons/24/ScaleMax.svg create mode 100755 resources/themes/cura-light/icons/24/Shield.svg create mode 100755 resources/themes/cura-light/icons/24/Sliders.svg rename resources/themes/cura-light/icons/{solid.svg => 24/Solid.svg} (100%) create mode 100755 resources/themes/cura-light/icons/24/SpeedOMeter.svg create mode 100755 resources/themes/cura-light/icons/24/Spool.svg create mode 100755 resources/themes/cura-light/icons/24/Sputnik.svg create mode 100755 resources/themes/cura-light/icons/24/Star.svg create mode 100755 resources/themes/cura-light/icons/24/StarFilled.svg create mode 100755 resources/themes/cura-light/icons/24/Support.svg create mode 100755 resources/themes/cura-light/icons/24/SupportBlocker.svg create mode 100755 resources/themes/cura-light/icons/24/ThreeDots.svg create mode 100755 resources/themes/cura-light/icons/24/UltimakerCura.svg create mode 100755 resources/themes/cura-light/icons/24/View3D.svg create mode 100755 resources/themes/cura-light/icons/24/ViewFront.svg create mode 100755 resources/themes/cura-light/icons/24/ViewLeft.svg create mode 100755 resources/themes/cura-light/icons/24/ViewRight.svg create mode 100755 resources/themes/cura-light/icons/24/ViewTop.svg create mode 100755 resources/themes/cura-light/icons/24/Warning.svg create mode 100644 resources/themes/cura-light/icons/30/Extruder.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 delete mode 100644 resources/themes/cura-light/icons/dense.svg 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 delete mode 100644 resources/themes/cura-light/icons/material_spool.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 5cdb500b4e..fb4e086983 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 } @@ -79,7 +79,7 @@ Item height: UM.Theme.getSize("message_close").height color: UM.Theme.getColor("small_button_text") hoverColor: UM.Theme.getColor("small_button_text_hover") - iconSource: UM.Theme.getIcon("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..33c16853c5 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("UltimakeCura") 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 05507fc4a2..c0c4e252ed 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("MeshTypeExclude"); property bool needBorder: true checkable: true onClicked: setMeshType(antiOverhangMeshType) @@ -304,7 +304,7 @@ Item height: width sourceSize.height: width color: control.hovered ? UM.Theme.getColor("setting_control_button_hover") : UM.Theme.getColor("setting_control_button") - source: UM.Theme.getIcon("minus") + source: UM.Theme.getIcon("Minus") } } } diff --git a/plugins/PerObjectSettingsTool/__init__.py b/plugins/PerObjectSettingsTool/__init__.py index 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 708fc932c8..14dcce03b3 100644 --- a/plugins/SimulationView/SimulationViewMenuComponent.qml +++ b/plugins/SimulationView/SimulationViewMenuComponent.qml @@ -203,7 +203,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", "30") 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/plugins/UM3NetworkPrinting/resources/svg/icons/Buildplate.svg b/plugins/UM3NetworkPrinting/resources/svg/icons/Buildplate.svg new file mode 100755 index 0000000000..79fdc06c07 --- /dev/null +++ b/plugins/UM3NetworkPrinting/resources/svg/icons/Buildplate.svg @@ -0,0 +1,7 @@ + + + + + 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 9377b99df8..ce786be5b1 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 8d13629adc..9af8cbe660 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": @@ -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": @@ -3673,7 +3673,7 @@ "travel": { "label": "Travel", - "icon": "category_travel", + "icon": "PrintTravel", "description": "travel", "type": "category", "children": @@ -3978,7 +3978,7 @@ "cooling": { "label": "Cooling", - "icon": "category_cool", + "icon": "Fan", "description": "Cooling", "type": "category", "children": @@ -4128,7 +4128,7 @@ { "label": "Support", "type": "category", - "icon": "category_support", + "icon": "Support", "description": "Support", "children": { @@ -5168,7 +5168,7 @@ { "label": "Build Plate Adhesion", "type": "category", - "icon": "category_adhesion", + "icon": "Adhesion", "description": "Adhesion", "children": { @@ -5822,7 +5822,7 @@ { "label": "Dual Extrusion", "type": "category", - "icon": "category_dual", + "icon": "DualExtrusion", "description": "Settings used for printing with multiple extruders.", "children": { @@ -6037,7 +6037,7 @@ { "label": "Mesh Fixes", "type": "category", - "icon": "category_fixes", + "icon": "Bandage", "description": "Make the meshes more suited for 3D printing.", "children": { @@ -6163,7 +6163,7 @@ { "label": "Special Modes", "type": "category", - "icon": "category_blackmagic", + "icon": "BlackMagic", "description": "Non-traditional ways to print your models.", "children": { @@ -6336,7 +6336,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..f719005134 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", "30") color: extruderEnabled ? materialColor: UM.Theme.getColor("disabled") } @@ -64,9 +64,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..07b9b9add6 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", "30") 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("MeshTypeExclude"); } 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..8b66f9b34e 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", "30") 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", "30") 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..51cc3aad19 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", "12") + } + else if (connectionStatus == "printer_cloud_connected") + { + return UM.Theme.getIcon("CloudBlueBG", "12") + } + else if (connectionStatus == "printer_cloud_not_available") + { + return UM.Theme.getIcon("CloudGreyBG", "12") + } + 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..c7b57097bc 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", "30") 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", "30") color: control.model.getItem(index).color } } diff --git a/resources/qml/Settings/SettingItem.qml b/resources/qml/Settings/SettingItem.qml index f0c748d190..56f07f51af 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("Formula") onEntered: { hoverTimer.stop(); base.showTooltip(catalog.i18nc("@label", "This setting is normally calculated, but it currently has an absolute value set.\n\nClick to restore the calculated value.")) } onExited: base.showTooltip(base.createTooltipText()) diff --git a/resources/qml/Settings/SettingOptionalExtruder.qml b/resources/qml/Settings/SettingOptionalExtruder.qml index ce078551d8..e1bf97f532 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", "30") 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", "30") color: control.model.getItem(index).color } } diff --git a/resources/qml/Settings/SettingView.qml b/resources/qml/Settings/SettingView.qml index b31e7e4508..fe73f55c09 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/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-light/icons/12/CheckBlueBG.svg b/resources/themes/cura-light/icons/12/CheckBlueBG.svg new file mode 100644 index 0000000000..ecb4b4a25c --- /dev/null +++ b/resources/themes/cura-light/icons/12/CheckBlueBG.svg @@ -0,0 +1,12 @@ + + + + + + + + + + + diff --git a/resources/themes/cura-light/icons/12/CloudBlueBG.svg b/resources/themes/cura-light/icons/12/CloudBlueBG.svg new file mode 100644 index 0000000000..d3ca3bf6e2 --- /dev/null +++ b/resources/themes/cura-light/icons/12/CloudBlueBG.svg @@ -0,0 +1,13 @@ + + + + + + + + + + + diff --git a/resources/themes/cura-light/icons/12/CloudGreyBG.svg b/resources/themes/cura-light/icons/12/CloudGreyBG.svg new file mode 100644 index 0000000000..817d1d8fa7 --- /dev/null +++ b/resources/themes/cura-light/icons/12/CloudGreyBG.svg @@ -0,0 +1,13 @@ + + + + + + + + + + + diff --git a/resources/themes/cura-light/icons/dot.svg b/resources/themes/cura-light/icons/12/Dot.svg similarity index 100% rename from resources/themes/cura-light/icons/dot.svg rename to resources/themes/cura-light/icons/12/Dot.svg diff --git a/resources/themes/cura-light/icons/24/Adhesion.svg b/resources/themes/cura-light/icons/24/Adhesion.svg new file mode 100755 index 0000000000..a916be792f --- /dev/null +++ b/resources/themes/cura-light/icons/24/Adhesion.svg @@ -0,0 +1,14 @@ + + + + + + + + + + + + + diff --git a/resources/themes/cura-light/icons/24/ArrowDoubleCircleRight.svg b/resources/themes/cura-light/icons/24/ArrowDoubleCircleRight.svg new file mode 100755 index 0000000000..54a432ed01 --- /dev/null +++ b/resources/themes/cura-light/icons/24/ArrowDoubleCircleRight.svg @@ -0,0 +1,7 @@ + + + + + diff --git a/resources/themes/cura-light/icons/24/ArrowFourWay.svg b/resources/themes/cura-light/icons/24/ArrowFourWay.svg new file mode 100755 index 0000000000..390382f70c --- /dev/null +++ b/resources/themes/cura-light/icons/24/ArrowFourWay.svg @@ -0,0 +1,8 @@ + + + + + diff --git a/resources/themes/cura-light/icons/package.svg b/resources/themes/cura-light/icons/24/ArrowReset.svg old mode 100644 new mode 100755 similarity index 50% rename from resources/themes/cura-light/icons/package.svg rename to resources/themes/cura-light/icons/24/ArrowReset.svg index 4f74a43c42..b7df19d07b --- a/resources/themes/cura-light/icons/package.svg +++ b/resources/themes/cura-light/icons/24/ArrowReset.svg @@ -1,7 +1,7 @@ - + viewBox="0 0 24 24" style="enable-background:new 0 0 24 24;" xml:space="preserve"> + diff --git a/resources/themes/cura-light/icons/24/Bandage.svg b/resources/themes/cura-light/icons/24/Bandage.svg new file mode 100755 index 0000000000..b4545a1336 --- /dev/null +++ b/resources/themes/cura-light/icons/24/Bandage.svg @@ -0,0 +1,8 @@ + + + + + diff --git a/resources/themes/cura-light/icons/24/BlackMagic.svg b/resources/themes/cura-light/icons/24/BlackMagic.svg new file mode 100755 index 0000000000..6127a65405 --- /dev/null +++ b/resources/themes/cura-light/icons/24/BlackMagic.svg @@ -0,0 +1,9 @@ + + + + + diff --git a/resources/themes/cura-light/icons/24/Cancel.svg b/resources/themes/cura-light/icons/24/Cancel.svg new file mode 100755 index 0000000000..3e66ca01eb --- /dev/null +++ b/resources/themes/cura-light/icons/24/Cancel.svg @@ -0,0 +1,7 @@ + + + + + diff --git a/resources/themes/cura-light/icons/24/CancelBlock.svg b/resources/themes/cura-light/icons/24/CancelBlock.svg new file mode 100755 index 0000000000..1c9b06d7eb --- /dev/null +++ b/resources/themes/cura-light/icons/24/CancelBlock.svg @@ -0,0 +1,9 @@ + + + + + + + + diff --git a/resources/themes/cura-light/icons/24/CancelCircle.svg b/resources/themes/cura-light/icons/24/CancelCircle.svg new file mode 100755 index 0000000000..ef74f87bbe --- /dev/null +++ b/resources/themes/cura-light/icons/24/CancelCircle.svg @@ -0,0 +1,8 @@ + + + + + diff --git a/resources/themes/cura-light/icons/24/Check.svg b/resources/themes/cura-light/icons/24/Check.svg new file mode 100755 index 0000000000..f65a26041c --- /dev/null +++ b/resources/themes/cura-light/icons/24/Check.svg @@ -0,0 +1,6 @@ + + + + + diff --git a/resources/themes/cura-light/icons/24/CheckCircle.svg b/resources/themes/cura-light/icons/24/CheckCircle.svg new file mode 100755 index 0000000000..c602e488ee --- /dev/null +++ b/resources/themes/cura-light/icons/24/CheckCircle.svg @@ -0,0 +1,10 @@ + + + + + + + + diff --git a/resources/themes/cura-light/icons/24/ChevronSingleDown.svg b/resources/themes/cura-light/icons/24/ChevronSingleDown.svg new file mode 100755 index 0000000000..e9e9b2e9ea --- /dev/null +++ b/resources/themes/cura-light/icons/24/ChevronSingleDown.svg @@ -0,0 +1,6 @@ + + + + + diff --git a/resources/themes/cura-light/icons/24/ChevronSingleLeft.svg b/resources/themes/cura-light/icons/24/ChevronSingleLeft.svg new file mode 100755 index 0000000000..3f8e412e66 --- /dev/null +++ b/resources/themes/cura-light/icons/24/ChevronSingleLeft.svg @@ -0,0 +1,6 @@ + + + + + diff --git a/resources/themes/cura-light/icons/24/ChevronSingleRight.svg b/resources/themes/cura-light/icons/24/ChevronSingleRight.svg new file mode 100755 index 0000000000..075d951d53 --- /dev/null +++ b/resources/themes/cura-light/icons/24/ChevronSingleRight.svg @@ -0,0 +1,6 @@ + + + + + diff --git a/resources/themes/cura-light/icons/24/ChevronSingleUp.svg b/resources/themes/cura-light/icons/24/ChevronSingleUp.svg new file mode 100755 index 0000000000..328cf0f862 --- /dev/null +++ b/resources/themes/cura-light/icons/24/ChevronSingleUp.svg @@ -0,0 +1,6 @@ + + + + + diff --git a/resources/themes/cura-light/icons/circle_outline.svg b/resources/themes/cura-light/icons/24/CircleOutline.svg similarity index 100% rename from resources/themes/cura-light/icons/circle_outline.svg rename to resources/themes/cura-light/icons/24/CircleOutline.svg diff --git a/resources/themes/cura-light/icons/24/Clock.svg b/resources/themes/cura-light/icons/24/Clock.svg new file mode 100755 index 0000000000..15c1af918f --- /dev/null +++ b/resources/themes/cura-light/icons/24/Clock.svg @@ -0,0 +1,7 @@ + + + + + diff --git a/resources/themes/cura-light/icons/24/Cloud.svg b/resources/themes/cura-light/icons/24/Cloud.svg new file mode 100755 index 0000000000..dc2de4ae31 --- /dev/null +++ b/resources/themes/cura-light/icons/24/Cloud.svg @@ -0,0 +1,8 @@ + + + + + diff --git a/resources/themes/cura-light/icons/24/DualExtrusion.svg b/resources/themes/cura-light/icons/24/DualExtrusion.svg new file mode 100755 index 0000000000..a30c8bbb04 --- /dev/null +++ b/resources/themes/cura-light/icons/24/DualExtrusion.svg @@ -0,0 +1,11 @@ + + + + + + + + + + diff --git a/resources/themes/cura-light/icons/24/Experiment.svg b/resources/themes/cura-light/icons/24/Experiment.svg new file mode 100755 index 0000000000..170e538c33 --- /dev/null +++ b/resources/themes/cura-light/icons/24/Experiment.svg @@ -0,0 +1,9 @@ + + + + + + + diff --git a/resources/themes/cura-light/icons/24/Extruder1.svg b/resources/themes/cura-light/icons/24/Extruder1.svg new file mode 100644 index 0000000000..88ea96a420 --- /dev/null +++ b/resources/themes/cura-light/icons/24/Extruder1.svg @@ -0,0 +1,23 @@ + + + + + + + + + + + + + + + + + + + + diff --git a/resources/themes/cura-light/icons/24/Extruder2.svg b/resources/themes/cura-light/icons/24/Extruder2.svg new file mode 100644 index 0000000000..4e1eb80257 --- /dev/null +++ b/resources/themes/cura-light/icons/24/Extruder2.svg @@ -0,0 +1,19 @@ + + + + + + + + + + + + diff --git a/resources/themes/cura-light/icons/24/ExtruderColor.svg b/resources/themes/cura-light/icons/24/ExtruderColor.svg new file mode 100644 index 0000000000..04d0c43546 --- /dev/null +++ b/resources/themes/cura-light/icons/24/ExtruderColor.svg @@ -0,0 +1,11 @@ + + + + + + + + + diff --git a/resources/themes/cura-light/icons/24/Eye.svg b/resources/themes/cura-light/icons/24/Eye.svg new file mode 100755 index 0000000000..e2b460e9e9 --- /dev/null +++ b/resources/themes/cura-light/icons/24/Eye.svg @@ -0,0 +1,8 @@ + + + + + diff --git a/resources/themes/cura-light/icons/24/Fan.svg b/resources/themes/cura-light/icons/24/Fan.svg new file mode 100755 index 0000000000..164c2b3526 --- /dev/null +++ b/resources/themes/cura-light/icons/24/Fan.svg @@ -0,0 +1,10 @@ + + + + + diff --git a/resources/themes/cura-light/icons/24/Folder.svg b/resources/themes/cura-light/icons/24/Folder.svg new file mode 100755 index 0000000000..297a74a04c --- /dev/null +++ b/resources/themes/cura-light/icons/24/Folder.svg @@ -0,0 +1,7 @@ + + + + + diff --git a/resources/themes/cura-light/icons/24/Formula.svg b/resources/themes/cura-light/icons/24/Formula.svg new file mode 100755 index 0000000000..6a799267ad --- /dev/null +++ b/resources/themes/cura-light/icons/24/Formula.svg @@ -0,0 +1,10 @@ + + + + + + + + diff --git a/resources/themes/cura-light/icons/24/Guide.svg b/resources/themes/cura-light/icons/24/Guide.svg new file mode 100755 index 0000000000..ed9d0cb6b8 --- /dev/null +++ b/resources/themes/cura-light/icons/24/Guide.svg @@ -0,0 +1,10 @@ + + + + + + + diff --git a/resources/themes/cura-light/icons/24/Hamburger.svg b/resources/themes/cura-light/icons/24/Hamburger.svg new file mode 100755 index 0000000000..406dd92a3e --- /dev/null +++ b/resources/themes/cura-light/icons/24/Hamburger.svg @@ -0,0 +1,10 @@ + + + + + + + + + diff --git a/resources/themes/cura-light/icons/24/House.svg b/resources/themes/cura-light/icons/24/House.svg new file mode 100755 index 0000000000..7795d945ff --- /dev/null +++ b/resources/themes/cura-light/icons/24/House.svg @@ -0,0 +1,7 @@ + + + + + diff --git a/resources/themes/cura-light/icons/24/Infill0.svg b/resources/themes/cura-light/icons/24/Infill0.svg new file mode 100755 index 0000000000..e1aca7e9cb --- /dev/null +++ b/resources/themes/cura-light/icons/24/Infill0.svg @@ -0,0 +1,6 @@ + + + + + diff --git a/resources/themes/cura-light/icons/24/Infill1.svg b/resources/themes/cura-light/icons/24/Infill1.svg new file mode 100755 index 0000000000..3ca0764b3b --- /dev/null +++ b/resources/themes/cura-light/icons/24/Infill1.svg @@ -0,0 +1,10 @@ + + + + + diff --git a/resources/themes/cura-light/icons/24/Infill2.svg b/resources/themes/cura-light/icons/24/Infill2.svg new file mode 100755 index 0000000000..5e33748d3e --- /dev/null +++ b/resources/themes/cura-light/icons/24/Infill2.svg @@ -0,0 +1,9 @@ + + + + + diff --git a/resources/themes/cura-light/icons/24/Infill3.svg b/resources/themes/cura-light/icons/24/Infill3.svg new file mode 100755 index 0000000000..bab0419505 --- /dev/null +++ b/resources/themes/cura-light/icons/24/Infill3.svg @@ -0,0 +1,7 @@ + + + + + diff --git a/resources/themes/cura-light/icons/24/InfillGradual.svg b/resources/themes/cura-light/icons/24/InfillGradual.svg new file mode 100755 index 0000000000..1925590a83 --- /dev/null +++ b/resources/themes/cura-light/icons/24/InfillGradual.svg @@ -0,0 +1,8 @@ + + + + + diff --git a/resources/themes/cura-light/icons/24/Information.svg b/resources/themes/cura-light/icons/24/Information.svg new file mode 100755 index 0000000000..2cb16f6a3f --- /dev/null +++ b/resources/themes/cura-light/icons/24/Information.svg @@ -0,0 +1,7 @@ + + + + + diff --git a/resources/themes/cura-light/icons/24/LayFlat.svg b/resources/themes/cura-light/icons/24/LayFlat.svg new file mode 100755 index 0000000000..8ddbf4c992 --- /dev/null +++ b/resources/themes/cura-light/icons/24/LayFlat.svg @@ -0,0 +1,10 @@ + + + + + + + + diff --git a/resources/themes/cura-light/icons/24/LayFlatOnFace.svg b/resources/themes/cura-light/icons/24/LayFlatOnFace.svg new file mode 100755 index 0000000000..2f29d5a0dd --- /dev/null +++ b/resources/themes/cura-light/icons/24/LayFlatOnFace.svg @@ -0,0 +1,7 @@ + + + + + diff --git a/resources/themes/cura-light/icons/24/Layers.svg b/resources/themes/cura-light/icons/24/Layers.svg new file mode 100755 index 0000000000..1db4ee10ed --- /dev/null +++ b/resources/themes/cura-light/icons/24/Layers.svg @@ -0,0 +1,11 @@ + + + + + + + + diff --git a/resources/themes/cura-light/icons/24/Lightning.svg b/resources/themes/cura-light/icons/24/Lightning.svg new file mode 100644 index 0000000000..04b63e76f6 --- /dev/null +++ b/resources/themes/cura-light/icons/24/Lightning.svg @@ -0,0 +1,11 @@ + + + + + + + + + diff --git a/resources/themes/cura-light/icons/24/Link.svg b/resources/themes/cura-light/icons/24/Link.svg new file mode 100755 index 0000000000..e81ec70986 --- /dev/null +++ b/resources/themes/cura-light/icons/24/Link.svg @@ -0,0 +1,10 @@ + + + + + diff --git a/resources/themes/cura-light/icons/24/LinkExternal.svg b/resources/themes/cura-light/icons/24/LinkExternal.svg new file mode 100755 index 0000000000..c94b1807bc --- /dev/null +++ b/resources/themes/cura-light/icons/24/LinkExternal.svg @@ -0,0 +1,7 @@ + + + + + diff --git a/resources/themes/cura-light/icons/24/Magnifier.svg b/resources/themes/cura-light/icons/24/Magnifier.svg new file mode 100755 index 0000000000..f14db0e280 --- /dev/null +++ b/resources/themes/cura-light/icons/24/Magnifier.svg @@ -0,0 +1,7 @@ + + + + + diff --git a/resources/themes/cura-light/icons/24/MeshType.svg b/resources/themes/cura-light/icons/24/MeshType.svg new file mode 100755 index 0000000000..fa164ef885 --- /dev/null +++ b/resources/themes/cura-light/icons/24/MeshType.svg @@ -0,0 +1,12 @@ + + + + + + + + + + + diff --git a/resources/themes/cura-light/icons/24/MeshTypeExclude.svg b/resources/themes/cura-light/icons/24/MeshTypeExclude.svg new file mode 100755 index 0000000000..94396f7b7d --- /dev/null +++ b/resources/themes/cura-light/icons/24/MeshTypeExclude.svg @@ -0,0 +1,8 @@ + + + + + + + diff --git a/resources/themes/cura-light/icons/24/MeshTypeIntersect.svg b/resources/themes/cura-light/icons/24/MeshTypeIntersect.svg new file mode 100755 index 0000000000..c4c97999e9 --- /dev/null +++ b/resources/themes/cura-light/icons/24/MeshTypeIntersect.svg @@ -0,0 +1,6 @@ + + + + + diff --git a/resources/themes/cura-light/icons/24/MeshTypeNormal.svg b/resources/themes/cura-light/icons/24/MeshTypeNormal.svg new file mode 100755 index 0000000000..e1aca7e9cb --- /dev/null +++ b/resources/themes/cura-light/icons/24/MeshTypeNormal.svg @@ -0,0 +1,6 @@ + + + + + diff --git a/resources/themes/cura-light/icons/24/MeshTypeSupport.svg b/resources/themes/cura-light/icons/24/MeshTypeSupport.svg new file mode 100755 index 0000000000..812648518b --- /dev/null +++ b/resources/themes/cura-light/icons/24/MeshTypeSupport.svg @@ -0,0 +1,12 @@ + + + + + + + + + + + diff --git a/resources/themes/cura-light/icons/24/Minus.svg b/resources/themes/cura-light/icons/24/Minus.svg new file mode 100755 index 0000000000..31b9046dbf --- /dev/null +++ b/resources/themes/cura-light/icons/24/Minus.svg @@ -0,0 +1,6 @@ + + + + + diff --git a/resources/themes/cura-light/icons/24/Mirror.svg b/resources/themes/cura-light/icons/24/Mirror.svg new file mode 100755 index 0000000000..b88556c0dc --- /dev/null +++ b/resources/themes/cura-light/icons/24/Mirror.svg @@ -0,0 +1,14 @@ + + + + + + + + + + + + + diff --git a/resources/themes/cura-light/icons/24/Pen.svg b/resources/themes/cura-light/icons/24/Pen.svg new file mode 100755 index 0000000000..4a4c41a882 --- /dev/null +++ b/resources/themes/cura-light/icons/24/Pen.svg @@ -0,0 +1,6 @@ + + + + + diff --git a/resources/themes/cura-light/icons/24/Plugin.svg b/resources/themes/cura-light/icons/24/Plugin.svg new file mode 100755 index 0000000000..49f94abd3b --- /dev/null +++ b/resources/themes/cura-light/icons/24/Plugin.svg @@ -0,0 +1,7 @@ + + + + + diff --git a/resources/themes/cura-light/icons/24/Plus.svg b/resources/themes/cura-light/icons/24/Plus.svg new file mode 100755 index 0000000000..05a4b691ab --- /dev/null +++ b/resources/themes/cura-light/icons/24/Plus.svg @@ -0,0 +1,6 @@ + + + + + diff --git a/resources/themes/cura-light/icons/24/PrintQuality.svg b/resources/themes/cura-light/icons/24/PrintQuality.svg new file mode 100755 index 0000000000..17c8a03b59 --- /dev/null +++ b/resources/themes/cura-light/icons/24/PrintQuality.svg @@ -0,0 +1,10 @@ + + + + + + + + + diff --git a/resources/themes/cura-light/icons/24/PrintShell.svg b/resources/themes/cura-light/icons/24/PrintShell.svg new file mode 100755 index 0000000000..08d8decab8 --- /dev/null +++ b/resources/themes/cura-light/icons/24/PrintShell.svg @@ -0,0 +1,17 @@ + + + + + + + + + + + + + + + diff --git a/resources/themes/cura-light/icons/24/PrintTravel.svg b/resources/themes/cura-light/icons/24/PrintTravel.svg new file mode 100755 index 0000000000..0eb42d5c56 --- /dev/null +++ b/resources/themes/cura-light/icons/24/PrintTravel.svg @@ -0,0 +1,10 @@ + + + + + + + + diff --git a/resources/themes/cura-light/icons/24/Printer.svg b/resources/themes/cura-light/icons/24/Printer.svg new file mode 100755 index 0000000000..9e08067224 --- /dev/null +++ b/resources/themes/cura-light/icons/24/Printer.svg @@ -0,0 +1,6 @@ + + + + + diff --git a/resources/themes/cura-light/icons/24/PrinterTriple.svg b/resources/themes/cura-light/icons/24/PrinterTriple.svg new file mode 100755 index 0000000000..faa5d586ea --- /dev/null +++ b/resources/themes/cura-light/icons/24/PrinterTriple.svg @@ -0,0 +1,11 @@ + + + + + + + + + + diff --git a/resources/themes/cura-light/icons/24/Quick.svg b/resources/themes/cura-light/icons/24/Quick.svg new file mode 100755 index 0000000000..71756d09fd --- /dev/null +++ b/resources/themes/cura-light/icons/24/Quick.svg @@ -0,0 +1,17 @@ + + + + + + + + + + + + + + + + diff --git a/resources/themes/cura-light/icons/24/Rotate.svg b/resources/themes/cura-light/icons/24/Rotate.svg new file mode 100755 index 0000000000..8043df21ba --- /dev/null +++ b/resources/themes/cura-light/icons/24/Rotate.svg @@ -0,0 +1,19 @@ + + + + + + + + + + + + + diff --git a/resources/themes/cura-light/icons/24/Scale.svg b/resources/themes/cura-light/icons/24/Scale.svg new file mode 100755 index 0000000000..372f1188ed --- /dev/null +++ b/resources/themes/cura-light/icons/24/Scale.svg @@ -0,0 +1,9 @@ + + + + + + + + diff --git a/resources/themes/cura-light/icons/24/ScaleMax.svg b/resources/themes/cura-light/icons/24/ScaleMax.svg new file mode 100755 index 0000000000..b009a6c0a8 --- /dev/null +++ b/resources/themes/cura-light/icons/24/ScaleMax.svg @@ -0,0 +1,9 @@ + + + + + + + + diff --git a/resources/themes/cura-light/icons/24/Shield.svg b/resources/themes/cura-light/icons/24/Shield.svg new file mode 100755 index 0000000000..cc5ec7ffcf --- /dev/null +++ b/resources/themes/cura-light/icons/24/Shield.svg @@ -0,0 +1,7 @@ + + + + + diff --git a/resources/themes/cura-light/icons/24/Sliders.svg b/resources/themes/cura-light/icons/24/Sliders.svg new file mode 100755 index 0000000000..d9f6312ca0 --- /dev/null +++ b/resources/themes/cura-light/icons/24/Sliders.svg @@ -0,0 +1,10 @@ + + + + + diff --git a/resources/themes/cura-light/icons/solid.svg b/resources/themes/cura-light/icons/24/Solid.svg similarity index 100% rename from resources/themes/cura-light/icons/solid.svg rename to resources/themes/cura-light/icons/24/Solid.svg diff --git a/resources/themes/cura-light/icons/24/SpeedOMeter.svg b/resources/themes/cura-light/icons/24/SpeedOMeter.svg new file mode 100755 index 0000000000..03d8f3e8e2 --- /dev/null +++ b/resources/themes/cura-light/icons/24/SpeedOMeter.svg @@ -0,0 +1,9 @@ + + + + + diff --git a/resources/themes/cura-light/icons/24/Spool.svg b/resources/themes/cura-light/icons/24/Spool.svg new file mode 100755 index 0000000000..aee874de6b --- /dev/null +++ b/resources/themes/cura-light/icons/24/Spool.svg @@ -0,0 +1,8 @@ + + + + diff --git a/resources/themes/cura-light/icons/24/Sputnik.svg b/resources/themes/cura-light/icons/24/Sputnik.svg new file mode 100755 index 0000000000..4b8341b0c5 --- /dev/null +++ b/resources/themes/cura-light/icons/24/Sputnik.svg @@ -0,0 +1,10 @@ + + + + diff --git a/resources/themes/cura-light/icons/24/Star.svg b/resources/themes/cura-light/icons/24/Star.svg new file mode 100755 index 0000000000..3a23b9a1f3 --- /dev/null +++ b/resources/themes/cura-light/icons/24/Star.svg @@ -0,0 +1,6 @@ + + + + diff --git a/resources/themes/cura-light/icons/24/StarFilled.svg b/resources/themes/cura-light/icons/24/StarFilled.svg new file mode 100755 index 0000000000..a0c7256800 --- /dev/null +++ b/resources/themes/cura-light/icons/24/StarFilled.svg @@ -0,0 +1,5 @@ + + + + diff --git a/resources/themes/cura-light/icons/24/Support.svg b/resources/themes/cura-light/icons/24/Support.svg new file mode 100755 index 0000000000..095e29547d --- /dev/null +++ b/resources/themes/cura-light/icons/24/Support.svg @@ -0,0 +1,13 @@ + + + + + + + + + + + diff --git a/resources/themes/cura-light/icons/24/SupportBlocker.svg b/resources/themes/cura-light/icons/24/SupportBlocker.svg new file mode 100755 index 0000000000..cd00c2c985 --- /dev/null +++ b/resources/themes/cura-light/icons/24/SupportBlocker.svg @@ -0,0 +1,12 @@ + + + + + + + + + + diff --git a/resources/themes/cura-light/icons/24/ThreeDots.svg b/resources/themes/cura-light/icons/24/ThreeDots.svg new file mode 100755 index 0000000000..51e7214cbb --- /dev/null +++ b/resources/themes/cura-light/icons/24/ThreeDots.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/resources/themes/cura-light/icons/24/UltimakerCura.svg b/resources/themes/cura-light/icons/24/UltimakerCura.svg new file mode 100755 index 0000000000..d691f27bdd --- /dev/null +++ b/resources/themes/cura-light/icons/24/UltimakerCura.svg @@ -0,0 +1,8 @@ + + + + + + + diff --git a/resources/themes/cura-light/icons/24/View3D.svg b/resources/themes/cura-light/icons/24/View3D.svg new file mode 100755 index 0000000000..5dd5146a24 --- /dev/null +++ b/resources/themes/cura-light/icons/24/View3D.svg @@ -0,0 +1,7 @@ + + + + diff --git a/resources/themes/cura-light/icons/24/ViewFront.svg b/resources/themes/cura-light/icons/24/ViewFront.svg new file mode 100755 index 0000000000..8161a687b3 --- /dev/null +++ b/resources/themes/cura-light/icons/24/ViewFront.svg @@ -0,0 +1,6 @@ + + + + diff --git a/resources/themes/cura-light/icons/24/ViewLeft.svg b/resources/themes/cura-light/icons/24/ViewLeft.svg new file mode 100755 index 0000000000..db84384ae9 --- /dev/null +++ b/resources/themes/cura-light/icons/24/ViewLeft.svg @@ -0,0 +1,6 @@ + + + + diff --git a/resources/themes/cura-light/icons/24/ViewRight.svg b/resources/themes/cura-light/icons/24/ViewRight.svg new file mode 100755 index 0000000000..2212dc9ee1 --- /dev/null +++ b/resources/themes/cura-light/icons/24/ViewRight.svg @@ -0,0 +1,6 @@ + + + + diff --git a/resources/themes/cura-light/icons/24/ViewTop.svg b/resources/themes/cura-light/icons/24/ViewTop.svg new file mode 100755 index 0000000000..c70e3f0d81 --- /dev/null +++ b/resources/themes/cura-light/icons/24/ViewTop.svg @@ -0,0 +1,6 @@ + + + + diff --git a/resources/themes/cura-light/icons/24/Warning.svg b/resources/themes/cura-light/icons/24/Warning.svg new file mode 100755 index 0000000000..6105030fe6 --- /dev/null +++ b/resources/themes/cura-light/icons/24/Warning.svg @@ -0,0 +1,6 @@ + + + + diff --git a/resources/themes/cura-light/icons/30/Extruder.svg b/resources/themes/cura-light/icons/30/Extruder.svg new file mode 100644 index 0000000000..1849e8bfdd --- /dev/null +++ b/resources/themes/cura-light/icons/30/Extruder.svg @@ -0,0 +1,14 @@ + + + + + + + + + + + + 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/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/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/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/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 daf06ac6af..766d22914c 100755 --- a/resources/themes/cura-light/styles.qml +++ b/resources/themes/cura-light/styles.qml @@ -76,7 +76,7 @@ QtObject height: Theme.getSize("standard_arrow").height sourceSize.height: width color: control.enabled ? Theme.getColor("setting_control_button") : Theme.getColor("setting_category_disabled_text") - source: Theme.getIcon("arrow_bottom") + source: Theme.getIcon("ChevronSingleDown") } Label { @@ -384,7 +384,7 @@ QtObject anchors.rightMargin: Theme.getSize("default_lining").width * 2 anchors.verticalCenter: parent.verticalCenter - source: Theme.getIcon("arrow_bottom") + source: Theme.getIcon("ChevronSingleDown") width: Theme.getSize("standard_arrow").width height: 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: Theme.getColor("checkbox_mark") - source: control.exclusiveGroup ? Theme.getIcon("dot") : Theme.getIcon("check") + source: control.exclusiveGroup ? Theme.getIcon("Dot", "12") : Theme.getIcon("Check") opacity: control.checked Behavior on opacity { NumberAnimation { duration: 100; } } } @@ -468,11 +468,11 @@ QtObject { if (control.checkbox_state == 2) { - return Theme.getIcon("solid"); + return Theme.getIcon("Solid"); } else { - return control.exclusiveGroup ? Theme.getIcon("dot") : Theme.getIcon("check"); + return control.exclusiveGroup ? Theme.getIcon("Dot", "12") : Theme.getIcon("Check"); } } opacity: control.checked From 13cd2d677c85adc3c6ccc0bbd31550eb4d1a41de Mon Sep 17 00:00:00 2001 From: jelle Spijker Date: Wed, 28 Apr 2021 11:00:52 +0200 Subject: [PATCH 2/9] Added new icon for Top/Bottom CURA-8010_new_icons --- resources/definitions/fdmprinter.def.json | 2 +- .../themes/cura-light/icons/24/PrintTopBottom.svg | 10 ++++++++++ 2 files changed, 11 insertions(+), 1 deletion(-) create mode 100644 resources/themes/cura-light/icons/24/PrintTopBottom.svg diff --git a/resources/definitions/fdmprinter.def.json b/resources/definitions/fdmprinter.def.json index 9af8cbe660..1923964354 100644 --- a/resources/definitions/fdmprinter.def.json +++ b/resources/definitions/fdmprinter.def.json @@ -1346,7 +1346,7 @@ "top_bottom": { "label": "Top/Bottom", - "icon": "category_topbottom", + "icon": "PrintTopBottom", "description": "Top/Bottom", "type": "category", "children": diff --git a/resources/themes/cura-light/icons/24/PrintTopBottom.svg b/resources/themes/cura-light/icons/24/PrintTopBottom.svg new file mode 100644 index 0000000000..2ac2e241e0 --- /dev/null +++ b/resources/themes/cura-light/icons/24/PrintTopBottom.svg @@ -0,0 +1,10 @@ + + + + + + + + + + From 886f41603ad5deb7bc3e5ff1992fbe5c9cb9c6dc Mon Sep 17 00:00:00 2001 From: jelle Spijker Date: Wed, 28 Apr 2021 11:02:18 +0200 Subject: [PATCH 3/9] Updated Connectivity icons so they can follow theming CURA-8010_new_icons --- .../themes/cura-light/icons/12/CheckBlueBG.svg | 16 ++++++---------- .../themes/cura-light/icons/12/CloudBlueBG.svg | 18 +++++++----------- .../themes/cura-light/icons/12/CloudGreyBG.svg | 18 +++++++----------- 3 files changed, 20 insertions(+), 32 deletions(-) diff --git a/resources/themes/cura-light/icons/12/CheckBlueBG.svg b/resources/themes/cura-light/icons/12/CheckBlueBG.svg index ecb4b4a25c..a4c403598a 100644 --- a/resources/themes/cura-light/icons/12/CheckBlueBG.svg +++ b/resources/themes/cura-light/icons/12/CheckBlueBG.svg @@ -1,12 +1,8 @@ - - + - - - - - - - - + + diff --git a/resources/themes/cura-light/icons/12/CloudBlueBG.svg b/resources/themes/cura-light/icons/12/CloudBlueBG.svg index d3ca3bf6e2..7a43843dfd 100644 --- a/resources/themes/cura-light/icons/12/CloudBlueBG.svg +++ b/resources/themes/cura-light/icons/12/CloudBlueBG.svg @@ -1,13 +1,9 @@ - - + - - - - - - - - + + diff --git a/resources/themes/cura-light/icons/12/CloudGreyBG.svg b/resources/themes/cura-light/icons/12/CloudGreyBG.svg index 817d1d8fa7..aa2bba0467 100644 --- a/resources/themes/cura-light/icons/12/CloudGreyBG.svg +++ b/resources/themes/cura-light/icons/12/CloudGreyBG.svg @@ -1,13 +1,9 @@ - - + - - - - - - - - + + From 913369ee4169617aaa07dc497a16c632b4cf25f8 Mon Sep 17 00:00:00 2001 From: jelle Spijker Date: Wed, 28 Apr 2021 11:08:27 +0200 Subject: [PATCH 4/9] Removed auto generated text CURA-8010_new_icons --- resources/themes/cura-light/icons/24/Adhesion.svg | 1 - resources/themes/cura-light/icons/24/ArrowDoubleCircleRight.svg | 1 - resources/themes/cura-light/icons/24/ArrowFourWay.svg | 1 - resources/themes/cura-light/icons/24/ArrowReset.svg | 1 - resources/themes/cura-light/icons/24/Bandage.svg | 1 - resources/themes/cura-light/icons/24/BlackMagic.svg | 1 - resources/themes/cura-light/icons/24/Cancel.svg | 1 - resources/themes/cura-light/icons/24/CancelBlock.svg | 1 - resources/themes/cura-light/icons/24/CancelCircle.svg | 1 - resources/themes/cura-light/icons/24/Check.svg | 1 - resources/themes/cura-light/icons/24/CheckCircle.svg | 1 - resources/themes/cura-light/icons/24/ChevronSingleDown.svg | 1 - resources/themes/cura-light/icons/24/ChevronSingleLeft.svg | 1 - resources/themes/cura-light/icons/24/ChevronSingleRight.svg | 1 - resources/themes/cura-light/icons/24/ChevronSingleUp.svg | 1 - resources/themes/cura-light/icons/24/Clock.svg | 1 - resources/themes/cura-light/icons/24/Cloud.svg | 1 - resources/themes/cura-light/icons/24/DualExtrusion.svg | 1 - resources/themes/cura-light/icons/24/Experiment.svg | 1 - resources/themes/cura-light/icons/24/Extruder1.svg | 1 - resources/themes/cura-light/icons/24/Extruder2.svg | 1 - resources/themes/cura-light/icons/24/ExtruderColor.svg | 1 - resources/themes/cura-light/icons/24/Eye.svg | 1 - resources/themes/cura-light/icons/24/Fan.svg | 1 - resources/themes/cura-light/icons/24/Folder.svg | 1 - resources/themes/cura-light/icons/24/Formula.svg | 1 - resources/themes/cura-light/icons/24/Guide.svg | 1 - resources/themes/cura-light/icons/24/Hamburger.svg | 1 - resources/themes/cura-light/icons/24/House.svg | 1 - resources/themes/cura-light/icons/24/Infill0.svg | 1 - resources/themes/cura-light/icons/24/Infill1.svg | 1 - resources/themes/cura-light/icons/24/Infill2.svg | 1 - resources/themes/cura-light/icons/24/Infill3.svg | 1 - resources/themes/cura-light/icons/24/InfillGradual.svg | 1 - resources/themes/cura-light/icons/24/Information.svg | 1 - resources/themes/cura-light/icons/24/LayFlat.svg | 1 - resources/themes/cura-light/icons/24/LayFlatOnFace.svg | 1 - resources/themes/cura-light/icons/24/Layers.svg | 1 - resources/themes/cura-light/icons/24/Lightning.svg | 1 - resources/themes/cura-light/icons/24/Link.svg | 1 - resources/themes/cura-light/icons/24/LinkExternal.svg | 1 - resources/themes/cura-light/icons/24/Magnifier.svg | 1 - resources/themes/cura-light/icons/24/MeshTypeExclude.svg | 1 - resources/themes/cura-light/icons/24/MeshTypeIntersect.svg | 1 - resources/themes/cura-light/icons/24/MeshTypeNormal.svg | 1 - resources/themes/cura-light/icons/24/MeshTypeSupport.svg | 1 - resources/themes/cura-light/icons/24/Minus.svg | 1 - resources/themes/cura-light/icons/24/Mirror.svg | 1 - resources/themes/cura-light/icons/24/Pen.svg | 1 - resources/themes/cura-light/icons/24/Plugin.svg | 1 - resources/themes/cura-light/icons/24/Plus.svg | 1 - resources/themes/cura-light/icons/24/PrintQuality.svg | 1 - resources/themes/cura-light/icons/24/PrintShell.svg | 1 - resources/themes/cura-light/icons/24/PrintTravel.svg | 1 - resources/themes/cura-light/icons/24/Printer.svg | 1 - resources/themes/cura-light/icons/24/PrinterTriple.svg | 1 - resources/themes/cura-light/icons/24/Quick.svg | 1 - resources/themes/cura-light/icons/24/Rotate.svg | 1 - resources/themes/cura-light/icons/24/Scale.svg | 1 - resources/themes/cura-light/icons/24/ScaleMax.svg | 1 - resources/themes/cura-light/icons/24/Shield.svg | 1 - resources/themes/cura-light/icons/24/Sliders.svg | 1 - resources/themes/cura-light/icons/24/SpeedOMeter.svg | 1 - 63 files changed, 63 deletions(-) diff --git a/resources/themes/cura-light/icons/24/Adhesion.svg b/resources/themes/cura-light/icons/24/Adhesion.svg index a916be792f..f43ccdb030 100755 --- a/resources/themes/cura-light/icons/24/Adhesion.svg +++ b/resources/themes/cura-light/icons/24/Adhesion.svg @@ -1,5 +1,4 @@ - diff --git a/resources/themes/cura-light/icons/24/ArrowDoubleCircleRight.svg b/resources/themes/cura-light/icons/24/ArrowDoubleCircleRight.svg index 54a432ed01..9c3699e040 100755 --- a/resources/themes/cura-light/icons/24/ArrowDoubleCircleRight.svg +++ b/resources/themes/cura-light/icons/24/ArrowDoubleCircleRight.svg @@ -1,5 +1,4 @@ - - - - - - - diff --git a/resources/themes/cura-light/icons/24/CancelCircle.svg b/resources/themes/cura-light/icons/24/CancelCircle.svg index ef74f87bbe..dc541f2d54 100755 --- a/resources/themes/cura-light/icons/24/CancelCircle.svg +++ b/resources/themes/cura-light/icons/24/CancelCircle.svg @@ -1,5 +1,4 @@ - - diff --git a/resources/themes/cura-light/icons/24/CheckCircle.svg b/resources/themes/cura-light/icons/24/CheckCircle.svg index c602e488ee..aac1a50b95 100755 --- a/resources/themes/cura-light/icons/24/CheckCircle.svg +++ b/resources/themes/cura-light/icons/24/CheckCircle.svg @@ -1,5 +1,4 @@ - diff --git a/resources/themes/cura-light/icons/24/ChevronSingleDown.svg b/resources/themes/cura-light/icons/24/ChevronSingleDown.svg index e9e9b2e9ea..3d6018ada0 100755 --- a/resources/themes/cura-light/icons/24/ChevronSingleDown.svg +++ b/resources/themes/cura-light/icons/24/ChevronSingleDown.svg @@ -1,5 +1,4 @@ - diff --git a/resources/themes/cura-light/icons/24/ChevronSingleLeft.svg b/resources/themes/cura-light/icons/24/ChevronSingleLeft.svg index 3f8e412e66..25d41e2ef5 100755 --- a/resources/themes/cura-light/icons/24/ChevronSingleLeft.svg +++ b/resources/themes/cura-light/icons/24/ChevronSingleLeft.svg @@ -1,5 +1,4 @@ - diff --git a/resources/themes/cura-light/icons/24/ChevronSingleRight.svg b/resources/themes/cura-light/icons/24/ChevronSingleRight.svg index 075d951d53..099ca58e67 100755 --- a/resources/themes/cura-light/icons/24/ChevronSingleRight.svg +++ b/resources/themes/cura-light/icons/24/ChevronSingleRight.svg @@ -1,5 +1,4 @@ - diff --git a/resources/themes/cura-light/icons/24/ChevronSingleUp.svg b/resources/themes/cura-light/icons/24/ChevronSingleUp.svg index 328cf0f862..1575d25ed5 100755 --- a/resources/themes/cura-light/icons/24/ChevronSingleUp.svg +++ b/resources/themes/cura-light/icons/24/ChevronSingleUp.svg @@ -1,5 +1,4 @@ - diff --git a/resources/themes/cura-light/icons/24/Clock.svg b/resources/themes/cura-light/icons/24/Clock.svg index 15c1af918f..9bdc8252aa 100755 --- a/resources/themes/cura-light/icons/24/Clock.svg +++ b/resources/themes/cura-light/icons/24/Clock.svg @@ -1,5 +1,4 @@ - - - diff --git a/resources/themes/cura-light/icons/24/Experiment.svg b/resources/themes/cura-light/icons/24/Experiment.svg index 170e538c33..75201d92f7 100755 --- a/resources/themes/cura-light/icons/24/Experiment.svg +++ b/resources/themes/cura-light/icons/24/Experiment.svg @@ -1,5 +1,4 @@ - diff --git a/resources/themes/cura-light/icons/24/Extruder1.svg b/resources/themes/cura-light/icons/24/Extruder1.svg index 88ea96a420..b818bab2bc 100644 --- a/resources/themes/cura-light/icons/24/Extruder1.svg +++ b/resources/themes/cura-light/icons/24/Extruder1.svg @@ -1,5 +1,4 @@ - diff --git a/resources/themes/cura-light/icons/24/Extruder2.svg b/resources/themes/cura-light/icons/24/Extruder2.svg index 4e1eb80257..764170753b 100644 --- a/resources/themes/cura-light/icons/24/Extruder2.svg +++ b/resources/themes/cura-light/icons/24/Extruder2.svg @@ -1,5 +1,4 @@ - diff --git a/resources/themes/cura-light/icons/24/ExtruderColor.svg b/resources/themes/cura-light/icons/24/ExtruderColor.svg index 04d0c43546..08c93163aa 100644 --- a/resources/themes/cura-light/icons/24/ExtruderColor.svg +++ b/resources/themes/cura-light/icons/24/ExtruderColor.svg @@ -1,5 +1,4 @@ - diff --git a/resources/themes/cura-light/icons/24/Eye.svg b/resources/themes/cura-light/icons/24/Eye.svg index e2b460e9e9..a45a0fed40 100755 --- a/resources/themes/cura-light/icons/24/Eye.svg +++ b/resources/themes/cura-light/icons/24/Eye.svg @@ -1,5 +1,4 @@ - - - - diff --git a/resources/themes/cura-light/icons/24/Guide.svg b/resources/themes/cura-light/icons/24/Guide.svg index ed9d0cb6b8..358a8864a4 100755 --- a/resources/themes/cura-light/icons/24/Guide.svg +++ b/resources/themes/cura-light/icons/24/Guide.svg @@ -1,5 +1,4 @@ - diff --git a/resources/themes/cura-light/icons/24/Hamburger.svg b/resources/themes/cura-light/icons/24/Hamburger.svg index 406dd92a3e..ed83977773 100755 --- a/resources/themes/cura-light/icons/24/Hamburger.svg +++ b/resources/themes/cura-light/icons/24/Hamburger.svg @@ -1,5 +1,4 @@ - diff --git a/resources/themes/cura-light/icons/24/House.svg b/resources/themes/cura-light/icons/24/House.svg index 7795d945ff..b44362a061 100755 --- a/resources/themes/cura-light/icons/24/House.svg +++ b/resources/themes/cura-light/icons/24/House.svg @@ -1,5 +1,4 @@ - - diff --git a/resources/themes/cura-light/icons/24/Infill1.svg b/resources/themes/cura-light/icons/24/Infill1.svg index 3ca0764b3b..1d31070389 100755 --- a/resources/themes/cura-light/icons/24/Infill1.svg +++ b/resources/themes/cura-light/icons/24/Infill1.svg @@ -1,5 +1,4 @@ - - - - - - diff --git a/resources/themes/cura-light/icons/24/LayFlatOnFace.svg b/resources/themes/cura-light/icons/24/LayFlatOnFace.svg index 2f29d5a0dd..1f2b42f6fe 100755 --- a/resources/themes/cura-light/icons/24/LayFlatOnFace.svg +++ b/resources/themes/cura-light/icons/24/LayFlatOnFace.svg @@ -1,5 +1,4 @@ - - diff --git a/resources/themes/cura-light/icons/24/Lightning.svg b/resources/themes/cura-light/icons/24/Lightning.svg index 04b63e76f6..544fe86df1 100644 --- a/resources/themes/cura-light/icons/24/Lightning.svg +++ b/resources/themes/cura-light/icons/24/Lightning.svg @@ -1,5 +1,4 @@ - diff --git a/resources/themes/cura-light/icons/24/Link.svg b/resources/themes/cura-light/icons/24/Link.svg index e81ec70986..477d977f50 100755 --- a/resources/themes/cura-light/icons/24/Link.svg +++ b/resources/themes/cura-light/icons/24/Link.svg @@ -1,5 +1,4 @@ - - - - diff --git a/resources/themes/cura-light/icons/24/MeshTypeIntersect.svg b/resources/themes/cura-light/icons/24/MeshTypeIntersect.svg index c4c97999e9..0f98747442 100755 --- a/resources/themes/cura-light/icons/24/MeshTypeIntersect.svg +++ b/resources/themes/cura-light/icons/24/MeshTypeIntersect.svg @@ -1,5 +1,4 @@ - diff --git a/resources/themes/cura-light/icons/24/MeshTypeNormal.svg b/resources/themes/cura-light/icons/24/MeshTypeNormal.svg index e1aca7e9cb..d33ab09dda 100755 --- a/resources/themes/cura-light/icons/24/MeshTypeNormal.svg +++ b/resources/themes/cura-light/icons/24/MeshTypeNormal.svg @@ -1,5 +1,4 @@ - diff --git a/resources/themes/cura-light/icons/24/MeshTypeSupport.svg b/resources/themes/cura-light/icons/24/MeshTypeSupport.svg index 812648518b..e9a6d5b095 100755 --- a/resources/themes/cura-light/icons/24/MeshTypeSupport.svg +++ b/resources/themes/cura-light/icons/24/MeshTypeSupport.svg @@ -1,5 +1,4 @@ - diff --git a/resources/themes/cura-light/icons/24/Minus.svg b/resources/themes/cura-light/icons/24/Minus.svg index 31b9046dbf..ebb380a3fa 100755 --- a/resources/themes/cura-light/icons/24/Minus.svg +++ b/resources/themes/cura-light/icons/24/Minus.svg @@ -1,5 +1,4 @@ - diff --git a/resources/themes/cura-light/icons/24/Mirror.svg b/resources/themes/cura-light/icons/24/Mirror.svg index b88556c0dc..cec1fddc84 100755 --- a/resources/themes/cura-light/icons/24/Mirror.svg +++ b/resources/themes/cura-light/icons/24/Mirror.svg @@ -1,5 +1,4 @@ - diff --git a/resources/themes/cura-light/icons/24/Pen.svg b/resources/themes/cura-light/icons/24/Pen.svg index 4a4c41a882..bf57f90e6f 100755 --- a/resources/themes/cura-light/icons/24/Pen.svg +++ b/resources/themes/cura-light/icons/24/Pen.svg @@ -1,5 +1,4 @@ - diff --git a/resources/themes/cura-light/icons/24/Plugin.svg b/resources/themes/cura-light/icons/24/Plugin.svg index 49f94abd3b..95db5e876a 100755 --- a/resources/themes/cura-light/icons/24/Plugin.svg +++ b/resources/themes/cura-light/icons/24/Plugin.svg @@ -1,5 +1,4 @@ - - diff --git a/resources/themes/cura-light/icons/24/PrintQuality.svg b/resources/themes/cura-light/icons/24/PrintQuality.svg index 17c8a03b59..59eeb25c1e 100755 --- a/resources/themes/cura-light/icons/24/PrintQuality.svg +++ b/resources/themes/cura-light/icons/24/PrintQuality.svg @@ -1,5 +1,4 @@ - diff --git a/resources/themes/cura-light/icons/24/PrintShell.svg b/resources/themes/cura-light/icons/24/PrintShell.svg index 08d8decab8..66291153a2 100755 --- a/resources/themes/cura-light/icons/24/PrintShell.svg +++ b/resources/themes/cura-light/icons/24/PrintShell.svg @@ -1,5 +1,4 @@ - diff --git a/resources/themes/cura-light/icons/24/PrintTravel.svg b/resources/themes/cura-light/icons/24/PrintTravel.svg index 0eb42d5c56..cd2f5a8602 100755 --- a/resources/themes/cura-light/icons/24/PrintTravel.svg +++ b/resources/themes/cura-light/icons/24/PrintTravel.svg @@ -1,5 +1,4 @@ - diff --git a/resources/themes/cura-light/icons/24/Printer.svg b/resources/themes/cura-light/icons/24/Printer.svg index 9e08067224..f5f1a50cce 100755 --- a/resources/themes/cura-light/icons/24/Printer.svg +++ b/resources/themes/cura-light/icons/24/Printer.svg @@ -1,5 +1,4 @@ - diff --git a/resources/themes/cura-light/icons/24/PrinterTriple.svg b/resources/themes/cura-light/icons/24/PrinterTriple.svg index faa5d586ea..4530fad98e 100755 --- a/resources/themes/cura-light/icons/24/PrinterTriple.svg +++ b/resources/themes/cura-light/icons/24/PrinterTriple.svg @@ -1,5 +1,4 @@ - diff --git a/resources/themes/cura-light/icons/24/Quick.svg b/resources/themes/cura-light/icons/24/Quick.svg index 71756d09fd..25a5ee0af5 100755 --- a/resources/themes/cura-light/icons/24/Quick.svg +++ b/resources/themes/cura-light/icons/24/Quick.svg @@ -1,5 +1,4 @@ - diff --git a/resources/themes/cura-light/icons/24/Rotate.svg b/resources/themes/cura-light/icons/24/Rotate.svg index 8043df21ba..0b294e399b 100755 --- a/resources/themes/cura-light/icons/24/Rotate.svg +++ b/resources/themes/cura-light/icons/24/Rotate.svg @@ -1,5 +1,4 @@ - diff --git a/resources/themes/cura-light/icons/24/Scale.svg b/resources/themes/cura-light/icons/24/Scale.svg index 372f1188ed..35ae3ceb86 100755 --- a/resources/themes/cura-light/icons/24/Scale.svg +++ b/resources/themes/cura-light/icons/24/Scale.svg @@ -1,5 +1,4 @@ - diff --git a/resources/themes/cura-light/icons/24/ScaleMax.svg b/resources/themes/cura-light/icons/24/ScaleMax.svg index b009a6c0a8..ea264786d3 100755 --- a/resources/themes/cura-light/icons/24/ScaleMax.svg +++ b/resources/themes/cura-light/icons/24/ScaleMax.svg @@ -1,5 +1,4 @@ - diff --git a/resources/themes/cura-light/icons/24/Shield.svg b/resources/themes/cura-light/icons/24/Shield.svg index cc5ec7ffcf..d44cf8ea73 100755 --- a/resources/themes/cura-light/icons/24/Shield.svg +++ b/resources/themes/cura-light/icons/24/Shield.svg @@ -1,5 +1,4 @@ - - - - - - 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 From 5cb56b74e263356293781a53c77402e8e55220cb Mon Sep 17 00:00:00 2001 From: jelle Spijker Date: Wed, 28 Apr 2021 11:24:33 +0200 Subject: [PATCH 6/9] Updated the ExtruderIcon to not look completely horrible This icon is due for a revisit with ticket: - CURA-8011 Replace extruder/material icon Therefore out-of-scope for this ticket. CURA-8010_new_icons --- resources/qml/ExtruderIcon.qml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/resources/qml/ExtruderIcon.qml b/resources/qml/ExtruderIcon.qml index f719005134..3ec5922fcd 100644 --- a/resources/qml/ExtruderIcon.qml +++ b/resources/qml/ExtruderIcon.qml @@ -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 From 9ea97f7561698ed1b95cfdd92c372d13cd07b34c Mon Sep 17 00:00:00 2001 From: jelle Spijker Date: Wed, 28 Apr 2021 15:45:20 +0200 Subject: [PATCH 7/9] SVG are not correlated to pixel size. Although this deviates from the UX practices. It tended to confuse the programmers ;-) The variances in level of detail for the icons are now placed in the sub-directories. small, default and big. CURA-8010_new_icons --- resources/qml/ExtruderIcon.qml | 2 +- resources/qml/ObjectItemButton.qml | 2 +- .../Recommended/RecommendedSupportSelector.qml | 4 ++-- resources/qml/PrinterSelector/MachineSelector.qml | 6 +++--- resources/qml/Settings/SettingExtruder.qml | 4 ++-- resources/qml/Settings/SettingOptionalExtruder.qml | 4 ++-- .../themes/cura-light/icons/{24 => default}/Adhesion.svg | 0 .../icons/{24 => default}/ArrowDoubleCircleRight.svg | 0 .../cura-light/icons/{24 => default}/ArrowFourWay.svg | 0 .../themes/cura-light/icons/{24 => default}/ArrowReset.svg | 0 .../themes/cura-light/icons/{24 => default}/Bandage.svg | 0 .../themes/cura-light/icons/{24 => default}/BlackMagic.svg | 0 .../themes/cura-light/icons/{24 => default}/Cancel.svg | 0 .../themes/cura-light/icons/{24 => default}/CancelBlock.svg | 0 .../cura-light/icons/{24 => default}/CancelCircle.svg | 0 resources/themes/cura-light/icons/{24 => default}/Check.svg | 0 .../themes/cura-light/icons/{24 => default}/CheckCircle.svg | 0 .../cura-light/icons/{24 => default}/ChevronSingleDown.svg | 0 .../cura-light/icons/{24 => default}/ChevronSingleLeft.svg | 0 .../cura-light/icons/{24 => default}/ChevronSingleRight.svg | 0 .../cura-light/icons/{24 => default}/ChevronSingleUp.svg | 0 .../cura-light/icons/{24 => default}/CircleOutline.svg | 0 resources/themes/cura-light/icons/{24 => default}/Clock.svg | 0 resources/themes/cura-light/icons/{24 => default}/Cloud.svg | 0 .../cura-light/icons/{24 => default}/DualExtrusion.svg | 0 .../themes/cura-light/icons/{24 => default}/Experiment.svg | 0 .../themes/cura-light/icons/{24 => default}/Extruder1.svg | 0 .../themes/cura-light/icons/{24 => default}/Extruder2.svg | 0 .../cura-light/icons/{24 => default}/ExtruderColor.svg | 0 resources/themes/cura-light/icons/{24 => default}/Eye.svg | 0 resources/themes/cura-light/icons/{24 => default}/Fan.svg | 0 .../themes/cura-light/icons/{24 => default}/Folder.svg | 0 .../themes/cura-light/icons/{24 => default}/Formula.svg | 0 resources/themes/cura-light/icons/{24 => default}/Guide.svg | 0 .../themes/cura-light/icons/{24 => default}/Hamburger.svg | 0 resources/themes/cura-light/icons/{24 => default}/House.svg | 0 .../themes/cura-light/icons/{24 => default}/Infill0.svg | 0 .../themes/cura-light/icons/{24 => default}/Infill1.svg | 0 .../themes/cura-light/icons/{24 => default}/Infill2.svg | 0 .../themes/cura-light/icons/{24 => default}/Infill3.svg | 0 .../cura-light/icons/{24 => default}/InfillGradual.svg | 0 .../themes/cura-light/icons/{24 => default}/Information.svg | 0 .../themes/cura-light/icons/{24 => default}/LayFlat.svg | 0 .../cura-light/icons/{24 => default}/LayFlatOnFace.svg | 0 .../themes/cura-light/icons/{24 => default}/Layers.svg | 0 .../themes/cura-light/icons/{24 => default}/Lightning.svg | 0 resources/themes/cura-light/icons/{24 => default}/Link.svg | 0 .../cura-light/icons/{24 => default}/LinkExternal.svg | 0 .../themes/cura-light/icons/{24 => default}/Magnifier.svg | 0 .../themes/cura-light/icons/{24 => default}/MeshType.svg | 0 .../cura-light/icons/{24 => default}/MeshTypeExclude.svg | 0 .../cura-light/icons/{24 => default}/MeshTypeIntersect.svg | 0 .../cura-light/icons/{24 => default}/MeshTypeNormal.svg | 0 .../cura-light/icons/{24 => default}/MeshTypeSupport.svg | 0 resources/themes/cura-light/icons/{24 => default}/Minus.svg | 0 .../themes/cura-light/icons/{24 => default}/Mirror.svg | 0 resources/themes/cura-light/icons/{24 => default}/Pen.svg | 0 .../themes/cura-light/icons/{24 => default}/Plugin.svg | 0 resources/themes/cura-light/icons/{24 => default}/Plus.svg | 0 .../cura-light/icons/{24 => default}/PrintQuality.svg | 0 .../themes/cura-light/icons/{24 => default}/PrintShell.svg | 0 .../cura-light/icons/{24 => default}/PrintTopBottom.svg | 0 .../themes/cura-light/icons/{24 => default}/PrintTravel.svg | 0 .../themes/cura-light/icons/{24 => default}/Printer.svg | 0 .../cura-light/icons/{24 => default}/PrinterTriple.svg | 0 resources/themes/cura-light/icons/{24 => default}/Quick.svg | 0 .../themes/cura-light/icons/{24 => default}/Rotate.svg | 0 resources/themes/cura-light/icons/{24 => default}/Scale.svg | 0 .../themes/cura-light/icons/{24 => default}/ScaleMax.svg | 0 .../themes/cura-light/icons/{24 => default}/Shield.svg | 0 .../themes/cura-light/icons/{24 => default}/Sliders.svg | 0 resources/themes/cura-light/icons/{24 => default}/Solid.svg | 0 .../themes/cura-light/icons/{24 => default}/SpeedOMeter.svg | 0 resources/themes/cura-light/icons/{24 => default}/Spool.svg | 0 .../themes/cura-light/icons/{24 => default}/Sputnik.svg | 0 resources/themes/cura-light/icons/{24 => default}/Star.svg | 0 .../themes/cura-light/icons/{24 => default}/StarFilled.svg | 0 .../themes/cura-light/icons/{24 => default}/Support.svg | 0 .../cura-light/icons/{24 => default}/SupportBlocker.svg | 0 .../themes/cura-light/icons/{24 => default}/ThreeDots.svg | 0 .../cura-light/icons/{24 => default}/UltimakerCura.svg | 0 .../themes/cura-light/icons/{24 => default}/View3D.svg | 0 .../themes/cura-light/icons/{24 => default}/ViewFront.svg | 0 .../themes/cura-light/icons/{24 => default}/ViewLeft.svg | 0 .../themes/cura-light/icons/{24 => default}/ViewRight.svg | 0 .../themes/cura-light/icons/{24 => default}/ViewTop.svg | 0 .../themes/cura-light/icons/{24 => default}/Warning.svg | 0 .../themes/cura-light/icons/{30 => large}/Extruder.svg | 0 .../themes/cura-light/icons/{12 => small}/CheckBlueBG.svg | 0 .../themes/cura-light/icons/{12 => small}/CloudBlueBG.svg | 0 .../themes/cura-light/icons/{12 => small}/CloudGreyBG.svg | 0 resources/themes/cura-light/icons/{12 => small}/Dot.svg | 0 resources/themes/cura-light/styles.qml | 4 ++-- 93 files changed, 13 insertions(+), 13 deletions(-) rename resources/themes/cura-light/icons/{24 => default}/Adhesion.svg (100%) rename resources/themes/cura-light/icons/{24 => default}/ArrowDoubleCircleRight.svg (100%) rename resources/themes/cura-light/icons/{24 => default}/ArrowFourWay.svg (100%) rename resources/themes/cura-light/icons/{24 => default}/ArrowReset.svg (100%) rename resources/themes/cura-light/icons/{24 => default}/Bandage.svg (100%) rename resources/themes/cura-light/icons/{24 => default}/BlackMagic.svg (100%) rename resources/themes/cura-light/icons/{24 => default}/Cancel.svg (100%) rename resources/themes/cura-light/icons/{24 => default}/CancelBlock.svg (100%) rename resources/themes/cura-light/icons/{24 => default}/CancelCircle.svg (100%) rename resources/themes/cura-light/icons/{24 => default}/Check.svg (100%) rename resources/themes/cura-light/icons/{24 => default}/CheckCircle.svg (100%) rename resources/themes/cura-light/icons/{24 => default}/ChevronSingleDown.svg (100%) rename resources/themes/cura-light/icons/{24 => default}/ChevronSingleLeft.svg (100%) rename resources/themes/cura-light/icons/{24 => default}/ChevronSingleRight.svg (100%) rename resources/themes/cura-light/icons/{24 => default}/ChevronSingleUp.svg (100%) rename resources/themes/cura-light/icons/{24 => default}/CircleOutline.svg (100%) rename resources/themes/cura-light/icons/{24 => default}/Clock.svg (100%) rename resources/themes/cura-light/icons/{24 => default}/Cloud.svg (100%) rename resources/themes/cura-light/icons/{24 => default}/DualExtrusion.svg (100%) rename resources/themes/cura-light/icons/{24 => default}/Experiment.svg (100%) rename resources/themes/cura-light/icons/{24 => default}/Extruder1.svg (100%) rename resources/themes/cura-light/icons/{24 => default}/Extruder2.svg (100%) rename resources/themes/cura-light/icons/{24 => default}/ExtruderColor.svg (100%) rename resources/themes/cura-light/icons/{24 => default}/Eye.svg (100%) rename resources/themes/cura-light/icons/{24 => default}/Fan.svg (100%) rename resources/themes/cura-light/icons/{24 => default}/Folder.svg (100%) rename resources/themes/cura-light/icons/{24 => default}/Formula.svg (100%) rename resources/themes/cura-light/icons/{24 => default}/Guide.svg (100%) rename resources/themes/cura-light/icons/{24 => default}/Hamburger.svg (100%) rename resources/themes/cura-light/icons/{24 => default}/House.svg (100%) rename resources/themes/cura-light/icons/{24 => default}/Infill0.svg (100%) rename resources/themes/cura-light/icons/{24 => default}/Infill1.svg (100%) rename resources/themes/cura-light/icons/{24 => default}/Infill2.svg (100%) rename resources/themes/cura-light/icons/{24 => default}/Infill3.svg (100%) rename resources/themes/cura-light/icons/{24 => default}/InfillGradual.svg (100%) rename resources/themes/cura-light/icons/{24 => default}/Information.svg (100%) rename resources/themes/cura-light/icons/{24 => default}/LayFlat.svg (100%) rename resources/themes/cura-light/icons/{24 => default}/LayFlatOnFace.svg (100%) rename resources/themes/cura-light/icons/{24 => default}/Layers.svg (100%) rename resources/themes/cura-light/icons/{24 => default}/Lightning.svg (100%) rename resources/themes/cura-light/icons/{24 => default}/Link.svg (100%) rename resources/themes/cura-light/icons/{24 => default}/LinkExternal.svg (100%) rename resources/themes/cura-light/icons/{24 => default}/Magnifier.svg (100%) rename resources/themes/cura-light/icons/{24 => default}/MeshType.svg (100%) rename resources/themes/cura-light/icons/{24 => default}/MeshTypeExclude.svg (100%) rename resources/themes/cura-light/icons/{24 => default}/MeshTypeIntersect.svg (100%) rename resources/themes/cura-light/icons/{24 => default}/MeshTypeNormal.svg (100%) rename resources/themes/cura-light/icons/{24 => default}/MeshTypeSupport.svg (100%) rename resources/themes/cura-light/icons/{24 => default}/Minus.svg (100%) rename resources/themes/cura-light/icons/{24 => default}/Mirror.svg (100%) rename resources/themes/cura-light/icons/{24 => default}/Pen.svg (100%) rename resources/themes/cura-light/icons/{24 => default}/Plugin.svg (100%) rename resources/themes/cura-light/icons/{24 => default}/Plus.svg (100%) rename resources/themes/cura-light/icons/{24 => default}/PrintQuality.svg (100%) rename resources/themes/cura-light/icons/{24 => default}/PrintShell.svg (100%) rename resources/themes/cura-light/icons/{24 => default}/PrintTopBottom.svg (100%) rename resources/themes/cura-light/icons/{24 => default}/PrintTravel.svg (100%) rename resources/themes/cura-light/icons/{24 => default}/Printer.svg (100%) rename resources/themes/cura-light/icons/{24 => default}/PrinterTriple.svg (100%) rename resources/themes/cura-light/icons/{24 => default}/Quick.svg (100%) rename resources/themes/cura-light/icons/{24 => default}/Rotate.svg (100%) rename resources/themes/cura-light/icons/{24 => default}/Scale.svg (100%) rename resources/themes/cura-light/icons/{24 => default}/ScaleMax.svg (100%) rename resources/themes/cura-light/icons/{24 => default}/Shield.svg (100%) rename resources/themes/cura-light/icons/{24 => default}/Sliders.svg (100%) rename resources/themes/cura-light/icons/{24 => default}/Solid.svg (100%) rename resources/themes/cura-light/icons/{24 => default}/SpeedOMeter.svg (100%) rename resources/themes/cura-light/icons/{24 => default}/Spool.svg (100%) rename resources/themes/cura-light/icons/{24 => default}/Sputnik.svg (100%) rename resources/themes/cura-light/icons/{24 => default}/Star.svg (100%) rename resources/themes/cura-light/icons/{24 => default}/StarFilled.svg (100%) rename resources/themes/cura-light/icons/{24 => default}/Support.svg (100%) rename resources/themes/cura-light/icons/{24 => default}/SupportBlocker.svg (100%) rename resources/themes/cura-light/icons/{24 => default}/ThreeDots.svg (100%) rename resources/themes/cura-light/icons/{24 => default}/UltimakerCura.svg (100%) rename resources/themes/cura-light/icons/{24 => default}/View3D.svg (100%) rename resources/themes/cura-light/icons/{24 => default}/ViewFront.svg (100%) rename resources/themes/cura-light/icons/{24 => default}/ViewLeft.svg (100%) rename resources/themes/cura-light/icons/{24 => default}/ViewRight.svg (100%) rename resources/themes/cura-light/icons/{24 => default}/ViewTop.svg (100%) rename resources/themes/cura-light/icons/{24 => default}/Warning.svg (100%) rename resources/themes/cura-light/icons/{30 => large}/Extruder.svg (100%) rename resources/themes/cura-light/icons/{12 => small}/CheckBlueBG.svg (100%) rename resources/themes/cura-light/icons/{12 => small}/CloudBlueBG.svg (100%) rename resources/themes/cura-light/icons/{12 => small}/CloudGreyBG.svg (100%) rename resources/themes/cura-light/icons/{12 => small}/Dot.svg (100%) diff --git a/resources/qml/ExtruderIcon.qml b/resources/qml/ExtruderIcon.qml index 3ec5922fcd..40d5b2362e 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", "30") + source: UM.Theme.getIcon("Extruder", "large") color: extruderEnabled ? materialColor: UM.Theme.getColor("disabled") } diff --git a/resources/qml/ObjectItemButton.qml b/resources/qml/ObjectItemButton.qml index 07b9b9add6..d634927a7e 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", "30") + source: UM.Theme.getIcon("Extruder", "large") color: extruderColor visible: showExtruderSwatches && extruderColor != "" } diff --git a/resources/qml/PrintSetupSelector/Recommended/RecommendedSupportSelector.qml b/resources/qml/PrintSetupSelector/Recommended/RecommendedSupportSelector.qml index 8b66f9b34e..ab1b5bf3e9 100644 --- a/resources/qml/PrintSetupSelector/Recommended/RecommendedSupportSelector.qml +++ b/resources/qml/PrintSetupSelector/Recommended/RecommendedSupportSelector.qml @@ -229,7 +229,7 @@ Item sourceSize.width: width sourceSize.height: height - source: UM.Theme.getIcon("Extruder", "30") + source: UM.Theme.getIcon("Extruder", "large") color: supportExtruderCombobox.color } } @@ -299,7 +299,7 @@ Item sourceSize.width: width sourceSize.height: height - source: UM.Theme.getIcon("Extruder", "30") + source: UM.Theme.getIcon("Extruder", "large") color: supportExtruderCombobox.model.getItem(index).color } } diff --git a/resources/qml/PrinterSelector/MachineSelector.qml b/resources/qml/PrinterSelector/MachineSelector.qml index 51cc3aad19..556bb893cc 100644 --- a/resources/qml/PrinterSelector/MachineSelector.qml +++ b/resources/qml/PrinterSelector/MachineSelector.qml @@ -122,15 +122,15 @@ Cura.ExpandablePopup { if (connectionStatus == "printer_connected") { - return UM.Theme.getIcon("CheckBlueBG", "12") + return UM.Theme.getIcon("CheckBlueBG", "small") } else if (connectionStatus == "printer_cloud_connected") { - return UM.Theme.getIcon("CloudBlueBG", "12") + return UM.Theme.getIcon("CloudBlueBG", "small") } else if (connectionStatus == "printer_cloud_not_available") { - return UM.Theme.getIcon("CloudGreyBG", "12") + return UM.Theme.getIcon("CloudGreyBG", "small") } else { diff --git a/resources/qml/Settings/SettingExtruder.qml b/resources/qml/Settings/SettingExtruder.qml index c7b57097bc..5f0744fe47 100644 --- a/resources/qml/Settings/SettingExtruder.qml +++ b/resources/qml/Settings/SettingExtruder.qml @@ -171,7 +171,7 @@ SettingItem sourceSize.width: width sourceSize.height: height - source: UM.Theme.getIcon("Extruder", "30") + source: UM.Theme.getIcon("Extruder", "large") color: control.color } } @@ -240,7 +240,7 @@ SettingItem sourceSize.width: width sourceSize.height: height - source: UM.Theme.getIcon("Extruder", "30") + source: UM.Theme.getIcon("Extruder", "large") color: control.model.getItem(index).color } } diff --git a/resources/qml/Settings/SettingOptionalExtruder.qml b/resources/qml/Settings/SettingOptionalExtruder.qml index e1bf97f532..deb8f3d478 100644 --- a/resources/qml/Settings/SettingOptionalExtruder.qml +++ b/resources/qml/Settings/SettingOptionalExtruder.qml @@ -172,7 +172,7 @@ SettingItem sourceSize.width: width sourceSize.height: height - source: UM.Theme.getIcon("Extruder", "30") + source: UM.Theme.getIcon("Extruder", "large") color: control.color } } @@ -237,7 +237,7 @@ SettingItem sourceSize.width: width sourceSize.height: height - source: UM.Theme.getIcon("Extruder", "30") + source: UM.Theme.getIcon("Extruder", "large") color: control.model.getItem(index).color } } diff --git a/resources/themes/cura-light/icons/24/Adhesion.svg b/resources/themes/cura-light/icons/default/Adhesion.svg similarity index 100% rename from resources/themes/cura-light/icons/24/Adhesion.svg rename to resources/themes/cura-light/icons/default/Adhesion.svg diff --git a/resources/themes/cura-light/icons/24/ArrowDoubleCircleRight.svg b/resources/themes/cura-light/icons/default/ArrowDoubleCircleRight.svg similarity index 100% rename from resources/themes/cura-light/icons/24/ArrowDoubleCircleRight.svg rename to resources/themes/cura-light/icons/default/ArrowDoubleCircleRight.svg diff --git a/resources/themes/cura-light/icons/24/ArrowFourWay.svg b/resources/themes/cura-light/icons/default/ArrowFourWay.svg similarity index 100% rename from resources/themes/cura-light/icons/24/ArrowFourWay.svg rename to resources/themes/cura-light/icons/default/ArrowFourWay.svg diff --git a/resources/themes/cura-light/icons/24/ArrowReset.svg b/resources/themes/cura-light/icons/default/ArrowReset.svg similarity index 100% rename from resources/themes/cura-light/icons/24/ArrowReset.svg rename to resources/themes/cura-light/icons/default/ArrowReset.svg diff --git a/resources/themes/cura-light/icons/24/Bandage.svg b/resources/themes/cura-light/icons/default/Bandage.svg similarity index 100% rename from resources/themes/cura-light/icons/24/Bandage.svg rename to resources/themes/cura-light/icons/default/Bandage.svg diff --git a/resources/themes/cura-light/icons/24/BlackMagic.svg b/resources/themes/cura-light/icons/default/BlackMagic.svg similarity index 100% rename from resources/themes/cura-light/icons/24/BlackMagic.svg rename to resources/themes/cura-light/icons/default/BlackMagic.svg diff --git a/resources/themes/cura-light/icons/24/Cancel.svg b/resources/themes/cura-light/icons/default/Cancel.svg similarity index 100% rename from resources/themes/cura-light/icons/24/Cancel.svg rename to resources/themes/cura-light/icons/default/Cancel.svg diff --git a/resources/themes/cura-light/icons/24/CancelBlock.svg b/resources/themes/cura-light/icons/default/CancelBlock.svg similarity index 100% rename from resources/themes/cura-light/icons/24/CancelBlock.svg rename to resources/themes/cura-light/icons/default/CancelBlock.svg diff --git a/resources/themes/cura-light/icons/24/CancelCircle.svg b/resources/themes/cura-light/icons/default/CancelCircle.svg similarity index 100% rename from resources/themes/cura-light/icons/24/CancelCircle.svg rename to resources/themes/cura-light/icons/default/CancelCircle.svg diff --git a/resources/themes/cura-light/icons/24/Check.svg b/resources/themes/cura-light/icons/default/Check.svg similarity index 100% rename from resources/themes/cura-light/icons/24/Check.svg rename to resources/themes/cura-light/icons/default/Check.svg diff --git a/resources/themes/cura-light/icons/24/CheckCircle.svg b/resources/themes/cura-light/icons/default/CheckCircle.svg similarity index 100% rename from resources/themes/cura-light/icons/24/CheckCircle.svg rename to resources/themes/cura-light/icons/default/CheckCircle.svg diff --git a/resources/themes/cura-light/icons/24/ChevronSingleDown.svg b/resources/themes/cura-light/icons/default/ChevronSingleDown.svg similarity index 100% rename from resources/themes/cura-light/icons/24/ChevronSingleDown.svg rename to resources/themes/cura-light/icons/default/ChevronSingleDown.svg diff --git a/resources/themes/cura-light/icons/24/ChevronSingleLeft.svg b/resources/themes/cura-light/icons/default/ChevronSingleLeft.svg similarity index 100% rename from resources/themes/cura-light/icons/24/ChevronSingleLeft.svg rename to resources/themes/cura-light/icons/default/ChevronSingleLeft.svg diff --git a/resources/themes/cura-light/icons/24/ChevronSingleRight.svg b/resources/themes/cura-light/icons/default/ChevronSingleRight.svg similarity index 100% rename from resources/themes/cura-light/icons/24/ChevronSingleRight.svg rename to resources/themes/cura-light/icons/default/ChevronSingleRight.svg diff --git a/resources/themes/cura-light/icons/24/ChevronSingleUp.svg b/resources/themes/cura-light/icons/default/ChevronSingleUp.svg similarity index 100% rename from resources/themes/cura-light/icons/24/ChevronSingleUp.svg rename to resources/themes/cura-light/icons/default/ChevronSingleUp.svg diff --git a/resources/themes/cura-light/icons/24/CircleOutline.svg b/resources/themes/cura-light/icons/default/CircleOutline.svg similarity index 100% rename from resources/themes/cura-light/icons/24/CircleOutline.svg rename to resources/themes/cura-light/icons/default/CircleOutline.svg diff --git a/resources/themes/cura-light/icons/24/Clock.svg b/resources/themes/cura-light/icons/default/Clock.svg similarity index 100% rename from resources/themes/cura-light/icons/24/Clock.svg rename to resources/themes/cura-light/icons/default/Clock.svg diff --git a/resources/themes/cura-light/icons/24/Cloud.svg b/resources/themes/cura-light/icons/default/Cloud.svg similarity index 100% rename from resources/themes/cura-light/icons/24/Cloud.svg rename to resources/themes/cura-light/icons/default/Cloud.svg diff --git a/resources/themes/cura-light/icons/24/DualExtrusion.svg b/resources/themes/cura-light/icons/default/DualExtrusion.svg similarity index 100% rename from resources/themes/cura-light/icons/24/DualExtrusion.svg rename to resources/themes/cura-light/icons/default/DualExtrusion.svg diff --git a/resources/themes/cura-light/icons/24/Experiment.svg b/resources/themes/cura-light/icons/default/Experiment.svg similarity index 100% rename from resources/themes/cura-light/icons/24/Experiment.svg rename to resources/themes/cura-light/icons/default/Experiment.svg diff --git a/resources/themes/cura-light/icons/24/Extruder1.svg b/resources/themes/cura-light/icons/default/Extruder1.svg similarity index 100% rename from resources/themes/cura-light/icons/24/Extruder1.svg rename to resources/themes/cura-light/icons/default/Extruder1.svg diff --git a/resources/themes/cura-light/icons/24/Extruder2.svg b/resources/themes/cura-light/icons/default/Extruder2.svg similarity index 100% rename from resources/themes/cura-light/icons/24/Extruder2.svg rename to resources/themes/cura-light/icons/default/Extruder2.svg diff --git a/resources/themes/cura-light/icons/24/ExtruderColor.svg b/resources/themes/cura-light/icons/default/ExtruderColor.svg similarity index 100% rename from resources/themes/cura-light/icons/24/ExtruderColor.svg rename to resources/themes/cura-light/icons/default/ExtruderColor.svg diff --git a/resources/themes/cura-light/icons/24/Eye.svg b/resources/themes/cura-light/icons/default/Eye.svg similarity index 100% rename from resources/themes/cura-light/icons/24/Eye.svg rename to resources/themes/cura-light/icons/default/Eye.svg diff --git a/resources/themes/cura-light/icons/24/Fan.svg b/resources/themes/cura-light/icons/default/Fan.svg similarity index 100% rename from resources/themes/cura-light/icons/24/Fan.svg rename to resources/themes/cura-light/icons/default/Fan.svg diff --git a/resources/themes/cura-light/icons/24/Folder.svg b/resources/themes/cura-light/icons/default/Folder.svg similarity index 100% rename from resources/themes/cura-light/icons/24/Folder.svg rename to resources/themes/cura-light/icons/default/Folder.svg diff --git a/resources/themes/cura-light/icons/24/Formula.svg b/resources/themes/cura-light/icons/default/Formula.svg similarity index 100% rename from resources/themes/cura-light/icons/24/Formula.svg rename to resources/themes/cura-light/icons/default/Formula.svg diff --git a/resources/themes/cura-light/icons/24/Guide.svg b/resources/themes/cura-light/icons/default/Guide.svg similarity index 100% rename from resources/themes/cura-light/icons/24/Guide.svg rename to resources/themes/cura-light/icons/default/Guide.svg diff --git a/resources/themes/cura-light/icons/24/Hamburger.svg b/resources/themes/cura-light/icons/default/Hamburger.svg similarity index 100% rename from resources/themes/cura-light/icons/24/Hamburger.svg rename to resources/themes/cura-light/icons/default/Hamburger.svg diff --git a/resources/themes/cura-light/icons/24/House.svg b/resources/themes/cura-light/icons/default/House.svg similarity index 100% rename from resources/themes/cura-light/icons/24/House.svg rename to resources/themes/cura-light/icons/default/House.svg diff --git a/resources/themes/cura-light/icons/24/Infill0.svg b/resources/themes/cura-light/icons/default/Infill0.svg similarity index 100% rename from resources/themes/cura-light/icons/24/Infill0.svg rename to resources/themes/cura-light/icons/default/Infill0.svg diff --git a/resources/themes/cura-light/icons/24/Infill1.svg b/resources/themes/cura-light/icons/default/Infill1.svg similarity index 100% rename from resources/themes/cura-light/icons/24/Infill1.svg rename to resources/themes/cura-light/icons/default/Infill1.svg diff --git a/resources/themes/cura-light/icons/24/Infill2.svg b/resources/themes/cura-light/icons/default/Infill2.svg similarity index 100% rename from resources/themes/cura-light/icons/24/Infill2.svg rename to resources/themes/cura-light/icons/default/Infill2.svg diff --git a/resources/themes/cura-light/icons/24/Infill3.svg b/resources/themes/cura-light/icons/default/Infill3.svg similarity index 100% rename from resources/themes/cura-light/icons/24/Infill3.svg rename to resources/themes/cura-light/icons/default/Infill3.svg diff --git a/resources/themes/cura-light/icons/24/InfillGradual.svg b/resources/themes/cura-light/icons/default/InfillGradual.svg similarity index 100% rename from resources/themes/cura-light/icons/24/InfillGradual.svg rename to resources/themes/cura-light/icons/default/InfillGradual.svg diff --git a/resources/themes/cura-light/icons/24/Information.svg b/resources/themes/cura-light/icons/default/Information.svg similarity index 100% rename from resources/themes/cura-light/icons/24/Information.svg rename to resources/themes/cura-light/icons/default/Information.svg diff --git a/resources/themes/cura-light/icons/24/LayFlat.svg b/resources/themes/cura-light/icons/default/LayFlat.svg similarity index 100% rename from resources/themes/cura-light/icons/24/LayFlat.svg rename to resources/themes/cura-light/icons/default/LayFlat.svg diff --git a/resources/themes/cura-light/icons/24/LayFlatOnFace.svg b/resources/themes/cura-light/icons/default/LayFlatOnFace.svg similarity index 100% rename from resources/themes/cura-light/icons/24/LayFlatOnFace.svg rename to resources/themes/cura-light/icons/default/LayFlatOnFace.svg diff --git a/resources/themes/cura-light/icons/24/Layers.svg b/resources/themes/cura-light/icons/default/Layers.svg similarity index 100% rename from resources/themes/cura-light/icons/24/Layers.svg rename to resources/themes/cura-light/icons/default/Layers.svg diff --git a/resources/themes/cura-light/icons/24/Lightning.svg b/resources/themes/cura-light/icons/default/Lightning.svg similarity index 100% rename from resources/themes/cura-light/icons/24/Lightning.svg rename to resources/themes/cura-light/icons/default/Lightning.svg diff --git a/resources/themes/cura-light/icons/24/Link.svg b/resources/themes/cura-light/icons/default/Link.svg similarity index 100% rename from resources/themes/cura-light/icons/24/Link.svg rename to resources/themes/cura-light/icons/default/Link.svg diff --git a/resources/themes/cura-light/icons/24/LinkExternal.svg b/resources/themes/cura-light/icons/default/LinkExternal.svg similarity index 100% rename from resources/themes/cura-light/icons/24/LinkExternal.svg rename to resources/themes/cura-light/icons/default/LinkExternal.svg diff --git a/resources/themes/cura-light/icons/24/Magnifier.svg b/resources/themes/cura-light/icons/default/Magnifier.svg similarity index 100% rename from resources/themes/cura-light/icons/24/Magnifier.svg rename to resources/themes/cura-light/icons/default/Magnifier.svg diff --git a/resources/themes/cura-light/icons/24/MeshType.svg b/resources/themes/cura-light/icons/default/MeshType.svg similarity index 100% rename from resources/themes/cura-light/icons/24/MeshType.svg rename to resources/themes/cura-light/icons/default/MeshType.svg diff --git a/resources/themes/cura-light/icons/24/MeshTypeExclude.svg b/resources/themes/cura-light/icons/default/MeshTypeExclude.svg similarity index 100% rename from resources/themes/cura-light/icons/24/MeshTypeExclude.svg rename to resources/themes/cura-light/icons/default/MeshTypeExclude.svg diff --git a/resources/themes/cura-light/icons/24/MeshTypeIntersect.svg b/resources/themes/cura-light/icons/default/MeshTypeIntersect.svg similarity index 100% rename from resources/themes/cura-light/icons/24/MeshTypeIntersect.svg rename to resources/themes/cura-light/icons/default/MeshTypeIntersect.svg diff --git a/resources/themes/cura-light/icons/24/MeshTypeNormal.svg b/resources/themes/cura-light/icons/default/MeshTypeNormal.svg similarity index 100% rename from resources/themes/cura-light/icons/24/MeshTypeNormal.svg rename to resources/themes/cura-light/icons/default/MeshTypeNormal.svg diff --git a/resources/themes/cura-light/icons/24/MeshTypeSupport.svg b/resources/themes/cura-light/icons/default/MeshTypeSupport.svg similarity index 100% rename from resources/themes/cura-light/icons/24/MeshTypeSupport.svg rename to resources/themes/cura-light/icons/default/MeshTypeSupport.svg diff --git a/resources/themes/cura-light/icons/24/Minus.svg b/resources/themes/cura-light/icons/default/Minus.svg similarity index 100% rename from resources/themes/cura-light/icons/24/Minus.svg rename to resources/themes/cura-light/icons/default/Minus.svg diff --git a/resources/themes/cura-light/icons/24/Mirror.svg b/resources/themes/cura-light/icons/default/Mirror.svg similarity index 100% rename from resources/themes/cura-light/icons/24/Mirror.svg rename to resources/themes/cura-light/icons/default/Mirror.svg diff --git a/resources/themes/cura-light/icons/24/Pen.svg b/resources/themes/cura-light/icons/default/Pen.svg similarity index 100% rename from resources/themes/cura-light/icons/24/Pen.svg rename to resources/themes/cura-light/icons/default/Pen.svg diff --git a/resources/themes/cura-light/icons/24/Plugin.svg b/resources/themes/cura-light/icons/default/Plugin.svg similarity index 100% rename from resources/themes/cura-light/icons/24/Plugin.svg rename to resources/themes/cura-light/icons/default/Plugin.svg diff --git a/resources/themes/cura-light/icons/24/Plus.svg b/resources/themes/cura-light/icons/default/Plus.svg similarity index 100% rename from resources/themes/cura-light/icons/24/Plus.svg rename to resources/themes/cura-light/icons/default/Plus.svg diff --git a/resources/themes/cura-light/icons/24/PrintQuality.svg b/resources/themes/cura-light/icons/default/PrintQuality.svg similarity index 100% rename from resources/themes/cura-light/icons/24/PrintQuality.svg rename to resources/themes/cura-light/icons/default/PrintQuality.svg diff --git a/resources/themes/cura-light/icons/24/PrintShell.svg b/resources/themes/cura-light/icons/default/PrintShell.svg similarity index 100% rename from resources/themes/cura-light/icons/24/PrintShell.svg rename to resources/themes/cura-light/icons/default/PrintShell.svg diff --git a/resources/themes/cura-light/icons/24/PrintTopBottom.svg b/resources/themes/cura-light/icons/default/PrintTopBottom.svg similarity index 100% rename from resources/themes/cura-light/icons/24/PrintTopBottom.svg rename to resources/themes/cura-light/icons/default/PrintTopBottom.svg diff --git a/resources/themes/cura-light/icons/24/PrintTravel.svg b/resources/themes/cura-light/icons/default/PrintTravel.svg similarity index 100% rename from resources/themes/cura-light/icons/24/PrintTravel.svg rename to resources/themes/cura-light/icons/default/PrintTravel.svg diff --git a/resources/themes/cura-light/icons/24/Printer.svg b/resources/themes/cura-light/icons/default/Printer.svg similarity index 100% rename from resources/themes/cura-light/icons/24/Printer.svg rename to resources/themes/cura-light/icons/default/Printer.svg diff --git a/resources/themes/cura-light/icons/24/PrinterTriple.svg b/resources/themes/cura-light/icons/default/PrinterTriple.svg similarity index 100% rename from resources/themes/cura-light/icons/24/PrinterTriple.svg rename to resources/themes/cura-light/icons/default/PrinterTriple.svg diff --git a/resources/themes/cura-light/icons/24/Quick.svg b/resources/themes/cura-light/icons/default/Quick.svg similarity index 100% rename from resources/themes/cura-light/icons/24/Quick.svg rename to resources/themes/cura-light/icons/default/Quick.svg diff --git a/resources/themes/cura-light/icons/24/Rotate.svg b/resources/themes/cura-light/icons/default/Rotate.svg similarity index 100% rename from resources/themes/cura-light/icons/24/Rotate.svg rename to resources/themes/cura-light/icons/default/Rotate.svg diff --git a/resources/themes/cura-light/icons/24/Scale.svg b/resources/themes/cura-light/icons/default/Scale.svg similarity index 100% rename from resources/themes/cura-light/icons/24/Scale.svg rename to resources/themes/cura-light/icons/default/Scale.svg diff --git a/resources/themes/cura-light/icons/24/ScaleMax.svg b/resources/themes/cura-light/icons/default/ScaleMax.svg similarity index 100% rename from resources/themes/cura-light/icons/24/ScaleMax.svg rename to resources/themes/cura-light/icons/default/ScaleMax.svg diff --git a/resources/themes/cura-light/icons/24/Shield.svg b/resources/themes/cura-light/icons/default/Shield.svg similarity index 100% rename from resources/themes/cura-light/icons/24/Shield.svg rename to resources/themes/cura-light/icons/default/Shield.svg diff --git a/resources/themes/cura-light/icons/24/Sliders.svg b/resources/themes/cura-light/icons/default/Sliders.svg similarity index 100% rename from resources/themes/cura-light/icons/24/Sliders.svg rename to resources/themes/cura-light/icons/default/Sliders.svg diff --git a/resources/themes/cura-light/icons/24/Solid.svg b/resources/themes/cura-light/icons/default/Solid.svg similarity index 100% rename from resources/themes/cura-light/icons/24/Solid.svg rename to resources/themes/cura-light/icons/default/Solid.svg diff --git a/resources/themes/cura-light/icons/24/SpeedOMeter.svg b/resources/themes/cura-light/icons/default/SpeedOMeter.svg similarity index 100% rename from resources/themes/cura-light/icons/24/SpeedOMeter.svg rename to resources/themes/cura-light/icons/default/SpeedOMeter.svg diff --git a/resources/themes/cura-light/icons/24/Spool.svg b/resources/themes/cura-light/icons/default/Spool.svg similarity index 100% rename from resources/themes/cura-light/icons/24/Spool.svg rename to resources/themes/cura-light/icons/default/Spool.svg diff --git a/resources/themes/cura-light/icons/24/Sputnik.svg b/resources/themes/cura-light/icons/default/Sputnik.svg similarity index 100% rename from resources/themes/cura-light/icons/24/Sputnik.svg rename to resources/themes/cura-light/icons/default/Sputnik.svg diff --git a/resources/themes/cura-light/icons/24/Star.svg b/resources/themes/cura-light/icons/default/Star.svg similarity index 100% rename from resources/themes/cura-light/icons/24/Star.svg rename to resources/themes/cura-light/icons/default/Star.svg diff --git a/resources/themes/cura-light/icons/24/StarFilled.svg b/resources/themes/cura-light/icons/default/StarFilled.svg similarity index 100% rename from resources/themes/cura-light/icons/24/StarFilled.svg rename to resources/themes/cura-light/icons/default/StarFilled.svg diff --git a/resources/themes/cura-light/icons/24/Support.svg b/resources/themes/cura-light/icons/default/Support.svg similarity index 100% rename from resources/themes/cura-light/icons/24/Support.svg rename to resources/themes/cura-light/icons/default/Support.svg diff --git a/resources/themes/cura-light/icons/24/SupportBlocker.svg b/resources/themes/cura-light/icons/default/SupportBlocker.svg similarity index 100% rename from resources/themes/cura-light/icons/24/SupportBlocker.svg rename to resources/themes/cura-light/icons/default/SupportBlocker.svg diff --git a/resources/themes/cura-light/icons/24/ThreeDots.svg b/resources/themes/cura-light/icons/default/ThreeDots.svg similarity index 100% rename from resources/themes/cura-light/icons/24/ThreeDots.svg rename to resources/themes/cura-light/icons/default/ThreeDots.svg diff --git a/resources/themes/cura-light/icons/24/UltimakerCura.svg b/resources/themes/cura-light/icons/default/UltimakerCura.svg similarity index 100% rename from resources/themes/cura-light/icons/24/UltimakerCura.svg rename to resources/themes/cura-light/icons/default/UltimakerCura.svg diff --git a/resources/themes/cura-light/icons/24/View3D.svg b/resources/themes/cura-light/icons/default/View3D.svg similarity index 100% rename from resources/themes/cura-light/icons/24/View3D.svg rename to resources/themes/cura-light/icons/default/View3D.svg diff --git a/resources/themes/cura-light/icons/24/ViewFront.svg b/resources/themes/cura-light/icons/default/ViewFront.svg similarity index 100% rename from resources/themes/cura-light/icons/24/ViewFront.svg rename to resources/themes/cura-light/icons/default/ViewFront.svg diff --git a/resources/themes/cura-light/icons/24/ViewLeft.svg b/resources/themes/cura-light/icons/default/ViewLeft.svg similarity index 100% rename from resources/themes/cura-light/icons/24/ViewLeft.svg rename to resources/themes/cura-light/icons/default/ViewLeft.svg diff --git a/resources/themes/cura-light/icons/24/ViewRight.svg b/resources/themes/cura-light/icons/default/ViewRight.svg similarity index 100% rename from resources/themes/cura-light/icons/24/ViewRight.svg rename to resources/themes/cura-light/icons/default/ViewRight.svg diff --git a/resources/themes/cura-light/icons/24/ViewTop.svg b/resources/themes/cura-light/icons/default/ViewTop.svg similarity index 100% rename from resources/themes/cura-light/icons/24/ViewTop.svg rename to resources/themes/cura-light/icons/default/ViewTop.svg diff --git a/resources/themes/cura-light/icons/24/Warning.svg b/resources/themes/cura-light/icons/default/Warning.svg similarity index 100% rename from resources/themes/cura-light/icons/24/Warning.svg rename to resources/themes/cura-light/icons/default/Warning.svg diff --git a/resources/themes/cura-light/icons/30/Extruder.svg b/resources/themes/cura-light/icons/large/Extruder.svg similarity index 100% rename from resources/themes/cura-light/icons/30/Extruder.svg rename to resources/themes/cura-light/icons/large/Extruder.svg diff --git a/resources/themes/cura-light/icons/12/CheckBlueBG.svg b/resources/themes/cura-light/icons/small/CheckBlueBG.svg similarity index 100% rename from resources/themes/cura-light/icons/12/CheckBlueBG.svg rename to resources/themes/cura-light/icons/small/CheckBlueBG.svg diff --git a/resources/themes/cura-light/icons/12/CloudBlueBG.svg b/resources/themes/cura-light/icons/small/CloudBlueBG.svg similarity index 100% rename from resources/themes/cura-light/icons/12/CloudBlueBG.svg rename to resources/themes/cura-light/icons/small/CloudBlueBG.svg diff --git a/resources/themes/cura-light/icons/12/CloudGreyBG.svg b/resources/themes/cura-light/icons/small/CloudGreyBG.svg similarity index 100% rename from resources/themes/cura-light/icons/12/CloudGreyBG.svg rename to resources/themes/cura-light/icons/small/CloudGreyBG.svg diff --git a/resources/themes/cura-light/icons/12/Dot.svg b/resources/themes/cura-light/icons/small/Dot.svg similarity index 100% rename from resources/themes/cura-light/icons/12/Dot.svg rename to resources/themes/cura-light/icons/small/Dot.svg diff --git a/resources/themes/cura-light/styles.qml b/resources/themes/cura-light/styles.qml index 766d22914c..e7cf39a164 100755 --- a/resources/themes/cura-light/styles.qml +++ b/resources/themes/cura-light/styles.qml @@ -422,7 +422,7 @@ QtObject height: Math.round(parent.height / 2.5) sourceSize.height: width color: Theme.getColor("checkbox_mark") - source: control.exclusiveGroup ? Theme.getIcon("Dot", "12") : Theme.getIcon("Check") + source: control.exclusiveGroup ? Theme.getIcon("Dot", "small") : Theme.getIcon("Check") opacity: control.checked Behavior on opacity { NumberAnimation { duration: 100; } } } @@ -472,7 +472,7 @@ QtObject } else { - return control.exclusiveGroup ? Theme.getIcon("Dot", "12") : Theme.getIcon("Check"); + return control.exclusiveGroup ? Theme.getIcon("Dot", "small") : Theme.getIcon("Check"); } } opacity: control.checked From 247412b16aedc421f377dbee1d7d85f6a0463f62 Mon Sep 17 00:00:00 2001 From: jelle Spijker Date: Wed, 28 Apr 2021 16:54:26 +0200 Subject: [PATCH 8/9] Implemeted new icons in on-boarding dialog CURA-8010_new_icons --- .../SimulationView/SimulationViewMenuComponent.qml | 2 +- resources/qml/WelcomePages/CloudContent.qml | 6 +++--- .../cura-light/icons/large/PrinterTriple.svg | 14 ++++++++++++++ 3 files changed, 18 insertions(+), 4 deletions(-) create mode 100644 resources/themes/cura-light/icons/large/PrinterTriple.svg diff --git a/plugins/SimulationView/SimulationViewMenuComponent.qml b/plugins/SimulationView/SimulationViewMenuComponent.qml index 14dcce03b3..f86110c2b5 100644 --- a/plugins/SimulationView/SimulationViewMenuComponent.qml +++ b/plugins/SimulationView/SimulationViewMenuComponent.qml @@ -203,7 +203,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", "30") + source: UM.Theme.getIcon("Extruder", "large") color: model.color } diff --git a/resources/qml/WelcomePages/CloudContent.qml b/resources/qml/WelcomePages/CloudContent.qml index 692ad12a29..276d3a1f1d 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", "large") sourceSize.width: width sourceSize.height: height } diff --git a/resources/themes/cura-light/icons/large/PrinterTriple.svg b/resources/themes/cura-light/icons/large/PrinterTriple.svg new file mode 100644 index 0000000000..9226bdfe11 --- /dev/null +++ b/resources/themes/cura-light/icons/large/PrinterTriple.svg @@ -0,0 +1,14 @@ + + + + + + + + + + + + + From f887db23f6dc1e9e1b71d88389f8b7582256731b Mon Sep 17 00:00:00 2001 From: Kostas Karmas Date: Wed, 28 Apr 2021 18:53:32 +0200 Subject: [PATCH 9/9] Use detail_level to describe the icons (instead of size) Previously the icons were organized according to "size" which could prove to be confusing. This commit fixes that by organizing them according to "detail_level". CURA-8010 --- .../SimulationViewMenuComponent.qml | 2 +- resources/qml/ExtruderIcon.qml | 2 +- resources/qml/ObjectItemButton.qml | 2 +- .../RecommendedSupportSelector.qml | 4 ++-- .../qml/PrinterSelector/MachineSelector.qml | 6 ++--- resources/qml/Settings/SettingExtruder.qml | 4 ++-- .../qml/Settings/SettingOptionalExtruder.qml | 4 ++-- resources/qml/WelcomePages/CloudContent.qml | 2 +- .../cura-light/icons/default/Extruder1.svg | 22 ------------------- .../cura-light/icons/default/Extruder2.svg | 18 --------------- .../icons/default/ExtruderColor.svg | 10 --------- .../icons/{small => low}/CheckBlueBG.svg | 0 .../icons/{small => low}/CloudBlueBG.svg | 0 .../icons/{small => low}/CloudGreyBG.svg | 0 .../cura-light/icons/{small => low}/Dot.svg | 0 .../icons/{large => medium}/Extruder.svg | 0 .../icons/{large => medium}/PrinterTriple.svg | 0 resources/themes/cura-light/styles.qml | 4 ++-- 18 files changed, 15 insertions(+), 65 deletions(-) delete mode 100644 resources/themes/cura-light/icons/default/Extruder1.svg delete mode 100644 resources/themes/cura-light/icons/default/Extruder2.svg delete mode 100644 resources/themes/cura-light/icons/default/ExtruderColor.svg rename resources/themes/cura-light/icons/{small => low}/CheckBlueBG.svg (100%) rename resources/themes/cura-light/icons/{small => low}/CloudBlueBG.svg (100%) rename resources/themes/cura-light/icons/{small => low}/CloudGreyBG.svg (100%) rename resources/themes/cura-light/icons/{small => low}/Dot.svg (100%) rename resources/themes/cura-light/icons/{large => medium}/Extruder.svg (100%) rename resources/themes/cura-light/icons/{large => medium}/PrinterTriple.svg (100%) diff --git a/plugins/SimulationView/SimulationViewMenuComponent.qml b/plugins/SimulationView/SimulationViewMenuComponent.qml index f86110c2b5..7c8e086909 100644 --- a/plugins/SimulationView/SimulationViewMenuComponent.qml +++ b/plugins/SimulationView/SimulationViewMenuComponent.qml @@ -203,7 +203,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", "large") + source: UM.Theme.getIcon("Extruder", "medium") color: model.color } diff --git a/resources/qml/ExtruderIcon.qml b/resources/qml/ExtruderIcon.qml index 40d5b2362e..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", "large") + source: UM.Theme.getIcon("Extruder", "medium") color: extruderEnabled ? materialColor: UM.Theme.getColor("disabled") } diff --git a/resources/qml/ObjectItemButton.qml b/resources/qml/ObjectItemButton.qml index d634927a7e..2b998e0438 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", "large") + source: UM.Theme.getIcon("Extruder", "medium") color: extruderColor visible: showExtruderSwatches && extruderColor != "" } diff --git a/resources/qml/PrintSetupSelector/Recommended/RecommendedSupportSelector.qml b/resources/qml/PrintSetupSelector/Recommended/RecommendedSupportSelector.qml index ab1b5bf3e9..924dcd5ec4 100644 --- a/resources/qml/PrintSetupSelector/Recommended/RecommendedSupportSelector.qml +++ b/resources/qml/PrintSetupSelector/Recommended/RecommendedSupportSelector.qml @@ -229,7 +229,7 @@ Item sourceSize.width: width sourceSize.height: height - source: UM.Theme.getIcon("Extruder", "large") + 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", "large") + source: UM.Theme.getIcon("Extruder", "medium") color: supportExtruderCombobox.model.getItem(index).color } } diff --git a/resources/qml/PrinterSelector/MachineSelector.qml b/resources/qml/PrinterSelector/MachineSelector.qml index 556bb893cc..7c74be1605 100644 --- a/resources/qml/PrinterSelector/MachineSelector.qml +++ b/resources/qml/PrinterSelector/MachineSelector.qml @@ -122,15 +122,15 @@ Cura.ExpandablePopup { if (connectionStatus == "printer_connected") { - return UM.Theme.getIcon("CheckBlueBG", "small") + return UM.Theme.getIcon("CheckBlueBG", "low") } else if (connectionStatus == "printer_cloud_connected") { - return UM.Theme.getIcon("CloudBlueBG", "small") + return UM.Theme.getIcon("CloudBlueBG", "low") } else if (connectionStatus == "printer_cloud_not_available") { - return UM.Theme.getIcon("CloudGreyBG", "small") + return UM.Theme.getIcon("CloudGreyBG", "low") } else { diff --git a/resources/qml/Settings/SettingExtruder.qml b/resources/qml/Settings/SettingExtruder.qml index 5f0744fe47..995e1103f3 100644 --- a/resources/qml/Settings/SettingExtruder.qml +++ b/resources/qml/Settings/SettingExtruder.qml @@ -171,7 +171,7 @@ SettingItem sourceSize.width: width sourceSize.height: height - source: UM.Theme.getIcon("Extruder", "large") + 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", "large") + source: UM.Theme.getIcon("Extruder", "medium") color: control.model.getItem(index).color } } diff --git a/resources/qml/Settings/SettingOptionalExtruder.qml b/resources/qml/Settings/SettingOptionalExtruder.qml index deb8f3d478..5b1da6b785 100644 --- a/resources/qml/Settings/SettingOptionalExtruder.qml +++ b/resources/qml/Settings/SettingOptionalExtruder.qml @@ -172,7 +172,7 @@ SettingItem sourceSize.width: width sourceSize.height: height - source: UM.Theme.getIcon("Extruder", "large") + 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", "large") + source: UM.Theme.getIcon("Extruder", "medium") color: control.model.getItem(index).color } } diff --git a/resources/qml/WelcomePages/CloudContent.qml b/resources/qml/WelcomePages/CloudContent.qml index 276d3a1f1d..26e3a2f87c 100644 --- a/resources/qml/WelcomePages/CloudContent.qml +++ b/resources/qml/WelcomePages/CloudContent.qml @@ -172,7 +172,7 @@ Item anchors.horizontalCenter: communityColumn.horizontalCenter fillMode: Image.PreserveAspectFit width: UM.Theme.getSize("welcome_wizard_cloud_content_image").width - source: UM.Theme.getIcon("PrinterTriple", "large") + source: UM.Theme.getIcon("PrinterTriple", "medium") sourceSize.width: width sourceSize.height: height } diff --git a/resources/themes/cura-light/icons/default/Extruder1.svg b/resources/themes/cura-light/icons/default/Extruder1.svg deleted file mode 100644 index b818bab2bc..0000000000 --- a/resources/themes/cura-light/icons/default/Extruder1.svg +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - - - - - - - - - - - - - - diff --git a/resources/themes/cura-light/icons/default/Extruder2.svg b/resources/themes/cura-light/icons/default/Extruder2.svg deleted file mode 100644 index 764170753b..0000000000 --- a/resources/themes/cura-light/icons/default/Extruder2.svg +++ /dev/null @@ -1,18 +0,0 @@ - - - - - - - - - - - diff --git a/resources/themes/cura-light/icons/default/ExtruderColor.svg b/resources/themes/cura-light/icons/default/ExtruderColor.svg deleted file mode 100644 index 08c93163aa..0000000000 --- a/resources/themes/cura-light/icons/default/ExtruderColor.svg +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - diff --git a/resources/themes/cura-light/icons/small/CheckBlueBG.svg b/resources/themes/cura-light/icons/low/CheckBlueBG.svg similarity index 100% rename from resources/themes/cura-light/icons/small/CheckBlueBG.svg rename to resources/themes/cura-light/icons/low/CheckBlueBG.svg diff --git a/resources/themes/cura-light/icons/small/CloudBlueBG.svg b/resources/themes/cura-light/icons/low/CloudBlueBG.svg similarity index 100% rename from resources/themes/cura-light/icons/small/CloudBlueBG.svg rename to resources/themes/cura-light/icons/low/CloudBlueBG.svg diff --git a/resources/themes/cura-light/icons/small/CloudGreyBG.svg b/resources/themes/cura-light/icons/low/CloudGreyBG.svg similarity index 100% rename from resources/themes/cura-light/icons/small/CloudGreyBG.svg rename to resources/themes/cura-light/icons/low/CloudGreyBG.svg diff --git a/resources/themes/cura-light/icons/small/Dot.svg b/resources/themes/cura-light/icons/low/Dot.svg similarity index 100% rename from resources/themes/cura-light/icons/small/Dot.svg rename to resources/themes/cura-light/icons/low/Dot.svg diff --git a/resources/themes/cura-light/icons/large/Extruder.svg b/resources/themes/cura-light/icons/medium/Extruder.svg similarity index 100% rename from resources/themes/cura-light/icons/large/Extruder.svg rename to resources/themes/cura-light/icons/medium/Extruder.svg diff --git a/resources/themes/cura-light/icons/large/PrinterTriple.svg b/resources/themes/cura-light/icons/medium/PrinterTriple.svg similarity index 100% rename from resources/themes/cura-light/icons/large/PrinterTriple.svg rename to resources/themes/cura-light/icons/medium/PrinterTriple.svg diff --git a/resources/themes/cura-light/styles.qml b/resources/themes/cura-light/styles.qml index e7cf39a164..b56080a6c6 100755 --- a/resources/themes/cura-light/styles.qml +++ b/resources/themes/cura-light/styles.qml @@ -422,7 +422,7 @@ QtObject height: Math.round(parent.height / 2.5) sourceSize.height: width color: Theme.getColor("checkbox_mark") - source: control.exclusiveGroup ? Theme.getIcon("Dot", "small") : Theme.getIcon("Check") + source: control.exclusiveGroup ? Theme.getIcon("Dot", "low") : Theme.getIcon("Check") opacity: control.checked Behavior on opacity { NumberAnimation { duration: 100; } } } @@ -472,7 +472,7 @@ QtObject } else { - return control.exclusiveGroup ? Theme.getIcon("Dot", "small") : Theme.getIcon("Check"); + return control.exclusiveGroup ? Theme.getIcon("Dot", "low") : Theme.getIcon("Check"); } } opacity: control.checked