15.10 last minute restyling

Contributes to: issue CURA-60

resources/qml/SaveButton.qml

@@ -59,12 +59,14 @@ Rectangle {
         }
     }
 
-//     Rectangle{
+    Rectangle{
-//         id: printJobRow
+        id: printJobRow
-//         implicitWidth: base.width;
+        implicitWidth: base.width;
-//         implicitHeight: UM.Theme.sizes.sidebar_header.height
+        //implicitHeight: UM.Theme.sizes.sidebar_header.height /////////////remove this TODO
-//         anchors.top: parent.top
+        implicitHeight: 1
-//         color: UM.Theme.colors.sidebar_header_bar
+        anchors.top: parent.top
+        //color: UM.Theme.colors.sidebar_header_bar
+        color: UM.Theme.colors.setting_control_border
 //         Label{
 //             id: printJobTextfieldLabel
 //             text: catalog.i18nc("@label","Printjob name");
@@ -103,13 +105,13 @@ Rectangle {
 //                 }
 //             }
 //         }
-//     }
+    }
 
     Rectangle {
         id: specsRow
         implicitWidth: base.width
         implicitHeight: UM.Theme.sizes.sidebar_specs_bar.height
-        anchors.top: parent.top
+        anchors.top: printJobRow.bottom
         Item{
             id: time
             width: (parent.width / 100 * 45) - UM.Theme.sizes.default_margin.width * 2

resources/qml/Toolbar.qml

@@ -28,7 +28,7 @@ Item {
             model: UM.Models.toolModel
 
             Button {
-                text: model.name;
+                text: model.name
                 iconSource: UM.Theme.icons[model.icon];
 
                 checkable: true;

resources/themes/cura/icons/setting_per_object.svg

@@ -1,7 +1,45 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Generator: Adobe Illustrator 19.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<!-- Generator: Adobe Illustrator 19.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<svg version="1.2" baseProfile="tiny" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"
+
-	 x="0px" y="0px" viewBox="0 0 30 30" xml:space="preserve">
+<svg
-<path d="M30,20L25.1,6.7L27.6,0H12.9l1.6,5H7.1H6.9H6.4l2.3,6H2.4l2.4,6.2L0,30h19.5l-1.7-4h7.5h0.1h0.6l-2.3-6H30z M17.5,25
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
-	l-2.8-7.5l2.4-6.5H9.6L7.7,6h7.2h7.5l-2.4,6.4l2.9,7.6l2,5H17.5z"/>
+   xmlns:cc="http://creativecommons.org/ns#"
-</svg>
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.2"
+   id="Layer_1"
+   x="0px"
+   y="0px"
+   viewBox="0 0 30 30"
+   xml:space="preserve"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="setting_per_object.svg"><metadata
+     id="metadata9"><rdf:RDF><cc:Work
+         rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" /></cc:Work></rdf:RDF></metadata><defs
+     id="defs7" /><sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1440"
+     inkscape:window-height="834"
+     id="namedview5"
+     showgrid="false"
+     inkscape:zoom="7.8666667"
+     inkscape:cx="15"
+     inkscape:cy="15"
+     inkscape:window-x="0"
+     inkscape:window-y="27"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="Layer_1" /><path
+     d="M30,20L25.1,6.7L27.6,0H12.9l1.6,5H7.1H6.9H6.4l2.3,6H2.4l2.4,6.2L0,30h19.5l-1.7-4h7.5h0.1h0.6l-2.3-6H30z M17.5,25  l-2.8-7.5l2.4-6.5H9.6L7.7,6h7.2h7.5l-2.4,6.4l2.9,7.6l2,5H17.5z"
+     id="path3"
+     style="fill:#ffffff" /></svg>