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

Fix a number of QML warnings

Browse source 
CURA-5785
This commit is contained in:
Jaime van Kessel 2018-11-16 16:10:26 +01:00
parent 7f99ed1af3
commit 52b2f4579a
3 changed files with 4 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

16
resources/qml/Cura.qml
View file

@ -214,22 +214,6 @@ UM.MainWindow
} }
} }
Loader
{
id: viewPanel
anchors.bottom: viewModeButton.top
anchors.topMargin: UM.Theme.getSize("default_margin").height
anchors.right: viewModeButton.right
property var buttonTarget: Qt.point(viewModeButton.x + Math.round(viewModeButton.width / 2), viewModeButton.y + Math.round(viewModeButton.height / 2))
height: childrenRect.height
width: childrenRect.width
source: UM.ActiveView.valid ? UM.ActiveView.activeViewPanel : ""
}
Cura.ActionPanelWidget Cura.ActionPanelWidget
{ {
anchors.right: parent.right anchors.right: parent.right

2
resources/qml/MachineSelector.qml
View file

@ -45,7 +45,7 @@ Cura.ExpandableComponent
{ {
anchors.fill: parent anchors.fill: parent
contentHeight: column.implicitHeight contentHeight: column.implicitHeight
contentWidth: row.implicitWidth contentWidth: column.implicitWidth
clip: true clip: true
ScrollBar.horizontal.policy: ScrollBar.AlwaysOff ScrollBar.horizontal.policy: ScrollBar.AlwaysOff

6
resources/qml/Menus/ConfigurationMenu/QuickConfigurationSelector.qml
View file

@ -111,7 +111,7 @@ Cura.ExpandableComponent
delegate: TabButton delegate: TabButton
{ {
width: Math.round(ListView.view.width / extrudersModel.rowCount()) width: ListView.view != null ? Math.round(ListView.view.width / extrudersModel.rowCount()): 0
height: parent.height height: parent.height
contentItem: Item contentItem: Item
{ {
@ -156,7 +156,7 @@ Cura.ExpandableComponent
OldControls.CheckBox OldControls.CheckBox
{ {
checked: Cura.MachineManager.getExtruder(tabControl.model.index).isEnabled checked: tabControl.model != null ? Cura.MachineManager.getExtruder(tabControl.model.index).isEnabled: false
onClicked: Cura.MachineManager.setExtruderEnabled(tabControl.model.index, checked) onClicked: Cura.MachineManager.setExtruderEnabled(tabControl.model.index, checked)
height: UM.Theme.getSize("setting_control").height height: UM.Theme.getSize("setting_control").height
style: UM.Theme.styles.checkbox style: UM.Theme.styles.checkbox
@ -190,7 +190,7 @@ Cura.ExpandableComponent
tooltip: currentRootMaterialName tooltip: currentRootMaterialName
visible: Cura.MachineManager.hasMaterials visible: Cura.MachineManager.hasMaterials
enabled: !extrudersList.visible || Cura.ExtruderManager.activeExtruderIndex > -1 enabled: Cura.ExtruderManager.activeExtruderIndex > -1
height: UM.Theme.getSize("setting_control").height height: UM.Theme.getSize("setting_control").height
width: tabControl.controlWidth width: tabControl.controlWidth