From 7a3cd81e3f1afea6e576d6851a4e85a48968cf95 Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Mon, 1 Apr 2019 14:10:09 +0200 Subject: [PATCH] Fix font size for the titles in the welcome flow CURA-6057 --- .../qml/WelcomePages/AddNetworkOrLocalPrinterContent.qml | 2 +- resources/qml/WelcomePages/AddPrinterByIpContent.qml | 9 +++------ resources/qml/WelcomePages/DataCollectionsContent.qml | 2 +- .../qml/WelcomePages/FirstStartMachineActionsContent.qml | 2 +- resources/qml/WelcomePages/UserAgreementContent.qml | 2 +- resources/qml/WelcomePages/WelcomeContent.qml | 2 +- resources/qml/WelcomePages/WhatsNewContent.qml | 2 +- resources/themes/cura-light/theme.json | 5 +++++ 8 files changed, 14 insertions(+), 12 deletions(-) diff --git a/resources/qml/WelcomePages/AddNetworkOrLocalPrinterContent.qml b/resources/qml/WelcomePages/AddNetworkOrLocalPrinterContent.qml index 6e1d827fb4..c1ec7481a2 100644 --- a/resources/qml/WelcomePages/AddNetworkOrLocalPrinterContent.qml +++ b/resources/qml/WelcomePages/AddNetworkOrLocalPrinterContent.qml @@ -23,7 +23,7 @@ Item horizontalAlignment: Text.AlignHCenter text: catalog.i18nc("@label", "Add a printer") color: UM.Theme.getColor("primary_button") - font: UM.Theme.getFont("large_bold") + font: UM.Theme.getFont("huge") renderType: Text.NativeRendering } diff --git a/resources/qml/WelcomePages/AddPrinterByIpContent.qml b/resources/qml/WelcomePages/AddPrinterByIpContent.qml index b0085c1774..5ec8bd42f8 100644 --- a/resources/qml/WelcomePages/AddPrinterByIpContent.qml +++ b/resources/qml/WelcomePages/AddPrinterByIpContent.qml @@ -29,12 +29,11 @@ Item { id: titleLabel anchors.top: parent.top - anchors.topMargin: UM.Theme.getSize("wide_margin").height anchors.horizontalCenter: parent.horizontalCenter horizontalAlignment: Text.AlignHCenter text: catalog.i18nc("@label", "Add printer by IP address") color: UM.Theme.getColor("primary_button") - font: UM.Theme.getFont("large_bold") + font: UM.Theme.getFont("huge") renderType: Text.NativeRendering } @@ -44,8 +43,8 @@ Item anchors.bottom: connectButton.top anchors.topMargin: UM.Theme.getSize("default_margin").height anchors.bottomMargin: UM.Theme.getSize("default_margin").height - anchors.horizontalCenter: parent.horizontalCenter - width: Math.floor(parent.width * 3 / 4) + anchors.left: parent.left + anchors.right: parent.right Item { @@ -241,7 +240,6 @@ Item id: backButton anchors.left: parent.left anchors.bottom: parent.bottom - anchors.margins: UM.Theme.getSize("wide_margin").width text: catalog.i18nc("@button", "Cancel") onClicked: base.showPreviousPage() } @@ -251,7 +249,6 @@ Item id: connectButton anchors.right: parent.right anchors.bottom: parent.bottom - anchors.margins: UM.Theme.getSize("wide_margin").width text: catalog.i18nc("@button", "Connect") onClicked: { diff --git a/resources/qml/WelcomePages/DataCollectionsContent.qml b/resources/qml/WelcomePages/DataCollectionsContent.qml index 0ab3bb6c01..610ce889d6 100644 --- a/resources/qml/WelcomePages/DataCollectionsContent.qml +++ b/resources/qml/WelcomePages/DataCollectionsContent.qml @@ -23,7 +23,7 @@ Item horizontalAlignment: Text.AlignHCenter text: catalog.i18nc("@label", "Help us to improve Ultimaker Cura") color: UM.Theme.getColor("primary_button") - font: UM.Theme.getFont("large_bold") + font: UM.Theme.getFont("huge") renderType: Text.NativeRendering } diff --git a/resources/qml/WelcomePages/FirstStartMachineActionsContent.qml b/resources/qml/WelcomePages/FirstStartMachineActionsContent.qml index 330b76479d..3acca4dea6 100644 --- a/resources/qml/WelcomePages/FirstStartMachineActionsContent.qml +++ b/resources/qml/WelcomePages/FirstStartMachineActionsContent.qml @@ -44,7 +44,7 @@ Item horizontalAlignment: Text.AlignHCenter text: machineActionsModel.currentItem.title == undefined ? "" : machineActionsModel.currentItem.title color: UM.Theme.getColor("primary_button") - font: UM.Theme.getFont("large_bold") + font: UM.Theme.getFont("huge") renderType: Text.NativeRendering } diff --git a/resources/qml/WelcomePages/UserAgreementContent.qml b/resources/qml/WelcomePages/UserAgreementContent.qml index 6ccf82b650..5308241ae3 100644 --- a/resources/qml/WelcomePages/UserAgreementContent.qml +++ b/resources/qml/WelcomePages/UserAgreementContent.qml @@ -22,7 +22,7 @@ Item horizontalAlignment: Text.AlignHCenter text: catalog.i18nc("@label", "User Agreement") color: UM.Theme.getColor("primary_button") - font: UM.Theme.getFont("large_bold") + font: UM.Theme.getFont("huge") renderType: Text.NativeRendering } diff --git a/resources/qml/WelcomePages/WelcomeContent.qml b/resources/qml/WelcomePages/WelcomeContent.qml index 57ee28068f..b59c91a0b7 100644 --- a/resources/qml/WelcomePages/WelcomeContent.qml +++ b/resources/qml/WelcomePages/WelcomeContent.qml @@ -28,7 +28,7 @@ Item horizontalAlignment: Text.AlignHCenter text: catalog.i18nc("@label", "Welcome to Ultimaker Cura") color: UM.Theme.getColor("primary_button") - font: UM.Theme.getFont("large_bold") + font: UM.Theme.getFont("huge") renderType: Text.NativeRendering } diff --git a/resources/qml/WelcomePages/WhatsNewContent.qml b/resources/qml/WelcomePages/WhatsNewContent.qml index ec1792c3e6..db6cd3b576 100644 --- a/resources/qml/WelcomePages/WhatsNewContent.qml +++ b/resources/qml/WelcomePages/WhatsNewContent.qml @@ -23,7 +23,7 @@ Item horizontalAlignment: Text.AlignHCenter text: catalog.i18nc("@label", "What's new in Ultimaker Cura") color: UM.Theme.getColor("primary_button") - font: UM.Theme.getFont("large_bold") + font: UM.Theme.getFont("huge") renderType: Text.NativeRendering } diff --git a/resources/themes/cura-light/theme.json b/resources/themes/cura-light/theme.json index 29c9c1ba12..1cccb288c0 100644 --- a/resources/themes/cura-light/theme.json +++ b/resources/themes/cura-light/theme.json @@ -29,6 +29,11 @@ "weight": 63, "family": "Noto Sans" }, + "huge": { + "size": 1.8, + "weight": 50, + "family": "Noto Sans" + }, "medium": { "size": 1.16, "weight": 40,