GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-04-22 21:59:37 +08:00
Code Issues Packages Projects Releases Wiki Activity

Unrevert new icon set for all of Cura's interface

Browse Source 
We created a new set of icons for Cura. These icons had to be reverted though because they weren't working out in the interface for the last release yet.
This unreverts them, basically adding them back hoping that we'll get them fixed in time for the next release.

Contributes to issue CURA-8342.

Revert "Revert "Fix merge conflict""

This reverts commit bb20e3307f43edc1ff53cb154d2351ddfe39e158.

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

This reverts commit 70e4e9640e561e18a12870f30c905203ce8ccee7.

Revert "Revert "Fix typo in icon name""

This reverts commit 38ce22ba7c3f40b971bc6e1e0a8e776ca9d51512.

Revert "Revert "Add list for deprecated icons""

This reverts commit 119a957e7f978dbf1ddbcb3b0005bf38e8fed943.

Revert "Revert "Add Function icon""

This reverts commit 760726cf0bb953bb1b0fc277b448f419d4bd2544.

Revert "Revert "Switch out inherit icon""

This reverts commit 26afff609381e2004d194c280f504b6226859bd3.

Revert "Revert "Merge branch 'CURA-8205_Introduce_new_icons_in_Cura' of github.com:Ultimaker/Cura""

This reverts commit 6483db3d47ee052c1a966cdee3af7190577a5769.

Revert "Fix incorrect icons"

This reverts commit 02a4ade2a50a943ff36fd4895bdc9261cf2133eb.
This commit is contained in:
Ghostkeeper 2021-06-28 17:02:37 +02:00
parent 7ff86547ef
commit 0a75c772ed
No known key found for this signature in database
GPG Key ID: D2A8871EE34EC59A
286 changed files with 1249 additions and 1521 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
plugins/3MFReader/WorkspaceDialog.qml
View File

@ -419,7 +419,7 @@ UM.Dialog
width: warningLabel.height
height: width
source: UM.Theme.getIcon("notice")
source: UM.Theme.getIcon("Information")
color: palette.text
}

4
plugins/CuraDrive/src/qml/components/BackupListFooter.qml
View File

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

4
plugins/CuraDrive/src/qml/components/BackupListItem.qml
View File

@ -38,7 +38,7 @@ Item
height: UM.Theme.getSize("section_icon").height
color: UM.Theme.getColor("small_button_text")
hoverColor: UM.Theme.getColor("small_button_text_hover")
iconSource: UM.Theme.getIcon("info")
iconSource: UM.Theme.getIcon("Information")
onClicked: backupListItem.showDetails = !backupListItem.showDetails
}
@ -80,7 +80,7 @@ Item
height: UM.Theme.getSize("message_close").height
color: UM.Theme.getColor("small_button_text")
hoverColor: UM.Theme.getColor("small_button_text_hover")
iconSource: UM.Theme.getIcon("cross1")
iconSource: UM.Theme.getIcon("Cancel")
onClicked: confirmDeleteDialog.visible = true
}
}

12
plugins/CuraDrive/src/qml/components/BackupListItemDetails.qml
View File

@ -1,4 +1,4 @@
// Copyright (c) 2018 Ultimaker B.V.
// Copyright (c) 2021 Ultimaker B.V.
// Cura is released under the terms of the LGPLv3 or higher.
import QtQuick 2.7
@ -17,7 +17,7 @@ ColumnLayout
// Cura version
BackupListItemDetailsRow
{
iconSource: UM.Theme.getIcon("application")
iconSource: UM.Theme.getIcon("UltimakerCura")
label: catalog.i18nc("@backuplist:label", "Cura Version")
value: backupDetailsData.metadata.cura_release
}
@ -25,7 +25,7 @@ ColumnLayout
// Machine count.
BackupListItemDetailsRow
{
iconSource: UM.Theme.getIcon("printer_single")
iconSource: UM.Theme.getIcon("Printer")
label: catalog.i18nc("@backuplist:label", "Machines")
value: backupDetailsData.metadata.machine_count
}
@ -33,7 +33,7 @@ ColumnLayout
// Material count
BackupListItemDetailsRow
{
iconSource: UM.Theme.getIcon("category_material")
iconSource: UM.Theme.getIcon("Spool")
label: catalog.i18nc("@backuplist:label", "Materials")
value: backupDetailsData.metadata.material_count
}
@ -41,7 +41,7 @@ ColumnLayout
// Profile count.
BackupListItemDetailsRow
{
iconSource: UM.Theme.getIcon("settings")
iconSource: UM.Theme.getIcon("Sliders")
label: catalog.i18nc("@backuplist:label", "Profiles")
value: backupDetailsData.metadata.profile_count
}
@ -49,7 +49,7 @@ ColumnLayout
// Plugin count.
BackupListItemDetailsRow
{
iconSource: UM.Theme.getIcon("plugin")
iconSource: UM.Theme.getIcon("Plugin")
label: catalog.i18nc("@backuplist:label", "Plugins")
value: backupDetailsData.metadata.plugin_count
}

2
plugins/MonitorStage/MonitorMain.qml
View File

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

2
plugins/PerObjectSettingsTool/PerObjectCategory.qml
View File

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

10
plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml
View File

@ -80,7 +80,7 @@ Item
{
id: normalButton
text: catalog.i18nc("@label", "Normal model")
iconSource: UM.Theme.getIcon("pos_normal");
iconSource: UM.Theme.getIcon("Infill0");
property bool needBorder: true
checkable: true
onClicked: setMeshType(normalMeshType);
@ -92,7 +92,7 @@ Item
{
id: supportMeshButton
text: catalog.i18nc("@label", "Print as support")
iconSource: UM.Theme.getIcon("pos_print_as_support");
iconSource: UM.Theme.getIcon("MeshTypeSupport");
property bool needBorder: true
checkable:true
onClicked: setMeshType(supportMeshType)
@ -104,7 +104,7 @@ Item
{
id: overlapMeshButton
text: catalog.i18nc("@label", "Modify settings for overlaps")
iconSource: UM.Theme.getIcon("pos_modify_overlaps");
iconSource: UM.Theme.getIcon("MeshTypeIntersect");
property bool needBorder: true
checkable:true
onClicked: setMeshType(infillMeshType)
@ -116,7 +116,7 @@ Item
{
id: antiOverhangMeshButton
text: catalog.i18nc("@label", "Don't support overlaps")
iconSource: UM.Theme.getIcon("pos_modify_dont_support_overlap");
iconSource: UM.Theme.getIcon("BlockSupportOverlaps");
property bool needBorder: true
checkable: true
onClicked: setMeshType(antiOverhangMeshType)
@ -306,7 +306,7 @@ Item
height: width
sourceSize.height: width
color: control.hovered ? UM.Theme.getColor("setting_control_button_hover") : UM.Theme.getColor("setting_control_button")
source: UM.Theme.getIcon("minus")
source: UM.Theme.getIcon("Minus")
}
}
}

2
plugins/PerObjectSettingsTool/__init__.py
View File

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

22
plugins/PerObjectSettingsTool/tool_icon.svg
View File

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

Before

Width:  |  Height:  |  Size: 1.8 KiB

8
plugins/PostProcessingPlugin/PostProcessingPlugin.qml
View File

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

10
plugins/PostProcessingPlugin/Script.svg Executable file
View File

@ -0,0 +1,10 @@
<?xml version="1.0" encoding="iso-8859-1"?>
<svg version="1.1" id="Artwork" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
viewBox="0 0 24 24" style="enable-background:new 0 0 24 24;" xml:space="preserve">
<g>
<polygon style="fill:#1D1C1A;" points="4.4,12 8.2,15.8 6.8,17.2 1.6,12 6.8,6.8 8.2,8.2 "/>
<polygon style="fill:#1D1C1A;" points="22.4,12 17.2,17.2 15.8,15.8 19.6,12 15.8,8.2 17.2,6.8 "/>
<rect x="3.9" y="11" transform="matrix(0.1236 -0.9923 0.9923 0.1236 -1.429 22.4317)" style="fill:#1D1C1A;" width="16.1" height="2"/>
</g>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 600 B

47
plugins/PostProcessingPlugin/postprocessing.svg
View File

@ -1,47 +0,0 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!-- Generator: Adobe Illustrator 16.2.1, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:cc="http://creativecommons.org/ns#"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:svg="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
version="1.1"
id="Layer_1"
x="0px"
y="0px"
width="512px"
height="512px"
viewBox="0 0 512 512"
style="enable-background:new 0 0 512 512;"
xml:space="preserve"
inkscape:version="0.91 r13725"
sodipodi:docname="postprocessing.svg"><metadata
id="metadata9"><rdf:RDF><cc:Work
rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title></dc:title></cc:Work></rdf:RDF></metadata><defs
id="defs7" /><sodipodi:namedview
pagecolor="#ffffff"
bordercolor="#666666"
borderopacity="1"
objecttolerance="10"
gridtolerance="10"
guidetolerance="10"
inkscape:pageopacity="0"
inkscape:pageshadow="2"
inkscape:window-width="1104"
inkscape:window-height="1006"
id="namedview5"
showgrid="false"
inkscape:zoom="1.3359375"
inkscape:cx="256"
inkscape:cy="256"
inkscape:window-x="701"
inkscape:window-y="121"
inkscape:window-maximized="0"
inkscape:current-layer="Layer_1" /><path
d="M 402.15234 0 C 371.74552 4.7369516e-015 345.79114 10.752017 324.21875 32.324219 C 302.57788 53.89652 291.82617 79.851497 291.82617 110.18945 C 291.82617 127.34315 295.26662 143.09419 302.16602 157.44531 L 238.38477 221.20312 C 227.77569 210.95036 218.04331 201.50935 209.66016 193.32422 C 207.33386 190.99792 202.68042 189.48707 198.60938 191.92969 L 191.74609 196.11719 C 165.34252 169.24836 154.17609 158.42965 150.57031 145.40234 C 146.84822 131.79345 150.22148 113.64862 153.71094 106.90234 C 156.61882 101.55183 165.69233 96.550326 173.36914 95.96875 L 183.37109 106.20508 C 185.69739 108.53139 189.30456 108.53139 191.63086 106.20508 L 227.57227 69.681641 C 229.89858 67.355335 229.89858 63.517712 227.57227 61.191406 L 169.53125 2.21875 C 167.20494 -0.10755598 163.48147 -0.10755598 161.27148 2.21875 L 125.33008 38.742188 C 123.00378 41.068494 123.00378 44.906116 125.33008 47.232422 L 129.16992 51.1875 C 129.16992 56.88695 128.35573 65.727167 123.70312 70.496094 C 116.49157 77.823958 102.18413 69.332919 92.878906 75.962891 C 83.689998 82.476548 72.05746 92.944493 64.613281 100.38867 C 57.285417 107.83285 29.138171 137.37722 9.015625 187.16016 C -11.106922 236.94311 4.3632369 283.12 15.296875 295.2168 C 21.11264 301.61414 31.696982 308.12804 29.835938 296.03125 C 27.974892 283.81815 24.951448 241.47942 38.792969 224.14844 C 52.634489 206.81746 70.894726 192.62799 94.623047 191.46484 C 117.42084 190.30169 130.56529 198.09417 160.10938 228.10352 L 156.85156 234.15234 C 154.75788 238.10706 155.92175 243.10728 158.24805 245.43359 C 161.95717 248.74082 172.37305 258.96006 186.52539 273.04297 L 6.9511719 452.54883 C 2.2984329 457.14417 1.1842379e-015 462.71497 0 469.14844 C -1.1842379e-015 475.69681 2.2984329 481.15473 6.9511719 485.51953 L 26.308594 505.22266 C 31.018838 509.76054 36.589603 512 42.908203 512 C 49.341623 512 54.800053 509.76054 59.337891 505.22266 L 238.96875 325.6582 C 317.6609 404.95524 424.21289 513.40234 424.21289 513.40234 L 482.25391 454.43164 C 437.71428 411.9686 358.71135 336.76293 291.93164 272.71484 L 354.68945 209.98047 C 369.08663 216.91399 384.90203 220.37891 402.15234 220.37891 C 425.29988 220.37891 446.52947 213.53073 465.77344 199.83398 C 485.08493 186.1372 498.57775 168.33291 506.31641 146.34961 C 510.08303 135.39222 512 126.69334 512 120.25586 C 512 117.79044 511.24662 115.80572 509.87695 114.16211 C 508.50726 112.5185 506.59041 111.69531 504.125 111.69531 C 502.61835 111.69531 496.86414 114.5734 486.72852 120.39453 C 476.6614 126.21564 465.50054 132.85752 453.37891 140.32227 C 441.18878 147.78698 434.7515 151.75888 433.92969 152.23828 L 386.40234 125.94141 L 386.40234 70.8125 L 458.51562 29.242188 C 461.18649 27.461587 462.48633 25.202356 462.48633 22.394531 C 462.48633 19.586706 461.1865 17.325625 458.51562 15.476562 C 451.32484 10.545729 442.4896 6.780346 432.08008 4.0410156 C 421.60206 1.3701797 411.67159 0 402.15234 0 z "
id="path3" /></svg>
Side by Side

Before

Width:  |  Height:  |  Size: 4.4 KiB

2
plugins/PrepareStage/PrepareMenu.qml
View File

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

2
plugins/SimulationView/SimulationViewMainComponent.qml
View File

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

2
plugins/SimulationView/SimulationViewMenuComponent.qml
View File

@ -211,7 +211,7 @@ Cura.ExpandableComponent
anchors.right: extrudersModelCheckBox.right
width: UM.Theme.getSize("layerview_legend_size").width
height: UM.Theme.getSize("layerview_legend_size").height
source: UM.Theme.getIcon("extruder_button")
source: UM.Theme.getIcon("Extruder", "medium")
color: model.color
}

5
plugins/SimulationView/resources/Pause.svg Executable file
View File

@ -0,0 +1,5 @@
<?xml version="1.0" encoding="iso-8859-1"?>
<svg version="1.1" id="Artwork" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
viewBox="0 0 24 24" style="enable-background:new 0 0 24 24;" xml:space="preserve">
<path style="fill:#000E1A;" d="M8,21H6V3h2V21z M18,3h-2v18h2V3z"/>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 329 B

6
plugins/SimulationView/resources/Play.svg Executable file
View File

@ -0,0 +1,6 @@
<?xml version="1.0" encoding="iso-8859-1"?>
<svg version="1.1" id="Artwork" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
viewBox="0 0 24 24" style="enable-background:new 0 0 24 24;" xml:space="preserve">
<path style="fill:#231F20;" d="M5,20V4c0-0.8,0.9-1.3,1.5-0.9l13,8c0.6,0.4,0.6,1.3,0,1.7l-13,8C5.9,21.3,5,20.8,5,20z M7,5.8v12.4
L17.1,12L7,5.8z"/>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 410 B

79
plugins/SimulationView/resources/simulation_pause.svg
View File

@ -1,79 +0,0 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!-- Created with Inkscape (http://www.inkscape.org/) -->
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:cc="http://creativecommons.org/ns#"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:svg="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
width="6mm"
height="6mm"
viewBox="0 0 5.9999999 6"
version="1.1"
id="svg877"
inkscape:version="0.92.2 (5c3e80d, 2017-08-06)"
sodipodi:docname="simulation_pause2.svg">
<defs
id="defs871" />
<sodipodi:namedview
id="base"
pagecolor="#ffffff"
bordercolor="#666666"
borderopacity="1.0"
inkscape:pageopacity="0.0"
inkscape:pageshadow="2"
inkscape:zoom="15.839192"
inkscape:cx="-5.3551409"
inkscape:cy="17.386031"
inkscape:document-units="mm"
inkscape:current-layer="layer1"
showgrid="false"
inkscape:window-width="2880"
inkscape:window-height="1675"
inkscape:window-x="-13"
inkscape:window-y="-13"
inkscape:window-maximized="1"
fit-margin-top="0"
fit-margin-left="0"
fit-margin-right="0"
fit-margin-bottom="0" />
<metadata
id="metadata874">
<rdf:RDF>
<cc:Work
rdf:about="">
<dc:format>image/svg+xml</dc:format>
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
<dc:title></dc:title>
</cc:Work>
</rdf:RDF>
</metadata>
<g
inkscape:label="Layer 1"
inkscape:groupmode="layer"
id="layer1"
transform="translate(-11.163774,-122.8006)">
<g
id="g825"
transform="matrix(0.26458333,0,0,0.26458333,10.185689,121.85192)">
<rect
y="5"
x="19"
height="20"
width="2.7552757"
id="rect5192"
style="fill:#000000;fill-opacity:1;stroke:none;stroke-width:2.34745646;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
<rect
y="5"
x="9"
height="20"
width="2.7552757"
id="rect5192-5"
style="fill:#000000;fill-opacity:1;stroke:none;stroke-width:2.34745646;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
</g>
</g>
</svg>
Side by Side

Before

Width:  |  Height:  |  Size: 2.4 KiB

78
plugins/SimulationView/resources/simulation_resume.svg
View File

@ -1,78 +0,0 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!-- Created with Inkscape (http://www.inkscape.org/) -->
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:cc="http://creativecommons.org/ns#"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:svg="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
width="6mm"
height="6mm"
viewBox="0 0 6 6"
version="1.1"
id="svg8"
inkscape:version="0.92.2 (5c3e80d, 2017-08-06)"
sodipodi:docname="simulation_resume2.svg">
<defs
id="defs2" />
<sodipodi:namedview
id="base"
pagecolor="#ffffff"
bordercolor="#666666"
borderopacity="1.0"
inkscape:pageopacity="0.0"
inkscape:pageshadow="2"
inkscape:zoom="15.839192"
inkscape:cx="-32.404712"
inkscape:cy="14.267522"
inkscape:document-units="mm"
inkscape:current-layer="layer1"
showgrid="false"
inkscape:window-width="2880"
inkscape:window-height="1675"
inkscape:window-x="-13"
inkscape:window-y="-13"
inkscape:window-maximized="1"
fit-margin-top="0"
fit-margin-left="0"
fit-margin-right="0"
fit-margin-bottom="0" />
<metadata
id="metadata5">
<rdf:RDF>
<cc:Work
rdf:about="">
<dc:format>image/svg+xml</dc:format>
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
<dc:title></dc:title>
</cc:Work>
</rdf:RDF>
</metadata>
<g
inkscape:label="Layer 1"
inkscape:groupmode="layer"
id="layer1"
transform="translate(81.024887,-389.647)">
<path
sodipodi:type="star"
style="fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.50520164;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
id="path847"
sodipodi:sides="3"
sodipodi:cx="-78.732257"
sodipodi:cy="392.65222"
sodipodi:r1="3.0592039"
sodipodi:r2="1.5296021"
sodipodi:arg1="0"
sodipodi:arg2="1.0471976"
inkscape:flatsided="true"
inkscape:rounded="0"
inkscape:randomized="0"
d="m -75.67305,392.65222 -4.588806,2.64935 v -5.2987 z"
inkscape:transform-center-x="0.75529536"
inkscape:transform-center-y="0.40090429" />
</g>
</svg>
Side by Side

Before

Width:  |  Height:  |  Size: 2.4 KiB

2
plugins/SupportEraser/__init__.py
View File

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

14
plugins/SupportEraser/tool_icon.svg
View File

@ -1,14 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<svg width="30px" height="30px" viewBox="0 0 28 28" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<!-- Generator: Sketch 57.1 (83088) - https://sketch.com -->
<title>support_blocker</title>
<desc>Created with Sketch.</desc>
<g id="support_blocker" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
<g id="Group-3" transform="translate(3.000000, 2.000000)">
<g id="Print-as-support-Copy" fill="#000">
<path d="M0.833,19.65 L0.833,22.342 L0,22.3428571 L0.833,19.65 Z M4.166,8.879 L4.166,22.342 L2.499,22.342 L2.499,14.266 L4.166,8.879 Z M7.5,0.8 L7.5,22.342 L5.833,22.342 L5.833,0.8 L7.5,0.8 Z M10.833,0.8 L10.833,22.342 L9.166,22.342 L9.166,0.8 L10.833,0.8 Z M14.166,0.8 L14.166,14 L12.499,14 L12.499,0.8 L14.166,0.8 Z M15.833,8.879 L17.418,14 L15.833,14 L15.833,8.879 Z M4.166,0.8 L4.166,6.139 L2.499,1.351 L2.499,0.8 L4.166,0.8 Z M17.5,0.8 L17.5,1.351 L15.833,6.139 L15.833,0.8 L17.5,0.8 Z" id="Combined-Shape"></path>
</g>
<path d="M12,14 L22,14 L22,24 L12,24 L12,14 Z" id="Rectangle" stroke="#000" stroke-dasharray="1,1"></path>
</g>
</g>
</svg>
Side by Side

Before

Width:  |  Height:  |  Size: 1.2 KiB

7
plugins/Toolbox/resources/images/Shop.svg Executable file
View File

@ -0,0 +1,7 @@
<?xml version="1.0" encoding="iso-8859-1"?>
<svg version="1.1" id="Artwork" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
viewBox="0 0 24 24" style="enable-background:new 0 0 24 24;" xml:space="preserve">
<path style="fill:#000E1A;" d="M19,3H5C3.3,3,2,4.3,2,6v3c0,1.5,0.8,2.7,2,3.4V22h16v-9.6c1.2-0.7,2-2,2-3.4V6C22,4.3,20.7,3,19,3z
M10,5h4v4c0,1.1-0.9,2-2,2s-2-0.9-2-2V5z M4,9V5h4v4c0,1.1-0.9,2-2,2S4,10.1,4,9z M18,20h-4v-5h-4v5H6v-7c1.2,0,2.3-0.5,3-1.4
c0.7,0.8,1.8,1.4,3,1.4s2.3-0.5,3-1.4c0.7,0.8,1.8,1.4,3,1.4V20z M20,9c0,1.1-0.9,2-2,2s-2-0.9-2-2V5h4V9z"/>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 621 B

3
plugins/Toolbox/resources/images/shop.svg
View File

@ -1,3 +0,0 @@
<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24">
<path d="M19,3H5A2.9,2.9,0,0,0,2,6V9a3.9,3.9,0,0,0,2,3.4V22H20V12.4A3.9,3.9,0,0,0,22,9V6A2.9,2.9,0,0,0,19,3ZM10,5h4V9a2,2,0,0,1-4,0ZM4,9V5H8V9A2,2,0,0,1,4,9ZM18,20H14V15H10v5H6V13a3.7,3.7,0,0,0,3-1.4A3.7,3.7,0,0,0,12,13a3.7,3.7,0,0,0,3-1.4A3.7,3.7,0,0,0,18,13ZM20,9a2,2,0,0,1-4,0V5h4Z" />
</svg>
Side by Side

Before

Width:  |  Height:  |  Size: 364 B

2
plugins/Toolbox/resources/qml/components/ToolboxBackColumn.qml
View File

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

2
plugins/Toolbox/resources/qml/components/ToolboxHeader.qml
View File

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

2
plugins/UM3NetworkPrinting/resources/qml/MonitorBuildplateConfiguration.qml
View File

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

4
plugins/UM3NetworkPrinting/resources/qml/MonitorCarousel.qml
View File

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

2
plugins/UM3NetworkPrinting/resources/qml/MonitorIconExtruder.qml
View File

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

12
plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobPreview.qml
View File

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

4
plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml
View File

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

2
plugins/UM3NetworkPrinting/resources/qml/MonitorQueue.qml
View File

@ -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?!)
}

2
plugins/UM3NetworkPrinting/resources/qml/PrinterVideoStream.qml
View File

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

6
plugins/UM3NetworkPrinting/resources/svg/Camera.svg Executable file
View File

@ -0,0 +1,6 @@
<?xml version="1.0" encoding="iso-8859-1"?>
<svg version="1.1" id="Artwork" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
viewBox="0 0 24 24" style="enable-background:new 0 0 24 24;" xml:space="preserve">
<path style="fill:#000E1A;" d="M22,6.4l-4,2V8c0-1.7-1.3-3-3-3H5C3.3,5,2,6.3,2,8v8c0,1.7,1.3,3,3,3h10c1.7,0,3-1.3,3-3v-0.4l4,2
V6.4z M16,17H4V7h12V17z M20,14.4l-2-1c0-0.9,0-1.8,0-2.8l2-1V14.4z"/>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 458 B

7
plugins/UM3NetworkPrinting/resources/svg/CancelCircle.svg Executable file
View File

@ -0,0 +1,7 @@
<?xml version="1.0" encoding="iso-8859-1"?>
<svg version="1.1" id="Artwork" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
viewBox="0 0 24 24" style="enable-background:new 0 0 24 24;" xml:space="preserve">
<path style="fill:#000E1A;" d="M12,2C6.5,2,2,6.5,2,12s4.5,10,10,10s10-4.5,10-10S17.5,2,12,2z M12,20c-4.4,0-8-3.6-8-8s3.6-8,8-8
s8,3.6,8,8S16.4,20,12,20z M16.7,8.7L13.4,12l3.3,3.3l-1.4,1.4L12,13.4l-3.3,3.3l-1.4-1.4l3.3-3.3L7.3,8.7l1.4-1.4l3.3,3.3l3.3-3.3
L16.7,8.7z"/>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 532 B

5
plugins/UM3NetworkPrinting/resources/svg/Check.svg Executable file
View File

@ -0,0 +1,5 @@
<?xml version="1.0" encoding="iso-8859-1"?>
<svg version="1.1" id="Artwork" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
viewBox="0 0 24 24" style="enable-background:new 0 0 24 24;" xml:space="preserve">
<polygon style="fill:#000E1A;" points="9.1,19.4 1.9,12.2 3.3,10.8 9.1,16.6 19.4,6.3 20.8,7.7 "/>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 359 B

9
plugins/UM3NetworkPrinting/resources/svg/CheckCircle.svg Executable file
View File

@ -0,0 +1,9 @@
<?xml version="1.0" encoding="iso-8859-1"?>
<svg version="1.1" id="Artwork" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
viewBox="0 0 24 24" style="enable-background:new 0 0 24 24;" xml:space="preserve">
<g>
<path style="fill:#000E1A;" d="M12,2C6.5,2,2,6.5,2,12c0,5.5,4.5,10,10,10s10-4.5,10-10C22,6.5,17.5,2,12,2z M12,20
c-4.4,0-8-3.6-8-8c0-4.4,3.6-8,8-8s8,3.6,8,8C20,16.4,16.4,20,12,20z"/>
<polygon style="fill:#000E1A;" points="16.3,8.3 11,13.6 7.7,10.3 6.3,11.7 11,16.4 17.7,9.7 "/>
</g>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 554 B

10
plugins/UM3NetworkPrinting/resources/svg/PauseCircle.svg Executable file
View File

@ -0,0 +1,10 @@
<?xml version="1.0" encoding="iso-8859-1"?>
<svg version="1.1" id="Artwork" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
viewBox="0 0 24 24" style="enable-background:new 0 0 24 24;" xml:space="preserve">
<g>
<path style="fill:#000E1A;" d="M12,2C6.5,2,2,6.5,2,12c0,5.5,4.5,10,10,10s10-4.5,10-10C22,6.5,17.5,2,12,2z M12,20
c-4.4,0-8-3.6-8-8c0-4.4,3.6-8,8-8s8,3.6,8,8C20,16.4,16.4,20,12,20z"/>
<rect x="13" y="8" style="fill:#000E1A;" width="2" height="8"/>
<rect x="9" y="8" style="fill:#000E1A;" width="2" height="8"/>
</g>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 586 B

7
plugins/UM3NetworkPrinting/resources/svg/Prohibition.svg Executable file
View File

@ -0,0 +1,7 @@
<?xml version="1.0" encoding="iso-8859-1"?>
<svg version="1.1" id="Artwork" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
viewBox="0 0 24 24" style="enable-background:new 0 0 24 24;" xml:space="preserve">
<path style="fill:#000E1A;" d="M12,2C6.5,2,2,6.5,2,12s4.5,10,10,10s10-4.5,10-10S17.5,2,12,2z M4,12c0-1.8,0.6-3.5,1.7-4.9
l11.2,11.2C15.5,19.4,13.8,20,12,20C7.6,20,4,16.4,4,12z M18.3,16.9L7.1,5.7C8.5,4.6,10.2,4,12,4c4.4,0,8,3.6,8,8
C20,13.8,19.4,15.5,18.3,16.9z"/>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 528 B

6
plugins/UM3NetworkPrinting/resources/svg/Warning.svg Executable file
View File

@ -0,0 +1,6 @@
<?xml version="1.0" encoding="iso-8859-1"?>
<svg version="1.1" id="Artwork" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
viewBox="0 0 24 24" style="enable-background:new 0 0 24 24;" xml:space="preserve">
<path style="fill:#000E1A;" d="M22,18L13.7,3.1c-0.4-0.6-1-1-1.7-1s-1.4,0.4-1.7,1L2,18c-0.3,0.6-0.3,1.4,0,2c0.4,0.6,1,1,1.7,1
h16.6c0.7,0,1.4-0.4,1.7-1C22.4,19.4,22.4,18.7,22,18z M3.7,19L12,4.1L20.3,19H3.7z M11,8h2v6h-2V8z M13,18h-2v-2h2V18z"/>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 507 B

1
plugins/UM3NetworkPrinting/resources/svg/aborted-icon.svg
View File

@ -1 +0,0 @@
<svg id="Layer_1" data-name="Layer 1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 32 32"><title>aborted-icon</title><path d="M16,0A16,16,0,1,0,32,16,16,16,0,0,0,16,0Zm1.69,28.89a13,13,0,1,1,11.2-11.2A13,13,0,0,1,17.69,28.89Z"/><polygon points="20.6 9.28 16 13.88 11.4 9.28 9.28 11.4 13.88 16 9.28 20.6 11.4 22.72 16 18.12 20.6 22.72 22.72 20.6 18.12 16 22.72 11.4 20.6 9.28"/></svg>
Side by Side

Before

Width:  |  Height:  |  Size: 386 B

10
plugins/UM3NetworkPrinting/resources/svg/action-required-icon.svg
View File

@ -1,10 +0,0 @@
<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="24" height="24" viewBox="0 0 24 24">
<defs>
<path id="a" d="M13.774 1.412l9.706 18.665A2 2 0 0 1 21.706 23H2.294A2 2 0 0 1 .52 20.077l9.706-18.665a2 2 0 0 1 3.548 0z"/>
</defs>
<g fill="none" fill-rule="evenodd">
<use fill="#FFF" xlink:href="#a"/>
<path stroke="#000" stroke-width="2.4" d="M12.71 1.966a.8.8 0 0 0-1.42 0L1.584 20.631a.8.8 0 0 0 .71 1.169h19.412a.8.8 0 0 0 .71-1.17L12.71 1.967z"/>
<path fill="#000" d="M13.144 14.995h-2.29L10.5 8h2.998l-.354 6.995zm-2.612 2.502c0-.475.13-.844.388-1.108.258-.263.633-.395 1.125-.395.488 0 .857.132 1.108.395.251.264.377.633.377 1.108 0 .47-.13.836-.39 1.1-.261.263-.626.395-1.095.395-.473 0-.843-.132-1.111-.396-.268-.263-.402-.63-.402-1.1z"/>
</g>
</svg>
Side by Side

Before

Width:  |  Height:  |  Size: 844 B

1
plugins/UM3NetworkPrinting/resources/svg/approved-icon.svg
View File

@ -1 +0,0 @@
<svg id="Layer_1" data-name="Layer 1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 32 32"><title>approved-icon</title><path d="M16,29A13,13,0,1,0,3,16,13,13,0,0,0,16,29ZM8,14.59l6,5.3L23.89,9l2.22,2L14.18,24.11,6,16.83Z" fill="none"/><path d="M16,32A16,16,0,1,0,0,16,16,16,0,0,0,16,32ZM16,3A13,13,0,1,1,3,16,13,13,0,0,1,16,3Z"/><polygon points="26.11 11.01 23.89 8.99 13.96 19.89 8 14.59 6 16.83 14.18 24.11 26.11 11.01"/></svg>
Side by Side

Before

Width:  |  Height:  |  Size: 431 B

6
plugins/UM3NetworkPrinting/resources/svg/blocked-icon.svg
View File

@ -1,6 +0,0 @@
<svg xmlns="http://www.w3.org/2000/svg" width="25" height="24" viewBox="0 0 25 24">
<g fill="none" fill-rule="evenodd" stroke="#000" stroke-width="2.4" transform="translate(.567)">
<circle cx="12" cy="12" r="10.8"/>
<path stroke-linecap="square" d="M5.5 18.5L18.935 5.065"/>
</g>
</svg>
Side by Side

Before

Width:  |  Height:  |  Size: 311 B

8
plugins/UM3NetworkPrinting/resources/svg/camera-icon.svg
View File

@ -1,8 +0,0 @@
<svg width="48px" height="48px" viewBox="0 0 48 48" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<!-- Generator: Sketch 51.3 (57544) - http://www.bohemiancoding.com/sketch -->
<desc>Created with Sketch.</desc>
<defs></defs>
<g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
<path d="M39.0204082,32.810726 L39.0204082,40 L0,40 L0,8 L39.0204082,8 L39.0204082,13.382823 L42.565076,11.9601033 C44.1116852,11.3414006 46.2176038,11.5575311 47.3294911,12.5468926 L48,13.1435139 L48,32.1994839 C48,32.8444894 47.6431099,33.4236728 46.9293296,33.9370341 C45.8586592,34.707076 45.395355,34.5806452 44.4537143,34.5806452 C43.7935857,34.5806452 43.1386795,34.4629571 42.5629467,34.2325919 L39.0204082,32.810726 Z M35.0204082,12 L4,12 L4,36 L35.0204082,36 L35.0204082,26.8950804 L37.7653798,27.9968275 L44,30.4992132 L44,15.6943364 L35.0204082,19.298468 L35.0204082,12 Z" id="Shape" fill="#FFFFFF" fill-rule="nonzero"></path>
</g>
</svg>
Side by Side

Before

Width:  |  Height:  |  Size: 1.0 KiB

3
plugins/UM3NetworkPrinting/resources/svg/checkmark-icon.svg
View File

@ -1,3 +0,0 @@
<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24">
<path fill="none" fill-rule="evenodd" stroke="#000" stroke-width="3" d="M3 10.71L10.068 17 21 5"/>
</svg>
Side by Side

Before

Width:  |  Height:  |  Size: 194 B

6
resources/themes/cura-light/icons/package.svg → plugins/UM3NetworkPrinting/resources/svg/icons/Buildplate.svg Normal file → Executable file
View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="iso-8859-1"?>
<!-- Generator: Adobe Illustrator 25.2.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
<svg version="1.1" id="Artwork" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
viewBox="0 0 48 48" style="enable-background:new 0 0 48 48;" xml:space="preserve">
<path style="fill:#000E1A;" d="M39,14V8H27v6h-6V8H9v6H7c-1.7,0-3,1.3-3,3v20c0,1.7,1.3,3,3,3h34c1.7,0,3-1.3,3-3V17
c0-1.7-1.3-3-3-3H39z M29,10h8v4c-2.1,0-4.9,0-8,0V10z M11,10h8v4c-3,0-5.8,0-8,0V10z M42,38H6V16h36V38z"/>
viewBox="0 0 24 24" style="enable-background:new 0 0 24 24;" xml:space="preserve">
<path style="fill:#000E1A;" d="M18,21H6c-1.7,0-3-1.3-3-3V6c0-1.7,1.3-3,3-3h12c1.7,0,3,1.3,3,3v12C21,19.7,19.7,21,18,21z M5,19h14
V5H5V19z M14.7,7.7l-1.4-1.4l-7,7l1.4,1.4L14.7,7.7z M9.7,7.7L8.3,6.3l-2,2l1.4,1.4L9.7,7.7z"/>
</svg>
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 577 B

After

Width:  |  Height:  |  Size: 580 B

8
plugins/UM3NetworkPrinting/resources/svg/icons/CameraPhoto.svg Executable file
View File

@ -0,0 +1,8 @@
<?xml version="1.0" encoding="iso-8859-1"?>
<!-- Generator: Adobe Illustrator 25.2.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
<svg version="1.1" id="Artwork" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
viewBox="0 0 24 24" style="enable-background:new 0 0 24 24;" xml:space="preserve">
<path style="fill:#000E1A;" d="M19,6h-1.6l-2-2H8.6l-2,2H5C3.3,6,2,7.3,2,9v8c0,1.7,1.3,3,3,3h14c1.7,0,3-1.3,3-3V9
C22,7.3,20.7,6,19,6z M20,18H4V8h3.4l2-2h5.2l2,2H20V18z M12,8c-2.2,0-4,1.8-4,4s1.8,4,4,4s4-1.8,4-4S14.2,8,12,8z M12,14
c-1.1,0-2-0.9-2-2s0.9-2,2-2s2,0.9,2,2S13.1,14,12,14z"/>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 646 B

15
plugins/UM3NetworkPrinting/resources/svg/icons/Extruder.svg Normal file
View File

@ -0,0 +1,15 @@
<?xml version="1.0" encoding="iso-8859-1"?>
<!-- Generator: Adobe Illustrator 24.3.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
viewBox="0 0 30 30" style="enable-background:new 0 0 30 30;" xml:space="preserve">
<g id="Layer_1">
<g>
<g>
<path d="M15,3C8.37,3,3,8.37,3,15v11h2v-4.36C7.15,24.87,10.83,27,15,27c6.63,0,12-5.37,12-12S21.63,3,15,3z M15,25
C9.49,25,5,20.51,5,15S9.49,5,15,5s10,4.49,10,10S20.51,25,15,25z"/>
</g>
</g>
</g>
<g id="Comments">
</g>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 600 B

5
plugins/UM3NetworkPrinting/resources/svg/icons/buildplate.svg
View File

@ -1,5 +0,0 @@
<svg width="18px" height="18px" viewBox="0 0 18 18" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
<path d="M18,5 L18,6 L9,10 L0,6 L0,5 L9,1 L18,5 Z M18,8.18863507 L9,12.1886351 L0,8.18863507 L0,7.09431753 L9,11.0943175 L18,7.09431753 L18,8.18863507 Z M18,10.3772701 L9,14.3772701 L0,10.3772701 L0,9.2829526 L9,13.2829526 L18,9.2829526 L18,10.3772701 Z M18,12.5659052 L9,16.5659052 L0,12.5659052 L0,11.4715877 L9,15.4715877 L18,11.4715877 L18,12.5659052 Z" id="Combined-Shape" fill="#D10000" fill-rule="nonzero"></path>
</g>
</svg>
Side by Side

Before

Width:  |  Height:  |  Size: 672 B

5
plugins/UM3NetworkPrinting/resources/svg/icons/camera.svg
View File

@ -1,5 +0,0 @@
<svg width="12px" height="12px" viewBox="0 0 12 12" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
<path d="M4.298828,0.998047 L7.7,0.998047 L8.7,3 L12,3 L12,10 L0,10 L0,3 L3.3,3 L4.298828,0.998047 Z M6,4 C4.625211,4 3.5,5.1252 3.5,6.5 C3.5,7.8748 4.625211,9 6,9 C7.37479,9 8.5,7.8748 8.5,6.5 C8.5,5.1252 7.37479,4 6,4 Z M6,5 C6.83435,5 7.5,5.6657 7.5,6.5 C7.5,7.3343 6.83435,8 6,8 C5.165651,8 4.5,7.3343 4.5,6.5 C4.5,5.6657 5.165651,5 6,5 Z" id="Combined-Shape" fill="#0A0850" fill-rule="nonzero"></path>
</g>
</svg>
Side by Side

Before

Width:  |  Height:  |  Size: 658 B

5
plugins/UM3NetworkPrinting/resources/svg/icons/extruder.svg
View File

@ -1,5 +0,0 @@
<svg width="32px" height="32px" viewBox="0 0 32 32" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
<path d="M24,24 L16,32 L8,24 L2,24 C0.8954305,24 1.3527075e-16,23.1045695 0,22 L0,2 C-1.3527075e-16,0.8954305 0.8954305,2.02906125e-16 2,0 L30,0 C31.1045695,-2.02906125e-16 32,0.8954305 32,2 L32,22 C32,23.1045695 31.1045695,24 30,24 L24,24 Z M16,21 C20.418278,21 24,17.418278 24,13 C24,8.581722 20.418278,5 16,5 C11.581722,5 8,8.581722 8,13 C8,17.418278 11.581722,21 16,21 Z" id="Combined-Shape" fill="#D8D8D8" fill-rule="nonzero"></path>
</g>
</svg>
Side by Side

Before

Width:  |  Height:  |  Size: 690 B

1
plugins/UM3NetworkPrinting/resources/svg/paused-icon.svg
View File

@ -1 +0,0 @@
<svg id="Layer_1" data-name="Layer 1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 32 32"><title>paused-icon</title><path d="M16,0A16,16,0,1,0,32,16,16,16,0,0,0,16,0Zm0,29A13,13,0,1,1,29,16,13,13,0,0,1,16,29Z"/><rect x="11.5" y="9" width="3" height="14"/><rect x="17.5" y="9" width="3" height="14"/></svg>
Side by Side

Before

Width:  |  Height:  |  Size: 308 B

4
plugins/UM3NetworkPrinting/resources/svg/warning-icon.svg
View File

@ -1,4 +0,0 @@
<svg id="Layer_1" data-name="Layer 1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 32 32">
<title>warning-icon</title>
<path d="M18.09,1.31A2.35,2.35,0,0,0,16,0a2.31,2.31,0,0,0-2.09,1.31L.27,28.44A2.49,2.49,0,0,0,.11,30.3a2.38,2.38,0,0,0,1.16,1.42A2.33,2.33,0,0,0,2.36,32H29.64A2.4,2.4,0,0,0,32,29.57a2.55,2.55,0,0,0-.27-1.14ZM3.34,29,16,3.83,28.66,29Z"/><polygon points="13.94 25.19 13.94 25.19 13.94 25.19 13.94 25.19"/><polygon points="14.39 21.68 17.61 21.68 18.11 11.85 13.89 11.85 14.39 21.68"/><path d="M16.06,23.08a2.19,2.19,0,0,0-1.56,3.66,2.14,2.14,0,0,0,1.56.55,2.06,2.06,0,0,0,1.54-.55,2.1,2.1,0,0,0,.55-1.55,2.17,2.17,0,0,0-.53-1.55A2.05,2.05,0,0,0,16.06,23.08Z"/>
</svg>
Side by Side

Before

Width:  |  Height:  |  Size: 695 B

4
resources/definitions/fdmextruder.def.json
View File

@ -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":

30
resources/definitions/fdmprinter.def.json
View File

@ -28,7 +28,7 @@
"label": "Machine",
"type": "category",
"description": "Machine specific settings",
"icon": "category_machine",
"icon": "Printer",
"children":
{
"machine_name":
@ -765,7 +765,7 @@
{
"label": "Quality",
"type": "category",
"icon": "category_layer_height",
"icon": "PrintQuality",
"description": "All settings that influence the resolution of the print. These settings have a large impact on the quality (and print time)",
"children":
{
@ -1001,7 +1001,7 @@
"shell":
{
"label": "Walls",
"icon": "category_shell",
"icon": "PrintShell",
"description": "Shell",
"type": "category",
"children":
@ -1346,7 +1346,7 @@
"top_bottom":
{
"label": "Top/Bottom",
"icon": "category_topbottom",
"icon": "PrintTopBottom",
"description": "Top/Bottom",
"type": "category",
"children":
@ -1822,7 +1822,7 @@
"infill":
{
"label": "Infill",
"icon": "category_infill",
"icon": "Infill1",
"description": "Infill",
"type": "category",
"children":
@ -2161,7 +2161,7 @@
"material":
{
"label": "Material",
"icon": "category_material",
"icon": "Spool",
"description": "Material",
"type": "category",
"children":
@ -2766,7 +2766,7 @@
"speed":
{
"label": "Speed",
"icon": "category_speed",
"icon": "SpeedOMeter",
"description": "Speed",
"type": "category",
"children":
@ -3672,7 +3672,7 @@
"travel":
{
"label": "Travel",
"icon": "category_travel",
"icon": "PrintTravel",
"description": "travel",
"type": "category",
"children":
@ -3977,7 +3977,7 @@
"cooling":
{
"label": "Cooling",
"icon": "category_cool",
"icon": "Fan",
"description": "Cooling",
"type": "category",
"children":
@ -4127,7 +4127,7 @@
{
"label": "Support",
"type": "category",
"icon": "category_support",
"icon": "Support",
"description": "Support",
"children":
{
@ -5167,7 +5167,7 @@
{
"label": "Build Plate Adhesion",
"type": "category",
"icon": "category_adhesion",
"icon": "Adhesion",
"description": "Adhesion",
"children":
{
@ -5821,7 +5821,7 @@
{
"label": "Dual Extrusion",
"type": "category",
"icon": "category_dual",
"icon": "DualExtrusion",
"description": "Settings used for printing with multiple extruders.",
"children":
{
@ -6036,7 +6036,7 @@
{
"label": "Mesh Fixes",
"type": "category",
"icon": "category_fixes",
"icon": "Bandage",
"description": "Make the meshes more suited for 3D printing.",
"children":
{
@ -6162,7 +6162,7 @@
{
"label": "Special Modes",
"type": "category",
"icon": "category_blackmagic",
"icon": "BlackMagic",
"description": "Non-traditional ways to print your models.",
"children":
{
@ -6335,7 +6335,7 @@
{
"label": "Experimental",
"type": "category",
"icon": "category_experimental",
"icon": "Experiment",
"description": "Features that haven't completely been fleshed out yet.",
"children":
{

2
resources/qml/Account/AvatarImage.qml
View File

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

8
resources/qml/Account/SyncState.qml
View File

@ -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...")}
}
]

2
resources/qml/ActionPanel/OutputDevicesActionButton.qml
View File

@ -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)

4
resources/qml/ActionPanel/OutputProcessWidget.qml
View File

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

2
resources/qml/ActionPanel/PrintInformationWidget.qml
View File

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

2
resources/qml/ActionPanel/SliceProcessWidget.qml
View File

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

2
resources/qml/CheckBoxWithTooltip.qml
View File

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

2
resources/qml/ExpandableComponent.qml
View File

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

2
resources/qml/ExpandableComponentHeader.qml
View File

@ -59,7 +59,7 @@ 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 {}

2
resources/qml/ExpandablePopup.qml
View File

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

9
resources/qml/ExtruderIcon.qml
View File

@ -22,7 +22,7 @@ Item
id: mainIcon
anchors.fill: parent
source: UM.Theme.getIcon("extruder_button")
source: UM.Theme.getIcon("Extruder", "medium")
color: extruderEnabled ? materialColor: UM.Theme.getColor("disabled")
}
@ -32,15 +32,14 @@ Item
width: height
height: Math.round(parent.height / 2)
radius: Math.round(width / 2)
radius: Math.round(width)
color: UM.Theme.getColor("toolbar_background")
anchors
{
horizontalCenter: parent.horizontalCenter
top: parent.top
// The circle needs to be slightly off center (so it sits in the middle of the square bit of the icon)
topMargin: (parent.height - height) / 2 - 0.1 * parent.height
topMargin: (parent.height - height) / 2
}
Label
@ -64,7 +63,7 @@ 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")
}

2
resources/qml/JobSpecs.qml
View File

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

2
resources/qml/Menus/ConfigurationMenu/ConfigurationItem.qml
View File

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

2
resources/qml/Menus/ConfigurationMenu/ConfigurationListView.qml
View File

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

4
resources/qml/Menus/ConfigurationMenu/ConfigurationMenu.qml
View File

@ -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:
{

4
resources/qml/Menus/ConfigurationMenu/CustomConfiguration.qml
View File

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

8
resources/qml/ObjectItemButton.qml
View File

@ -53,7 +53,7 @@ Button
anchors.left: parent.left
width: height
height: parent.height - UM.Theme.getSize("narrow_margin").height
source: UM.Theme.getIcon("extruder_button")
source: UM.Theme.getIcon("Extruder", "medium")
color: extruderColor
visible: showExtruderSwatches && extruderColor != ""
}
@ -168,12 +168,12 @@ Button
{
switch (meshType) {
case "support_mesh":
return UM.Theme.getIcon("pos_print_as_support");
return UM.Theme.getIcon("MeshTypeSupport");
case "cutting_mesh":
case "infill_mesh":
return UM.Theme.getIcon("pos_modify_overlaps");
return UM.Theme.getIcon("MeshTypeIntersect");
case "anti_overhang_mesh":
return UM.Theme.getIcon("pos_modify_dont_support_overlap");
return UM.Theme.getIcon("BlockSupportOverlaps");
}
return "";
}

2
resources/qml/ObjectSelector.qml
View File

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

2
resources/qml/Preferences/Materials/MaterialsBrandSection.qml
View File

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

2
resources/qml/Preferences/Materials/MaterialsSlot.qml
View File

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

2
resources/qml/Preferences/Materials/MaterialsTypeSection.qml
View File

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

4
resources/qml/PrintSetupSelector/Custom/CustomPrintSetup.qml
View File

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

2
resources/qml/PrintSetupSelector/NoIntentIcon.qml
View File

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

6
resources/qml/PrintSetupSelector/PrintSetupSelectorContents.qml
View File

@ -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,7 +233,7 @@ 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")
}
}

8
resources/qml/PrintSetupSelector/PrintSetupSelectorHeader.qml
View File

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

2
resources/qml/PrintSetupSelector/Recommended/RecommendedAdhesionSelector.qml
View File

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

12
resources/qml/PrintSetupSelector/Recommended/RecommendedInfillDensitySelector.qml
View File

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

4
resources/qml/PrintSetupSelector/Recommended/RecommendedQualityProfileSelector.qml
View File

@ -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:
{

8
resources/qml/PrintSetupSelector/Recommended/RecommendedSupportSelector.qml
View File

@ -26,7 +26,7 @@ Item
anchors.top: parent.top
anchors.left: parent.left
visible: enableSupportCheckBox.visible
source: UM.Theme.getIcon("category_support")
source: UM.Theme.getIcon("Support")
text: catalog.i18nc("@label", "Support")
font: UM.Theme.getFont("medium")
width: labelColumnWidth
@ -162,7 +162,7 @@ Item
x: supportExtruderCombobox.width - width - supportExtruderCombobox.rightPadding
y: supportExtruderCombobox.topPadding + Math.round((supportExtruderCombobox.availableHeight - height) / 2)
source: UM.Theme.getIcon("arrow_bottom")
source: UM.Theme.getIcon("ChevronSingleDown")
width: UM.Theme.getSize("standard_arrow").width
height: UM.Theme.getSize("standard_arrow").height
sourceSize.width: width + 5 * screenScaleFactor
@ -229,7 +229,7 @@ Item
sourceSize.width: width
sourceSize.height: height
source: UM.Theme.getIcon("extruder_button")
source: UM.Theme.getIcon("Extruder", "medium")
color: supportExtruderCombobox.color
}
}
@ -299,7 +299,7 @@ Item
sourceSize.width: width
sourceSize.height: height
source: UM.Theme.getIcon("extruder_button")
source: UM.Theme.getIcon("Extruder", "medium")
color: supportExtruderCombobox.model.getItem(index).color
}
}

16
resources/qml/PrinterOutput/ManualPrinterControl.qml
View File

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

24
resources/qml/PrinterSelector/MachineSelector.qml
View File

@ -93,11 +93,11 @@ Cura.ExpandablePopup
{
if (isGroup)
{
return UM.Theme.getIcon("printer_group")
return UM.Theme.getIcon("PrinterTriple")
}
else if (isNetworkPrinter || isCloudRegistered)
{
return UM.Theme.getIcon("printer_single")
return UM.Theme.getIcon("Printer")
}
else
{
@ -118,7 +118,25 @@ Cura.ExpandablePopup
leftMargin: UM.Theme.getSize("thick_margin").width
}
source: UM.Theme.getIcon(connectionStatus)
source:
{
if (connectionStatus == "printer_connected")
{
return UM.Theme.getIcon("CheckBlueBG", "low")
}
else if (connectionStatus == "printer_cloud_connected")
{
return UM.Theme.getIcon("CloudBlueBG", "low")
}
else if (connectionStatus == "printer_cloud_not_available")
{
return UM.Theme.getIcon("CloudGreyBG", "low")
}
else
{
return ""
}
}
width: UM.Theme.getSize("printer_status_icon").width
height: UM.Theme.getSize("printer_status_icon").height

6
resources/qml/Settings/SettingCategory.qml
View File

@ -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."))

2
resources/qml/Settings/SettingCheckBox.qml
View File

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

6
resources/qml/Settings/SettingExtruder.qml
View File

@ -104,7 +104,7 @@ SettingItem
x: control.width - width - control.rightPadding
y: control.topPadding + Math.round((control.availableHeight - height) / 2)
source: UM.Theme.getIcon("arrow_bottom")
source: UM.Theme.getIcon("ChevronSingleDown")
width: UM.Theme.getSize("standard_arrow").width
height: UM.Theme.getSize("standard_arrow").height
sourceSize.width: width + 5 * screenScaleFactor
@ -171,7 +171,7 @@ SettingItem
sourceSize.width: width
sourceSize.height: height
source: UM.Theme.getIcon("extruder_button")
source: UM.Theme.getIcon("Extruder", "medium")
color: control.color
}
}
@ -240,7 +240,7 @@ SettingItem
sourceSize.width: width
sourceSize.height: height
source: UM.Theme.getIcon("extruder_button")
source: UM.Theme.getIcon("Extruder", "medium")
color: control.model.getItem(index).color
}
}

6
resources/qml/Settings/SettingItem.qml
View File

@ -179,7 +179,7 @@ Item
color: UM.Theme.getColor("setting_control_button")
hoverColor: UM.Theme.getColor("setting_control_button")
iconSource: UM.Theme.getIcon("link")
iconSource: UM.Theme.getIcon("Link")
onEntered:
{
@ -208,7 +208,7 @@ Item
color: UM.Theme.getColor("setting_control_button")
hoverColor: UM.Theme.getColor("setting_control_button_hover")
iconSource: UM.Theme.getIcon("reset")
iconSource: UM.Theme.getIcon("ArrowReset")
onClicked:
{
@ -324,7 +324,7 @@ Item
color: UM.Theme.getColor("setting_control_button")
hoverColor: UM.Theme.getColor("setting_control_button_hover")
iconSource: UM.Theme.getIcon("formula")
iconSource: UM.Theme.getIcon("Function")
onEntered: { hoverTimer.stop(); base.showTooltip(catalog.i18nc("@label", "This setting is normally calculated, but it currently has an absolute value set.\n\nClick to restore the calculated value.")) }
onExited: base.showTooltip(base.createTooltipText())

6
resources/qml/Settings/SettingOptionalExtruder.qml
View File

@ -105,7 +105,7 @@ SettingItem
x: control.width - width - control.rightPadding
y: control.topPadding + Math.round((control.availableHeight - height) / 2)
source: UM.Theme.getIcon("arrow_bottom")
source: UM.Theme.getIcon("ChevronSingleDown")
width: UM.Theme.getSize("standard_arrow").width
height: UM.Theme.getSize("standard_arrow").height
sourceSize.width: width + 5 * screenScaleFactor
@ -172,7 +172,7 @@ SettingItem
sourceSize.width: width
sourceSize.height: height
source: UM.Theme.getIcon("extruder_button")
source: UM.Theme.getIcon("Extruder", "medium")
color: control.color
}
}
@ -237,7 +237,7 @@ SettingItem
sourceSize.width: width
sourceSize.height: height
source: UM.Theme.getIcon("extruder_button")
source: UM.Theme.getIcon("Extruder", "medium")
color: control.model.getItem(index).color
}
}

6
resources/qml/Settings/SettingView.qml
View File

@ -65,7 +65,7 @@ Item
anchors.right: clearFilterButton.left
anchors.rightMargin: Math.round(UM.Theme.getSize("thick_margin").width)
placeholderText: "<img align='middle' src='"+ UM.Theme.getIcon("search") +"'>" + "<div vertical-align=bottom>" + catalog.i18nc("@label:textbox", "Search settings")
placeholderText: "<img align='middle' src='"+ UM.Theme.getIcon("Magnifier") +"'>" + "<div vertical-align=bottom>" + 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 {}

10
resources/qml/ViewOrientationControls.qml
View File

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

2
resources/qml/WelcomePages/AddLocalPrinterScrollView.qml
View File

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

2
resources/qml/WelcomePages/AddNetworkPrinterScrollView.qml
View File

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

6
resources/qml/WelcomePages/CloudContent.qml
View File

@ -112,7 +112,7 @@ Item
anchors.horizontalCenter: parent.horizontalCenter
fillMode: Image.PreserveAspectFit
width: UM.Theme.getSize("welcome_wizard_cloud_content_image").width
source: UM.Theme.getIcon("package")
source: UM.Theme.getIcon("Plugin")
sourceSize.width: width
sourceSize.height: height
}
@ -142,7 +142,7 @@ Item
anchors.horizontalCenter: parent.horizontalCenter
fillMode: Image.PreserveAspectFit
width: UM.Theme.getSize("welcome_wizard_cloud_content_image").width
source: UM.Theme.getIcon("material_spool")
source: UM.Theme.getIcon("Spool")
sourceSize.width: width
sourceSize.height: height
}
@ -172,7 +172,7 @@ Item
anchors.horizontalCenter: communityColumn.horizontalCenter
fillMode: Image.PreserveAspectFit
width: UM.Theme.getSize("welcome_wizard_cloud_content_image").width
source: UM.Theme.getIcon("group")
source: UM.Theme.getIcon("PrinterTriple", "medium")
sourceSize.width: width
sourceSize.height: height
}

2
resources/qml/WelcomePages/DropDownHeader.qml
View File

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

2
resources/qml/WelcomePages/DropDownWidget.qml
View File

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

2
resources/qml/Widgets/CheckBox.qml
View File

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

2
resources/qml/Widgets/ComboBox.qml
View File

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

Some files were not shown because too many files have changed in this diff Show More