diff options
author | c.lamboo <casperlamboo@gmail.com> | 2022-05-10 16:39:02 +0300 |
---|---|---|
committer | c.lamboo <casperlamboo@gmail.com> | 2022-05-10 16:39:02 +0300 |
commit | 35f5c3f959a7d5ad85b0e2d8e0514cde509ca6c8 (patch) | |
tree | f650ab192e92ddb2797361efbe87b5f2c27e04fc /resources/qml | |
parent | f0e3c19a34d1fde3b7ec4fd95677fbefa2028b26 (diff) |
Revert "Render labels using `Text.QtRendering` on OSX"
This reverts commit f0e3c19a34d1fde3b7ec4fd95677fbefa2028b26.
Diffstat (limited to 'resources/qml')
28 files changed, 186 insertions, 67 deletions
diff --git a/resources/qml/ActionPanel/PrintJobInformation.qml b/resources/qml/ActionPanel/PrintJobInformation.qml index d142335d41..9cdbf0714f 100644 --- a/resources/qml/ActionPanel/PrintJobInformation.qml +++ b/resources/qml/ActionPanel/PrintJobInformation.qml @@ -4,7 +4,7 @@ import QtQuick 2.7 import QtQuick.Controls 2.1 -import UM 1.5 as UM +import UM 1.1 as UM import Cura 1.0 as Cura Column @@ -26,14 +26,15 @@ Column leftPadding: UM.Theme.getSize("default_margin").width rightPadding: UM.Theme.getSize("default_margin").width - UM.Label + Label { text: catalog.i18nc("@label", "Time estimation").toUpperCase() color: UM.Theme.getColor("primary") font: UM.Theme.getFont("default_bold") + renderType: Text.NativeRendering } - UM.Label + Label { id: byLineType @@ -75,13 +76,16 @@ Column Repeater { model: modelData - UM.Label + Label { width: Math.round(byLineType.width * byLineType.columnWidthMultipliers[index]) height: contentHeight horizontalAlignment: byLineType.columnHorizontalAligns[index] + color: UM.Theme.getColor("text") + font: UM.Theme.getFont("default") wrapMode: Text.WrapAnywhere text: modelData + renderType: Text.NativeRendering } } } @@ -90,6 +94,9 @@ Column width: parent.width - 2 * UM.Theme.getSize("default_margin").width height: childrenRect.height + color: UM.Theme.getColor("text") + font: UM.Theme.getFont("default") + renderType: Text.NativeRendering textFormat: Text.RichText } } @@ -102,14 +109,15 @@ Column leftPadding: UM.Theme.getSize("default_margin").width rightPadding: UM.Theme.getSize("default_margin").width - UM.Label + Label { text: catalog.i18nc("@label", "Material estimation").toUpperCase() color: UM.Theme.getColor("primary") font: UM.Theme.getFont("default_bold") + renderType: Text.NativeRendering } - UM.Label + Label { id: byMaterialType @@ -172,13 +180,16 @@ Column Repeater { model: modelData - UM.Label + Label { width: Math.round(byMaterialType.width * byMaterialType.columnWidthMultipliers[index]) height: contentHeight horizontalAlignment: byMaterialType.columnHorizontalAligns[index] + color: UM.Theme.getColor("text") + font: UM.Theme.getFont("default") wrapMode: Text.WrapAnywhere text: modelData + renderType: Text.NativeRendering } } } @@ -187,6 +198,9 @@ Column width: parent.width - 2 * UM.Theme.getSize("default_margin").width height: childrenRect.height + color: UM.Theme.getColor("text") + font: UM.Theme.getFont("default") + renderType: Text.NativeRendering textFormat: Text.RichText } } diff --git a/resources/qml/ActionPanel/SliceProcessWidget.qml b/resources/qml/ActionPanel/SliceProcessWidget.qml index cf70e4ba87..58bf736575 100644 --- a/resources/qml/ActionPanel/SliceProcessWidget.qml +++ b/resources/qml/ActionPanel/SliceProcessWidget.qml @@ -5,7 +5,7 @@ import QtQuick 2.7 import QtQuick.Controls 2.4 import QtQuick.Layouts 1.3 -import UM 1.5 as UM +import UM 1.4 as UM import Cura 1.0 as Cura @@ -45,13 +45,16 @@ Column } } - UM.Label + Label { id: autoSlicingLabel width: parent.width visible: progressBar.visible text: catalog.i18nc("@label:PrintjobStatus", "Slicing...") + color: UM.Theme.getColor("text") + font: UM.Theme.getFont("default") + renderType: Text.NativeRendering } Item { @@ -68,7 +71,7 @@ Column height: width status: UM.StatusIcon.Status.WARNING } - UM.Label + Label { id: label anchors.left: warningIcon.right @@ -76,6 +79,9 @@ Column anchors.verticalCenter: parent.verticalCenter anchors.leftMargin: UM.Theme.getSize("default_margin").width text: catalog.i18nc("@label:PrintjobStatus", "Unable to slice") + color: UM.Theme.getColor("text") + font: UM.Theme.getFont("default") + renderType: Text.NativeRendering wrapMode: Text.WordWrap } } diff --git a/resources/qml/ApplicationSwitcher/ApplicationButton.qml b/resources/qml/ApplicationSwitcher/ApplicationButton.qml index 92624933cf..3d67889220 100644 --- a/resources/qml/ApplicationSwitcher/ApplicationButton.qml +++ b/resources/qml/ApplicationSwitcher/ApplicationButton.qml @@ -82,6 +82,7 @@ Button height: base.height - applicationIcon.height - 2 * UM.Theme.getSize("default_margin").width // Account for the top and bottom margins horizontalAlignment: Text.AlignHCenter + wrapMode: Text.Wrap elide: Text.ElideRight } } diff --git a/resources/qml/Dialogs/AskOpenAsProjectOrModelsDialog.qml b/resources/qml/Dialogs/AskOpenAsProjectOrModelsDialog.qml index 65d62a5fab..23e01b5e46 100644 --- a/resources/qml/Dialogs/AskOpenAsProjectOrModelsDialog.qml +++ b/resources/qml/Dialogs/AskOpenAsProjectOrModelsDialog.qml @@ -81,6 +81,7 @@ UM.Dialog id: questionText width: parent.width text: catalog.i18nc("@text:window", "This is a Cura project file. Would you like to open it as a project or import the models from it?") + font: UM.Theme.getFont("default") wrapMode: Text.WordWrap } diff --git a/resources/qml/MachineSettings/ComboBoxWithOptions.qml b/resources/qml/MachineSettings/ComboBoxWithOptions.qml index 4ff7cf7092..0ad4f8bb0c 100644 --- a/resources/qml/MachineSettings/ComboBoxWithOptions.qml +++ b/resources/qml/MachineSettings/ComboBoxWithOptions.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 import "../Widgets" @@ -52,13 +52,15 @@ UM.TooltipArea watchedProperties: [ "value", "options", "description" ] } - UM.Label + Label { id: fieldLabel anchors.left: parent.left anchors.verticalCenter: comboBox.verticalCenter visible: text != "" font: UM.Theme.getFont("medium") + color: UM.Theme.getColor("text") + renderType: Text.NativeRendering } ListModel diff --git a/resources/qml/MachineSettings/NumericTextFieldWithUnit.qml b/resources/qml/MachineSettings/NumericTextFieldWithUnit.qml index 0287e0213f..2950714d6a 100644 --- a/resources/qml/MachineSettings/NumericTextFieldWithUnit.qml +++ b/resources/qml/MachineSettings/NumericTextFieldWithUnit.qml @@ -62,12 +62,15 @@ UM.TooltipArea watchedProperties: [ "value", "description" ] } - UM.Label + Label { id: fieldLabel anchors.left: parent.left anchors.verticalCenter: textFieldWithUnit.verticalCenter visible: text != "" + font: UM.Theme.getFont("default") + color: UM.Theme.getColor("text") + renderType: Text.NativeRendering } TextField diff --git a/resources/qml/MachineSettings/SimpleCheckBox.qml b/resources/qml/MachineSettings/SimpleCheckBox.qml index fa40cecef2..cda666571f 100644 --- a/resources/qml/MachineSettings/SimpleCheckBox.qml +++ b/resources/qml/MachineSettings/SimpleCheckBox.qml @@ -46,13 +46,15 @@ UM.TooltipArea watchedProperties: [ "value", "description" ] } - UM.Label + Label { id: fieldLabel anchors.left: parent.left anchors.verticalCenter: checkBox.verticalCenter visible: text != "" font: UM.Theme.getFont("medium") + color: UM.Theme.getColor("text") + renderType: Text.NativeRendering } UM.CheckBox diff --git a/resources/qml/Menus/ConfigurationMenu/AutoConfiguration.qml b/resources/qml/Menus/ConfigurationMenu/AutoConfiguration.qml index 0bf29c13b7..18409dd43a 100644 --- a/resources/qml/Menus/ConfigurationMenu/AutoConfiguration.qml +++ b/resources/qml/Menus/ConfigurationMenu/AutoConfiguration.qml @@ -4,7 +4,7 @@ import QtQuick 2.7 import QtQuick.Controls 2.0 -import UM 1.5 as UM +import UM 1.3 as UM import Cura 1.0 as Cura Item @@ -12,13 +12,14 @@ Item width: parent.width height: childrenRect.height - UM.Label + Label { id: header text: catalog.i18nc("@header", "Configurations") font: UM.Theme.getFont("medium") color: UM.Theme.getColor("small_button_text") height: contentHeight + renderType: Text.NativeRendering anchors { diff --git a/resources/qml/Menus/ConfigurationMenu/ConfigurationListView.qml b/resources/qml/Menus/ConfigurationMenu/ConfigurationListView.qml index 0840cfea87..10e2435dfc 100644 --- a/resources/qml/Menus/ConfigurationMenu/ConfigurationListView.qml +++ b/resources/qml/Menus/ConfigurationMenu/ConfigurationListView.qml @@ -39,7 +39,7 @@ Item anchors.verticalCenter: parent.verticalCenter status: UM.StatusIcon.Status.WARNING } - UM.Label + Label { id: label anchors.left: icon.right @@ -51,6 +51,9 @@ Item text: Cura.MachineManager.printerConnected ? catalog.i18nc("@label", "Loading available configurations from the printer...") : catalog.i18nc("@label", "The configurations are not available because the printer is disconnected.") + color: UM.Theme.getColor("text") + font: UM.Theme.getFont("default") + renderType: Text.NativeRendering wrapMode: Text.WordWrap } } diff --git a/resources/qml/Preferences/Materials/MaterialsSyncDialog.qml b/resources/qml/Preferences/Materials/MaterialsSyncDialog.qml index 08ea2efd5b..3e8fdd7397 100644 --- a/resources/qml/Preferences/Materials/MaterialsSyncDialog.qml +++ b/resources/qml/Preferences/Materials/MaterialsSyncDialog.qml @@ -231,6 +231,7 @@ Window { id: syncStatusLabel anchors.left: parent.left + wrapMode: Text.Wrap elide: Text.ElideRight visible: text !== "" font: UM.Theme.getFont("medium") @@ -558,6 +559,7 @@ Window text: catalog.i18nc("@text", "It seems like you don't have any compatible printers connected to Digital Factory. Make sure your printer is connected and it's running the latest firmware.") Layout.fillWidth: true horizontalAlignment: Text.AlignHCenter + wrapMode: Text.Wrap } Item @@ -631,6 +633,7 @@ Window { text: catalog.i18nc("@text In the UI this is followed by a list of steps the user needs to take.", "Follow the following steps to load the new material profiles to your printer.") font: UM.Theme.getFont("medium") + wrapMode: Text.Wrap Layout.fillWidth: true } diff --git a/resources/qml/PrintSetupSelector/Recommended/RecommendedInfillDensitySelector.qml b/resources/qml/PrintSetupSelector/Recommended/RecommendedInfillDensitySelector.qml index 9e2d73609c..625629c810 100644 --- a/resources/qml/PrintSetupSelector/Recommended/RecommendedInfillDensitySelector.qml +++ b/resources/qml/PrintSetupSelector/Recommended/RecommendedInfillDensitySelector.qml @@ -133,6 +133,7 @@ Item visible: (index % 20) == 0 // Only show steps of 20% anchors.horizontalCenter: parent.horizontalCenter y: UM.Theme.getSize("thin_margin").height + renderType: Text.NativeRendering color: UM.Theme.getColor("quality_slider_available") } } diff --git a/resources/qml/PrintSetupSelector/Recommended/RecommendedQualityProfileSelector.qml b/resources/qml/PrintSetupSelector/Recommended/RecommendedQualityProfileSelector.qml index f96062463d..1176142b3b 100644 --- a/resources/qml/PrintSetupSelector/Recommended/RecommendedQualityProfileSelector.qml +++ b/resources/qml/PrintSetupSelector/Recommended/RecommendedQualityProfileSelector.qml @@ -4,7 +4,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 import ".." @@ -111,7 +111,7 @@ Item } height: intentCategoryLabel.height - UM.Label + Label { id: intentCategoryLabel text: model.name @@ -119,6 +119,8 @@ Item anchors.left: parent.left anchors.leftMargin: UM.Theme.getSize("section_icon").width + UM.Theme.getSize("narrow_margin").width font: UM.Theme.getFont("medium") + color: UM.Theme.getColor("text") + renderType: Text.NativeRendering elide: Text.ElideRight } diff --git a/resources/qml/PrintSetupTooltip.qml b/resources/qml/PrintSetupTooltip.qml index af4280342c..e4d322f9d4 100644 --- a/resources/qml/PrintSetupTooltip.qml +++ b/resources/qml/PrintSetupTooltip.qml @@ -90,6 +90,7 @@ UM.PointingRectangle y: UM.Theme.getSize("tooltip_margins").height width: textScroll.width - 2 * UM.Theme.getSize("tooltip_margins").width + wrapMode: Text.Wrap textFormat: Text.RichText color: UM.Theme.getColor("tooltip_text") } diff --git a/resources/qml/PrinterOutput/OutputDeviceHeader.qml b/resources/qml/PrinterOutput/OutputDeviceHeader.qml index bbc208374f..aeb9d14363 100644 --- a/resources/qml/PrinterOutput/OutputDeviceHeader.qml +++ b/resources/qml/PrinterOutput/OutputDeviceHeader.qml @@ -33,6 +33,7 @@ Item { id: outputDeviceNameLabel font: UM.Theme.getFont("large_bold") + color: UM.Theme.getColor("text") anchors.left: parent.left anchors.top: parent.top anchors.margins: UM.Theme.getSize("default_margin").width diff --git a/resources/qml/PrinterTypeLabel.qml b/resources/qml/PrinterTypeLabel.qml index 7b9acc19c9..f2e8dc6f48 100644 --- a/resources/qml/PrinterTypeLabel.qml +++ b/resources/qml/PrinterTypeLabel.qml @@ -4,7 +4,7 @@ import QtQuick 2.7 import QtQuick.Controls 2.1 -import UM 1.5 as UM +import UM 1.1 as UM // This component creates a label with the abbreviated name of a printer, with a rectangle surrounding the label. // It is created in a separated place in order to be reused whenever needed. @@ -24,11 +24,14 @@ Item radius: UM.Theme.getSize("checkbox_radius").width } - UM.Label + Label { id: printerTypeLabel text: "CFFFP" // As an abbreviated name of the Custom FFF Printer anchors.verticalCenter: parent.verticalCenter anchors.horizontalCenter: parent.horizontalCenter + renderType: Text.NativeRendering + font: UM.Theme.getFont("default") + color: UM.Theme.getColor("text") } }
\ No newline at end of file diff --git a/resources/qml/Settings/SettingItem.qml b/resources/qml/Settings/SettingItem.qml index 228de4a9d6..e975f1a2b9 100644 --- a/resources/qml/Settings/SettingItem.qml +++ b/resources/qml/Settings/SettingItem.qml @@ -5,7 +5,7 @@ import QtQuick 2.7 import QtQuick.Layouts 1.2 import QtQuick.Controls 2.0 -import UM 1.5 as UM +import UM 1.1 as UM import Cura 1.0 as Cura import "." @@ -135,7 +135,7 @@ Item } } - UM.Label + Label { id: label @@ -146,6 +146,7 @@ Item text: definition.label elide: Text.ElideMiddle + renderType: Text.NativeRendering textFormat: Text.PlainText color: UM.Theme.getColor("setting_control_text") diff --git a/resources/qml/Toolbar.qml b/resources/qml/Toolbar.qml index 6ecdc9dce0..9c1abd31b7 100644 --- a/resources/qml/Toolbar.qml +++ b/resources/qml/Toolbar.qml @@ -210,11 +210,12 @@ Item width: toolHint.width + UM.Theme.getSize("default_margin").width height: toolHint.height; color: UM.Theme.getColor("tooltip") - UM.Label + Label { id: toolHint text: UM.ActiveTool.properties.getValue("ToolHint") != undefined ? UM.ActiveTool.properties.getValue("ToolHint") : "" color: UM.Theme.getColor("tooltip_text") + font: UM.Theme.getFont("default") anchors.horizontalCenter: parent.horizontalCenter } diff --git a/resources/qml/WelcomePages/AddCloudPrintersView.qml b/resources/qml/WelcomePages/AddCloudPrintersView.qml index 3f2d3dbab2..0b94d21fae 100644 --- a/resources/qml/WelcomePages/AddCloudPrintersView.qml +++ b/resources/qml/WelcomePages/AddCloudPrintersView.qml @@ -38,7 +38,7 @@ Item bottomMargin: UM.Theme.getSize("default_margin").height } - UM.Label + Label { id: titleLabel anchors.top: parent.top @@ -47,6 +47,7 @@ Item text: catalog.i18nc("@label", "Add a Cloud printer") color: UM.Theme.getColor("primary_button") font: UM.Theme.getFont("huge") + renderType: Text.NativeRendering } // Component that contains a busy indicator and a message, while it waits for Cura to discover a cloud printer @@ -64,7 +65,7 @@ Item running: searchingForCloudPrinters palette.dark: UM.Theme.getColor("text") } - UM.Label + Label { id: waitingLabel anchors.top: waitingIndicator.bottom @@ -72,8 +73,10 @@ Item horizontalAlignment: Text.AlignHCenter text: catalog.i18nc("@label", "Waiting for Cloud response") font: UM.Theme.getFont("large") + renderType: Text.NativeRendering + color: UM.Theme.getColor("text") } - UM.Label + Label { id: noPrintersFoundLabel anchors.top: waitingLabel.bottom @@ -82,8 +85,9 @@ Item horizontalAlignment: Text.AlignHCenter text: catalog.i18nc("@label", "No printers found in your account?") font: UM.Theme.getFont("medium") + color: UM.Theme.getColor("text") } - UM.Label + Label { text: "Sign in with a different account" anchors.top: noPrintersFoundLabel.bottom @@ -108,7 +112,7 @@ Item } // Label displayed when a new cloud printer is discovered - UM.Label + Label { anchors.top: titleLabel.bottom anchors.topMargin: 2 * UM.Theme.getSize("default_margin").height @@ -117,6 +121,7 @@ Item text: catalog.i18nc("@label", "The following printers in your account have been added in Cura:") height: contentHeight + 2 * UM.Theme.getSize("default_margin").height visible: discoveredCloudPrintersModel.count > 0 + color: UM.Theme.getColor("text") } // The scrollView that contains the list of newly discovered Ultimaker Cloud printers. Visible only when @@ -148,29 +153,32 @@ Item Column { id: contentColumn - UM.Label + Label { id: cloudPrinterNameLabel leftPadding: UM.Theme.getSize("default_margin").width text: model.name ? model.name : "" font: UM.Theme.getFont("large_bold") + color: UM.Theme.getColor("text") elide: Text.ElideRight } - UM.Label + Label { id: cloudPrinterTypeLabel leftPadding: 2 * UM.Theme.getSize("default_margin").width topPadding: UM.Theme.getSize("thin_margin").height - text: "Type: " + model.machine_type + text: {"Type: " + model.machine_type} font: UM.Theme.getFont("medium") + color: UM.Theme.getColor("text") elide: Text.ElideRight } - UM.Label + Label { id: cloudPrinterFirmwareVersionLabel leftPadding: 2 * UM.Theme.getSize("default_margin").width - text: "Firmware version: " + model.firmware_version + text: {"Firmware version: " + model.firmware_version} font: UM.Theme.getFont("medium") + color: UM.Theme.getColor("text") elide: Text.ElideRight } } diff --git a/resources/qml/WelcomePages/AddLocalPrinterScrollView.qml b/resources/qml/WelcomePages/AddLocalPrinterScrollView.qml index 1d868d72ef..127fca5fa6 100644 --- a/resources/qml/WelcomePages/AddLocalPrinterScrollView.qml +++ b/resources/qml/WelcomePages/AddLocalPrinterScrollView.qml @@ -183,6 +183,7 @@ Item UM.Label { width: parent.width - (2 * UM.Theme.getSize("default_margin").width) + wrapMode: Text.Wrap text: base.getMachineName() color: UM.Theme.getColor("primary_button") font: UM.Theme.getFont("huge") diff --git a/resources/qml/WelcomePages/AddNetworkOrLocalPrinterContent.qml b/resources/qml/WelcomePages/AddNetworkOrLocalPrinterContent.qml index 83a38eab7a..dbf68ce701 100644 --- a/resources/qml/WelcomePages/AddNetworkOrLocalPrinterContent.qml +++ b/resources/qml/WelcomePages/AddNetworkOrLocalPrinterContent.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 @@ -15,7 +15,7 @@ Item { UM.I18nCatalog { id: catalog; name: "cura" } - UM.Label + Label { id: titleLabel anchors.top: parent.top @@ -24,6 +24,7 @@ Item text: catalog.i18nc("@label", "Add a printer") color: UM.Theme.getColor("primary_button") font: UM.Theme.getFont("huge") + renderType: Text.NativeRendering } DropDownWidget diff --git a/resources/qml/WelcomePages/AddNetworkPrinterScrollView.qml b/resources/qml/WelcomePages/AddNetworkPrinterScrollView.qml index 36c670f462..badd87326b 100644 --- a/resources/qml/WelcomePages/AddNetworkPrinterScrollView.qml +++ b/resources/qml/WelcomePages/AddNetworkPrinterScrollView.qml @@ -218,6 +218,7 @@ Item anchors.right: parent.right anchors.verticalCenter: parent.verticalCenter text: catalog.i18nc("@label", "Troubleshooting") + font: UM.Theme.getFont("default") color: UM.Theme.getColor("text_link") } diff --git a/resources/qml/WelcomePages/AddPrinterByIpContent.qml b/resources/qml/WelcomePages/AddPrinterByIpContent.qml index 90fdd2be91..1adaa09a49 100644 --- a/resources/qml/WelcomePages/AddPrinterByIpContent.qml +++ b/resources/qml/WelcomePages/AddPrinterByIpContent.qml @@ -5,7 +5,7 @@ import QtQuick 2.15 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.5 as Cura @@ -61,7 +61,7 @@ Item } } - UM.Label + Label { id: titleLabel anchors.top: parent.top @@ -70,6 +70,7 @@ Item text: catalog.i18nc("@label", "Add printer by IP address") color: UM.Theme.getColor("primary_button") font: UM.Theme.getFont("huge") + renderType: Text.NativeRendering } Item @@ -87,13 +88,17 @@ Item anchors.right: parent.right anchors.margins: UM.Theme.getSize("default_margin").width - UM.Label + Label { id: explainLabel height: contentHeight anchors.left: parent.left anchors.right: parent.right anchors.top: parent.top + + font: UM.Theme.getFont("default") + color: UM.Theme.getColor("text") + renderType: Text.NativeRendering text: catalog.i18nc("@label", "Enter the IP address of your printer on the network.") } @@ -131,7 +136,7 @@ Item onAccepted: addPrinterButton.clicked() } - UM.Label + Label { id: invalidInputLabel anchors.top: hostnameField.bottom @@ -139,6 +144,9 @@ Item anchors.left: parent.left visible: false text: catalog.i18nc("@text", "Please enter a valid IP address.") + font: UM.Theme.getFont("default") + color: UM.Theme.getColor("text") + renderType: Text.NativeRendering } Cura.SecondaryButton @@ -180,11 +188,14 @@ Item anchors.top: userInputFields.bottom anchors.margins: UM.Theme.getSize("default_margin").width - UM.Label + Label { id: waitResponseLabel anchors.top: parent.top anchors.margins: UM.Theme.getSize("default_margin").width + font: UM.Theme.getFont("default") + color: UM.Theme.getColor("text") + renderType: Text.NativeRendering visible: addPrinterByIpScreen.hasRequestInProgress || (addPrinterByIpScreen.hasRequestFinished && !addPrinterByIpScreen.isPrinterDiscovered) textFormat: Text.RichText @@ -214,15 +225,18 @@ Item visible: addPrinterByIpScreen.isPrinterDiscovered - UM.Label + Label { id: printerNameLabel anchors.top: parent.top font: UM.Theme.getFont("large") + color: UM.Theme.getColor("text") + renderType: Text.NativeRendering + text: !addPrinterByIpScreen.isPrinterDiscovered ? "???" : addPrinterByIpScreen.discoveredPrinter.name } - UM.Label + Label { id: printerCannotBeAddedLabel width: parent.width @@ -231,6 +245,8 @@ Item text: catalog.i18nc("@label", "This printer cannot be added because it's an unknown printer or it's not the host of a group.") visible: addPrinterByIpScreen.hasRequestFinished && !addPrinterByIpScreen.canAddPrinter font: UM.Theme.getFont("default_bold") + color: UM.Theme.getColor("text") + renderType: Text.NativeRendering wrapMode: Text.WordWrap } @@ -242,33 +258,52 @@ Item columns: 2 columnSpacing: UM.Theme.getSize("default_margin").width - UM.Label + Label { text: catalog.i18nc("@label", "Type") + font: UM.Theme.getFont("default") + color: UM.Theme.getColor("text") + renderType: Text.NativeRendering } - UM.Label + Label { id: typeText text: !addPrinterByIpScreen.isPrinterDiscovered ? "?" : addPrinterByIpScreen.discoveredPrinter.readableMachineType + font: UM.Theme.getFont("default") + color: UM.Theme.getColor("text") + renderType: Text.NativeRendering } - UM.Label + + Label { text: catalog.i18nc("@label", "Firmware version") + font: UM.Theme.getFont("default") + color: UM.Theme.getColor("text") + renderType: Text.NativeRendering } - UM.Label + Label { id: firmwareText text: !addPrinterByIpScreen.isPrinterDiscovered ? "0.0.0.0" : addPrinterByIpScreen.discoveredPrinter.device.getProperty("firmware_version") + font: UM.Theme.getFont("default") + color: UM.Theme.getColor("text") + renderType: Text.NativeRendering } - UM.Label + Label { text: catalog.i18nc("@label", "Address") + font: UM.Theme.getFont("default") + color: UM.Theme.getColor("text") + renderType: Text.NativeRendering } - UM.Label + Label { id: addressText text: !addPrinterByIpScreen.isPrinterDiscovered ? "0.0.0.0" : addPrinterByIpScreen.discoveredPrinter.address + font: UM.Theme.getFont("default") + color: UM.Theme.getColor("text") + renderType: Text.NativeRendering } } diff --git a/resources/qml/WelcomePages/CloudContent.qml b/resources/qml/WelcomePages/CloudContent.qml index cf830a9b36..7dc35c7bc5 100644 --- a/resources/qml/WelcomePages/CloudContent.qml +++ b/resources/qml/WelcomePages/CloudContent.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 @@ -56,7 +56,7 @@ Item spacing: UM.Theme.getSize("thick_margin").height - UM.Label + Label { id: titleLabel anchors.horizontalCenter: parent.horizontalCenter @@ -64,6 +64,7 @@ Item text: catalog.i18nc("@label", "Sign in to the Ultimaker platform") color: UM.Theme.getColor("primary_button") font: UM.Theme.getFont("huge") + renderType: Text.NativeRendering } // Filler item @@ -115,13 +116,17 @@ Item sourceSize.width: width sourceSize.height: height } - UM.Label + Label { id: marketplaceTextLabel anchors.horizontalCenter: parent.horizontalCenter width: parent.width text: catalog.i18nc("@text", "Add material settings and plugins from the Marketplace") + wrapMode: Text.Wrap horizontalAlignment: Text.AlignHCenter + color: UM.Theme.getColor("text") + font: UM.Theme.getFont("default") + renderType: Text.NativeRendering } } @@ -141,13 +146,17 @@ Item sourceSize.width: width sourceSize.height: height } - UM.Label + Label { id: syncTextLabel anchors.horizontalCenter: parent.horizontalCenter width: parent.width text: catalog.i18nc("@text", "Backup and sync your material settings and plugins") + wrapMode: Text.Wrap horizontalAlignment: Text.AlignHCenter + color: UM.Theme.getColor("text") + font: UM.Theme.getFont("default") + renderType: Text.NativeRendering } } @@ -167,13 +176,17 @@ Item sourceSize.width: width sourceSize.height: height } - UM.Label + Label { id: communityTextLabel anchors.horizontalCenter: communityColumn.horizontalCenter width: parent.width text: catalog.i18nc("@text", "Share ideas and get help from 48,000+ users in the Ultimaker Community") + wrapMode: Text.Wrap horizontalAlignment: Text.AlignHCenter + color: UM.Theme.getColor("text") + font: UM.Theme.getFont("default") + renderType: Text.NativeRendering } } } diff --git a/resources/qml/WelcomePages/DataCollectionsContent.qml b/resources/qml/WelcomePages/DataCollectionsContent.qml index ece437890e..be4d09e876 100644 --- a/resources/qml/WelcomePages/DataCollectionsContent.qml +++ b/resources/qml/WelcomePages/DataCollectionsContent.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 @@ -15,7 +15,7 @@ Item { UM.I18nCatalog { id: catalog; name: "cura" } - UM.Label + Label { id: titleLabel anchors.top: parent.top @@ -24,6 +24,7 @@ Item text: catalog.i18nc("@label", "Help us to improve Ultimaker Cura") color: UM.Theme.getColor("primary_button") font: UM.Theme.getFont("huge") + renderType: Text.NativeRendering } // Area where the cloud contents can be put. Pictures, texts and such. @@ -47,7 +48,7 @@ Item spacing: UM.Theme.getSize("wide_margin").height - UM.Label + Label { id: topLabel width: parent.width @@ -56,6 +57,8 @@ Item text: catalog.i18nc("@text", "Ultimaker Cura collects anonymous data to improve print quality and user experience, including:") wrapMode: Text.WordWrap font: UM.Theme.getFont("medium") + color: UM.Theme.getColor("text") + renderType: Text.NativeRendering } Grid { @@ -88,7 +91,7 @@ Item } } - UM.Label + Label { id: bottomLabel width: parent.width @@ -104,8 +107,10 @@ Item textFormat: Text.RichText wrapMode: Text.WordWrap font: UM.Theme.getFont("medium") + color: UM.Theme.getColor("text") linkColor: UM.Theme.getColor("text_link") onLinkActivated: CuraApplication.showMoreInformationDialogForAnonymousDataCollection() + renderType: Text.NativeRendering } } } diff --git a/resources/qml/WelcomePages/FirstStartMachineActionsContent.qml b/resources/qml/WelcomePages/FirstStartMachineActionsContent.qml index 2503190c32..64a815855b 100644 --- a/resources/qml/WelcomePages/FirstStartMachineActionsContent.qml +++ b/resources/qml/WelcomePages/FirstStartMachineActionsContent.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 @@ -36,7 +36,7 @@ Item } } - UM.Label + Label { id: titleLabel anchors.top: parent.top @@ -45,6 +45,7 @@ Item text: machineActionsModel.currentItem.title == undefined ? "" : machineActionsModel.currentItem.title color: UM.Theme.getColor("primary_button") font: UM.Theme.getFont("huge") + renderType: Text.NativeRendering } Item diff --git a/resources/qml/WelcomePages/ImageTile.qml b/resources/qml/WelcomePages/ImageTile.qml index b8f40ed25f..7ed07304e6 100644 --- a/resources/qml/WelcomePages/ImageTile.qml +++ b/resources/qml/WelcomePages/ImageTile.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 // @@ -18,7 +18,7 @@ Column property alias text: label.text property alias imageSource: image.source - UM.Label + Label { id: label width: image.width @@ -26,6 +26,9 @@ Column horizontalAlignment: Text.AlignHCenter text: "" wrapMode: Text.WordWrap + font: UM.Theme.getFont("default") + color: UM.Theme.getColor("text") + renderType: Text.NativeRendering } Image diff --git a/resources/qml/WelcomePages/WelcomeContent.qml b/resources/qml/WelcomePages/WelcomeContent.qml index 4123535cc9..619780435d 100644 --- a/resources/qml/WelcomePages/WelcomeContent.qml +++ b/resources/qml/WelcomePages/WelcomeContent.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 // @@ -48,7 +48,7 @@ Item width: parent.width } - UM.Label + Label { id: titleLabel anchors.horizontalCenter: parent.horizontalCenter @@ -56,16 +56,20 @@ Item text: catalog.i18nc("@label", "Welcome to Ultimaker Cura") color: UM.Theme.getColor("primary_button") font: UM.Theme.getFont("huge_bold") + renderType: Text.NativeRendering } - UM.Label + Label { id: textLabel anchors.horizontalCenter: parent.horizontalCenter horizontalAlignment: Text.AlignHCenter width: titleLabel.width + 2 * UM.Theme.getSize("thick_margin").width text: catalog.i18nc("@text", "Please follow these steps to set up Ultimaker Cura. This will only take a few moments.") + wrapMode: Text.Wrap font: UM.Theme.getFont("medium") + color: UM.Theme.getColor("text") + renderType: Text.NativeRendering } // Filler item diff --git a/resources/qml/WelcomePages/WhatsNewContent.qml b/resources/qml/WelcomePages/WhatsNewContent.qml index bbae9380a2..2ac3935ece 100644 --- a/resources/qml/WelcomePages/WhatsNewContent.qml +++ b/resources/qml/WelcomePages/WhatsNewContent.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 @@ -19,7 +19,7 @@ Item UM.I18nCatalog { id: catalog; name: "cura" } - UM.Label + Label { id: titleLabel anchors.top: parent.top @@ -28,6 +28,7 @@ Item text: catalog.i18nc("@label", "What's New") color: UM.Theme.getColor("primary_button") font: UM.Theme.getFont("huge") + renderType: Text.NativeRendering } Rectangle |