From 23d0a911ff3618e74f134722b9bfa47c429df7f7 Mon Sep 17 00:00:00 2001
From: Christian Mollekopf <chrigi_1@fastmail.fm>
Date: Wed, 24 Jan 2018 11:46:56 +0100
Subject: Tie the account name to the email address

---
 accounts/gmail/qml/AccountSettings.qml | 14 +-------------
 accounts/imap/qml/AccountSettings.qml  | 14 +-------------
 2 files changed, 2 insertions(+), 26 deletions(-)

diff --git a/accounts/gmail/qml/AccountSettings.qml b/accounts/gmail/qml/AccountSettings.qml
index 0ebce1d3..15430a17 100644
--- a/accounts/gmail/qml/AccountSettings.qml
+++ b/accounts/gmail/qml/AccountSettings.qml
@@ -62,19 +62,6 @@ Item {
             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
@@ -98,6 +85,7 @@ Item {
             text: gmailSettings.emailAddress
             onTextChanged: {
                 gmailSettings.emailAddress = text
+                gmailSettings.accountName = text
             }
             placeholderText: qsTr("Your email address")
         }
diff --git a/accounts/imap/qml/AccountSettings.qml b/accounts/imap/qml/AccountSettings.qml
index d81f9c54..186b6bd7 100644
--- a/accounts/imap/qml/AccountSettings.qml
+++ b/accounts/imap/qml/AccountSettings.qml
@@ -51,19 +51,6 @@ Item {
         columnSpacing: Kube.Units.largeSpacing
         rowSpacing: Kube.Units.largeSpacing
 
-        Kube.Label {
-            text: qsTr("Title of Account")
-            Layout.alignment: Qt.AlignRight
-        }
-        Kube.RequiredTextField {
-            Layout.fillWidth: true
-            placeholderText: qsTr("E.g. \"Work\", \"Home\" that will be displayed in Kube as name")
-            text: imapSettings.accountName
-            onTextChanged: {
-                imapSettings.accountName = text
-            }
-        }
-
         Kube.Label {
             text: qsTr("Name")
             Layout.alignment: Qt.AlignRight
@@ -89,6 +76,7 @@ Item {
                 imapSettings.emailAddress = text
                 imapSettings.imapUsername = text
                 imapSettings.smtpUsername = text
+                imapSettings.accountName = text
             }
             placeholderText: qsTr("Your email address")
         }
-- 
cgit v1.2.3