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

Fix color swatch not being updated after color selection change - CURA-4774

Browse source
This commit is contained in:
ChrisTerBeke 2018-01-09 15:50:32 +01:00
parent 33f0e8cb65
commit f9286d4bd5
1 changed files with 33 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

48
resources/qml/Preferences/MaterialView.qml
View file

@ -104,14 +104,13 @@ TabView
Label { width: scrollView.columnWidth; height: parent.rowHeight; verticalAlignment: Qt.AlignVCenter; text: catalog.i18nc("@label", "Color") } Label { width: scrollView.columnWidth; height: parent.rowHeight; verticalAlignment: Qt.AlignVCenter; text: catalog.i18nc("@label", "Color") }
Row Row {
{ width: scrollView.columnWidth
width: scrollView.columnWidth; height: parent.rowHeight
height: parent.rowHeight;
spacing: Math.floor(UM.Theme.getSize("default_margin").width/2) spacing: Math.floor(UM.Theme.getSize("default_margin").width/2)
Rectangle // color indicator square
{ Rectangle {
id: colorSelector id: colorSelector
color: properties.color_code color: properties.color_code
@ -121,17 +120,36 @@ TabView
anchors.verticalCenter: parent.verticalCenter anchors.verticalCenter: parent.verticalCenter
MouseArea { anchors.fill: parent; onClicked: colorDialog.open(); enabled: base.editingEnabled } // open the color selection dialog on click
MouseArea {
anchors.fill: parent
onClicked: colorDialog.open()
enabled: base.editingEnabled
}
} }
ReadOnlyTextField
{ // make sure the color stays connected after changing the color
Binding {
target: colorSelector
property: "color"
value: properties.color_code
}
// pretty color name text field
ReadOnlyTextField {
id: colorLabel; id: colorLabel;
text: properties.color_name; text: properties.color_name;
readOnly: !base.editingEnabled readOnly: !base.editingEnabled
onEditingFinished: base.setMetaDataEntry("color_name", properties.color_name, text) onEditingFinished: base.setMetaDataEntry("color_name", properties.color_name, text)
} }
ColorDialog { id: colorDialog; color: properties.color_code; onAccepted: base.setMetaDataEntry("color_code", properties.color_code, color) } // popup dialog to select a new color
// if successful it sets the properties.color_code value to the new color
ColorDialog {
id: colorDialog
color: properties.color_code
onAccepted: base.setMetaDataEntry("color_code", properties.color_code, color)
}
} }
Item { width: parent.width; height: UM.Theme.getSize("default_margin").height } Item { width: parent.width; height: UM.Theme.getSize("default_margin").height }
@ -401,11 +419,11 @@ TabView
} }
// Tiny convenience function to check if a value really changed before trying to set it. // Tiny convenience function to check if a value really changed before trying to set it.
function setMetaDataEntry(entry_name, old_value, new_value) function setMetaDataEntry(entry_name, old_value, new_value) {
{ if (old_value != new_value) {
if(old_value != new_value) Cura.ContainerManager.setContainerMetaDataEntry(base.containerId, entry_name, new_value)
{ // make sure the UI properties are updated as well since we don't re-fetch the entire model here
Cura.ContainerManager.setContainerMetaDataEntry(base.containerId, entry_name, new_value); properties[entry_name] = new_value
} }
} }