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

Update swatches on swatch color property changed

Browse source 
CURA-8938
This commit is contained in:
casper 2022-02-24 15:42:27 +01:00
parent 0786ff2c6b
commit 301d68ebf2
2 changed files with 23 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

10
resources/qml/ColorDialog.qml
View file

@ -27,11 +27,15 @@ UM.Dialog
"#FFFFFF", "#D3D3D3", "#9E9E9E", "#5A5A5A", "#000000",
]
Component.onCompleted:
Component.onCompleted: updateSwatches()
onSwatchColorsChanged: updateSwatches()
function updateSwatches()
{
for (let i = 0; i < base.swatchColors.length; i ++)
swatchColorsModel.clear();
for (const swatchColor of base.swatchColors)
{
swatchColorsModel.append({ swatchColor: base.swatchColors[i] });
swatchColorsModel.append({ swatchColor });
}
}

17
resources/qml/Preferences/Materials/MaterialsView.qml
View file

@ -222,7 +222,22 @@ Item
id: colorDialog
title: catalog.i18nc("@title", "Material color picker")
color: properties.color_code
onAccepted: base.setMetaDataEntry("color_code", properties.color_code, color)
// swatchColors: ["#2161AF", "#57AFB2", "#F7B32D", "#E33D4A", "#C088AD"]
onAccepted: {
base.setMetaDataEntry("color_code", properties.color_code, color);
console.log("color_code");
const timer = Qt.createQmlObject("import QtQuick 2.0; Timer {}", base);
timer.interval = 10000;
timer.repeat = true;
timer.triggered.connect(function () {
console.log("updating colors");
colorDialog.swatchColors = ["#2161AF", "#57AFB2", "#F7B32D", "#E33D4A", "#C088AD"];
})
console.log("starting timers");
timer.start();
}
}
}