15.10 minimal version of the simple mode

Contributes to: issue CURA-60

resources/qml/SidebarSimple.qml

@@ -11,23 +11,167 @@ import UM 1.1 as UM
 Item
 {
     id: base;
-
     anchors.fill: parent;
-    anchors.leftMargin: UM.Theme.sizes.default_margin.width;
-    anchors.rightMargin: UM.Theme.sizes.default_margin.width;
 
     property Action configureSettings;
-
     property variant minimumPrintTime: PrintInformation.minimumPrintTime;
     property variant maximumPrintTime: PrintInformation.maximumPrintTime;
 
     Component.onCompleted: PrintInformation.enabled = true
     Component.onDestruction: PrintInformation.enabled = false
     UM.I18nCatalog { id: catalog; name:"cura"}
-    ColumnLayout
-    {
-        anchors.fill: parent;
 
+//     Rectangle {
+//         anchors.top: simpleModeGrid.top
+//         anchors.left: simpleModeGrid.left
+//         width: simpleModeGrid.width
+//         height: simpleModeGrid.height
+//         color: "blue"
+//     }
+
+    Grid {
+        id: simpleModeGrid
+        anchors.fill: parent;
+        columns: 2
+        spacing: 0
+
+//         Rectangle{
+//             id: infillLabelCell
+//             width: base.width/100*45
+//             height: 100
+//             Column {
+//                 spacing: 0
+//                 anchors{
+//                     top: parent.top
+//                     topMargin: UM.Theme.sizes.default_margin.height
+//                     right: parent.right
+//                     rightMargin: UM.Theme.sizes.default_margin.width
+//                     bottom: parent.bottom
+//                     bottomMargin: UM.Theme.sizes.default_margin.height
+//                     left: parent.left
+//                     leftMargin: UM.Theme.sizes.default_margin.width
+//                 }
+//
+//                 Label{
+//                     id: infillLabel
+//                     //: Infill selection label
+//                     text: catalog.i18nc("@label","Infill:");
+//                     font: UM.Theme.fonts.default;
+//                 }
+//                 Label{
+//                     id: infillCaption
+//                     width: infillLabelCell.width - UM.Theme.sizes.default_margin.width
+//                     text: "hier staat overig tekst hier staat overig tekst hier staat overig tekst"
+//                     font: UM.Theme.fonts.caption
+//                     wrapMode: Text.Wrap
+//                     color: UM.Theme.colors.text
+//                 }
+//             }
+//         }
+//
+//         Rectangle{
+//             id: infillCell
+//             height: 100
+//             width: base.width/100*55
+//             Row {
+//                 spacing: 0
+//                 anchors.right: parent.right
+//                 anchors.rightMargin: UM.Theme.sizes.default_margin.width
+//                 Rectangle {
+//                     id: infillWrapper
+//                     width: infillCell.width/4;
+//                     height: infillCell.height
+//                     Rectangle{
+//                         id: infillIconLining
+//                         anchors.top: parent.top
+//                         anchors.topMargin: UM.Theme.sizes.default_margin.height
+//                         anchors.horizontalCenter: parent.horizontalCenter
+//                         z: parent.z + 1
+//                         width: parent.width - UM.Theme.sizes.default_margin.width/2
+//                         height: parent.width  - UM.Theme.sizes.default_margin.width/2
+//                         color: "grey"
+//                         border.color: "black"
+//                         border.width:1
+//                         UM.RecolorImage {
+//                             id: infillIcon
+//                             z: parent.z + 1
+//                             anchors.verticalCenter: parent.verticalCenter
+//                             anchors.horizontalCenter: parent.horizontalCenter
+//                             width: UM.Theme.sizes.save_button_specs_icons.width
+//                             height: UM.Theme.sizes.save_button_specs_icons.height
+//                             sourceSize.width: width
+//                             sourceSize.height: width
+//                             color: UM.Theme.colors.text_hover
+//                             source: UM.Theme.icons.print_time;
+//                         }
+//                     }
+//                     Label{
+//                        //: Infill version label "light:
+//                         text: catalog.i18nc("@label","Light");
+//                         anchors.top: infillIconLining.bottom
+//                         anchors.horizontalCenter: parent.horizontalCenter
+//                         font.bold: true
+//                     }
+//                 }
+//                 Rectangle {
+//                     color: "green";
+//                     width: infillCell.width/4;
+//                     height: infillCell.height
+//                 }
+//                 Rectangle {
+//                     color: "blue";
+//                     width: infillCell.width/4;
+//                     height: infillCell.height
+//                 }
+//                 Rectangle {
+//                     color: "yellow";
+//                     width: infillCell.width/4;
+//                     height: infillCell.height
+//                 }
+//             }
+//         }
+
+        Rectangle {
+            width: parent.width/100*45 - UM.Theme.sizes.default_margin.width
+            height: 100
+            Label{
+                anchors.left: parent.left
+                anchors.leftMargin: UM.Theme.sizes.default_margin.width
+                //: Helpers selection label
+                text: catalog.i18nc("@label","Helpers:");
+                font: UM.Theme.fonts.default;
+            }
+        }
+        Rectangle {
+            width: parent.width/100*55 - UM.Theme.sizes.default_margin.width
+            height: 100
+            Column {
+                spacing: 4
+
+                CheckBox{
+                    Layout.preferredHeight: UM.Theme.sizes.section.height;
+                    //: Setting enable skirt adhesion checkbox
+                    text: catalog.i18nc("@action:checkbox","Enable Skirt Adhesion");
+                    style: UM.Theme.styles.checkbox;
+                    checked: Printer.getSettingValue("skirt_line_count");
+                    onCheckedChanged: Printer.setSettingValue("skirt_line_count", checked);
+                }
+                CheckBox{
+                    Layout.preferredHeight: UM.Theme.sizes.section.height;
+
+                    //: Setting enable support checkbox
+                    text: catalog.i18nc("@action:checkbox","Enable Support");
+
+                    style: UM.Theme.styles.checkbox;
+
+                    checked: Printer.getSettingValue("support_enable");
+                    onCheckedChanged: Printer.setSettingValue("support_enable", checked);
+                }
+            }
+        }
+    }
+
+/*
         Item
         {
             Layout.fillWidth: true;
@@ -130,5 +274,5 @@ Item
         }
 
         Item { Layout.fillWidth: true; Layout.fillHeight: true; }
-    }
+    }*/
 }

resources/themes/cura/theme.json

@@ -121,7 +121,7 @@
         "checkbox_hover": [245, 245, 245, 255],
         "checkbox_border": [174, 174, 174, 255],
         "checkbox_mark": [35, 35, 35, 255],
-        "checkbox_text": [140, 144, 154, 255],
+        "checkbox_text": [0, 0, 0, 255],
 
         "tooltip": [255, 225, 146, 255],