mirror of
https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura
synced 2025-08-15 06:55:55 +08:00
Simplifying layout by removing unneeded elements. CURA-2763
This commit is contained in:
Jack Ha
parent
67f1afb9ce
commit
4ecd1a0fe3
@ -61,11 +61,25 @@ Column
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
Row
|
/*Rectangle
|
||||||
{
|
{
|
||||||
id: extruderSelectionRow
|
id: extruderSeparator
|
||||||
height: UM.Theme.getSize("sidebar_tabs").height
|
// anchors.verticalCenter: parent.verticalCenter
|
||||||
visible: machineExtruderCount.properties.value > 1 && !sidebar.monitoringPrint
|
// anchors.top: machineSelectionRow.bottom
|
||||||
|
|
||||||
|
width: parent.width
|
||||||
|
height: UM.Theme.getSize("sidebar_lining").height
|
||||||
|
color: UM.Theme.getColor("sidebar_lining")
|
||||||
|
}*/
|
||||||
|
|
||||||
|
ListView
|
||||||
|
{
|
||||||
|
id: extrudersList
|
||||||
|
property var index: 0
|
||||||
|
|
||||||
|
height: UM.Theme.getSize("sidebar_header_mode_tabs").height
|
||||||
|
|
||||||
|
boundsBehavior: Flickable.StopAtBounds
|
||||||
|
|
||||||
anchors
|
anchors
|
||||||
{
|
{
|
||||||
@ -73,111 +87,85 @@ Column
|
|||||||
right: parent.right
|
right: parent.right
|
||||||
}
|
}
|
||||||
|
|
||||||
Rectangle
|
ExclusiveGroup { id: extruderMenuGroup; }
|
||||||
{
|
|
||||||
anchors.verticalCenter: parent.verticalCenter
|
|
||||||
|
|
||||||
width: parent.width
|
orientation: ListView.Horizontal
|
||||||
height: parent.height
|
|
||||||
color: UM.Theme.getColor("tab_background")
|
model: Cura.ExtrudersModel { id: extrudersModel; addGlobal: false }
|
||||||
|
|
||||||
|
Connections
|
||||||
|
{
|
||||||
|
target: Cura.MachineManager
|
||||||
|
onGlobalContainerChanged:
|
||||||
|
{
|
||||||
|
forceActiveFocus() // Changing focus applies the currently-being-typed values so it can change the displayed setting values.
|
||||||
|
var extruder_index = (machineExtruderCount.properties.value == 1) ? -1 : 0
|
||||||
|
ExtruderManager.setActiveExtruderIndex(extruder_index);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
ListView
|
delegate: Button
|
||||||
{
|
{
|
||||||
id: extrudersList
|
height: ListView.view.height
|
||||||
property var index: 0
|
width: ListView.view.width / extrudersModel.rowCount()
|
||||||
|
|
||||||
height: UM.Theme.getSize("sidebar_header_mode_tabs").height
|
text: model.name
|
||||||
|
tooltip: model.name
|
||||||
|
exclusiveGroup: extruderMenuGroup
|
||||||
|
checked: base.currentExtruderIndex == index
|
||||||
|
|
||||||
boundsBehavior: Flickable.StopAtBounds
|
onClicked:
|
||||||
|
|
||||||
anchors
|
|
||||||
{
|
{
|
||||||
left: parent.left
|
forceActiveFocus() // Changing focus applies the currently-being-typed values so it can change the displayed setting values.
|
||||||
right: parent.right
|
ExtruderManager.setActiveExtruderIndex(index);
|
||||||
bottom: parent.bottom
|
|
||||||
}
|
}
|
||||||
|
|
||||||
ExclusiveGroup { id: extruderMenuGroup; }
|
style: ButtonStyle
|
||||||
|
|
||||||
orientation: ListView.Horizontal
|
|
||||||
|
|
||||||
model: Cura.ExtrudersModel { id: extrudersModel; addGlobal: false }
|
|
||||||
|
|
||||||
Connections
|
|
||||||
{
|
{
|
||||||
target: Cura.MachineManager
|
background: Rectangle
|
||||||
onGlobalContainerChanged:
|
|
||||||
{
|
{
|
||||||
forceActiveFocus() // Changing focus applies the currently-being-typed values so it can change the displayed setting values.
|
border.width: UM.Theme.getSize("default_lining").width
|
||||||
var extruder_index = (machineExtruderCount.properties.value == 1) ? -1 : 0
|
border.color: control.checked ? UM.Theme.getColor("tab_checked_border") :
|
||||||
ExtruderManager.setActiveExtruderIndex(extruder_index);
|
control.pressed ? UM.Theme.getColor("tab_active_border") :
|
||||||
}
|
control.hovered ? UM.Theme.getColor("tab_hovered_border") : UM.Theme.getColor("tab_unchecked_border")
|
||||||
}
|
color: control.checked ? UM.Theme.getColor("tab_checked") :
|
||||||
|
control.pressed ? UM.Theme.getColor("tab_active") :
|
||||||
|
control.hovered ? UM.Theme.getColor("tab_hovered") : UM.Theme.getColor("tab_unchecked")
|
||||||
|
Behavior on color { ColorAnimation { duration: 50; } }
|
||||||
|
|
||||||
delegate: Button
|
Rectangle
|
||||||
{
|
|
||||||
height: ListView.view.height
|
|
||||||
width: ListView.view.width / extrudersModel.rowCount()
|
|
||||||
|
|
||||||
text: model.name
|
|
||||||
tooltip: model.name
|
|
||||||
exclusiveGroup: extruderMenuGroup
|
|
||||||
checked: base.currentExtruderIndex == index
|
|
||||||
|
|
||||||
onClicked:
|
|
||||||
{
|
|
||||||
forceActiveFocus() // Changing focus applies the currently-being-typed values so it can change the displayed setting values.
|
|
||||||
ExtruderManager.setActiveExtruderIndex(index);
|
|
||||||
}
|
|
||||||
|
|
||||||
style: ButtonStyle
|
|
||||||
{
|
|
||||||
background: Rectangle
|
|
||||||
{
|
{
|
||||||
|
id: swatch
|
||||||
|
visible: index > -1
|
||||||
|
height: UM.Theme.getSize("setting_control").height / 2
|
||||||
|
width: height
|
||||||
|
anchors.left: parent.left
|
||||||
|
anchors.leftMargin: (parent.height - height) / 2
|
||||||
|
anchors.verticalCenter: parent.verticalCenter
|
||||||
|
|
||||||
|
color: model.color
|
||||||
border.width: UM.Theme.getSize("default_lining").width
|
border.width: UM.Theme.getSize("default_lining").width
|
||||||
border.color: control.checked ? UM.Theme.getColor("tab_checked_border") :
|
border.color: UM.Theme.getColor("setting_control_border")
|
||||||
control.pressed ? UM.Theme.getColor("tab_active_border") :
|
}
|
||||||
control.hovered ? UM.Theme.getColor("tab_hovered_border") : UM.Theme.getColor("tab_unchecked_border")
|
|
||||||
color: control.checked ? UM.Theme.getColor("tab_checked") :
|
Label
|
||||||
control.pressed ? UM.Theme.getColor("tab_active") :
|
{
|
||||||
control.hovered ? UM.Theme.getColor("tab_hovered") : UM.Theme.getColor("tab_unchecked")
|
anchors.verticalCenter: parent.verticalCenter
|
||||||
Behavior on color { ColorAnimation { duration: 50; } }
|
anchors.left: swatch.visible ? swatch.right : parent.left
|
||||||
|
anchors.leftMargin: swatch.visible ? UM.Theme.getSize("default_margin").width / 2 : UM.Theme.getSize("default_margin").width
|
||||||
Rectangle
|
anchors.right: parent.right
|
||||||
{
|
anchors.rightMargin: UM.Theme.getSize("default_margin").width / 2
|
||||||
id: swatch
|
|
||||||
visible: index > -1
|
color: control.checked ? UM.Theme.getColor("tab_checked_text") :
|
||||||
height: UM.Theme.getSize("setting_control").height / 2
|
control.pressed ? UM.Theme.getColor("tab_active_text") :
|
||||||
width: height
|
control.hovered ? UM.Theme.getColor("tab_hovered_text") : UM.Theme.getColor("tab_unchecked_text")
|
||||||
anchors.left: parent.left
|
|
||||||
anchors.leftMargin: (parent.height - height) / 2
|
font: UM.Theme.getFont("default")
|
||||||
anchors.verticalCenter: parent.verticalCenter
|
text: control.text
|
||||||
|
elide: Text.ElideRight
|
||||||
color: model.color
|
|
||||||
border.width: UM.Theme.getSize("default_lining").width
|
|
||||||
border.color: UM.Theme.getColor("setting_control_border")
|
|
||||||
}
|
|
||||||
|
|
||||||
Label
|
|
||||||
{
|
|
||||||
anchors.verticalCenter: parent.verticalCenter
|
|
||||||
anchors.left: swatch.visible ? swatch.right : parent.left
|
|
||||||
anchors.leftMargin: swatch.visible ? UM.Theme.getSize("default_margin").width / 2 : UM.Theme.getSize("default_margin").width
|
|
||||||
anchors.right: parent.right
|
|
||||||
anchors.rightMargin: UM.Theme.getSize("default_margin").width / 2
|
|
||||||
|
|
||||||
color: control.checked ? UM.Theme.getColor("tab_checked_text") :
|
|
||||||
control.pressed ? UM.Theme.getColor("tab_active_text") :
|
|
||||||
control.hovered ? UM.Theme.getColor("tab_hovered_text") : UM.Theme.getColor("tab_unchecked_text")
|
|
||||||
|
|
||||||
font: UM.Theme.getFont("default")
|
|
||||||
text: control.text
|
|
||||||
elide: Text.ElideRight
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
label: Item { }
|
|
||||||
}
|
}
|
||||||
|
label: Item { }
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -195,6 +183,7 @@ Column
|
|||||||
leftMargin: UM.Theme.getSize("default_margin").width
|
leftMargin: UM.Theme.getSize("default_margin").width
|
||||||
right: parent.right
|
right: parent.right
|
||||||
rightMargin: UM.Theme.getSize("default_margin").width
|
rightMargin: UM.Theme.getSize("default_margin").width
|
||||||
|
top: extrudersList.bottom
|
||||||
}
|
}
|
||||||
|
|
||||||
Label
|
Label
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user