GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-06-04 11:14:21 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix QML warnings when switching to an extruder tab

Browse Source
This commit is contained in:
fieldOfView 2017-04-21 21:48:20 +02:00
parent 656e7a8046
commit 0966ef5338
1 changed files with 24 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
plugins/MachineSettingsAction/MachineSettingsAction.qml
View File

@ -450,6 +450,7 @@ Cura.MachineAction
Label Label
{ {
text: catalog.i18nc("@label", "Start Gcode") text: catalog.i18nc("@label", "Start Gcode")
font.bold: true
} }
TextArea TextArea
{ {
@ -457,7 +458,6 @@ Cura.MachineAction
width: parent.width width: parent.width
height: parent.height - y height: parent.height - y
font: UM.Theme.getFont("fixed") font: UM.Theme.getFont("fixed")
wrapMode: TextEdit.NoWrap
text: machineStartGcodeProvider.properties.value text: machineStartGcodeProvider.properties.value
onActiveFocusChanged: onActiveFocusChanged:
{ {
@ -466,6 +466,10 @@ Cura.MachineAction
machineStartGcodeProvider.setPropertyValue("value", machineStartGcodeField.text) machineStartGcodeProvider.setPropertyValue("value", machineStartGcodeField.text)
} }
} }
Component.onCompleted:
{
wrapMode = TextEdit.NoWrap;
}
} }
} }
@ -475,6 +479,7 @@ Cura.MachineAction
Label Label
{ {
text: catalog.i18nc("@label", "End Gcode") text: catalog.i18nc("@label", "End Gcode")
font.bold: true
} }
TextArea TextArea
{ {
@ -482,7 +487,6 @@ Cura.MachineAction
width: parent.width width: parent.width
height: parent.height - y height: parent.height - y
font: UM.Theme.getFont("fixed") font: UM.Theme.getFont("fixed")
wrapMode: TextEdit.NoWrap
text: machineEndGcodeProvider.properties.value text: machineEndGcodeProvider.properties.value
onActiveFocusChanged: onActiveFocusChanged:
{ {
@ -491,6 +495,10 @@ Cura.MachineAction
machineEndGcodeProvider.setPropertyValue("value", machineEndGcodeField.text) machineEndGcodeProvider.setPropertyValue("value", machineEndGcodeField.text)
} }
} }
Component.onCompleted:
{
wrapMode = TextEdit.NoWrap;
}
} }
} }
} }
@ -552,7 +560,7 @@ Cura.MachineAction
Label Label
{ {
text: catalog.i18nc("@label", "Printer Settings") text: catalog.i18nc("@label", "Nozzle Settings")
font.bold: true font.bold: true
} }
@ -616,6 +624,7 @@ Cura.MachineAction
Label Label
{ {
text: catalog.i18nc("@label", "Extruder Start Gcode") text: catalog.i18nc("@label", "Extruder Start Gcode")
font.bold: true
} }
TextArea TextArea
{ {
@ -623,8 +632,7 @@ Cura.MachineAction
width: parent.width width: parent.width
height: parent.height - y height: parent.height - y
font: UM.Theme.getFont("fixed") font: UM.Theme.getFont("fixed")
wrapMode: TextEdit.NoWrap text: (extruderStartGcodeProvider.properties.value) ? extruderStartGcodeProvider.properties.value : ""
text: extruderStartGcodeProvider.properties.value
onActiveFocusChanged: onActiveFocusChanged:
{ {
if(!activeFocus) if(!activeFocus)
@ -632,6 +640,10 @@ Cura.MachineAction
extruderStartGcodeProvider.setPropertyValue("value", extruderStartGcodeField.text) extruderStartGcodeProvider.setPropertyValue("value", extruderStartGcodeField.text)
} }
} }
Component.onCompleted:
{
wrapMode = TextEdit.NoWrap;
}
} }
} }
Column { Column {
@ -640,6 +652,7 @@ Cura.MachineAction
Label Label
{ {
text: catalog.i18nc("@label", "Extruder End Gcode") text: catalog.i18nc("@label", "Extruder End Gcode")
font.bold: true
} }
TextArea TextArea
{ {
@ -647,8 +660,7 @@ Cura.MachineAction
width: parent.width width: parent.width
height: parent.height - y height: parent.height - y
font: UM.Theme.getFont("fixed") font: UM.Theme.getFont("fixed")
wrapMode: TextEdit.NoWrap text: (extruderEndGcodeProvider.properties.value) ? extruderEndGcodeProvider.properties.value : ""
text: extruderEndGcodeProvider.properties.value
onActiveFocusChanged: onActiveFocusChanged:
{ {
if(!activeFocus) if(!activeFocus)
@ -656,6 +668,10 @@ Cura.MachineAction
extruderEndGcodeProvider.setPropertyValue("value", extruderEndGcodeField.text) extruderEndGcodeProvider.setPropertyValue("value", extruderEndGcodeField.text)
} }
} }
Component.onCompleted:
{
wrapMode = TextEdit.NoWrap;
}
} }
} }
} }
@ -674,7 +690,7 @@ Cura.MachineAction
TextField TextField
{ {
id: textField id: textField
text: propertyProvider.properties.value text: (propertyProvider.properties.value) ? propertyProvider.properties.value : ""
validator: RegExpValidator { regExp: /[0-9\.]{0,6}/ } validator: RegExpValidator { regExp: /[0-9\.]{0,6}/ }
onEditingFinished: onEditingFinished:
{ {