diff --git a/resources/qml/Account/GeneralOperations.qml b/resources/qml/Account/GeneralOperations.qml
index 9562f940a4..c78e9ad828 100644
--- a/resources/qml/Account/GeneralOperations.qml
+++ b/resources/qml/Account/GeneralOperations.qml
@@ -11,35 +11,26 @@ Column
{
spacing: UM.Theme.getSize("default_margin").width
padding: UM.Theme.getSize("default_margin").width
- Image
- {
- id: machinesImage
- anchors.horizontalCenter: parent.horizontalCenter
- source: UM.Theme.getIcon("sign_in_to_cloud")
- horizontalAlignment: Image.AlignHCenter
- verticalAlignment: Image.AlignVCenter
- }
Label
{
id: title
anchors.horizontalCenter: parent.horizontalCenter
- horizontalAlignment: Text.AlignHCenter
renderType: Text.NativeRendering
- text: "Ultimaker Account"
+ text: catalog.i18nc("@label", "Sign in to the Ultimaker platform")
font: UM.Theme.getFont("large_bold")
color: UM.Theme.getColor("text")
}
- Label
+ Image
{
- id: generalInformation
+ id: machinesImage
anchors.horizontalCenter: parent.horizontalCenter
- horizontalAlignment: Text.AlignHCenter
- renderType: Text.NativeRendering
- text: catalog.i18nc("@label", "Your key to connected 3D printing")
- font: UM.Theme.getFont("default_bold")
- color: UM.Theme.getColor("text")
+ source: UM.Theme.getImage("welcome_cura")
+ width: parent.width / 2
+ fillMode: Image.PreserveAspectFit
+ horizontalAlignment: Image.AlignHCenter
+ verticalAlignment: Image.AlignVCenter
}
Label
@@ -48,18 +39,12 @@ Column
anchors.horizontalCenter: parent.horizontalCenter
horizontalAlignment: Text.AlignLeft
renderType: Text.NativeRendering
- text: catalog.i18nc("@text", "- Customize your experience with more print profiles and plugins\n- Stay flexible by syncing your setup and loading it anywhere\n- Increase efficiency with a remote workflow on Ultimaker printers")
+ text: catalog.i18nc("@text", "- Add material profiles and plug-ins from the Marketplace\n- Back-up and sync your material profiles and plug-ins\n- Share ideas and get help from 48,000+ users in the Ultimaker community")
lineHeight: 1.4
font: UM.Theme.getFont("default")
color: UM.Theme.getColor("text")
}
- // placeholder
- Label
- {
- text: " "
- }
-
Cura.PrimaryButton
{
anchors.horizontalCenter: parent.horizontalCenter
@@ -70,13 +55,11 @@ Column
fixedWidthMode: true
}
- Cura.SecondaryButton
+ Cura.TertiaryButton
{
anchors.horizontalCenter: parent.horizontalCenter
- width: UM.Theme.getSize("account_button").width
height: UM.Theme.getSize("account_button").height
- text: catalog.i18nc("@button", "Create account")
+ text: catalog.i18nc("@button", "Create a free Ultimaker account")
onClicked: Qt.openUrlExternally(CuraApplication.ultimakerCloudAccountRootUrl + "/app/create")
- fixedWidthMode: true
}
-}
\ No newline at end of file
+}
diff --git a/resources/qml/WelcomePages/WelcomeContent.qml b/resources/qml/WelcomePages/WelcomeContent.qml
index 45a0bf4a7c..619780435d 100644
--- a/resources/qml/WelcomePages/WelcomeContent.qml
+++ b/resources/qml/WelcomePages/WelcomeContent.qml
@@ -34,7 +34,7 @@ Item
{
id: curaImage
anchors.horizontalCenter: parent.horizontalCenter
- source: UM.Theme.getImage("first_run_welcome_cura")
+ source: UM.Theme.getImage("welcome_cura")
fillMode: Image.PreserveAspectFit
width: UM.Theme.getSize("welcome_wizard_content_image_big").width
sourceSize.width: width
diff --git a/resources/themes/cura-light/icons/sign_in_to_cloud.svg b/resources/themes/cura-light/icons/sign_in_to_cloud.svg
deleted file mode 100644
index 27471fddce..0000000000
--- a/resources/themes/cura-light/icons/sign_in_to_cloud.svg
+++ /dev/null
@@ -1,16 +0,0 @@
-
-
\ No newline at end of file
diff --git a/resources/themes/cura-light/images/first_run_welcome_cura.svg b/resources/themes/cura-light/images/first_run_welcome_cura.svg
deleted file mode 100644
index 3d957884b4..0000000000
--- a/resources/themes/cura-light/images/first_run_welcome_cura.svg
+++ /dev/null
@@ -1,17 +0,0 @@
-
diff --git a/resources/themes/cura-light/images/welcome_cura.svg b/resources/themes/cura-light/images/welcome_cura.svg
new file mode 100644
index 0000000000..33816dbd18
--- /dev/null
+++ b/resources/themes/cura-light/images/welcome_cura.svg
@@ -0,0 +1,14 @@
+