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

New icons: more icons and cleanup

Browse source
This commit is contained in:
LemmyCook 2025-09-09 17:02:57 -04:00
parent 43eec0e387
commit 48f6c0705b
41 changed files with 6201 additions and 5018 deletions
Download patch file Download diff file Expand all files Collapse all files

21
Assets/Fonts/bootstrap/LICENSE
View file

@ -1,21 +0,0 @@
The MIT License (MIT)
Copyright (c) 2019-2024 The Bootstrap Authors
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:
The above copyright notice and this permission notice shall be included in
all copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE.

BIN
Assets/Fonts/bootstrap/bootstrap-icons.woff2
View file

Binary file not shown.

BIN
Assets/Fonts/tabler/tabler-icons.woff2 Normal file
View file

Binary file not shown.

19
Commons/Icons.qml
View file

@ -11,19 +11,28 @@ Singleton {
// Expose the font family name for easy access
readonly property string fontFamily: fontLoader.name
readonly property string defaultIcon: Bootstrap.defaultIcon
readonly property string defaultIcon: TablerIcons.defaultIcon
readonly property var icons: TablerIcons.icons
readonly property var aliases: TablerIcons.aliases
readonly property string fontPath: "/Assets/Fonts/tabler/tabler-icons.woff2"
Component.onCompleted: {
Logger.log("Icons", "Service started")
}
function get(iconName) {
return Bootstrap.icons[iconName]
// Check in aliases first
if (aliases[iconName] !== undefined) {
iconName = aliases[iconName]
}
// Find the appropriate codepoint
return icons[iconName]
}
FontLoader {
id: fontLoader
source: Quickshell.shellDir + "/Assets/Fonts/bootstrap/bootstrap-icons.woff2"
source: Quickshell.shellDir + fontPath
}
// Monitor font loading status
@ -31,9 +40,9 @@ Singleton {
target: fontLoader
function onStatusChanged() {
if (fontLoader.status === FontLoader.Ready) {
Logger.log("Bootstrap", "Font loaded successfully:", fontFamily)
Logger.log("Icons", "Font loaded successfully:", fontFamily)
} else if (fontLoader.status === FontLoader.Error) {
Logger.error("Bootstrap", "Font failed to load")
Logger.error("Icons", "Font failed to load")
}
}
}

28
Commons/IconsSets/Bootstrap.qml
View file

@ -9,7 +9,33 @@ Singleton {
readonly property string defaultIcon: "balloon"
readonly property var aliases: {
"close": "x-lg"
"close": "x-lg",
"settings": "gear",
"add": "plus-lg",
"media-pause": "pause",
"media-play": "play",
"media-prev": "skip-start",
"media-next": "skip-end",
"refresh": "arrow-repeat",
"cpu-usage": "speedometer2",
"cpu-temperature": "fire",
"memory": "cpu",
"performance": "speedometer2",
"balanced": "yin-yang",
"powersaver": "leaf",
"download-speed": "cloud-arrow-down",
"upload-speed": "cloud-arrow-up",
"storage": "hdd",
"bluetooth": "bluetooth",
"ethernet": "ethernet",
"keyboard": "keyboard",
"power": "power",
"keep-awake": "cup",
"nightlight": "moon-stars",
"camera-video": "camera-video",
"chevron-left": "chevron-left",
"chevron-right": "chevron-right",
"dark-mode": "transparency"
}
readonly property var icons: {

4904
Commons/IconsSets/Tabler.qml
View file

File diff suppressed because it is too large Load diff

6072
Commons/IconsSets/TablerIcons.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)
NIconButton {
visible: ArchUpdaterService.updateFailed
icon: "arrow-repeat"
icon: "refresh"
tooltipText: "Reset update state"
sizeRatio: 0.8
colorBg: Color.mError
@ -55,7 +55,7 @@ NPanel {
}
NIconButton {
icon: "x-lg"
icon: "close"
tooltipText: "Close"
sizeRatio: 0.8
onClicked: root.close()
@ -245,7 +245,7 @@ NPanel {
// Prominent refresh button
NIconButton {
icon: "arrow-repeat"
icon: "refresh"
tooltipText: "Try checking again"
sizeRatio: 1.2
colorBg: Color.mPrimary
@ -295,7 +295,7 @@ NPanel {
// Prominent refresh button
NIconButton {
icon: "arrow-repeat"
icon: "refresh"
tooltipText: "Refresh and try again"
sizeRatio: 1.2
colorBg: Color.mPrimary
@ -483,7 +483,7 @@ NPanel {
spacing: Style.marginL * scaling
NIconButton {
icon: "arrow-repeat"
icon: "refresh"
tooltipText: ArchUpdaterService.aurBusy ? "Checking for updates..." : (!ArchUpdaterService.canPoll ? "Refresh available soon" : "Refresh package lists")
onClicked: {
ArchUpdaterService.forceRefresh()

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

@ -32,7 +32,7 @@ NIconButton {
return "box"
}
if (ArchUpdaterService.aurBusy) {
return "arrow-repeat"
return "refresh"
}
if (ArchUpdaterService.totalUpdates > 0) {
return "box-fill"

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

@ -9,7 +9,7 @@ NIconButton {
property ShellScreen screen
property real scaling: 1.0
icon: "transparency"
icon: "dark-mode"
tooltipText: "Toggle light/dark mode"
sizeRatio: 0.8

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

@ -13,7 +13,7 @@ NIconButton {
sizeRatio: 0.8
icon: "cup"
icon: IdleInhibitorService.isInhibited ? "keep-awake-on" : "keep-awake-off"
tooltipText: IdleInhibitorService.isInhibited ? "Disable keep awake" : "Enable keep awake"
colorBg: IdleInhibitorService.isInhibited ? Color.mPrimary : Color.mSurfaceVariant
colorFg: IdleInhibitorService.isInhibited ? Color.mOnPrimary : Color.mOnSurface

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

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

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

@ -20,7 +20,7 @@ NIconButton {
colorBorder: Color.transparent
colorBorderHover: Color.transparent
icon: "moon-stars"
icon: Settings.data.nightLight.enabled ? "nightlight-on" : "nightlight-off"
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

8
Modules/Bar/Widgets/PowerProfile.qml
View file

@ -18,13 +18,13 @@ NIconButton {
function profileIcon() {
if (!hasPP)
return "yin-yang"
return "balanced"
if (PowerProfileService.profile === PowerProfile.Performance)
return "speedometer2"
return "performance"
if (PowerProfileService.profile === PowerProfile.Balanced)
return "yin-yang"
return "balanced"
if (PowerProfileService.profile === PowerProfile.PowerSaver)
return "leaf"
return "powersaver"
}
function profileName() {

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

@ -33,7 +33,7 @@ NIconButton {
readonly property bool useDistroLogo: (widgetSettings.useDistroLogo
!== undefined) ? widgetSettings.useDistroLogo : widgetMetadata.useDistroLogo
icon: useDistroLogo ? "" : "layout-sidebar-inset-reverse"
icon: useDistroLogo ? "" : "panel"
tooltipText: "Open side panel."
sizeRatio: 0.8

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

@ -71,7 +71,7 @@ RowLayout {
spacing: Style.marginXS * scaling
NIcon {
icon: "speedometer2"
icon: "cpu-usage"
font.pointSize: Style.fontSizeM * scaling
Layout.alignment: Qt.AlignVCenter
}
@ -101,7 +101,7 @@ RowLayout {
spacing: Style.marginXS * scaling
NIcon {
icon: "fire"
icon: "cpu-temperature"
// Fire is so tall, we need to make it smaller
font.pointSize: Style.fontSizeS * scaling
Layout.alignment: Qt.AlignVCenter
@ -132,7 +132,7 @@ RowLayout {
spacing: Style.marginXS * scaling
NIcon {
icon: "cpu"
icon: "memory"
font.pointSize: Style.fontSizeM * scaling
Layout.alignment: Qt.AlignVCenter
}
@ -162,7 +162,7 @@ RowLayout {
spacing: Style.marginXS * scaling
NIcon {
icon: "cloud-arrow-down"
icon: "download-speed"
font.pointSize: Style.fontSizeM * scaling
Layout.alignment: Qt.AlignVCenter
}
@ -192,7 +192,7 @@ RowLayout {
spacing: Style.marginXS * scaling
NIcon {
icon: "cloud-arrow-up"
icon: "upload-speed"
font.pointSize: Style.fontSizeM * scaling
Layout.alignment: Qt.AlignVCenter
}
@ -222,7 +222,7 @@ RowLayout {
spacing: Style.marginXS * scaling
NIcon {
icon: "hdd"
icon: "storage"
font.pointSize: Style.fontSizeM * scaling
Layout.alignment: Qt.AlignVCenter
}

4
Modules/BluetoothPanel/BluetoothPanel.qml
View file

@ -42,7 +42,7 @@ NPanel {
}
NIconButton {
icon: BluetoothService.adapter && BluetoothService.adapter.discovering ? "stop" : "arrow-repeat"
icon: BluetoothService.adapter && BluetoothService.adapter.discovering ? "stop" : "refresh"
tooltipText: "Refresh Devices"
sizeRatio: 0.8
onClicked: {
@ -53,7 +53,7 @@ NPanel {
}
NIconButton {
icon: "x-lg"
icon: "close"
tooltipText: "Close"
sizeRatio: 0.8
onClicked: {

4
Modules/Calendar/Calendar.qml
View file

@ -28,7 +28,7 @@ NPanel {
spacing: Style.marginS * scaling
NIconButton {
icon: "chevron_left"
icon: "chevron-left"
tooltipText: "Previous month"
onClicked: {
let newDate = new Date(grid.year, grid.month - 1, 1)
@ -47,7 +47,7 @@ NPanel {
}
NIconButton {
icon: "chevron_right"
icon: "chevron-right"
tooltipText: "Next month"
onClicked: {
let newDate = new Date(grid.year, grid.month + 1, 1)

2
Modules/LockScreen/LockScreen.qml
View file

@ -781,7 +781,7 @@ Loader {
NIcon {
id: iconReboot
anchors.centerIn: parent
icon: "arrow-repeat"
icon: "refresh"
font.pointSize: Style.fontSizeXXXL * scaling
color: restartButtonArea.containsMouse ? Color.mOnPrimary : Color.mPrimary
}

2
Modules/Notification/Notification.qml
View file

@ -292,7 +292,7 @@ Variants {
// Close button positioned absolutely
NIconButton {
icon: "x-lg"
icon: "close"
tooltipText: "Close"
sizeRatio: 0.6
anchors.top: parent.top

2
Modules/Notification/NotificationHistoryPanel.qml
View file

@ -59,7 +59,7 @@ NPanel {
}
NIconButton {
icon: "x-lg"
icon: "close"
tooltipText: "Close"
sizeRatio: 0.8
onClicked: {

4
Modules/PowerPanel/PowerPanel.qml
View file

@ -39,7 +39,7 @@ NPanel {
"subtitle": "Put the system to sleep"
}, {
"action": "reboot",
"icon": "arrow-repeat",
"icon": "refresh",
"title": "Reboot",
"subtitle": "Restart the system"
}, {
@ -276,7 +276,7 @@ NPanel {
}
NIconButton {
icon: timerActive ? "x-square" : "x-lg"
icon: timerActive ? "x-square" : "close"
tooltipText: timerActive ? "Cancel Timer" : "Close"
Layout.alignment: Qt.AlignVCenter
colorBg: timerActive ? Qt.alpha(Color.mError, 0.08) : Color.transparent

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

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

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

@ -84,7 +84,7 @@ Popup {
}
NIconButton {
icon: "x-lg"
icon: "close"
onClicked: settingsPopup.close()
}
}

8
Modules/SettingsPanel/Bar/WidgetSettings/CustomButtonSettings.qml
View file

@ -26,8 +26,8 @@ ColumnLayout {
id: iconInput
Layout.fillWidth: true
label: "Icon Name"
description: "Pick from Bootstrap Icons or type a name."
placeholderText: "Enter icon name (e.g., speedometer2, gear, house)"
description: "Select an icon from the library."
placeholderText: "Enter icon name (e.g., cat, gear, house, ...)"
text: widgetData?.icon || widgetMetadata.icon
}
@ -65,7 +65,7 @@ ColumnLayout {
property string query: ""
property string selectedIcon: ""
property var allIcons: Object.keys(Bootstrap.icons)
property var allIcons: Object.keys(Icons.icons)
property var filteredIcons: allIcons.filter(function (name) {
return query === "" || name.toLowerCase().indexOf(query.toLowerCase()) !== -1
})
@ -96,7 +96,7 @@ ColumnLayout {
Layout.fillWidth: true
}
NIconButton {
icon: "x-lg"
icon: "close"
onClicked: iconPicker.close()
}
}

34
Modules/SettingsPanel/SettingsPanel.qml
View file

@ -123,52 +123,52 @@ NPanel {
let newTabs = [{
"id": SettingsPanel.Tab.General,
"label": "General",
"icon": "box",
"icon": "settings-general",
"source": generalTab
}, {
"id": SettingsPanel.Tab.Bar,
"label": "Bar",
"icon": "segmented-nav",
"icon": "settings-bar",
"source": barTab
}, {
"id": SettingsPanel.Tab.Launcher,
"label": "Launcher",
"icon": "rocket",
"icon": "settings-launcher",
"source": launcherTab
}, {
"id": SettingsPanel.Tab.Audio,
"label": "Audio",
"icon": "speaker",
"icon": "settings-audio",
"source": audioTab
}, {
"id": SettingsPanel.Tab.Display,
"label": "Display",
"icon": "display",
"icon": "settings-display",
"source": displayTab
}, {
"id": SettingsPanel.Tab.Network,
"label": "Network",
"icon": "ethernet",
"icon": "settings-network",
"source": networkTab
}, {
"id": SettingsPanel.Tab.Brightness,
"label": "Brightness",
"icon": "brightness-high",
"icon": "settings-brightness",
"source": brightnessTab
}, {
"id": SettingsPanel.Tab.Weather,
"label": "Weather",
"icon": "cloud-sun",
"icon": "settings-weather",
"source": weatherTab
}, {
"id": SettingsPanel.Tab.ColorScheme,
"label": "Color Scheme",
"icon": "palette",
"icon": "settings-color-scheme",
"source": colorSchemeTab
}, {
"id": SettingsPanel.Tab.Wallpaper,
"label": "Wallpaper",
"icon": "easel",
"icon": "settings-wallpaper",
"source": wallpaperTab
}]
@ -177,7 +177,7 @@ NPanel {
newTabs.push({
"id": SettingsPanel.Tab.WallpaperSelector,
"label": "Wallpaper Selector",
"icon": "image",
"icon": "settings-wallpaper-selector",
"source": wallpaperSelectorTab
})
}
@ -185,17 +185,17 @@ NPanel {
newTabs.push({
"id": SettingsPanel.Tab.ScreenRecorder,
"label": "Screen Recorder",
"icon": "camera-video",
"icon": "settings-screen-recorder",
"source": screenRecorderTab
}, {
"id": SettingsPanel.Tab.Hooks,
"label": "Hooks",
"icon": "link-45deg",
"icon": "settings-hooks",
"source": hooksTab
}, {
"id": SettingsPanel.Tab.About,
"label": "About",
"icon": "info-circle",
"icon": "settings-about",
"source": aboutTab
})
@ -403,9 +403,9 @@ NPanel {
spacing: Style.marginM * scaling
NIcon {
text: Bootstrap.icons[modelData.icon]
icon: modelData.icon
color: tabTextColor
font.pointSize: Style.fontSizeL * scaling
font.pointSize: Style.fontSizeXL * scaling
}
// Tab label
NText {
@ -472,7 +472,7 @@ NPanel {
// Close button
NIconButton {
icon: "x-lg"
icon: "close"
tooltipText: "Close"
Layout.alignment: Qt.AlignVCenter
onClicked: root.close()

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

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

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

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

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

@ -96,7 +96,7 @@ ColumnLayout {
}
NIconButton {
icon: "arrow-repeat"
icon: "refresh"
tooltipText: "Refresh wallpaper list"
onClicked: {
WallpaperService.refreshWallpapersList()

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

@ -307,7 +307,7 @@ NBox {
// Previous button
NIconButton {
icon: "skip-start"
icon: "media-prev"
tooltipText: "Previous Media"
visible: MediaService.canGoPrevious
onClicked: MediaService.canGoPrevious ? MediaService.previous() : {}
@ -315,7 +315,7 @@ NBox {
// Play/Pause button
NIconButton {
icon: MediaService.isPlaying ? "pause" : "play"
icon: MediaService.isPlaying ? "media-pause" : "media-play"
tooltipText: MediaService.isPlaying ? "Pause" : "Play"
visible: (MediaService.canPlay || MediaService.canPause)
onClicked: (MediaService.canPlay || MediaService.canPause) ? MediaService.playPause() : {}
@ -323,7 +323,7 @@ NBox {
// Next button
NIconButton {
icon: "skip-end"
icon: "media-next"
tooltipText: "Next media"
visible: MediaService.canGoNext
onClicked: MediaService.canGoNext ? MediaService.next() : {}

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

@ -27,7 +27,7 @@ NBox {
}
// Performance
NIconButton {
icon: "speedometer2"
icon: "performance"
tooltipText: "Set performance power profile."
enabled: hasPP
opacity: enabled ? Style.opacityFull : Style.opacityMedium
@ -42,7 +42,7 @@ NBox {
}
// Balanced
NIconButton {
icon: "yin-yang"
icon: "balanced"
tooltipText: "Set balanced power profile."
enabled: hasPP
opacity: enabled ? Style.opacityFull : Style.opacityMedium
@ -57,7 +57,7 @@ NBox {
}
// Eco
NIconButton {
icon: "leaf"
icon: "powersaver"
tooltipText: "Set eco power profile."
enabled: hasPP
opacity: enabled ? Style.opacityFull : Style.opacityMedium

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

@ -59,7 +59,7 @@ NBox {
Layout.fillWidth: true
}
NIconButton {
icon: "gear"
icon: "settings"
tooltipText: "Open settings."
onClicked: {
settingsPanel.requestedTab = SettingsPanel.Tab.General
@ -79,7 +79,7 @@ NBox {
NIconButton {
id: closeButton
icon: "x-lg"
icon: "close"
tooltipText: "Close side panel."
onClicked: {
sidePanel.close()

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

@ -24,7 +24,7 @@ NBox {
NCircleStat {
value: SystemStatService.cpuUsage
icon: "speedometer2"
icon: "cpu-usage"
flat: true
contentScale: 0.8
width: 72 * scaling
@ -33,7 +33,7 @@ NBox {
NCircleStat {
value: SystemStatService.cpuTemp
suffix: "°C"
icon: "fire"
icon: "cpu-temperature"
flat: true
contentScale: 0.8
width: 72 * scaling
@ -41,7 +41,7 @@ NBox {
}
NCircleStat {
value: SystemStatService.memPercent
icon: "cpu"
icon: "memory"
flat: true
contentScale: 0.8
width: 72 * scaling

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

@ -44,7 +44,7 @@ NBox {
// Idle Inhibitor
NIconButton {
icon: "cup"
icon: IdleInhibitorService.isInhibited ? "keep-awake-on" : "keep-awake-off"
tooltipText: IdleInhibitorService.isInhibited ? "Disable keep awake." : "Enable keep awake."
colorBg: IdleInhibitorService.isInhibited ? Color.mPrimary : Color.mSurfaceVariant
colorFg: IdleInhibitorService.isInhibited ? Color.mOnPrimary : Color.mPrimary

12
Modules/WiFiPanel/WiFiPanel.qml
View file

@ -55,7 +55,7 @@ NPanel {
}
NIconButton {
icon: "arrow-repeat"
icon: "refresh"
tooltipText: "Refresh"
sizeRatio: 0.8
enabled: Settings.data.network.wifiEnabled && !NetworkService.scanning
@ -63,7 +63,7 @@ NPanel {
}
NIconButton {
icon: "x-lg"
icon: "close"
tooltipText: "Close"
sizeRatio: 0.8
onClicked: root.close()
@ -105,7 +105,7 @@ NPanel {
}
NIconButton {
icon: "x-lg"
icon: "close"
sizeRatio: 0.6
onClicked: NetworkService.lastError = ""
}
@ -492,7 +492,7 @@ NPanel {
}
NIconButton {
icon: "x-lg"
icon: "close"
sizeRatio: 0.8
onClicked: {
passwordSsid = ""
@ -547,7 +547,7 @@ NPanel {
}
NIconButton {
icon: "x-lg"
icon: "close"
sizeRatio: 0.8
onClicked: expandedSsid = ""
}
@ -586,7 +586,7 @@ NPanel {
NButton {
text: "Scan again"
icon: "arrow-repeat"
icon: "refresh"
Layout.alignment: Qt.AlignHCenter
onClicked: NetworkService.scan()
}

2
Services/NetworkService.qml
View file

@ -207,7 +207,7 @@ Singleton {
return "wifi-2"
if (signal >= 20)
return "wifi-1"
return "dot"
return "wifi-0"
}
function isSecured(security) {

4
Widgets/NColorPickerDialog.qml
View file

@ -148,7 +148,7 @@ Popup {
}
NIconButton {
icon: "x-lg"
icon: "close"
onClicked: root.close()
}
}
@ -492,7 +492,7 @@ Popup {
NButton {
id: cancelButton
text: "Cancel"
icon: "x-lg"
icon: "close"
outlined: cancelButton.hovered ? false : true
customHeight: 36 * scaling
customWidth: 100 * scaling

7
Widgets/NIcon.qml
View file

@ -4,8 +4,9 @@ import qs.Commons
import qs.Widgets
Text {
id: root
property string icon: Icons.defaultIcon
property string family: Icons.fontFamily
visible: (icon !== undefined) && (icon !== "")
text: {
@ -15,11 +16,11 @@ Text {
if (Icons.get(icon) === undefined) {
Logger.warn("Icon", `"${icon}"`, "doesn't exist in the icons font")
Logger.callStack()
return Icons.get(defaultIcon)
return Icons.get(Icons.defaultIcon)
}
return Icons.get(icon)
}
font.family: family
font.family: Icons.fontFamily
font.pointSize: Style.fontSizeL * scaling
color: Color.mOnSurface
verticalAlignment: Text.AlignVCenter

2
Widgets/NIconButton.qml
View file

@ -48,7 +48,7 @@ Rectangle {
NIcon {
icon: root.icon
font.pointSize: Math.max(1, root.width * 0.4)
font.pointSize: Math.max(1, root.width * 0.5)
color: root.enabled && root.hovering ? colorFgHover : colorFg
// Center horizontally
x: (root.width - width) / 2

2
Widgets/NInputAction.qml
View file

@ -14,7 +14,7 @@ RowLayout {
property string placeholderText: ""
property string text: ""
property string actionButtonText: "Test"
property string actionButtonIcon: "play"
property string actionButtonIcon: "media-play"
property bool actionButtonEnabled: text !== ""
// Signals

2
Widgets/NToast.qml
View file

@ -162,7 +162,7 @@ Item {
// Close button (only if persistent or manual dismiss needed)
NIconButton {
icon: "x-lg"
icon: "close"
visible: root.persistent || root.duration === 0
colorBg: Color.mSurfaceVariant