3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-20 21:27:50 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

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

Browse source 
This reverts commit 6120d8a054, reversing
changes made to 95652556fe.
This commit is contained in:
Jaime van Kessel 2021-05-27 16:06:20 +02:00
parent 38ce22ba7c
commit 70e4e9640e
No known key found for this signature in database
GPG key ID: 3710727397403C91
283 changed files with 1518 additions and 945 deletions
Download patch file Download diff file Expand all files Collapse all files

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("StarFilled")
iconSource: UM.Theme.getIcon("star")
onClicked:
{
@ -176,7 +176,7 @@ Item
{
id: downArrow
source: UM.Theme.getIcon("ChevronSingleDown")
source: UM.Theme.getIcon("arrow_bottom")
width: UM.Theme.getSize("standard_arrow").width
height: UM.Theme.getSize("standard_arrow").height

4
resources/qml/PrintSetupSelector/NoIntentIcon.qml
View file

@ -18,7 +18,7 @@ Item
UM.RecolorImage
{
source: UM.Theme.getIcon("Information")
source: UM.Theme.getIcon("info")
color: UM.Theme.getColor("icon")
anchors.fill: parent
}
@ -33,4 +33,4 @@ Item
}
onExited: base.hideTooltip()
}
}
}

8
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("ChevronSingleLeft")
iconSource: UM.Theme.getIcon("arrow_left")
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("ChevronSingleRight")
iconSource: UM.Theme.getIcon("arrow_right")
isIconOnRightSide: true
visible: currentModeIndex == PrintSetupSelectorContents.Mode.Recommended
onClicked:
@ -233,10 +233,10 @@ Item
height: UM.Theme.getSize("drag_icon").height
anchors.centerIn: parent
source: UM.Theme.getIcon("ThreeDots")
source: UM.Theme.getIcon("resize")
color: UM.Theme.getColor("small_button_text")
}
}
}
}
}
}

10
resources/qml/PrintSetupSelector/PrintSetupSelectorHeader.qml
View file

@ -15,7 +15,7 @@ RowLayout
Cura.IconWithText
{
source: UM.Theme.getIcon("PrintQuality")
source: UM.Theme.getIcon("category_layer_height")
text:
{
if (Cura.MachineManager.activeStack)
@ -50,7 +50,7 @@ RowLayout
Cura.IconWithText
{
source: UM.Theme.getIcon("Infill1")
source: UM.Theme.getIcon("category_infill")
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("Support")
source: UM.Theme.getIcon("category_support")
text: supportEnabled.properties.value == "True" ? enabledText : disabledText
font: UM.Theme.getFont("medium")
@ -80,7 +80,7 @@ RowLayout
Cura.IconWithText
{
source: UM.Theme.getIcon("Adhesion")
source: UM.Theme.getIcon("category_adhesion")
text: platformAdhesionType.properties.value != "skirt" && platformAdhesionType.properties.value != "none" ? enabledText : disabledText
font: UM.Theme.getFont("medium")
@ -92,4 +92,4 @@ RowLayout
watchedProperties: [ "value"]
}
}
}
}

4
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("Adhesion")
source: UM.Theme.getIcon("category_adhesion")
text: catalog.i18nc("@label", "Adhesion")
font: UM.Theme.getFont("medium")
width: labelColumnWidth
@ -87,4 +87,4 @@ Item
watchedProperties: [ "value", "resolve", "enabled" ]
storeIndex: 0
}
}
}

14
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("InfillGradual")
return UM.Theme.getIcon("gradual")
}
if (density <= 0)
{
return UM.Theme.getIcon("Infill0")
return UM.Theme.getIcon("hollow")
}
if (density < 40)
{
return UM.Theme.getIcon("Infill3")
return UM.Theme.getIcon("sparse")
}
if (density < 90)
{
return UM.Theme.getIcon("Infill2")
return UM.Theme.getIcon("dense")
}
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("Infill1")
source: UM.Theme.getIcon("category_infill")
text: catalog.i18nc("@label", "Infill") + " (%)"
font: UM.Theme.getFont("medium")
width: labelColumnWidth
@ -252,4 +252,4 @@ Item
watchedProperties: ["value", "enabled"]
storeIndex: 0
}
}
}

6
resources/qml/PrintSetupSelector/Recommended/RecommendedQualityProfileSelector.qml
View file

@ -48,7 +48,7 @@ Item
Cura.IconWithText
{
id: profileLabel
source: UM.Theme.getIcon("PrintQuality")
source: UM.Theme.getIcon("category_layer_height")
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("ArrowReset")
iconSource: UM.Theme.getIcon("reset")
onClicked:
{
@ -198,4 +198,4 @@ Item
}
}
}
}

10
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("Support")
source: UM.Theme.getIcon("category_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("ChevronSingleDown")
source: UM.Theme.getIcon("arrow_bottom")
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", "medium")
source: UM.Theme.getIcon("extruder_button")
color: supportExtruderCombobox.color
}
}
@ -299,7 +299,7 @@ Item
sourceSize.width: width
sourceSize.height: height
source: UM.Theme.getIcon("Extruder", "medium")
source: UM.Theme.getIcon("extruder_button")
color: supportExtruderCombobox.model.getItem(index).color
}
}
@ -342,4 +342,4 @@ Item
watchedProperties: ["value"]
storeIndex: 0
}
}
}