diff options
author | Christian Mollekopf <chrigi_1@fastmail.fm> | 2017-10-08 11:46:36 +0200 |
---|---|---|
committer | Christian Mollekopf <chrigi_1@fastmail.fm> | 2017-10-08 11:46:36 +0200 |
commit | 10394dc130f8117b54e0590f41aadff3ee1f9332 (patch) | |
tree | 53881dc3f2daa6e782e0af71786f0445d453625c /framework/qml/EditAccount.qml | |
parent | 7008aee88ef522af0277ca37667583e61d8fa445 (diff) | |
download | kube-10394dc130f8117b54e0590f41aadff3ee1f9332.tar.gz kube-10394dc130f8117b54e0590f41aadff3ee1f9332.zip |
Support reentering the password from the settings
Additionally this fixes the loader sizing to use the implicit size.
This means all settings pages need to set an implicit height.
Diffstat (limited to 'framework/qml/EditAccount.qml')
-rw-r--r-- | framework/qml/EditAccount.qml | 23 |
1 files changed, 8 insertions, 15 deletions
diff --git a/framework/qml/EditAccount.qml b/framework/qml/EditAccount.qml index 85df955b..df567e5a 100644 --- a/framework/qml/EditAccount.qml +++ b/framework/qml/EditAccount.qml | |||
@@ -59,36 +59,29 @@ Item { | |||
59 | wrapMode: Text.Wrap | 59 | wrapMode: Text.Wrap |
60 | } | 60 | } |
61 | 61 | ||
62 | Item { | 62 | Column { |
63 | id: accountEdit | ||
64 | anchors { | 63 | anchors { |
65 | top:subHeadline.bottom | 64 | top: subHeadline.bottom |
66 | left: parent.left | 65 | left: parent.left |
67 | right: parent.right | 66 | right: parent.right |
68 | bottom: footer.top | 67 | bottom: footer.top |
69 | topMargin: Kube.Units.largeSpacing * 2 | 68 | topMargin: Kube.Units.largeSpacing * 2 |
70 | } | 69 | } |
71 | 70 | spacing: Kube.Units.largeSpacing | |
72 | Loader { | 71 | Loader { |
73 | id: loader | 72 | id: loader |
74 | anchors { | 73 | anchors { |
75 | top: parent.top | ||
76 | left: parent.left | 74 | left: parent.left |
77 | right: parent.right | 75 | right: parent.right |
78 | } | 76 | } |
79 | //The initial size is somehow necessary so the loader is properly anchored | 77 | height: item ? item.implicitHeight : 0 |
80 | height: 10 | ||
81 | source: accountFactory.uiPath | 78 | source: accountFactory.uiPath |
82 | onLoaded: item.accountId = root.accountId | 79 | onLoaded: item.accountId = root.accountId |
83 | } | 80 | } |
84 | Item { | 81 | Kube.Button { |
85 | id: spacer | 82 | anchors.right: parent.right |
86 | anchors { | 83 | text: qsTr("Change Password") |
87 | top: loader.bottom | 84 | onClicked: Kube.Fabric.postMessage(Kube.Messages.requestLogin, {}) |
88 | left: parent.left | ||
89 | right: parent.right | ||
90 | bottom: parent.bottom | ||
91 | } | ||
92 | } | 85 | } |
93 | } | 86 | } |
94 | 87 | ||