3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-24 15:13:56 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

Fixed merge issues

Browse source
This commit is contained in:
Jaime van Kessel 2015-08-27 16:09:42 +02:00
commit 74a1a5f6f1
19 changed files with 325 additions and 143 deletions
Download patch file Download diff file Expand all files Collapse all files

14
resources/qml/Cura.qml
View file

@ -339,11 +339,13 @@ UM.MainWindow
{
id: toolbar;
anchors
{
horizontalCenter: parent.horizontalCenter
horizontalCenterOffset: -(UM.Theme.sizes.panel.width / 2)
top: parent.top;
anchors {
left: parent.left
top: parent.top
topMargin: 74
//horizontalCenter: parent.horizontalCenter
//horizontalCenterOffset: -(UM.Theme.sizes.sidebar.width / 2)
//top: parent.top;
}
}
@ -358,7 +360,7 @@ UM.MainWindow
right: parent.right;
}
width: UM.Theme.sizes.panel.width;
width: UM.Theme.sizes.sidebar.width;
addMachineAction: actions.addMachine;
configureMachinesAction: actions.configureMachines;