From 122e95955dcfb12b6b927b2fce847c4de6446b27 Mon Sep 17 00:00:00 2001
From: quadbyte <studio@quadbyte.net>
Date: Wed, 20 Aug 2025 20:53:05 -0400
Subject: [PATCH] Settings: better option names. Replaced many font.bold by the
 proper syntax with Style. + Minor adjustments

---
 Modules/AppLauncher/AppLauncher.qml               |  5 ++---
 Modules/Bar/WiFiPanel.qml                         |  2 +-
 Modules/LockScreen/LockScreen.qml                 | 12 ++++++------
 Modules/Notification/NotificationHistoryPanel.qml |  4 ++--
 Modules/SettingsPanel/Tabs/BarTab.qml             |  4 ++--
 5 files changed, 13 insertions(+), 14 deletions(-)

diff --git a/Modules/AppLauncher/AppLauncher.qml b/Modules/AppLauncher/AppLauncher.qml
index 6567430..e9dc0df 100644
--- a/Modules/AppLauncher/AppLauncher.qml
+++ b/Modules/AppLauncher/AppLauncher.qml
@@ -236,7 +236,6 @@ NPanel {
             rightPadding: 0
             topPadding: 0
             bottomPadding: 0
-            font.bold: true
             Component.onCompleted: {
               // Focus the search bar by default
               Qt.callLater(() => {
@@ -360,7 +359,7 @@ NPanel {
                                                    || modelData.isCommand)
                   text: modelData.name ? modelData.name.charAt(0).toUpperCase() : "?"
                   font.pointSize: Style.fontSizeXXL * scaling
-                  font.weight: Font.Bold
+                  font.weight: Style.fontWeightBold
                   color: Color.mPrimary
                 }
 
@@ -379,7 +378,7 @@ NPanel {
                 NText {
                   text: modelData.name || "Unknown"
                   font.pointSize: Style.fontSizeL * scaling
-                  font.weight: Font.Bold
+                  font.weight: Style.fontWeightBold
                   color: (appCardArea.containsMouse || isSelected) ? Color.mOnPrimary : Color.mOnSurface
                   elide: Text.ElideRight
                   Layout.fillWidth: true
diff --git a/Modules/Bar/WiFiPanel.qml b/Modules/Bar/WiFiPanel.qml
index 7d28bd1..8d88cd9 100644
--- a/Modules/Bar/WiFiPanel.qml
+++ b/Modules/Bar/WiFiPanel.qml
@@ -43,7 +43,7 @@ NPanel {
         NText {
           text: "WiFi"
           font.pointSize: Style.fontSizeL * scaling
-          font.bold: true
+          font.weight: Style.fontWeightBold
           color: Color.mOnSurface
           Layout.fillWidth: true
         }
diff --git a/Modules/LockScreen/LockScreen.qml b/Modules/LockScreen/LockScreen.qml
index 93413fb..467400c 100644
--- a/Modules/LockScreen/LockScreen.qml
+++ b/Modules/LockScreen/LockScreen.qml
@@ -257,7 +257,7 @@ Loader {
                 text: Qt.formatDateTime(new Date(), "HH:mm")
                 font.family: Settings.data.ui.fontBillboard
                 font.pointSize: Style.fontSizeXXXL * 6 * scaling
-                font.weight: Font.Bold
+                font.weight: Style.fontWeightBold
                 font.letterSpacing: -2 * scaling
                 color: Color.mOnSurface
                 horizontalAlignment: Text.AlignHCenter
@@ -425,7 +425,7 @@ Loader {
                         color: Color.mOnSurface
                         font.family: Settings.data.ui.fontFixed
                         font.pointSize: Style.fontSizeL * scaling
-                        font.weight: Font.Bold
+                        font.weight: Style.fontWeightBold
                         Layout.fillWidth: true
                       }
 
@@ -445,7 +445,7 @@ Loader {
                           color: Color.mOnSurface
                           font.family: Settings.data.ui.fontFixed
                           font.pointSize: Style.fontSizeM * scaling
-                          font.weight: Font.Bold
+                          font.weight: Style.fontWeightBold
                         }
                       }
                     }
@@ -471,7 +471,7 @@ Loader {
                         color: Color.mPrimary
                         font.family: Settings.data.ui.fontFixed
                         font.pointSize: Style.fontSizeL * scaling
-                        font.weight: Font.Bold
+                        font.weight: Style.fontWeightBold
                       }
 
                       NText {
@@ -509,7 +509,7 @@ Loader {
                         color: Color.mPrimary
                         font.family: Settings.data.ui.fontFixed
                         font.pointSize: Style.fontSizeL * scaling
-                        font.weight: Font.Bold
+                        font.weight: Style.fontWeightBold
                       }
 
                       NText {
@@ -640,7 +640,7 @@ Loader {
                         color: executeButtonArea.containsMouse ? Color.mOnPrimary : Color.mPrimary
                         font.family: Settings.data.ui.fontFixed
                         font.pointSize: Style.fontSizeM * scaling
-                        font.weight: Font.Bold
+                        font.weight: Style.fontWeightBold
                       }
 
                       MouseArea {
diff --git a/Modules/Notification/NotificationHistoryPanel.qml b/Modules/Notification/NotificationHistoryPanel.qml
index 6c7e465..fb116bb 100644
--- a/Modules/Notification/NotificationHistoryPanel.qml
+++ b/Modules/Notification/NotificationHistoryPanel.qml
@@ -38,7 +38,7 @@ NPanel {
         NText {
           text: "Notification History"
           font.pointSize: Style.fontSizeL * scaling
-          font.bold: true
+          font.weight: Style.fontWeightBold
           color: Color.mOnSurface
           Layout.fillWidth: true
         }
@@ -131,7 +131,7 @@ NPanel {
                 text: (summary || "No summary").substring(0, 100)
                 font.pointSize: Style.fontSizeM * scaling
                 font.weight: Font.Medium
-                color: notificationMouseArea.containsMouse ? Color.mSurface : Color.mOnSurface
+                color: notificationMouseArea.containsMouse ? Color.mSurface : Color.mPrimary
                 wrapMode: Text.Wrap
                 width: parent.width - 60
                 maximumLineCount: 2
diff --git a/Modules/SettingsPanel/Tabs/BarTab.qml b/Modules/SettingsPanel/Tabs/BarTab.qml
index 328b5ca..e1db23b 100644
--- a/Modules/SettingsPanel/Tabs/BarTab.qml
+++ b/Modules/SettingsPanel/Tabs/BarTab.qml
@@ -80,7 +80,7 @@ ColumnLayout {
 
         NToggle {
           label: "Show Active Window"
-          description: "Display the title of the currently focused window on the left side of the bar."
+          description: "Display the title of the currently focused window."
           checked: Settings.data.bar.showActiveWindow
           onToggled: checked => {
                        Settings.data.bar.showActiveWindow = checked
@@ -88,7 +88,7 @@ ColumnLayout {
         }
 
         NToggle {
-          label: "Show App Icon Next To Active Window"
+          label: "Show Active Window's Icon"
           description: "Display the app icon next to the title of the currently focused window."
           checked: Settings.data.bar.showActiveWindowIcon
           onToggled: checked => {