Skip to content

Commit ec163d1

Browse files
committed
Hide non-SV materials from the settings > extruder menu's.
Don't merge to main. CURA-12625 CURA-12833
1 parent 08177f2 commit ec163d1

File tree

3 files changed

+3
-72
lines changed

3 files changed

+3
-72
lines changed

resources/qml/Menus/ConfigurationMenu/ConfigurationListView.qml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ Item
5050
// other when the connection was lost
5151
text: Cura.MachineManager.printerConnected ?
5252
catalog.i18nc("@label", "Loading available configurations from the printer...") :
53-
catalog.i18nc("@label", "The configurations are not available because the printer is disconnected.")
53+
catalog.i18nc("@label", "Configurations aren't available because the printer is disconnected. (The 'settings' menu can be used to manually configure, though it's recommended to connect the printer instead, then select any here.)")
5454
wrapMode: Text.WordWrap
5555
}
5656
}

resources/qml/Menus/MaterialBrandMenu.qml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,12 @@ Instead we'll use a pop-up which doesn't seem to have that problem. */
1414
Cura.MenuItem
1515
{
1616
id: materialBrandMenu
17-
height: UM.Theme.getSize("menu").height + UM.Theme.getSize("narrow_margin").height
17+
height: materialTypesModel.name.toLowerCase() == "solevation" ? UM.Theme.getSize("menu").height + UM.Theme.getSize("narrow_margin").height : 1
1818
overrideShowArrow: true
1919

2020
property var materialTypesModel
2121
text: materialTypesModel.name
22+
visible: materialTypesModel.name.toLowerCase() == "solevation"
2223

2324
contentItem: MouseArea
2425
{

resources/qml/Menus/MaterialMenu.qml

Lines changed: 0 additions & 70 deletions
Original file line numberDiff line numberDiff line change
@@ -27,19 +27,6 @@ Cura.Menu
2727

2828
property string activeMaterialId: (activeExtruder === null || activeExtruder === undefined) ? "" : activeExtruder.material.id
2929
property bool updateModels: true
30-
Cura.FavoriteMaterialsModel
31-
{
32-
id: favoriteMaterialsModel
33-
extruderPosition: materialMenu.extruderIndex
34-
enabled: updateModels
35-
}
36-
37-
Cura.GenericMaterialsModel
38-
{
39-
id: genericMaterialsModel
40-
extruderPosition: materialMenu.extruderIndex
41-
enabled: updateModels
42-
}
4330

4431
Cura.MaterialBrandsModel
4532
{
@@ -48,54 +35,6 @@ Cura.Menu
4835
enabled: updateModels
4936
}
5037

51-
Cura.MenuItem
52-
{
53-
text: catalog.i18nc("@label:category menu label", "Favorites")
54-
enabled: false
55-
visible: favoriteMaterialsModel.items.length > 0
56-
}
57-
58-
Instantiator
59-
{
60-
model: favoriteMaterialsModel
61-
delegate: Cura.MenuItem
62-
{
63-
text: model.brand + " " + model.name
64-
checkable: true
65-
enabled: isActiveExtruderEnabled
66-
checked: model.root_material_id === materialMenu.currentRootMaterialId
67-
onTriggered: Cura.MachineManager.setMaterial(extruderIndex, model.container_node)
68-
}
69-
onObjectAdded: function(index, object) { materialMenu.insertItem(index + 1, object) }
70-
onObjectRemoved: function(index, object) { materialMenu.removeItem(index) }
71-
}
72-
73-
Cura.MenuSeparator { visible: favoriteMaterialsModel.items.length > 0}
74-
75-
Cura.Menu
76-
{
77-
id: genericMenu
78-
title: catalog.i18nc("@label:category menu label", "Generic")
79-
enabled: genericMaterialsModel.items.length > 0
80-
81-
Instantiator
82-
{
83-
model: genericMaterialsModel
84-
delegate: Cura.MenuItem
85-
{
86-
text: model.name
87-
checkable: true
88-
enabled: isActiveExtruderEnabled
89-
checked: model.root_material_id === materialMenu.currentRootMaterialId
90-
onTriggered: Cura.MachineManager.setMaterial(extruderIndex, model.container_node)
91-
}
92-
onObjectAdded: function(index, object) { genericMenu.insertItem(index, object)}
93-
onObjectRemoved: function(index, object) {genericMenu.removeItem(index) }
94-
}
95-
}
96-
97-
Cura.MenuSeparator {}
98-
9938
Instantiator
10039
{
10140
model: brandModel
@@ -106,13 +45,4 @@ Cura.Menu
10645
onObjectAdded: function(index, object) { materialMenu.insertItem(index + 4, object)}
10746
onObjectRemoved: function(index, object) { materialMenu.removeItem(index) }
10847
}
109-
110-
Cura.MenuSeparator {}
111-
112-
Cura.MenuSeparator {}
113-
114-
Cura.MenuItem
115-
{
116-
action: Cura.Actions.marketplaceMaterials
117-
}
11848
}

0 commit comments

Comments
 (0)