12 files changed, 61 insertions, 53 deletions

diff --git a/accounts/CMakeLists.txt b/accounts/CMakeLists.txt
index 76a11c54..0209f00b 100644
--- a/accounts/CMakeLists.txt
+++ b/accounts/CMakeLists.txt
@@ -12,5 +12,5 @@ endmacro(install_qml_account)
 add_subdirectory(maildir)
 add_subdirectory(imap)
 add_subdirectory(kolabnow)
-add_subdirectory(gmail)
+add_subdirectory(google)
 add_subdirectory(generic)
diff --git a/accounts/gmail/CMakeLists.txt b/accounts/gmail/CMakeLists.txt
deleted file mode 100644
index f8baee04..00000000
--- a/accounts/gmail/CMakeLists.txt
+++ /dev/null
@@ -1,19 +0,0 @@
-project(kube-accounts-gmail)
-
-set(SRCS
-    gmailsettings.cpp
-    gmailaccountplugin.cpp
-)
-
-add_library(gmailaccountplugin SHARED ${SRCS})
-target_link_libraries(gmailaccountplugin
-    sink
-    frameworkplugin
-    Qt5::Core
-    Qt5::Quick
-    Qt5::Qml
-)
-
-install(TARGETS gmailaccountplugin DESTINATION ${QML_INSTALL_DIR}/org/kube/accounts/gmail)
-install(FILES metadata.json DESTINATION ${QML_INSTALL_DIR}/org/kube/accounts/gmail)
-install_qml_account(gmail)
diff --git a/accounts/gmail/qmldir b/accounts/gmail/qmldir
deleted file mode 100644
index 78a9e5b7..00000000
--- a/accounts/gmail/qmldir
+++ /dev/null
@@ -1,3 +0,0 @@
-module org.kube.accounts.gmail
-
-plugin gmailaccountplugin
diff --git a/accounts/google/CMakeLists.txt b/accounts/google/CMakeLists.txt
new file mode 100644
index 00000000..3732190d
--- /dev/null
+++ b/accounts/google/CMakeLists.txt
@@ -0,0 +1,19 @@
+project(kube-accounts-google)
+
+set(SRCS
+    googlesettings.cpp
+    googleaccountplugin.cpp
+)
+
+add_library(googleaccountplugin SHARED ${SRCS})
+target_link_libraries(googleaccountplugin
+    sink
+    frameworkplugin
+    Qt5::Core
+    Qt5::Quick
+    Qt5::Qml
+)
+
+install(TARGETS googleaccountplugin DESTINATION ${QML_INSTALL_DIR}/org/kube/accounts/google)
+install(FILES metadata.json DESTINATION ${QML_INSTALL_DIR}/org/kube/accounts/google)
+install_qml_account(google)
diff --git a/accounts/gmail/gmailaccountplugin.cpp b/accounts/google/googleaccountplugin.cpp
index 53218939..d419e585 100644
--- a/accounts/gmail/gmailaccountplugin.cpp
+++ b/accounts/google/googleaccountplugin.cpp
@@ -16,14 +16,14 @@
     Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
     02110-1301, USA.
 */
-#include "gmailaccountplugin.h"
+#include "googleaccountplugin.h"
 
-#include "gmailsettings.h"
+#include "googlesettings.h"
 
 #include <QtQml>
 
-void GmailAccountPlugin::registerTypes (const char *uri)
+void GoogleAccountPlugin::registerTypes (const char *uri)
 {
-    Q_ASSERT(uri == QLatin1String("org.kube.accounts.gmail"));
-    qmlRegisterType<GmailSettings>(uri, 1, 0, "GmailSettings");
+    Q_ASSERT(uri == QLatin1String("org.kube.accounts.google"));
+    qmlRegisterType<GoogleSettings>(uri, 1, 0, "GoogleSettings");
 }
diff --git a/accounts/gmail/gmailaccountplugin.h b/accounts/google/googleaccountplugin.h
index 5876e393..d546c4f9 100644
--- a/accounts/gmail/gmailaccountplugin.h
+++ b/accounts/google/googleaccountplugin.h
@@ -21,7 +21,7 @@
 #include <QQmlEngine>
 #include <QQmlExtensionPlugin>
 
-class GmailAccountPlugin : public QQmlExtensionPlugin
+class GoogleAccountPlugin : public QQmlExtensionPlugin
 {
     Q_OBJECT
     Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface")
diff --git a/accounts/gmail/gmailsettings.cpp b/accounts/google/googlesettings.cpp
index a50668b8..6c4c32de 100644
--- a/accounts/gmail/gmailsettings.cpp
+++ b/accounts/google/googlesettings.cpp
@@ -16,14 +16,14 @@
     Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
     02110-1301, USA.
 */
-#include "gmailsettings.h"
+#include "googlesettings.h"
 
-GmailSettings::GmailSettings(QObject *parent)
+GoogleSettings::GoogleSettings(QObject *parent)
     : AccountSettings(parent)
 {
 }
 
-void GmailSettings::load()
+void GoogleSettings::load()
 {
     loadAccount();
     loadImapResource();
@@ -31,7 +31,7 @@ void GmailSettings::load()
     loadIdentity();
 }
 
-void GmailSettings::save()
+void GoogleSettings::save()
 {
     mImapServer = "imaps://imap.gmail.com:993";
     mImapUsername = mEmailAddress;
@@ -39,13 +39,21 @@ void GmailSettings::save()
     mSmtpServer = "smtps://smtp.gmail.com:587";
     mSmtpUsername = mEmailAddress;
 
+    mCardDavServer = QStringLiteral("https://www.googleapis.com/carddav/v1/principals/") + mEmailAddress + "/";
+    mCardDavUsername = mEmailAddress;
+
+    mCalDavServer = QStringLiteral("https://www.google.com/calendar/dav/") + mEmailAddress + "/";
+    mCalDavUsername = mEmailAddress;
+
     saveAccount();
     saveImapResource();
     saveMailtransportResource();
+    saveCardDavResource();
+    saveCalDavResource();
     saveIdentity();
 }
 
-void GmailSettings::remove()
+void GoogleSettings::remove()
 {
     removeResource(mMailtransportIdentifier);
     removeResource(mImapIdentifier);
diff --git a/accounts/gmail/gmailsettings.h b/accounts/google/googlesettings.h
index 708cb94b..ac7ae61f 100644
--- a/accounts/gmail/gmailsettings.h
+++ b/accounts/google/googlesettings.h
@@ -20,12 +20,12 @@
 
 #include <domain/settings/accountsettings.h>
 
-class GmailSettings : public AccountSettings
+class GoogleSettings : public AccountSettings
 {
     Q_OBJECT
 
 public:
-    GmailSettings(QObject *parent = 0);
+    GoogleSettings(QObject *parent = 0);
 
     Q_INVOKABLE virtual void load() Q_DECL_OVERRIDE;
     Q_INVOKABLE virtual void save() Q_DECL_OVERRIDE;
diff --git a/accounts/gmail/metadata.json b/accounts/google/metadata.json
index 68c06971..0ad786f1 100644
--- a/accounts/gmail/metadata.json
+++ b/accounts/google/metadata.json
@@ -1,4 +1,4 @@
 {
-    "Name": "GMail",
+    "Name": "Google",
     "RequiresKeyring": true
 }
diff --git a/accounts/gmail/qml/AccountSettings.qml b/accounts/google/qml/AccountSettings.qml
index d7df5eaf..73cdfbd7 100644
--- a/accounts/gmail/qml/AccountSettings.qml
+++ b/accounts/google/qml/AccountSettings.qml
@@ -20,28 +20,28 @@
 import QtQuick 2.4
 import QtQuick.Layouts 1.1
 import org.kube.framework 1.0 as Kube
-import org.kube.accounts.gmail 1.0 as GmailAccount
+import org.kube.accounts.google 1.0 as GoogleAccount
 
 Item {
 
     property string accountId
-    property string heading: qsTr("Connect your GMail account")
+    property string heading: qsTr("Connect your Google account")
     property string subheadline: qsTr("To let Kube access your account, fill in email address, username and give the account a title that will be displayed inside Kube.")
     property bool valid: true
     implicitHeight: grid.implicitHeight
 
-    GmailAccount.GmailSettings {
-        id: gmailSettings
+    GoogleAccount.GoogleSettings {
+        id: googleSettings
         accountIdentifier: accountId
-        accountType: "gmail"
+        accountType: "google"
     }
 
     function save(){
-        gmailSettings.save()
+        googleSettings.save()
     }
 
     function remove(){
-        gmailSettings.remove()
+        googleSettings.remove()
     }
 
     GridLayout {
@@ -52,7 +52,7 @@ Item {
         rowSpacing: Kube.Units.largeSpacing
 
         Kube.Label {
-            text: "Please note that GMail requires you to configure your account to allow IMAP connections from Kube:
+            text: "Please note that Google requires you to configure your account to allow IMAP connections from Kube:
 <ol type=''>
 <li> See <a href='https://support.google.com/mail/answer/7126229'>https://support.google.com/mail/answer/7126229</a> to configure your account to allow IMAP connections.
 <li> Visit <a href='https://myaccount.google.com/lesssecureapps'>https://myaccount.google.com/lesssecureapps</a> and enable the setting to allow Kube to connect to your account."
@@ -68,9 +68,9 @@ Item {
         Kube.TextField {
             Layout.fillWidth: true
             placeholderText: qsTr("Your name")
-            text: gmailSettings.userName
+            text: googleSettings.userName
             onTextChanged: {
-                gmailSettings.userName = text
+                googleSettings.userName = text
             }
         }
 
@@ -81,10 +81,10 @@ Item {
         Kube.TextField {
             Layout.fillWidth: true
 
-            text: gmailSettings.emailAddress
+            text: googleSettings.emailAddress
             onTextChanged: {
-                gmailSettings.emailAddress = text
-                gmailSettings.accountName = text
+                googleSettings.emailAddress = text
+                googleSettings.accountName = text
             }
             placeholderText: qsTr("Your email address")
         }
diff --git a/accounts/gmail/qml/Login.qml b/accounts/google/qml/Login.qml
index bcab19be..0a44aa8c 100644
--- a/accounts/gmail/qml/Login.qml
+++ b/accounts/google/qml/Login.qml
@@ -20,7 +20,7 @@
 import QtQuick 2.4
 import QtQuick.Layouts 1.1
 import org.kube.framework 1.0 as Kube
-import org.kube.accounts.gmail 1.0 as GmailAccount
+import org.kube.accounts.google 1.0 as GoogleAccount
 
 Item {
     property alias accountId: settings.accountIdentifier
@@ -28,9 +28,9 @@ Item {
     property string subheadline: settings.accountName
     property bool valid: pwField.acceptableInput
 
-    GmailAccount.GmailSettings {
+    GoogleAccount.GoogleSettings {
         id: settings
-        accountType: "gmail"
+        accountType: "google"
     }
 
     function login(){
diff --git a/accounts/google/qmldir b/accounts/google/qmldir
new file mode 100644
index 00000000..a4a06cb7
--- /dev/null
+++ b/accounts/google/qmldir
@@ -0,0 +1,3 @@
+module org.kube.accounts.google
+
+plugin googleaccountplugin