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

Merge branch 'master' into feature_setting_visibility_profiles

Browse source
This commit is contained in:
fieldOfView 2018-02-15 11:56:36 +01:00
commit 85aed830a6
8 changed files with 17 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

1
resources/qml/Settings/SettingCategory.qml
View file

@ -78,6 +78,7 @@ Button
verticalCenter: parent.verticalCenter;
}
text: definition.label
renderType: Text.NativeRendering
font: UM.Theme.getFont("setting_category")
color:
{

2
resources/qml/Settings/SettingComboBox.qml
View file

@ -80,6 +80,7 @@ SettingItem
anchors.right: downArrow.left
text: control.currentText
renderType: Text.NativeRendering
font: UM.Theme.getFont("default")
color: !enabled ? UM.Theme.getColor("setting_control_disabled_text") : UM.Theme.getColor("setting_control_text")
elide: Text.ElideRight
@ -116,6 +117,7 @@ SettingItem
contentItem: Label
{
text: modelData.value
renderType: Text.NativeRendering
color: control.contentItem.color
font: UM.Theme.getFont("default")
elide: Text.ElideRight

2
resources/qml/Settings/SettingExtruder.qml
View file

@ -117,6 +117,7 @@ SettingItem
rightPadding: swatch.width + UM.Theme.getSize("setting_unit_margin").width
text: control.currentText
renderType: Text.NativeRendering
font: UM.Theme.getFont("default")
color: enabled ? UM.Theme.getColor("setting_control_text") : UM.Theme.getColor("setting_control_disabled_text")
@ -171,6 +172,7 @@ SettingItem
contentItem: Label
{
text: model.name
renderType: Text.NativeRendering
color: UM.Theme.getColor("setting_control_text")
font: UM.Theme.getFont("default")
elide: Text.ElideRight

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

@ -112,11 +112,9 @@ Item {
anchors.right: settingControls.left;
anchors.verticalCenter: parent.verticalCenter
height: UM.Theme.getSize("section").height;
verticalAlignment: Text.AlignVCenter;
text: definition.label
elide: Text.ElideMiddle;
renderType: Text.NativeRendering
color: UM.Theme.getColor("setting_control_text");
opacity: (definition.visible) ? 1 : 0.5

2
resources/qml/Settings/SettingOptionalExtruder.qml
View file

@ -136,6 +136,7 @@ SettingItem
rightPadding: swatch.width + UM.Theme.getSize("setting_unit_margin").width
text: control.currentText
renderType: Text.NativeRendering
font: UM.Theme.getFont("default")
color: enabled ? UM.Theme.getColor("setting_control_text") : UM.Theme.getColor("setting_control_disabled_text")
@ -190,6 +191,7 @@ SettingItem
contentItem: Label
{
text: model.name
renderType: Text.NativeRendering
color: UM.Theme.getColor("setting_control_text")
font: UM.Theme.getFont("default")
elide: Text.ElideRight

7
resources/qml/Settings/SettingTextField.qml
View file

@ -83,11 +83,12 @@ SettingItem
Label
{
anchors.right: parent.right;
anchors.right: parent.right
anchors.rightMargin: Math.round(UM.Theme.getSize("setting_unit_margin").width)
anchors.verticalCenter: parent.verticalCenter;
anchors.verticalCenter: parent.verticalCenter
text: definition.unit;
text: definition.unit
renderType: Text.NativeRendering
color: UM.Theme.getColor("setting_unit")
font: UM.Theme.getFont("default")
}