lainns-mirror/noctalia-shell
1
0
Fork 0
mirror of https://github.com/noctalia-dev/noctalia-shell.git synced 2026-05-11 17:08:27 +08:00
Code Issues Packages Projects Releases Wiki Activity

ipc: fixing warnings

Browse Source
This commit is contained in:
Lemmy
2026-02-08 18:01:13 -05:00
parent 0ea0019c48
commit af3ea6252d
1 changed files with 81 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Services/Control/IPCService.qml
+81 -80
View File
@@ -35,99 +35,100 @@ Item {
}
}
// Settings IPC helpers (outside IpcHandler to avoid QVariant IPC warnings)
readonly property var _settingsTabMap: ({
"about": SettingsPanel.Tab.About,
"audio": SettingsPanel.Tab.Audio,
"bar": SettingsPanel.Tab.Bar,
"colorscheme": SettingsPanel.Tab.ColorScheme,
"lockscreen": SettingsPanel.Tab.LockScreen,
"controlcenter": SettingsPanel.Tab.ControlCenter,
"desktopwidgets": SettingsPanel.Tab.DesktopWidgets,
"osd": SettingsPanel.Tab.OSD,
"display": SettingsPanel.Tab.Display,
"dock": SettingsPanel.Tab.Dock,
"general": SettingsPanel.Tab.General,
"hooks": SettingsPanel.Tab.Hooks,
"launcher": SettingsPanel.Tab.Launcher,
"location": SettingsPanel.Tab.Location,
"network": SettingsPanel.Tab.Network,
"notifications": SettingsPanel.Tab.Notifications,
"plugins": SettingsPanel.Tab.Plugins,
"sessionmenu": SettingsPanel.Tab.SessionMenu,
"systemmonitor": SettingsPanel.Tab.SystemMonitor,
"userinterface": SettingsPanel.Tab.UserInterface,
"wallpaper": SettingsPanel.Tab.Wallpaper
})
function _parseSettingsTabArg(tabArg) {
var parts = tabArg.split("/");
var tabId = _resolveSettingsTab(parts[0]);
var subTabId = parts.length > 1 ? parseInt(parts[1]) : -1;
return {
"tab": tabId,
"subTab": isNaN(subTabId) ? -1 : subTabId
};
}
function _resolveSettingsTab(tabName) {
if (!tabName)
return SettingsPanel.Tab.General;
var key = tabName.toLowerCase().replace(/[-_]/g, "");
if (key in _settingsTabMap)
return _settingsTabMap[key];
Logger.w("IPC", "Unknown settings tab: " + tabName);
return SettingsPanel.Tab.General;
}
function _settingsToggle(tabId, subTabId) {
if (Settings.data.ui.settingsPanelMode === "window") {
if (SettingsPanelService.isWindowOpen) {
SettingsPanelService.closeWindow();
} else {
SettingsPanelService.openToTab(tabId, subTabId);
}
} else {
root.screenDetector.withCurrentScreen(screen => {
var settingsPanel = PanelService.getPanel("settingsPanel", screen);
if (settingsPanel?.isPanelOpen) {
settingsPanel.close();
} else {
settingsPanel?.openToTab(tabId, subTabId);
}
});
}
}
function _settingsOpen(tabId, subTabId) {
if (Settings.data.ui.settingsPanelMode === "window") {
SettingsPanelService.openToTab(tabId, subTabId);
} else {
root.screenDetector.withCurrentScreen(screen => {
var settingsPanel = PanelService.getPanel("settingsPanel", screen);
settingsPanel?.openToTab(tabId, subTabId);
});
}
}
IpcHandler {
target: "settings"
readonly property var _tabMap: ({
"about": SettingsPanel.Tab.About,
"audio": SettingsPanel.Tab.Audio,
"bar": SettingsPanel.Tab.Bar,
"colorscheme": SettingsPanel.Tab.ColorScheme,
"lockscreen": SettingsPanel.Tab.LockScreen,
"controlcenter": SettingsPanel.Tab.ControlCenter,
"desktopwidgets": SettingsPanel.Tab.DesktopWidgets,
"osd": SettingsPanel.Tab.OSD,
"display": SettingsPanel.Tab.Display,
"dock": SettingsPanel.Tab.Dock,
"general": SettingsPanel.Tab.General,
"hooks": SettingsPanel.Tab.Hooks,
"launcher": SettingsPanel.Tab.Launcher,
"location": SettingsPanel.Tab.Location,
"network": SettingsPanel.Tab.Network,
"notifications": SettingsPanel.Tab.Notifications,
"plugins": SettingsPanel.Tab.Plugins,
"sessionmenu": SettingsPanel.Tab.SessionMenu,
"systemmonitor": SettingsPanel.Tab.SystemMonitor,
"userinterface": SettingsPanel.Tab.UserInterface,
"wallpaper": SettingsPanel.Tab.Wallpaper
})
function _parseTabArg(tabArg) {
var parts = tabArg.split("/");
var tabId = _resolveTab(parts[0]);
var subTabId = parts.length > 1 ? parseInt(parts[1]) : -1;
return {
"tab": tabId,
"subTab": isNaN(subTabId) ? -1 : subTabId
};
}
function _resolveTab(tabName) {
if (!tabName)
return SettingsPanel.Tab.General;
var key = tabName.toLowerCase().replace(/[-_]/g, "");
if (key in _tabMap)
return _tabMap[key];
Logger.w("IPC", "Unknown settings tab: " + tabName);
return SettingsPanel.Tab.General;
}
function _toggle(tabId, subTabId) {
if (Settings.data.ui.settingsPanelMode === "window") {
if (SettingsPanelService.isWindowOpen) {
SettingsPanelService.closeWindow();
} else {
SettingsPanelService.openToTab(tabId, subTabId);
}
} else {
root.screenDetector.withCurrentScreen(screen => {
var settingsPanel = PanelService.getPanel("settingsPanel", screen);
if (settingsPanel?.isPanelOpen) {
settingsPanel.close();
} else {
settingsPanel?.openToTab(tabId, subTabId);
}
});
}
}
function _open(tabId, subTabId) {
if (Settings.data.ui.settingsPanelMode === "window") {
SettingsPanelService.openToTab(tabId, subTabId);
} else {
root.screenDetector.withCurrentScreen(screen => {
var settingsPanel = PanelService.getPanel("settingsPanel", screen);
settingsPanel?.openToTab(tabId, subTabId);
});
}
}
function toggle() {
_toggle(SettingsPanel.Tab.General, -1);
root._settingsToggle(SettingsPanel.Tab.General, -1);
}
function toggleTab(tab: string) {
var parsed = _parseTabArg(tab);
_toggle(parsed.tab, parsed.subTab);
var parsed = root._parseSettingsTabArg(tab);
root._settingsToggle(parsed.tab, parsed.subTab);
}
function open() {
_open(SettingsPanel.Tab.General, -1);
root._settingsOpen(SettingsPanel.Tab.General, -1);
}
function openTab(tab: string) {
var parsed = _parseTabArg(tab);
_open(parsed.tab, parsed.subTab);
var parsed = root._parseSettingsTabArg(tab);
root._settingsOpen(parsed.tab, parsed.subTab);
}
}