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

Fix QML warnings

Browse source
This commit is contained in:
Lipu Fei 2020-01-07 10:57:29 +01:00
parent 045f4c51fa
commit 4f91389941
5 changed files with 26 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

2
plugins/SliceInfoPlugin/MoreInfoWindow.qml
View file

@ -88,7 +88,7 @@ Window
right: parent.right right: parent.right
} }
textArea.text: manager.getExampleData() textArea.text: (manager === null) ? "" : manager.getExampleData()
textArea.textFormat: Text.RichText textArea.textFormat: Text.RichText
textArea.wrapMode: Text.Wrap textArea.wrapMode: Text.Wrap
textArea.readOnly: true textArea.readOnly: true

4
resources/qml/JobSpecs.qml
View file

@ -14,7 +14,7 @@ Item
id: base id: base
property bool activity: CuraApplication.platformActivity property bool activity: CuraApplication.platformActivity
property string fileBaseName: PrintInformation.baseName property string fileBaseName: (PrintInformation === null) ? "" : PrintInformation.baseName
UM.I18nCatalog UM.I18nCatalog
{ {
@ -80,7 +80,7 @@ Item
height: UM.Theme.getSize("jobspecs_line").height height: UM.Theme.getSize("jobspecs_line").height
width: Math.max(__contentWidth + UM.Theme.getSize("default_margin").width, 50) width: Math.max(__contentWidth + UM.Theme.getSize("default_margin").width, 50)
maximumLength: 120 maximumLength: 120
text: PrintInformation.jobName text: (PrintInformation === null) ? "" : PrintInformation.jobName
horizontalAlignment: TextInput.AlignLeft horizontalAlignment: TextInput.AlignLeft
property string textBeforeEdit: "" property string textBeforeEdit: ""

16
resources/qml/Menus/MaterialMenu.qml
View file

@ -13,11 +13,19 @@ Menu
title: catalog.i18nc("@label:category menu label", "Material") title: catalog.i18nc("@label:category menu label", "Material")
property int extruderIndex: 0 property int extruderIndex: 0
property string currentRootMaterialId: Cura.MachineManager.currentRootMaterialId[extruderIndex] property string currentRootMaterialId:
property var activeExtruder: Cura.MachineManager.activeMachine.extruderList[extruderIndex] {
property bool isActiveExtruderEnabled: activeExtruder === undefined ? false : activeExtruder.isEnabled var value = Cura.MachineManager.currentRootMaterialId[extruderIndex]
return (value === undefined) ? "" : value
}
property var activeExtruder:
{
var activeMachine = Cura.MachineManager.activeMachine
return (activeMachine === null) ? null : activeMachine.extruderList[extruderIndex]
}
property bool isActiveExtruderEnabled: activeExtruder === null ? false : activeExtruder.isEnabled
property string activeMaterialId: activeExtruder === undefined ? false : activeExtruder.material.id property string activeMaterialId: activeExtruder === null ? false : activeExtruder.material.id
property bool updateModels: true property bool updateModels: true
Cura.FavoriteMaterialsModel Cura.FavoriteMaterialsModel

10
resources/qml/Menus/NozzleMenu.qml
View file

@ -28,12 +28,22 @@ Menu
text: model.hotend_name text: model.hotend_name
checkable: true checkable: true
checked: { checked: {
var activeMachine = Cura.MachineManager.activeMachine
if (activeMachine === null)
{
return false
}
var extruder = Cura.MachineManager.activeMachine.extruderList[extruderIndex] var extruder = Cura.MachineManager.activeMachine.extruderList[extruderIndex]
return (extruder === undefined) ? false : (extruder.variant.name == model.hotend_name) return (extruder === undefined) ? false : (extruder.variant.name == model.hotend_name)
} }
exclusiveGroup: group exclusiveGroup: group
enabled: enabled:
{ {
var activeMachine = Cura.MachineManager.activeMachine
if (activeMachine === null)
{
return false
}
var extruder = Cura.MachineManager.activeMachine.extruderList[extruderIndex] var extruder = Cura.MachineManager.activeMachine.extruderList[extruderIndex]
return (extruder === undefined) ? false : extruder.isEnabled return (extruder === undefined) ? false : extruder.isEnabled
} }

2
resources/qml/Menus/SettingsMenu.qml
View file

@ -22,7 +22,7 @@ Menu
Menu Menu
{ {
title: modelData.name title: modelData.name
property var extruder: Cura.MachineManager.activeMachine.extruderList[model.index] property var extruder: (base.activeMachine === null) ? null : activeMachine.extruderList[model.index]
NozzleMenu { title: Cura.MachineManager.activeDefinitionVariantsName; visible: Cura.MachineManager.activeMachine.hasVariants; extruderIndex: index } NozzleMenu { title: Cura.MachineManager.activeDefinitionVariantsName; visible: Cura.MachineManager.activeMachine.hasVariants; extruderIndex: index }
MaterialMenu { title: catalog.i18nc("@title:menu", "&Material"); visible: Cura.MachineManager.activeMachine.hasMaterials; extruderIndex: index } MaterialMenu { title: catalog.i18nc("@title:menu", "&Material"); visible: Cura.MachineManager.activeMachine.hasMaterials; extruderIndex: index }