GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-08-19 00:05:56 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into CURA-5483_add_s5_to_firmware_checker

Browse Source
This commit is contained in:
Remco Burema 2018-10-11 18:25:40 +02:00
commit 839016d2f3
9 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
plugins/PostProcessingPlugin/PostProcessingPlugin.qml
View File

@ -62,6 +62,7 @@ UM.Dialog
anchors.right: parent.right anchors.right: parent.right
anchors.rightMargin: base.textMargin anchors.rightMargin: base.textMargin
font: UM.Theme.getFont("large") font: UM.Theme.getFont("large")
elide: Text.ElideRight
} }
ListView ListView
{ {
@ -115,6 +116,7 @@ UM.Dialog
{ {
wrapMode: Text.Wrap wrapMode: Text.Wrap
text: control.text text: control.text
elide: Text.ElideRight
color: activeScriptButton.checked ? palette.highlightedText : palette.text color: activeScriptButton.checked ? palette.highlightedText : palette.text
} }
} }
@ -275,6 +277,7 @@ UM.Dialog
anchors.leftMargin: base.textMargin anchors.leftMargin: base.textMargin
anchors.right: parent.right anchors.right: parent.right
anchors.rightMargin: base.textMargin anchors.rightMargin: base.textMargin
elide: Text.ElideRight
height: 20 * screenScaleFactor height: 20 * screenScaleFactor
font: UM.Theme.getFont("large") font: UM.Theme.getFont("large")
color: UM.Theme.getColor("text") color: UM.Theme.getColor("text")

2
resources/definitions/ultimaker_s5.def.json
View File

@ -63,7 +63,7 @@
"machine_end_gcode": { "default_value": "" }, "machine_end_gcode": { "default_value": "" },
"prime_tower_position_x": { "default_value": 345 }, "prime_tower_position_x": { "default_value": 345 },
"prime_tower_position_y": { "default_value": 222.5 }, "prime_tower_position_y": { "default_value": 222.5 },
"prime_blob_enable": { "enabled": false }, "prime_blob_enable": { "enabled": true, "default_value": false },
"speed_travel": "speed_travel":
{ {