A login view

2 files changed, 64 insertions, 19 deletions

diff --git a/accounts/kolabnow/package/contents/ui/KolabnowAccountSettings.qml b/accounts/kolabnow/package/contents/ui/KolabnowAccountSettings.qml
index 8d8b6665..482ddc99 100644
--- a/accounts/kolabnow/package/contents/ui/KolabnowAccountSettings.qml
+++ b/accounts/kolabnow/package/contents/ui/KolabnowAccountSettings.qml
@@ -26,8 +26,8 @@ Item {
 
     property string accountId
     property string heading: qsTr("Connect your Kolab Now account")
-    property string subheadline: qsTr("To let Kube access your account, fill in email address, username, password and give the account a title that will be displayed inside Kube.")
-    property bool valid: accountField.acceptableInput && nameField.acceptableInput && emailField.acceptableInput && pwField.acceptableInput
+    property string subheadline: qsTr("To let Kube access your account, fill in your name, username, password.")
+    property bool valid: nameField.acceptableInput && emailField.acceptableInput
 
     KolabnowAccount.KolabnowSettings {
         id: kolabnowSettings
@@ -85,23 +85,6 @@ Item {
                 }
                 placeholderText: qsTr("Your email address")
             }
-
-            Kube.Label {
-                text: qsTr("Password")
-                Layout.alignment: Qt.AlignRight
-            }
-
-            Kube.PasswordField {
-                id: pwField
-                Layout.fillWidth: true
-
-                placeholderText: qsTr("Password of your email account")
-                text: kolabnowSettings.imapPassword
-                onTextChanged: {
-                    kolabnowSettings.imapPassword = text
-                    kolabnowSettings.smtpPassword = text
-                }
-            }
         }
     }
 }
diff --git a/accounts/kolabnow/package/contents/ui/Login.qml b/accounts/kolabnow/package/contents/ui/Login.qml
new file mode 100644
index 00000000..ae0213d5
--- /dev/null
+++ b/accounts/kolabnow/package/contents/ui/Login.qml
@@ -0,0 +1,62 @@
+/*
+  Copyright (C) 2016 Michael Bohlender, <michael.bohlender@kdemail.net>
+  Copyright (C) 2017 Christian Mollekopf, <mollekopf@kolabsys.com>
+
+  This program is free software; you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation; either version 2 of the License, or
+  (at your option) any later version.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License along
+  with this program; if not, write to the Free Software Foundation, Inc.,
+  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+*/
+
+import QtQuick 2.4
+import QtQuick.Layouts 1.1
+import org.kube.framework 1.0 as Kube
+import org.kube.accounts.kolabnow 1.0 as KolabnowAccount
+
+Item {
+    property string accountId
+    property string heading: qsTr("Login")
+    property string subheadline: settings.accountName
+
+    KolabnowAccount.KolabnowSettings {
+        id: settings
+        accountIdentifier: accountId
+        accountType: "kolabnow"
+    }
+
+    function login(){
+        settings.save()
+    }
+
+    GridLayout {
+        anchors {
+            fill: parent
+        }
+        columns: 2
+        columnSpacing: Kube.Units.largeSpacing
+        rowSpacing: Kube.Units.largeSpacing
+
+        Kube.Label {
+            text: qsTr("Password")
+            Layout.alignment: Qt.AlignRight
+        }
+
+        Kube.PasswordField {
+            id: pwField
+            Layout.fillWidth: true
+
+            placeholderText: qsTr("Password of your email account")
+            text: settings.imapPassword
+            onTextChanged: settings.imapPassword = text
+        }
+    }
+}