3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-08-09 23:05:01 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge branch 'CURA-8011_Replace_extruder_icons' into CURA-8247_badge_background_colour

Browse source
This commit is contained in:
Ghostkeeper 2021-07-05 15:19:38 +02:00
commit 43237c91c6
No known key found for this signature in database
GPG key ID: D2A8871EE34EC59A
39 changed files with 257 additions and 214 deletions
Download patch file Download diff file Expand all files Collapse all files

13
resources/themes/cura-light/icons/default/Extruder.svg Normal file
View file

@ -0,0 +1,13 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Generator: Adobe Illustrator 24.3.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
<svg version="1.1" id="Layer_1" 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 id="Layer_1_1_">
<g>
<path d="M12,2C6.5,2,2,6.5,2,12v9h2v-3c1.8,2.4,4.7,4,8,4c5.5,0,10-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"/>
</g>
</g>
<g id="Comments">
</g>
</svg>
Side by side

After

Width:  |  Height:  |  Size: 568 B

14
resources/themes/cura-light/icons/default/ExtruderColor.svg Normal file
View file

@ -0,0 +1,14 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Generator: Adobe Illustrator 24.3.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
<svg version="1.1" id="Layer_1" 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">
<style type="text/css">
.st0{fill:#231F20;}
</style>
<g id="Layer_1_1_">
<path class="st0" d="M12,21c-5,0-9-4-9-9s4-9,9-9s9,4,9,9S17,21,12,21z M12,6c-3.3,0-6,2.7-6,6s2.7,6,6,6s6-2.7,6-6S15.3,6,12,6z"
/>
</g>
<g id="Comments">
</g>
</svg>
Side by side

After

Width:  |  Height:  |  Size: 587 B

14
resources/themes/cura-light/icons/medium/ExtruderColor.svg Normal file
View file

@ -0,0 +1,14 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Generator: Adobe Illustrator 24.3.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
<svg version="1.1" id="Layer_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">
<style type="text/css">
.st0{fill:#231F20;}
</style>
<g id="Layer_1_1_">
<path class="st0" d="M15,26C8.9,26,4,21.1,4,15S8.9,4,15,4s11,4.9,11,11S21.1,26,15,26z M15,7c-4.4,0-8,3.6-8,8s3.6,8,8,8
s8-3.6,8-8S19.4,7,15,7z"/>
</g>
<g id="Comments">
</g>
</svg>
Side by side

After

Width:  |  Height:  |  Size: 603 B

11
resources/themes/cura-light/icons/medium/Folder.svg Normal file
View file

@ -0,0 +1,11 @@
<?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">
<path d="M24,9c0-1.65-1.35-3-3-3h-9l-1-1H6C4.34,5,3,6.34,3,8v14c0,1.66,1.34,3,3,3h18c1.66,0,3-1.34,3-3V12C27,10.34,25.66,9,24,9
z M25,23H5V7h5.17l4,4H25V23z"/>
</g>
<g id="Comments">
</g>
</svg>
Side by side

After

Width:  |  Height:  |  Size: 552 B

13
resources/themes/cura-light/icons/medium/Printer.svg Normal file
View file

@ -0,0 +1,13 @@
<?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>
<path d="M24,6v18h-2l-2-2H10l-2,2H6V6H24 M26,4H4v22h4.828l2-2h8.343l2,2H26V4L26,4z"/>
<rect x="10" y="18" width="10" height="2"/>
</g>
</g>
<g id="Comments">
</g>
</svg>
Side by side

After

Width:  |  Height:  |  Size: 534 B

17
resources/themes/cura-light/icons/medium/Sliders.svg Normal file
View file

@ -0,0 +1,17 @@
<?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>
<path d="M18,5h-2c-1.1,0-2,0.9-2,2H3v2h11c0,1.1,0.9,2,2,2h2c1.1,0,2-0.9,2-2V7C20,5.9,19.1,5,18,5z M18,9h-2V7h2V9z"/>
<rect x="21" y="7" width="6" height="2"/>
<rect x="25" y="14" width="2" height="2"/>
<path d="M22,12h-2c-1.1,0-2,0.9-2,2H3v2h15c0,1.1,0.9,2,2,2h2c1.1,0,2-0.9,2-2v-2C24,12.9,23.1,12,22,12z M22,16h-2v-2h2V16z"/>
<path d="M12,19h-2c-1.1,0-2,0.9-2,2H3v2h5c0,1.1,0.9,2,2,2h2c1.1,0,2-0.9,2-2v-2C14,19.9,13.1,19,12,19z M12,23h-2v-2h2V23z"/>
<rect x="15" y="21" width="12" height="2"/>
</g>
</g>
<g id="Comments">
</g>
</svg>
Side by side

After

Width:  |  Height:  |  Size: 907 B

6
resources/themes/cura-light/styles.qml
View file

@ -252,11 +252,11 @@ QtObject
anchors.centerIn: parent
opacity: control.enabled ? 1.0 : 0.2
source: control.iconSource
width: UM.Theme.getSize("button_icon").width
height: UM.Theme.getSize("button_icon").height
width: UM.Theme.getSize("medium_button_icon").width
height: UM.Theme.getSize("medium_button_icon").height
color: UM.Theme.getColor("icon")
sourceSize: UM.Theme.getSize("button_icon")
sourceSize: UM.Theme.getSize("medium_button_icon")
}
}
}

42
resources/themes/cura-light/theme.json
View file

@ -129,24 +129,44 @@
"family": "Noto Sans"
},
"small": {
"size": 0.7,
"size": 0.9,
"weight": 40,
"family": "Noto Sans"
},
"small_ja_JP": {
"size": 0.7,
"size": 0.9,
"weight": 50,
"family": "Noto Sans"
},
"small_zh_CN": {
"size": 0.7,
"size": 0.9,
"weight": 50,
"family": "Noto Sans"
},
"small_zh_TW": {
"size": 0.7,
"size": 0.9,
"weight": 50,
"family": "Noto Sans"
},
"small_black": {
"size": 0.9,
"weight": 100,
"family": "Noto Sans"
},
"small_black_ja_JP": {
"size": 0.9,
"weight": 100,
"family": "Noto Sans"
},
"small_black_zh_CN": {
"size": 0.9,
"weight": 100,
"family": "Noto Sans"
},
"small_black_zh_TW": {
"size": 0.9,
"weight": 100,
"family": "Noto Sans"
}
},
@ -250,6 +270,7 @@
"button_tooltip_text": [192, 193, 194, 255],
"extruder_button_material_border": [255, 255, 255, 255],
"extruder_disabled": [255, 255, 255, 102],
"rating_star": [90, 90, 90, 255],
@ -483,9 +504,9 @@
"machine_selector_widget": [20.0, 4.0],
"machine_selector_widget_content": [25.0, 32.0],
"machine_selector_icon": [2.66, 2.66],
"machine_selector_icon": [2.5, 2.5],
"views_selector": [23.0, 4.0],
"views_selector": [16.0, 4.0],
"printer_type_label": [3.5, 1.5],
@ -504,12 +525,12 @@
"thin_margin": [0.71, 0.71],
"narrow_margin": [0.5, 0.5],
"extruder_icon": [2.33, 2.33],
"extruder_icon": [2.5, 2.5],
"section": [0.0, 2],
"section_control": [0, 1],
"section_icon": [1.6, 1.6],
"section_icon_column": [2.8, 0.0],
"section_icon": [2, 2],
"section_icon_column": [2.5, 2.5],
"rating_star": [1.0, 1.0],
"setting": [25.0, 1.8],
@ -538,6 +559,9 @@
"small_button": [2, 2],
"small_button_icon": [1.5, 1.5],
"medium_button": [2.5, 2.5],
"medium_button_icon": [2, 2],
"favorites_row": [2, 2],
"favorites_button": [2, 2],
"favorites_button_icon": [1.2, 1.2],