diff options
author | c.lamboo <casperlamboo@gmail.com> | 2022-05-10 16:36:50 +0300 |
---|---|---|
committer | c.lamboo <casperlamboo@gmail.com> | 2022-05-10 16:36:50 +0300 |
commit | f0e3c19a34d1fde3b7ec4fd95677fbefa2028b26 (patch) | |
tree | 5333854a5279982cb9c1a7e7885d9f6a09042f25 /plugins | |
parent | c4f9669887569f01d302382be15a1246e201617d (diff) |
Render labels using `Text.QtRendering` on OSX
Fonts were looking a bit to thick on when using `Text.NativeRendering`, so using `Text.QtRendering` instead. After this the font weight looks identical to figma (as far as I can see).
In this commit I also changed all `Label`'s to `UM.Label`'s and removed default properties where I could.
CURA-9154
Diffstat (limited to 'plugins')
28 files changed, 62 insertions, 151 deletions
diff --git a/plugins/3MFReader/WorkspaceDialog.qml b/plugins/3MFReader/WorkspaceDialog.qml index e69cced221..4c384b306b 100644 --- a/plugins/3MFReader/WorkspaceDialog.qml +++ b/plugins/3MFReader/WorkspaceDialog.qml @@ -437,7 +437,6 @@ UM.Dialog { id: warningLabel text: catalog.i18nc("@action:warning", "Loading a project will clear all models on the build plate.") - wrapMode: Text.Wrap } } } diff --git a/plugins/CuraDrive/src/qml/pages/BackupsPage.qml b/plugins/CuraDrive/src/qml/pages/BackupsPage.qml index bb17cea973..87d3127999 100644 --- a/plugins/CuraDrive/src/qml/pages/BackupsPage.qml +++ b/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.3 as UM +import UM 1.5 as UM import Cura 1.1 as Cura import "../components" @@ -22,28 +22,23 @@ Item width: parent.width anchors.fill: parent - Label + UM.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 } - Label + UM.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 @@ -54,16 +49,13 @@ Item Layout.fillHeight: true } - Label + UM.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 diff --git a/plugins/DigitalLibrary/resources/qml/CreateNewProjectPopup.qml b/plugins/DigitalLibrary/resources/qml/CreateNewProjectPopup.qml index 6846720dda..1aef93c251 100644 --- a/plugins/DigitalLibrary/resources/qml/CreateNewProjectPopup.qml +++ b/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.2 as UM +import UM 1.5 as UM import Cura 1.6 as Cura import DigitalFactory 1.0 as DF @@ -64,12 +64,10 @@ Popup } } - Label + UM.Label { id: projectNameLabel text: "Project Name" - font: UM.Theme.getFont("default") - color: UM.Theme.getColor("text") anchors { top: createNewLibraryProjectLabel.bottom @@ -107,13 +105,12 @@ Popup } } - Label + UM.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 diff --git a/plugins/DigitalLibrary/resources/qml/OpenProjectFilesPage.qml b/plugins/DigitalLibrary/resources/qml/OpenProjectFilesPage.qml index 3e483b4fef..3c36a5687a 100644 --- a/plugins/DigitalLibrary/resources/qml/OpenProjectFilesPage.qml +++ b/plugins/DigitalLibrary/resources/qml/OpenProjectFilesPage.qml @@ -83,13 +83,12 @@ Item } } - Label + UM.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 @@ -102,14 +101,13 @@ Item } } - Label + UM.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") } diff --git a/plugins/DigitalLibrary/resources/qml/ProjectSummaryCard.qml b/plugins/DigitalLibrary/resources/qml/ProjectSummaryCard.qml index ba2abf22a9..ca836ee21d 100644 --- a/plugins/DigitalLibrary/resources/qml/ProjectSummaryCard.qml +++ b/plugins/DigitalLibrary/resources/qml/ProjectSummaryCard.qml @@ -2,7 +2,7 @@ import QtQuick 2.10 import QtQuick.Controls 2.3 -import UM 1.2 as UM +import UM 1.5 as UM import Cura 1.6 as Cura Cura.RoundedRectangle @@ -58,34 +58,31 @@ Cura.RoundedRectangle width: parent.width - x - UM.Theme.getSize("default_margin").width anchors.verticalCenter: parent.verticalCenter - Label + UM.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") } - Label + UM.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") } - Label + UM.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") } } } diff --git a/plugins/DigitalLibrary/resources/qml/SaveProjectFilesPage.qml b/plugins/DigitalLibrary/resources/qml/SaveProjectFilesPage.qml index e7114e3312..90b9bd8b05 100644 --- a/plugins/DigitalLibrary/resources/qml/SaveProjectFilesPage.qml +++ b/plugins/DigitalLibrary/resources/qml/SaveProjectFilesPage.qml @@ -44,14 +44,13 @@ Item cardMouseAreaEnabled: false } - Label + UM.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") } @@ -110,13 +109,12 @@ Item } } - Label + UM.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 @@ -129,14 +127,13 @@ Item } } - Label + UM.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") } diff --git a/plugins/DigitalLibrary/resources/qml/SelectProjectPage.qml b/plugins/DigitalLibrary/resources/qml/SelectProjectPage.qml index 5a98fcb975..faceb4df23 100644 --- a/plugins/DigitalLibrary/resources/qml/SelectProjectPage.qml +++ b/plugins/DigitalLibrary/resources/qml/SelectProjectPage.qml @@ -104,13 +104,12 @@ Item width: parent.width - 2 * UM.Theme.getSize("thick_margin").width } - Label + UM.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 diff --git a/plugins/FirmwareUpdater/FirmwareUpdaterMachineAction.qml b/plugins/FirmwareUpdater/FirmwareUpdaterMachineAction.qml index 5c410c274a..70919d5dcb 100644 --- a/plugins/FirmwareUpdater/FirmwareUpdaterMachineAction.qml +++ b/plugins/FirmwareUpdater/FirmwareUpdaterMachineAction.qml @@ -147,8 +147,6 @@ Cura.MachineAction return catalog.i18nc("@label","Firmware update failed due to missing firmware."); } } - - wrapMode: Text.Wrap } UM.ProgressBar diff --git a/plugins/MachineSettingsAction/MachineSettingsExtruderTab.qml b/plugins/MachineSettingsAction/MachineSettingsExtruderTab.qml index 293e7386b2..dc1a479be9 100644 --- a/plugins/MachineSettingsAction/MachineSettingsExtruderTab.qml +++ b/plugins/MachineSettingsAction/MachineSettingsExtruderTab.qml @@ -4,7 +4,7 @@ import QtQuick 2.10 import QtQuick.Controls 2.3 -import UM 1.3 as UM +import UM 1.5 as UM import Cura 1.1 as Cura @@ -58,11 +58,10 @@ Item spacing: base.columnSpacing - Label // Title Label + UM.Label // Title Label { text: catalog.i18nc("@title:label", "Nozzle Settings") font: UM.Theme.getFont("medium_bold") - renderType: Text.NativeRendering } Cura.NumericTextFieldWithUnit // "Nozzle size" diff --git a/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml b/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml index 32c8f8df63..6c11c414ed 100644 --- a/plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml +++ b/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.3 as UM +import UM 1.5 as UM import Cura 1.1 as Cura @@ -51,12 +51,10 @@ Item spacing: base.columnSpacing - Label // Title Label + UM.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 } @@ -182,12 +180,10 @@ Item spacing: base.columnSpacing - Label // Title Label + UM.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 } diff --git a/plugins/Marketplace/resources/qml/LicenseDialog.qml b/plugins/Marketplace/resources/qml/LicenseDialog.qml index 2f3f4ffc12..4517771da3 100644 --- a/plugins/Marketplace/resources/qml/LicenseDialog.qml +++ b/plugins/Marketplace/resources/qml/LicenseDialog.qml @@ -42,16 +42,13 @@ UM.Dialog source: UM.Theme.getIcon("Certificate", "high") } - Label + UM.Label { text: catalog.i18nc("@text", "Please read and agree with the plugin licence.") - color: UM.Theme.getColor("text") font: UM.Theme.getFont("large") anchors.verticalCenter: icon.verticalCenter height: UM.Theme.getSize("marketplace_large_icon").height verticalAlignment: Qt.AlignmentFlag.AlignVCenter - wrapMode: Text.Wrap - renderType: Text.NativeRendering } } diff --git a/plugins/Marketplace/resources/qml/Marketplace.qml b/plugins/Marketplace/resources/qml/Marketplace.qml index 887886fd22..d925f265d9 100644 --- a/plugins/Marketplace/resources/qml/Marketplace.qml +++ b/plugins/Marketplace/resources/qml/Marketplace.qml @@ -6,7 +6,7 @@ import QtQuick.Controls 2.15 import QtQuick.Layouts 1.15 import QtQuick.Window 2.2 -import UM 1.2 as UM +import UM 1.5 as UM import Cura 1.6 as Cura Window @@ -67,7 +67,7 @@ Window Layout.preferredWidth: parent.width Layout.preferredHeight: childrenRect.height + UM.Theme.getSize("default_margin").height - Label + UM.Label { id: pageTitle anchors @@ -80,7 +80,6 @@ Window } font: UM.Theme.getFont("large") - color: UM.Theme.getColor("text") text: content.item ? content.item.pageTitle: catalog.i18nc("@title", "Loading...") } } diff --git a/plugins/Marketplace/resources/qml/PackageCard.qml b/plugins/Marketplace/resources/qml/PackageCard.qml index 7442c63aa6..52254a478f 100644 --- a/plugins/Marketplace/resources/qml/PackageCard.qml +++ b/plugins/Marketplace/resources/qml/PackageCard.qml @@ -29,16 +29,13 @@ Rectangle anchors.fill: parent - Label + UM.Label { id: descriptionLabel width: parent.width text: packageData.description - font: UM.Theme.getFont("default") - color: UM.Theme.getColor("text") maximumLineCount: 2 - wrapMode: Text.Wrap elide: Text.ElideRight visible: text !== "" } diff --git a/plugins/Marketplace/resources/qml/PackageCardHeader.qml b/plugins/Marketplace/resources/qml/PackageCardHeader.qml index 9d401c5253..2bbf76f9d0 100644 --- a/plugins/Marketplace/resources/qml/PackageCardHeader.qml +++ b/plugins/Marketplace/resources/qml/PackageCardHeader.qml @@ -87,11 +87,10 @@ Item Layout.preferredWidth: parent.width Layout.preferredHeight: childrenRect.height - Label + UM.Label { text: packageData.displayName font: UM.Theme.getFont("medium_bold") - color: UM.Theme.getColor("text") verticalAlignment: Text.AlignTop } VerifiedIcon @@ -100,12 +99,10 @@ Item visible: packageData.isCheckedByUltimaker } - Label + UM.Label { id: packageVersionLabel text: packageData.packageVersion - font: UM.Theme.getFont("default") - color: UM.Theme.getColor("text") Layout.fillWidth: true } @@ -155,14 +152,11 @@ Item spacing: UM.Theme.getSize("narrow_margin").width // label "By" - Label + UM.Label { id: authorBy Layout.alignment: Qt.AlignCenter - text: catalog.i18nc("@label", "By") - font: UM.Theme.getFont("default") - color: UM.Theme.getColor("text") } // clickable author name diff --git a/plugins/Marketplace/resources/qml/PackageDetails.qml b/plugins/Marketplace/resources/qml/PackageDetails.qml index 218669d81e..2bc92da8de 100644 --- a/plugins/Marketplace/resources/qml/PackageDetails.qml +++ b/plugins/Marketplace/resources/qml/PackageDetails.qml @@ -45,14 +45,13 @@ Item iconSize: height - leftPadding * 2 } - Label + UM.Label { Layout.alignment: Qt.AlignmentFlag.AlignVCenter Layout.fillWidth: true text: detailPage.title font: UM.Theme.getFont("large") - color: UM.Theme.getColor("text") } } diff --git a/plugins/Marketplace/resources/qml/PackagePage.qml b/plugins/Marketplace/resources/qml/PackagePage.qml index 455b2b8d5d..a8ddf2348c 100644 --- a/plugins/Marketplace/resources/qml/PackagePage.qml +++ b/plugins/Marketplace/resources/qml/PackagePage.qml @@ -56,13 +56,9 @@ Rectangle color: UM.Theme.getColor("text") } - Label + UM.Label { - anchors.verticalCenter: downloadsIcon.verticalCenter - - color: UM.Theme.getColor("text") - font: UM.Theme.getFont("default") text: packageData.downloadCount } } @@ -78,25 +74,22 @@ Rectangle topPadding: 0 spacing: UM.Theme.getSize("default_margin").height - Label + UM.Label { width: parent.width - parent.padding * 2 text: catalog.i18nc("@header", "Description") font: UM.Theme.getFont("medium_bold") - color: UM.Theme.getColor("text") elide: Text.ElideRight } - Label + UM.Label { width: parent.width - parent.padding * 2 text: packageData.formattedDescription font: UM.Theme.getFont("medium") - color: UM.Theme.getColor("text") linkColor: UM.Theme.getColor("text_link") - wrapMode: Text.Wrap textFormat: Text.RichText onLinkActivated: UM.UrlUtil.openUrl(link, ["http", "https"]) @@ -110,13 +103,12 @@ Rectangle visible: packageData.packageType === "material" spacing: 0 - Label + UM.Label { width: parent.width text: catalog.i18nc("@header", "Compatible printers") font: UM.Theme.getFont("medium_bold") - color: UM.Theme.getColor("text") elide: Text.ElideRight } @@ -124,25 +116,23 @@ Rectangle { model: packageData.compatiblePrinters - Label + UM.Label { width: compatiblePrinterColumn.width text: modelData font: UM.Theme.getFont("medium") - color: UM.Theme.getColor("text") elide: Text.ElideRight } } - Label + UM.Label { width: parent.width visible: packageData.compatiblePrinters.length == 0 text: "(" + catalog.i18nc("@info", "No compatibility information") + ")" font: UM.Theme.getFont("medium") - color: UM.Theme.getColor("text") elide: Text.ElideRight } } @@ -155,13 +145,12 @@ Rectangle visible: packageData.packageType === "material" spacing: 0 - Label + UM.Label { width: parent.width text: catalog.i18nc("@header", "Compatible support materials") font: UM.Theme.getFont("medium_bold") - color: UM.Theme.getColor("text") elide: Text.ElideRight } @@ -169,25 +158,23 @@ Rectangle { model: packageData.compatibleSupportMaterials - Label + UM.Label { width: compatibleSupportMaterialColumn.width text: modelData font: UM.Theme.getFont("medium") - color: UM.Theme.getColor("text") elide: Text.ElideRight } } - Label + UM.Label { width: parent.width visible: packageData.compatibleSupportMaterials.length == 0 text: "(" + catalog.i18nc("@info No materials", "None") + ")" font: UM.Theme.getFont("medium") - color: UM.Theme.getColor("text") elide: Text.ElideRight } } @@ -199,23 +186,21 @@ Rectangle visible: packageData.packageType === "material" spacing: 0 - Label + UM.Label { width: parent.width text: catalog.i18nc("@header", "Compatible with Material Station") font: UM.Theme.getFont("medium_bold") - color: UM.Theme.getColor("text") elide: Text.ElideRight } - Label + UM.Label { width: parent.width text: packageData.isCompatibleMaterialStation ? catalog.i18nc("@info", "Yes") : catalog.i18nc("@info", "No") font: UM.Theme.getFont("medium") - color: UM.Theme.getColor("text") elide: Text.ElideRight } } @@ -227,23 +212,21 @@ Rectangle visible: packageData.packageType === "material" spacing: 0 - Label + UM.Label { width: parent.width text: catalog.i18nc("@header", "Optimized for Air Manager") font: UM.Theme.getFont("medium_bold") - color: UM.Theme.getColor("text") elide: Text.ElideRight } - Label + UM.Label { width: parent.width text: packageData.isCompatibleAirManager ? catalog.i18nc("@info", "Yes") : catalog.i18nc("@info", "No") font: UM.Theme.getFont("medium") - color: UM.Theme.getColor("text") elide: Text.ElideRight } } diff --git a/plugins/Marketplace/resources/qml/PackageTypeTab.qml b/plugins/Marketplace/resources/qml/PackageTypeTab.qml index 79eaa9a16c..09dd7f56c3 100644 --- a/plugins/Marketplace/resources/qml/PackageTypeTab.qml +++ b/plugins/Marketplace/resources/qml/PackageTypeTab.qml @@ -3,7 +3,7 @@ import QtQuick 2.15 import QtQuick.Controls 2.15 -import UM 1.0 as UM +import UM 1.5 as UM TabButton { @@ -22,11 +22,10 @@ TabButton border.width: UM.Theme.getSize("thick_lining").width } - contentItem: Label + contentItem: UM.Label { text: parent.text font: UM.Theme.getFont("medium_bold") - color: UM.Theme.getColor("text") width: contentWidth anchors.centerIn: parent } diff --git a/plugins/Marketplace/resources/qml/Packages.qml b/plugins/Marketplace/resources/qml/Packages.qml index 74a18bccd3..70ff7de195 100644 --- a/plugins/Marketplace/resources/qml/Packages.qml +++ b/plugins/Marketplace/resources/qml/Packages.qml @@ -40,7 +40,7 @@ ListView color: UM.Theme.getColor("detail_background") - Label + UM.Label { id: sectionHeaderText anchors.verticalCenter: parent.verticalCenter @@ -48,7 +48,6 @@ ListView text: section font: UM.Theme.getFont("large") - color: UM.Theme.getColor("text") } } diff --git a/plugins/MonitorStage/MonitorMain.qml b/plugins/MonitorStage/MonitorMain.qml index 8992606d90..fdb67d0feb 100644 --- a/plugins/MonitorStage/MonitorMain.qml +++ b/plugins/MonitorStage/MonitorMain.qml @@ -132,7 +132,7 @@ Rectangle width: UM.Theme.getSize("icon_indicator").width height: UM.Theme.getSize("icon_indicator").height } - Label + UM.Label { id: manageQueueText anchors @@ -144,7 +144,6 @@ Rectangle color: UM.Theme.getColor("text_link") font: UM.Theme.getFont("medium") text: catalog.i18nc("@label link to technical assistance", "View user manuals online") - renderType: Text.NativeRendering } MouseArea { @@ -155,14 +154,13 @@ Rectangle onExited: manageQueueText.font.underline = false } } - Label + UM.Label { id: noConnectionLabel anchors.horizontalCenter: parent.horizontalCenter visible: !isNetworkConfigurable text: catalog.i18nc("@info", "In order to monitor your print from Cura, please connect the printer.") font: UM.Theme.getFont("medium") - color: UM.Theme.getColor("text") wrapMode: Text.WordWrap width: contentWidth } diff --git a/plugins/PostProcessingPlugin/PostProcessingPlugin.qml b/plugins/PostProcessingPlugin/PostProcessingPlugin.qml index 4faf908881..c252f13c68 100644 --- a/plugins/PostProcessingPlugin/PostProcessingPlugin.qml +++ b/plugins/PostProcessingPlugin/PostProcessingPlugin.qml @@ -245,7 +245,7 @@ UM.Dialog height: parent.height id: settingsPanel - Label + UM.Label { id: scriptSpecsHeader text: manager.selectedScriptIndex == -1 ? catalog.i18nc("@label", "Settings") : base.activeScriptName @@ -262,7 +262,6 @@ UM.Dialog elide: Text.ElideRight height: 20 * screenScaleFactor font: UM.Theme.getFont("large_bold") - color: UM.Theme.getColor("text") } ListView diff --git a/plugins/SimulationView/SimulationViewMenuComponent.qml b/plugins/SimulationView/SimulationViewMenuComponent.qml index a811fea5db..d434d883eb 100644 --- a/plugins/SimulationView/SimulationViewMenuComponent.qml +++ b/plugins/SimulationView/SimulationViewMenuComponent.qml @@ -286,9 +286,7 @@ Cura.ExpandableComponent UM.Label { text: label - font: UM.Theme.getFont("default") elide: Text.ElideRight - renderType: Text.NativeRendering color: UM.Theme.getColor("setting_control_text") anchors.verticalCenter: parent.verticalCenter anchors.left: legendModelCheckBox.left diff --git a/plugins/SliceInfoPlugin/MoreInfoWindow.qml b/plugins/SliceInfoPlugin/MoreInfoWindow.qml index 2f60089343..310fa29c17 100644 --- a/plugins/SliceInfoPlugin/MoreInfoWindow.qml +++ b/plugins/SliceInfoPlugin/MoreInfoWindow.qml @@ -61,7 +61,7 @@ Window right: parent.right } - Label + UM.Label { id: headerText anchors @@ -71,9 +71,7 @@ Window right: parent.right } text: catalog.i18nc("@text:window", "Ultimaker Cura collects anonymous data in order to improve the print quality and user experience. Below is an example of all the data that is shared:") - color: UM.Theme.getColor("text") wrapMode: Text.WordWrap - renderType: Text.NativeRendering } Cura.ScrollableTextArea diff --git a/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml b/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml index 7d34a182b3..877c85bb24 100644 --- a/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml +++ b/plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml @@ -295,7 +295,6 @@ Cura.MachineAction UM.Label { text: catalog.i18nc("@label", "Enter the IP address of your printer on the network.") - renderType: Text.NativeRendering } Cura.TextField diff --git a/plugins/UM3NetworkPrinting/resources/qml/MonitorExtruderConfiguration.qml b/plugins/UM3NetworkPrinting/resources/qml/MonitorExtruderConfiguration.qml index 2720e6896a..1b2be71e55 100644 --- a/plugins/UM3NetworkPrinting/resources/qml/MonitorExtruderConfiguration.qml +++ b/plugins/UM3NetworkPrinting/resources/qml/MonitorExtruderConfiguration.qml @@ -3,7 +3,7 @@ import QtQuick 2.2 import QtQuick.Controls 2.0 -import UM 1.3 as UM +import UM 1.5 as UM import Cura 1.6 as Cura @@ -57,32 +57,25 @@ Item width: Math.max(materialLabel.contentWidth, 60 * screenScaleFactor) // TODO: Theme! radius: 2 * screenScaleFactor // TODO: Theme! - Label + UM.Label { id: materialLabel anchors.top: parent.top - color: UM.Theme.getColor("text") elide: Text.ElideRight - font: UM.Theme.getFont("default") // 12pt, regular text: "" visible: text !== "" - - renderType: Text.NativeRendering } - Label + UM.Label { id: printCoreLabel anchors.top: materialLabel.bottom - color: UM.Theme.getColor("text") elide: Text.ElideRight font: UM.Theme.getFont("default_bold") // 12pt, bold text: "" visible: text !== "" - - renderType: Text.NativeRendering } } } diff --git a/plugins/UM3NetworkPrinting/resources/qml/MonitorInfoBlurb.qml b/plugins/UM3NetworkPrinting/resources/qml/MonitorInfoBlurb.qml index 5c32c2435a..1ec7eba036 100644 --- a/plugins/UM3NetworkPrinting/resources/qml/MonitorInfoBlurb.qml +++ b/plugins/UM3NetworkPrinting/resources/qml/MonitorInfoBlurb.qml @@ -3,7 +3,7 @@ import QtQuick 2.3 import QtQuick.Controls 2.0 -import UM 1.3 as UM +import UM 1.5 as UM /** * A MonitorInfoBlurb is an extension of the GenericPopUp used to show static information (vs. interactive context @@ -31,7 +31,7 @@ Item id: contentWrapper implicitWidth: childrenRect.width implicitHeight: innerLabel.contentHeight + 2 * innerLabel.padding - Label + UM.Label { id: innerLabel padding: 12 * screenScaleFactor // TODO: Theme! @@ -39,7 +39,6 @@ Item wrapMode: Text.WordWrap width: 240 * screenScaleFactor // TODO: Theme! color: UM.Theme.getColor("monitor_tooltip_text") - font: UM.Theme.getFont("default") } } } diff --git a/plugins/UM3NetworkPrinting/resources/qml/PrintWindow.qml b/plugins/UM3NetworkPrinting/resources/qml/PrintWindow.qml index 441766a8e7..d1c561ccae 100644 --- a/plugins/UM3NetworkPrinting/resources/qml/PrintWindow.qml +++ b/plugins/UM3NetworkPrinting/resources/qml/PrintWindow.qml @@ -4,7 +4,7 @@ import QtQuick 2.2 import QtQuick.Window 2.2 import QtQuick.Controls 2.15 -import UM 1.1 as UM +import UM 1.5 as UM UM.Dialog { @@ -70,7 +70,7 @@ UM.Dialog { name: "cura"; } - Label { + UM.Label { id: manualPrinterSelectionLabel; anchors { left: parent.left; @@ -79,8 +79,6 @@ UM.Dialog { } height: 20 * screenScaleFactor; text: catalog.i18nc("@label", "Printer selection"); - wrapMode: Text.Wrap; - renderType: Text.NativeRendering; } ComboBox { diff --git a/plugins/UltimakerMachineActions/BedLevelMachineAction.qml b/plugins/UltimakerMachineActions/BedLevelMachineAction.qml index a9f7e93d44..ccc1fb75b0 100644 --- a/plugins/UltimakerMachineActions/BedLevelMachineAction.qml +++ b/plugins/UltimakerMachineActions/BedLevelMachineAction.qml @@ -5,7 +5,7 @@ import QtQuick 2.10 import QtQuick.Controls 2.3 import QtQuick.Layouts 1.3 -import UM 1.3 as UM +import UM 1.5 as UM import Cura 1.1 as Cura @@ -23,18 +23,16 @@ Cura.MachineAction anchors.horizontalCenter: parent.horizontalCenter width: parent.width * 3 / 4 - Label + UM.Label { id: pageTitle width: parent.width text: catalog.i18nc("@title", "Build Plate Leveling") wrapMode: Text.WordWrap font: UM.Theme.getFont("medium") - color: UM.Theme.getColor("text") - renderType: Text.NativeRendering } - Label + UM.Label { id: pageDescription anchors.top: pageTitle.bottom @@ -42,12 +40,9 @@ Cura.MachineAction width: parent.width wrapMode: Text.WordWrap text: catalog.i18nc("@label", "To make sure your prints will come out great, you can now adjust your buildplate. When you click 'Move to Next Position' the nozzle will move to the different positions that can be adjusted.") - font: UM.Theme.getFont("default") - color: UM.Theme.getColor("text") - renderType: Text.NativeRendering } - Label + UM.Label { id: bedlevelingText anchors.top: pageDescription.bottom @@ -55,9 +50,6 @@ Cura.MachineAction width: parent.width wrapMode: Text.WordWrap text: catalog.i18nc("@label", "For every position; insert a piece of paper under the nozzle and adjust the print build plate height. The print build plate height is right when the paper is slightly gripped by the tip of the nozzle.") - font: UM.Theme.getFont("default") - color: UM.Theme.getColor("text") - renderType: Text.NativeRendering } Row diff --git a/plugins/UltimakerMachineActions/UMOUpgradeSelectionMachineAction.qml b/plugins/UltimakerMachineActions/UMOUpgradeSelectionMachineAction.qml index 3d7b4a054f..8136e63a47 100644 --- a/plugins/UltimakerMachineActions/UMOUpgradeSelectionMachineAction.qml +++ b/plugins/UltimakerMachineActions/UMOUpgradeSelectionMachineAction.qml @@ -20,7 +20,7 @@ Cura.MachineAction anchors.topMargin: UM.Theme.getSize("default_margin").width * 5 anchors.leftMargin: UM.Theme.getSize("default_margin").width * 4 - Label + UM.Label { id: pageDescription anchors.top: parent.top @@ -29,8 +29,6 @@ Cura.MachineAction wrapMode: Text.WordWrap text: catalog.i18nc("@label","Please select any upgrades made to this Ultimaker Original") font: UM.Theme.getFont("medium") - color: UM.Theme.getColor("text") - renderType: Text.NativeRendering } UM.CheckBox |