3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-08-08 14:34:01 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 7

Merge branch '2.3'

Browse source
This commit is contained in:
Tim Kuipers 2016-10-21 16:20:52 +02:00
commit 86d682daae
10 changed files with 170 additions and 70 deletions
Download patch file Download diff file Expand all files Collapse all files

4
resources/qml/Menus/ProfileMenu.qml
View file

@ -17,7 +17,7 @@ Menu
MenuItem
{
text: model.name
text: model.name + " - " + model.layer_height
checkable: true
checked: Cura.MachineManager.activeQualityChangesId == "empty_quality_changes" && Cura.MachineManager.activeQualityType == model.metadata.quality_type
exclusiveGroup: group
@ -40,7 +40,7 @@ Menu
MenuItem
{
text: model.name
text: model.name + " - " + model.layer_height
checkable: true
checked: Cura.MachineManager.globalQualityId == model.id
exclusiveGroup: group

11
resources/qml/SidebarHeader.qml
View file

@ -285,7 +285,16 @@ Column
ToolButton
{
id: globalProfileSelection
text: Cura.MachineManager.activeQualityName
text: {
var result = Cura.MachineManager.activeQualityName;
if (Cura.MachineManager.activeQualityLayerHeight > 0) {
result += " <font color=\"" + UM.Theme.getColor("text_detail") + "\">";
result += " - ";
result += Cura.MachineManager.activeQualityLayerHeight + "mm";
result += "</font>";
}
return result;
}
enabled: !extrudersList.visible || base.currentExtruderIndex > -1
width: parent.width * 0.55 + UM.Theme.getSize("default_margin").width