From 2ffbd47ae807d044ac563fb680a322cefebe4ef7 Mon Sep 17 00:00:00 2001 From: Christian Mollekopf Date: Mon, 18 Dec 2017 21:06:21 +0100 Subject: Removed kpackage structure --- .../package/contents/ui/AccountSettings.qml | 84 ---------------------- accounts/kolabnow/package/contents/ui/Login.qml | 62 ---------------- accounts/kolabnow/package/metadata.desktop | 8 --- accounts/kolabnow/qml/AccountSettings.qml | 84 ++++++++++++++++++++++ accounts/kolabnow/qml/Login.qml | 62 ++++++++++++++++ 5 files changed, 146 insertions(+), 154 deletions(-) delete mode 100644 accounts/kolabnow/package/contents/ui/AccountSettings.qml delete mode 100644 accounts/kolabnow/package/contents/ui/Login.qml delete mode 100644 accounts/kolabnow/package/metadata.desktop create mode 100644 accounts/kolabnow/qml/AccountSettings.qml create mode 100644 accounts/kolabnow/qml/Login.qml (limited to 'accounts/kolabnow') diff --git a/accounts/kolabnow/package/contents/ui/AccountSettings.qml b/accounts/kolabnow/package/contents/ui/AccountSettings.qml deleted file mode 100644 index 4161bc49..00000000 --- a/accounts/kolabnow/package/contents/ui/AccountSettings.qml +++ /dev/null @@ -1,84 +0,0 @@ -/* - Copyright (C) 2016 Michael Bohlender, - Copyright (C) 2017 Christian Mollekopf, - - 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("Connect your Kolab Now account") - property string subheadline: qsTr("Please fill in your name and email address. No account yet? Sign up now!") - property bool valid: nameField.acceptableInput && emailField.acceptableInput - implicitHeight: grid.implicitHeight - - KolabnowAccount.KolabnowSettings { - id: kolabnowSettings - accountIdentifier: accountId - accountType: "kolabnow" - } - - function save(){ - kolabnowSettings.save() - } - - function remove(){ - kolabnowSettings.remove() - } - - GridLayout { - id: grid - anchors.fill: parent - columns: 2 - columnSpacing: Kube.Units.largeSpacing - rowSpacing: Kube.Units.largeSpacing - - Kube.Label { - text: qsTr("Name") - Layout.alignment: Qt.AlignRight - } - Kube.RequiredTextField { - id: nameField - focus: true - Layout.fillWidth: true - placeholderText: qsTr("Your name") - text: kolabnowSettings.userName - onTextChanged: { - kolabnowSettings.userName = text - } - } - - Kube.Label { - text: qsTr("Email address") - Layout.alignment: Qt.AlignRight - } - Kube.RequiredTextField { - id: emailField - Layout.fillWidth: true - - text: kolabnowSettings.emailAddress - onTextChanged: { - kolabnowSettings.emailAddress = text - kolabnowSettings.accountName = text - } - placeholderText: qsTr("Your email address") - } - } -} diff --git a/accounts/kolabnow/package/contents/ui/Login.qml b/accounts/kolabnow/package/contents/ui/Login.qml deleted file mode 100644 index e416b089..00000000 --- a/accounts/kolabnow/package/contents/ui/Login.qml +++ /dev/null @@ -1,62 +0,0 @@ -/* - Copyright (C) 2016 Michael Bohlender, - Copyright (C) 2017 Christian Mollekopf, - - 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 alias accountId: settings.accountIdentifier - property string heading: qsTr("Login") - property string subheadline: settings.accountName - - KolabnowAccount.KolabnowSettings { - id: settings - 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 - focus: true - - placeholderText: qsTr("Password of your Kolab Now account") - text: settings.imapPassword - onTextChanged: settings.imapPassword = text - } - } -} diff --git a/accounts/kolabnow/package/metadata.desktop b/accounts/kolabnow/package/metadata.desktop deleted file mode 100644 index 6777e2d1..00000000 --- a/accounts/kolabnow/package/metadata.desktop +++ /dev/null @@ -1,8 +0,0 @@ -[Desktop Entry] -Name=Kube Kolabnow Accounts Plugin -X-KDE-PluginInfo-Name=org.kube.accounts.kolabnow -Exec=kpackagelauncherqml -a org.kube.accounts.kolabnow -X-Plasma-MainScript=ui/KolabnowAccountSettings.qml -X-KDE-ServiceTypes=KPackage/GenericQML -Icon=folder -Type=Service diff --git a/accounts/kolabnow/qml/AccountSettings.qml b/accounts/kolabnow/qml/AccountSettings.qml new file mode 100644 index 00000000..4161bc49 --- /dev/null +++ b/accounts/kolabnow/qml/AccountSettings.qml @@ -0,0 +1,84 @@ +/* + Copyright (C) 2016 Michael Bohlender, + Copyright (C) 2017 Christian Mollekopf, + + 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("Connect your Kolab Now account") + property string subheadline: qsTr("Please fill in your name and email address. No account yet? Sign up now!") + property bool valid: nameField.acceptableInput && emailField.acceptableInput + implicitHeight: grid.implicitHeight + + KolabnowAccount.KolabnowSettings { + id: kolabnowSettings + accountIdentifier: accountId + accountType: "kolabnow" + } + + function save(){ + kolabnowSettings.save() + } + + function remove(){ + kolabnowSettings.remove() + } + + GridLayout { + id: grid + anchors.fill: parent + columns: 2 + columnSpacing: Kube.Units.largeSpacing + rowSpacing: Kube.Units.largeSpacing + + Kube.Label { + text: qsTr("Name") + Layout.alignment: Qt.AlignRight + } + Kube.RequiredTextField { + id: nameField + focus: true + Layout.fillWidth: true + placeholderText: qsTr("Your name") + text: kolabnowSettings.userName + onTextChanged: { + kolabnowSettings.userName = text + } + } + + Kube.Label { + text: qsTr("Email address") + Layout.alignment: Qt.AlignRight + } + Kube.RequiredTextField { + id: emailField + Layout.fillWidth: true + + text: kolabnowSettings.emailAddress + onTextChanged: { + kolabnowSettings.emailAddress = text + kolabnowSettings.accountName = text + } + placeholderText: qsTr("Your email address") + } + } +} diff --git a/accounts/kolabnow/qml/Login.qml b/accounts/kolabnow/qml/Login.qml new file mode 100644 index 00000000..e416b089 --- /dev/null +++ b/accounts/kolabnow/qml/Login.qml @@ -0,0 +1,62 @@ +/* + Copyright (C) 2016 Michael Bohlender, + Copyright (C) 2017 Christian Mollekopf, + + 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 alias accountId: settings.accountIdentifier + property string heading: qsTr("Login") + property string subheadline: settings.accountName + + KolabnowAccount.KolabnowSettings { + id: settings + 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 + focus: true + + placeholderText: qsTr("Password of your Kolab Now account") + text: settings.imapPassword + onTextChanged: settings.imapPassword = text + } + } +} -- cgit v1.2.3