3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-12-05 16:51:12 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Fix various QML warnings

Browse source 
CURA-8979
This commit is contained in:
Jaime van Kessel 2022-03-15 10:32:44 +01:00
parent f760ca146d
commit 97124bf5a9
4 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
resources/qml/Preferences/Materials/MaterialsDetailsPanel.qml
View file

@ -60,7 +60,7 @@ Item
properties: materialProperties properties: materialProperties
containerId: currentItem != null ? currentItem.id : "" containerId: currentItem != null ? currentItem.id : ""
currentMaterialNode: currentItem.container_node currentMaterialNode: currentItem != null ? currentItem.container_node: null
} }
QtObject QtObject

2
resources/qml/Preferences/Materials/MaterialsPage.qml
View file

@ -68,7 +68,7 @@ UM.ManagementPage
} }
title: catalog.i18nc("@title:tab", "Materials") 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>` scrollviewCaption: catalog.i18nc("@label", "Materials compatible with active printer:") + `<br /><b>${Cura.MachineManager.activeMachine.name}</b>`
buttons: [ buttons: [

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

@ -97,7 +97,6 @@ Item
} }
border.width: UM.Theme.getSize("default_lining").width border.width: UM.Theme.getSize("default_lining").width
border.color: UM.Theme.getColor("thick_lining") border.color: UM.Theme.getColor("thick_lining")
visible: base.hasCurrentItem
ScrollView ScrollView
{ {
@ -240,11 +239,12 @@ Item
anchors.verticalCenter: parent.verticalCenter anchors.verticalCenter: parent.verticalCenter
width: childrenRect.width + 2 * UM.Theme.getSize("narrow_margin").width width: colorSelectorBackground.width + 2 * UM.Theme.getSize("narrow_margin").width
height: childrenRect.height + 2 * UM.Theme.getSize("narrow_margin").height height: colorSelectorBackground.height + 2 * UM.Theme.getSize("narrow_margin").height
Rectangle Rectangle
{ {
id: colorSelectorBackground
color: properties.color_code color: properties.color_code
width: UM.Theme.getSize("icon_indicator").width width: UM.Theme.getSize("icon_indicator").width
height: UM.Theme.getSize("icon_indicator").height height: UM.Theme.getSize("icon_indicator").height

2
resources/themes/cura-light/theme.json
View file

@ -559,7 +559,7 @@
"medium_button_icon": [2, 2], "medium_button_icon": [2, 2],
"context_menu": [20, 2], "context_menu": [20, 2],
"icon_indicator": [1, 1], "icon_indicator": [1, 1],
"printer_status_icon": [1.0, 1.0], "printer_status_icon": [1.0, 1.0],