GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-08-12 01:39:03 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix the last material qml warnings

Browse Source
This commit is contained in:
Jaime van Kessel 2019-05-16 14:29:05 +02:00
parent bfe1275d46
commit 99e6ec9509
2 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
resources/qml/Preferences/Materials/MaterialsPage.qml
View File

@ -271,7 +271,9 @@ Item
id: confirmRemoveMaterialDialog id: confirmRemoveMaterialDialog
icon: StandardIcon.Question; icon: StandardIcon.Question;
title: catalog.i18nc("@title:window", "Confirm Remove") title: catalog.i18nc("@title:window", "Confirm Remove")
text: catalog.i18nc("@label (%1 is object name)", "Are you sure you wish to remove %1? This cannot be undone!").arg(base.currentItem.name) property string materialName: base.currentItem !== null ? base.currentItem.name : ""
text: catalog.i18nc("@label (%1 is object name)", "Are you sure you wish to remove %1? This cannot be undone!").arg(materialName)
standardButtons: StandardButton.Yes | StandardButton.No standardButtons: StandardButton.Yes | StandardButton.No
modality: Qt.ApplicationModal modality: Qt.ApplicationModal
onYes: onYes:

14
resources/qml/Preferences/Materials/MaterialsSlot.qml
View File

@ -19,8 +19,18 @@ Rectangle
height: UM.Theme.getSize("favorites_row").height height: UM.Theme.getSize("favorites_row").height
width: parent.width width: parent.width
color: material != null ? (base.currentItem.root_material_id == material.root_material_id ? UM.Theme.getColor("favorites_row_selected") : "transparent") : "transparent" //color: material != null ? (base.currentItem.root_material_id == material.root_material_id ? UM.Theme.getColor("favorites_row_selected") : "transparent") : "transparent"
color:
{
if(material !== null && base.currentItem !== null)
{
if(base.currentItem.root_material_id === material.root_material_id)
{
return UM.Theme.getColor("favorites_row_selected")
}
}
return "transparent"
}
Rectangle Rectangle
{ {
id: swatch id: swatch