never/noctalia-shell
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Icons: WIP using a proper mapping table

Browse source
This commit is contained in:
LemmyCook 2025-09-08 21:05:48 -04:00
parent 8da2cdf430
commit a4107c87c0
41 changed files with 2277 additions and 183 deletions
Download patch file Download diff file Expand all files Collapse all files

2172
Commons/Bootstrap.qml Normal file
View file

File diff suppressed because it is too large Load diff

10
Modules/ArchUpdaterPanel/ArchUpdaterPanel.qml
View file

@ -44,7 +44,7 @@ NPanel {
// Reset button (only show if update failed) // Reset button (only show if update failed)
NIconButton { NIconButton {
visible: ArchUpdaterService.updateFailed visible: ArchUpdaterService.updateFailed
icon: FontService.icons["refresh"] icon: Bootstrap.icons["arrow-repeat"]
tooltipText: "Reset update state" tooltipText: "Reset update state"
sizeRatio: 0.8 sizeRatio: 0.8
colorBg: Color.mError colorBg: Color.mError
@ -55,7 +55,7 @@ NPanel {
} }
NIconButton { NIconButton {
icon: FontService.icons["close"] icon: Bootstrap.icons["close"]
tooltipText: "Close" tooltipText: "Close"
sizeRatio: 0.8 sizeRatio: 0.8
onClicked: root.close() onClicked: root.close()
@ -245,7 +245,7 @@ NPanel {
// Prominent refresh button // Prominent refresh button
NIconButton { NIconButton {
icon: FontService.icons["refresh"] icon: Bootstrap.icons["arrow-repeat"]
tooltipText: "Try checking again" tooltipText: "Try checking again"
sizeRatio: 1.2 sizeRatio: 1.2
colorBg: Color.mPrimary colorBg: Color.mPrimary
@ -295,7 +295,7 @@ NPanel {
// Prominent refresh button // Prominent refresh button
NIconButton { NIconButton {
icon: FontService.icons["refresh"] icon: Bootstrap.icons["arrow-repeat"]
tooltipText: "Refresh and try again" tooltipText: "Refresh and try again"
sizeRatio: 1.2 sizeRatio: 1.2
colorBg: Color.mPrimary colorBg: Color.mPrimary
@ -483,7 +483,7 @@ NPanel {
spacing: Style.marginL * scaling spacing: Style.marginL * scaling
NIconButton { NIconButton {
icon: FontService.icons["refresh"] icon: Bootstrap.icons["arrow-repeat"]
tooltipText: ArchUpdaterService.aurBusy ? "Checking for updates..." : (!ArchUpdaterService.canPoll ? "Refresh available soon" : "Refresh package lists") tooltipText: ArchUpdaterService.aurBusy ? "Checking for updates..." : (!ArchUpdaterService.canPoll ? "Refresh available soon" : "Refresh package lists")
onClicked: { onClicked: {
ArchUpdaterService.forceRefresh() ArchUpdaterService.forceRefresh()

2
Modules/Bar/Widgets/Bluetooth.qml
View file

@ -20,7 +20,7 @@ NIconButton {
colorBorder: Color.transparent colorBorder: Color.transparent
colorBorderHover: Color.transparent colorBorderHover: Color.transparent
icon: FontService.icons["bluetooth"] icon: Bootstrap.icons["bluetooth"]
tooltipText: "Bluetooth" tooltipText: "Bluetooth"
onClicked: PanelService.getPanel("bluetoothPanel")?.toggle(screen, this) onClicked: PanelService.getPanel("bluetoothPanel")?.toggle(screen, this)
} }

2
Modules/Bar/Widgets/Brightness.qml
View file

@ -46,7 +46,7 @@ Item {
function getIcon() { function getIcon() {
var monitor = getMonitor() var monitor = getMonitor()
var brightness = monitor ? monitor.brightness : 0 var brightness = monitor ? monitor.brightness : 0
return brightness <= 0.5 ? FontService.icons["brightness_low"] : FontService.icons["brightness_high"] return brightness <= 0.5 ? Bootstrap.icons["brightness_low"] : Bootstrap.icons["brightness_high"]
} }
// Connection used to open the pill when brightness changes // Connection used to open the pill when brightness changes

2
Modules/Bar/Widgets/DarkModeToggle.qml
View file

@ -9,7 +9,7 @@ NIconButton {
property ShellScreen screen property ShellScreen screen
property real scaling: 1.0 property real scaling: 1.0
icon: FontService.icons["contrast"] icon: Bootstrap.icons["contrast"]
tooltipText: "Toggle light/dark mode" tooltipText: "Toggle light/dark mode"
sizeRatio: 0.8 sizeRatio: 0.8

2
Modules/Bar/Widgets/KeepAwake.qml
View file

@ -13,7 +13,7 @@ NIconButton {
sizeRatio: 0.8 sizeRatio: 0.8
icon: FontService.icons["coffee"] icon: Bootstrap.icons["coffee"]
tooltipText: IdleInhibitorService.isInhibited ? "Disable keep awake" : "Enable keep awake" tooltipText: IdleInhibitorService.isInhibited ? "Disable keep awake" : "Enable keep awake"
colorBg: Color.mSurfaceVariant colorBg: Color.mSurfaceVariant
colorFg: IdleInhibitorService.isInhibited ? Color.mPrimary : Color.mOnSurface colorFg: IdleInhibitorService.isInhibited ? Color.mPrimary : Color.mOnSurface

2
Modules/Bar/Widgets/KeyboardLayout.qml
View file

@ -24,7 +24,7 @@ Item {
anchors.verticalCenter: parent.verticalCenter anchors.verticalCenter: parent.verticalCenter
rightOpen: BarWidgetRegistry.getNPillDirection(root) rightOpen: BarWidgetRegistry.getNPillDirection(root)
icon: FontService.icons["keyboard"] icon: Bootstrap.icons["keyboard"]
iconCircleColor: Color.mPrimary iconCircleColor: Color.mPrimary
collapsedIconColor: Color.mOnSurface collapsedIconColor: Color.mOnSurface
autoHide: false // Important to be false so we can hover as long as we want autoHide: false // Important to be false so we can hover as long as we want

4
Modules/Bar/Widgets/MediaMini.qml
View file

@ -134,7 +134,7 @@ RowLayout {
NIcon { NIcon {
id: windowIcon id: windowIcon
text: MediaService.isPlaying ? FontService.icons["pause"] : FontService.icons["play"] text: MediaService.isPlaying ? Bootstrap.icons["pause"] : Bootstrap.icons["play"]
font.pointSize: Style.fontSizeL * scaling font.pointSize: Style.fontSizeL * scaling
verticalAlignment: Text.AlignVCenter verticalAlignment: Text.AlignVCenter
Layout.alignment: Qt.AlignVCenter Layout.alignment: Qt.AlignVCenter
@ -154,7 +154,7 @@ RowLayout {
id: trackArt id: trackArt
anchors.fill: parent anchors.fill: parent
imagePath: MediaService.trackArtUrl imagePath: MediaService.trackArtUrl
fallbackIcon: MediaService.isPlaying ? FontService.icons["pause"] : FontService.icons["play"] fallbackIcon: MediaService.isPlaying ? Bootstrap.icons["pause"] : Bootstrap.icons["play"]
fallbackIconSize: 10 * scaling fallbackIconSize: 10 * scaling
borderWidth: 0 borderWidth: 0
border.color: Color.transparent border.color: Color.transparent

2
Modules/Bar/Widgets/NightLight.qml
View file

@ -20,7 +20,7 @@ NIconButton {
colorBorder: Color.transparent colorBorder: Color.transparent
colorBorderHover: Color.transparent colorBorderHover: Color.transparent
icon: FontService.icons["moon_stars"] icon: Bootstrap.icons["moon-stars"]
tooltipText: `Night light: ${Settings.data.nightLight.enabled ? "enabled." : "disabled."}\nLeft click to toggle.\nRight click to access settings.` tooltipText: `Night light: ${Settings.data.nightLight.enabled ? "enabled." : "disabled."}\nLeft click to toggle.\nRight click to access settings.`
onClicked: Settings.data.nightLight.enabled = !Settings.data.nightLight.enabled onClicked: Settings.data.nightLight.enabled = !Settings.data.nightLight.enabled

2
Modules/Bar/Widgets/NotificationHistory.qml
View file

@ -53,7 +53,7 @@ NIconButton {
} }
sizeRatio: 0.8 sizeRatio: 0.8
icon: Settings.data.notifications.doNotDisturb ? FontService.icons["bell_striked"] : FontService.icons["bell"] icon: Settings.data.notifications.doNotDisturb ? Bootstrap.icons["bell_striked"] : 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'." 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 colorBg: Color.mSurfaceVariant
colorFg: Color.mOnSurface colorFg: Color.mOnSurface

2
Modules/Bar/Widgets/SidePanelToggle.qml
View file

@ -33,7 +33,7 @@ NIconButton {
readonly property bool useDistroLogo: (widgetSettings.useDistroLogo readonly property bool useDistroLogo: (widgetSettings.useDistroLogo
!== undefined) ? widgetSettings.useDistroLogo : widgetMetadata.useDistroLogo !== undefined) ? widgetSettings.useDistroLogo : widgetMetadata.useDistroLogo
icon: useDistroLogo ? "" : FontService.icons["panel"] icon: useDistroLogo ? "" : Bootstrap.icons["panel"]
tooltipText: "Open side panel." tooltipText: "Open side panel."
sizeRatio: 0.8 sizeRatio: 0.8

10
Modules/Bar/Widgets/SystemMonitor.qml
View file

@ -66,7 +66,7 @@ RowLayout {
NIcon { NIcon {
id: cpuUsageIcon id: cpuUsageIcon
text: FontService.icons["speed"] text: Bootstrap.icons["speed"]
Layout.alignment: Qt.AlignVCenter Layout.alignment: Qt.AlignVCenter
} }
@ -91,7 +91,7 @@ RowLayout {
visible: showCpuTemp visible: showCpuTemp
NIcon { NIcon {
text: FontService.icons["thermometer"] text: Bootstrap.icons["thermometer"]
Layout.alignment: Qt.AlignVCenter Layout.alignment: Qt.AlignVCenter
} }
@ -114,7 +114,7 @@ RowLayout {
visible: showMemoryUsage visible: showMemoryUsage
NIcon { NIcon {
text: FontService.icons["memory"] text: Bootstrap.icons["memory"]
Layout.alignment: Qt.AlignVCenter Layout.alignment: Qt.AlignVCenter
} }
@ -137,7 +137,7 @@ RowLayout {
visible: showNetworkStats visible: showNetworkStats
NIcon { NIcon {
text: FontService.icons["download"] text: Bootstrap.icons["download"]
Layout.alignment: Qt.AlignVCenter Layout.alignment: Qt.AlignVCenter
} }
@ -160,7 +160,7 @@ RowLayout {
visible: showNetworkStats visible: showNetworkStats
NIcon { NIcon {
text: FontService.icons["upload"] text: Bootstrap.icons["upload"]
Layout.alignment: Qt.AlignVCenter Layout.alignment: Qt.AlignVCenter
} }

6
Modules/Bar/Widgets/Volume.qml
View file

@ -43,11 +43,11 @@ Item {
function getIcon() { function getIcon() {
if (AudioService.muted) { if (AudioService.muted) {
return FontService.icons["volume_muted"] return Bootstrap.icons["volume_muted"]
} }
return AudioService.volume return AudioService.volume
<= Number.EPSILON ? FontService.icons["volume_off"] : (AudioService.volume <= Number.EPSILON ? Bootstrap.icons["volume_off"] : (AudioService.volume
< 0.5 ? FontService.icons["volume_half"] : FontService.icons["volume_full"]) < 0.5 ? Bootstrap.icons["volume_half"] : Bootstrap.icons["volume_full"])
} }
// Connection used to open the pill when volume changes // Connection used to open the pill when volume changes

2
Modules/Bar/Widgets/WiFi.qml
View file

@ -23,7 +23,7 @@ NIconButton {
icon: { icon: {
try { try {
if (NetworkService.ethernetConnected) { if (NetworkService.ethernetConnected) {
return FontService.icons["ethernet"] return Bootstrap.icons["ethernet"]
} }
let connected = false let connected = false
let signalStrength = 0 let signalStrength = 0

7
Modules/BluetoothPanel/BluetoothPanel.qml
View file

@ -28,7 +28,7 @@ NPanel {
spacing: Style.marginM * scaling spacing: Style.marginM * scaling
NIcon { NIcon {
text: FontService.icons["bluetooth"] text: Bootstrap.icons["bluetooth"]
font.pointSize: Style.fontSizeXXL * scaling font.pointSize: Style.fontSizeXXL * scaling
color: Color.mPrimary color: Color.mPrimary
} }
@ -42,7 +42,8 @@ NPanel {
} }
NIconButton { NIconButton {
icon: BluetoothService.adapter && BluetoothService.adapter.discovering ? FontService.icons["stop"] : FontService.icons["refresh"] icon: BluetoothService.adapter
&& BluetoothService.adapter.discovering ? Bootstrap.icons["stop"] : Bootstrap.icons["arrow-repeat"]
tooltipText: "Refresh Devices" tooltipText: "Refresh Devices"
sizeRatio: 0.8 sizeRatio: 0.8
onClicked: { onClicked: {
@ -53,7 +54,7 @@ NPanel {
} }
NIconButton { NIconButton {
icon: FontService.icons["close"] icon: Bootstrap.icons["close"]
tooltipText: "Close" tooltipText: "Close"
sizeRatio: 0.8 sizeRatio: 0.8
onClicked: { onClicked: {

2
Modules/LockScreen/LockScreen.qml
View file

@ -328,7 +328,7 @@ Loader {
width: 100 * scaling width: 100 * scaling
height: 100 * scaling height: 100 * scaling
imagePath: Settings.data.general.avatarImage imagePath: Settings.data.general.avatarImage
fallbackIcon: FontService.icons["person"] fallbackIcon: Bootstrap.icons["person"]
} }
MouseArea { MouseArea {

2
Modules/Notification/Notification.qml
View file

@ -294,7 +294,7 @@ Variants {
// Close button positioned absolutely // Close button positioned absolutely
NIconButton { NIconButton {
icon: FontService.icons["close"] icon: Bootstrap.icons["close"]
tooltipText: "Close" tooltipText: "Close"
sizeRatio: 0.6 sizeRatio: 0.6
anchors.top: parent.top anchors.top: parent.top

10
Modules/Notification/NotificationHistoryPanel.qml
View file

@ -31,7 +31,7 @@ NPanel {
spacing: Style.marginM * scaling spacing: Style.marginM * scaling
NIcon { NIcon {
text: FontService.icons["bell"] text: Bootstrap.icons["bell"]
font.pointSize: Style.fontSizeXXL * scaling font.pointSize: Style.fontSizeXXL * scaling
color: Color.mPrimary color: Color.mPrimary
} }
@ -45,21 +45,21 @@ NPanel {
} }
NIconButton { NIconButton {
icon: Settings.data.notifications.doNotDisturb ? FontService.icons["bell_striked"] : FontService.icons["bell"] icon: Settings.data.notifications.doNotDisturb ? Bootstrap.icons["bell_striked"] : Bootstrap.icons["bell"]
tooltipText: Settings.data.notifications.doNotDisturb ? "'Do Not Disturb' is enabled." : "'Do Not Disturb' is disabled." tooltipText: Settings.data.notifications.doNotDisturb ? "'Do Not Disturb' is enabled." : "'Do Not Disturb' is disabled."
sizeRatio: 0.8 sizeRatio: 0.8
onClicked: Settings.data.notifications.doNotDisturb = !Settings.data.notifications.doNotDisturb onClicked: Settings.data.notifications.doNotDisturb = !Settings.data.notifications.doNotDisturb
} }
NIconButton { NIconButton {
icon: FontService.icons["trash"] icon: Bootstrap.icons["trash"]
tooltipText: "Clear history" tooltipText: "Clear history"
sizeRatio: 0.8 sizeRatio: 0.8
onClicked: NotificationService.clearHistory() onClicked: NotificationService.clearHistory()
} }
NIconButton { NIconButton {
icon: FontService.icons["close"] icon: Bootstrap.icons["close"]
tooltipText: "Close" tooltipText: "Close"
sizeRatio: 0.8 sizeRatio: 0.8
onClicked: { onClicked: {
@ -175,7 +175,7 @@ NPanel {
// Delete button // Delete button
NIconButton { NIconButton {
icon: FontService.icons["trash"] icon: Bootstrap.icons["trash"]
tooltipText: "Delete notification" tooltipText: "Delete notification"
sizeRatio: 0.7 sizeRatio: 0.7
Layout.alignment: Qt.AlignTop Layout.alignment: Qt.AlignTop

6
Modules/SettingsPanel/Bar/BarSectionEditor.qml
View file

@ -85,7 +85,7 @@ NBox {
} }
NIconButton { NIconButton {
icon: FontService.icons["plus"] icon: Bootstrap.icons["plus"]
colorBg: Color.mPrimary colorBg: Color.mPrimary
colorFg: Color.mOnPrimary colorFg: Color.mOnPrimary
@ -170,7 +170,7 @@ NBox {
Loader { Loader {
active: BarWidgetRegistry.widgetHasUserSettings(modelData.id) active: BarWidgetRegistry.widgetHasUserSettings(modelData.id)
sourceComponent: NIconButton { sourceComponent: NIconButton {
icon: FontService.icons["gear"] icon: Bootstrap.icons["gear"]
sizeRatio: 0.6 sizeRatio: 0.6
colorBorder: Qt.alpha(Color.mOutline, Style.opacityLight) colorBorder: Qt.alpha(Color.mOutline, Style.opacityLight)
colorBg: Color.mOnSurface colorBg: Color.mOnSurface
@ -210,7 +210,7 @@ NBox {
} }
NIconButton { NIconButton {
icon: FontService.icons["close"] icon: Bootstrap.icons["close"]
sizeRatio: 0.6 sizeRatio: 0.6
colorBorder: Qt.alpha(Color.mOutline, Style.opacityLight) colorBorder: Qt.alpha(Color.mOutline, Style.opacityLight)
colorBg: Color.mOnSurface colorBg: Color.mOnSurface

4
Modules/SettingsPanel/Bar/BarWidgetSettingsDialog.qml
View file

@ -84,7 +84,7 @@ Popup {
} }
NIconButton { NIconButton {
icon: FontService.icons["close"] icon: Bootstrap.icons["close"]
onClicked: settingsPopup.close() onClicked: settingsPopup.close()
} }
} }
@ -121,7 +121,7 @@ Popup {
NButton { NButton {
text: "Apply" text: "Apply"
icon: FontService.icons["check"] icon: Bootstrap.icons["check"]
onClicked: { onClicked: {
if (settingsLoader.item && settingsLoader.item.saveSettings) { if (settingsLoader.item && settingsLoader.item.saveSettings) {
var newSettings = settingsLoader.item.saveSettings() var newSettings = settingsLoader.item.saveSettings()

4
Modules/SettingsPanel/SettingsPanel.qml
View file

@ -408,7 +408,7 @@ NPanel {
height: width height: width
NIcon { NIcon {
text: FontService.icons[modelData.icon] text: Bootstrap.icons[modelData.icon]
color: tabTextColor color: tabTextColor
font.pointSize: Style.fontSizeL * scaling font.pointSize: Style.fontSizeL * scaling
anchors.centerIn: parent anchors.centerIn: parent
@ -480,7 +480,7 @@ NPanel {
// Close button // Close button
NIconButton { NIconButton {
icon: FontService.icons["close"] icon: Bootstrap.icons["close"]
tooltipText: "Close" tooltipText: "Close"
Layout.alignment: Qt.AlignVCenter Layout.alignment: Qt.AlignVCenter
onClicked: root.close() onClicked: root.close()

2
Modules/SettingsPanel/Tabs/AboutTab.qml
View file

@ -172,7 +172,7 @@ ColumnLayout {
imagePath: modelData.avatar_url || "" imagePath: modelData.avatar_url || ""
anchors.fill: parent anchors.fill: parent
anchors.margins: Style.marginXS * scaling anchors.margins: Style.marginXS * scaling
fallbackIcon: FontService.icons["person"] fallbackIcon: Bootstrap.icons["person"]
borderColor: contributorArea.containsMouse ? Color.mOnTertiary : Color.mPrimary borderColor: contributorArea.containsMouse ? Color.mOnTertiary : Color.mPrimary
borderWidth: Math.max(1, Style.borderM * scaling) borderWidth: Math.max(1, Style.borderM * scaling)

4
Modules/SettingsPanel/Tabs/AudioTab.qml
View file

@ -272,7 +272,7 @@ ColumnLayout {
// Button aligned to the center of the actual input field // Button aligned to the center of the actual input field
NIconButton { NIconButton {
icon: FontService.icons["plus"] icon: Bootstrap.icons["plus"]
Layout.alignment: Qt.AlignBottom Layout.alignment: Qt.AlignBottom
Layout.bottomMargin: blacklistInput.description ? Style.marginS * scaling : 0 Layout.bottomMargin: blacklistInput.description ? Style.marginS * scaling : 0
onClicked: { onClicked: {
@ -322,7 +322,7 @@ ColumnLayout {
} }
NIconButton { NIconButton {
icon: FontService.icons["close"] icon: Bootstrap.icons["close"]
sizeRatio: 0.8 sizeRatio: 0.8
Layout.alignment: Qt.AlignVCenter Layout.alignment: Qt.AlignVCenter
Layout.rightMargin: Style.marginXS * scaling Layout.rightMargin: Style.marginXS * scaling

2
Modules/SettingsPanel/Tabs/DisplayTab.qml
View file

@ -181,7 +181,7 @@ ColumnLayout {
} }
NIconButton { NIconButton {
icon: FontService.icons["refresh"] icon: Bootstrap.icons["arrow-repeat"]
tooltipText: "Reset scaling" tooltipText: "Reset scaling"
onClicked: ScalingService.setScreenScale(modelData, 1.0) onClicked: ScalingService.setScreenScale(modelData, 1.0)
} }

2
Modules/SettingsPanel/Tabs/GeneralTab.qml
View file

@ -19,7 +19,7 @@ ColumnLayout {
width: 108 * scaling width: 108 * scaling
height: 108 * scaling height: 108 * scaling
imagePath: Settings.data.general.avatarImage imagePath: Settings.data.general.avatarImage
fallbackIcon: FontService.icons["person"] fallbackIcon: Bootstrap.icons["person"]
borderColor: Color.mPrimary borderColor: Color.mPrimary
borderWidth: Math.max(1, Style.borderM * scaling) borderWidth: Math.max(1, Style.borderM * scaling)
Layout.alignment: Qt.AlignTop Layout.alignment: Qt.AlignTop

6
Modules/SettingsPanel/Tabs/WallpaperSelectorTab.qml
View file

@ -59,7 +59,7 @@ ColumnLayout {
anchors.fill: parent anchors.fill: parent
anchors.margins: Style.marginXS * scaling anchors.margins: Style.marginXS * scaling
imagePath: currentWallpaper imagePath: currentWallpaper
fallbackIcon: FontService.icons["image"] fallbackIcon: Bootstrap.icons["image"]
imageRadius: Style.radiusM * scaling imageRadius: Style.radiusM * scaling
borderColor: Color.mSecondary borderColor: Color.mSecondary
borderWidth: Style.borderL * 2 * scaling borderWidth: Style.borderL * 2 * scaling
@ -96,7 +96,7 @@ ColumnLayout {
} }
NIconButton { NIconButton {
icon: FontService.icons["refresh"] icon: Bootstrap.icons["arrow-repeat"]
tooltipText: "Refresh wallpaper list" tooltipText: "Refresh wallpaper list"
onClicked: { onClicked: {
WallpaperService.refreshWallpapersList() WallpaperService.refreshWallpapersList()
@ -181,7 +181,7 @@ ColumnLayout {
visible: isSelected visible: isSelected
NIcon { NIcon {
text: FontService.icons["check"] text: Bootstrap.icons["check"]
font.pointSize: Style.fontSizeM * scaling font.pointSize: Style.fontSizeM * scaling
font.weight: Style.fontWeightBold font.weight: Style.fontWeightBold
color: Color.mOnSecondary color: Color.mOnSecondary

14
Modules/SidePanel/Cards/MediaCard.qml
View file

@ -31,7 +31,7 @@ NBox {
} }
NIcon { NIcon {
text: FontService.icons["album"] text: Bootstrap.icons["album"]
font.pointSize: Style.fontSizeXXXL * 2.5 * scaling font.pointSize: Style.fontSizeXXXL * 2.5 * scaling
color: Color.mPrimary color: Color.mPrimary
Layout.alignment: Qt.AlignHCenter Layout.alignment: Qt.AlignHCenter
@ -89,7 +89,7 @@ NBox {
indicator: NIcon { indicator: NIcon {
x: playerSelector.width - width x: playerSelector.width - width
y: playerSelector.topPadding + (playerSelector.availableHeight - height) / 2 y: playerSelector.topPadding + (playerSelector.availableHeight - height) / 2
text: FontService.icons["arrow_drop_down"] text: Bootstrap.icons["arrow_drop_down"]
font.pointSize: Style.fontSizeXXL * scaling font.pointSize: Style.fontSizeXXL * scaling
color: Color.mOnSurface color: Color.mOnSurface
horizontalAlignment: Text.AlignRight horizontalAlignment: Text.AlignRight
@ -162,14 +162,14 @@ NBox {
anchors.fill: parent anchors.fill: parent
anchors.margins: Style.marginXS * scaling anchors.margins: Style.marginXS * scaling
imagePath: MediaService.trackArtUrl imagePath: MediaService.trackArtUrl
fallbackIcon: FontService.icons["album"] fallbackIcon: Bootstrap.icons["album"]
borderColor: Color.mOutline borderColor: Color.mOutline
borderWidth: Math.max(1, Style.borderS * scaling) borderWidth: Math.max(1, Style.borderS * scaling)
} }
// Fallback icon when no album art available // Fallback icon when no album art available
NIcon { NIcon {
text: FontService.icons["album"] text: Bootstrap.icons["album"]
color: Color.mPrimary color: Color.mPrimary
font.pointSize: Style.fontSizeL * 12 * scaling font.pointSize: Style.fontSizeL * 12 * scaling
visible: !trackArt.visible visible: !trackArt.visible
@ -307,7 +307,7 @@ NBox {
// Previous button // Previous button
NIconButton { NIconButton {
icon: FontService.icons["prev"] icon: Bootstrap.icons["prev"]
tooltipText: "Previous Media" tooltipText: "Previous Media"
visible: MediaService.canGoPrevious visible: MediaService.canGoPrevious
onClicked: MediaService.canGoPrevious ? MediaService.previous() : {} onClicked: MediaService.canGoPrevious ? MediaService.previous() : {}
@ -315,7 +315,7 @@ NBox {
// Play/Pause button // Play/Pause button
NIconButton { NIconButton {
icon: MediaService.isPlaying ? FontService.icons["pause"] : FontService.icons["play"] icon: MediaService.isPlaying ? Bootstrap.icons["pause"] : Bootstrap.icons["play"]
tooltipText: MediaService.isPlaying ? "Pause" : "Play" tooltipText: MediaService.isPlaying ? "Pause" : "Play"
visible: (MediaService.canPlay || MediaService.canPause) visible: (MediaService.canPlay || MediaService.canPause)
onClicked: (MediaService.canPlay || MediaService.canPause) ? MediaService.playPause() : {} onClicked: (MediaService.canPlay || MediaService.canPause) ? MediaService.playPause() : {}
@ -323,7 +323,7 @@ NBox {
// Next button // Next button
NIconButton { NIconButton {
icon: FontService.icons["next"] icon: Bootstrap.icons["next"]
tooltipText: "Next media" tooltipText: "Next media"
visible: MediaService.canGoNext visible: MediaService.canGoNext
onClicked: MediaService.canGoNext ? MediaService.next() : {} onClicked: MediaService.canGoNext ? MediaService.next() : {}

6
Modules/SidePanel/Cards/PowerProfilesCard.qml
View file

@ -28,7 +28,7 @@ NBox {
} }
// Performance // Performance
NIconButton { NIconButton {
icon: FontService.icons["speed"] icon: Bootstrap.icons["speed"]
tooltipText: "Set performance power profile." tooltipText: "Set performance power profile."
enabled: hasPP enabled: hasPP
opacity: enabled ? Style.opacityFull : Style.opacityMedium opacity: enabled ? Style.opacityFull : Style.opacityMedium
@ -42,7 +42,7 @@ NBox {
} }
// Balanced // Balanced
NIconButton { NIconButton {
icon: FontService.icons["yin_yang"] icon: Bootstrap.icons["yin_yang"]
tooltipText: "Set balanced power profile." tooltipText: "Set balanced power profile."
enabled: hasPP enabled: hasPP
opacity: enabled ? Style.opacityFull : Style.opacityMedium opacity: enabled ? Style.opacityFull : Style.opacityMedium
@ -56,7 +56,7 @@ NBox {
} }
// Eco // Eco
NIconButton { NIconButton {
icon: FontService.icons["leaf"] icon: Bootstrap.icons["leaf"]
tooltipText: "Set eco power profile." tooltipText: "Set eco power profile."
enabled: hasPP enabled: hasPP
opacity: enabled ? Style.opacityFull : Style.opacityMedium opacity: enabled ? Style.opacityFull : Style.opacityMedium

8
Modules/SidePanel/Cards/ProfileCard.qml
View file

@ -32,7 +32,7 @@ NBox {
width: Style.baseWidgetSize * 1.25 * scaling width: Style.baseWidgetSize * 1.25 * scaling
height: Style.baseWidgetSize * 1.25 * scaling height: Style.baseWidgetSize * 1.25 * scaling
imagePath: Settings.data.general.avatarImage imagePath: Settings.data.general.avatarImage
fallbackIcon: FontService.icons["person"] fallbackIcon: Bootstrap.icons["person"]
borderColor: Color.mPrimary borderColor: Color.mPrimary
borderWidth: Math.max(1, Style.borderM * scaling) borderWidth: Math.max(1, Style.borderM * scaling)
} }
@ -58,7 +58,7 @@ NBox {
Layout.fillWidth: true Layout.fillWidth: true
} }
NIconButton { NIconButton {
icon: FontService.icons["gear"] icon: Bootstrap.icons["gear"]
tooltipText: "Open settings." tooltipText: "Open settings."
onClicked: { onClicked: {
settingsPanel.requestedTab = SettingsPanel.Tab.General settingsPanel.requestedTab = SettingsPanel.Tab.General
@ -68,7 +68,7 @@ NBox {
NIconButton { NIconButton {
id: powerButton id: powerButton
icon: FontService.icons["power"] icon: Bootstrap.icons["power"]
tooltipText: "Power menu." tooltipText: "Power menu."
onClicked: { onClicked: {
powerPanel.open(screen) powerPanel.open(screen)
@ -78,7 +78,7 @@ NBox {
NIconButton { NIconButton {
id: closeButton id: closeButton
icon: FontService.icons["close"] icon: Bootstrap.icons["close"]
tooltipText: "Close side panel." tooltipText: "Close side panel."
onClicked: { onClicked: {
sidePanel.close() sidePanel.close()

8
Modules/SidePanel/Cards/SystemMonitorCard.qml
View file

@ -24,7 +24,7 @@ NBox {
NCircleStat { NCircleStat {
value: SystemStatService.cpuUsage value: SystemStatService.cpuUsage
icon: FontService.icons["speed"] icon: Bootstrap.icons["speed"]
flat: true flat: true
contentScale: 0.8 contentScale: 0.8
width: 72 * scaling width: 72 * scaling
@ -33,7 +33,7 @@ NBox {
NCircleStat { NCircleStat {
value: SystemStatService.cpuTemp value: SystemStatService.cpuTemp
suffix: "°C" suffix: "°C"
icon: FontService.icons["thermometer"] icon: Bootstrap.icons["thermometer"]
flat: true flat: true
contentScale: 0.8 contentScale: 0.8
width: 72 * scaling width: 72 * scaling
@ -41,7 +41,7 @@ NBox {
} }
NCircleStat { NCircleStat {
value: SystemStatService.memPercent value: SystemStatService.memPercent
icon: FontService.icons["memory"] icon: Bootstrap.icons["memory"]
flat: true flat: true
contentScale: 0.8 contentScale: 0.8
width: 72 * scaling width: 72 * scaling
@ -49,7 +49,7 @@ NBox {
} }
NCircleStat { NCircleStat {
value: SystemStatService.diskPercent value: SystemStatService.diskPercent
icon: FontService.icons["drive"] icon: Bootstrap.icons["drive"]
flat: true flat: true
contentScale: 0.8 contentScale: 0.8
width: 72 * scaling width: 72 * scaling

6
Modules/SidePanel/Cards/UtilitiesCard.qml
View file

@ -25,7 +25,7 @@ NBox {
} }
// Screen Recorder // Screen Recorder
NIconButton { NIconButton {
icon: FontService.icons["video_camera"] icon: Bootstrap.icons["video_camera"]
tooltipText: ScreenRecorderService.isRecording ? "Stop screen recording." : "Start screen recording." tooltipText: ScreenRecorderService.isRecording ? "Stop screen recording." : "Start screen recording."
colorBg: ScreenRecorderService.isRecording ? Color.mPrimary : Color.mSurfaceVariant colorBg: ScreenRecorderService.isRecording ? Color.mPrimary : Color.mSurfaceVariant
colorFg: ScreenRecorderService.isRecording ? Color.mOnPrimary : Color.mPrimary colorFg: ScreenRecorderService.isRecording ? Color.mOnPrimary : Color.mPrimary
@ -41,7 +41,7 @@ NBox {
// Idle Inhibitor // Idle Inhibitor
NIconButton { NIconButton {
icon: FontService.icons["coffee"] icon: Bootstrap.icons["coffee"]
tooltipText: IdleInhibitorService.isInhibited ? "Disable keep awake." : "Enable keep awake." tooltipText: IdleInhibitorService.isInhibited ? "Disable keep awake." : "Enable keep awake."
colorBg: IdleInhibitorService.isInhibited ? Color.mPrimary : Color.mSurfaceVariant colorBg: IdleInhibitorService.isInhibited ? Color.mPrimary : Color.mSurfaceVariant
colorFg: IdleInhibitorService.isInhibited ? Color.mOnPrimary : Color.mPrimary colorFg: IdleInhibitorService.isInhibited ? Color.mOnPrimary : Color.mPrimary
@ -53,7 +53,7 @@ NBox {
// Wallpaper // Wallpaper
NIconButton { NIconButton {
visible: Settings.data.wallpaper.enabled visible: Settings.data.wallpaper.enabled
icon: FontService.icons["image"] icon: Bootstrap.icons["image"]
tooltipText: "Left click: Open wallpaper selector.\nRight click: Set random wallpaper." tooltipText: "Left click: Open wallpaper selector.\nRight click: Set random wallpaper."
onClicked: { onClicked: {
var settingsPanel = PanelService.getPanel("settingsPanel") var settingsPanel = PanelService.getPanel("settingsPanel")

14
Modules/WiFiPanel/WiFiPanel.qml
View file

@ -55,7 +55,7 @@ NPanel {
} }
NIconButton { NIconButton {
icon: FontService.icons["refresh"] icon: Bootstrap.icons["arrow-repeat"]
tooltipText: "Refresh" tooltipText: "Refresh"
sizeRatio: 0.8 sizeRatio: 0.8
enabled: Settings.data.network.wifiEnabled && !NetworkService.scanning enabled: Settings.data.network.wifiEnabled && !NetworkService.scanning
@ -63,7 +63,7 @@ NPanel {
} }
NIconButton { NIconButton {
icon: FontService.icons["close"] icon: Bootstrap.icons["close"]
tooltipText: "Close" tooltipText: "Close"
sizeRatio: 0.8 sizeRatio: 0.8
onClicked: root.close() onClicked: root.close()
@ -105,7 +105,7 @@ NPanel {
} }
NIconButton { NIconButton {
icon: FontService.icons["close"] icon: Bootstrap.icons["close"]
sizeRatio: 0.6 sizeRatio: 0.6
onClicked: NetworkService.lastError = "" onClicked: NetworkService.lastError = ""
} }
@ -377,7 +377,7 @@ NPanel {
&& NetworkService.connectingTo !== modelData.ssid && NetworkService.connectingTo !== modelData.ssid
&& NetworkService.forgettingNetwork !== modelData.ssid && NetworkService.forgettingNetwork !== modelData.ssid
&& NetworkService.disconnectingFrom !== modelData.ssid && NetworkService.disconnectingFrom !== modelData.ssid
icon: FontService.icons["trash"] icon: Bootstrap.icons["trash"]
tooltipText: "Forget network" tooltipText: "Forget network"
sizeRatio: 0.7 sizeRatio: 0.7
onClicked: expandedSsid = expandedSsid === modelData.ssid ? "" : modelData.ssid onClicked: expandedSsid = expandedSsid === modelData.ssid ? "" : modelData.ssid
@ -492,7 +492,7 @@ NPanel {
} }
NIconButton { NIconButton {
icon: FontService.icons["close"] icon: Bootstrap.icons["close"]
sizeRatio: 0.8 sizeRatio: 0.8
onClicked: { onClicked: {
passwordSsid = "" passwordSsid = ""
@ -547,7 +547,7 @@ NPanel {
} }
NIconButton { NIconButton {
icon: FontService.icons["close"] icon: Bootstrap.icons["close"]
sizeRatio: 0.8 sizeRatio: 0.8
onClicked: expandedSsid = "" onClicked: expandedSsid = ""
} }
@ -586,7 +586,7 @@ NPanel {
NButton { NButton {
text: "Scan again" text: "Scan again"
icon: FontService.icons["refresh"] icon: Bootstrap.icons["arrow-repeat"]
Layout.alignment: Qt.AlignHCenter Layout.alignment: Qt.AlignHCenter
onClicked: NetworkService.scan() onClicked: NetworkService.scan()
} }

12
Services/BatteryService.qml
View file

@ -10,20 +10,20 @@ Singleton {
// Choose icon based on charge and charging state // Choose icon based on charge and charging state
function getIcon(percent, charging, isReady) { function getIcon(percent, charging, isReady) {
if (!isReady) { if (!isReady) {
return FontService.icons["battery_empty"] // FIXME: find battery error ? return Bootstrap.icons["battery_empty"] // FIXME: find battery error ?
} }
if (charging) { if (charging) {
return FontService.icons["battery_charging"] return Bootstrap.icons["battery_charging"]
} else { } else {
if (percent >= 85) if (percent >= 85)
return FontService.icons["battery_full"] return Bootstrap.icons["battery_full"]
if (percent >= 45) if (percent >= 45)
return FontService.icons["battery_half"] return Bootstrap.icons["battery_half"]
if (percent >= 25) if (percent >= 25)
return FontService.icons["battery_low"] return Bootstrap.icons["battery_low"]
if (percent >= 0) if (percent >= 0)
return FontService.icons["battery_empty"] return Bootstrap.icons["battery_empty"]
} }
} }
} }

79
Services/FontService.qml
View file

@ -13,85 +13,6 @@ Singleton {
property ListModel displayFonts: ListModel {} property ListModel displayFonts: ListModel {}
property bool fontsLoaded: false property bool fontsLoaded: false
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",
"wifi_low": "\uF619",
"wifi_half": "\uF61A",
"wifi_full": "\uF61C",
"power": "\uF4FF",
"gear": "\uF3E5",
"close": "\uF659",
"check": "\uF272",
"panel": "\uF290",
"memory": "\uF2D6",
"trash": "\uF78B",
"video_camera": "\uF21F",
"ethernet": "\uF2EB",
"speed": "\uF66B",
"leaf": "\uF90C",
"microphone": "\uF490",
"microphone_muted": "\uF48F",
"coffee": "\uF2E0",
"refresh": "\uF130",
"image": "\uF226",
"contrast": "\uF288",
"thermometer": "\uF5CD",
"paint_drop": "\uF30C",
"yin_yang": "\uF8E7",
"record": "\uF518",
"pause": "\uF4C1",
"play": "\uF4F2",
"stop": "\uF590",
"prev": "\uF561",
"next": "\uF55B",
"arrow_drop_down": "\uF22C",
"warning": "\uF334",
"info": "\uF26A",
"upload": "\uF296",
"download": "\uF294",
"album": "\uF2FF",
"plus": "\uF64D",
"minus": "\uF63B",
"eyedropper": "\uF342",
"bell": "\uF18A",
"bell_striked": "\uF631",
"drive": "\uF412",
"bluetooth": "\uF682",
"person": "\uF4DA",
"bar": "\uF52B",
"launcher": "\uF843",
"palette": "\uF4B1",
"sunrise": "\uF5A5",
"moon_stars": "\uF496",
"gauge": "\uF580",
"lightning": "\uF46D",
"keyboard": "\uF451",
"paint_brush": "\uEE26",
"link": "\uF470",
"macaron": "\uF154",
"box": "\uF1C8",
"monitor": "\uF302",
// another contrast \uF8F3 \uF8DA
}
// ------------------------------------------- // -------------------------------------------
function init() { function init() {
Logger.log("Font", "Service started") Logger.log("Font", "Service started")

20
Services/LocationService.qml
View file

@ -231,24 +231,24 @@ Singleton {
// -------------------------------- // --------------------------------
function weatherSymbolFromCode(code) { function weatherSymbolFromCode(code) {
if (code === 0) if (code === 0)
return FontService.icons["sunny"] return Bootstrap.icons["sun"]
if (code === 1 || code === 2) if (code === 1 || code === 2)
return FontService.icons["partly_cloudy"] return Bootstrap.icons["cloud-sun"]
if (code === 3) if (code === 3)
return FontService.icons["cloud"] return Bootstrap.icons["cloud"]
if (code >= 45 && code <= 48) if (code >= 45 && code <= 48)
return FontService.icons["foggy"] return Bootstrap.icons["cloud-haze"]
if (code >= 51 && code <= 67) if (code >= 51 && code <= 67)
return FontService.icons["rainy"] return Bootstrap.icons["cloud-rain"]
if (code >= 71 && code <= 77) if (code >= 71 && code <= 77)
return FontService.icons["snowy"] return Bootstrap.icons["cloud-snow"]
if (code >= 71 && code <= 77) if (code >= 71 && code <= 77)
return FontService.icons["snowy"] return Bootstrap.icons["cloud-snow"]
if (code >= 85 && code <= 86) if (code >= 85 && code <= 86)
return FontService.icons["snowy"] return Bootstrap.icons["cloud-snow"]
if (code >= 95 && code <= 99) if (code >= 95 && code <= 99)
return FontService.icons["thunderstorm"] return Bootstrap.icons["cloud-lightning"]
return FontService.icons["cloud"] return Bootstrap.icons["cloud"]
} }
// -------------------------------- // --------------------------------

2
Widgets/NColorPicker.qml
View file

@ -59,7 +59,7 @@ Rectangle {
} }
NIcon { NIcon {
text: FontService.icons["eyedropper"] text: Bootstrap.icons["eyedropper"]
color: Color.mOnSurfaceVariant color: Color.mOnSurfaceVariant
} }
} }

8
Widgets/NColorPickerDialog.qml
View file

@ -130,7 +130,7 @@ Popup {
spacing: Style.marginS * scaling spacing: Style.marginS * scaling
NIcon { NIcon {
text: FontService.icons["eyedropper"] text: Bootstrap.icons["eyedropper"]
font.pointSize: Style.fontSizeXXL * scaling font.pointSize: Style.fontSizeXXL * scaling
color: Color.mPrimary color: Color.mPrimary
} }
@ -148,7 +148,7 @@ Popup {
} }
NIconButton { NIconButton {
icon: FontService.icons["close"] icon: Bootstrap.icons["close"]
onClicked: root.close() onClicked: root.close()
} }
} }
@ -492,7 +492,7 @@ Popup {
NButton { NButton {
id: cancelButton id: cancelButton
text: "Cancel" text: "Cancel"
icon: FontService.icons["close"] icon: Bootstrap.icons["close"]
outlined: cancelButton.hovered ? false : true outlined: cancelButton.hovered ? false : true
customHeight: 36 * scaling customHeight: 36 * scaling
customWidth: 100 * scaling customWidth: 100 * scaling
@ -503,7 +503,7 @@ Popup {
NButton { NButton {
text: "Apply" text: "Apply"
icon: FontService.icons["check"] icon: Bootstrap.icons["check"]
customHeight: 36 * scaling customHeight: 36 * scaling
customWidth: 100 * scaling customWidth: 100 * scaling
onClicked: { onClicked: {

2
Widgets/NComboBox.qml
View file

@ -85,7 +85,7 @@ RowLayout {
indicator: NIcon { indicator: NIcon {
x: combo.width - width - Style.marginM * scaling x: combo.width - width - Style.marginM * scaling
y: combo.topPadding + (combo.availableHeight - height) / 2 y: combo.topPadding + (combo.availableHeight - height) / 2
text: FontService.icons["arrow_drop_down"] text: Bootstrap.icons["arrow_drop_down"]
font.pointSize: Style.fontSizeL * scaling font.pointSize: Style.fontSizeL * scaling
} }

2
Widgets/NInputAction.qml
View file

@ -14,7 +14,7 @@ RowLayout {
property string placeholderText: "" property string placeholderText: ""
property string text: "" property string text: ""
property string actionButtonText: "Test" property string actionButtonText: "Test"
property string actionButtonIcon: FontService.icons["play"] property string actionButtonIcon: Bootstrap.icons["play"]
property bool actionButtonEnabled: text !== "" property bool actionButtonEnabled: text !== ""
// Signals // Signals

4
Widgets/NSpinBox.qml
View file

@ -95,7 +95,7 @@ RowLayout {
NIcon { NIcon {
anchors.centerIn: parent anchors.centerIn: parent
text: FontService.icons["minus"] text: Bootstrap.icons["minus"]
font.pointSize: Style.fontSizeS * scaling font.pointSize: Style.fontSizeS * scaling
color: decreaseArea.containsMouse ? Color.mOnPrimary : Color.mPrimary color: decreaseArea.containsMouse ? Color.mOnPrimary : Color.mPrimary
} }
@ -130,7 +130,7 @@ RowLayout {
NIcon { NIcon {
anchors.centerIn: parent anchors.centerIn: parent
text: FontService.icons["plus"] text: Bootstrap.icons["plus"]
font.pointSize: Style.fontSizeS * scaling font.pointSize: Style.fontSizeS * scaling
color: increaseArea.containsMouse ? Color.mOnPrimary : Color.mPrimary color: increaseArea.containsMouse ? Color.mOnPrimary : Color.mPrimary
} }

4
Widgets/NToast.qml
View file

@ -118,7 +118,7 @@ Item {
// Icon // Icon
NIcon { NIcon {
id: icon id: icon
text: (root.type == "warning") ? FontService.icons["warning"] : FontService.icons["info"] text: (root.type == "warning") ? Bootstrap.icons["warning"] : Bootstrap.icons["info"]
color: { color: {
switch (root.type) { switch (root.type) {
case "warning": case "warning":
@ -162,7 +162,7 @@ Item {
// Close button (only if persistent or manual dismiss needed) // Close button (only if persistent or manual dismiss needed)
NIconButton { NIconButton {
icon: FontService.icons["close"] icon: Bootstrap.icons["close"]
visible: root.persistent || root.duration === 0 visible: root.persistent || root.duration === 0
colorBg: Color.mSurfaceVariant colorBg: Color.mSurfaceVariant