Move the Cura logo into the top bar

Looks ugly there, I think, but the colours will be changed eventually so we'll see.

Contributes to issue CURA-4213.
This commit is contained in:
Ghostkeeper 2017-08-31 16:09:16 +02:00
parent 062957c249
commit c6d614156f
No known key found for this signature in database
GPG key ID: C5F96EE2BC0F7E75
2 changed files with 17 additions and 23 deletions

View file

@ -353,28 +353,6 @@ UM.MainWindow
action: Cura.Actions.open;
}
Image
{
id: logo
anchors
{
left: parent.left
leftMargin: UM.Theme.getSize("default_margin").width;
bottom: parent.bottom
bottomMargin: UM.Theme.getSize("default_margin").height;
}
source: UM.Theme.getImage("logo");
width: UM.Theme.getSize("logo").width;
height: UM.Theme.getSize("logo").height;
z: -1;
sourceSize.width: width;
sourceSize.height: height;
}
Toolbar
{
id: toolbar;

View file

@ -29,9 +29,25 @@ Rectangle
name:"cura"
}
Image
{
id: logo
anchors.left: parent.left
anchors.leftMargin: UM.Theme.getSize("default_margin").width
anchors.verticalCenter: parent.verticalCenter
source: UM.Theme.getImage("logo");
width: UM.Theme.getSize("logo").width;
height: UM.Theme.getSize("logo").height;
sourceSize.width: width;
sourceSize.height: height;
}
Row
{
anchors.left: parent.left
anchors.left: logo.right
anchors.leftMargin: UM.Theme.getSize("default_margin").width
anchors.right: machineSelection.left
anchors.rightMargin: UM.Theme.getSize("default_margin").width
spacing: UM.Theme.getSize("default_margin").width