3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-16 03:07:53 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Fix font size for the titles in the welcome flow

Browse source 
CURA-6057
This commit is contained in:
Jaime van Kessel 2019-04-01 14:10:09 +02:00
parent 1b8b5415f7
commit 7a3cd81e3f
8 changed files with 14 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

2
resources/qml/WelcomePages/AddNetworkOrLocalPrinterContent.qml
View file

@ -23,7 +23,7 @@ Item
horizontalAlignment: Text.AlignHCenter horizontalAlignment: Text.AlignHCenter
text: catalog.i18nc("@label", "Add a printer") text: catalog.i18nc("@label", "Add a printer")
color: UM.Theme.getColor("primary_button") color: UM.Theme.getColor("primary_button")
font: UM.Theme.getFont("large_bold") font: UM.Theme.getFont("huge")
renderType: Text.NativeRendering renderType: Text.NativeRendering
} }

9
resources/qml/WelcomePages/AddPrinterByIpContent.qml
View file

@ -29,12 +29,11 @@ Item
{ {
id: titleLabel id: titleLabel
anchors.top: parent.top anchors.top: parent.top
anchors.topMargin: UM.Theme.getSize("wide_margin").height
anchors.horizontalCenter: parent.horizontalCenter anchors.horizontalCenter: parent.horizontalCenter
horizontalAlignment: Text.AlignHCenter horizontalAlignment: Text.AlignHCenter
text: catalog.i18nc("@label", "Add printer by IP address") text: catalog.i18nc("@label", "Add printer by IP address")
color: UM.Theme.getColor("primary_button") color: UM.Theme.getColor("primary_button")
font: UM.Theme.getFont("large_bold") font: UM.Theme.getFont("huge")
renderType: Text.NativeRendering renderType: Text.NativeRendering
} }
@ -44,8 +43,8 @@ Item
anchors.bottom: connectButton.top anchors.bottom: connectButton.top
anchors.topMargin: UM.Theme.getSize("default_margin").height anchors.topMargin: UM.Theme.getSize("default_margin").height
anchors.bottomMargin: UM.Theme.getSize("default_margin").height anchors.bottomMargin: UM.Theme.getSize("default_margin").height
anchors.horizontalCenter: parent.horizontalCenter anchors.left: parent.left
width: Math.floor(parent.width * 3 / 4) anchors.right: parent.right
Item Item
{ {
@ -241,7 +240,6 @@ Item
id: backButton id: backButton
anchors.left: parent.left anchors.left: parent.left
anchors.bottom: parent.bottom anchors.bottom: parent.bottom
anchors.margins: UM.Theme.getSize("wide_margin").width
text: catalog.i18nc("@button", "Cancel") text: catalog.i18nc("@button", "Cancel")
onClicked: base.showPreviousPage() onClicked: base.showPreviousPage()
} }
@ -251,7 +249,6 @@ Item
id: connectButton id: connectButton
anchors.right: parent.right anchors.right: parent.right
anchors.bottom: parent.bottom anchors.bottom: parent.bottom
anchors.margins: UM.Theme.getSize("wide_margin").width
text: catalog.i18nc("@button", "Connect") text: catalog.i18nc("@button", "Connect")
onClicked: onClicked:
{ {

2
resources/qml/WelcomePages/DataCollectionsContent.qml
View file

@ -23,7 +23,7 @@ Item
horizontalAlignment: Text.AlignHCenter horizontalAlignment: Text.AlignHCenter
text: catalog.i18nc("@label", "Help us to improve Ultimaker Cura") text: catalog.i18nc("@label", "Help us to improve Ultimaker Cura")
color: UM.Theme.getColor("primary_button") color: UM.Theme.getColor("primary_button")
font: UM.Theme.getFont("large_bold") font: UM.Theme.getFont("huge")
renderType: Text.NativeRendering renderType: Text.NativeRendering
} }

2
resources/qml/WelcomePages/FirstStartMachineActionsContent.qml
View file

@ -44,7 +44,7 @@ Item
horizontalAlignment: Text.AlignHCenter horizontalAlignment: Text.AlignHCenter
text: machineActionsModel.currentItem.title == undefined ? "" : machineActionsModel.currentItem.title text: machineActionsModel.currentItem.title == undefined ? "" : machineActionsModel.currentItem.title
color: UM.Theme.getColor("primary_button") color: UM.Theme.getColor("primary_button")
font: UM.Theme.getFont("large_bold") font: UM.Theme.getFont("huge")
renderType: Text.NativeRendering renderType: Text.NativeRendering
} }

2
resources/qml/WelcomePages/UserAgreementContent.qml
View file

@ -22,7 +22,7 @@ Item
horizontalAlignment: Text.AlignHCenter horizontalAlignment: Text.AlignHCenter
text: catalog.i18nc("@label", "User Agreement") text: catalog.i18nc("@label", "User Agreement")
color: UM.Theme.getColor("primary_button") color: UM.Theme.getColor("primary_button")
font: UM.Theme.getFont("large_bold") font: UM.Theme.getFont("huge")
renderType: Text.NativeRendering renderType: Text.NativeRendering
} }

2
resources/qml/WelcomePages/WelcomeContent.qml
View file

@ -28,7 +28,7 @@ Item
horizontalAlignment: Text.AlignHCenter horizontalAlignment: Text.AlignHCenter
text: catalog.i18nc("@label", "Welcome to Ultimaker Cura") text: catalog.i18nc("@label", "Welcome to Ultimaker Cura")
color: UM.Theme.getColor("primary_button") color: UM.Theme.getColor("primary_button")
font: UM.Theme.getFont("large_bold") font: UM.Theme.getFont("huge")
renderType: Text.NativeRendering renderType: Text.NativeRendering
} }

2
resources/qml/WelcomePages/WhatsNewContent.qml
View file

@ -23,7 +23,7 @@ Item
horizontalAlignment: Text.AlignHCenter horizontalAlignment: Text.AlignHCenter
text: catalog.i18nc("@label", "What's new in Ultimaker Cura") text: catalog.i18nc("@label", "What's new in Ultimaker Cura")
color: UM.Theme.getColor("primary_button") color: UM.Theme.getColor("primary_button")
font: UM.Theme.getFont("large_bold") font: UM.Theme.getFont("huge")
renderType: Text.NativeRendering renderType: Text.NativeRendering
} }

5
resources/themes/cura-light/theme.json
View file

@ -29,6 +29,11 @@
"weight": 63, "weight": 63,
"family": "Noto Sans" "family": "Noto Sans"
}, },
"huge": {
"size": 1.8,
"weight": 50,
"family": "Noto Sans"
},
"medium": { "medium": {
"size": 1.16, "size": 1.16,
"weight": 40, "weight": 40,