3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-25 07:33:57 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Rearrange Toolbar

Browse source 
Reposition MessageStack
This commit is contained in:
fieldOfView 2015-11-25 13:08:29 +01:00
parent 9c7ee751d5
commit ab02aef6cd
2 changed files with 10 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

9
resources/qml/Cura.qml
View file

@ -326,9 +326,8 @@ UM.MainWindow
anchors anchors
{ {
horizontalCenter: parent.horizontalCenter horizontalCenter: parent.horizontalCenter
horizontalCenterOffset: -(UM.Theme.sizes.logo.width/ 2) horizontalCenterOffset: -(UM.Theme.sizes.sidebar.width/ 2)
top: parent.verticalCenter; verticalCenter: parent.verticalCenter;
bottom: parent.bottom;
} }
} }
@ -432,9 +431,9 @@ UM.MainWindow
id: toolbar; id: toolbar;
anchors { anchors {
left: parent.left left: openFileButton.right
leftMargin: UM.Theme.sizes.window_margin.width
top: parent.top top: parent.top
topMargin: UM.Theme.sizes.window_margin.height + UM.Theme.sizes.button.height
//horizontalCenter: parent.horizontalCenter //horizontalCenter: parent.horizontalCenter
//horizontalCenterOffset: -(UM.Theme.sizes.sidebar.width / 2) //horizontalCenterOffset: -(UM.Theme.sizes.sidebar.width / 2)
//top: parent.top; //top: parent.top;

8
resources/qml/Toolbar.qml
View file

@ -15,7 +15,7 @@ Item {
height: buttons.height height: buttons.height
property int activeY property int activeY
ColumnLayout { RowLayout {
id: buttons; id: buttons;
anchors.bottom: parent.bottom; anchors.bottom: parent.bottom;
@ -35,12 +35,14 @@ Item {
checked: model.active; checked: model.active;
enabled: UM.Selection.hasSelection; enabled: UM.Selection.hasSelection;
property bool verticalTooltip: true;
style: UM.Theme.styles.tool_button; style: UM.Theme.styles.tool_button;
//Workaround since using ToolButton"s onClicked would break the binding of the checked property, instead //Workaround since using ToolButton"s onClicked would break the binding of the checked property, instead
//just catch the click so we do not trigger that behaviour. //just catch the click so we do not trigger that behaviour.
MouseArea { MouseArea {
anchors.fill: parent; anchors.fill: parent;
cursorShape: Qt.PointingHandCursor
onClicked: { onClicked: {
parent.checked ? UM.Controller.setActiveTool(null) : UM.Controller.setActiveTool(model.id); parent.checked ? UM.Controller.setActiveTool(null) : UM.Controller.setActiveTool(model.id);
base.activeY = parent.y base.activeY = parent.y
@ -62,7 +64,9 @@ Item {
Rectangle { Rectangle {
id: panelBackground; id: panelBackground;
anchors.left: parent.right; anchors.left: parent.left;
anchors.top: parent.bottom;
anchors.topMargin: UM.Theme.sizes.default_margin.width;
y: base.activeY y: base.activeY
width: { width: {