GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-08-14 03:55:56 +08:00
Code Issues Packages Projects Releases Wiki Activity

Remove welcome_pages_default_margin theme entry

Browse Source 
Use the wide margin instead. It's practically the same, nobody is going to notice. It still looks spacey and nice, and it's more consistent with the rest of the interface.
We had previously agreed that we will not make any new widget-specific theme entries any more.

Contributes to issue CURA-6057.
This commit is contained in:
Ghostkeeper 2019-03-29 13:36:05 +01:00
parent 129c1ab3d4
commit 5028290e0d
No known key found for this signature in database
GPG Key ID: 86BEF881AE2CF276
9 changed files with 27 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
resources/qml/WelcomePages/AddNetworkOrLocalPrinterContent.qml
View File

@ -19,7 +19,7 @@ Item
{ {
id: titleLabel id: titleLabel
anchors.top: parent.top anchors.top: parent.top
anchors.topMargin: UM.Theme.getSize("welcome_pages_default_margin").height 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 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: UM.Theme.getSize("welcome_pages_default_margin").width anchors.margins: UM.Theme.getSize("wide_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

6
resources/qml/WelcomePages/AddPrinterByIpContent.qml
View File

@ -29,7 +29,7 @@ Item
{ {
id: titleLabel id: titleLabel
anchors.top: parent.top anchors.top: parent.top
anchors.topMargin: UM.Theme.getSize("welcome_pages_default_margin").height 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")
@ -241,7 +241,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("welcome_pages_default_margin").width 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 +251,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("welcome_pages_default_margin").width anchors.margins: UM.Theme.getSize("wide_margin").width
text: catalog.i18nc("@button", "Connect") text: catalog.i18nc("@button", "Connect")
onClicked: onClicked:
{ {

8
resources/qml/WelcomePages/CloudContent.qml
View File

@ -19,7 +19,7 @@ Item
{ {
id: titleLabel id: titleLabel
anchors.top: parent.top anchors.top: parent.top
anchors.topMargin: UM.Theme.getSize("welcome_pages_default_margin").height 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", "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: UM.Theme.getSize("welcome_pages_default_margin").width anchors.margins: UM.Theme.getSize("wide_margin").width
text: catalog.i18nc("@button", "Finish") text: catalog.i18nc("@button", "Finish")
onClicked: base.showNextPage() onClicked: base.showNextPage()
} }
@ -111,7 +111,7 @@ Item
id: createAccountButton id: createAccountButton
anchors.left: parent.left anchors.left: parent.left
anchors.verticalCenter: finishButton.verticalCenter anchors.verticalCenter: finishButton.verticalCenter
anchors.margins: UM.Theme.getSize("welcome_pages_default_margin").width anchors.margins: UM.Theme.getSize("wide_margin").width
text: catalog.i18nc("@button", "Create an account") text: catalog.i18nc("@button", "Create an account")
onClicked: Qt.openUrlExternally(CuraApplication.ultimakerCloudAccountRootUrl + "/app/create") onClicked: Qt.openUrlExternally(CuraApplication.ultimakerCloudAccountRootUrl + "/app/create")
} }
@ -121,7 +121,7 @@ Item
id: signInButton id: signInButton
anchors.left: createAccountButton.right anchors.left: createAccountButton.right
anchors.verticalCenter: finishButton.verticalCenter anchors.verticalCenter: finishButton.verticalCenter
anchors.margins: UM.Theme.getSize("welcome_pages_default_margin").width anchors.margins: UM.Theme.getSize("wide_margin").width
text: catalog.i18nc("@button", "Sign in") text: catalog.i18nc("@button", "Sign in")
color: UM.Theme.getColor("secondary_button_text") color: UM.Theme.getColor("secondary_button_text")
font: UM.Theme.getFont("medium") font: UM.Theme.getFont("medium")

8
resources/qml/WelcomePages/DataCollectionsContent.qml
View File

@ -19,7 +19,7 @@ Item
{ {
id: titleLabel id: titleLabel
anchors.top: parent.top anchors.top: parent.top
anchors.topMargin: UM.Theme.getSize("welcome_pages_default_margin").height 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", "Help us to improve Ultimaker Cura") text: catalog.i18nc("@label", "Help us to improve Ultimaker Cura")
@ -36,14 +36,14 @@ Item
anchors.bottom: getStartedButton.top anchors.bottom: getStartedButton.top
anchors.left: parent.left anchors.left: parent.left
anchors.right: parent.right anchors.right: parent.right
anchors.margins: UM.Theme.getSize("welcome_pages_default_margin").width anchors.margins: UM.Theme.getSize("wide_margin").width
Column Column
{ {
anchors.centerIn: parent anchors.centerIn: parent
width: parent.width width: parent.width
spacing: UM.Theme.getSize("welcome_pages_default_margin").height spacing: UM.Theme.getSize("wide_margin").height
Image Image
{ {
@ -87,7 +87,7 @@ Item
id: getStartedButton id: getStartedButton
anchors.right: parent.right anchors.right: parent.right
anchors.bottom: parent.bottom anchors.bottom: parent.bottom
anchors.margins: UM.Theme.getSize("welcome_pages_default_margin").width anchors.margins: UM.Theme.getSize("wide_margin").width
text: catalog.i18nc("@button", "Next") text: catalog.i18nc("@button", "Next")
onClicked: base.showNextPage() onClicked: base.showNextPage()
} }

4
resources/qml/WelcomePages/FirstStartMachineActionsContent.qml
View File

@ -40,7 +40,7 @@ Item
{ {
id: titleLabel id: titleLabel
anchors.top: parent.top anchors.top: parent.top
anchors.topMargin: UM.Theme.getSize("welcome_pages_default_margin").height anchors.topMargin: UM.Theme.getSize("wide_margin").height
anchors.horizontalCenter: parent.horizontalCenter anchors.horizontalCenter: parent.horizontalCenter
horizontalAlignment: Text.AlignHCenter horizontalAlignment: Text.AlignHCenter
text: machineActionsModel.currentItem.title == undefined ? "" : machineActionsModel.currentItem.title text: machineActionsModel.currentItem.title == undefined ? "" : machineActionsModel.currentItem.title
@ -71,7 +71,7 @@ Item
id: nextButton id: nextButton
anchors.right: parent.right anchors.right: parent.right
anchors.bottom: parent.bottom anchors.bottom: parent.bottom
anchors.margins: UM.Theme.getSize("welcome_pages_default_margin").width anchors.margins: UM.Theme.getSize("wide_margin").width
text: catalog.i18nc("@button", "Next") text: catalog.i18nc("@button", "Next")
onClicked: machineActionsModel.goToNextAction() onClicked: machineActionsModel.goToNextAction()
} }

10
resources/qml/WelcomePages/UserAgreementContent.qml
View File

@ -18,7 +18,7 @@ Item
{ {
id: titleLabel id: titleLabel
anchors.top: parent.top anchors.top: parent.top
anchors.topMargin: UM.Theme.getSize("welcome_pages_default_margin").height 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", "User Agreement") text: catalog.i18nc("@label", "User Agreement")
@ -33,13 +33,13 @@ Item
anchors.bottom: agreeButton.top anchors.bottom: agreeButton.top
anchors.left: parent.left anchors.left: parent.left
anchors.right: parent.right anchors.right: parent.right
anchors.margins: UM.Theme.getSize("welcome_pages_default_margin").width anchors.margins: UM.Theme.getSize("wide_margin").width
Label Label
{ {
id: disclaimerLineLabel id: disclaimerLineLabel
anchors.centerIn: parent anchors.centerIn: parent
anchors.margins: UM.Theme.getSize("welcome_pages_default_margin").width anchors.margins: UM.Theme.getSize("wide_margin").width
width: (parent.width * 2 / 3) | 0 width: (parent.width * 2 / 3) | 0
@ -59,7 +59,7 @@ Item
id: agreeButton id: agreeButton
anchors.right: parent.right anchors.right: parent.right
anchors.bottom: parent.bottom anchors.bottom: parent.bottom
anchors.margins: UM.Theme.getSize("welcome_pages_default_margin").width anchors.margins: UM.Theme.getSize("wide_margin").width
text: catalog.i18nc("@button", "Agree") text: catalog.i18nc("@button", "Agree")
onClicked: onClicked:
{ {
@ -74,7 +74,7 @@ Item
id: declineButton id: declineButton
anchors.left: parent.left anchors.left: parent.left
anchors.bottom: parent.bottom anchors.bottom: parent.bottom
anchors.margins: UM.Theme.getSize("welcome_pages_default_margin").width anchors.margins: UM.Theme.getSize("wide_margin").width
text: catalog.i18nc("@button", "Decline and close") text: catalog.i18nc("@button", "Decline and close")
onClicked: onClicked:
{ {

6
resources/qml/WelcomePages/WelcomeContent.qml
View File

@ -15,13 +15,13 @@ Item
{ {
UM.I18nCatalog { id: catalog; name: "cura" } UM.I18nCatalog { id: catalog; name: "cura" }
anchors.margins: UM.Theme.getSize("welcome_pages_default_margin").width anchors.margins: UM.Theme.getSize("wide_margin").width
Column // Arrange the items vertically and put everything in the center Column // Arrange the items vertically and put everything in the center
{ {
anchors.centerIn: parent anchors.centerIn: parent
width: parent.width width: parent.width
spacing: UM.Theme.getSize("welcome_pages_default_margin").height spacing: UM.Theme.getSize("wide_margin").height
Label Label
{ {
@ -55,7 +55,7 @@ Item
{ {
id: getStartedButton id: getStartedButton
anchors.horizontalCenter: parent.horizontalCenter anchors.horizontalCenter: parent.horizontalCenter
anchors.margins: UM.Theme.getSize("welcome_pages_default_margin").width anchors.margins: UM.Theme.getSize("wide_margin").width
text: catalog.i18nc("@button", "Get started") text: catalog.i18nc("@button", "Get started")
onClicked: base.showNextPage() onClicked: base.showNextPage()
} }

8
resources/qml/WelcomePages/WhatsNewContent.qml
View File

@ -19,7 +19,7 @@ Item
{ {
id: titleLabel id: titleLabel
anchors.top: parent.top anchors.top: parent.top
anchors.topMargin: UM.Theme.getSize("welcome_pages_default_margin").height 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", "What's new in Ultimaker Cura") text: catalog.i18nc("@label", "What's new in Ultimaker Cura")
@ -32,8 +32,8 @@ Item
{ {
anchors.top: titleLabel.bottom anchors.top: titleLabel.bottom
anchors.bottom: getStartedButton.top anchors.bottom: getStartedButton.top
anchors.topMargin: UM.Theme.getSize("welcome_pages_default_margin").height anchors.topMargin: UM.Theme.getSize("wide_margin").height
anchors.bottomMargin: UM.Theme.getSize("welcome_pages_default_margin").height anchors.bottomMargin: UM.Theme.getSize("wide_margin").height
anchors.horizontalCenter: parent.horizontalCenter anchors.horizontalCenter: parent.horizontalCenter
width: (parent.width * 3 / 4) | 0 width: (parent.width * 3 / 4) | 0
@ -65,7 +65,7 @@ Item
id: getStartedButton id: getStartedButton
anchors.right: parent.right anchors.right: parent.right
anchors.bottom: parent.bottom anchors.bottom: parent.bottom
anchors.margins: UM.Theme.getSize("welcome_pages_default_margin").width anchors.margins: UM.Theme.getSize("wide_margin").width
text: catalog.i18nc("@button", "Next") text: catalog.i18nc("@button", "Next")
onClicked: base.showNextPage() onClicked: base.showNextPage()
} }

2
resources/themes/cura-light/theme.json
View File

@ -509,8 +509,6 @@
"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],