From 194a5194a895749df40cde70a8bbde97513cf4de Mon Sep 17 00:00:00 2001
From: miruka <miruka@disroot.org>
Date: Fri, 1 May 2020 05:21:50 -0400
Subject: [PATCH] Better account context menu, add it in AccountsBar

---
 src/gui/MainPane/Account.qml            | 18 +-----------
 src/gui/MainPane/AccountContextMenu.qml | 39 +++++++++++++++++++++++++
 src/gui/MainPane/AccountsBar.qml        |  2 ++
 src/icons/thin/account-settings.svg     |  3 ++
 src/icons/thin/menu-add-chat.svg        |  5 ++++
 5 files changed, 50 insertions(+), 17 deletions(-)
 create mode 100644 src/gui/MainPane/AccountContextMenu.qml
 create mode 100644 src/icons/thin/account-settings.svg
 create mode 100644 src/icons/thin/menu-add-chat.svg

diff --git a/src/gui/MainPane/Account.qml b/src/gui/MainPane/Account.qml
index 8d0924b8..51298d14 100644
--- a/src/gui/MainPane/Account.qml
+++ b/src/gui/MainPane/Account.qml
@@ -2,7 +2,6 @@
 
 import QtQuick 2.12
 import QtQuick.Layouts 1.12
-import Clipboard 0.1
 import "../Base"
 import "../Base/HTile"
 
@@ -58,22 +57,7 @@ HTile {
         }
     }
 
-    contextMenu: HMenu {
-        HMenuItem {
-            icon.name: "copy-user-id"
-            text: qsTr("Copy user ID")
-            onTriggered: Clipboard.text = accountModel.id
-        }
-
-        HMenuItemPopupSpawner {
-            icon.name: "sign-out"
-            icon.color: theme.colors.negativeBackground
-            text: qsTr("Sign out")
-
-            popup: "Popups/SignOutPopup.qml"
-            properties: { "userId": accountModel.id }
-        }
-    }
+    contextMenu: AccountContextMenu { userId: accountModel.id }
 
     onLeftClicked: {
         pageLoader.showPage(
diff --git a/src/gui/MainPane/AccountContextMenu.qml b/src/gui/MainPane/AccountContextMenu.qml
new file mode 100644
index 00000000..5102f685
--- /dev/null
+++ b/src/gui/MainPane/AccountContextMenu.qml
@@ -0,0 +1,39 @@
+// SPDX-License-Identifier: LGPL-3.0-or-later
+
+import QtQuick 2.12
+import Clipboard 0.1
+import "../Base"
+
+HMenu {
+    property string userId
+
+
+    HMenuItem {
+        icon.name: "account-settings"
+        text: qsTr("Account settings")
+        onClicked: pageLoader.showPage(
+            "AccountSettings/AccountSettings", { "userId": userId },
+        )
+    }
+
+    HMenuItem {
+        icon.name: "menu-add-chat"
+        text: qsTr("Add new chat")
+        onClicked: pageLoader.showPage("AddChat/AddChat", {userId: userId})
+    }
+
+    HMenuItem {
+        icon.name: "copy-user-id"
+        text: qsTr("Copy user ID")
+        onTriggered: Clipboard.text = userId
+    }
+
+    HMenuItemPopupSpawner {
+        icon.name: "sign-out"
+        icon.color: theme.colors.negativeBackground
+        text: qsTr("Sign out")
+
+        popup: "Popups/SignOutPopup.qml"
+        properties: { "userId": userId }
+    }
+}
diff --git a/src/gui/MainPane/AccountsBar.qml b/src/gui/MainPane/AccountsBar.qml
index f55ed13b..f18f7a36 100644
--- a/src/gui/MainPane/AccountsBar.qml
+++ b/src/gui/MainPane/AccountsBar.qml
@@ -90,6 +90,8 @@ HColumnLayout {
                 }
             }
 
+            contextMenu: AccountContextMenu { userId: model.id }
+
             onLeftClicked: roomList.goToAccount(model.id)
         }
 
diff --git a/src/icons/thin/account-settings.svg b/src/icons/thin/account-settings.svg
new file mode 100644
index 00000000..bd8786c6
--- /dev/null
+++ b/src/icons/thin/account-settings.svg
@@ -0,0 +1,3 @@
+<svg height="24" viewBox="0 0 24 24" width="24" xmlns="http://www.w3.org/2000/svg">
+    <path d="m24 14.187v-4.374c-2.148-.766-2.726-.802-3.027-1.529-.303-.729.083-1.169 1.059-3.223l-3.093-3.093c-2.026.963-2.488 1.364-3.224 1.059-.727-.302-.768-.889-1.527-3.027h-4.375c-.764 2.144-.8 2.725-1.529 3.027-.752.313-1.203-.1-3.223-1.059l-3.093 3.093c.977 2.055 1.362 2.493 1.059 3.224-.302.727-.881.764-3.027 1.528v4.375c2.139.76 2.725.8 3.027 1.528.304.734-.081 1.167-1.059 3.223l3.093 3.093c1.999-.95 2.47-1.373 3.223-1.059.728.302.764.88 1.529 3.027h4.374c.758-2.131.799-2.723 1.537-3.031.745-.308 1.186.099 3.215 1.062l3.093-3.093c-.975-2.05-1.362-2.492-1.059-3.223.3-.726.88-.763 3.027-1.528zm-4.875.764c-.577 1.394-.068 2.458.488 3.578l-1.084 1.084c-1.093-.543-2.161-1.076-3.573-.49-1.396.581-1.79 1.693-2.188 2.877h-1.534c-.398-1.185-.791-2.297-2.183-2.875-1.419-.588-2.507-.045-3.579.488l-1.083-1.084c.557-1.118 1.066-2.18.487-3.58-.579-1.391-1.691-1.784-2.876-2.182v-1.533c1.185-.398 2.297-.791 2.875-2.184.578-1.394.068-2.459-.488-3.579l1.084-1.084c1.082.538 2.162 1.077 3.58.488 1.392-.577 1.785-1.69 2.183-2.875h1.534c.398 1.185.792 2.297 2.184 2.875 1.419.588 2.506.045 3.579-.488l1.084 1.084c-.556 1.121-1.065 2.187-.488 3.58.577 1.391 1.689 1.784 2.875 2.183v1.534c-1.188.398-2.302.791-2.877 2.183zm-7.125-5.951c1.654 0 3 1.346 3 3s-1.346 3-3 3-3-1.346-3-3 1.346-3 3-3zm0-2c-2.762 0-5 2.238-5 5s2.238 5 5 5 5-2.238 5-5-2.238-5-5-5z"/>
+</svg>
diff --git a/src/icons/thin/menu-add-chat.svg b/src/icons/thin/menu-add-chat.svg
new file mode 100644
index 00000000..bf15a604
--- /dev/null
+++ b/src/icons/thin/menu-add-chat.svg
@@ -0,0 +1,5 @@
+<svg height="24" viewBox="0 0 24 24" width="24" xmlns="http://www.w3.org/2000/svg">
+    <path d="m22 3v13h-11.643l-4.357 3.105v-3.105h-4v-13zm2-2h-24v16.981h4v5.019l7-5.019h13z"/>
+    <path d="m4.563744-13.28837h9.686071v1.966569h-9.686071z" transform="rotate(90)"/>
+    <path d="m-17.148121-10.390064h9.686071v1.966569h-9.686071z" transform="scale(-1)"/>
+</svg>