From c77784b5c10ce93e798afca0b90df7606421d553 Mon Sep 17 00:00:00 2001 From: LemmyCook Date: Mon, 8 Sep 2025 21:23:57 -0400 Subject: [PATCH] Icons: most settings tabs --- Commons/Bootstrap.qml | 22 ++-------------- Modules/ArchUpdaterPanel/ArchUpdaterPanel.qml | 2 +- Modules/Bar/Widgets/NotificationHistory.qml | 2 +- Modules/Bar/Widgets/SystemMonitor.qml | 7 +++-- Modules/Bar/Widgets/Volume.qml | 6 ++--- Modules/BluetoothPanel/BluetoothPanel.qml | 2 +- Modules/Notification/Notification.qml | 2 +- .../Notification/NotificationHistoryPanel.qml | 4 +-- .../SettingsPanel/Bar/BarSectionEditor.qml | 2 +- .../Bar/BarWidgetSettingsDialog.qml | 2 +- Modules/SettingsPanel/SettingsPanel.qml | 26 +++++++++---------- Modules/SettingsPanel/Tabs/AudioTab.qml | 2 +- Modules/SidePanel/Cards/ProfileCard.qml | 2 +- Modules/WiFiPanel/WiFiPanel.qml | 8 +++--- Widgets/NColorPickerDialog.qml | 4 +-- Widgets/NIcon.qml | 1 - Widgets/NToast.qml | 2 +- 17 files changed, 38 insertions(+), 58 deletions(-) diff --git a/Commons/Bootstrap.qml b/Commons/Bootstrap.qml index bf55111..eba39e4 100644 --- a/Commons/Bootstrap.qml +++ b/Commons/Bootstrap.qml @@ -8,24 +8,6 @@ import qs.Commons Singleton { id: root - - // property var icons: { - // "sunny": "\uF1D2", - // "partly_cloudy": "\uF2BE", - // "cloud": "\uF2C3", - // "foggy": "\uF2A7", - // "rainy": "\uF29D", - // "snowy": "\uF2BC", - // "thunderstorm": "\uF2AC", - // "battery_empty": "\uF188", - // "battery_low": "\uF911", - // "battery_half": "\uF187", - // "battery_full": "\uF186", - // "battery_charging": "\uF185", - // "volume_muted": "\uF60D", - // "volume_off": "\uF60F", - // "volume_half": "\uF60B", - // "volume_full": "\uF611", // "brightness_low": "\uF1D4", // "brightness_high": "\uF1D2", // "wifi_disable": "\uF61B", @@ -33,7 +15,7 @@ Singleton { // "wifi_half": "\uF61A", // "wifi_full": "\uF61C", // "power": "\uF4FF", - // "gear": "\uF3E5", + // "close": "\uF659", // "check": "\uF272", // "panel": "\uF290", @@ -70,7 +52,7 @@ Singleton { // "bell": "\uF18A", // "bell_striked": "\uF631", // "drive": "\uF412", - // "bluetooth": "\uF682", + // "person": "\uF4DA", // "bar": "\uF52B", // "launcher": "\uF843", diff --git a/Modules/ArchUpdaterPanel/ArchUpdaterPanel.qml b/Modules/ArchUpdaterPanel/ArchUpdaterPanel.qml index e5b798c..dacaf9a 100644 --- a/Modules/ArchUpdaterPanel/ArchUpdaterPanel.qml +++ b/Modules/ArchUpdaterPanel/ArchUpdaterPanel.qml @@ -55,7 +55,7 @@ NPanel { } NIconButton { - icon: Bootstrap.icons["close"] + icon: Bootstrap.icons["x-lg"] tooltipText: "Close" sizeRatio: 0.8 onClicked: root.close() diff --git a/Modules/Bar/Widgets/NotificationHistory.qml b/Modules/Bar/Widgets/NotificationHistory.qml index a0836c3..4a64d36 100644 --- a/Modules/Bar/Widgets/NotificationHistory.qml +++ b/Modules/Bar/Widgets/NotificationHistory.qml @@ -53,7 +53,7 @@ NIconButton { } sizeRatio: 0.8 - icon: Settings.data.notifications.doNotDisturb ? Bootstrap.icons["bell_striked"] : Bootstrap.icons["bell"] + icon: Settings.data.notifications.doNotDisturb ? Bootstrap.icons["bell-slash"] : Bootstrap.icons["bell"] tooltipText: Settings.data.notifications.doNotDisturb ? "Notification history.\nRight-click to disable 'Do Not Disturb'." : "Notification history.\nRight-click to enable 'Do Not Disturb'." colorBg: Color.mSurfaceVariant colorFg: Color.mOnSurface diff --git a/Modules/Bar/Widgets/SystemMonitor.qml b/Modules/Bar/Widgets/SystemMonitor.qml index 58cfc90..e749116 100644 --- a/Modules/Bar/Widgets/SystemMonitor.qml +++ b/Modules/Bar/Widgets/SystemMonitor.qml @@ -66,7 +66,7 @@ RowLayout { NIcon { id: cpuUsageIcon - text: Bootstrap.icons["speed"] + text: Bootstrap.icons["speedometer2"] Layout.alignment: Qt.AlignVCenter } @@ -85,13 +85,12 @@ RowLayout { // CPU Temperature Component RowLayout { id: cpuTempLayout - // spacing is thin here to compensate for the vertical thermometer icon - spacing: Style.marginXXS * scaling + spacing: Style.marginXS * scaling Layout.alignment: Qt.AlignVCenter visible: showCpuTemp NIcon { - text: Bootstrap.icons["thermometer"] + text: Bootstrap.icons["fire"] Layout.alignment: Qt.AlignVCenter } diff --git a/Modules/Bar/Widgets/Volume.qml b/Modules/Bar/Widgets/Volume.qml index 1db94ec..286bdcb 100644 --- a/Modules/Bar/Widgets/Volume.qml +++ b/Modules/Bar/Widgets/Volume.qml @@ -43,11 +43,11 @@ Item { function getIcon() { if (AudioService.muted) { - return Bootstrap.icons["volume_muted"] + return Bootstrap.icons["volume-mute"] } return AudioService.volume - <= Number.EPSILON ? Bootstrap.icons["volume_off"] : (AudioService.volume - < 0.5 ? Bootstrap.icons["volume_half"] : Bootstrap.icons["volume_full"]) + <= Number.EPSILON ? Bootstrap.icons["volume-off"] : (AudioService.volume + < 0.5 ? Bootstrap.icons["volume-down"] : Bootstrap.icons["volume-up"]) } // Connection used to open the pill when volume changes diff --git a/Modules/BluetoothPanel/BluetoothPanel.qml b/Modules/BluetoothPanel/BluetoothPanel.qml index 958a293..9c26adc 100644 --- a/Modules/BluetoothPanel/BluetoothPanel.qml +++ b/Modules/BluetoothPanel/BluetoothPanel.qml @@ -54,7 +54,7 @@ NPanel { } NIconButton { - icon: Bootstrap.icons["close"] + icon: Bootstrap.icons["x-lg"] tooltipText: "Close" sizeRatio: 0.8 onClicked: { diff --git a/Modules/Notification/Notification.qml b/Modules/Notification/Notification.qml index e699d85..c78ed0d 100644 --- a/Modules/Notification/Notification.qml +++ b/Modules/Notification/Notification.qml @@ -294,7 +294,7 @@ Variants { // Close button positioned absolutely NIconButton { - icon: Bootstrap.icons["close"] + icon: Bootstrap.icons["x-lg"] tooltipText: "Close" sizeRatio: 0.6 anchors.top: parent.top diff --git a/Modules/Notification/NotificationHistoryPanel.qml b/Modules/Notification/NotificationHistoryPanel.qml index 7d2c1f0..06b8bd7 100644 --- a/Modules/Notification/NotificationHistoryPanel.qml +++ b/Modules/Notification/NotificationHistoryPanel.qml @@ -45,7 +45,7 @@ NPanel { } NIconButton { - icon: Settings.data.notifications.doNotDisturb ? Bootstrap.icons["bell_striked"] : Bootstrap.icons["bell"] + icon: Settings.data.notifications.doNotDisturb ? Bootstrap.icons["bell-slash"] : Bootstrap.icons["bell"] tooltipText: Settings.data.notifications.doNotDisturb ? "'Do Not Disturb' is enabled." : "'Do Not Disturb' is disabled." sizeRatio: 0.8 onClicked: Settings.data.notifications.doNotDisturb = !Settings.data.notifications.doNotDisturb @@ -59,7 +59,7 @@ NPanel { } NIconButton { - icon: Bootstrap.icons["close"] + icon: Bootstrap.icons["x-lg"] tooltipText: "Close" sizeRatio: 0.8 onClicked: { diff --git a/Modules/SettingsPanel/Bar/BarSectionEditor.qml b/Modules/SettingsPanel/Bar/BarSectionEditor.qml index 86c0863..3d206c7 100644 --- a/Modules/SettingsPanel/Bar/BarSectionEditor.qml +++ b/Modules/SettingsPanel/Bar/BarSectionEditor.qml @@ -210,7 +210,7 @@ NBox { } NIconButton { - icon: Bootstrap.icons["close"] + icon: Bootstrap.icons["x-lg"] sizeRatio: 0.6 colorBorder: Qt.alpha(Color.mOutline, Style.opacityLight) colorBg: Color.mOnSurface diff --git a/Modules/SettingsPanel/Bar/BarWidgetSettingsDialog.qml b/Modules/SettingsPanel/Bar/BarWidgetSettingsDialog.qml index 1d806b2..5cc8e0e 100644 --- a/Modules/SettingsPanel/Bar/BarWidgetSettingsDialog.qml +++ b/Modules/SettingsPanel/Bar/BarWidgetSettingsDialog.qml @@ -84,7 +84,7 @@ Popup { } NIconButton { - icon: Bootstrap.icons["close"] + icon: Bootstrap.icons["x-lg"] onClicked: settingsPopup.close() } } diff --git a/Modules/SettingsPanel/SettingsPanel.qml b/Modules/SettingsPanel/SettingsPanel.qml index 47b431b..d7ab9eb 100644 --- a/Modules/SettingsPanel/SettingsPanel.qml +++ b/Modules/SettingsPanel/SettingsPanel.qml @@ -128,22 +128,22 @@ NPanel { }, { "id": SettingsPanel.Tab.Bar, "label": "Bar", - "icon": "bar", + "icon": "segmented-nav", "source": barTab }, { "id": SettingsPanel.Tab.Launcher, "label": "Launcher", - "icon": "launcher", + "icon": "rocket", "source": launcherTab }, { "id": SettingsPanel.Tab.Audio, "label": "Audio", - "icon": "volume_full", + "icon": "speaker", "source": audioTab }, { "id": SettingsPanel.Tab.Display, "label": "Display", - "icon": "monitor", + "icon": "display", "source": displayTab }, { "id": SettingsPanel.Tab.Network, @@ -153,22 +153,22 @@ NPanel { }, { "id": SettingsPanel.Tab.Brightness, "label": "Brightness", - "icon": "brightness_high", + "icon": "brightness-high", "source": brightnessTab }, { "id": SettingsPanel.Tab.Weather, "label": "Weather", - "icon": "partly_cloudy", + "icon": "cloud-sun", "source": weatherTab }, { "id": SettingsPanel.Tab.ColorScheme, "label": "Color Scheme", - "icon": "paint_drop", + "icon": "palette", "source": colorSchemeTab }, { "id": SettingsPanel.Tab.Wallpaper, "label": "Wallpaper", - "icon": "image", + "icon": "easel", "source": wallpaperTab }] @@ -177,7 +177,7 @@ NPanel { newTabs.push({ "id": SettingsPanel.Tab.WallpaperSelector, "label": "Wallpaper Selector", - "icon": "paint_brush", + "icon": "image", "source": wallpaperSelectorTab }) } @@ -185,17 +185,17 @@ NPanel { newTabs.push({ "id": SettingsPanel.Tab.ScreenRecorder, "label": "Screen Recorder", - "icon": "video_camera", + "icon": "camera-video", "source": screenRecorderTab }, { "id": SettingsPanel.Tab.Hooks, "label": "Hooks", - "icon": "link", + "icon": "link-45deg", "source": hooksTab }, { "id": SettingsPanel.Tab.About, "label": "About", - "icon": "macaron", + "icon": "person", "source": aboutTab }) @@ -480,7 +480,7 @@ NPanel { // Close button NIconButton { - icon: Bootstrap.icons["close"] + icon: Bootstrap.icons["x-lg"] tooltipText: "Close" Layout.alignment: Qt.AlignVCenter onClicked: root.close() diff --git a/Modules/SettingsPanel/Tabs/AudioTab.qml b/Modules/SettingsPanel/Tabs/AudioTab.qml index aaf739c..20ece47 100644 --- a/Modules/SettingsPanel/Tabs/AudioTab.qml +++ b/Modules/SettingsPanel/Tabs/AudioTab.qml @@ -322,7 +322,7 @@ ColumnLayout { } NIconButton { - icon: Bootstrap.icons["close"] + icon: Bootstrap.icons["x-lg"] sizeRatio: 0.8 Layout.alignment: Qt.AlignVCenter Layout.rightMargin: Style.marginXS * scaling diff --git a/Modules/SidePanel/Cards/ProfileCard.qml b/Modules/SidePanel/Cards/ProfileCard.qml index 96521df..d85a432 100644 --- a/Modules/SidePanel/Cards/ProfileCard.qml +++ b/Modules/SidePanel/Cards/ProfileCard.qml @@ -78,7 +78,7 @@ NBox { NIconButton { id: closeButton - icon: Bootstrap.icons["close"] + icon: Bootstrap.icons["x-lg"] tooltipText: "Close side panel." onClicked: { sidePanel.close() diff --git a/Modules/WiFiPanel/WiFiPanel.qml b/Modules/WiFiPanel/WiFiPanel.qml index e39cdf9..59698ea 100644 --- a/Modules/WiFiPanel/WiFiPanel.qml +++ b/Modules/WiFiPanel/WiFiPanel.qml @@ -63,7 +63,7 @@ NPanel { } NIconButton { - icon: Bootstrap.icons["close"] + icon: Bootstrap.icons["x-lg"] tooltipText: "Close" sizeRatio: 0.8 onClicked: root.close() @@ -105,7 +105,7 @@ NPanel { } NIconButton { - icon: Bootstrap.icons["close"] + icon: Bootstrap.icons["x-lg"] sizeRatio: 0.6 onClicked: NetworkService.lastError = "" } @@ -492,7 +492,7 @@ NPanel { } NIconButton { - icon: Bootstrap.icons["close"] + icon: Bootstrap.icons["x-lg"] sizeRatio: 0.8 onClicked: { passwordSsid = "" @@ -547,7 +547,7 @@ NPanel { } NIconButton { - icon: Bootstrap.icons["close"] + icon: Bootstrap.icons["x-lg"] sizeRatio: 0.8 onClicked: expandedSsid = "" } diff --git a/Widgets/NColorPickerDialog.qml b/Widgets/NColorPickerDialog.qml index f78cc2f..7fe60bc 100644 --- a/Widgets/NColorPickerDialog.qml +++ b/Widgets/NColorPickerDialog.qml @@ -148,7 +148,7 @@ Popup { } NIconButton { - icon: Bootstrap.icons["close"] + icon: Bootstrap.icons["x-lg"] onClicked: root.close() } } @@ -492,7 +492,7 @@ Popup { NButton { id: cancelButton text: "Cancel" - icon: Bootstrap.icons["close"] + icon: Bootstrap.icons["x-lg"] outlined: cancelButton.hovered ? false : true customHeight: 36 * scaling customWidth: 100 * scaling diff --git a/Widgets/NIcon.qml b/Widgets/NIcon.qml index 2f5a330..0dc6f7b 100644 --- a/Widgets/NIcon.qml +++ b/Widgets/NIcon.qml @@ -4,7 +4,6 @@ import qs.Commons import qs.Widgets Text { - text: "\uF706" // fallback/default to balloon icon font.family: "bootstrap-icons" font.pointSize: Style.fontSizeL * scaling color: Color.mOnSurface diff --git a/Widgets/NToast.qml b/Widgets/NToast.qml index 4a52ab3..00cb81b 100644 --- a/Widgets/NToast.qml +++ b/Widgets/NToast.qml @@ -162,7 +162,7 @@ Item { // Close button (only if persistent or manual dismiss needed) NIconButton { - icon: Bootstrap.icons["close"] + icon: Bootstrap.icons["x-lg"] visible: root.persistent || root.duration === 0 colorBg: Color.mSurfaceVariant