diff --git a/resources/qml/Account/AccountDetails.qml b/resources/qml/Account/AccountDetails.qml index 45f822e41f..265842e2b4 100644 --- a/resources/qml/Account/AccountDetails.qml +++ b/resources/qml/Account/AccountDetails.qml @@ -1,8 +1,8 @@ // Copyright (c) 2018 Ultimaker B.V. // Cura is released under the terms of the LGPLv3 or higher. -import QtQuick 2.7 -import QtQuick.Controls 2.1 +import QtQuick 2.10 +import QtQuick.Controls 2.3 import UM 1.4 as UM import Cura 1.1 as Cura @@ -16,38 +16,6 @@ Column padding: UM.Theme.getSize("wide_margin").height spacing: UM.Theme.getSize("wide_margin").height - AvatarImage - { - id: avatar - width: UM.Theme.getSize("avatar_image").width - height: UM.Theme.getSize("avatar_image").height - anchors.horizontalCenter: parent.horizontalCenter - source: - { - if(loggedIn) - { - if(profileImage) - { - return profileImage - } - return UM.Theme.getImage("avatar_no_user") - } - return UM.Theme.getImage("avatar_no_user") - } - outlineColor: loggedIn ? UM.Theme.getColor("account_widget_outline_active") : UM.Theme.getColor("lining") - } - - Label - { - id: information - anchors.horizontalCenter: parent.horizontalCenter - horizontalAlignment: Text.AlignHCenter - renderType: Text.NativeRendering - text: loggedIn ? profile["username"] : catalog.i18nc("@label", "Please log in or create an account to\nenjoy all features of Ultimaker Cura.") - font: loggedIn ? UM.Theme.getFont("large_bold") : UM.Theme.getFont("default") - color: UM.Theme.getColor("text") - } - Loader { id: accountOperations diff --git a/resources/qml/Account/GeneralOperations.qml b/resources/qml/Account/GeneralOperations.qml index 666a254cd1..73b8f0b9bc 100644 --- a/resources/qml/Account/GeneralOperations.qml +++ b/resources/qml/Account/GeneralOperations.qml @@ -1,31 +1,87 @@ // Copyright (c) 2018 Ultimaker B.V. // Cura is released under the terms of the LGPLv3 or higher. -import QtQuick 2.2 -import QtQuick.Controls 1.1 +import QtQuick 2.10 +import QtQuick.Controls 2.3 import UM 1.4 as UM import Cura 1.1 as Cura -Row +Column { spacing: 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: catalog.i18nc("@label", "Ultimaker Cloud") + font: UM.Theme.getFont("large_bold") + color: UM.Theme.getColor("text") + } + + Label + { + id: generalInformation + anchors.horizontalCenter: parent.horizontalCenter + horizontalAlignment: Text.AlignHCenter + renderType: Text.NativeRendering + text: catalog.i18nc("@label", "Enjoy a more powerful 3D printing experience.") + font: UM.Theme.getFont("default") + color: UM.Theme.getColor("text") + } + + Label + { + id: generalInformationPoints + anchors.horizontalCenter: parent.horizontalCenter + horizontalAlignment: Text.AlignLeft + renderType: Text.NativeRendering + text: { + var t = " - Send prints to your Ultimaker printer from anywhere\n" + + " - Access your Ultimaker Cura Settings worldwide\n" + + " - Enhance your workflow with advanced material profiles" + return catalog.i18nc("@label", t) + } + lineHeight: 1.4 + font: UM.Theme.getFont("default") + color: UM.Theme.getColor("text") + } + + // placeholder + Label + { + text: " " + } + + Cura.PrimaryButton + { + anchors.horizontalCenter: parent.horizontalCenter + width: UM.Theme.getSize("account_button").width + height: UM.Theme.getSize("account_button").height + text: catalog.i18nc("@button", "Sign in") + onClicked: Cura.API.account.login() + fixedWidthMode: true + } + Cura.SecondaryButton { + anchors.horizontalCenter: parent.horizontalCenter width: UM.Theme.getSize("account_button").width height: UM.Theme.getSize("account_button").height text: catalog.i18nc("@button", "Create account") onClicked: Qt.openUrlExternally(CuraApplication.ultimakerCloudAccountRootUrl + "/app/create") fixedWidthMode: true } - - Cura.PrimaryButton - { - width: UM.Theme.getSize("account_button").width - height: UM.Theme.getSize("account_button").height - text: catalog.i18nc("@button", "Login") - onClicked: Cura.API.account.login() - fixedWidthMode: true - } } \ No newline at end of file diff --git a/resources/themes/cura-light/icons/sign_in_to_cloud.svg b/resources/themes/cura-light/icons/sign_in_to_cloud.svg new file mode 100644 index 0000000000..75abb176c2 --- /dev/null +++ b/resources/themes/cura-light/icons/sign_in_to_cloud.svg @@ -0,0 +1,36 @@ + + + + Group-cloud + Created with Sketch. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/resources/themes/cura-light/theme.json b/resources/themes/cura-light/theme.json index a54b63b4c9..3d3bbba0a8 100644 --- a/resources/themes/cura-light/theme.json +++ b/resources/themes/cura-light/theme.json @@ -445,7 +445,7 @@ "stage_menu": [0.0, 4.0], - "account_button": [12, 3], + "account_button": [12, 2.5], "print_setup_widget": [38.0, 30.0], "print_setup_mode_toggle": [0.0, 2.0],