GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-08-15 10:25:58 +08:00
Code Issues Packages Projects Releases Wiki Activity

Replace the extruder icon with the new design

Browse Source 
CURA-8011
This commit is contained in:
Jaime van Kessel 2021-06-29 16:21:39 +02:00
parent 778172a07a
commit 9735daf497
No known key found for this signature in database
GPG Key ID: 3710727397403C91
2 changed files with 29 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
resources/qml/ExtruderIcon.qml
View File

@ -1,7 +1,7 @@
// Copyright (c) 2018 Ultimaker B.V. // Copyright (c) 2021 Ultimaker B.V.
// Cura is released under the terms of the LGPLv3 or higher. // Cura is released under the terms of the LGPLv3 or higher.
import QtQuick 2.7 import QtQuick 2.11
import QtQuick.Controls 1.1 import QtQuick.Controls 1.1
import UM 1.2 as UM import UM 1.2 as UM
@ -17,29 +17,26 @@ Item
property alias textColor: extruderNumberText.color property alias textColor: extruderNumberText.color
property bool extruderEnabled: true property bool extruderEnabled: true
UM.RecolorImage Item
{ {
id: mainIcon opacity: extruderEnabled ? 1 : 0.4
anchors.fill: parent anchors.fill: parent
source: UM.Theme.getIcon("Extruder", "medium") UM.RecolorImage
color: extruderEnabled ? materialColor: UM.Theme.getColor("disabled")
}
Rectangle
{
id: extruderNumberCircle
width: height
height: Math.round(parent.height / 2)
radius: Math.round(width)
color: UM.Theme.getColor("toolbar_background")
anchors
{ {
horizontalCenter: parent.horizontalCenter id: blorp
top: parent.top anchors.fill: parent
topMargin: (parent.height - height) / 2
source: UM.Theme.getIcon("ExtruderColor", "medium")
color: materialColor
}
UM.RecolorImage
{
id: mainIcon
anchors.fill: parent
source: UM.Theme.getIcon("Extruder", "medium")
color: UM.Theme.getColor("text")
} }
Label Label
@ -51,21 +48,9 @@ Item
color: UM.Theme.getColor("text") color: UM.Theme.getColor("text")
width: contentWidth width: contentWidth
height: contentHeight height: contentHeight
visible: extruderEnabled
renderType: Text.NativeRendering renderType: Text.NativeRendering
horizontalAlignment: Text.AlignHCenter horizontalAlignment: Text.AlignHCenter
verticalAlignment: Text.AlignVCenter verticalAlignment: Text.AlignVCenter
} }
UM.RecolorImage
{
id: disabledIcon
anchors.fill: parent
anchors.margins: UM.Theme.getSize("thick_lining").width
sourceSize.height: width
source: UM.Theme.getIcon("Cancel")
visible: !extruderEnabled
color: UM.Theme.getColor("text")
}
} }
} }

11
resources/themes/cura-light/icons/medium/ExtruderColor.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 style="fill:#231F20;" d="M15,25C9.486,25,5,20.514,5,15S9.486,5,15,5s10,4.486,10,10S20.514,25,15,25z M15,7
c-4.411,0-8,3.589-8,8s3.589,8,8,8s8-3.589,8-8S19.411,7,15,7z"/>
</g>
<g id="Comments">
</g>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 568 B