3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-12-05 16:51:12 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge branch '3.2'

Browse source
This commit is contained in:
Ghostkeeper 2018-01-15 16:52:28 +01:00
commit e7c5120f9c
No known key found for this signature in database
GPG key ID: 5252B696FB5E7C7A
4 changed files with 11 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

4
resources/qml/Settings/SettingView.qml
View file

@ -63,9 +63,9 @@ Item
menu: ProfileMenu { }
function generateActiveQualityText () {
result = Cura.MachineManager.activeQualityName
var result = Cura.MachineManager.activeQualityName;
if (Cura.MachineManager.isActiveQualitySupported ) {
if (Cura.MachineManager.isActiveQualitySupported) {
if (Cura.MachineManager.activeQualityLayerHeight > 0) {
result += " <font color=\"" + UM.Theme.getColor("text_detail") + "\">"
result += " - "

7
resources/themes/cura-light/styles.qml
View file

@ -864,9 +864,10 @@ QtObject {
}
}
label: Label {
text: control.text;
color: Theme.getColor("checkbox_text");
font: Theme.getFont("default");
text: control.text
color: Theme.getColor("checkbox_text")
font: Theme.getFont("default")
elide: Text.ElideRight
}
}
}