diff --git a/resources/qml/SaveButton.qml b/resources/qml/SaveButton.qml index e48b55921d..50808f9777 100644 --- a/resources/qml/SaveButton.qml +++ b/resources/qml/SaveButton.qml @@ -59,12 +59,14 @@ Rectangle { } } -// Rectangle{ -// id: printJobRow -// implicitWidth: base.width; -// implicitHeight: UM.Theme.sizes.sidebar_header.height -// anchors.top: parent.top -// color: UM.Theme.colors.sidebar_header_bar + Rectangle{ + id: printJobRow + implicitWidth: base.width; + //implicitHeight: UM.Theme.sizes.sidebar_header.height /////////////remove this TODO + implicitHeight: 1 + 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 diff --git a/resources/qml/Toolbar.qml b/resources/qml/Toolbar.qml index ca6b625b1b..2acebf094f 100644 --- a/resources/qml/Toolbar.qml +++ b/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; diff --git a/resources/themes/cura/icons/setting_per_object.svg b/resources/themes/cura/icons/setting_per_object.svg index 9c5bd9bc8d..53c8a97d95 100644 --- a/resources/themes/cura/icons/setting_per_object.svg +++ b/resources/themes/cura/icons/setting_per_object.svg @@ -1,7 +1,45 @@ - - - - - + + + +image/svg+xml \ No newline at end of file