3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-06 22:47:29 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Use detail_level to describe the icons (instead of size)

Browse source 
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
This commit is contained in:
Kostas Karmas 2021-04-28 18:53:32 +02:00
parent 247412b16a
commit f887db23f6
18 changed files with 15 additions and 65 deletions
Download patch file Download diff file Expand all files Collapse all files

2
plugins/SimulationView/SimulationViewMenuComponent.qml
View file

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

2
resources/qml/ExtruderIcon.qml
View file

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

2
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", "large")
source: UM.Theme.getIcon("Extruder", "medium")
color: extruderColor
visible: showExtruderSwatches && extruderColor != ""
}

4
resources/qml/PrintSetupSelector/Recommended/RecommendedSupportSelector.qml
View file

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

6
resources/qml/PrinterSelector/MachineSelector.qml
View file

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

4
resources/qml/Settings/SettingExtruder.qml
View file

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

4
resources/qml/Settings/SettingOptionalExtruder.qml
View file

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

2
resources/qml/WelcomePages/CloudContent.qml
View file

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

22
resources/themes/cura-light/icons/default/Extruder1.svg
View file

@ -1,22 +0,0 @@
<?xml version="1.0" encoding="iso-8859-1"?>
<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 24 24" style="enable-background:new 0 0 24 24;" xml:space="preserve">
<g id="Layer_1">
<g>
<path d="M12,2C6.477,2,2,6.477,2,12v9h2v-3.018C5.824,20.417,8.723,22,12,22c5.523,0,10-4.477,10-10C22,6.477,17.523,2,12,2z
M12,20c-4.418,0-8-3.582-8-8s3.582-8,8-8s8,3.582,8,8S16.418,20,12,20z"/>
<g>
<defs>
<path id="SVGID_1_" d="M13.49,16h-1.9c0,0,0-5.67,0-5.84c-0.078,0.092-0.161,0.179-0.25,0.26l-0.28,0.26l-0.9,0.73l-0.94-1.16
l2.66-2.1h1.62L13.49,16z"/>
</defs>
<use xlink:href="#SVGID_1_" style="overflow:visible;"/>
<clipPath id="SVGID_2_">
<use xlink:href="#SVGID_1_" style="overflow:visible;"/>
</clipPath>
</g>
</g>
</g>
<g id="Comments">
</g>
</svg>
Side by side

Before

Width:  |  Height:  |  Size: 863 B

18
resources/themes/cura-light/icons/default/Extruder2.svg
View file

@ -1,18 +0,0 @@
<?xml version="1.0" encoding="iso-8859-1"?>
<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 24 24" style="enable-background:new 0 0 24 24;" xml:space="preserve">
<g id="Layer_1">
<g>
<path d="M12,2C6.477,2,2,6.477,2,12v9h2v-3.018C5.824,20.417,8.723,22,12,22c5.523,0,10-4.477,10-10C22,6.477,17.523,2,12,2z
M12,20c-4.418,0-8-3.582-8-8s3.582-8,8-8s8,3.582,8,8S16.418,20,12,20z"/>
<path d="M14.79,16H9.21v-1.26l1.94-2c0.4-0.41,0.71-0.75,0.95-1c0.195-0.208,0.363-0.44,0.5-0.69
c0.099-0.202,0.15-0.425,0.15-0.65c0.022-0.232-0.072-0.46-0.25-0.61c-0.18-0.13-0.398-0.197-0.62-0.19
c-0.286,0.002-0.568,0.074-0.82,0.21c-0.311,0.168-0.603,0.369-0.87,0.6l-1-1.2c0.233-0.203,0.476-0.394,0.73-0.57
c0.278-0.194,0.585-0.342,0.91-0.44c0.396-0.133,0.812-0.201,1.23-0.2c0.469-0.014,0.935,0.082,1.36,0.28
c0.358,0.166,0.663,0.43,0.88,0.76c0.206,0.326,0.314,0.704,0.31,1.09c0.004,0.414-0.085,0.824-0.26,1.2
c-0.187,0.395-0.437,0.756-0.74,1.07c-0.33,0.35-0.74,0.74-1.21,1.18l-0.82,0.75v0.07h3.21V16z"/>
</g>
</g>
<g id="Comments">
</g>
</svg>
Side by side

Before

Width:  |  Height:  |  Size: 1.1 KiB

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

@ -1,10 +0,0 @@
<?xml version="1.0" encoding="iso-8859-1"?>
<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 24 24" style="enable-background:new 0 0 24 24;" xml:space="preserve">
<g id="Layer_1">
<path style="fill:#231F20;" d="M12,20c-4.411,0-8-3.589-8-8s3.589-8,8-8s8,3.589,8,8S16.411,20,12,20z M12,6c-3.309,0-6,2.691-6,6
s2.691,6,6,6s6-2.691,6-6S15.309,6,12,6z"/>
</g>
<g id="Comments">
</g>
</svg>
Side by side

Before

Width:  |  Height:  |  Size: 467 B

0
resources/themes/cura-light/icons/small/CheckBlueBG.svg → resources/themes/cura-light/icons/low/CheckBlueBG.svg
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 439 B

After

Width:  |  Height:  |  Size: 439 B

Before After
Before After

0
resources/themes/cura-light/icons/small/CloudBlueBG.svg → resources/themes/cura-light/icons/low/CloudBlueBG.svg
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 485 B

After

Width:  |  Height:  |  Size: 485 B

Before After
Before After

0
resources/themes/cura-light/icons/small/CloudGreyBG.svg → resources/themes/cura-light/icons/low/CloudGreyBG.svg
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 485 B

After

Width:  |  Height:  |  Size: 485 B

Before After
Before After

0
resources/themes/cura-light/icons/small/Dot.svg → resources/themes/cura-light/icons/low/Dot.svg
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 130 B

After

Width:  |  Height:  |  Size: 130 B

Before After
Before After

0
resources/themes/cura-light/icons/large/Extruder.svg → resources/themes/cura-light/icons/medium/Extruder.svg
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 505 B

After

Width:  |  Height:  |  Size: 505 B

Before After
Before After

0
resources/themes/cura-light/icons/large/PrinterTriple.svg → resources/themes/cura-light/icons/medium/PrinterTriple.svg
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 588 B

After

Width:  |  Height:  |  Size: 588 B

Before After
Before After

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

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