GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-08-13 03:19:04 +08:00
Code Issues Packages Projects Releases Wiki Activity

Rearrange sidebar top

Browse Source 
CURA-340
This commit is contained in:
fieldOfView 2016-05-25 23:27:46 +02:00
parent 098cf515df
commit 6a77f67c34
2 changed files with 12 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
resources/qml/Sidebar.qml
View File

@ -56,22 +56,13 @@ Rectangle
configureMachinesAction: base.configureMachinesAction; configureMachinesAction: base.configureMachinesAction;
} }
Rectangle {
id: headerSeparator
width: parent.width
height: UM.Theme.getSize("sidebar_lining").height
color: UM.Theme.getColor("sidebar_lining")
anchors.top: header.bottom
anchors.topMargin: UM.Theme.getSize("default_margin").height
}
ProfileSetup { ProfileSetup {
id: profileItem id: profileItem
addProfileAction: base.addProfileAction addProfileAction: base.addProfileAction
updateProfileAction: base.updateProfileAction updateProfileAction: base.updateProfileAction
resetProfileAction: base.resetProfileAction resetProfileAction: base.resetProfileAction
manageProfilesAction: base.manageProfilesAction manageProfilesAction: base.manageProfilesAction
anchors.top: settingsModeSelection.bottom anchors.top: header.bottom
anchors.topMargin: UM.Theme.getSize("default_margin").height anchors.topMargin: UM.Theme.getSize("default_margin").height
width: parent.width width: parent.width
height: totalHeightProfileSetup height: totalHeightProfileSetup
@ -80,6 +71,15 @@ Rectangle
onHideTooltip: base.hideTooltip() onHideTooltip: base.hideTooltip()
} }
Rectangle {
id: headerSeparator
width: parent.width
height: UM.Theme.getSize("sidebar_lining").height
color: UM.Theme.getColor("sidebar_lining")
anchors.top: profileItem.bottom
anchors.topMargin: UM.Theme.getSize("default_margin").height
}
currentModeIndex: currentModeIndex:
{ {
var index = parseInt(UM.Preferences.getValue("cura/active_mode")) var index = parseInt(UM.Preferences.getValue("cura/active_mode"))
@ -172,7 +172,7 @@ Rectangle
id: sidebarContents id: sidebarContents
anchors.bottom: footerSeparator.top anchors.bottom: footerSeparator.top
anchors.top: profileItem.bottom anchors.top: settingsModeSelection.bottom
anchors.topMargin: UM.Theme.getSize("default_margin").height anchors.topMargin: UM.Theme.getSize("default_margin").height
anchors.left: base.left anchors.left: base.left
anchors.right: base.right anchors.right: base.right

14
resources/qml/SidebarHeader.qml
View File

@ -25,23 +25,11 @@ Item
color: UM.Theme.getColor("sidebar_header_bar") color: UM.Theme.getColor("sidebar_header_bar")
} }
Label{
id: printjobTabLabel
text: catalog.i18nc("@label:listbox","Print Job");
anchors.left: parent.left
anchors.leftMargin: UM.Theme.getSize("default_margin").width;
anchors.top: sidebarTabRow.bottom
anchors.topMargin: UM.Theme.getSize("default_margin").height
width: parent.width/100*45
font: UM.Theme.getFont("large");
color: UM.Theme.getColor("text")
}
Rectangle { Rectangle {
id: machineSelectionRow id: machineSelectionRow
width: base.width width: base.width
height: UM.Theme.getSize("sidebar_setup").height height: UM.Theme.getSize("sidebar_setup").height
anchors.top: printjobTabLabel.bottom anchors.top: sidebarTabRow.bottom
anchors.topMargin: UM.Theme.getSize("default_margin").height anchors.topMargin: UM.Theme.getSize("default_margin").height
anchors.horizontalCenter: parent.horizontalCenter anchors.horizontalCenter: parent.horizontalCenter