15.10 restyling of the sidebar

Contributes to: issue CURA-60
This commit is contained in:
Tamara Hogenhout 2015-08-31 17:26:40 +02:00
parent 5cbeed753c
commit 33aa5f596f

View File

@ -41,18 +41,11 @@ Rectangle
} }
} }
ColumnLayout SidebarHeader {
{
anchors.fill: parent;
anchors.topMargin: UM.Theme.sizes.default_margin.height;
spacing: UM.Theme.sizes.default_margin.height;
SidebarHeader
{
id: header; id: header;
Layout.fillWidth: true; width: parent.width
height: totalHeightHeader
addMachineAction: base.addMachineAction; addMachineAction: base.addMachineAction;
configureMachinesAction: base.configureMachinesAction; configureMachinesAction: base.configureMachinesAction;
@ -70,12 +63,12 @@ Rectangle
onCurrentModeIndexChanged: UM.Preferences.setValue("cura/active_mode", currentModeIndex); onCurrentModeIndexChanged: UM.Preferences.setValue("cura/active_mode", currentModeIndex);
} }
Loader Loader{
{
id: sidebarContents; id: sidebarContents;
anchors.bottom: saveButton.top
Layout.fillWidth: true; anchors.top: header.bottom
Layout.fillHeight: true; anchors.left: base.left
anchors.right: base.right
source: modesListModel.get(header.currentModeIndex).file; source: modesListModel.get(header.currentModeIndex).file;
@ -98,12 +91,11 @@ Rectangle
} }
} }
SaveButton SaveButton {
{
id: saveButton; id: saveButton;
implicitWidth: base.width implicitWidth: base.width
implicitHeight: totalHeight implicitHeight: totalHeight
} anchors.bottom: parent.bottom
} }
SidebarTooltip SidebarTooltip