3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-12-05 16:51:12 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge branch 'master' into CURA-8013_Adjust_sizes_of_header_and_toolbar

Browse source
This commit is contained in:
Konstantinos Karmas 2021-06-29 11:04:51 +02:00
commit 8a22eaa5cc
288 changed files with 1088 additions and 1538 deletions
Download patch file Download diff file Expand all files Collapse all files

2
resources/qml/Menus/ConfigurationMenu/ConfigurationItem.qml
View file

@ -93,7 +93,7 @@ Button
id: icon
anchors.verticalCenter: unknownMaterialMessage.verticalCenter
source: UM.Theme.getIcon("warning")
source: UM.Theme.getIcon("Warning")
color: UM.Theme.getColor("warning")
width: UM.Theme.getSize("section_icon").width
height: width

2
resources/qml/Menus/ConfigurationMenu/ConfigurationListView.qml
View file

@ -39,7 +39,7 @@ Item
anchors.left: parent.left
anchors.verticalCenter: label.verticalCenter
source: UM.Theme.getIcon("warning")
source: UM.Theme.getIcon("Warning")
color: UM.Theme.getColor("warning")
width: UM.Theme.getSize("section_icon").width
height: width

4
resources/qml/Menus/ConfigurationMenu/ConfigurationMenu.qml
View file

@ -250,7 +250,7 @@ Cura.ExpandablePopup
anchors.right: parent.right
iconSource: UM.Theme.getIcon("arrow_right")
iconSource: UM.Theme.getIcon("ChevronSingleRight")
isIconOnRightSide: true
onClicked:
@ -266,7 +266,7 @@ Cura.ExpandablePopup
visible: popupItem.configuration_method == ConfigurationMenu.ConfigurationMethod.Custom
text: catalog.i18nc("@label", "Configurations")
iconSource: UM.Theme.getIcon("arrow_left")
iconSource: UM.Theme.getIcon("ChevronSingleLeft")
onClicked:
{

4
resources/qml/Menus/ConfigurationMenu/CustomConfiguration.qml
View file

@ -314,7 +314,7 @@ Item
anchors.centerIn: parent
background: UM.RecolorImage
{
source: UM.Theme.getIcon("printing_guideline")
source: UM.Theme.getIcon("Guide")
color: instructionButton.hovered ? UM.Theme.getColor("primary") : UM.Theme.getColor("icon")
}
visible: selectors.instructionLink != ""
@ -388,7 +388,7 @@ Item
{
id: warningImage
anchors.left: parent.left
source: UM.Theme.getIcon("warning")
source: UM.Theme.getIcon("Warning")
width: UM.Theme.getSize("section_icon").width
height: UM.Theme.getSize("section_icon").height
sourceSize.width: width