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

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

6
resources/qml/Settings/SettingCategory.qml
View file

@ -93,7 +93,7 @@ Button
height: UM.Theme.getSize("standard_arrow").height
sourceSize.height: width
color: UM.Theme.getColor("setting_control_button")
source: definition.expanded ? UM.Theme.getIcon("ChevronSingleDown") : UM.Theme.getIcon("ChevronSingleLeft")
source: definition.expanded ? UM.Theme.getIcon("arrow_bottom") : UM.Theme.getIcon("arrow_left")
}
}
@ -154,7 +154,7 @@ Button
color: UM.Theme.getColor("setting_control_button")
hoverColor: UM.Theme.getColor("setting_control_button_hover")
iconSource: UM.Theme.getIcon("Sliders")
iconSource: UM.Theme.getIcon("settings")
onClicked: Cura.Actions.configureSettingVisibility.trigger(definition)
}
@ -195,7 +195,7 @@ Button
color: UM.Theme.getColor("setting_control_button")
hoverColor: UM.Theme.getColor("setting_control_button_hover")
iconSource: UM.Theme.getIcon("Information")
iconSource: UM.Theme.getIcon("notice")
onEntered: base.showTooltip(catalog.i18nc("@label","Some hidden settings use values different from their normal calculated value.\n\nClick to make these settings visible."))

2
resources/qml/Settings/SettingCheckBox.qml
View file

@ -151,7 +151,7 @@ SettingItem
height: Math.round(parent.height / 2.5)
sourceSize.height: width
color: !enabled ? UM.Theme.getColor("setting_control_disabled_text") : UM.Theme.getColor("setting_control_text");
source: UM.Theme.getIcon("Check")
source: UM.Theme.getIcon("check")
opacity: control.checked ? 1 : 0
Behavior on opacity { NumberAnimation { duration: 100; } }
}

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

@ -104,7 +104,7 @@ SettingItem
x: control.width - width - control.rightPadding
y: control.topPadding + Math.round((control.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
@ -171,7 +171,7 @@ SettingItem
sourceSize.width: width
sourceSize.height: height
source: UM.Theme.getIcon("Extruder", "medium")
source: UM.Theme.getIcon("extruder_button")
color: control.color
}
}
@ -240,7 +240,7 @@ SettingItem
sourceSize.width: width
sourceSize.height: height
source: UM.Theme.getIcon("Extruder", "medium")
source: UM.Theme.getIcon("extruder_button")
color: control.model.getItem(index).color
}
}

6
resources/qml/Settings/SettingItem.qml
View file

@ -179,7 +179,7 @@ Item
color: UM.Theme.getColor("setting_control_button")
hoverColor: UM.Theme.getColor("setting_control_button")
iconSource: UM.Theme.getIcon("Link")
iconSource: UM.Theme.getIcon("link")
onEntered:
{
@ -208,7 +208,7 @@ Item
color: UM.Theme.getColor("setting_control_button")
hoverColor: UM.Theme.getColor("setting_control_button_hover")
iconSource: UM.Theme.getIcon("ArrowReset")
iconSource: UM.Theme.getIcon("reset")
onClicked:
{
@ -324,7 +324,7 @@ Item
color: UM.Theme.getColor("setting_control_button")
hoverColor: UM.Theme.getColor("setting_control_button_hover")
iconSource: UM.Theme.getIcon("Formula")
iconSource: UM.Theme.getIcon("formula")
onEntered: { hoverTimer.stop(); base.showTooltip(catalog.i18nc("@label", "This setting is normally calculated, but it currently has an absolute value set.\n\nClick to restore the calculated value.")) }
onExited: base.showTooltip(base.createTooltipText())

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

@ -105,7 +105,7 @@ SettingItem
x: control.width - width - control.rightPadding
y: control.topPadding + Math.round((control.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
@ -172,7 +172,7 @@ SettingItem
sourceSize.width: width
sourceSize.height: height
source: UM.Theme.getIcon("Extruder", "medium")
source: UM.Theme.getIcon("extruder_button")
color: control.color
}
}
@ -237,7 +237,7 @@ SettingItem
sourceSize.width: width
sourceSize.height: height
source: UM.Theme.getIcon("Extruder", "medium")
source: UM.Theme.getIcon("extruder_button")
color: control.model.getItem(index).color
}
}

6
resources/qml/Settings/SettingView.qml
View file

@ -65,7 +65,7 @@ Item
anchors.right: clearFilterButton.left
anchors.rightMargin: Math.round(UM.Theme.getSize("thick_margin").width)
placeholderText: "<img align='middle' src='"+ UM.Theme.getIcon("Magnifier") +"'>" + "<div vertical-align=bottom>" + catalog.i18nc("@label:textbox", "Search settings")
placeholderText: "<img align='middle' src='"+ UM.Theme.getIcon("search") +"'>" + "<div vertical-align=bottom>" + catalog.i18nc("@label:textbox", "Search settings")
style: TextFieldStyle
{
@ -133,7 +133,7 @@ Item
UM.SimpleButton
{
id: clearFilterButton
iconSource: UM.Theme.getIcon("Cancel")
iconSource: UM.Theme.getIcon("cross1")
visible: findingSettings
height: Math.round(parent.height * 0.4)
@ -193,7 +193,7 @@ Item
sourceSize.width: width
sourceSize.height: height
color: control.hovered ? UM.Theme.getColor("small_button_text_hover") : UM.Theme.getColor("small_button_text")
source: UM.Theme.getIcon("Hamburger")
source: UM.Theme.getIcon("menu")
}
}
label: Label {}