Use material icon for folders.

Signed-off-by: alex-z <[email protected]>

resources.qrc

@@ -48,6 +48,7 @@
         <file>src/gui/tray/CallNotificationDialog.qml</file>
         <file>src/gui/tray/EditFileLocallyLoadingDialog.qml</file>
         <file>src/gui/tray/NCBusyIndicator.qml</file>
+        <file>src/gui/tray/NCIconWithBackgroundImage.qml</file>
         <file>src/gui/tray/NCToolTip.qml</file>
         <file>src/gui/tray/NCProgressBar.qml</file>
         <file>src/gui/tray/EnforcedPlainTextLabel.qml</file>

src/gui/tray/NCIconWithBackgroundImage.qml

@@ -0,0 +1,56 @@
+/*
+ * Copyright (C) 2023 by Oleksandr Zolotov <[email protected]>
+ *
+ * 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.
+ */
+
+import QtQuick 2.15
+import Style 1.0
+
+Item {
+    id: root
+
+    property alias source: icon.source
+    property alias sourceSize: icon.sourceSize
+    property alias backgroundIconSource: backgroundImage.source
+
+    implicitWidth: backgroundImage.source !== "" ? backgroundImage.implicitWidth : icon.implicitWidth
+    implicitHeight: backgroundImage.source !== "" ? backgroundImage.implicitHeight : icon.implicitHeight
+
+    Image {
+        id: backgroundImage
+
+        anchors.fill: parent
+
+        cache: true
+        mipmap: true
+
+        sourceSize {
+            width: root.width
+            height: root.height
+        }
+
+        fillMode: Image.PreserveAspectFit
+        visible: source !== ""
+    }
+
+    Image {
+        id: icon
+
+        anchors.centerIn: parent
+
+        cache: true
+        mipmap: true
+
+        fillMode: Image.PreserveAspectFit
+        visible: source !== ""
+    }
+}

src/gui/tray/TrayFolderListItem.qml

@@ -21,7 +21,8 @@ MenuItem {
     id: root
 
     property string subline: ""
-    property string iconSource: "image://svgimage-custom-color/folder-group.svg/" + palette.buttonText
+    property string iconSource: "image://svgimage-custom-color/account-group.svg/" + palette.buttonText
+    property string backgroundIconSource: value
     property string toolTipText: root.text
 
     NCToolTip {
@@ -45,13 +46,12 @@ MenuItem {
         anchors.rightMargin: Style.trayWindowMenuEntriesMargin
         spacing: Style.trayHorizontalMargin
 
-        Image {
+        NCIconWithBackgroundImage {
             source: root.iconSource
-            cache: true
-            sourceSize.width: root.height * Style.smallIconScaleFactor
-            sourceSize.height: root.height * Style.smallIconScaleFactor
-            verticalAlignment: Qt.AlignVCenter
-            horizontalAlignment: Qt.AlignHCenter
+            sourceSize.width: root.height * 0.25
+            sourceSize.height: root.height * 0.25
+
+            backgroundIconSource: root.backgroundIconSource
 
             Layout.preferredHeight: root.height * Style.smallIconScaleFactor
             Layout.preferredWidth: root.height * Style.smallIconScaleFactor

src/gui/tray/TrayFoldersMenuButton.qml

@@ -100,9 +100,14 @@ HeaderButton {
 
         Image {
             id: openLocalFolderButtonIcon
-            cache: false
+            cache: true
             source: "image://svgimage-custom-color/folder.svg/" + Style.currentUserHeaderTextColor
 
+            sourceSize {
+                width: Style.headerButtonIconSize
+                height: Style.headerButtonIconSize
+            }
+
             verticalAlignment: Qt.AlignCenter
 
             Accessible.role: Accessible.Graphic
@@ -185,9 +190,10 @@ HeaderButton {
                         subline: model.modelData.parentPath
                         width: foldersMenuListView.width
                         height: Style.standardPrimaryButtonHeight
-                        iconSource: !isGroupFolder ?
-                                        "image://svgimage-custom-color/folder.svg/" + palette.buttonText :
-                                        "image://svgimage-custom-color/folder-group.svg/" + palette.buttonText
+                        backgroundIconSource: "image://svgimage-custom-color/folder.svg/" + palette.buttonText
+                        iconSource: isGroupFolder
+                                    ? "image://svgimage-custom-color/account-group.svg/" + palette.brightText
+                                    : ""
 
                         onTriggered: {
                             foldersMenu.close();

theme.qrc.in

@@ -44,6 +44,7 @@
         <file>theme/white/state-sync-64.png</file>
         <file>theme/white/state-sync-128.png</file>
         <file>theme/white/state-sync-256.png</file>
+        <file>theme/black/account-group.svg</file>
         <file>theme/black/change.svg</file>
         <file>theme/black/clear.svg</file>
         <file>theme/black/comment.svg</file>