Revert "Render labels using `Text.QtRendering` on OSX"

This reverts commit f0e3c19a34d1fde3b7ec4fd95677fbefa2028b26.

plugins/3MFReader/WorkspaceDialog.qml

@@ -437,6 +437,7 @@ UM.Dialog
                 {
                     id: warningLabel
                     text: catalog.i18nc("@action:warning", "Loading a project will clear all models on the build plate.")
+                    wrapMode: Text.Wrap
                 }
             }
         }

plugins/CuraDrive/src/qml/pages/BackupsPage.qml

@@ -5,7 +5,7 @@ import QtQuick 2.7
 import QtQuick.Controls 2.1
 import QtQuick.Layouts 1.3
 
-import UM 1.5 as UM
+import UM 1.3 as UM
 import Cura 1.1 as Cura
 
 import "../components"
@@ -22,23 +22,28 @@ Item
         width: parent.width
         anchors.fill: parent
 
-        UM.Label
+        Label
         {
             id: backupTitle
             text: catalog.i18nc("@title", "My Backups")
             font: UM.Theme.getFont("large")
+            color: UM.Theme.getColor("text")
             Layout.fillWidth: true
+            renderType: Text.NativeRendering
         }
 
-        UM.Label
+        Label
         {
             text: catalog.i18nc("@empty_state",
                 "You don't have any backups currently. Use the 'Backup Now' button to create one.")
             width: parent.width
+            font: UM.Theme.getFont("default")
+            color: UM.Theme.getColor("text")
             wrapMode: Label.WordWrap
             visible: backupList.model.length == 0
             Layout.fillWidth: true
             Layout.fillHeight: true
+            renderType: Text.NativeRendering
         }
 
         BackupList
@@ -49,13 +54,16 @@ Item
             Layout.fillHeight: true
         }
 
-        UM.Label
+        Label
         {
             text: catalog.i18nc("@backup_limit_info",
                 "During the preview phase, you'll be limited to 5 visible backups. Remove a backup to see older ones.")
             width: parent.width
+            font: UM.Theme.getFont("default")
+            color: UM.Theme.getColor("text")
             wrapMode: Label.WordWrap
             visible: backupList.model.length > 4
+            renderType: Text.NativeRendering
         }
 
         BackupListFooter

plugins/DigitalLibrary/resources/qml/CreateNewProjectPopup.qml

@@ -5,7 +5,7 @@ import QtQuick 2.15
 import QtQuick.Window 2.2
 import QtQuick.Controls 2.3
 
-import UM 1.5 as UM
+import UM 1.2 as UM
 import Cura 1.6 as Cura
 
 import DigitalFactory 1.0 as DF
@@ -64,10 +64,12 @@ Popup
         }
     }
 
-    UM.Label
+    Label
     {
         id: projectNameLabel
         text: "Project Name"
+        font: UM.Theme.getFont("default")
+        color: UM.Theme.getColor("text")
         anchors
         {
             top: createNewLibraryProjectLabel.bottom
@@ -105,12 +107,13 @@ Popup
         }
     }
 
-    UM.Label
+    Label
     {
         id: errorWhileCreatingProjectLabel
         text: manager.projectCreationErrorText
         width: parent.width
         wrapMode: Text.WordWrap
+        font: UM.Theme.getFont("default")
         color: UM.Theme.getColor("error")
         visible: manager.creatingNewProjectStatus == DF.RetrievalStatus.Failed
         anchors

plugins/DigitalLibrary/resources/qml/OpenProjectFilesPage.qml

@@ -83,12 +83,13 @@ Item
             }
         }
 
-        UM.Label
+        Label
         {
             id: emptyProjectLabel
             anchors.horizontalCenter: parent.horizontalCenter
             anchors.verticalCenter: parent.verticalCenter
             text: "Select a project to view its files."
+            font: UM.Theme.getFont("default")
             color: UM.Theme.getColor("setting_category_text")
 
             Connections
@@ -101,13 +102,14 @@ Item
             }
         }
 
-        UM.Label
+        Label
         {
             id: noFilesInProjectLabel
             anchors.horizontalCenter: parent.horizontalCenter
             anchors.verticalCenter: parent.verticalCenter
             visible: (manager.digitalFactoryFileModel.count == 0 && !emptyProjectLabel.visible && !retrievingFilesBusyIndicator.visible)
             text: "No supported files in this project."
+            font: UM.Theme.getFont("default")
             color: UM.Theme.getColor("setting_category_text")
         }
 

plugins/DigitalLibrary/resources/qml/ProjectSummaryCard.qml

@@ -2,7 +2,7 @@
 import QtQuick 2.10
 import QtQuick.Controls 2.3
 
-import UM 1.5 as UM
+import UM 1.2 as UM
 import Cura 1.6 as Cura
 
 Cura.RoundedRectangle
@@ -58,31 +58,34 @@ Cura.RoundedRectangle
             width: parent.width - x - UM.Theme.getSize("default_margin").width
             anchors.verticalCenter: parent.verticalCenter
 
-            UM.Label
+            Label
             {
                 id: displayNameLabel
                 width: parent.width
                 height: Math.round(parent.height / 3)
                 elide: Text.ElideRight
+                color: UM.Theme.getColor("text")
                 font: UM.Theme.getFont("default_bold")
             }
 
-            UM.Label
+            Label
             {
                 id: usernameLabel
                 width: parent.width
                 height: Math.round(parent.height / 3)
                 elide: Text.ElideRight
                 color: UM.Theme.getColor("small_button_text")
+                font: UM.Theme.getFont("default")
             }
 
-            UM.Label
+            Label
             {
                 id: lastUpdatedLabel
                 width: parent.width
                 height: Math.round(parent.height / 3)
                 elide: Text.ElideRight
                 color: UM.Theme.getColor("small_button_text")
+                font: UM.Theme.getFont("default")
             }
         }
     }

plugins/DigitalLibrary/resources/qml/SaveProjectFilesPage.qml

@@ -44,13 +44,14 @@ Item
         cardMouseAreaEnabled: false
     }
 
-    UM.Label
+    Label
     {
         id: fileNameLabel
         anchors.top: projectSummaryCard.bottom
         anchors.topMargin: UM.Theme.getSize("default_margin").height
         text: "Cura project name"
         font: UM.Theme.getFont("medium")
+        color: UM.Theme.getColor("text")
     }
 
 
@@ -109,12 +110,13 @@ Item
             }
         }
 
-        UM.Label
+        Label
         {
             id: emptyProjectLabel
             anchors.horizontalCenter: parent.horizontalCenter
             anchors.verticalCenter: parent.verticalCenter
             text: "Select a project to view its files."
+            font: UM.Theme.getFont("default")
             color: UM.Theme.getColor("setting_category_text")
 
             Connections
@@ -127,13 +129,14 @@ Item
             }
         }
 
-        UM.Label
+        Label
         {
             id: noFilesInProjectLabel
             anchors.horizontalCenter: parent.horizontalCenter
             anchors.verticalCenter: parent.verticalCenter
             visible: (manager.digitalFactoryFileModel.count == 0 && !emptyProjectLabel.visible && !retrievingFilesBusyIndicator.visible)
             text: "No supported files in this project."
+            font: UM.Theme.getFont("default")
             color: UM.Theme.getColor("setting_category_text")
         }
 

plugins/DigitalLibrary/resources/qml/SelectProjectPage.qml

@@ -104,12 +104,13 @@ Item
                 width: parent.width - 2 * UM.Theme.getSize("thick_margin").width
             }
 
-            UM.Label
+            Label
             {
                 id: noLibraryProjectsLabel
                 anchors.horizontalCenter: parent.horizontalCenter
                 text: searchBar.text === "" ? "It appears that you don't have any projects in the Library yet." : "No projects found that match the search query."
                 font: UM.Theme.getFont("medium")
+                color: UM.Theme.getColor("text")
             }
 
             Cura.TertiaryButton

plugins/FirmwareUpdater/FirmwareUpdaterMachineAction.qml

@@ -147,6 +147,8 @@ Cura.MachineAction
                             return catalog.i18nc("@label","Firmware update failed due to missing firmware.");
                     }
                 }
+
+                wrapMode: Text.Wrap
             }
 
             UM.ProgressBar

plugins/MachineSettingsAction/MachineSettingsExtruderTab.qml

@@ -4,7 +4,7 @@
 import QtQuick 2.10
 import QtQuick.Controls 2.3
 
-import UM 1.5 as UM
+import UM 1.3 as UM
 import Cura 1.1 as Cura
 
 
@@ -58,10 +58,11 @@ Item
 
             spacing: base.columnSpacing
 
-            UM.Label   // Title Label
+            Label   // Title Label
             {
                 text: catalog.i18nc("@title:label", "Nozzle Settings")
                 font: UM.Theme.getFont("medium_bold")
+                renderType: Text.NativeRendering
             }
 
             Cura.NumericTextFieldWithUnit  // "Nozzle size"

plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml

@@ -5,7 +5,7 @@ import QtQuick 2.10
 import QtQuick.Controls 2.3
 import QtQuick.Layouts 1.3
 
-import UM 1.5 as UM
+import UM 1.3 as UM
 import Cura 1.1 as Cura
 
 
@@ -51,10 +51,12 @@ Item
 
             spacing: base.columnSpacing
 
-            UM.Label   // Title Label
+            Label   // Title Label
             {
                 text: catalog.i18nc("@title:label", "Printer Settings")
                 font: UM.Theme.getFont("medium_bold")
+                color: UM.Theme.getColor("text")
+                renderType: Text.NativeRendering
                 width: parent.width
                 elide: Text.ElideRight
             }
@@ -180,10 +182,12 @@ Item
 
             spacing: base.columnSpacing
 
-            UM.Label   // Title Label
+            Label   // Title Label
             {
                 text: catalog.i18nc("@title:label", "Printhead Settings")
                 font: UM.Theme.getFont("medium_bold")
+                color: UM.Theme.getColor("text")
+                renderType: Text.NativeRendering
                 width: parent.width
                 elide: Text.ElideRight
             }