diff options
author | Michael Bohlender <michael.bohlender@kdemail.net> | 2017-01-05 15:28:43 +0100 |
---|---|---|
committer | Michael Bohlender <michael.bohlender@kdemail.net> | 2017-01-05 15:28:43 +0100 |
commit | 2ea57b9a9c5db3fa340cb62d40a9732af31143e0 (patch) | |
tree | f4da2825c9610c51cd378c92fa8fc08d58864458 /components/package/contents/ui/AccountSwitcher.qml | |
parent | 5b521141a0576a6f12a8a1f990198a97a4d60aa6 (diff) | |
download | kube-2ea57b9a9c5db3fa340cb62d40a9732af31143e0.tar.gz kube-2ea57b9a9c5db3fa340cb62d40a9732af31143e0.zip |
adjust accountswitcher to accountsplugin, remove old newaccountdialog, enable accountwizard
Diffstat (limited to 'components/package/contents/ui/AccountSwitcher.qml')
-rw-r--r-- | components/package/contents/ui/AccountSwitcher.qml | 15 |
1 files changed, 4 insertions, 11 deletions
diff --git a/components/package/contents/ui/AccountSwitcher.qml b/components/package/contents/ui/AccountSwitcher.qml index 6c899c50..41b3478c 100644 --- a/components/package/contents/ui/AccountSwitcher.qml +++ b/components/package/contents/ui/AccountSwitcher.qml | |||
@@ -24,6 +24,7 @@ import QtQml 2.2 as QtQml | |||
24 | import org.kde.kirigami 1.0 as Kirigami | 24 | import org.kde.kirigami 1.0 as Kirigami |
25 | 25 | ||
26 | import org.kube.framework.domain 1.0 as KubeFramework | 26 | import org.kube.framework.domain 1.0 as KubeFramework |
27 | import org.kube.framework.accounts 1.0 as KubeAccounts | ||
27 | import org.kube.components 1.0 as KubeComponents | 28 | import org.kube.components 1.0 as KubeComponents |
28 | 29 | ||
29 | Controls2.Button { | 30 | Controls2.Button { |
@@ -81,17 +82,9 @@ Controls2.Button { | |||
81 | text: "Create new Account" | 82 | text: "Create new Account" |
82 | 83 | ||
83 | onClicked: { | 84 | onClicked: { |
84 | newAccountComponent.createObject(app) | 85 | accountWizard.open() |
85 | popup.close() | 86 | popup.close() |
86 | } | 87 | } |
87 | |||
88 | Component { | ||
89 | id: newAccountComponent | ||
90 | KubeComponents.NewAccountDialog { | ||
91 | id: settings | ||
92 | anchors.fill: parent | ||
93 | } | ||
94 | } | ||
95 | } | 88 | } |
96 | 89 | ||
97 | Controls2.Button { | 90 | Controls2.Button { |
@@ -123,7 +116,7 @@ Controls2.Button { | |||
123 | 116 | ||
124 | clip: true | 117 | clip: true |
125 | 118 | ||
126 | model: KubeFramework.AccountsModel { } | 119 | model: KubeAccounts.AccountsModel { } |
127 | 120 | ||
128 | delegate: Kirigami.AbstractListItem { | 121 | delegate: Kirigami.AbstractListItem { |
129 | id: accountDelegate | 122 | id: accountDelegate |
@@ -158,7 +151,7 @@ Controls2.Button { | |||
158 | 151 | ||
159 | Layout.fillHeight: true | 152 | Layout.fillHeight: true |
160 | 153 | ||
161 | KubeFramework.AccountFactory { | 154 | KubeAccounts.AccountFactory { |
162 | id: accountFactory | 155 | id: accountFactory |
163 | accountId: model.accountId | 156 | accountId: model.accountId |
164 | } | 157 | } |