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

Fixed fonts

Browse source 
CL-896
This commit is contained in:
Jaime van Kessel 2018-08-24 14:07:56 +02:00
parent 36da9cc9e5
commit 5605ff3b46
3 changed files with 14 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

8
plugins/UM3NetworkPrinting/ClusterControlItem.qml
View file

@ -52,7 +52,7 @@ Component
top: printingLabel.bottom top: printingLabel.bottom
left: parent.left left: parent.left
right: parent.right right: parent.right
topMargin: 2 * UM.Theme.getSize("default_margin").height topMargin: 1 * UM.Theme.getSize("default_margin").height
bottom: parent.bottom bottom: parent.bottom
bottomMargin: UM.Theme.getSize("default_margin").height bottomMargin: UM.Theme.getSize("default_margin").height
} }
@ -134,6 +134,7 @@ Component
anchors.right: collapseIcon.left anchors.right: collapseIcon.left
anchors.rightMargin: UM.Theme.getSize("default_margin").width anchors.rightMargin: UM.Theme.getSize("default_margin").width
elide: Text.ElideRight elide: Text.ElideRight
font: UM.Theme.getFont("default_bold")
} }
UM.RecolorImage UM.RecolorImage
@ -159,6 +160,8 @@ Component
anchors.right: collapseIcon.left anchors.right: collapseIcon.left
anchors.rightMargin: UM.Theme.getSize("default_margin").width anchors.rightMargin: UM.Theme.getSize("default_margin").width
elide: Text.ElideRight elide: Text.ElideRight
font: UM.Theme.getFont("default")
opacity: 0.6
} }
} }
@ -254,6 +257,8 @@ Component
id: ownerName id: ownerName
anchors.top: printJobName.bottom anchors.top: printJobName.bottom
text: modelData.activePrintJob != null ? modelData.activePrintJob.owner : "" text: modelData.activePrintJob != null ? modelData.activePrintJob.owner : ""
font: UM.Theme.getFont("default")
opacity: 0.6
} }
Image Image
@ -380,6 +385,7 @@ Component
anchors.verticalCenter: parent.verticalCenter anchors.verticalCenter: parent.verticalCenter
color: progressItem.width + progressLabel.width < control.width ? "black" : "white" color: progressItem.width + progressLabel.width < control.width ? "black" : "white"
width: contentWidth width: contentWidth
font: UM.Theme.getFont("default")
} }
} }
} }

3
plugins/UM3NetworkPrinting/PrintCoreConfiguration.qml
View file

@ -79,6 +79,9 @@ Item
anchors.top: materialLabel.bottom anchors.top: materialLabel.bottom
elide: Text.ElideRight elide: Text.ElideRight
opacity: 0.6
font: UM.Theme.getFont("default")
anchors anchors
{ {
top: materialLabel.bottom top: materialLabel.bottom

6
plugins/UM3NetworkPrinting/PrintJobInfoBlock.qml
View file

@ -70,6 +70,8 @@ Item
id: ownerName id: ownerName
anchors.top: printJobName.bottom anchors.top: printJobName.bottom
text: printJob.owner text: printJob.owner
font: UM.Theme.getFont("default")
opacity: 0.6
} }
Image Image
@ -84,10 +86,10 @@ Item
Label Label
{ {
id: totalTimeLabel id: totalTimeLabel
opacity: 0.6
anchors.bottom: parent.bottom anchors.bottom: parent.bottom
anchors.right: parent.right anchors.right: parent.right
font: UM.Theme.getFont("default")
text: printJob != null ? getPrettyTime(printJob.timeTotal) : "" text: printJob != null ? getPrettyTime(printJob.timeTotal) : ""
elide: Text.ElideRight elide: Text.ElideRight
} }