3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-08-06 05:23:58 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Revert "Revert "fix merge conflict""

Browse source 
This reverts commit 4bffa6d90f.
This commit is contained in:
Daniel Schiavini 2018-12-07 10:25:46 +01:00
parent 4bffa6d90f
commit a1c252d3a2
73 changed files with 3047 additions and 1216 deletions
Download patch file Download diff file Expand all files Collapse all files

4
resources/qml/PrinterOutput/OutputDeviceHeader.qml
View file

@ -43,7 +43,7 @@ Item
{
id: outputDeviceAddressLabel
text: (outputDevice != null && outputDevice.address != null) ? outputDevice.address : ""
font: UM.Theme.getFont("small")
font: UM.Theme.getFont("default_bold")
color: UM.Theme.getColor("text_inactive")
anchors.top: outputDeviceNameLabel.bottom
anchors.left: parent.left
@ -54,7 +54,7 @@ Item
{
text: outputDevice != null ? "" : catalog.i18nc("@info:status", "The printer is not connected.")
color: outputDevice != null && outputDevice.acceptsCommands ? UM.Theme.getColor("setting_control_text") : UM.Theme.getColor("setting_control_disabled_text")
font: UM.Theme.getFont("very_small")
font: UM.Theme.getFont("default")
wrapMode: Text.WordWrap
anchors.left: parent.left
anchors.leftMargin: UM.Theme.getSize("default_margin").width