Merge pull request #1 from Ultimaker/master

Resync with ultimaker

resources/definitions/creality_cr10spro.def.json

@@ -4,7 +4,7 @@
     "inherits": "creality_cr10",
     "overrides": {
         "machine_name": { "default_value": "Creality CR-10S Pro" },
-        "machine_start_gcode": { "default_value": "M201 X500.00 Y500.00 Z100.00 E5000.00 ;Setup machine max acceleration\nM203 X500.00 Y500.00 Z10.00 E50.00 ;Setup machine max feedrate\nM204 P500.00 R1000.00 T500.00 ;Setup Print/Retract/Travel acceleration\nM205 X8.00 Y8.00 Z0.40 E5.00 ;Setup Jerk\nM220 S100 ;Reset Feedrate\nM221 S100 ;Reset Flowrate\n\nG28 ;Home\nM420 S1 Z2 ;Enable ABL using saved Mesh and Fade Height\n\nG92 E0 ;Reset Extruder\nG1 Z2.0 F3000 ;Move Z Axis up\nG1 X10.1 Y20 Z0.28 F5000.0 ;Move to start position\nG1 X10.1 Y200.0 Z0.28 F1500.0 E15 ;Draw the first line\nG1 X10.4 Y200.0 Z0.28 F5000.0 ;Move to side a little\nG1 X10.4 Y20 Z0.28 F1500.0 E30 ;Draw the second line\nG92 E0 ;Reset Extruder\nG1 Z2.0 F3000 ;Move Z Axis up\n"},
+        "machine_start_gcode": { "default_value": "M201 X500.00 Y500.00 Z100.00 E5000.00 ;Setup machine max acceleration\nM203 X500.00 Y500.00 Z10.00 E50.00 ;Setup machine max feedrate\nM204 P500.00 R1000.00 T500.00 ;Setup Print/Retract/Travel acceleration\nM205 X8.00 Y8.00 Z0.40 E5.00 ;Setup Jerk\nM220 S100 ;Reset Feedrate\nM221 S100 ;Reset Flowrate\n\nG28 ;Home\nG29 ;Auto bed Level\n\nG92 E0 ;Reset Extruder\nG1 Z2.0 F3000 ;Move Z Axis up\nG1 X10.1 Y20 Z0.28 F5000.0 ;Move to start position\nG1 X10.1 Y200.0 Z0.28 F1500.0 E15 ;Draw the first line\nG1 X10.4 Y200.0 Z0.28 F5000.0 ;Move to side a little\nG1 X10.4 Y20 Z0.28 F1500.0 E30 ;Draw the second line\nG92 E0 ;Reset Extruder\nG1 Z2.0 F3000 ;Move Z Axis up\n"},
         "machine_head_with_fans_polygon": { "default_value": [
                 [-44, 34],
                 [-44, -34],
@@ -21,4 +21,4 @@
         "platform": "creality_cr10spro.stl",
         "platform_offset": [ -150, 0, 150]
     }
-}
+}

resources/definitions/creality_ender3pro.def.json

@@ -9,8 +9,8 @@
     },
     "overrides": {
         "machine_name": { "default_value": "Creality Ender-3 Pro" },
-        "machine_width": { "default_value": 235 },
-        "machine_depth": { "default_value": 235 },
+        "machine_width": { "default_value": 220 },
+        "machine_depth": { "default_value": 220 },
         "machine_height": { "default_value": 250 },
         "machine_head_with_fans_polygon": { "default_value": [
                 [-26, 34],

resources/definitions/flsun_qq_s.def.json

@@ -43,7 +43,7 @@
             "default_value": 1.75
         },
         "machine_start_gcode": {
-            "default_value": "G21\nG90\nM82\nM107 T0\nM190 S{material_bed_temperature}\nM109 S{material_print_temperature} T0\nG28\nG92 E0\nG0 E3 F200\nG92 E0\n"
+            "default_value": "G21\nG90\nM82\nM107 T0\nM190 S{material_bed_temperature_layer_0}\nM109 S{material_print_temperature_layer_0} T0\nG28\nG92 E0\nG0 E3 F200\nG92 E0\n"
         },
         "machine_end_gcode": {
             "default_value": "M107 T0\nM104 S0\nM104 S0 T1\nM140 S0\nG92 E0\nG91\nG1 E-1 F300 \nG1 Z+0.5 E-5 X-20 Y-20 F9000\nG28 X0 Y0\nM84 ;steppers off\nG90 ;absolute positioning\n"

resources/qml/WelcomePages/AddNetworkOrLocalPrinterContent.qml

@@ -143,8 +143,9 @@ Item
                 const networkPrinterItem = addNetworkPrinterDropDown.contentItem.currentItem
                 CuraApplication.getDiscoveredPrintersModel().createMachineFromDiscoveredPrinter(networkPrinterItem)
 
-                // If we have created a machine, go to the last page, which is the "cloud" page.
-                base.goToPage("cloud")
+                // If we have created a machine, end the wizard (since this is the last page)
+                base.endWizard()
+
             }
             else
             {

resources/qml/WelcomePages/AddPrinterByIpContent.qml

@@ -130,7 +130,7 @@ Item
 
                     onTextEdited: invalidInputLabel.visible = false
 
-                    placeholderText: catalog.i18nc("@text", "Place enter your printer's IP address.")
+                    placeholderText: catalog.i18nc("@text", "Enter your printer's IP address.")
 
                     enabled: { ! (addPrinterByIpScreen.hasRequestInProgress || addPrinterByIpScreen.isPrinterDiscovered) }
                     onAccepted: addPrinterButton.clicked()

resources/qml/WelcomePages/CloudContent.qml

@@ -15,14 +15,18 @@ Item
 {
     UM.I18nCatalog { id: catalog; name: "cura" }
 
-    property bool isLoggedIn: Cura.API.account.isLoggedIn
+    property bool newCloudPrintersDetected: Cura.API.account.newCloudPrintersDetected
 
-    onIsLoggedInChanged:
+    onNewCloudPrintersDetectedChanged:
     {
-        if(isLoggedIn)
+        // When the user signs in successfully, it will be checked whether he/she has cloud printers connected to
+        // the account. If he/she does, then the welcome wizard can close. If not, then proceed to the next page (if any)
+        if(newCloudPrintersDetected)
+        {
+            base.endWizard()
+        }
+        else
         {
-            // If the user created an account or logged in by pressing any button on this page, all the actions that
-            // need / can be done by this page are completed, so we can just go to the next (if any).
             base.showNextPage()
         }
     }
@@ -46,7 +50,7 @@ Item
         anchors
         {
             top: titleLabel.bottom
-            bottom: finishButton.top
+            bottom: skipButton.top
             left: parent.left
             right: parent.right
             topMargin: UM.Theme.getSize("default_margin").height
@@ -107,35 +111,47 @@ Item
                 color: UM.Theme.getColor("text")
                 renderType: Text.NativeRendering
             }
+
+            // "Sign in" and "Create an account" exist inside the column
+            Cura.PrimaryButton
+            {
+                id: signInButton
+                height: createAccountButton.height
+                width: createAccountButton.width
+                anchors.horizontalCenter: parent.horizontalCenter
+                text: catalog.i18nc("@button", "Sign in")
+                onClicked: Cura.API.account.login()
+                // Content Item is used in order to align the text inside the button. Without it, when resizing the
+                // button, the text will be aligned on the left
+                contentItem: Text {
+                    text: signInButton.text
+                    font: UM.Theme.getFont("medium")
+                    color: UM.Theme.getColor("primary_text")
+                    horizontalAlignment: Text.AlignHCenter
+                    verticalAlignment: Text.AlignVCenter
+                }
+            }
+
+            Cura.SecondaryButton
+            {
+                id: createAccountButton
+                anchors.horizontalCenter: parent.horizontalCenter
+                text: catalog.i18nc("@button","Create account")
+                onClicked: Qt.openUrlExternally(CuraApplication.ultimakerCloudAccountRootUrl + "/app/create")
+            }
         }
+
+
     }
 
-    // Bottom buttons go here
-    Cura.PrimaryButton
-    {
-        id: finishButton
-        anchors.right: parent.right
-        anchors.bottom: parent.bottom
-        text: catalog.i18nc("@button", "Finish")
-        onClicked: base.showNextPage()
-    }
-
-    Cura.SecondaryButton
-    {
-        id: createAccountButton
-        anchors.left: parent.left
-        anchors.verticalCenter: finishButton.verticalCenter
-        text: catalog.i18nc("@button", "Create an account")
-        onClicked: Qt.openUrlExternally(CuraApplication.ultimakerCloudAccountRootUrl + "/app/create")
-    }
-
+    // The "Skip" button exists on the bottom right
     Label
     {
-        id: signInButton
-        anchors.left: createAccountButton.right
-        anchors.verticalCenter: finishButton.verticalCenter
+        id: skipButton
+        anchors.right: parent.right
+        anchors.bottom: parent.bottom
         anchors.leftMargin: UM.Theme.getSize("default_margin").width
-        text: catalog.i18nc("@button", "Sign in")
+        text: catalog.i18nc("@button", "Skip")
         color: UM.Theme.getColor("secondary_button_text")
         font: UM.Theme.getFont("medium")
         renderType: Text.NativeRendering
@@ -144,7 +160,7 @@ Item
         {
             anchors.fill: parent
             hoverEnabled: true
-            onClicked: Cura.API.account.login()
+            onClicked: base.showNextPage()
             onEntered: parent.font.underline = true
             onExited: parent.font.underline = false
         }

resources/shaders/overhang.shader

@@ -68,11 +68,9 @@ fragment =
 
         finalColor = (-normal.y > u_overhangAngle) ? u_overhangColor : finalColor;
 
-        if(u_renderError > 0.5)
-        {
-            vec3 grid = vec3(f_vertex.x - round(f_vertex.x), f_vertex.y - round(f_vertex.y), f_vertex.z - round(f_vertex.z));
-            finalColor.a = dot(grid, grid) < 0.245 ? 0.667 : 1.0;
-        }
+        vec3 grid = vec3(f_vertex.x - floor(f_vertex.x - 0.5), f_vertex.y - floor(f_vertex.y - 0.5), f_vertex.z - floor(f_vertex.z - 0.5));
+        finalColor.a = (u_renderError > 0.5) && dot(grid, grid) < 0.245 ? 0.667 : 1.0;
+
         gl_FragColor = finalColor;
     }
 
@@ -144,11 +142,8 @@ fragment41core =
         finalColor = (u_faceId != gl_PrimitiveID) ? ((-normal.y > u_overhangAngle) ? u_overhangColor : finalColor) : u_faceColor;
 
         frag_color = finalColor;
-        if(u_renderError > 0.5)
-        {
-            vec3 grid = f_vertex - round(f_vertex);
-            frag_color.a = dot(grid, grid) < 0.245 ? 0.667 : 1.0;
-        }
+        vec3 grid = f_vertex - round(f_vertex);
+        frag_color.a = (u_renderError > 0.5) && dot(grid, grid) < 0.245 ? 0.667 : 1.0;
     }
 
 [defaults]

resources/variants/creality_ender3pro_0.2.inst.cfg

@@ -0,0 +1,12 @@
+[general]
+name = 0.2mm Nozzle
+version = 4
+definition = creality_ender3pro
+
+[metadata]
+setting_version = 13
+type = variant
+hardware_type = nozzle
+
+[values]
+machine_nozzle_size = 0.2

resources/variants/creality_ender3pro_0.3.inst.cfg

@@ -0,0 +1,12 @@
+[general]
+name = 0.3mm Nozzle
+version = 4
+definition = creality_ender3pro
+
+[metadata]
+setting_version = 13
+type = variant
+hardware_type = nozzle
+
+[values]
+machine_nozzle_size = 0.3

resources/variants/creality_ender3pro_0.4.inst.cfg

@@ -0,0 +1,12 @@
+[general]
+name = 0.4mm Nozzle
+version = 4
+definition = creality_ender3pro
+
+[metadata]
+setting_version = 13
+type = variant
+hardware_type = nozzle
+
+[values]
+machine_nozzle_size = 0.4

resources/variants/creality_ender3pro_0.5.inst.cfg

@@ -0,0 +1,12 @@
+[general]
+name = 0.5mm Nozzle
+version = 4
+definition = creality_ender3pro
+
+[metadata]
+setting_version = 13
+type = variant
+hardware_type = nozzle
+
+[values]
+machine_nozzle_size = 0.5

resources/variants/creality_ender3pro_0.6.inst.cfg

@@ -0,0 +1,12 @@
+[general]
+name = 0.6mm Nozzle
+version = 4
+definition = creality_ender3pro
+
+[metadata]
+setting_version = 13
+type = variant
+hardware_type = nozzle
+
+[values]
+machine_nozzle_size = 0.6

resources/variants/creality_ender3pro_0.8.inst.cfg

@@ -0,0 +1,12 @@
+[general]
+name = 0.8mm Nozzle
+version = 4
+definition = creality_ender3pro
+
+[metadata]
+setting_version = 13
+type = variant
+hardware_type = nozzle
+
+[values]
+machine_nozzle_size = 0.8

resources/variants/creality_ender3pro_1.0.inst.cfg

@@ -0,0 +1,12 @@
+[general]
+name = 1.0mm Nozzle
+version = 4
+definition = creality_ender3pro
+
+[metadata]
+setting_version = 13
+type = variant
+hardware_type = nozzle
+
+[values]
+machine_nozzle_size = 1.0