Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/Ultimaker/Cura.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJaime van Kessel <nallath@gmail.com>2022-03-15 12:32:44 +0300
committerJaime van Kessel <nallath@gmail.com>2022-03-15 12:32:44 +0300
commit97124bf5a9bbf58f825df2b6b1f64f6c21bd84e0 (patch)
treec98c0db0d62a1c39508832b845837a2f975941ec
parentf760ca146d960c0a8704b7477d059e5606dda024 (diff)
Fix various QML warnings
CURA-8979
-rw-r--r--resources/qml/Preferences/Materials/MaterialsDetailsPanel.qml2
-rw-r--r--resources/qml/Preferences/Materials/MaterialsPage.qml2
-rw-r--r--resources/qml/Preferences/Materials/MaterialsView.qml6
-rw-r--r--resources/themes/cura-light/theme.json2
4 files changed, 6 insertions, 6 deletions
diff --git a/resources/qml/Preferences/Materials/MaterialsDetailsPanel.qml b/resources/qml/Preferences/Materials/MaterialsDetailsPanel.qml
index c96dadda67..bb9e732800 100644
--- a/resources/qml/Preferences/Materials/MaterialsDetailsPanel.qml
+++ b/resources/qml/Preferences/Materials/MaterialsDetailsPanel.qml
@@ -60,7 +60,7 @@ Item
properties: materialProperties
containerId: currentItem != null ? currentItem.id : ""
- currentMaterialNode: currentItem.container_node
+ currentMaterialNode: currentItem != null ? currentItem.container_node: null
}
QtObject
diff --git a/resources/qml/Preferences/Materials/MaterialsPage.qml b/resources/qml/Preferences/Materials/MaterialsPage.qml
index 6c44033a63..a777701b21 100644
--- a/resources/qml/Preferences/Materials/MaterialsPage.qml
+++ b/resources/qml/Preferences/Materials/MaterialsPage.qml
@@ -68,7 +68,7 @@ UM.ManagementPage
}
title: catalog.i18nc("@title:tab", "Materials")
- detailsPlaneCation: currentItem.name
+ detailsPlaneCation: currentItem ? currentItem.name: ""
scrollviewCaption: catalog.i18nc("@label", "Materials compatible with active printer:") + `<br /><b>${Cura.MachineManager.activeMachine.name}</b>`
buttons: [
diff --git a/resources/qml/Preferences/Materials/MaterialsView.qml b/resources/qml/Preferences/Materials/MaterialsView.qml
index 1997d1f739..a860472f39 100644
--- a/resources/qml/Preferences/Materials/MaterialsView.qml
+++ b/resources/qml/Preferences/Materials/MaterialsView.qml
@@ -97,7 +97,6 @@ Item
}
border.width: UM.Theme.getSize("default_lining").width
border.color: UM.Theme.getColor("thick_lining")
- visible: base.hasCurrentItem
ScrollView
{
@@ -240,11 +239,12 @@ Item
anchors.verticalCenter: parent.verticalCenter
- width: childrenRect.width + 2 * UM.Theme.getSize("narrow_margin").width
- height: childrenRect.height + 2 * UM.Theme.getSize("narrow_margin").height
+ width: colorSelectorBackground.width + 2 * UM.Theme.getSize("narrow_margin").width
+ height: colorSelectorBackground.height + 2 * UM.Theme.getSize("narrow_margin").height
Rectangle
{
+ id: colorSelectorBackground
color: properties.color_code
width: UM.Theme.getSize("icon_indicator").width
height: UM.Theme.getSize("icon_indicator").height
diff --git a/resources/themes/cura-light/theme.json b/resources/themes/cura-light/theme.json
index 6895e382fa..fce18d88bc 100644
--- a/resources/themes/cura-light/theme.json
+++ b/resources/themes/cura-light/theme.json
@@ -559,7 +559,7 @@
"medium_button_icon": [2, 2],
"context_menu": [20, 2],
-
+
"icon_indicator": [1, 1],
"printer_status_icon": [1.0, 1.0],