From 99bdec06696695a99d32ab88e0131d407bf5a320 Mon Sep 17 00:00:00 2001
From: Devin Lin <espidev@gmail.com>
Date: Mon, 13 Nov 2023 20:26:45 -0800
Subject: [PATCH] homescreens/folio: Improve configure menu

---
 .../ui/settings/SettingsComponent.qml         | 70 +++++++++++++++----
 1 file changed, 55 insertions(+), 15 deletions(-)

diff --git a/containments/homescreens/folio/package/contents/ui/settings/SettingsComponent.qml b/containments/homescreens/folio/package/contents/ui/settings/SettingsComponent.qml
index 0908c316..e6d218ad 100644
--- a/containments/homescreens/folio/package/contents/ui/settings/SettingsComponent.qml
+++ b/containments/homescreens/folio/package/contents/ui/settings/SettingsComponent.qml
@@ -46,6 +46,7 @@ Item {
         anchors.left: parent.left
         anchors.right: parent.right
         anchors.bottom: parent.bottom
+        anchors.bottomMargin: Kirigami.Units.largeSpacing
         height: root.height * (1 - settingsModeHomeScreenScale)
 
         RowLayout {
@@ -54,25 +55,51 @@ Item {
             spacing: Kirigami.Units.largeSpacing
 
             PC3.ToolButton {
-                text: i18n('Wallpapers')
+                opacity: 0.9
                 enabled: false
-                display: PC3.ToolButton.TextUnderIcon
-
-                icon.name: 'edit-image'
-
                 implicitHeight: Kirigami.Units.gridUnit * 4
                 implicitWidth: Kirigami.Units.gridUnit * 5
+
+                contentItem: ColumnLayout {
+                    spacing: Kirigami.Units.largeSpacing
+
+                    Kirigami.Icon {
+                        Layout.alignment: Qt.AlignHCenter | Qt.AlignBottom
+                        implicitWidth: Kirigami.Units.iconSizes.smallMedium
+                        implicitHeight: Kirigami.Units.iconSizes.smallMedium
+                        source: 'edit-image'
+                    }
+                    
+                    QQC2.Label {
+                        Layout.alignment: Qt.AlignHCenter | Qt.AlignTop
+                        text: i18n('Wallpapers')
+                        font.bold: true
+                    }
+                }
             }
 
             PC3.ToolButton {
-                text: ('Settings')
-                display: PC3.ToolButton.TextUnderIcon
-
-                icon.name: 'settings-configure'
-
+                opacity: 0.9
                 implicitHeight: Kirigami.Units.gridUnit * 4
                 implicitWidth: Kirigami.Units.gridUnit * 5
 
+                contentItem: ColumnLayout {
+                    spacing: Kirigami.Units.largeSpacing
+
+                    Kirigami.Icon {
+                        Layout.alignment: Qt.AlignHCenter | Qt.AlignBottom
+                        implicitWidth: Kirigami.Units.iconSizes.smallMedium
+                        implicitHeight: Kirigami.Units.iconSizes.smallMedium
+                        source: 'settings-configure'
+                    }
+                    
+                    QQC2.Label {
+                        Layout.alignment: Qt.AlignHCenter | Qt.AlignTop
+                        text: i18n('Settings')
+                        font.bold: true
+                    }
+                }
+
                 onClicked: {
                     // ensure that if the window is already opened, it gets raised to the top
                     settingsWindow.hide();
@@ -81,14 +108,27 @@ Item {
             }
 
             PC3.ToolButton {
-                text: 'Widgets'
-                display: PC3.ToolButton.TextUnderIcon
-
-                icon.name: 'widget-alternatives'
-
+                opacity: 0.9
                 implicitHeight: Kirigami.Units.gridUnit * 4
                 implicitWidth: Kirigami.Units.gridUnit * 5
 
+                contentItem: ColumnLayout {
+                    spacing: Kirigami.Units.largeSpacing
+
+                    Kirigami.Icon {
+                        Layout.alignment: Qt.AlignHCenter | Qt.AlignBottom
+                        implicitWidth: Kirigami.Units.iconSizes.smallMedium
+                        implicitHeight: Kirigami.Units.iconSizes.smallMedium
+                        source: 'widget-alternatives'
+                    }
+                    
+                    QQC2.Label {
+                        Layout.alignment: Qt.AlignHCenter | Qt.AlignTop
+                        text: i18n('Widgets')
+                        font.bold: true
+                    }
+                }
+
                 onClicked: {
                     appletListViewer.open = true;
                 }