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

Update materials slot

Browse source 
CURA-8979
This commit is contained in:
casper 2022-03-11 13:22:45 +01:00
parent 2dd440cc0c
commit c6b8abd53e
1 changed files with 65 additions and 54 deletions
Download patch file Download diff file Expand all files Collapse all files

119
resources/qml/Preferences/Materials/MaterialsSlot.qml
View file

@ -13,23 +13,31 @@ import Cura 1.5 as Cura
Rectangle
{
id: materialSlot
property var material: null
property var hovered: false
property var is_favorite: material != null && material.is_favorite
property bool hovered: false
height: UM.Theme.getSize("favorites_row").height
width: parent.width
color:
{
if (material !== null && base.currentItem !== null)
color: UM.Theme.getColor("main_background")
states:
[
State
{
if (base.currentItem.root_material_id === material.root_material_id)
{
return UM.Theme.getColor("favorites_row_selected");
}
name: "selected"
when: material !== null && base.currentItem !== null && base.currentItem.root_material_id === material.root_material_id
PropertyChanges { target: materialSlot; color: UM.Theme.getColor("background_3") }
PropertyChanges { target: materialLabel; font: UM.Theme.getFont("default_italic") }
},
State
{
name: "hovered"
when: hovered
PropertyChanges { target: materialSlot; color: UM.Theme.getColor("background_3") }
}
return "transparent";
}
]
Rectangle
{
id: swatch
@ -43,79 +51,82 @@ Rectangle
}
UM.Label
{
text: material != null ? material.brand + " " + material.name : ""
id: materialLabel
text: material != null ? `${material.brand} ${material.name}` : ""
verticalAlignment: Text.AlignVCenter
height: parent.height
anchors.left: swatch.right
anchors.verticalCenter: materialSlot.verticalCenter
anchors.leftMargin: UM.Theme.getSize("narrow_margin").width
font.italic: material != null && Cura.MachineManager.currentRootMaterialId[Cura.ExtruderManager.activeExtruderIndex] == material.root_material_id
anchors.leftMargin: UM.Theme.getSize("default_margin").width
font: UM.Theme.getFont("default")
}
MouseArea
{
anchors.fill: parent
onClicked:
{
materialList.currentBrand = material.brand
materialList.currentType = material.brand + "_" + material.material
base.setExpandedActiveMaterial(material.root_material_id)
materialList.currentBrand = material.brand;
materialList.currentType = `${material.brand}_${material.material}`;
base.setExpandedActiveMaterial(material.root_material_id);
}
hoverEnabled: true
onEntered: { materialSlot.hovered = true }
onExited: { materialSlot.hovered = false }
}
Button
Item
{
id: favorite_button
text: ""
implicitWidth: UM.Theme.getSize("favorites_button").width
implicitHeight: UM.Theme.getSize("favorites_button").height
visible: materialSlot.hovered || materialSlot.is_favorite || favorite_button.hovered
anchors
{
right: materialSlot.right
verticalCenter: materialSlot.verticalCenter
}
onClicked:
{
if (materialSlot.is_favorite)
id: favoriteButton
states:
[
State
{
CuraApplication.getMaterialManagementModel().removeFavorite(material.root_material_id)
}
else
name: "favorite"
when: material !== null && material.is_favorite
PropertyChanges { target: favoriteIndicator; source: UM.Theme.getIcon("StarFilled"); color: UM.Theme.getColor("primary") }
PropertyChanges { target: favoriteButton; visible: true }
},
State
{
CuraApplication.getMaterialManagementModel().addFavorite(material.root_material_id)
name: "hovered"
when: hovered
PropertyChanges { target: favoriteButton; visible: true }
}
}
]
implicitHeight: parent.height
implicitWidth: height
anchors.right: materialSlot.right
visible: false
UM.RecolorImage
{
anchors
id: favoriteIndicator
anchors.centerIn: parent
width: UM.Theme.getSize("small_button_icon").width
height: UM.Theme.getSize("small_button_icon").height
color: UM.Theme.getColor("text_inactive")
source: UM.Theme.getIcon("Star")
}
MouseArea
{
anchors.fill: parent
onClicked:
{
verticalCenter: favorite_button.verticalCenter
horizontalCenter: favorite_button.horizontalCenter
}
width: UM.Theme.getSize("favorites_button_icon").width
height: UM.Theme.getSize("favorites_button_icon").height
color:
{
if (favorite_button.hovered)
if (material !== null)
{
return UM.Theme.getColor("primary_hover")
}
else
{
if (materialSlot.is_favorite)
if (material.is_favorite)
{
return UM.Theme.getColor("primary")
CuraApplication.getMaterialManagementModel().removeFavorite(material.root_material_id)
}
else
{
UM.Theme.getColor("text_inactive")
CuraApplication.getMaterialManagementModel().addFavorite(material.root_material_id)
}
}
}
source: materialSlot.is_favorite ? UM.Theme.getIcon("StarFilled") : UM.Theme.getIcon("Star")
}
}
}