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

Merge branch 'master' into feature_setting_visibility_profiles

Browse source
This commit is contained in:
fieldOfView 2018-03-05 23:09:51 +01:00
commit 97d7354839
586 changed files with 6836 additions and 6692 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -59,13 +59,13 @@ Item
height: UM.Theme.getSize("setting_control").height
anchors.left: globalProfileLabel.right
anchors.right: parent.right
tooltip: Cura.MachineManager.activeQualityName
tooltip: Cura.MachineManager.activeQualityOrQualityChangesName
style: UM.Theme.styles.sidebar_header_button
activeFocusOnPress: true
menu: ProfileMenu { }
function generateActiveQualityText () {
var result = Cura.MachineManager.activeQualityName;
var result = Cura.MachineManager.activeQualityOrQualityChangesName;
if (Cura.MachineManager.isActiveQualitySupported) {
if (Cura.MachineManager.activeQualityLayerHeight > 0) {
@ -195,7 +195,7 @@ Item
TextField
{
id: filter;
height: parent.height
anchors.left: parent.left
anchors.right: clearFilterButton.left
anchors.rightMargin: Math.round(UM.Theme.getSize("sidebar_margin").width)
@ -622,4 +622,4 @@ Item
}
}
}
}
}