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

Settings Tab: replaced Tab IDs by a QML enum

Browse source
This commit is contained in:
quadbyte 2025-08-14 07:42:03 -04:00
parent 71433c7807
commit 2a7810c17c
9 changed files with 36 additions and 42 deletions
Download patch file Download diff file Expand all files Collapse all files

48
Modules/Settings/SettingsPanel.qml
View file

@ -10,25 +10,7 @@ import qs.Widgets
NLoader {
id: root
property var tabsIds: null
property var requestedTab: null
Component.onCompleted: {
// Fill up our ideads
tabsIds = Object.freeze({
"GENERAL": 0,
"BAR": 1,
"TIME_WEATHER": 2,
"SCREEN_RECORDER": 3,
"NETWORK": 4,
"AUDIO": 5,
"DISPLAY": 6,
"WALLPAPER": 7,
"WALLPAPER_SELECTOR": 8,
"MISC": 9,
"ABOUT": 10
})
}
property int requestedTab: Settings.Tab.General
content: Component {
NPanel {
@ -74,63 +56,67 @@ NLoader {
WlrLayershell.keyboardFocus: WlrKeyboardFocus.OnDemand
property var tabsModel: [{
"id": root.tabsIds.GENERAL,
"id": Settings.Tab.General,
"label": "General",
"icon": "tune",
"source": "Tabs/General.qml"
}, {
"id": root.tabsIds.BAR,
"id": Settings.Tab.Bar,
"label": "Bar",
"icon": "web_asset",
"source": "Tabs/Bar.qml"
}, {
"id": root.tabsIds.TIME_WEATHER,
"id": Settings.Tab.TimeWeather,
"label": "Time & Weather",
"icon": "schedule",
"source": "Tabs/TimeWeather.qml"
}, {
"id": root.tabsIds.SCREEN_RECORDER,
"id": Settings.Tab.ScreenRecorder,
"label": "Screen Recorder",
"icon": "videocam",
"source": "Tabs/ScreenRecorder.qml"
}, {
"id": root.tabsIds.NETWORK,
"id": Settings.Tab.Network,
"label": "Network",
"icon": "lan",
"source": "Tabs/Network.qml"
}, {
"id": root.tabsIds.AUDIO,
"id": Settings.Tab.Audio,
"label": "Audio",
"icon": "volume_up",
"source": "Tabs/Audio.qml"
}, {
"id": root.tabsIds.DISPLAY,
"id": Settings.Tab.Display,
"label": "Display",
"icon": "monitor",
"source": "Tabs/Display.qml"
}, {
"id": root.tabsIds.WALLPAPER,
"id": Settings.Tab.Wallpaper,
"label": "Wallpaper",
"icon": "image",
"source": "Tabs/Wallpaper.qml"
}, {
"id": root.tabsIds.WALLPAPER_SELECTOR,
"id": Settings.Tab.WallpaperSelector,
"label": "Wallpaper Selector",
"icon": "wallpaper_slideshow",
"source": "Tabs/WallpaperSelector.qml"
}, // {
// "id": root.tabsIds.MISC,
// "id": TabId.Misc,
// "label": "Misc",
// "icon": "more_horiz",
// "source": "Tabs/Misc.qml"
// },
{
"id": root.tabsIds.ABOUT,
"id": Settings.Tab.About,
"label": "About",
"icon": "info",
"source": "Tabs/About.qml"
}]
Component.onCompleted: {
show()
}
// Combined visibility change handler
onVisibleChanged: {
if (visible) {
@ -156,8 +142,6 @@ NLoader {
}
}
Component.onCompleted: show()
Rectangle {
id: bgRect
color: Colors.backgroundPrimary