mirror of
https://github.com/Ultimaker/Cura.git
synced 2025-07-11 00:37:50 -06:00
Add welcome_pages_default_margin
This commit is contained in:
parent
090e176969
commit
92dea8a52f
7 changed files with 16 additions and 14 deletions
|
@ -19,7 +19,7 @@ Item
|
||||||
{
|
{
|
||||||
id: titleLabel
|
id: titleLabel
|
||||||
anchors.top: parent.top
|
anchors.top: parent.top
|
||||||
anchors.topMargin: 40
|
anchors.topMargin: UM.Theme.getSize("welcome_pages_default_margin").height
|
||||||
anchors.horizontalCenter: parent.horizontalCenter
|
anchors.horizontalCenter: parent.horizontalCenter
|
||||||
horizontalAlignment: Text.AlignHCenter
|
horizontalAlignment: Text.AlignHCenter
|
||||||
text: catalog.i18nc("@label", "Add a printer")
|
text: catalog.i18nc("@label", "Add a printer")
|
||||||
|
@ -110,7 +110,7 @@ Item
|
||||||
id: nextButton
|
id: nextButton
|
||||||
anchors.right: parent.right
|
anchors.right: parent.right
|
||||||
anchors.bottom: parent.bottom
|
anchors.bottom: parent.bottom
|
||||||
anchors.margins: 40
|
anchors.margins: UM.Theme.getSize("welcome_pages_default_margin").width
|
||||||
enabled:
|
enabled:
|
||||||
{
|
{
|
||||||
// If the network printer dropdown is expanded, make sure that there is a selected item
|
// If the network printer dropdown is expanded, make sure that there is a selected item
|
||||||
|
|
|
@ -27,7 +27,7 @@ Item
|
||||||
{
|
{
|
||||||
id: titleLabel
|
id: titleLabel
|
||||||
anchors.top: parent.top
|
anchors.top: parent.top
|
||||||
anchors.topMargin: UM.Theme.getSize("default_margin").height
|
anchors.topMargin: UM.Theme.getSize("welcome_pages_default_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")
|
||||||
|
@ -200,7 +200,7 @@ 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("default_margin").width
|
anchors.margins: UM.Theme.getSize("welcome_pages_default_margin").width
|
||||||
text: catalog.i18nc("@button", "Cancel")
|
text: catalog.i18nc("@button", "Cancel")
|
||||||
width: UM.Theme.getSize("action_button").width
|
width: UM.Theme.getSize("action_button").width
|
||||||
fixedWidthMode: true
|
fixedWidthMode: true
|
||||||
|
@ -212,7 +212,7 @@ 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("default_margin").width
|
anchors.margins: UM.Theme.getSize("welcome_pages_default_margin").width
|
||||||
text: catalog.i18nc("@button", "Connect")
|
text: catalog.i18nc("@button", "Connect")
|
||||||
width: UM.Theme.getSize("action_button").width
|
width: UM.Theme.getSize("action_button").width
|
||||||
fixedWidthMode: true
|
fixedWidthMode: true
|
||||||
|
|
|
@ -19,7 +19,7 @@ Item
|
||||||
{
|
{
|
||||||
id: titleLabel
|
id: titleLabel
|
||||||
anchors.top: parent.top
|
anchors.top: parent.top
|
||||||
anchors.topMargin: 40
|
anchors.topMargin: UM.Theme.getSize("welcome_pages_default_margin").height
|
||||||
anchors.horizontalCenter: parent.horizontalCenter
|
anchors.horizontalCenter: parent.horizontalCenter
|
||||||
horizontalAlignment: Text.AlignHCenter
|
horizontalAlignment: Text.AlignHCenter
|
||||||
text: catalog.i18nc("@label", "Ultimaker Cloud")
|
text: catalog.i18nc("@label", "Ultimaker Cloud")
|
||||||
|
@ -101,7 +101,7 @@ Item
|
||||||
id: finishButton
|
id: finishButton
|
||||||
anchors.right: parent.right
|
anchors.right: parent.right
|
||||||
anchors.bottom: parent.bottom
|
anchors.bottom: parent.bottom
|
||||||
anchors.margins: 40
|
anchors.margins: UM.Theme.getSize("welcome_pages_default_margin").width
|
||||||
text: catalog.i18nc("@button", "Finish")
|
text: catalog.i18nc("@button", "Finish")
|
||||||
width: 140
|
width: 140
|
||||||
fixedWidthMode: true
|
fixedWidthMode: true
|
||||||
|
@ -113,7 +113,7 @@ Item
|
||||||
id: createAccountButton
|
id: createAccountButton
|
||||||
anchors.left: parent.left
|
anchors.left: parent.left
|
||||||
anchors.verticalCenter: finishButton.verticalCenter
|
anchors.verticalCenter: finishButton.verticalCenter
|
||||||
anchors.margins: 40
|
anchors.margins: UM.Theme.getSize("welcome_pages_default_margin").width
|
||||||
text: catalog.i18nc("@button", "Create an account")
|
text: catalog.i18nc("@button", "Create an account")
|
||||||
width: 140
|
width: 140
|
||||||
fixedWidthMode: true
|
fixedWidthMode: true
|
||||||
|
|
|
@ -19,7 +19,7 @@ Item
|
||||||
{
|
{
|
||||||
id: titleLabel
|
id: titleLabel
|
||||||
anchors.top: parent.top
|
anchors.top: parent.top
|
||||||
anchors.topMargin: 40
|
anchors.topMargin: UM.Theme.getSize("welcome_pages_default_margin").height
|
||||||
anchors.horizontalCenter: parent.horizontalCenter
|
anchors.horizontalCenter: parent.horizontalCenter
|
||||||
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")
|
||||||
|
@ -60,7 +60,7 @@ Item
|
||||||
id: getStartedButton
|
id: getStartedButton
|
||||||
anchors.right: parent.right
|
anchors.right: parent.right
|
||||||
anchors.bottom: parent.bottom
|
anchors.bottom: parent.bottom
|
||||||
anchors.margins: 40
|
anchors.margins: UM.Theme.getSize("welcome_pages_default_margin").width
|
||||||
text: catalog.i18nc("@button", "Next")
|
text: catalog.i18nc("@button", "Next")
|
||||||
width: 140
|
width: 140
|
||||||
fixedWidthMode: true
|
fixedWidthMode: true
|
||||||
|
|
|
@ -58,7 +58,7 @@ Item
|
||||||
id: agreeButton
|
id: agreeButton
|
||||||
anchors.right: parent.right
|
anchors.right: parent.right
|
||||||
anchors.bottom: parent.bottom
|
anchors.bottom: parent.bottom
|
||||||
anchors.margins: 40
|
anchors.margins: UM.Theme.getSize("welcome_pages_default_margin").width
|
||||||
text: catalog.i18nc("@button", "Agree")
|
text: catalog.i18nc("@button", "Agree")
|
||||||
width: 140
|
width: 140
|
||||||
fixedWidthMode: true
|
fixedWidthMode: true
|
||||||
|
@ -75,7 +75,7 @@ Item
|
||||||
id: declineButton
|
id: declineButton
|
||||||
anchors.left: parent.left
|
anchors.left: parent.left
|
||||||
anchors.bottom: parent.bottom
|
anchors.bottom: parent.bottom
|
||||||
anchors.margins: 40
|
anchors.margins: UM.Theme.getSize("welcome_pages_default_margin").width
|
||||||
text: catalog.i18nc("@button", "Decline and close")
|
text: catalog.i18nc("@button", "Decline and close")
|
||||||
width: 140
|
width: 140
|
||||||
fixedWidthMode: true
|
fixedWidthMode: true
|
||||||
|
|
|
@ -19,7 +19,7 @@ Item
|
||||||
{
|
{
|
||||||
id: titleLabel
|
id: titleLabel
|
||||||
anchors.top: parent.top
|
anchors.top: parent.top
|
||||||
anchors.topMargin: 40
|
anchors.topMargin: UM.Theme.getSize("welcome_pages_default_margin").height
|
||||||
anchors.horizontalCenter: parent.horizontalCenter
|
anchors.horizontalCenter: parent.horizontalCenter
|
||||||
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")
|
||||||
|
@ -76,7 +76,7 @@ Item
|
||||||
id: getStartedButton
|
id: getStartedButton
|
||||||
anchors.right: parent.right
|
anchors.right: parent.right
|
||||||
anchors.bottom: parent.bottom
|
anchors.bottom: parent.bottom
|
||||||
anchors.margins: 40
|
anchors.margins: UM.Theme.getSize("welcome_pages_default_margin").width
|
||||||
text: catalog.i18nc("@button", "Next")
|
text: catalog.i18nc("@button", "Next")
|
||||||
width: 140
|
width: 140
|
||||||
fixedWidthMode: true
|
fixedWidthMode: true
|
||||||
|
|
|
@ -507,6 +507,8 @@
|
||||||
"button_icon": [2.5, 2.5],
|
"button_icon": [2.5, 2.5],
|
||||||
"button_lining": [0, 0],
|
"button_lining": [0, 0],
|
||||||
|
|
||||||
|
"welcome_pages_default_margin": [2.5, 2.5],
|
||||||
|
|
||||||
"action_button": [15.0, 2.5],
|
"action_button": [15.0, 2.5],
|
||||||
"action_button_icon": [1.0, 1.0],
|
"action_button_icon": [1.0, 1.0],
|
||||||
"action_button_radius": [0.15, 0.15],
|
"action_button_radius": [0.15, 0.15],
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue