From d6793bc1974db28bc616131b97596483283a5c08 Mon Sep 17 00:00:00 2001
From: Tamara Hogenhout <t.hogenhout@ultimaker.com>
Date: Mon, 21 Sep 2015 14:31:43 +0200
Subject: [PATCH] adapts the sizes between buttons etc

fixes: issue CURA-194
---
 resources/qml/Cura.qml           | 2 +-
 resources/qml/SaveButton.qml     | 2 +-
 resources/qml/SidebarHeader.qml  | 5 ++---
 resources/themes/cura/theme.json | 6 ++++--
 4 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/resources/qml/Cura.qml b/resources/qml/Cura.qml
index 7f3644ee83..74e8fe147e 100644
--- a/resources/qml/Cura.qml
+++ b/resources/qml/Cura.qml
@@ -413,7 +413,7 @@ UM.MainWindow
                 anchors {
                     left: parent.left
                     top: parent.top
-                    topMargin: UM.Theme.sizes.default_margin.height + UM.Theme.sizes.button.height
+                    topMargin: UM.Theme.sizes.window_margin.height + UM.Theme.sizes.button.height
                     //horizontalCenter: parent.horizontalCenter
                     //horizontalCenterOffset: -(UM.Theme.sizes.sidebar.width / 2)
                     //top: parent.top;
diff --git a/resources/qml/SaveButton.qml b/resources/qml/SaveButton.qml
index b666b112b9..6499933d85 100644
--- a/resources/qml/SaveButton.qml
+++ b/resources/qml/SaveButton.qml
@@ -62,7 +62,7 @@ Rectangle {
     Rectangle{
         id: printJobRow
         implicitWidth: base.width;
-        implicitHeight: UM.Theme.sizes.sidebar_header.height
+        implicitHeight: UM.Theme.sizes.save_button_header.height
         anchors.top: parent.top
         color: UM.Theme.colors.sidebar_header_bar
         Label{
diff --git a/resources/qml/SidebarHeader.qml b/resources/qml/SidebarHeader.qml
index eecba3262e..0c3fd7bc52 100644
--- a/resources/qml/SidebarHeader.qml
+++ b/resources/qml/SidebarHeader.qml
@@ -39,18 +39,17 @@ Item
         Rectangle{
             id: settingsModeSelection
             width: parent.width/100*55
-            height: childrenRect.height - UM.Theme.sizes.default_margin.width;
+            height: UM.Theme.sizes.sidebar_header_mode_toggle.height
             anchors.right: parent.right
             anchors.rightMargin: UM.Theme.sizes.default_margin.width;
             anchors.verticalCenter: parent.verticalCenter
             Component{
                 id: wizardDelegate
                 Button {
-                    id: simpleModeButton
                     height: settingsModeSelection.height
                     anchors.left: parent.left
                     anchors.leftMargin: model.index * (settingsModeSelection.width / 2)
-                    anchors.top: parent.top
+                    anchors.verticalCenter: parent.verticalCenter
                     width: parent.width / 2
                     text: model.text
                     exclusiveGroup: modeMenuGroup;
diff --git a/resources/themes/cura/theme.json b/resources/themes/cura/theme.json
index 87704dfd19..24fcdfe8c5 100644
--- a/resources/themes/cura/theme.json
+++ b/resources/themes/cura/theme.json
@@ -147,13 +147,14 @@
     },
 
     "sizes": {
-        "window_margin": [2.0, 2.0],
+        "window_margin": [1.5, 1.5],
         "default_margin": [1.0, 1.0],
         "default_lining": [0.1, 0.1],
         "logo": [9.5, 2.0],
 
         "sidebar": [26.0, 10.0],
-        "sidebar_header": [0.0, 3.2],
+        "sidebar_header": [0.0, 3.8],
+        "sidebar_header_mode_toggle": [0.0, 2.4],
         "sidebar_setup": [0.0, 2.8],
         "sidebar_subParts": [0.0, 2.4],
         "sidebar_specs_bar": [0.0, 2.2],
@@ -196,6 +197,7 @@
         "tooltip_margins": [1.0, 1.0],
 
         "save_button_border": [0.06, 0.06],
+        "save_button_header": [0.0, 3.2],
         "save_button_text_margin": [0.3, 0.6],
         "save_button_slicing_bar": [0.0, 2.2],
         "save_button_label_margin": [0.5, 0.5],