Merge branch 'master' into CS-234_network_plugin_code_quality

.gitlab-ci.yml

@@ -3,17 +3,14 @@ image: registry.gitlab.com/ultimaker/cura/cura-build-environment:centos7
 stages:
   - build
 
-build-and-test:
+build and test linux:
   stage: build
+  tags:
+    - cura
+    - docker
+    - linux
   script:
     - docker/build.sh
   artifacts:
     paths:
       - build
-
-build-and-test_merge-requests:
-  stage: build
-  script:
-    - docker/build.sh
-  only:
-    - merge_requests

cura/PreviewPass.py

@@ -1,9 +1,8 @@
 # Copyright (c) 2018 Ultimaker B.V.
 # Cura is released under the terms of the LGPLv3 or higher.
 
-from typing import Optional, TYPE_CHECKING
+from typing import Optional, TYPE_CHECKING, cast
 
-from numpy import cast
 
 from UM.Application import Application
 from UM.Resources import Resources

resources/qml/Preferences/Materials/MaterialsPage.qml

@@ -45,6 +45,11 @@ Item
         materialListView.expandActiveMaterial(active_root_material_id)
     }
 
+    function setExpandedActiveMaterial(root_material_id)
+    {
+        materialListView.expandActiveMaterial(root_material_id)
+    }
+
     // When loaded, try to select the active material in the tree
     Component.onCompleted: resetExpandedActiveMaterial()
 

resources/qml/Preferences/Materials/MaterialsSlot.qml

@@ -60,7 +60,7 @@ Rectangle
         {
             materialList.currentBrand = material.brand
             materialList.currentType = material.brand + "_" + material.material
-            base.currentItem = material
+            base.setExpandedActiveMaterial(material.root_material_id)
         }
         hoverEnabled: true
         onEntered: { materialSlot.hovered = true }