3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-27 00:23:55 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Fix QML warnings

Browse source 
CURA-5772
This commit is contained in:
Jaime van Kessel 2018-10-15 15:32:50 +02:00
parent 2455961ac7
commit 553e29b9b8
4 changed files with 8 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

6
resources/qml/Cura.qml
View file

@ -159,7 +159,7 @@ UM.MainWindow
} }
height: 50 height: 50
source: UM.Controller.activeStage.stageMenuComponent source: UM.Controller.activeStage != null ? UM.Controller.activeStage.stageMenuComponent : ""
} }
Connections Connections
@ -252,13 +252,13 @@ UM.MainWindow
MouseArea MouseArea
{ {
visible: UM.Controller.activeStage.mainComponent != "" visible: parent.source != ""
anchors.fill: parent anchors.fill: parent
acceptedButtons: Qt.AllButtons acceptedButtons: Qt.AllButtons
onWheel: wheel.accepted = true onWheel: wheel.accepted = true
} }
source: UM.Controller.activeStage.mainComponent source: UM.Controller.activeStage != null ? UM.Controller.activeStage.mainComponent : ""
} }
UM.MessageStack UM.MessageStack

5
resources/qml/MaterialAndVariantSelector.qml
View file

@ -174,15 +174,18 @@ Rectangle
font: UM.Theme.getFont("large_nonbold") font: UM.Theme.getFont("large_nonbold")
text: catalog.i18nc("@label", "Extruder") text: catalog.i18nc("@label", "Extruder")
visible: width < (control.width - extruderIconItem.width - UM.Theme.getSize("default_margin").width) visible: width < (control.width - extruderIcon.width - UM.Theme.getSize("default_margin").width)
elide: Text.ElideRight elide: Text.ElideRight
} }
ExtruderIcon ExtruderIcon
{ {
// Round icon with the extruder number and material color indicator. // Round icon with the extruder number and material color indicator.
id: extruderIcon
anchors.verticalCenter: parent.verticalCenter anchors.verticalCenter: parent.verticalCenter
anchors.left: extruderStaticText.right anchors.left: extruderStaticText.right
anchors.leftMargin: UM.Theme.getSize("default_margin").width
width: control.height - Math.round(UM.Theme.getSize("default_margin").width / 2) width: control.height - Math.round(UM.Theme.getSize("default_margin").width / 2)
height: width height: width

2
resources/qml/ProgressAndSaveWidget.qml
View file

@ -20,7 +20,7 @@ Rectangle
signal hideTooltip() signal hideTooltip()
// Also add an extra margin, as we ant some breathing room around the edges. // Also add an extra margin, as we ant some breathing room around the edges.
height: childrenRect.height + UM.Theme.getSize("sidebar_margin").height height: saveButton.height + UM.Theme.getSize("sidebar_margin").height
Label Label
{ {
id: timeDetails id: timeDetails

1
resources/qml/Skeleton/TopHeader.qml
View file

@ -93,7 +93,6 @@ Rectangle
color: UM.Theme.getColor("topheader_button_text_active") color: UM.Theme.getColor("topheader_button_text_active")
font: UM.Theme.getFont("action_button") font: UM.Theme.getFont("action_button")
renderType: Text.NativeRendering renderType: Text.NativeRendering
anchors.verticalCenter: control.verticalCenter
} }
} }