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

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

Browse Source
This commit is contained in:
Jaime van Kessel 2021-05-17 13:49:21 +02:00
commit 90eb2bfbdc
No known key found for this signature in database
GPG Key ID: 3710727397403C91
5 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml
View File

@ -116,7 +116,7 @@ Item
{ {
id: antiOverhangMeshButton id: antiOverhangMeshButton
text: catalog.i18nc("@label", "Don't support overlaps") text: catalog.i18nc("@label", "Don't support overlaps")
iconSource: UM.Theme.getIcon("MeshTypeExclude"); iconSource: UM.Theme.getIcon("BlockSupportOverlaps");
property bool needBorder: true property bool needBorder: true
checkable: true checkable: true
onClicked: setMeshType(antiOverhangMeshType) onClicked: setMeshType(antiOverhangMeshType)

2
resources/qml/ObjectItemButton.qml
View File

@ -173,7 +173,7 @@ Button
case "infill_mesh": case "infill_mesh":
return UM.Theme.getIcon("MeshTypeIntersect"); return UM.Theme.getIcon("MeshTypeIntersect");
case "anti_overhang_mesh": case "anti_overhang_mesh":
return UM.Theme.getIcon("MeshTypeExclude"); return UM.Theme.getIcon("BlockSupportOverlaps");
} }
return ""; return "";
} }

1
resources/themes/cura-light/icons/default/BlockSupportOverlaps.svg Normal file
View File

@ -0,0 +1 @@
<svg id="Artwork" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><defs><style>.cls-1{fill:#231f20;}</style></defs><path class="cls-1" d="M5.05,14.3v6.75h-2V12.27c.09.11.19.22.29.32Z"/><path class="cls-1" d="M9.05,17.8v3.25h-2V16.3l.46.46A4.82,4.82,0,0,0,9.05,17.8Z"/><path class="cls-1" d="M13.05,17.8v3.25h-2V18.22A4.85,4.85,0,0,0,13.05,17.8Z"/><path d="M21.47,7.64l-2-2a2,2,0,0,0-2.82,0l-2,2a2,2,0,0,0,0,2.82l2,2a2,2,0,0,0,2.82,0l2-2A2,2,0,0,0,21.47,7.64Zm-3.42,3.41-2-2,2-2,2,2Z"/><polygon points="21 16.42 19.58 15 18 16.58 16.42 15 15 16.42 16.58 18 15 19.58 16.42 21 18 19.42 19.58 21 21 19.58 19.42 18 21 16.42"/><path d="M13.47,12.13l1.41,1.41-1.76,1.75a3,3,0,0,1-4.24,0L4.71,11.12a3,3,0,0,1,0-4.24L8.88,2.71a3,3,0,0,1,4.24,0l1.81,1.81-.41.41-.59.59-.41.41L11,3.41,5.41,9,11,14.59Z"/><path d="M13.52,5.93l.41-.41"/></svg>
Side by Side

After

Width:  |  Height:  |  Size: 837 B

7
resources/themes/cura-light/icons/default/MeshTypeExclude.svg
View File

@ -1,7 +0,0 @@
<?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 d="M17,7V3H6C4.3,3,3,4.3,3,6v11h4v4h11c1.7,0,3-1.3,3-3V7H17z M19,19H9v-4H5V5h10v4h4V19z"/>
</g>
</svg>
Side by Side

Before

Width:  |  Height:  |  Size: 369 B

6
resources/themes/cura-light/icons/deprecated_icons.json
View File

@ -64,7 +64,7 @@
"size": "default" "size": "default"
}, },
"pos_modify_dont_support_overlap": { "pos_modify_dont_support_overlap": {
"new_icon": "MeshTypeExclude", "new_icon": "BlockSupportOverlaps",
"size": "default" "size": "default"
}, },
"minus": { "minus": {
@ -239,6 +239,10 @@
"new_icon": "View3D", "new_icon": "View3D",
"size": "default" "size": "default"
}, },
"view_layer": {
"new_icon": "Layers",
"size": "default"
},
"view_front": { "view_front": {
"new_icon": "ViewFront", "new_icon": "ViewFront",
"size": "default" "size": "default"