From f320000ce5e5019d8f96af20b29aa266b54856f6 Mon Sep 17 00:00:00 2001
From: Ghostkeeper <rubend@tutanota.com>
Date: Mon, 3 Dec 2018 17:23:44 +0100
Subject: [PATCH 1/2] Change default profile of Aurora and Alfawise printers

Instead of the default layer height, we should change the default quality profile.
This is necessary because the 'normal' quality profile doesn't define a layer height, so that should inherit from the 0.1mm default layer height. But if the printer turned the default into a 0.15mm layer height then that is wrong.
Maybe we should let the normal quality profile overwrite it to 0.1mm, always?

Contributes to issue CURA-5902.
---
 resources/definitions/alfawise_u20.def.json    | 5 +----
 resources/definitions/jgaurora_a1.def.json     | 5 +----
 resources/definitions/jgaurora_a5.def.json     | 5 +----
 resources/definitions/jgaurora_z_603s.def.json | 5 +----
 4 files changed, 4 insertions(+), 16 deletions(-)

diff --git a/resources/definitions/alfawise_u20.def.json b/resources/definitions/alfawise_u20.def.json
index 87726fec3d..de8525fa4d 100644
--- a/resources/definitions/alfawise_u20.def.json
+++ b/resources/definitions/alfawise_u20.def.json
@@ -7,7 +7,7 @@
         "author": "Samuel Pinches",
         "manufacturer": "Alfawise",
         "file_formats": "text/x-gcode",
-        "preferred_quality_type": "fine",
+        "preferred_quality_type": "fast",
         "machine_extruder_trains":
         {
             "0": "alfawise_u20_extruder_0"
@@ -53,9 +53,6 @@
         "material_bed_temperature": {
             "default_value": 50
         },
-        "layer_height": {
-            "default_value": 0.15
-        },
         "layer_height_0": {
             "default_value": 0.2
         },
diff --git a/resources/definitions/jgaurora_a1.def.json b/resources/definitions/jgaurora_a1.def.json
index 4fd2eb4994..b9a921c311 100644
--- a/resources/definitions/jgaurora_a1.def.json
+++ b/resources/definitions/jgaurora_a1.def.json
@@ -7,7 +7,7 @@
         "author": "Samuel Pinches",
         "manufacturer": "JGAurora",
         "file_formats": "text/x-gcode",
-        "preferred_quality_type": "fine",
+        "preferred_quality_type": "fast",
         "machine_extruder_trains":
         {
             "0": "jgaurora_a1_extruder_0"
@@ -53,9 +53,6 @@
         "material_bed_temperature": {
             "default_value": 67
         },
-        "layer_height": {
-            "default_value": 0.15
-        },
         "layer_height_0": {
             "default_value": 0.12
         },
diff --git a/resources/definitions/jgaurora_a5.def.json b/resources/definitions/jgaurora_a5.def.json
index 02d9a9db4f..d84a8440e6 100644
--- a/resources/definitions/jgaurora_a5.def.json
+++ b/resources/definitions/jgaurora_a5.def.json
@@ -9,7 +9,7 @@
         "file_formats": "text/x-gcode",
         "platform": "jgaurora_a5.stl",
         "platform_offset": [-242, -101, 273],
-        "preferred_quality_type": "fine",
+        "preferred_quality_type": "fast",
         "machine_extruder_trains":
         {
             "0": "jgaurora_a5_extruder_0"
@@ -55,9 +55,6 @@
         "material_bed_temperature": {
             "default_value": 67
         },
-        "layer_height": {
-            "default_value": 0.15
-        },
         "layer_height_0": {
             "default_value": 0.12
         },
diff --git a/resources/definitions/jgaurora_z_603s.def.json b/resources/definitions/jgaurora_z_603s.def.json
index 59e0ff129c..3a78585240 100644
--- a/resources/definitions/jgaurora_z_603s.def.json
+++ b/resources/definitions/jgaurora_z_603s.def.json
@@ -7,7 +7,7 @@
         "author": "Samuel Pinches",
         "manufacturer": "JGAurora",
         "file_formats": "text/x-gcode",
-        "preferred_quality_type": "fine",
+        "preferred_quality_type": "fast",
         "machine_extruder_trains":
         {
             "0": "jgaurora_z_603s_extruder_0"
@@ -53,9 +53,6 @@
         "material_bed_temperature": {
             "default_value": 55
         },
-        "layer_height": {
-            "default_value": 0.15
-        },
         "layer_height_0": {
             "default_value": 0.2
         },

From 9ec7428620e4ea31b1b172aeda86a29db28fd7c8 Mon Sep 17 00:00:00 2001
From: Lipu Fei <lipu.fei815@gmail.com>
Date: Tue, 4 Dec 2018 10:54:30 +0100
Subject: [PATCH 2/2] Fix setting visiblity current index

CURA-5981
---
 resources/qml/Preferences/SettingVisibilityPage.qml | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/resources/qml/Preferences/SettingVisibilityPage.qml b/resources/qml/Preferences/SettingVisibilityPage.qml
index e319069502..1b964cad0c 100644
--- a/resources/qml/Preferences/SettingVisibilityPage.qml
+++ b/resources/qml/Preferences/SettingVisibilityPage.qml
@@ -115,15 +115,16 @@ UM.PreferencesPage
 
             currentIndex:
             {
+                var idx = -1;
                 for(var i = 0; i < settingVisibilityPresetsModel.items.length; ++i)
                 {
                     if(settingVisibilityPresetsModel.items[i].presetId == settingVisibilityPresetsModel.activePreset)
                     {
-                        currentIndex = i;
-                        return;
+                        idx = i;
+                        break;
                     }
                 }
-                return -1
+                return idx;
             }
 
             onActivated: