GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-08-13 20:05:56 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix position of the material compatibility warning

Browse Source 
CURA-4148
This commit is contained in:
Lipu Fei 2017-09-06 15:49:54 +02:00
parent d561af63e0
commit e18528d2ca
2 changed files with 17 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
resources/qml/SidebarHeader.qml
View File

@ -357,6 +357,22 @@ Column
anchors.right: parent.right anchors.right: parent.right
width: parent.width * 0.7 + UM.Theme.getSize("sidebar_margin").width width: parent.width * 0.7 + UM.Theme.getSize("sidebar_margin").width
UM.RecolorImage
{
id: warningImage
anchors.right: materialInfoLabel.left
anchors.rightMargin: UM.Theme.getSize("default_margin").width
anchors.verticalCenter: parent.Bottom
source: UM.Theme.getIcon("warning")
width: UM.Theme.getSize("section_icon").width
height: UM.Theme.getSize("section_icon").height
//sourceSize.width: width + 5
//sourceSize.height: width + 5
color: UM.Theme.getColor("setting_validation_warning")
visible: !Cura.MachineManager.isCurrentSetupSupported
}
Text Text
{ {
id: materialInfoLabel id: materialInfoLabel
@ -395,21 +411,6 @@ Column
onExited: base.hideTooltip(); onExited: base.hideTooltip();
} }
} }
UM.RecolorImage
{
id: warningImage
anchors.right: parent.right
anchors.verticalCenter: parent.Bottom
source: UM.Theme.getIcon("warning")
width: UM.Theme.getSize("section_icon").width
height: UM.Theme.getSize("section_icon").height
//sourceSize.width: width + 5
//sourceSize.height: width + 5
color: UM.Theme.getColor("setting_validation_warning")
visible: !Cura.MachineManager.isCurrentSetupSupported
}
} }
} }

2
resources/themes/cura-light/theme.json
View File

@ -173,7 +173,7 @@
"setting_validation_error_background": [255, 57, 14, 255], "setting_validation_error_background": [255, 57, 14, 255],
"setting_validation_error": [127, 127, 127, 255], "setting_validation_error": [127, 127, 127, 255],
"setting_validation_warning_background": [255, 186, 15, 255], "setting_validation_warning_background": [255, 186, 15, 255],
"setting_validation_warning": [127, 127, 127, 255], "setting_validation_warning": [0, 0, 0, 255],
"setting_validation_ok": [255, 255, 255, 255], "setting_validation_ok": [255, 255, 255, 255],
"progressbar_background": [245, 245, 245, 255], "progressbar_background": [245, 245, 245, 255],