1 files changed, 14 insertions, 65 deletions
diff --git a/applications/kube-mail/package/contents/ui/Settings.qml b/applications/kube-mail/package/contents/ui/Settings.qml
index 71fcf359..34755df0 100644
--- a/applications/kube-mail/package/contents/ui/Settings.qml
+++ b/applications/kube-mail/package/contents/ui/Settings.qml
@@ -50,74 +50,23 @@ Rectangle {
            anchors.fill: parent
        }
-        GridLayout {
+        KubeSettings.Settings {
-            columns: 2
+            id: contextSettings
-            anchors.fill: parent
+            identifier: "applicationcontext"
-            anchors.margins: 10
+            property string currentAccountId: "current"
-            rowSpacing: 10
+        }
-            columnSpacing: 10
-            Label { text: "Username" }
-            TextField {
-                id: username
-                text: "username"
-                Layout.fillWidth: true
-            }
-            Label { text: "Password" }
-            TextField {
-                id: password
-                text: "password"
-                Layout.fillWidth: true
-            }
-            Label { text: "Server" }
-            TextField {
-                id: server
-                text: "server"
-                Layout.fillWidth: true
-            }
-            KubeSettings.Settings {
-                id: contextSettings
-                identifier: "applicationcontext"
-                property string currentAccountId: "current"
-            }
-            KubeSettings.Settings {
-                id: accountSettings
-                identifier: "account.current"
-                property string primaryIdentity: "current"
-            }
-            KubeSettings.Settings {
-                id: identitySettings
-                identifier: "identity.current"
-                property string transport: "current"
-            }
-            KubeSettings.Settings {
-                id: transportSettings
-                identifier: "transport.current"
-                property alias username: username.text
-                property alias password: password.text
-                property alias server: server.text
-            }
-            Item {
+        Column {
-                Layout.columnSpan: 2
+            spacing: 5
-                Layout.fillWidth: true
+            Repeater {
-                Button {
+                model: ["current"] //Get from context settings
-                    id: button
+                delegate: MaildirAccountSettings { //This should be retrieved from the accounts plugin: KubeAccounts { identifier: modelData }.settingsUi
-                    anchors.centerIn: parent
+                    accountId: modelData
-                    text: "Save"
+                    accountName: "Maildir"
-                    onClicked: {
-                        contextSettings.save();
-                        accountSettings.save();
-                        identitySettings.save();
-                        transportSettings.save();
-                        root.visible = false;
-                    }
                }
            }
        }
+        //Add possibility to add more accounts
    }
 }

diff --git a/applications/kube-mail/package/contents/ui/Settings.qml b/applications/kube-mail/package/contents/ui/Settings.qml index 71fcf359..34755df0 100644 --- a/applications/kube-mail/package/contents/ui/Settings.qml +++ b/applications/kube-mail/package/contents/ui/Settings.qml
@@ -50,74 +50,23 @@ Rectangle {
50	anchors.fill: parent	50	anchors.fill: parent
51	}	51	}
52		52
53	GridLayout {	53	KubeSettings.Settings {
54	columns: 2	54	id: contextSettings
55	anchors.fill: parent	55	identifier: "applicationcontext"
56	anchors.margins: 10	56	property string currentAccountId: "current"
57	rowSpacing: 10	57	}
58	columnSpacing: 10
59
60	Label { text: "Username" }
61	TextField {
62	id: username
63	text: "username"
64	Layout.fillWidth: true
65	}
66
67	Label { text: "Password" }
68	TextField {
69	id: password
70	text: "password"
71	Layout.fillWidth: true
72	}
73
74	Label { text: "Server" }
75	TextField {
76	id: server
77	text: "server"
78	Layout.fillWidth: true
79	}
80
81	KubeSettings.Settings {
82	id: contextSettings
83	identifier: "applicationcontext"
84	property string currentAccountId: "current"
85	}
86	KubeSettings.Settings {
87	id: accountSettings
88	identifier: "account.current"
89	property string primaryIdentity: "current"
90	}
91	KubeSettings.Settings {
92	id: identitySettings
93	identifier: "identity.current"
94	property string transport: "current"
95	}
96	KubeSettings.Settings {
97	id: transportSettings
98	identifier: "transport.current"
99	property alias username: username.text
100	property alias password: password.text
101	property alias server: server.text
102	}
103		58
104	Item {	59	Column {
105	Layout.columnSpan: 2	60	spacing: 5
106	Layout.fillWidth: true	61	Repeater {
107	Button {	62	model: ["current"] //Get from context settings
108	id: button	63	delegate: MaildirAccountSettings { //This should be retrieved from the accounts plugin: KubeAccounts { identifier: modelData }.settingsUi
109	anchors.centerIn: parent	64	accountId: modelData
110	text: "Save"	65	accountName: "Maildir"
111	onClicked: {
112	contextSettings.save();
113	accountSettings.save();
114	identitySettings.save();
115	transportSettings.save();
116	root.visible = false;
117	}
118	}	66	}
119	}	67	}
120
121	}	68	}
		69
		70	//Add possibility to add more accounts
122	}	71	}
123	}	72	}