3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-22 06:03:57 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 21

Merge branch 'ui_rework_4_0' into CURA-5941_restyle_setting_dropdown

Browse source
This commit is contained in:
Diego Prado Gesto 2018-12-06 16:35:07 +01:00
commit 3b8b70bddf
22 changed files with 2283 additions and 120 deletions
Download patch file Download diff file Expand all files Collapse all files

23
resources/qml/Menus/ConfigurationMenu/ConfigurationMenu.qml
View file

@ -44,6 +44,7 @@ Cura.ExpandablePopup
orientation: ListView.Horizontal
anchors.fill: parent
model: extrudersModel
visible: base.enabled
delegate: Item
{
@ -69,6 +70,7 @@ Cura.ExpandablePopup
elide: Text.ElideRight
font: UM.Theme.getFont("default")
color: UM.Theme.getColor("text_inactive")
renderType: Text.NativeRendering
anchors
{
@ -86,6 +88,7 @@ Cura.ExpandablePopup
elide: Text.ElideRight
font: UM.Theme.getFont("default")
color: UM.Theme.getColor("text")
renderType: Text.NativeRendering
anchors
{
@ -100,6 +103,23 @@ Cura.ExpandablePopup
}
}
//Disable the menu if there are no materials, variants or build plates to change.
function updateEnabled()
{
var active_definition_id = Cura.MachineManager.activeMachine.definition.id;
var has_materials = Cura.ContainerManager.getContainerMetaDataEntry(active_definition_id, "has_materials");
var has_variants = Cura.ContainerManager.getContainerMetaDataEntry(active_definition_id, "has_variants");
var has_buildplates = Cura.ContainerManager.getContainerMetaDataEntry(active_definition_id, "has_variant_buildplates");
base.enabled = has_materials || has_variants || has_buildplates; //Only let it drop down if there is any configuration that you could change.
}
Connections
{
target: Cura.MachineManager
onGlobalContainerChanged: base.updateEnabled();
}
Component.onCompleted: updateEnabled();
contentItem: Column
{
id: popupItem
@ -136,8 +156,9 @@ Cura.ExpandablePopup
{
id: separator
visible: buttonBar.visible
x: -contentPadding
width: parent.width
width: base.width
height: UM.Theme.getSize("default_lining").height
color: UM.Theme.getColor("lining")