From 1f402569ad2ee5f8f4add72b9e79d538df134e81 Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Thu, 11 Jun 2020 16:51:42 +0200 Subject: [PATCH] Move properties into account details itself There isn't really a point to setting them from when the object is created... CURA-7418 --- resources/qml/Account/AccountDetails.qml | 7 ++++--- resources/qml/Account/AccountWidget.qml | 7 +------ 2 files changed, 5 insertions(+), 9 deletions(-) diff --git a/resources/qml/Account/AccountDetails.qml b/resources/qml/Account/AccountDetails.qml index 265842e2b4..e81fdb1fb2 100644 --- a/resources/qml/Account/AccountDetails.qml +++ b/resources/qml/Account/AccountDetails.qml @@ -9,9 +9,10 @@ import Cura 1.1 as Cura Column { - property var profile: null - property var loggedIn: false - property var profileImage: "" + property var profile: Cura.API.account.userProfile + property bool loggedIn: Cura.API.account.isLoggedIn + property var profileImage: Cura.API.account.profileImageUrl + padding: UM.Theme.getSize("wide_margin").height spacing: UM.Theme.getSize("wide_margin").height diff --git a/resources/qml/Account/AccountWidget.qml b/resources/qml/Account/AccountWidget.qml index eed711e745..8c4d4c91e8 100644 --- a/resources/qml/Account/AccountWidget.qml +++ b/resources/qml/Account/AccountWidget.qml @@ -133,12 +133,7 @@ Item Behavior on opacity { NumberAnimation { duration: 100 } } contentItem: AccountDetails - { - id: panel - profile: Cura.API.account.userProfile - loggedIn: Cura.API.account.isLoggedIn - profileImage: Cura.API.account.profileImageUrl - } + {} background: UM.PointingRectangle {