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

Make SimulationViewMenuComponent also use the ExpandableComponent

Browse source 
CURA-5785
This commit is contained in:
Jaime van Kessel 2018-11-13 15:57:00 +01:00
parent deb5fd1926
commit 785c2661a2
3 changed files with 20 additions and 64 deletions
Download patch file Download diff file Expand all files Collapse all files

74
plugins/SimulationView/SimulationViewMenuComponent.qml
View file

@ -10,19 +10,13 @@ import QtGraphicalEffects 1.0
import UM 1.0 as UM
import Cura 1.0 as Cura
Rectangle
Cura.ExpandableComponent
{
id: base
color: UM.Theme.getColor("tool_panel_background")
border.width: UM.Theme.getSize("default_lining").width
border.color: UM.Theme.getColor("lining")
width: UM.Theme.getSize("layerview_menu_size").width
height: viewSettings.collapsed ? layerViewTypesLabel.height + 2 * UM.Theme.getSize("default_margin").height : childrenRect.height + 2 * UM.Theme.getSize("default_margin").height
Behavior on height { NumberAnimation { duration: 100 } }
iconSource: UM.Theme.getIcon("pencil")
property var buttonTarget:
{
@ -51,59 +45,21 @@ Rectangle
}
}
Label
headerItem: Label
{
id: layerViewTypesLabel
text: catalog.i18nc("@label","Color scheme")
font: UM.Theme.getFont("default");
text: catalog.i18nc("@label", "Color scheme")
font: UM.Theme.getFont("default")
visible: !UM.SimulationView.compatibilityMode
color: UM.Theme.getColor("setting_control_text")
height: contentHeight
anchors
{
top: parent.top
margins: UM.Theme.getSize("default_margin").height
right: collapseButton.left
left: parent.left
}
height: base.height
verticalAlignment: Text.AlignVCenter
}
Button
{
id: collapseButton
anchors
{
top: parent.top
margins: UM.Theme.getSize("default_margin").width
right: parent.right
}
width: UM.Theme.getSize("standard_arrow").width
height: UM.Theme.getSize("standard_arrow").height
onClicked: viewSettings.collapsed = !viewSettings.collapsed
style: ButtonStyle
{
background: UM.RecolorImage
{
width: control.width
height: control.height
sourceSize.width: width
sourceSize.height: width
color: UM.Theme.getColor("setting_control_text")
source: viewSettings.collapsed ? UM.Theme.getIcon("arrow_left") : UM.Theme.getIcon("arrow_bottom")
}
label: Label{ }
}
}
Column
popupItem: Column
{
id: viewSettings
property bool collapsed: false
property var extruder_opacities: UM.Preferences.getValue("layerview/extruder_opacities").split("|")
property bool show_travel_moves: UM.Preferences.getValue("layerview/show_travel_moves")
property bool show_helpers: UM.Preferences.getValue("layerview/show_helpers")
@ -118,19 +74,11 @@ Rectangle
property bool only_show_top_layers: UM.Preferences.getValue("view/only_show_top_layers")
property int top_layer_count: UM.Preferences.getValue("view/top_layer_count")
anchors
{
top: layerViewTypesLabel.bottom
left: parent.left
right: parent.right
margins: UM.Theme.getSize("default_margin").height
}
width: UM.Theme.getSize("layerview_menu_size").width
height: childrenRect.height
spacing: UM.Theme.getSize("layerview_row_spacing").height
visible: !collapsed
ListModel // matches SimulationView.py
{
id: layerViewTypes