From 1f62cf29d038e1dfd9bd56505ecaae10ca14b60b Mon Sep 17 00:00:00 2001 From: Christian Mollekopf Date: Mon, 18 Dec 2017 20:32:57 +0100 Subject: Accounts without kpackage --- accounts/gmail/CMakeLists.txt | 4 +- .../gmail/package/contents/ui/AccountSettings.qml | 122 +++++++++++++++++++++ .../gmail/package/contents/ui/GmailSettings.qml | 122 --------------------- 3 files changed, 123 insertions(+), 125 deletions(-) create mode 100644 accounts/gmail/package/contents/ui/AccountSettings.qml delete mode 100644 accounts/gmail/package/contents/ui/GmailSettings.qml (limited to 'accounts/gmail') diff --git a/accounts/gmail/CMakeLists.txt b/accounts/gmail/CMakeLists.txt index 5be1b134..42b95a45 100644 --- a/accounts/gmail/CMakeLists.txt +++ b/accounts/gmail/CMakeLists.txt @@ -14,7 +14,5 @@ target_link_libraries(gmailaccountplugin Qt5::Qml ) -kpackage_install_package(package org.kube.accounts.gmail "genericqml") - install(TARGETS gmailaccountplugin DESTINATION ${QML_INSTALL_DIR}/org/kube/accounts/gmail) -install(FILES qmldir DESTINATION ${QML_INSTALL_DIR}/org/kube/accounts/gmail) +install_qml_account(gmail) diff --git a/accounts/gmail/package/contents/ui/AccountSettings.qml b/accounts/gmail/package/contents/ui/AccountSettings.qml new file mode 100644 index 00000000..16f7dbf3 --- /dev/null +++ b/accounts/gmail/package/contents/ui/AccountSettings.qml @@ -0,0 +1,122 @@ +/* + 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.Controls 1.4 as Controls +import QtQuick.Layouts 1.1 +import org.kube.framework 1.0 as Kube +import org.kube.accounts.gmail 1.0 as GmailAccount + +Item { + + property string accountId + property string heading: qsTr("Connect your GMail 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: true + implicitHeight: grid.implicitHeight + + GmailAccount.GmailSettings { + id: gmailSettings + accountIdentifier: accountId + accountType: "gmail" + } + + function save(){ + gmailSettings.save() + } + + function remove(){ + gmailSettings.remove() + } + + GridLayout { + id: grid + anchors.fill: parent + columns: 2 + columnSpacing: Kube.Units.largeSpacing + rowSpacing: Kube.Units.largeSpacing + + Kube.Label { + text: "Please note that GMail requires you to configure your account to allow IMAP connections from Kube: +
    +
  1. See https://support.google.com/mail/answer/7126229 to configure your account to allow IMAP connections. +
  2. Visit https://myaccount.google.com/lesssecureapps and enable the setting to allow Kube to connect to your account." + Layout.alignment: Qt.AlignCenter + Layout.columnSpan: 2 + textFormat: Text.StyledText + } + + Kube.Label { + text: qsTr("Title of Account") + Layout.alignment: Qt.AlignRight + } + Kube.TextField { + Layout.fillWidth: true + placeholderText: qsTr("E.g. \"Work\", \"Home\" that will be displayed in Kube as name") + text: gmailSettings.accountName + onTextChanged: { + gmailSettings.accountName = text + } + } + + Kube.Label { + text: qsTr("Name") + Layout.alignment: Qt.AlignRight + } + Kube.TextField { + Layout.fillWidth: true + placeholderText: qsTr("Your name") + text: gmailSettings.userName + onTextChanged: { + gmailSettings.userName = text + } + } + + Kube.Label { + text: qsTr("Email address") + Layout.alignment: Qt.AlignRight + } + Kube.TextField { + Layout.fillWidth: true + + text: gmailSettings.emailAddress + onTextChanged: { + gmailSettings.emailAddress = text + } + 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: gmailSettings.imapPassword + onTextChanged: { + gmailSettings.imapPassword = text + gmailSettings.smtpPassword = text + } + } + } +} diff --git a/accounts/gmail/package/contents/ui/GmailSettings.qml b/accounts/gmail/package/contents/ui/GmailSettings.qml deleted file mode 100644 index 16f7dbf3..00000000 --- a/accounts/gmail/package/contents/ui/GmailSettings.qml +++ /dev/null @@ -1,122 +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.Controls 1.4 as Controls -import QtQuick.Layouts 1.1 -import org.kube.framework 1.0 as Kube -import org.kube.accounts.gmail 1.0 as GmailAccount - -Item { - - property string accountId - property string heading: qsTr("Connect your GMail 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: true - implicitHeight: grid.implicitHeight - - GmailAccount.GmailSettings { - id: gmailSettings - accountIdentifier: accountId - accountType: "gmail" - } - - function save(){ - gmailSettings.save() - } - - function remove(){ - gmailSettings.remove() - } - - GridLayout { - id: grid - anchors.fill: parent - columns: 2 - columnSpacing: Kube.Units.largeSpacing - rowSpacing: Kube.Units.largeSpacing - - Kube.Label { - text: "Please note that GMail requires you to configure your account to allow IMAP connections from Kube: -
      -
    1. See https://support.google.com/mail/answer/7126229 to configure your account to allow IMAP connections. -
    2. Visit https://myaccount.google.com/lesssecureapps and enable the setting to allow Kube to connect to your account." - Layout.alignment: Qt.AlignCenter - Layout.columnSpan: 2 - textFormat: Text.StyledText - } - - Kube.Label { - text: qsTr("Title of Account") - Layout.alignment: Qt.AlignRight - } - Kube.TextField { - Layout.fillWidth: true - placeholderText: qsTr("E.g. \"Work\", \"Home\" that will be displayed in Kube as name") - text: gmailSettings.accountName - onTextChanged: { - gmailSettings.accountName = text - } - } - - Kube.Label { - text: qsTr("Name") - Layout.alignment: Qt.AlignRight - } - Kube.TextField { - Layout.fillWidth: true - placeholderText: qsTr("Your name") - text: gmailSettings.userName - onTextChanged: { - gmailSettings.userName = text - } - } - - Kube.Label { - text: qsTr("Email address") - Layout.alignment: Qt.AlignRight - } - Kube.TextField { - Layout.fillWidth: true - - text: gmailSettings.emailAddress - onTextChanged: { - gmailSettings.emailAddress = text - } - 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: gmailSettings.imapPassword - onTextChanged: { - gmailSettings.imapPassword = text - gmailSettings.smtpPassword = text - } - } - } -} -- cgit v1.2.3