Merge branch '3.4'

plugins/3MFReader/ThreeMFReader.py

@@ -15,7 +15,6 @@ from UM.Math.Vector import Vector
 from UM.Mesh.MeshBuilder import MeshBuilder
 from UM.Mesh.MeshReader import MeshReader
 from UM.Scene.GroupDecorator import GroupDecorator
-from UM.MimeTypeDatabase import MimeTypeDatabase, MimeType
 
 from cura.Settings.ExtruderManager import ExtruderManager
 from cura.Scene.CuraSceneNode import CuraSceneNode
@@ -26,15 +25,6 @@ from cura.Machines.QualityManager import getMachineDefinitionIDForQualitySearch
 
 MYPY = False
 
-
-MimeTypeDatabase.addMimeType(
-    MimeType(
-        name = "application/x-cura-project-file",
-        comment = "Cura Project File",
-        suffixes = ["curaproject.3mf"]
-    )
-)
-
 try:
     if not MYPY:
         import xml.etree.cElementTree as ET

plugins/3MFReader/__init__.py

@@ -13,8 +13,24 @@ from . import ThreeMFWorkspaceReader
 
 from UM.i18n import i18nCatalog
 from UM.Platform import Platform
+from UM.MimeTypeDatabase import MimeTypeDatabase, MimeType
 catalog = i18nCatalog("cura")
 
+MimeTypeDatabase.addMimeType(
+    MimeType(
+        name = "application/x-cura-project-file",
+        comment = "Cura Project File",
+        suffixes = ["curaproject.3mf"]
+    )
+)
+MimeTypeDatabase.addMimeType(
+    MimeType(
+        name = "application/x-cura-project-file",
+        comment = "Cura Project File",
+        suffixes = ["3mf"]
+    )
+)
+
 def getMetaData() -> Dict:
     # Workarround for osx not supporting double file extensions correctly.
     if Platform.isOSX():

plugins/Toolbox/resources/qml/ToolboxInstalledTileActions.qml

@@ -13,6 +13,16 @@ Column
     width: UM.Theme.getSize("toolbox_action_button").width
     spacing: UM.Theme.getSize("narrow_margin").height
 
+    Label
+    {
+        visible: !model.is_installed
+        text: catalog.i18nc("@label", "Will install upon restarting")
+        color: UM.Theme.getColor("lining")
+        font: UM.Theme.getFont("default")
+        wrapMode: Text.WordWrap
+        width: parent.width
+    }
+
     ToolboxProgressButton
     {
         id: updateButton
@@ -39,7 +49,7 @@ Column
     {
         id: removeButton
         text: canDowngrade ? catalog.i18nc("@action:button", "Downgrade") : catalog.i18nc("@action:button", "Uninstall")
-        visible: !model.is_bundled
+        visible: !model.is_bundled && model.is_installed
         enabled: !toolbox.isDownloading
         style: ButtonStyle
         {

plugins/Toolbox/src/PackagesModel.py

@@ -29,8 +29,9 @@ class PackagesModel(ListModel):
         self.addRoleName(Qt.UserRole + 12, "last_updated")
         self.addRoleName(Qt.UserRole + 13, "is_bundled")
         self.addRoleName(Qt.UserRole + 14, "is_enabled")
-        self.addRoleName(Qt.UserRole + 15, "has_configs")
-        self.addRoleName(Qt.UserRole + 16, "supported_configs")
+        self.addRoleName(Qt.UserRole + 15, "is_installed") # Scheduled pkgs are included in the model but should not be marked as actually installed
+        self.addRoleName(Qt.UserRole + 16, "has_configs")
+        self.addRoleName(Qt.UserRole + 17, "supported_configs")
 
         # List of filters for queries. The result is the union of the each list of results.
         self._filter = {}  # type: Dict[str, str]
@@ -73,6 +74,7 @@ class PackagesModel(ListModel):
                 "last_updated":      package["last_updated"] if "last_updated" in package else None,
                 "is_bundled":        package["is_bundled"] if "is_bundled" in package else False,
                 "is_enabled":        package["is_enabled"] if "is_enabled" in package else False,
+                "is_installed":      package["is_installed"] if "is_installed" in package else False,
                 "has_configs":       has_configs,
                 "supported_configs": configs_model
             })