3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-08-08 22:35:03 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

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
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
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
horizontalAlignment: Text.AlignHCenter
text: catalog.i18nc("@label", "Add a printer")
@ -110,7 +110,7 @@ Item
id: nextButton
anchors.right: parent.right
anchors.bottom: parent.bottom
anchors.margins: UM.Theme.getSize("welcome_pages_default_margin").width
anchors.margins: UM.Theme.getSize("wide_margin").width
enabled:
{
// 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
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
horizontalAlignment: Text.AlignHCenter
text: catalog.i18nc("@label", "Add printer by IP address")
@ -241,7 +241,7 @@ Item
id: backButton
anchors.left: parent.left
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")
onClicked: base.showPreviousPage()
}
@ -251,7 +251,7 @@ Item
id: connectButton
anchors.right: parent.right
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")
onClicked:
{

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

@ -19,7 +19,7 @@ Item
{
id: titleLabel
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
horizontalAlignment: Text.AlignHCenter
text: catalog.i18nc("@label", "Ultimaker Cloud")
@ -101,7 +101,7 @@ Item
id: finishButton
anchors.right: parent.right
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")
onClicked: base.showNextPage()
}
@ -111,7 +111,7 @@ Item
id: createAccountButton
anchors.left: parent.left
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")
onClicked: Qt.openUrlExternally(CuraApplication.ultimakerCloudAccountRootUrl + "/app/create")
}
@ -121,7 +121,7 @@ Item
id: signInButton
anchors.left: createAccountButton.right
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")
color: UM.Theme.getColor("secondary_button_text")
font: UM.Theme.getFont("medium")

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

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

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

@ -40,7 +40,7 @@ Item
{
id: titleLabel
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
horizontalAlignment: Text.AlignHCenter
text: machineActionsModel.currentItem.title == undefined ? "" : machineActionsModel.currentItem.title
@ -71,7 +71,7 @@ Item
id: nextButton
anchors.right: parent.right
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")
onClicked: machineActionsModel.goToNextAction()
}

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

@ -18,7 +18,7 @@ Item
{
id: titleLabel
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
horizontalAlignment: Text.AlignHCenter
text: catalog.i18nc("@label", "User Agreement")
@ -33,13 +33,13 @@ Item
anchors.bottom: agreeButton.top
anchors.left: parent.left
anchors.right: parent.right
anchors.margins: UM.Theme.getSize("welcome_pages_default_margin").width
anchors.margins: UM.Theme.getSize("wide_margin").width
Label
{
id: disclaimerLineLabel
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
@ -59,7 +59,7 @@ Item
id: agreeButton
anchors.right: parent.right
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")
onClicked:
{
@ -74,7 +74,7 @@ Item
id: declineButton
anchors.left: parent.left
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")
onClicked:
{

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

@ -15,13 +15,13 @@ Item
{
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
{
anchors.centerIn: parent
width: parent.width
spacing: UM.Theme.getSize("welcome_pages_default_margin").height
spacing: UM.Theme.getSize("wide_margin").height
Label
{
@ -55,7 +55,7 @@ Item
{
id: getStartedButton
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")
onClicked: base.showNextPage()
}

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

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