From 1284a8423cca8b6547cb3024cf64630038869abc Mon Sep 17 00:00:00 2001
From: Ming Rui Zhang <mingrui.zhang@savoirfairelinux.com>
Date: Tue, 1 Jun 2021 13:37:26 -0400
Subject: [PATCH] settings: use new menu svgs

Change-Id: I6d4456218448d1ca5c4682d33341207e2a0953eb
---
 images/icons/account_black-24dp.svg          | 16 +++++++++++++++
 images/icons/baseline-people-24px.svg        |  1 -
 images/icons/gear_black-24dp.svg             | 20 +++++++++++++++++++
 images/icons/media_black-24dp.svg            | 14 +++++++++++++
 images/icons/plugin_settings_black-24dp.svg  | 13 ++++++++++++
 resources.qrc                                |  5 ++++-
 src/settingsview/components/SettingsMenu.qml | 21 ++++++++++++--------
 7 files changed, 80 insertions(+), 10 deletions(-)
 create mode 100644 images/icons/account_black-24dp.svg
 delete mode 100644 images/icons/baseline-people-24px.svg
 create mode 100644 images/icons/gear_black-24dp.svg
 create mode 100644 images/icons/media_black-24dp.svg
 create mode 100644 images/icons/plugin_settings_black-24dp.svg

diff --git a/images/icons/account_black-24dp.svg b/images/icons/account_black-24dp.svg
new file mode 100644
index 000000000..5754afc83
--- /dev/null
+++ b/images/icons/account_black-24dp.svg
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 24.3.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 24 24" style="enable-background:new 0 0 24 24;" xml:space="preserve">
+<g>
+	<path d="M12,14.2c1.4,0,2.5-1.1,2.5-2.5c0-1.4-1.1-2.5-2.5-2.5s-2.5,1.1-2.5,2.5C9.5,13.1,10.6,14.2,12,14.2z M10.8,11.8
+		c0-0.7,0.5-1.2,1.2-1.2s1.2,0.5,1.2,1.2c0,0.7-0.5,1.2-1.2,1.2S10.8,12.4,10.8,11.8z"/>
+	<path d="M8.3,18.3c0.3,0,0.6-0.3,0.6-0.6v-0.9c0-0.7,0.5-1.2,1.2-1.2h3.7c0.7,0,1.2,0.5,1.2,1.2v0.9c0,0.3,0.3,0.6,0.6,0.6
+		c0.3,0,0.6-0.3,0.6-0.6v-0.9c0-1.4-1.1-2.5-2.5-2.5h-3.7c-1.4,0-2.5,1.1-2.5,2.5v0.9C7.7,18.1,8,18.3,8.3,18.3z"/>
+	<path d="M17.5,4.3H14V3.5C14,2.7,13.3,2,12.5,2h-0.9C10.7,2,10,2.7,10,3.5v0.7H6.5c-1.4,0-2.5,1.1-2.5,2.5v12.8
+		c0,1.4,1.1,2.5,2.5,2.5h11c1.4,0,2.5-1.1,2.5-2.5V6.7C19.9,5.4,18.8,4.3,17.5,4.3z M12.7,6.3c0,0.2-0.1,0.3-0.3,0.3h-0.9
+		c-0.2,0-0.3-0.1-0.3-0.3V3.5c0-0.2,0.1-0.3,0.3-0.3h0.9c0.2,0,0.3,0.1,0.3,0.3V6.3z M6.5,5.5H10v0.7c0,0.9,0.7,1.5,1.5,1.5h0.9
+		c0.9,0,1.5-0.7,1.5-1.5V5.5h3.5c0.7,0,1.2,0.5,1.2,1.2v12.8c0,0.7-0.5,1.2-1.2,1.2h-11c-0.7,0-1.2-0.5-1.2-1.2V6.7
+		C5.3,6.1,5.9,5.5,6.5,5.5z"/>
+</g>
+</svg>
diff --git a/images/icons/baseline-people-24px.svg b/images/icons/baseline-people-24px.svg
deleted file mode 100644
index 6bcb85918..000000000
--- a/images/icons/baseline-people-24px.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><path d="M0 0h24v24H0z" fill="none"/><path d="M16 11c1.66 0 2.99-1.34 2.99-3S17.66 5 16 5c-1.66 0-3 1.34-3 3s1.34 3 3 3zm-8 0c1.66 0 2.99-1.34 2.99-3S9.66 5 8 5C6.34 5 5 6.34 5 8s1.34 3 3 3zm0 2c-2.33 0-7 1.17-7 3.5V19h14v-2.5c0-2.33-4.67-3.5-7-3.5zm8 0c-.29 0-.62.02-.97.05 1.16.84 1.97 1.97 1.97 3.45V19h6v-2.5c0-2.33-4.67-3.5-7-3.5z"/></svg>
\ No newline at end of file
diff --git a/images/icons/gear_black-24dp.svg b/images/icons/gear_black-24dp.svg
new file mode 100644
index 000000000..55d658086
--- /dev/null
+++ b/images/icons/gear_black-24dp.svg
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 24.3.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 24 24" style="enable-background:new 0 0 24 24;" xml:space="preserve">
+<g>
+	<path d="M12,15.1c1.7,0,3.1-1.4,3.1-3.1c0-1.7-1.4-3.1-3.1-3.1S8.9,10.3,8.9,12C8.9,13.7,10.3,15.1,12,15.1z M10.1,12
+		c0-1,0.8-1.9,1.9-1.9s1.9,0.8,1.9,1.9c0,1-0.8,1.9-1.9,1.9S10.1,13,10.1,12z"/>
+	<path d="M21.1,14.6l-1.2-1.1C20,13,20,12.5,20,12c0-0.5,0-1-0.1-1.5l1.2-1.1C21.4,9,21.5,8.5,21.3,8L20.1,6
+		c-0.3-0.4-0.8-0.7-1.3-0.5l-1.6,0.5c-0.7-0.6-1.6-1.1-2.5-1.5l-0.4-1.6C14.2,2.3,13.7,2,13.2,2c0,0,0,0,0,0h-2.4c0,0,0,0,0,0
+		c-0.5,0-0.9,0.3-1.1,0.8L9.3,4.4C8.4,4.8,7.5,5.3,6.8,5.9L5.2,5.4C4.7,5.3,4.2,5.5,3.9,6L2.7,8C2.5,8.5,2.6,9,2.9,9.4l1.2,1.1
+		c-0.2,1-0.2,1.9,0,2.9l-1.2,1.1C2.6,15,2.5,15.5,2.7,16L3.9,18c0.3,0.4,0.8,0.7,1.3,0.5l1.6-0.5c0.7,0.6,1.6,1.1,2.5,1.5l0.4,1.6
+		c0.1,0.5,0.6,0.8,1.1,0.8c0,0,0,0,0,0h2.4c0,0,0,0,0,0c0.5,0,0.9-0.3,1.1-0.8l0.4-1.6c0.9-0.3,1.8-0.8,2.5-1.5l1.6,0.5
+		c0.5,0.1,1-0.1,1.3-0.5l1.2-2.1C21.5,15.5,21.4,15,21.1,14.6z M4,15.5L5.5,14l0-0.1c-0.4-1.3-0.4-2.6,0-3.9l0-0.1L4,8.5
+		c0,0,0-0.1,0-0.1l0.8-1.4c0,0,0.1-0.1,0.1-0.1L7,7.4l0.1-0.1c0.9-1,2.1-1.6,3.4-1.9l0.1,0l0.6-2c0-0.1,0.1-0.1,0.1-0.1h1.6
+		c0,0,0,0,0,0c0.1,0,0.1,0,0.1,0.1l0.6,2l0.1,0c1.3,0.3,2.5,1,3.4,1.9L17,7.4l2.1-0.5c0.1,0,0.1,0,0.1,0.1L20,8.3c0,0,0,0.1,0,0.1
+		l-1.4,1.5L18.5,10l0,0.1c0.4,1.3,0.4,2.6,0,3.9l0,0.1l1.5,1.5c0,0,0,0.1,0,0.1l-0.8,1.4c0,0-0.1,0.1-0.1,0.1L17,16.6L17,16.7
+		c-0.9,1-2.1,1.6-3.4,1.9l-0.1,0l-0.6,2c0,0.1-0.1,0.1-0.1,0.1h-1.6c-0.1,0-0.1,0-0.1-0.1l-0.6-2l-0.1,0c-1.3-0.3-2.5-1-3.4-1.9
+		L7,16.6l-2.1,0.5c-0.1,0-0.1,0-0.1-0.1L4,15.7C4,15.6,4,15.6,4,15.5z"/>
+</g>
+</svg>
diff --git a/images/icons/media_black-24dp.svg b/images/icons/media_black-24dp.svg
new file mode 100644
index 000000000..3f66dc084
--- /dev/null
+++ b/images/icons/media_black-24dp.svg
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 24.3.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 24 24" style="enable-background:new 0 0 24 24;" xml:space="preserve">
+<g>
+	<path d="M20.5,3.6H3.5c-1,0-1.9,0.8-1.9,1.9v11.3c0,1,0.8,1.9,1.9,1.9h7.8v0.6H7c-0.4,0-0.6,0.3-0.6,0.6s0.3,0.6,0.6,0.6H17
+		c0.4,0,0.6-0.3,0.6-0.6s-0.3-0.6-0.6-0.6h-4.4v-0.6h7.8c1,0,1.9-0.8,1.9-1.9V5.4C22.3,4.4,21.5,3.6,20.5,3.6z M3,5.4
+		c0-0.3,0.3-0.6,0.6-0.6h16.9c0.3,0,0.6,0.3,0.6,0.6v11.3c0,0.3-0.3,0.6-0.6,0.6H3.5C3.2,17.3,3,17,3,16.7V5.4z"/>
+	<path d="M9.7,15.4c0.3,0,0.5-0.1,0.8-0.2l4.7-2.7c0.7-0.4,1-1.4,0.6-2.1c-0.1-0.2-0.3-0.4-0.6-0.6l-4.7-2.7C9.7,6.7,8.8,7,8.4,7.7
+		C8.2,7.9,8.2,8.2,8.2,8.5v5.4c0,0.4,0.2,0.8,0.4,1.1C8.9,15.3,9.3,15.4,9.7,15.4z M9.7,8.2c0,0,0.1,0,0.1,0l4.7,2.7
+		c0.1,0.1,0.2,0.2,0.1,0.3c0,0-0.1,0.1-0.1,0.1l-4.7,2.7c-0.1,0-0.1,0-0.2,0c-0.1,0-0.1-0.1-0.1-0.1c0,0,0-0.1,0-0.1V8.5
+		C9.5,8.3,9.6,8.2,9.7,8.2z"/>
+</g>
+</svg>
diff --git a/images/icons/plugin_settings_black-24dp.svg b/images/icons/plugin_settings_black-24dp.svg
new file mode 100644
index 000000000..3045af9f0
--- /dev/null
+++ b/images/icons/plugin_settings_black-24dp.svg
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 24.3.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 24 24" style="enable-background:new 0 0 24 24;" xml:space="preserve">
+<path d="M18.1,10.7V7.1c0-0.4-0.3-0.7-0.7-0.7h-4c0.1-0.3,0.1-0.7,0.1-0.9c0-2-1.6-3.5-3.5-3.5C8,1.9,6.5,3.5,6.5,5.5
+	c0,0.3,0,0.7,0.1,0.9h-4C2.3,6.4,2,6.7,2,7.1v4.5c0,0.3,0.1,0.4,0.3,0.5c0.3,0.1,0.4,0.1,0.7,0.1C3.2,12,3.5,12,3.9,12
+	c1.2,0,2.3,1.1,2.3,2.3s-1.1,2.3-2.3,2.3c-0.3,0-0.7-0.1-0.9-0.3c-0.3-0.1-0.4-0.1-0.7,0.1C2.1,16.5,2,16.7,2,16.9v4.4
+	C2,21.6,2.3,22,2.7,22h14.7c0.4,0,0.7-0.3,0.7-0.7v-3.6c0.3,0,0.3,0,0.5,0c2,0,3.5-1.6,3.5-3.5C22.1,12,20.3,10.4,18.1,10.7z
+	 M17.1,16.4c-0.3,0.1-0.3,0.3-0.3,0.5v3.9H3.3v-3.1c2.3,0.3,4-1.5,4-3.5s-1.9-3.9-4-3.5V7.6h4.3l0,0c0.3,0,0.5-0.1,0.7-0.3
+	c0.1-0.3,0.1-0.5,0-0.7C7.9,6.3,7.7,5.9,7.7,5.5c0-1.2,1.1-2.3,2.3-2.3s2.3,1.1,2.3,2.3c0,0.4-0.1,0.8-0.4,1.2
+	c-0.1,0.3-0.1,0.5,0,0.7c0.1,0.1,0.3,0.3,0.7,0.3l0,0h4.3v3.9c0,0.3,0.1,0.4,0.3,0.5c0.3,0,0.5,0,0.7,0c0.3-0.1,0.7-0.3,0.9-0.3
+	c1.2,0,2.3,1.1,2.3,2.3s-1.1,2.3-2.3,2.3c-0.3,0-0.7-0.1-0.9-0.3C17.5,16.1,17.3,16.1,17.1,16.4z"/>
+</svg>
diff --git a/resources.qrc b/resources.qrc
index 9b40183a6..c551f33b9 100644
--- a/resources.qrc
+++ b/resources.qrc
@@ -79,7 +79,6 @@
         <file>images/icons/ic_hide_password.png</file>
         <file>images/icons/ic_show_password.png</file>
         <file>images/icons/baseline-desktop_windows-24px.svg</file>
-        <file>images/icons/baseline-people-24px.svg</file>
         <file>images/icons/ic_high_quality_24px.svg</file>
         <file>images/icons/insert_photo-24px.svg</file>
         <file>images/icons/round-add_a_photo-24px.svg</file>
@@ -135,6 +134,10 @@
         <file>images/icons/quote.svg</file>
         <file>images/icons/plugins-24px.svg</file>
         <file>images/icons/record_black_24dp.svg</file>
+        <file>images/icons/account_black-24dp.svg</file>
+        <file>images/icons/gear_black-24dp.svg</file>
+        <file>images/icons/media_black-24dp.svg</file>
+        <file>images/icons/plugin_settings_black-24dp.svg</file>
         <file>images/icons/share_stop_black_24dp.svg</file>
         <file>images/icons/share_screen_black_24dp.svg</file>
         <file>images/icons/chat_black_24dp.svg</file>
diff --git a/src/settingsview/components/SettingsMenu.qml b/src/settingsview/components/SettingsMenu.qml
index 0a2eb8e5e..af8384e8f 100644
--- a/src/settingsview/components/SettingsMenu.qml
+++ b/src/settingsview/components/SettingsMenu.qml
@@ -34,13 +34,13 @@ Rectangle {
 
     Component.onCompleted: {
         listModel.append({ 'type': SettingsView.Account, 'name': qsTr("Account"),
-                         'iconSource': "qrc:/images/icons/baseline-people-24px.svg"})
+                         'iconSource': "qrc:/images/icons/account_black-24dp.svg"})
         listModel.append({ 'type': SettingsView.General, 'name': qsTr("General"),
-                         'iconSource': "qrc:/images/icons/round-settings-24px.svg"})
+                         'iconSource': "qrc:/images/icons/gear_black-24dp.svg"})
         listModel.append({ 'type': SettingsView.Media, 'name': qsTr("Audio/Video"),
-                         'iconSource': "qrc:/images/icons/baseline-desktop_windows-24px.svg"})
+                         'iconSource': "qrc:/images/icons/media_black-24dp.svg"})
         listModel.append({ 'type': SettingsView.Plugin, 'name': qsTr("Plugin"),
-                         'iconSource': "qrc:/images/icons/extension_24dp.svg"})
+                         'iconSource': "qrc:/images/icons/plugin_settings_black-24dp.svg"})
     }
 
     anchors.fill: parent
@@ -71,18 +71,23 @@ Rectangle {
 
                 width: root.width
                 height: 64
+                preferredMargin: 24
 
                 buttonText: name
+                buttonTextFont.pointSize: JamiTheme.textFontSize + 2
+                textHAlign: Text.AlignLeft
+
                 source: iconSource
                 imageColor: JamiTheme.textColor
+                imageContainerHeight: 40
+                imageContainerWidth: 40
+
+                normalColor: root.color
                 pressedColor: Qt.lighter(JamiTheme.pressedButtonColor, 1.25)
                 checkedColor: JamiTheme.selectedColor
                 hoveredColor: JamiTheme.hoverColor
-                buttonTextFont.pointSize: JamiTheme.textFontSize + 2
+
                 duration: 0
-                textHAlign: Text.AlignLeft
-                preferredMargin: 24
-                normalColor: root.color
                 checkable: true
                 radius: 0
             }