GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-08-14 05:25:56 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'CURA-7480_Remove_flicabkle_config_panel'

Browse Source
This commit is contained in:
Ghostkeeper 2020-06-08 14:26:21 +02:00
commit d9c768e0d3
No known key found for this signature in database
GPG Key ID: D2A8871EE34EC59A
1 changed files with 54 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
resources/qml/Menus/ConfigurationMenu/ConfigurationMenu.qml
View File

@ -4,6 +4,7 @@
import QtQuick 2.10 import QtQuick 2.10
import QtQuick.Controls 2.3 import QtQuick.Controls 2.3
import QtQuick.Controls.Styles 1.4 import QtQuick.Controls.Styles 1.4
import QtQuick.Layouts 1.3
import UM 1.2 as UM import UM 1.2 as UM
import Cura 1.0 as Cura import Cura 1.0 as Cura
@ -37,19 +38,16 @@ Cura.ExpandablePopup
headerItem: Item headerItem: Item
{ {
// Horizontal list that shows the extruders and their materials // Horizontal list that shows the extruders and their materials
ListView RowLayout
{ {
id: extrudersList
orientation: ListView.Horizontal
anchors.fill: parent anchors.fill: parent
Repeater
{
model: extrudersModel model: extrudersModel
visible: Cura.MachineManager.activeMachine.hasMaterials
delegate: Item delegate: Item
{ {
height: parent.height Layout.fillWidth: true
width: Math.round(ListView.view.width / extrudersModel.count) Layout.fillHeight: true
// Extruder icon. Shows extruder index and has the same color as the active material. // Extruder icon. Shows extruder index and has the same color as the active material.
Cura.ExtruderIcon Cura.ExtruderIcon
@ -105,6 +103,7 @@ Cura.ExpandablePopup
} }
} }
} }
}
// Placeholder text if there is a configuration to select but no materials (so we can't show the materials per extruder). // Placeholder text if there is a configuration to select but no materials (so we can't show the materials per extruder).
Label Label