From 355271768cabcd34058838ecaa510fdc06215a85 Mon Sep 17 00:00:00 2001 From: ItsLemmy Date: Sat, 8 Nov 2025 16:38:43 -0500 Subject: [PATCH] Services in subfolder + cleanup/fixes --- Assets/settings-default.json | 2 +- Commons/KeyboardLayout.qml | 1 + Commons/Settings.qml | 2 +- Commons/Style.qml | 4 +--- Modules/Background/Background.qml | 7 ++++--- Modules/Background/Overview.qml | 3 ++- Modules/Bar/Bar.qml | 2 +- Modules/Bar/Extras/BarPill.qml | 1 - Modules/Bar/Extras/BarPillHorizontal.qml | 2 +- Modules/Bar/Extras/BarPillVertical.qml | 2 +- Modules/Bar/Extras/BarWidgetLoader.qml | 2 +- Modules/Bar/Widgets/ActiveWindow.qml | 4 +--- Modules/Bar/Widgets/AudioVisualizer.qml | 5 +++-- Modules/Bar/Widgets/Battery.qml | 3 ++- Modules/Bar/Widgets/Bluetooth.qml | 2 +- Modules/Bar/Widgets/Brightness.qml | 2 +- Modules/Bar/Widgets/Clock.qml | 2 +- Modules/Bar/Widgets/ControlCenter.qml | 6 +++--- Modules/Bar/Widgets/CustomButton.qml | 2 +- Modules/Bar/Widgets/DarkMode.qml | 2 +- Modules/Bar/Widgets/KeepAwake.qml | 2 +- Modules/Bar/Widgets/KeyboardLayout.qml | 3 ++- Modules/Bar/Widgets/LockKeys.qml | 3 ++- Modules/Bar/Widgets/MediaMini.qml | 3 ++- Modules/Bar/Widgets/Microphone.qml | 6 +++--- Modules/Bar/Widgets/NightLight.qml | 2 +- Modules/Bar/Widgets/NoctaliaPerformance.qml | 2 +- Modules/Bar/Widgets/NotificationHistory.qml | 3 ++- Modules/Bar/Widgets/PowerProfile.qml | 2 +- Modules/Bar/Widgets/ScreenRecorder.qml | 4 +++- Modules/Bar/Widgets/SessionMenu.qml | 1 - Modules/Bar/Widgets/Spacer.qml | 1 - Modules/Bar/Widgets/SystemMonitor.qml | 3 ++- Modules/Bar/Widgets/Taskbar.qml | 3 ++- Modules/Bar/Widgets/TaskbarGrouped.qml | 3 ++- Modules/Bar/Widgets/Tray.qml | 2 +- Modules/Bar/Widgets/Volume.qml | 7 ++++--- Modules/Bar/Widgets/WallpaperSelector.qml | 2 +- Modules/Bar/Widgets/WiFi.qml | 2 +- Modules/Bar/Widgets/Workspace.qml | 3 ++- Modules/Dock/Dock.qml | 2 +- Modules/Dock/DockMenu.qml | 1 - Modules/LockScreen/LockScreen.qml | 1 - Modules/MainScreen/AllScreens.qml | 2 +- Modules/MainScreen/MainScreen.qml | 13 +------------ Modules/MainScreen/ScreenCorners.qml | 1 - Modules/MainScreen/SmartPanel.qml | 2 +- Modules/Notification/Notification.qml | 2 +- Modules/OSD/OSD.qml | 4 +++- Modules/Panels/Audio/AudioPanel.qml | 2 +- Modules/Panels/Battery/BatteryPanel.qml | 2 +- Modules/Panels/Bluetooth/BluetoothDevicesList.qml | 2 +- Modules/Panels/Bluetooth/BluetoothPanel.qml | 6 +++--- Modules/Panels/Calendar/CalendarPanel.qml | 5 +++-- Modules/Panels/ControlCenter/Cards/AudioCard.qml | 2 +- Modules/Panels/ControlCenter/Cards/MediaCard.qml | 5 +++-- Modules/Panels/ControlCenter/Cards/ProfileCard.qml | 4 ++-- .../Panels/ControlCenter/Cards/ShortcutsCard.qml | 1 - .../ControlCenter/Cards/SystemMonitorCard.qml | 2 +- Modules/Panels/ControlCenter/Cards/WeatherCard.qml | 2 +- .../Panels/ControlCenter/ControlCenterPanel.qml | 5 +++-- .../ControlCenter/ControlCenterWidgetLoader.qml | 2 +- Modules/Panels/ControlCenter/Widgets/Bluetooth.qml | 3 ++- .../Panels/ControlCenter/Widgets/CustomButton.qml | 1 - Modules/Panels/ControlCenter/Widgets/KeepAwake.qml | 2 +- .../Panels/ControlCenter/Widgets/NightLight.qml | 3 ++- .../Panels/ControlCenter/Widgets/Notifications.qml | 3 ++- .../Panels/ControlCenter/Widgets/PowerProfile.qml | 6 ++---- .../ControlCenter/Widgets/ScreenRecorder.qml | 5 ++--- .../ControlCenter/Widgets/WallpaperSelector.qml | 2 +- Modules/Panels/ControlCenter/Widgets/WiFi.qml | 3 ++- Modules/Panels/Launcher/Launcher.qml | 5 ++--- .../Panels/Launcher/Plugins/ApplicationsPlugin.qml | 1 - .../Panels/Launcher/Plugins/CalculatorPlugin.qml | 1 - .../Panels/Launcher/Plugins/ClipboardPlugin.qml | 2 +- .../NotificationHistoryPanel.qml | 2 +- Modules/Panels/SessionMenu/SessionMenu.qml | 2 +- .../Settings/Bar/BarWidgetSettingsDialog.qml | 2 +- .../ControlCenterWidgetSettingsDialog.qml | 2 +- Modules/Panels/Settings/SettingsPanel.qml | 5 ++--- Modules/Panels/Settings/Tabs/AboutTab.qml | 2 +- Modules/Panels/Settings/Tabs/AudioTab.qml | 2 +- Modules/Panels/Settings/Tabs/BarTab.qml | 3 ++- Modules/Panels/Settings/Tabs/ColorSchemeTab.qml | 4 +++- Modules/Panels/Settings/Tabs/ControlCenterTab.qml | 2 +- Modules/Panels/Settings/Tabs/DisplayTab.qml | 4 +++- Modules/Panels/Settings/Tabs/DockTab.qml | 2 +- Modules/Panels/Settings/Tabs/GeneralTab.qml | 2 +- Modules/Panels/Settings/Tabs/HooksTab.qml | 3 ++- Modules/Panels/Settings/Tabs/LauncherTab.qml | 2 +- Modules/Panels/Settings/Tabs/LocationTab.qml | 2 +- Modules/Panels/Settings/Tabs/NetworkTab.qml | 3 +-- Modules/Panels/Settings/Tabs/NotificationsTab.qml | 2 +- Modules/Panels/Settings/Tabs/OsdTab.qml | 2 +- Modules/Panels/Settings/Tabs/WallpaperTab.qml | 3 ++- Modules/Panels/SetupWizard/SetupAppearanceStep.qml | 1 - Modules/Panels/SetupWizard/SetupCustomizeStep.qml | 1 - Modules/Panels/SetupWizard/SetupDockStep.qml | 1 - Modules/Panels/SetupWizard/SetupWallpaperStep.qml | 1 - Modules/Panels/SetupWizard/SetupWizard.qml | 1 - Modules/Panels/Tray/TrayDrawerPanel.qml | 2 +- Modules/Panels/Tray/TrayMenuPanel.qml | 1 - Modules/Panels/Wallpaper/WallpaperPanel.qml | 7 +++---- Modules/Panels/WiFi/WiFiPanel.qml | 5 ++--- Modules/Toast/ToastOverlay.qml | 1 - Modules/Toast/ToastScreen.qml | 7 +++---- Modules/Tooltip/Tooltip.qml | 3 +-- Services/{ => Compositor}/CompositorService.qml | 1 - Services/{ => Compositor}/HyprlandService.qml | 0 Services/{ => Compositor}/NiriService.qml | 0 Services/{ => Compositor}/SwayService.qml | 0 Services/{ => Control}/HooksService.qml | 2 +- Services/{ => Control}/IPCService.qml | 2 +- Services/{ => DynamicTheming}/AppThemeService.qml | 1 + .../{ => DynamicTheming}/ColorPaletteGenerator.qml | 2 +- .../{ => DynamicTheming}/ColorSchemeService.qml | 1 - .../{ => DynamicTheming}/TemplateProcessor.qml | 2 ++ Services/{ => DynamicTheming}/TemplateRegistry.qml | 12 ++++++------ Services/{ => Hardware}/BatteryService.qml | 2 +- Services/{ => Hardware}/BrightnessService.qml | 0 Services/{ => Keyboard}/ClipboardService.qml | 0 Services/{ => Keyboard}/KeyboardLayoutService.qml | 1 - Services/{ => Keyboard}/LockKeysService.qml | 0 Services/{ => Location}/CalendarService.qml | 0 Services/{ => Location}/DarkModeService.qml | 1 - Services/{ => Location}/LocationService.qml | 1 - Services/{ => Location}/NightLightService.qml | 1 - Services/{ => Media}/AudioService.qml | 0 Services/{ => Media}/CavaService.qml | 1 + Services/{ => Media}/MediaService.qml | 1 - Services/{ => Media}/ScreenRecorderService.qml | 2 +- Services/{ => Networking}/BluetoothService.qml | 1 - Services/{ => Networking}/NetworkService.qml | 2 +- Services/{ => Noctalia}/GitHubService.qml | 1 - Services/{ => Noctalia}/UpdateService.qml | 0 Services/{ => Power}/IdleInhibitorService.qml | 2 +- Services/{ => Power}/PowerProfileService.qml | 2 +- Services/{ => System}/DistroService.qml | 0 Services/{ => System}/FontService.qml | 0 Services/{ => System}/NotificationService.qml | 4 ++-- Services/{ => System}/ProgramCheckerService.qml | 1 + Services/{ => System}/SystemStatService.qml | 0 Services/{ => UI}/BarService.qml | 0 Services/{ => UI}/BarWidgetRegistry.qml | 14 +++++++++----- Services/{ => UI}/ControlCenterWidgetRegistry.qml | 0 Services/{ => UI}/PanelService.qml | 0 Services/{ => UI}/ToastService.qml | 0 Services/{ => UI}/TooltipService.qml | 0 Services/{ => UI}/WallpaperService.qml | 0 Widgets/NButton.qml | 2 +- Widgets/NColorPickerDialog.qml | 1 - Widgets/NComboBox.qml | 1 - Widgets/NContextMenu.qml | 1 - Widgets/NDropShadows.qml | 2 +- Widgets/NFilePicker.qml | 1 - Widgets/NIconButton.qml | 2 +- Widgets/NIconButtonHot.qml | 2 +- Widgets/NIconPicker.qml | 6 +++--- Widgets/NSearchableComboBox.qml | 1 - Widgets/NSlider.qml | 2 +- shell.qml | 11 ++++++++--- 161 files changed, 191 insertions(+), 201 deletions(-) rename Services/{ => Compositor}/CompositorService.qml (99%) rename Services/{ => Compositor}/HyprlandService.qml (100%) rename Services/{ => Compositor}/NiriService.qml (100%) rename Services/{ => Compositor}/SwayService.qml (100%) rename Services/{ => Control}/HooksService.qml (98%) rename Services/{ => Control}/IPCService.qml (99%) rename Services/{ => DynamicTheming}/AppThemeService.qml (98%) rename Services/{ => DynamicTheming}/ColorPaletteGenerator.qml (98%) rename Services/{ => DynamicTheming}/ColorSchemeService.qml (99%) rename Services/{ => DynamicTheming}/TemplateProcessor.qml (99%) rename Services/{ => DynamicTheming}/TemplateRegistry.qml (96%) rename Services/{ => Hardware}/BatteryService.qml (99%) rename Services/{ => Hardware}/BrightnessService.qml (100%) rename Services/{ => Keyboard}/ClipboardService.qml (100%) rename Services/{ => Keyboard}/KeyboardLayoutService.qml (99%) rename Services/{ => Keyboard}/LockKeysService.qml (100%) rename Services/{ => Location}/CalendarService.qml (100%) rename Services/{ => Location}/DarkModeService.qml (99%) rename Services/{ => Location}/LocationService.qml (99%) rename Services/{ => Location}/NightLightService.qml (99%) rename Services/{ => Media}/AudioService.qml (100%) rename Services/{ => Media}/CavaService.qml (99%) rename Services/{ => Media}/MediaService.qml (99%) rename Services/{ => Media}/ScreenRecorderService.qml (99%) rename Services/{ => Networking}/BluetoothService.qml (99%) rename Services/{ => Networking}/NetworkService.qml (99%) rename Services/{ => Noctalia}/GitHubService.qml (99%) rename Services/{ => Noctalia}/UpdateService.qml (100%) rename Services/{ => Power}/IdleInhibitorService.qml (99%) rename Services/{ => Power}/PowerProfileService.qml (99%) rename Services/{ => System}/DistroService.qml (100%) rename Services/{ => System}/FontService.qml (100%) rename Services/{ => System}/NotificationService.qml (99%) rename Services/{ => System}/ProgramCheckerService.qml (99%) rename Services/{ => System}/SystemStatService.qml (100%) rename Services/{ => UI}/BarService.qml (100%) rename Services/{ => UI}/BarWidgetRegistry.qml (96%) rename Services/{ => UI}/ControlCenterWidgetRegistry.qml (100%) rename Services/{ => UI}/PanelService.qml (100%) rename Services/{ => UI}/ToastService.qml (100%) rename Services/{ => UI}/TooltipService.qml (100%) rename Services/{ => UI}/WallpaperService.qml (100%) diff --git a/Assets/settings-default.json b/Assets/settings-default.json index 2c83016d..fabf4225 100644 --- a/Assets/settings-default.json +++ b/Assets/settings-default.json @@ -1,5 +1,5 @@ { - "settingsVersion": 20, + "settingsVersion": 21, "setupCompleted": false, "bar": { "position": "top", diff --git a/Commons/KeyboardLayout.qml b/Commons/KeyboardLayout.qml index 38d08aa1..9b090d21 100644 --- a/Commons/KeyboardLayout.qml +++ b/Commons/KeyboardLayout.qml @@ -2,6 +2,7 @@ pragma Singleton import QtQuick +// TODO: Move to KeyboardLayoutService. QtObject { id: root diff --git a/Commons/Settings.qml b/Commons/Settings.qml index a38f5082..6e2147f5 100644 --- a/Commons/Settings.qml +++ b/Commons/Settings.qml @@ -4,7 +4,7 @@ import QtQuick import Quickshell import Quickshell.Io import qs.Commons -import qs.Services +import qs.Services.UI import "../Helpers/QtObj2JS.js" as QtObj2JS Singleton { diff --git a/Commons/Style.qml b/Commons/Style.qml index bb06ff05..b2999d7b 100644 --- a/Commons/Style.qml +++ b/Commons/Style.qml @@ -2,9 +2,7 @@ pragma Singleton import QtQuick import Quickshell -import Quickshell.Io - -import qs.Services +import qs.Services.Power Singleton { id: root diff --git a/Modules/Background/Background.qml b/Modules/Background/Background.qml index 9c93b40b..f6b97bdd 100644 --- a/Modules/Background/Background.qml +++ b/Modules/Background/Background.qml @@ -2,7 +2,8 @@ import QtQuick import Quickshell import Quickshell.Wayland import qs.Commons -import qs.Services +import qs.Services.Compositor +import qs.Services.UI Variants { id: backgroundVariants @@ -109,7 +110,7 @@ Variants { property bool dimensionsCalculated: false source: "" - smooth: true + smooth: false mipmap: false visible: false cache: false @@ -138,7 +139,7 @@ Variants { property bool dimensionsCalculated: false source: "" - smooth: true + smooth: false mipmap: false visible: false cache: false diff --git a/Modules/Background/Overview.qml b/Modules/Background/Overview.qml index a5ee733d..6dcbd3bc 100644 --- a/Modules/Background/Overview.qml +++ b/Modules/Background/Overview.qml @@ -3,7 +3,8 @@ import Quickshell import QtQuick.Effects import Quickshell.Wayland import qs.Commons -import qs.Services +import qs.Services.Compositor +import qs.Services.UI Loader { active: CompositorService.isNiri && Settings.data.wallpaper.enabled && Settings.data.wallpaper.overviewEnabled diff --git a/Modules/Bar/Bar.qml b/Modules/Bar/Bar.qml index d858da2c..2d472595 100644 --- a/Modules/Bar/Bar.qml +++ b/Modules/Bar/Bar.qml @@ -5,7 +5,7 @@ import Quickshell import Quickshell.Wayland import Quickshell.Services.UPower import qs.Commons -import qs.Services +import qs.Services.UI import qs.Widgets import qs.Modules.Notification import qs.Modules.Bar.Extras diff --git a/Modules/Bar/Extras/BarPill.qml b/Modules/Bar/Extras/BarPill.qml index aef33339..d5befb21 100644 --- a/Modules/Bar/Extras/BarPill.qml +++ b/Modules/Bar/Extras/BarPill.qml @@ -2,7 +2,6 @@ import QtQuick import QtQuick.Controls import Quickshell import qs.Commons -import qs.Services import qs.Widgets Item { diff --git a/Modules/Bar/Extras/BarPillHorizontal.qml b/Modules/Bar/Extras/BarPillHorizontal.qml index c9d84869..ed74b74b 100644 --- a/Modules/Bar/Extras/BarPillHorizontal.qml +++ b/Modules/Bar/Extras/BarPillHorizontal.qml @@ -2,7 +2,7 @@ import QtQuick import QtQuick.Controls import Quickshell import qs.Commons -import qs.Services +import qs.Services.UI import qs.Widgets Item { diff --git a/Modules/Bar/Extras/BarPillVertical.qml b/Modules/Bar/Extras/BarPillVertical.qml index 492ec735..ea1001a7 100644 --- a/Modules/Bar/Extras/BarPillVertical.qml +++ b/Modules/Bar/Extras/BarPillVertical.qml @@ -2,7 +2,7 @@ import QtQuick import QtQuick.Controls import Quickshell import qs.Commons -import qs.Services +import qs.Services.UI import qs.Widgets Item { diff --git a/Modules/Bar/Extras/BarWidgetLoader.qml b/Modules/Bar/Extras/BarWidgetLoader.qml index fb90c645..71f21414 100644 --- a/Modules/Bar/Extras/BarWidgetLoader.qml +++ b/Modules/Bar/Extras/BarWidgetLoader.qml @@ -1,6 +1,6 @@ import QtQuick import Quickshell -import qs.Services +import qs.Services.UI import qs.Commons Item { diff --git a/Modules/Bar/Widgets/ActiveWindow.qml b/Modules/Bar/Widgets/ActiveWindow.qml index 8772c5b4..d02e92a3 100644 --- a/Modules/Bar/Widgets/ActiveWindow.qml +++ b/Modules/Bar/Widgets/ActiveWindow.qml @@ -1,11 +1,9 @@ import QtQuick -import QtQuick.Controls import QtQuick.Layouts import Quickshell -import Quickshell.Wayland import Quickshell.Widgets import qs.Commons -import qs.Services +import qs.Services.UI import qs.Widgets Item { diff --git a/Modules/Bar/Widgets/AudioVisualizer.qml b/Modules/Bar/Widgets/AudioVisualizer.qml index a83c9e52..cecc6952 100644 --- a/Modules/Bar/Widgets/AudioVisualizer.qml +++ b/Modules/Bar/Widgets/AudioVisualizer.qml @@ -1,9 +1,10 @@ import QtQuick import Quickshell import qs.Commons -import qs.Widgets.AudioSpectrum -import qs.Services +import qs.Services.UI +import qs.Services.Media import qs.Widgets +import qs.Widgets.AudioSpectrum Item { id: root diff --git a/Modules/Bar/Widgets/Battery.qml b/Modules/Bar/Widgets/Battery.qml index 7eb2a714..08488fe5 100644 --- a/Modules/Bar/Widgets/Battery.qml +++ b/Modules/Bar/Widgets/Battery.qml @@ -3,7 +3,8 @@ import Quickshell import Quickshell.Services.UPower import QtQuick.Layouts import qs.Commons -import qs.Services +import qs.Services.UI +import qs.Services.Hardware import qs.Widgets import qs.Modules.Bar.Extras diff --git a/Modules/Bar/Widgets/Bluetooth.qml b/Modules/Bar/Widgets/Bluetooth.qml index 84ca7f41..8c3bb1d8 100644 --- a/Modules/Bar/Widgets/Bluetooth.qml +++ b/Modules/Bar/Widgets/Bluetooth.qml @@ -1,7 +1,7 @@ import QtQuick import Quickshell import qs.Commons -import qs.Services +import qs.Services.UI import qs.Modules.Bar.Extras Item { diff --git a/Modules/Bar/Widgets/Brightness.qml b/Modules/Bar/Widgets/Brightness.qml index 615ec16e..a94383e1 100644 --- a/Modules/Bar/Widgets/Brightness.qml +++ b/Modules/Bar/Widgets/Brightness.qml @@ -3,7 +3,7 @@ import Quickshell import qs.Commons import qs.Modules.Bar.Extras import qs.Modules.Panels.Settings -import qs.Services +import qs.Services.UI import qs.Widgets Item { diff --git a/Modules/Bar/Widgets/Clock.qml b/Modules/Bar/Widgets/Clock.qml index 8a31bdc3..4eb93dba 100644 --- a/Modules/Bar/Widgets/Clock.qml +++ b/Modules/Bar/Widgets/Clock.qml @@ -2,7 +2,7 @@ import QtQuick import QtQuick.Layouts import Quickshell import qs.Commons -import qs.Services +import qs.Services.UI import qs.Widgets Rectangle { diff --git a/Modules/Bar/Widgets/ControlCenter.qml b/Modules/Bar/Widgets/ControlCenter.qml index d703a05f..fc19e980 100644 --- a/Modules/Bar/Widgets/ControlCenter.qml +++ b/Modules/Bar/Widgets/ControlCenter.qml @@ -4,7 +4,7 @@ import Quickshell.Widgets import QtQuick.Effects import qs.Commons import qs.Widgets -import qs.Services +import qs.Services.UI NIconButton { id: root @@ -48,9 +48,9 @@ NIconButton { var controlCenterPanel = PanelService.getPanel("controlCenterPanel", screen) if (Settings.data.controlCenter.position === "close_to_bar_button") { // Willopen the panel next to the bar button. - controlCenterPanel.toggle(this) + controlCenterPanel?.toggle(this) } else { - controlCenterPanel.toggle() + controlCenterPanel?.toggle() } } onRightClicked: PanelService.getPanel("settingsPanel", screen)?.toggle() diff --git a/Modules/Bar/Widgets/CustomButton.qml b/Modules/Bar/Widgets/CustomButton.qml index ab8c3982..7e474fde 100644 --- a/Modules/Bar/Widgets/CustomButton.qml +++ b/Modules/Bar/Widgets/CustomButton.qml @@ -3,7 +3,7 @@ import QtQuick.Layouts import Quickshell import Quickshell.Io import qs.Commons -import qs.Services +import qs.Services.UI import qs.Widgets import qs.Modules.Panels.Settings import qs.Modules.Bar.Extras diff --git a/Modules/Bar/Widgets/DarkMode.qml b/Modules/Bar/Widgets/DarkMode.qml index d9a2cb25..170b3f5f 100644 --- a/Modules/Bar/Widgets/DarkMode.qml +++ b/Modules/Bar/Widgets/DarkMode.qml @@ -1,7 +1,7 @@ import Quickshell import qs.Commons import qs.Widgets -import qs.Services +import qs.Services.UI NIconButton { id: root diff --git a/Modules/Bar/Widgets/KeepAwake.qml b/Modules/Bar/Widgets/KeepAwake.qml index c0546884..58b30d6f 100644 --- a/Modules/Bar/Widgets/KeepAwake.qml +++ b/Modules/Bar/Widgets/KeepAwake.qml @@ -2,7 +2,7 @@ import QtQuick import QtQuick.Layouts import Quickshell import qs.Commons -import qs.Services +import qs.Services.UI import qs.Widgets NIconButton { diff --git a/Modules/Bar/Widgets/KeyboardLayout.qml b/Modules/Bar/Widgets/KeyboardLayout.qml index 41ffd027..e00fd2d6 100644 --- a/Modules/Bar/Widgets/KeyboardLayout.qml +++ b/Modules/Bar/Widgets/KeyboardLayout.qml @@ -4,7 +4,8 @@ import Quickshell import Quickshell.Wayland import Quickshell.Io import qs.Commons -import qs.Services +import qs.Services.UI +import qs.Services.Keyboard import qs.Widgets import qs.Modules.Bar.Extras diff --git a/Modules/Bar/Widgets/LockKeys.qml b/Modules/Bar/Widgets/LockKeys.qml index 3fd5b8fb..a13dbd9b 100644 --- a/Modules/Bar/Widgets/LockKeys.qml +++ b/Modules/Bar/Widgets/LockKeys.qml @@ -4,7 +4,8 @@ import Quickshell import Quickshell.Io import qs.Commons import qs.Modules.Panels.Settings -import qs.Services +import qs.Services.Keyboard +import qs.Services.UI import qs.Widgets //import qs.Modules.Bar.Extras diff --git a/Modules/Bar/Widgets/MediaMini.qml b/Modules/Bar/Widgets/MediaMini.qml index 9d626284..0867514d 100644 --- a/Modules/Bar/Widgets/MediaMini.qml +++ b/Modules/Bar/Widgets/MediaMini.qml @@ -4,7 +4,8 @@ import QtQuick.Layouts import Quickshell import qs.Widgets.AudioSpectrum import qs.Commons -import qs.Services +import qs.Services.Media +import qs.Services.UI import qs.Widgets Item { diff --git a/Modules/Bar/Widgets/Microphone.qml b/Modules/Bar/Widgets/Microphone.qml index 23946dfb..b3e32915 100644 --- a/Modules/Bar/Widgets/Microphone.qml +++ b/Modules/Bar/Widgets/Microphone.qml @@ -3,10 +3,10 @@ import Quickshell import Quickshell.Io import Quickshell.Services.Pipewire import qs.Commons -import qs.Modules.Panels.Settings -import qs.Services -import qs.Widgets import qs.Modules.Bar.Extras +import qs.Modules.Panels.Settings +import qs.Services.UI +import qs.Widgets Item { id: root diff --git a/Modules/Bar/Widgets/NightLight.qml b/Modules/Bar/Widgets/NightLight.qml index 5524a5bd..2be0a047 100644 --- a/Modules/Bar/Widgets/NightLight.qml +++ b/Modules/Bar/Widgets/NightLight.qml @@ -5,7 +5,7 @@ import Quickshell import Quickshell.Wayland import qs.Commons import qs.Modules.Panels.Settings -import qs.Services +import qs.Services.UI import qs.Widgets NIconButton { diff --git a/Modules/Bar/Widgets/NoctaliaPerformance.qml b/Modules/Bar/Widgets/NoctaliaPerformance.qml index 443832fc..7678e92f 100644 --- a/Modules/Bar/Widgets/NoctaliaPerformance.qml +++ b/Modules/Bar/Widgets/NoctaliaPerformance.qml @@ -5,7 +5,7 @@ import Quickshell import Quickshell.Wayland import qs.Commons import qs.Modules.Panels.Settings -import qs.Services +import qs.Services.Power import qs.Widgets NIconButton { diff --git a/Modules/Bar/Widgets/NotificationHistory.qml b/Modules/Bar/Widgets/NotificationHistory.qml index 55f41d9b..dbd9bea9 100644 --- a/Modules/Bar/Widgets/NotificationHistory.qml +++ b/Modules/Bar/Widgets/NotificationHistory.qml @@ -4,7 +4,8 @@ import QtQuick.Controls import Quickshell import Quickshell.Wayland import qs.Commons -import qs.Services +import qs.Services.UI +import qs.Services.System import qs.Widgets NIconButton { diff --git a/Modules/Bar/Widgets/PowerProfile.qml b/Modules/Bar/Widgets/PowerProfile.qml index da96fcf1..e9bca98a 100644 --- a/Modules/Bar/Widgets/PowerProfile.qml +++ b/Modules/Bar/Widgets/PowerProfile.qml @@ -3,7 +3,7 @@ import QtQuick.Layouts import Quickshell import Quickshell.Services.UPower import qs.Commons -import qs.Services +import qs.Services.Power import qs.Widgets NIconButton { diff --git a/Modules/Bar/Widgets/ScreenRecorder.qml b/Modules/Bar/Widgets/ScreenRecorder.qml index 4e528c2f..8683f583 100644 --- a/Modules/Bar/Widgets/ScreenRecorder.qml +++ b/Modules/Bar/Widgets/ScreenRecorder.qml @@ -1,6 +1,8 @@ import Quickshell import qs.Commons -import qs.Services +import qs.Services.UI +import qs.Services.Media +import qs.Services.System import qs.Widgets // Screen Recording Indicator diff --git a/Modules/Bar/Widgets/SessionMenu.qml b/Modules/Bar/Widgets/SessionMenu.qml index d1b79998..a22b046c 100644 --- a/Modules/Bar/Widgets/SessionMenu.qml +++ b/Modules/Bar/Widgets/SessionMenu.qml @@ -2,7 +2,6 @@ import QtQuick import QtQuick.Layouts import Quickshell import qs.Commons -import qs.Services import qs.Widgets NIconButton { diff --git a/Modules/Bar/Widgets/Spacer.qml b/Modules/Bar/Widgets/Spacer.qml index 3af0e792..ff94682e 100644 --- a/Modules/Bar/Widgets/Spacer.qml +++ b/Modules/Bar/Widgets/Spacer.qml @@ -2,7 +2,6 @@ import QtQuick import QtQuick.Layouts import Quickshell import qs.Commons -import qs.Services import qs.Widgets Item { diff --git a/Modules/Bar/Widgets/SystemMonitor.qml b/Modules/Bar/Widgets/SystemMonitor.qml index 0adec65d..caab8fda 100644 --- a/Modules/Bar/Widgets/SystemMonitor.qml +++ b/Modules/Bar/Widgets/SystemMonitor.qml @@ -3,7 +3,8 @@ import QtQuick.Layouts import Quickshell import qs.Commons import qs.Modules.Panels.Settings -import qs.Services +import qs.Services.UI +import qs.Services.System import qs.Widgets Rectangle { diff --git a/Modules/Bar/Widgets/Taskbar.qml b/Modules/Bar/Widgets/Taskbar.qml index 959dc2df..30b41e72 100644 --- a/Modules/Bar/Widgets/Taskbar.qml +++ b/Modules/Bar/Widgets/Taskbar.qml @@ -5,7 +5,8 @@ import Quickshell import Quickshell.Widgets import Quickshell.Wayland import qs.Commons -import qs.Services +import qs.Services.Compositor +import qs.Services.UI import qs.Widgets Rectangle { diff --git a/Modules/Bar/Widgets/TaskbarGrouped.qml b/Modules/Bar/Widgets/TaskbarGrouped.qml index 73895274..ccf0ef41 100644 --- a/Modules/Bar/Widgets/TaskbarGrouped.qml +++ b/Modules/Bar/Widgets/TaskbarGrouped.qml @@ -5,7 +5,8 @@ import Quickshell import Quickshell.Wayland import Quickshell.Widgets import qs.Commons -import qs.Services +import qs.Services.Compositor +import qs.Services.UI import qs.Widgets Item { diff --git a/Modules/Bar/Widgets/Tray.qml b/Modules/Bar/Widgets/Tray.qml index 7971eac6..7f1a3921 100644 --- a/Modules/Bar/Widgets/Tray.qml +++ b/Modules/Bar/Widgets/Tray.qml @@ -7,7 +7,7 @@ import Quickshell.Services.SystemTray import Quickshell.Widgets import qs.Commons import qs.Modules.Bar.Extras -import qs.Services +import qs.Services.UI import qs.Widgets Rectangle { diff --git a/Modules/Bar/Widgets/Volume.qml b/Modules/Bar/Widgets/Volume.qml index 5a178e37..9fb72180 100644 --- a/Modules/Bar/Widgets/Volume.qml +++ b/Modules/Bar/Widgets/Volume.qml @@ -3,10 +3,11 @@ import Quickshell import Quickshell.Io import Quickshell.Services.Pipewire import qs.Commons -import qs.Modules.Panels.Settings -import qs.Services -import qs.Widgets import qs.Modules.Bar.Extras +import qs.Modules.Panels.Settings +import qs.Services.UI +import qs.Services.Media +import qs.Widgets Item { id: root diff --git a/Modules/Bar/Widgets/WallpaperSelector.qml b/Modules/Bar/Widgets/WallpaperSelector.qml index 322b54c0..1dbbdff4 100644 --- a/Modules/Bar/Widgets/WallpaperSelector.qml +++ b/Modules/Bar/Widgets/WallpaperSelector.qml @@ -2,7 +2,7 @@ import QtQuick import QtQuick.Layouts import Quickshell import qs.Commons -import qs.Services +import qs.Services.UI import qs.Widgets NIconButton { diff --git a/Modules/Bar/Widgets/WiFi.qml b/Modules/Bar/Widgets/WiFi.qml index 77000e83..73e731a1 100644 --- a/Modules/Bar/Widgets/WiFi.qml +++ b/Modules/Bar/Widgets/WiFi.qml @@ -1,7 +1,7 @@ import QtQuick import Quickshell import qs.Commons -import qs.Services +import qs.Services.UI import qs.Modules.Bar.Extras Item { diff --git a/Modules/Bar/Widgets/Workspace.qml b/Modules/Bar/Widgets/Workspace.qml index 0ceec88e..f30af56f 100644 --- a/Modules/Bar/Widgets/Workspace.qml +++ b/Modules/Bar/Widgets/Workspace.qml @@ -6,7 +6,8 @@ import QtQuick.Effects import Quickshell import Quickshell.Io import qs.Commons -import qs.Services +import qs.Services.Compositor +import qs.Services.UI import qs.Widgets Item { diff --git a/Modules/Dock/Dock.qml b/Modules/Dock/Dock.qml index 78ba4c38..5f8c5ae8 100644 --- a/Modules/Dock/Dock.qml +++ b/Modules/Dock/Dock.qml @@ -6,7 +6,7 @@ import Quickshell import Quickshell.Wayland import Quickshell.Widgets import qs.Commons -import qs.Services +import qs.Services.UI import qs.Widgets Loader { diff --git a/Modules/Dock/DockMenu.qml b/Modules/Dock/DockMenu.qml index 17fcbd29..ec2cb15f 100644 --- a/Modules/Dock/DockMenu.qml +++ b/Modules/Dock/DockMenu.qml @@ -5,7 +5,6 @@ import Quickshell import Quickshell.Wayland import Quickshell.Widgets import qs.Commons -import qs.Services import qs.Widgets PopupWindow { diff --git a/Modules/LockScreen/LockScreen.qml b/Modules/LockScreen/LockScreen.qml index f329afe1..84847e11 100644 --- a/Modules/LockScreen/LockScreen.qml +++ b/Modules/LockScreen/LockScreen.qml @@ -9,7 +9,6 @@ import Quickshell.Services.UPower import Quickshell.Io import Quickshell.Widgets import qs.Commons -import qs.Services import qs.Widgets import qs.Widgets.AudioSpectrum diff --git a/Modules/MainScreen/AllScreens.qml b/Modules/MainScreen/AllScreens.qml index 5204404c..dc929b57 100644 --- a/Modules/MainScreen/AllScreens.qml +++ b/Modules/MainScreen/AllScreens.qml @@ -3,7 +3,7 @@ import Quickshell import Quickshell.Wayland import qs.Commons -import qs.Services +import qs.Services.UI import qs.Modules.MainScreen // ------------------------------ diff --git a/Modules/MainScreen/MainScreen.qml b/Modules/MainScreen/MainScreen.qml index 5a59cbfc..0edbe4d8 100644 --- a/Modules/MainScreen/MainScreen.qml +++ b/Modules/MainScreen/MainScreen.qml @@ -3,7 +3,7 @@ import QtQuick.Effects import Quickshell import Quickshell.Wayland import qs.Commons -import qs.Services +import qs.Services.UI import "Backgrounds" as Backgrounds // All panels @@ -49,17 +49,6 @@ PanelWindow { Logger.d("MainScreen", "Initialized for screen:", screen?.name, "- Dimensions:", screen?.width, "x", screen?.height, "- Position:", screen?.x, ",", screen?.y) } - // Debug: Log mask region changes - onMaskChanged: { - Logger.d("MainScreen", "Mask changed!") - Logger.d("MainScreen", " Bar region:", barLoader.item?.barRegion) - Logger.d("MainScreen", " Panel count:", panelsRepeater.count) - for (var i = 0; i < panelsRepeater.count; i++) { - var panelItem = panelsRepeater.itemAt(i)?.item - Logger.d("MainScreen", " Panel", i, "- open:", panelItem?.isPanelOpen, "- region:", panelItem?.panelRegion) - } - } - // Wayland // Always use Exclusive keyboard focus when a panel is open // This ensures all keyboard shortcuts work reliably (Escape, etc.) diff --git a/Modules/MainScreen/ScreenCorners.qml b/Modules/MainScreen/ScreenCorners.qml index 367e6269..9f4c2e9e 100644 --- a/Modules/MainScreen/ScreenCorners.qml +++ b/Modules/MainScreen/ScreenCorners.qml @@ -1,7 +1,6 @@ import QtQuick import QtQuick.Shapes import qs.Commons -import qs.Services /** diff --git a/Modules/MainScreen/SmartPanel.qml b/Modules/MainScreen/SmartPanel.qml index 3d21b68d..547654ed 100644 --- a/Modules/MainScreen/SmartPanel.qml +++ b/Modules/MainScreen/SmartPanel.qml @@ -1,7 +1,7 @@ import QtQuick import Quickshell import qs.Commons -import qs.Services +import qs.Services.UI /** diff --git a/Modules/Notification/Notification.qml b/Modules/Notification/Notification.qml index c8ffce5d..8abe45f0 100644 --- a/Modules/Notification/Notification.qml +++ b/Modules/Notification/Notification.qml @@ -6,7 +6,7 @@ import Quickshell.Widgets import Quickshell.Wayland import Quickshell.Services.Notifications import qs.Commons -import qs.Services +import qs.Services.System import qs.Widgets // Simple notification popup - displays multiple notifications diff --git a/Modules/OSD/OSD.qml b/Modules/OSD/OSD.qml index 835965e6..1c7cc2ac 100644 --- a/Modules/OSD/OSD.qml +++ b/Modules/OSD/OSD.qml @@ -5,8 +5,10 @@ import QtQuick.Effects import Quickshell import Quickshell.Wayland import qs.Commons -import qs.Services import qs.Widgets +import qs.Services.Hardware +import qs.Services.Media +import qs.Services.System // Unified OSD component // Loader activates only when showing OSD, deactivates when hidden to save resources diff --git a/Modules/Panels/Audio/AudioPanel.qml b/Modules/Panels/Audio/AudioPanel.qml index b2b53f2f..6d857791 100644 --- a/Modules/Panels/Audio/AudioPanel.qml +++ b/Modules/Panels/Audio/AudioPanel.qml @@ -4,9 +4,9 @@ import QtQuick.Controls import Quickshell import Quickshell.Services.Pipewire import qs.Commons -import qs.Services import qs.Widgets import qs.Modules.MainScreen +import qs.Services.Media SmartPanel { id: root diff --git a/Modules/Panels/Battery/BatteryPanel.qml b/Modules/Panels/Battery/BatteryPanel.qml index 50d31791..f9544e26 100644 --- a/Modules/Panels/Battery/BatteryPanel.qml +++ b/Modules/Panels/Battery/BatteryPanel.qml @@ -4,7 +4,7 @@ import QtQuick.Controls import Quickshell import Quickshell.Wayland import qs.Commons -import qs.Services +import qs.Services.Hardware import qs.Widgets import qs.Modules.MainScreen diff --git a/Modules/Panels/Bluetooth/BluetoothDevicesList.qml b/Modules/Panels/Bluetooth/BluetoothDevicesList.qml index 3491a80b..147f1042 100644 --- a/Modules/Panels/Bluetooth/BluetoothDevicesList.qml +++ b/Modules/Panels/Bluetooth/BluetoothDevicesList.qml @@ -5,7 +5,7 @@ import Quickshell import Quickshell.Bluetooth import Quickshell.Wayland import qs.Commons -import qs.Services +import qs.Services.Networking import qs.Widgets NBox { diff --git a/Modules/Panels/Bluetooth/BluetoothPanel.qml b/Modules/Panels/Bluetooth/BluetoothPanel.qml index db1402ff..fead0d5c 100644 --- a/Modules/Panels/Bluetooth/BluetoothPanel.qml +++ b/Modules/Panels/Bluetooth/BluetoothPanel.qml @@ -3,9 +3,9 @@ import QtQuick.Layouts import QtQuick.Controls import Quickshell import Quickshell.Bluetooth -import Quickshell.Wayland import qs.Commons -import qs.Services +import qs.Services.UI +import qs.Services.Networking import qs.Widgets import qs.Modules.MainScreen @@ -13,7 +13,7 @@ SmartPanel { id: root preferredWidth: Math.round(340 * Style.uiScaleRatio) - preferredHeight: 500 * Style.uiScaleRatio + preferredHeight: Math.round(500 * Style.uiScaleRatio) panelContent: Rectangle { color: Color.transparent diff --git a/Modules/Panels/Calendar/CalendarPanel.qml b/Modules/Panels/Calendar/CalendarPanel.qml index f28158fc..a01f7836 100644 --- a/Modules/Panels/Calendar/CalendarPanel.qml +++ b/Modules/Panels/Calendar/CalendarPanel.qml @@ -4,10 +4,11 @@ import QtQuick.Layouts import Quickshell import Quickshell.Wayland import qs.Commons -import qs.Services -import qs.Widgets import qs.Modules.MainScreen import qs.Modules.Panels.ControlCenter.Cards +import qs.Services.Location +import qs.Services.UI +import qs.Widgets SmartPanel { id: root diff --git a/Modules/Panels/ControlCenter/Cards/AudioCard.qml b/Modules/Panels/ControlCenter/Cards/AudioCard.qml index 3370b71f..47c35711 100644 --- a/Modules/Panels/ControlCenter/Cards/AudioCard.qml +++ b/Modules/Panels/ControlCenter/Cards/AudioCard.qml @@ -2,7 +2,7 @@ import QtQuick import QtQuick.Layouts import Quickshell import qs.Commons -import qs.Services +import qs.Services.Media import qs.Widgets // Audio controls card: output and input volume controls diff --git a/Modules/Panels/ControlCenter/Cards/MediaCard.qml b/Modules/Panels/ControlCenter/Cards/MediaCard.qml index 9879d84c..2914ee09 100644 --- a/Modules/Panels/ControlCenter/Cards/MediaCard.qml +++ b/Modules/Panels/ControlCenter/Cards/MediaCard.qml @@ -3,10 +3,11 @@ import QtQuick.Controls import QtQuick.Layouts import QtQuick.Effects import Quickshell -import qs.Widgets.AudioSpectrum import qs.Commons -import qs.Services +import qs.Services.Media +import qs.Services.UI import qs.Widgets +import qs.Widgets.AudioSpectrum NBox { id: root diff --git a/Modules/Panels/ControlCenter/Cards/ProfileCard.qml b/Modules/Panels/ControlCenter/Cards/ProfileCard.qml index a8e04484..2a75e700 100644 --- a/Modules/Panels/ControlCenter/Cards/ProfileCard.qml +++ b/Modules/Panels/ControlCenter/Cards/ProfileCard.qml @@ -5,10 +5,10 @@ import Quickshell import Quickshell.Io import Quickshell.Widgets import qs.Commons -import qs.Services -import qs.Widgets import qs.Modules.Panels.ControlCenter.Cards import qs.Modules.Panels.Settings +import qs.Services.UI +import qs.Widgets // Header card with avatar, user and quick actions NBox { diff --git a/Modules/Panels/ControlCenter/Cards/ShortcutsCard.qml b/Modules/Panels/ControlCenter/Cards/ShortcutsCard.qml index 5e7c7ad6..91fba4b9 100644 --- a/Modules/Panels/ControlCenter/Cards/ShortcutsCard.qml +++ b/Modules/Panels/ControlCenter/Cards/ShortcutsCard.qml @@ -3,7 +3,6 @@ import QtQuick.Controls import QtQuick.Layouts import Quickshell import qs.Commons -import qs.Services import qs.Widgets import qs.Modules.Panels.ControlCenter import qs.Modules.Panels.ControlCenter.Cards diff --git a/Modules/Panels/ControlCenter/Cards/SystemMonitorCard.qml b/Modules/Panels/ControlCenter/Cards/SystemMonitorCard.qml index fc94aa97..2aa62105 100644 --- a/Modules/Panels/ControlCenter/Cards/SystemMonitorCard.qml +++ b/Modules/Panels/ControlCenter/Cards/SystemMonitorCard.qml @@ -2,7 +2,7 @@ import QtQuick import QtQuick.Layouts import Quickshell import qs.Commons -import qs.Services +import qs.Services.System import qs.Widgets // Unified system card: monitors CPU, temp, memory, disk diff --git a/Modules/Panels/ControlCenter/Cards/WeatherCard.qml b/Modules/Panels/ControlCenter/Cards/WeatherCard.qml index b9bd0344..52fcd7bc 100644 --- a/Modules/Panels/ControlCenter/Cards/WeatherCard.qml +++ b/Modules/Panels/ControlCenter/Cards/WeatherCard.qml @@ -2,7 +2,7 @@ import QtQuick import QtQuick.Layouts import Quickshell import qs.Commons -import qs.Services +import qs.Services.Location import qs.Widgets // Weather overview card (placeholder data) diff --git a/Modules/Panels/ControlCenter/ControlCenterPanel.qml b/Modules/Panels/ControlCenter/ControlCenterPanel.qml index 510d781f..07be9664 100644 --- a/Modules/Panels/ControlCenter/ControlCenterPanel.qml +++ b/Modules/Panels/ControlCenter/ControlCenterPanel.qml @@ -3,10 +3,11 @@ import QtQuick.Controls import QtQuick.Layouts import Quickshell import qs.Commons -import qs.Services -import qs.Widgets import qs.Modules.MainScreen import qs.Modules.Panels.ControlCenter.Cards +import qs.Services.Media +import qs.Services.UI +import qs.Widgets SmartPanel { id: root diff --git a/Modules/Panels/ControlCenter/ControlCenterWidgetLoader.qml b/Modules/Panels/ControlCenter/ControlCenterWidgetLoader.qml index ebfb05f7..0fb3cd8b 100644 --- a/Modules/Panels/ControlCenter/ControlCenterWidgetLoader.qml +++ b/Modules/Panels/ControlCenter/ControlCenterWidgetLoader.qml @@ -1,6 +1,6 @@ import QtQuick import Quickshell -import qs.Services +import qs.Services.UI import qs.Commons Item { diff --git a/Modules/Panels/ControlCenter/Widgets/Bluetooth.qml b/Modules/Panels/ControlCenter/Widgets/Bluetooth.qml index 5378156d..d3ab79ad 100644 --- a/Modules/Panels/ControlCenter/Widgets/Bluetooth.qml +++ b/Modules/Panels/ControlCenter/Widgets/Bluetooth.qml @@ -1,7 +1,8 @@ import QtQuick.Layouts import Quickshell import qs.Commons -import qs.Services +import qs.Services.Networking +import qs.Services.UI import qs.Widgets NIconButtonHot { diff --git a/Modules/Panels/ControlCenter/Widgets/CustomButton.qml b/Modules/Panels/ControlCenter/Widgets/CustomButton.qml index 84c89c62..bad214ad 100644 --- a/Modules/Panels/ControlCenter/Widgets/CustomButton.qml +++ b/Modules/Panels/ControlCenter/Widgets/CustomButton.qml @@ -2,7 +2,6 @@ import QtQuick import Quickshell import Quickshell.Io import qs.Commons -import qs.Services import qs.Widgets Item { diff --git a/Modules/Panels/ControlCenter/Widgets/KeepAwake.qml b/Modules/Panels/ControlCenter/Widgets/KeepAwake.qml index 96d60733..5b459e7e 100644 --- a/Modules/Panels/ControlCenter/Widgets/KeepAwake.qml +++ b/Modules/Panels/ControlCenter/Widgets/KeepAwake.qml @@ -1,7 +1,7 @@ import QtQuick.Layouts import Quickshell import qs.Commons -import qs.Services +import qs.Services.Power import qs.Widgets NIconButtonHot { diff --git a/Modules/Panels/ControlCenter/Widgets/NightLight.qml b/Modules/Panels/ControlCenter/Widgets/NightLight.qml index c59126ad..c45f197a 100644 --- a/Modules/Panels/ControlCenter/Widgets/NightLight.qml +++ b/Modules/Panels/ControlCenter/Widgets/NightLight.qml @@ -2,7 +2,8 @@ import QtQuick.Layouts import Quickshell import qs.Commons import qs.Modules.Panels.Settings -import qs.Services +import qs.Services.System +import qs.Services.UI import qs.Widgets NIconButtonHot { diff --git a/Modules/Panels/ControlCenter/Widgets/Notifications.qml b/Modules/Panels/ControlCenter/Widgets/Notifications.qml index 35f5cdf7..54a8d4fc 100644 --- a/Modules/Panels/ControlCenter/Widgets/Notifications.qml +++ b/Modules/Panels/ControlCenter/Widgets/Notifications.qml @@ -1,7 +1,8 @@ import QtQuick.Layouts import Quickshell import qs.Commons -import qs.Services +import qs.Services.System +import qs.Services.UI import qs.Widgets NIconButtonHot { diff --git a/Modules/Panels/ControlCenter/Widgets/PowerProfile.qml b/Modules/Panels/ControlCenter/Widgets/PowerProfile.qml index ca5f497f..1a211c16 100644 --- a/Modules/Panels/ControlCenter/Widgets/PowerProfile.qml +++ b/Modules/Panels/ControlCenter/Widgets/PowerProfile.qml @@ -2,7 +2,7 @@ import QtQuick.Layouts import Quickshell import Quickshell.Services.UPower import qs.Commons -import qs.Services +import qs.Services.Power import qs.Widgets // Performance @@ -15,7 +15,5 @@ NIconButtonHot { icon: PowerProfileService.getIcon() hot: !PowerProfileService.isDefault() tooltipText: I18n.tr("quickSettings.powerProfile.tooltip.action") - onClicked: { - PowerProfileService.cycleProfile() - } + onClicked: PowerProfileService.cycleProfile() } diff --git a/Modules/Panels/ControlCenter/Widgets/ScreenRecorder.qml b/Modules/Panels/ControlCenter/Widgets/ScreenRecorder.qml index 85fbacd9..b2e6520b 100644 --- a/Modules/Panels/ControlCenter/Widgets/ScreenRecorder.qml +++ b/Modules/Panels/ControlCenter/Widgets/ScreenRecorder.qml @@ -1,7 +1,7 @@ import QtQuick.Layouts import Quickshell import qs.Commons -import qs.Services +import qs.Services.UI import qs.Widgets NIconButtonHot { @@ -14,8 +14,7 @@ NIconButtonHot { onClicked: { ScreenRecorderService.toggleRecording() if (!ScreenRecorderService.isRecording) { - var panel = PanelService.getPanel("controlCenterPanel", screen) - panel?.close() + PanelService.getPanel("controlCenterPanel", screen)?.close } } } diff --git a/Modules/Panels/ControlCenter/Widgets/WallpaperSelector.qml b/Modules/Panels/ControlCenter/Widgets/WallpaperSelector.qml index daa941ee..6d6e840d 100644 --- a/Modules/Panels/ControlCenter/Widgets/WallpaperSelector.qml +++ b/Modules/Panels/ControlCenter/Widgets/WallpaperSelector.qml @@ -1,7 +1,7 @@ import QtQuick.Layouts import Quickshell import qs.Commons -import qs.Services +import qs.Services.UI import qs.Widgets NIconButtonHot { diff --git a/Modules/Panels/ControlCenter/Widgets/WiFi.qml b/Modules/Panels/ControlCenter/Widgets/WiFi.qml index a24f43e1..e40047f1 100644 --- a/Modules/Panels/ControlCenter/Widgets/WiFi.qml +++ b/Modules/Panels/ControlCenter/Widgets/WiFi.qml @@ -1,7 +1,8 @@ import QtQuick.Layouts import Quickshell import qs.Commons -import qs.Services +import qs.Services.Networking +import qs.Services.UI import qs.Widgets NIconButtonHot { diff --git a/Modules/Panels/Launcher/Launcher.qml b/Modules/Panels/Launcher/Launcher.qml index 43e1f886..d26f1b0b 100644 --- a/Modules/Panels/Launcher/Launcher.qml +++ b/Modules/Panels/Launcher/Launcher.qml @@ -4,7 +4,6 @@ import QtQuick.Layouts import Quickshell import Quickshell.Widgets import qs.Commons -import qs.Services import qs.Widgets import qs.Modules.MainScreen import "Plugins" @@ -13,8 +12,8 @@ SmartPanel { id: root // Panel configuration - preferredWidth: 500 * Style.uiScaleRatio - preferredHeight: 600 * Style.uiScaleRatio + preferredWidth: Math.round(500 * Style.uiScaleRatio) + preferredHeight: Math.round(600 * Style.uiScaleRatio) preferredWidthRatio: 0.3 preferredHeightRatio: 0.5 diff --git a/Modules/Panels/Launcher/Plugins/ApplicationsPlugin.qml b/Modules/Panels/Launcher/Plugins/ApplicationsPlugin.qml index 8add1460..3d3a1e60 100644 --- a/Modules/Panels/Launcher/Plugins/ApplicationsPlugin.qml +++ b/Modules/Panels/Launcher/Plugins/ApplicationsPlugin.qml @@ -2,7 +2,6 @@ import QtQuick import Quickshell import Quickshell.Io import qs.Commons -import qs.Services import "../../../../Helpers/FuzzySort.js" as Fuzzysort Item { diff --git a/Modules/Panels/Launcher/Plugins/CalculatorPlugin.qml b/Modules/Panels/Launcher/Plugins/CalculatorPlugin.qml index 9eca7fc7..e8aaf5e3 100644 --- a/Modules/Panels/Launcher/Plugins/CalculatorPlugin.qml +++ b/Modules/Panels/Launcher/Plugins/CalculatorPlugin.qml @@ -1,5 +1,4 @@ import QtQuick -import qs.Services import qs.Commons import "../../../../Helpers/AdvancedMath.js" as AdvancedMath diff --git a/Modules/Panels/Launcher/Plugins/ClipboardPlugin.qml b/Modules/Panels/Launcher/Plugins/ClipboardPlugin.qml index 0d5837bd..e6922b87 100644 --- a/Modules/Panels/Launcher/Plugins/ClipboardPlugin.qml +++ b/Modules/Panels/Launcher/Plugins/ClipboardPlugin.qml @@ -1,7 +1,7 @@ import QtQuick import Quickshell import qs.Commons -import qs.Services +import qs.Services.Keyboard Item { id: root diff --git a/Modules/Panels/NotificationHistory/NotificationHistoryPanel.qml b/Modules/Panels/NotificationHistory/NotificationHistoryPanel.qml index 3c90e942..53faaa8a 100644 --- a/Modules/Panels/NotificationHistory/NotificationHistoryPanel.qml +++ b/Modules/Panels/NotificationHistory/NotificationHistoryPanel.qml @@ -5,7 +5,7 @@ import Quickshell import Quickshell.Wayland import Quickshell.Services.Notifications import qs.Commons -import qs.Services +import qs.Services.System import qs.Widgets import qs.Modules.MainScreen diff --git a/Modules/Panels/SessionMenu/SessionMenu.qml b/Modules/Panels/SessionMenu/SessionMenu.qml index 4fdcdeea..a8c8f593 100644 --- a/Modules/Panels/SessionMenu/SessionMenu.qml +++ b/Modules/Panels/SessionMenu/SessionMenu.qml @@ -7,7 +7,7 @@ import Quickshell.Io import Quickshell.Widgets import Quickshell.Wayland import qs.Commons -import qs.Services +import qs.Services.Compositor import qs.Widgets import qs.Modules.MainScreen diff --git a/Modules/Panels/Settings/Bar/BarWidgetSettingsDialog.qml b/Modules/Panels/Settings/Bar/BarWidgetSettingsDialog.qml index c6f866fc..577c252f 100644 --- a/Modules/Panels/Settings/Bar/BarWidgetSettingsDialog.qml +++ b/Modules/Panels/Settings/Bar/BarWidgetSettingsDialog.qml @@ -4,7 +4,7 @@ import QtQuick.Effects import QtQuick.Layouts import qs.Commons import qs.Widgets -import qs.Services +import qs.Services.UI // Widget Settings Dialog Component Popup { diff --git a/Modules/Panels/Settings/ControlCenter/ControlCenterWidgetSettingsDialog.qml b/Modules/Panels/Settings/ControlCenter/ControlCenterWidgetSettingsDialog.qml index 4b9c9fb1..805f2fc5 100644 --- a/Modules/Panels/Settings/ControlCenter/ControlCenterWidgetSettingsDialog.qml +++ b/Modules/Panels/Settings/ControlCenter/ControlCenterWidgetSettingsDialog.qml @@ -3,7 +3,7 @@ import QtQuick.Controls import QtQuick.Layouts import qs.Commons import qs.Widgets -import qs.Services +import qs.Services.UI // Widget Settings Dialog Component Popup { diff --git a/Modules/Panels/Settings/SettingsPanel.qml b/Modules/Panels/Settings/SettingsPanel.qml index f1694ab0..1df4c2a1 100644 --- a/Modules/Panels/Settings/SettingsPanel.qml +++ b/Modules/Panels/Settings/SettingsPanel.qml @@ -2,12 +2,11 @@ import QtQuick import QtQuick.Controls import QtQuick.Layouts import Quickshell -import Quickshell.Wayland import qs.Modules.Panels.Settings.Tabs import qs.Commons -import qs.Services -import qs.Widgets import qs.Modules.MainScreen +import qs.Services.System +import qs.Widgets SmartPanel { id: root diff --git a/Modules/Panels/Settings/Tabs/AboutTab.qml b/Modules/Panels/Settings/Tabs/AboutTab.qml index 3bd64a45..b3463bc3 100644 --- a/Modules/Panels/Settings/Tabs/AboutTab.qml +++ b/Modules/Panels/Settings/Tabs/AboutTab.qml @@ -5,7 +5,7 @@ import QtQuick.Layouts import Quickshell import Quickshell.Io import qs.Commons -import qs.Services +import qs.Services.Noctalia import qs.Widgets ColumnLayout { diff --git a/Modules/Panels/Settings/Tabs/AudioTab.qml b/Modules/Panels/Settings/Tabs/AudioTab.qml index 2133f5a1..96fa6dc5 100644 --- a/Modules/Panels/Settings/Tabs/AudioTab.qml +++ b/Modules/Panels/Settings/Tabs/AudioTab.qml @@ -3,7 +3,7 @@ import QtQuick.Controls import QtQuick.Layouts import Quickshell.Services.Pipewire import qs.Commons -import qs.Services +import qs.Services.Media import qs.Widgets ColumnLayout { diff --git a/Modules/Panels/Settings/Tabs/BarTab.qml b/Modules/Panels/Settings/Tabs/BarTab.qml index b01e1f88..5e0c2fad 100644 --- a/Modules/Panels/Settings/Tabs/BarTab.qml +++ b/Modules/Panels/Settings/Tabs/BarTab.qml @@ -3,7 +3,8 @@ import QtQuick.Controls import QtQuick.Layouts import Quickshell import qs.Commons -import qs.Services +import qs.Services.Compositor +import qs.Services.UI import qs.Widgets ColumnLayout { diff --git a/Modules/Panels/Settings/Tabs/ColorSchemeTab.qml b/Modules/Panels/Settings/Tabs/ColorSchemeTab.qml index 80f0bf80..c4570b8b 100644 --- a/Modules/Panels/Settings/Tabs/ColorSchemeTab.qml +++ b/Modules/Panels/Settings/Tabs/ColorSchemeTab.qml @@ -4,7 +4,9 @@ import QtQuick.Layouts import Quickshell import Quickshell.Io import qs.Commons -import qs.Services +import qs.Services.DynamicTheming +import qs.Services.System +import qs.Services.UI import qs.Widgets ColumnLayout { diff --git a/Modules/Panels/Settings/Tabs/ControlCenterTab.qml b/Modules/Panels/Settings/Tabs/ControlCenterTab.qml index 8e96428f..989f56e7 100644 --- a/Modules/Panels/Settings/Tabs/ControlCenterTab.qml +++ b/Modules/Panels/Settings/Tabs/ControlCenterTab.qml @@ -3,7 +3,7 @@ import QtQuick.Controls import QtQuick.Layouts import Quickshell import qs.Commons -import qs.Services +import qs.Services.UI import qs.Widgets ColumnLayout { diff --git a/Modules/Panels/Settings/Tabs/DisplayTab.qml b/Modules/Panels/Settings/Tabs/DisplayTab.qml index ff863964..d9530e28 100644 --- a/Modules/Panels/Settings/Tabs/DisplayTab.qml +++ b/Modules/Panels/Settings/Tabs/DisplayTab.qml @@ -4,7 +4,9 @@ import QtQuick.Controls import Quickshell import Quickshell.Io import qs.Commons -import qs.Services +import qs.Services.Compositor +import qs.Services.Location +import qs.Services.Hardware import qs.Widgets ColumnLayout { diff --git a/Modules/Panels/Settings/Tabs/DockTab.qml b/Modules/Panels/Settings/Tabs/DockTab.qml index e9784bea..8afe2e59 100644 --- a/Modules/Panels/Settings/Tabs/DockTab.qml +++ b/Modules/Panels/Settings/Tabs/DockTab.qml @@ -3,7 +3,7 @@ import QtQuick.Controls import QtQuick.Layouts import Quickshell import qs.Commons -import qs.Services +import qs.Services.Compositor import qs.Widgets ColumnLayout { diff --git a/Modules/Panels/Settings/Tabs/GeneralTab.qml b/Modules/Panels/Settings/Tabs/GeneralTab.qml index 80b282e9..c5de3c6c 100644 --- a/Modules/Panels/Settings/Tabs/GeneralTab.qml +++ b/Modules/Panels/Settings/Tabs/GeneralTab.qml @@ -3,7 +3,7 @@ import QtQuick.Controls import QtQuick.Layouts import Quickshell import qs.Commons -import qs.Services +import qs.Services.System import qs.Widgets ColumnLayout { diff --git a/Modules/Panels/Settings/Tabs/HooksTab.qml b/Modules/Panels/Settings/Tabs/HooksTab.qml index 0b664cd3..b129bd7c 100644 --- a/Modules/Panels/Settings/Tabs/HooksTab.qml +++ b/Modules/Panels/Settings/Tabs/HooksTab.qml @@ -2,7 +2,8 @@ import QtQuick import QtQuick.Controls import QtQuick.Layouts import qs.Commons -import qs.Services +import qs.Services.Control +import qs.Services.UI import qs.Widgets ColumnLayout { diff --git a/Modules/Panels/Settings/Tabs/LauncherTab.qml b/Modules/Panels/Settings/Tabs/LauncherTab.qml index 642d1ee8..e4cc4631 100644 --- a/Modules/Panels/Settings/Tabs/LauncherTab.qml +++ b/Modules/Panels/Settings/Tabs/LauncherTab.qml @@ -2,7 +2,7 @@ import QtQuick import QtQuick.Controls import QtQuick.Layouts import qs.Commons -import qs.Services +import qs.Services.System import qs.Widgets ColumnLayout { diff --git a/Modules/Panels/Settings/Tabs/LocationTab.qml b/Modules/Panels/Settings/Tabs/LocationTab.qml index c2f264ce..b91edeb6 100644 --- a/Modules/Panels/Settings/Tabs/LocationTab.qml +++ b/Modules/Panels/Settings/Tabs/LocationTab.qml @@ -2,7 +2,7 @@ import QtQuick import QtQuick.Controls import QtQuick.Layouts import qs.Commons -import qs.Services +import qs.Services.Location import qs.Widgets ColumnLayout { diff --git a/Modules/Panels/Settings/Tabs/NetworkTab.qml b/Modules/Panels/Settings/Tabs/NetworkTab.qml index 958a2842..9ff4c6d2 100644 --- a/Modules/Panels/Settings/Tabs/NetworkTab.qml +++ b/Modules/Panels/Settings/Tabs/NetworkTab.qml @@ -2,9 +2,8 @@ import QtQuick import QtQuick.Controls import QtQuick.Layouts import Quickshell -import Quickshell.Bluetooth import qs.Commons -import qs.Services +import qs.Services.Networking import qs.Widgets ColumnLayout { diff --git a/Modules/Panels/Settings/Tabs/NotificationsTab.qml b/Modules/Panels/Settings/Tabs/NotificationsTab.qml index b37f1d62..6c0a9e37 100644 --- a/Modules/Panels/Settings/Tabs/NotificationsTab.qml +++ b/Modules/Panels/Settings/Tabs/NotificationsTab.qml @@ -3,7 +3,7 @@ import QtQuick.Layouts import QtQuick.Controls import Quickshell import qs.Commons -import qs.Services +import qs.Services.Compositor import qs.Widgets ColumnLayout { diff --git a/Modules/Panels/Settings/Tabs/OsdTab.qml b/Modules/Panels/Settings/Tabs/OsdTab.qml index 906f8883..3474ec87 100644 --- a/Modules/Panels/Settings/Tabs/OsdTab.qml +++ b/Modules/Panels/Settings/Tabs/OsdTab.qml @@ -3,7 +3,7 @@ import QtQuick.Layouts import QtQuick.Controls import Quickshell import qs.Commons -import qs.Services +import qs.Services.Compositor import qs.Widgets ColumnLayout { diff --git a/Modules/Panels/Settings/Tabs/WallpaperTab.qml b/Modules/Panels/Settings/Tabs/WallpaperTab.qml index 6fb57733..ec3995a0 100644 --- a/Modules/Panels/Settings/Tabs/WallpaperTab.qml +++ b/Modules/Panels/Settings/Tabs/WallpaperTab.qml @@ -4,7 +4,8 @@ import QtQuick.Layouts import Quickshell import Quickshell.Io import qs.Commons -import qs.Services +import qs.Services.Compositor +import qs.Services.UI import qs.Widgets ColumnLayout { diff --git a/Modules/Panels/SetupWizard/SetupAppearanceStep.qml b/Modules/Panels/SetupWizard/SetupAppearanceStep.qml index 7a2df8c0..73c8da0c 100644 --- a/Modules/Panels/SetupWizard/SetupAppearanceStep.qml +++ b/Modules/Panels/SetupWizard/SetupAppearanceStep.qml @@ -3,7 +3,6 @@ import QtQuick.Layouts import QtQuick.Controls import Quickshell.Io import qs.Commons -import qs.Services import qs.Widgets ColumnLayout { diff --git a/Modules/Panels/SetupWizard/SetupCustomizeStep.qml b/Modules/Panels/SetupWizard/SetupCustomizeStep.qml index 52da1576..2526933d 100644 --- a/Modules/Panels/SetupWizard/SetupCustomizeStep.qml +++ b/Modules/Panels/SetupWizard/SetupCustomizeStep.qml @@ -3,7 +3,6 @@ import QtQuick.Layouts import QtQuick.Controls import Quickshell import qs.Commons -import qs.Services import qs.Widgets ColumnLayout { diff --git a/Modules/Panels/SetupWizard/SetupDockStep.qml b/Modules/Panels/SetupWizard/SetupDockStep.qml index 79164869..c9446d7f 100644 --- a/Modules/Panels/SetupWizard/SetupDockStep.qml +++ b/Modules/Panels/SetupWizard/SetupDockStep.qml @@ -3,7 +3,6 @@ import QtQuick.Layouts import QtQuick.Controls import Quickshell import qs.Commons -import qs.Services import qs.Widgets ColumnLayout { diff --git a/Modules/Panels/SetupWizard/SetupWallpaperStep.qml b/Modules/Panels/SetupWizard/SetupWallpaperStep.qml index d1d0df06..dd08d7ec 100644 --- a/Modules/Panels/SetupWizard/SetupWallpaperStep.qml +++ b/Modules/Panels/SetupWizard/SetupWallpaperStep.qml @@ -5,7 +5,6 @@ import QtQuick.Effects import Quickshell import Quickshell.Io import qs.Commons -import qs.Services import qs.Widgets import "../../../Helpers/FuzzySort.js" as FuzzySort diff --git a/Modules/Panels/SetupWizard/SetupWizard.qml b/Modules/Panels/SetupWizard/SetupWizard.qml index 74dd1fb3..f8ee4df6 100644 --- a/Modules/Panels/SetupWizard/SetupWizard.qml +++ b/Modules/Panels/SetupWizard/SetupWizard.qml @@ -4,7 +4,6 @@ import QtQuick.Controls import Quickshell import Quickshell.Wayland import qs.Commons -import qs.Services import qs.Widgets import qs.Modules.MainScreen diff --git a/Modules/Panels/Tray/TrayDrawerPanel.qml b/Modules/Panels/Tray/TrayDrawerPanel.qml index 85cced89..20db163a 100644 --- a/Modules/Panels/Tray/TrayDrawerPanel.qml +++ b/Modules/Panels/Tray/TrayDrawerPanel.qml @@ -4,7 +4,7 @@ import Quickshell import Quickshell.Widgets import Quickshell.Services.SystemTray import qs.Commons -import qs.Services +import qs.Services.UI import qs.Widgets import qs.Modules.MainScreen diff --git a/Modules/Panels/Tray/TrayMenuPanel.qml b/Modules/Panels/Tray/TrayMenuPanel.qml index c55115c0..bfe11708 100644 --- a/Modules/Panels/Tray/TrayMenuPanel.qml +++ b/Modules/Panels/Tray/TrayMenuPanel.qml @@ -3,7 +3,6 @@ import QtQuick.Controls import QtQuick.Layouts import Quickshell import qs.Commons -import qs.Services import qs.Widgets import qs.Modules.MainScreen diff --git a/Modules/Panels/Wallpaper/WallpaperPanel.qml b/Modules/Panels/Wallpaper/WallpaperPanel.qml index 60e2cd41..d2fc547f 100644 --- a/Modules/Panels/Wallpaper/WallpaperPanel.qml +++ b/Modules/Panels/Wallpaper/WallpaperPanel.qml @@ -2,12 +2,11 @@ import QtQuick import QtQuick.Layouts import QtQuick.Controls import Quickshell -import Quickshell.Wayland import qs.Commons -import qs.Modules.Panels.Settings -import qs.Services -import qs.Widgets import qs.Modules.MainScreen +import qs.Modules.Panels.Settings +import qs.Services.UI +import qs.Widgets import "../../../Helpers/FuzzySort.js" as FuzzySort SmartPanel { diff --git a/Modules/Panels/WiFi/WiFiPanel.qml b/Modules/Panels/WiFi/WiFiPanel.qml index accb5782..8dc08084 100644 --- a/Modules/Panels/WiFi/WiFiPanel.qml +++ b/Modules/Panels/WiFi/WiFiPanel.qml @@ -2,11 +2,10 @@ import QtQuick import QtQuick.Layouts import QtQuick.Controls import Quickshell -import Quickshell.Wayland import qs.Commons -import qs.Services -import qs.Widgets import qs.Modules.MainScreen +import qs.Services.Networking +import qs.Widgets SmartPanel { id: root diff --git a/Modules/Toast/ToastOverlay.qml b/Modules/Toast/ToastOverlay.qml index 3051108d..db5dbe56 100644 --- a/Modules/Toast/ToastOverlay.qml +++ b/Modules/Toast/ToastOverlay.qml @@ -3,7 +3,6 @@ import QtQuick.Controls import Quickshell import Quickshell.Wayland import qs.Commons -import qs.Services import qs.Widgets Variants { diff --git a/Modules/Toast/ToastScreen.qml b/Modules/Toast/ToastScreen.qml index 70b1f38b..7ed7720c 100644 --- a/Modules/Toast/ToastScreen.qml +++ b/Modules/Toast/ToastScreen.qml @@ -1,10 +1,8 @@ import QtQuick -import QtQuick.Controls import Quickshell import Quickshell.Wayland import qs.Commons -import qs.Services -import qs.Widgets +import qs.Services.UI Item { id: root @@ -200,8 +198,9 @@ Item { WlrLayershell.layer: (Settings.data.notifications && Settings.data.notifications.overlayLayer) ? WlrLayer.Overlay : WlrLayer.Top WlrLayershell.keyboardFocus: WlrKeyboardFocus.None - exclusionMode: PanelWindow.ExclusionMode.Ignore + WlrLayershell.exclusionMode: ExclusionMode.Ignore + //mask: Region {} function showToast(message, description, icon, type, duration) { toastItem.show(message, description, icon, type, duration) } diff --git a/Modules/Tooltip/Tooltip.qml b/Modules/Tooltip/Tooltip.qml index f30306d3..584c1529 100644 --- a/Modules/Tooltip/Tooltip.qml +++ b/Modules/Tooltip/Tooltip.qml @@ -1,8 +1,7 @@ import QtQuick -import QtQuick.Layouts +// import QtQuick.Layouts import Quickshell import qs.Commons -import qs.Services import qs.Widgets PopupWindow { diff --git a/Services/CompositorService.qml b/Services/Compositor/CompositorService.qml similarity index 99% rename from Services/CompositorService.qml rename to Services/Compositor/CompositorService.qml index cd4b16b1..17275b34 100644 --- a/Services/CompositorService.qml +++ b/Services/Compositor/CompositorService.qml @@ -4,7 +4,6 @@ import QtQuick import Quickshell import Quickshell.Io import qs.Commons -import qs.Services Singleton { id: root diff --git a/Services/HyprlandService.qml b/Services/Compositor/HyprlandService.qml similarity index 100% rename from Services/HyprlandService.qml rename to Services/Compositor/HyprlandService.qml diff --git a/Services/NiriService.qml b/Services/Compositor/NiriService.qml similarity index 100% rename from Services/NiriService.qml rename to Services/Compositor/NiriService.qml diff --git a/Services/SwayService.qml b/Services/Compositor/SwayService.qml similarity index 100% rename from Services/SwayService.qml rename to Services/Compositor/SwayService.qml diff --git a/Services/HooksService.qml b/Services/Control/HooksService.qml similarity index 98% rename from Services/HooksService.qml rename to Services/Control/HooksService.qml index db9f5e17..646cfbfd 100644 --- a/Services/HooksService.qml +++ b/Services/Control/HooksService.qml @@ -3,7 +3,7 @@ pragma Singleton import QtQuick import Quickshell import qs.Commons -import qs.Services +import qs.Services.UI Singleton { id: root diff --git a/Services/IPCService.qml b/Services/Control/IPCService.qml similarity index 99% rename from Services/IPCService.qml rename to Services/Control/IPCService.qml index 406cfb07..1d753cce 100644 --- a/Services/IPCService.qml +++ b/Services/Control/IPCService.qml @@ -4,7 +4,7 @@ import Quickshell.Io import Quickshell.Wayland import Quickshell.Widgets import qs.Commons -import qs.Services +import qs.Services.UI Item { id: root diff --git a/Services/AppThemeService.qml b/Services/DynamicTheming/AppThemeService.qml similarity index 98% rename from Services/AppThemeService.qml rename to Services/DynamicTheming/AppThemeService.qml index f694d235..167309da 100644 --- a/Services/AppThemeService.qml +++ b/Services/DynamicTheming/AppThemeService.qml @@ -3,6 +3,7 @@ pragma Singleton import QtQuick import Quickshell import qs.Commons +import qs.Services.UI Singleton { id: root diff --git a/Services/ColorPaletteGenerator.qml b/Services/DynamicTheming/ColorPaletteGenerator.qml similarity index 98% rename from Services/ColorPaletteGenerator.qml rename to Services/DynamicTheming/ColorPaletteGenerator.qml index 05b9d7c2..343b1758 100644 --- a/Services/ColorPaletteGenerator.qml +++ b/Services/DynamicTheming/ColorPaletteGenerator.qml @@ -2,7 +2,7 @@ pragma Singleton import QtQuick import Quickshell -import "../Helpers/ColorsConvert.js" as ColorsConvert +import "../../Helpers/ColorsConvert.js" as ColorsConvert Singleton { id: root diff --git a/Services/ColorSchemeService.qml b/Services/DynamicTheming/ColorSchemeService.qml similarity index 99% rename from Services/ColorSchemeService.qml rename to Services/DynamicTheming/ColorSchemeService.qml index 002a1d89..734d8bd9 100644 --- a/Services/ColorSchemeService.qml +++ b/Services/DynamicTheming/ColorSchemeService.qml @@ -5,7 +5,6 @@ import Qt.labs.folderlistmodel import Quickshell import Quickshell.Io import qs.Commons -import qs.Services Singleton { id: root diff --git a/Services/TemplateProcessor.qml b/Services/DynamicTheming/TemplateProcessor.qml similarity index 99% rename from Services/TemplateProcessor.qml rename to Services/DynamicTheming/TemplateProcessor.qml index d5d0d0d8..b436967c 100644 --- a/Services/TemplateProcessor.qml +++ b/Services/DynamicTheming/TemplateProcessor.qml @@ -4,6 +4,8 @@ import QtQuick import Quickshell import Quickshell.Io import qs.Commons +import qs.Services.System +import qs.Services.UI Singleton { id: root diff --git a/Services/TemplateRegistry.qml b/Services/DynamicTheming/TemplateRegistry.qml similarity index 96% rename from Services/TemplateRegistry.qml rename to Services/DynamicTheming/TemplateRegistry.qml index a4157f48..40d0542c 100644 --- a/Services/TemplateRegistry.qml +++ b/Services/DynamicTheming/TemplateRegistry.qml @@ -51,7 +51,7 @@ Singleton { }, { "path": "~/.config/gtk-4.0/gtk.css" }], - "postProcess": mode => `gsettings set org.gnome.desktop.interface color-scheme prefer-${mode}\n` + "postProcess": mode => `gsettings set org.gnome.desktop.interface color-scheme prefer-${mode}` }, { "id": "qt", "name": "Qt", @@ -78,7 +78,7 @@ Singleton { "outputs": [{ "path": "~/.config/fuzzel/themes/noctalia" }], - "postProcess": () => `${colorsApplyScript} fuzzel\n` + "postProcess": () => `${colorsApplyScript} fuzzel` }, { "id": "vicinae", "name": "Vicinae", @@ -87,7 +87,7 @@ Singleton { "outputs": [{ "path": "~/.local/share/vicinae/themes/matugen.toml" }], - "postProcess": () => `cp -n ${Quickshell.shellDir}/Assets/noctalia.svg ~/.local/share/vicinae/themes/noctalia.svg && ${colorsApplyScript} vicinae\n` + "postProcess": () => `cp -n ${Quickshell.shellDir}/Assets/noctalia.svg ~/.local/share/vicinae/themes/noctalia.svg && ${colorsApplyScript} vicinae` }, { "id": "walker", "name": "Walker", @@ -96,7 +96,7 @@ Singleton { "outputs": [{ "path": "~/.config/walker/themes/noctalia/style.css" }], - "postProcess": () => `${colorsApplyScript} walker\n`, + "postProcess": () => `${colorsApplyScript} walker`, "strict": true // Use strict mode for palette generation (preserves custom surface/outline values) }, { "id": "pywalfox", @@ -106,8 +106,8 @@ Singleton { "outputs": [{ "path": "~/.cache/wal/colors.json" }], - "postProcess": () => `${colorsApplyScript} pywalfox\n` - }, // CONSOLIDATED DISCORD CLIENTS (requirement #2) + "postProcess": () => `${colorsApplyScript} pywalfox` + }, // CONSOLIDATED DISCORD CLIENTS { "id": "discord", "name": "Discord", diff --git a/Services/BatteryService.qml b/Services/Hardware/BatteryService.qml similarity index 99% rename from Services/BatteryService.qml rename to Services/Hardware/BatteryService.qml index 14b831c9..41d63695 100644 --- a/Services/BatteryService.qml +++ b/Services/Hardware/BatteryService.qml @@ -4,7 +4,7 @@ import Quickshell import Quickshell.Io import Quickshell.Services.UPower import qs.Commons -import qs.Services +import qs.Services.UI Singleton { id: root diff --git a/Services/BrightnessService.qml b/Services/Hardware/BrightnessService.qml similarity index 100% rename from Services/BrightnessService.qml rename to Services/Hardware/BrightnessService.qml diff --git a/Services/ClipboardService.qml b/Services/Keyboard/ClipboardService.qml similarity index 100% rename from Services/ClipboardService.qml rename to Services/Keyboard/ClipboardService.qml diff --git a/Services/KeyboardLayoutService.qml b/Services/Keyboard/KeyboardLayoutService.qml similarity index 99% rename from Services/KeyboardLayoutService.qml rename to Services/Keyboard/KeyboardLayoutService.qml index ed0b4f8b..7876b27a 100644 --- a/Services/KeyboardLayoutService.qml +++ b/Services/Keyboard/KeyboardLayoutService.qml @@ -5,7 +5,6 @@ import Quickshell import Quickshell.Io import Quickshell.Hyprland import qs.Commons -import qs.Services Singleton { id: root diff --git a/Services/LockKeysService.qml b/Services/Keyboard/LockKeysService.qml similarity index 100% rename from Services/LockKeysService.qml rename to Services/Keyboard/LockKeysService.qml diff --git a/Services/CalendarService.qml b/Services/Location/CalendarService.qml similarity index 100% rename from Services/CalendarService.qml rename to Services/Location/CalendarService.qml diff --git a/Services/DarkModeService.qml b/Services/Location/DarkModeService.qml similarity index 99% rename from Services/DarkModeService.qml rename to Services/Location/DarkModeService.qml index ad3eef00..e7c3315c 100644 --- a/Services/DarkModeService.qml +++ b/Services/Location/DarkModeService.qml @@ -3,7 +3,6 @@ pragma Singleton import QtQuick import Quickshell import qs.Commons -import qs.Services Singleton { id: root diff --git a/Services/LocationService.qml b/Services/Location/LocationService.qml similarity index 99% rename from Services/LocationService.qml rename to Services/Location/LocationService.qml index 7c2df5d4..775c9616 100644 --- a/Services/LocationService.qml +++ b/Services/Location/LocationService.qml @@ -4,7 +4,6 @@ import QtQuick import Quickshell import Quickshell.Io import qs.Commons -import qs.Services // Weather logic and caching with stable UI properties Singleton { diff --git a/Services/NightLightService.qml b/Services/Location/NightLightService.qml similarity index 99% rename from Services/NightLightService.qml rename to Services/Location/NightLightService.qml index 864ae87a..8160c9e9 100644 --- a/Services/NightLightService.qml +++ b/Services/Location/NightLightService.qml @@ -4,7 +4,6 @@ import QtQuick import Quickshell import Quickshell.Io import qs.Commons -import qs.Services Singleton { id: root diff --git a/Services/AudioService.qml b/Services/Media/AudioService.qml similarity index 100% rename from Services/AudioService.qml rename to Services/Media/AudioService.qml diff --git a/Services/CavaService.qml b/Services/Media/CavaService.qml similarity index 99% rename from Services/CavaService.qml rename to Services/Media/CavaService.qml index 16324bc7..622181c8 100644 --- a/Services/CavaService.qml +++ b/Services/Media/CavaService.qml @@ -4,6 +4,7 @@ import QtQuick import Quickshell import Quickshell.Io import qs.Commons +import qs.Services.UI Singleton { id: root diff --git a/Services/MediaService.qml b/Services/Media/MediaService.qml similarity index 99% rename from Services/MediaService.qml rename to Services/Media/MediaService.qml index b96cafbd..be8bab1e 100644 --- a/Services/MediaService.qml +++ b/Services/Media/MediaService.qml @@ -4,7 +4,6 @@ import QtQuick import Quickshell import Quickshell.Services.Mpris import qs.Commons -import qs.Services Singleton { id: root diff --git a/Services/ScreenRecorderService.qml b/Services/Media/ScreenRecorderService.qml similarity index 99% rename from Services/ScreenRecorderService.qml rename to Services/Media/ScreenRecorderService.qml index c2e09fc4..8b4d9f98 100644 --- a/Services/ScreenRecorderService.qml +++ b/Services/Media/ScreenRecorderService.qml @@ -4,7 +4,7 @@ import QtQuick import Quickshell import Quickshell.Io import qs.Commons -import qs.Services +import qs.Services.System Singleton { id: root diff --git a/Services/BluetoothService.qml b/Services/Networking/BluetoothService.qml similarity index 99% rename from Services/BluetoothService.qml rename to Services/Networking/BluetoothService.qml index 0ab4a30f..b130a489 100644 --- a/Services/BluetoothService.qml +++ b/Services/Networking/BluetoothService.qml @@ -5,7 +5,6 @@ import Quickshell import Quickshell.Bluetooth import Quickshell.Io import qs.Commons -import qs.Services Singleton { id: root diff --git a/Services/NetworkService.qml b/Services/Networking/NetworkService.qml similarity index 99% rename from Services/NetworkService.qml rename to Services/Networking/NetworkService.qml index 142d300a..61731a4c 100644 --- a/Services/NetworkService.qml +++ b/Services/Networking/NetworkService.qml @@ -4,7 +4,7 @@ import QtQuick import Quickshell import Quickshell.Io import qs.Commons -import qs.Services +import qs.Services.UI Singleton { id: root diff --git a/Services/GitHubService.qml b/Services/Noctalia/GitHubService.qml similarity index 99% rename from Services/GitHubService.qml rename to Services/Noctalia/GitHubService.qml index 1a2efc8a..6f7c1bf4 100644 --- a/Services/GitHubService.qml +++ b/Services/Noctalia/GitHubService.qml @@ -4,7 +4,6 @@ import QtQuick import Quickshell import Quickshell.Io import qs.Commons -import qs.Services // GitHub API logic and caching Singleton { diff --git a/Services/UpdateService.qml b/Services/Noctalia/UpdateService.qml similarity index 100% rename from Services/UpdateService.qml rename to Services/Noctalia/UpdateService.qml diff --git a/Services/IdleInhibitorService.qml b/Services/Power/IdleInhibitorService.qml similarity index 99% rename from Services/IdleInhibitorService.qml rename to Services/Power/IdleInhibitorService.qml index 941e2f3d..80aaba3f 100644 --- a/Services/IdleInhibitorService.qml +++ b/Services/Power/IdleInhibitorService.qml @@ -4,7 +4,7 @@ import QtQuick import Quickshell import Quickshell.Io import qs.Commons -import qs.Services +import qs.Services.UI Singleton { id: root diff --git a/Services/PowerProfileService.qml b/Services/Power/PowerProfileService.qml similarity index 99% rename from Services/PowerProfileService.qml rename to Services/Power/PowerProfileService.qml index cb778628..f086e9c1 100644 --- a/Services/PowerProfileService.qml +++ b/Services/Power/PowerProfileService.qml @@ -4,7 +4,7 @@ import QtQuick import Quickshell import Quickshell.Services.UPower import qs.Commons -import qs.Services +import qs.Services.UI Singleton { id: root diff --git a/Services/DistroService.qml b/Services/System/DistroService.qml similarity index 100% rename from Services/DistroService.qml rename to Services/System/DistroService.qml diff --git a/Services/FontService.qml b/Services/System/FontService.qml similarity index 100% rename from Services/FontService.qml rename to Services/System/FontService.qml diff --git a/Services/NotificationService.qml b/Services/System/NotificationService.qml similarity index 99% rename from Services/NotificationService.qml rename to Services/System/NotificationService.qml index 706e55fd..1442e5fb 100644 --- a/Services/NotificationService.qml +++ b/Services/System/NotificationService.qml @@ -6,8 +6,8 @@ import Quickshell import Quickshell.Io import Quickshell.Services.Notifications import qs.Commons -import qs.Services -import "../Helpers/sha256.js" as Checksum +import qs.Services.Power +import "../../Helpers/sha256.js" as Checksum Singleton { id: root diff --git a/Services/ProgramCheckerService.qml b/Services/System/ProgramCheckerService.qml similarity index 99% rename from Services/ProgramCheckerService.qml rename to Services/System/ProgramCheckerService.qml index fa3cb406..e569ce1e 100644 --- a/Services/ProgramCheckerService.qml +++ b/Services/System/ProgramCheckerService.qml @@ -4,6 +4,7 @@ import QtQuick import Quickshell import Quickshell.Io import qs.Commons +import qs.Services.DynamicTheming // Service to check if various programs are available on the system Singleton { diff --git a/Services/SystemStatService.qml b/Services/System/SystemStatService.qml similarity index 100% rename from Services/SystemStatService.qml rename to Services/System/SystemStatService.qml diff --git a/Services/BarService.qml b/Services/UI/BarService.qml similarity index 100% rename from Services/BarService.qml rename to Services/UI/BarService.qml diff --git a/Services/BarWidgetRegistry.qml b/Services/UI/BarWidgetRegistry.qml similarity index 96% rename from Services/BarWidgetRegistry.qml rename to Services/UI/BarWidgetRegistry.qml index 30cf715b..5cd91190 100644 --- a/Services/BarWidgetRegistry.qml +++ b/Services/UI/BarWidgetRegistry.qml @@ -12,7 +12,8 @@ Singleton { property var widgets: ({ "ActiveWindow": activeWindowComponent, "AudioVisualizer": audioVisualizerComponent, - "Battery": batteryComponent, + "Battery"// HEAVY + : batteryComponent, "Bluetooth": bluetoothComponent, "Brightness": brightnessComponent, "Clock": clockComponent, @@ -27,18 +28,21 @@ Singleton { "NightLight": nightLightComponent, "NoctaliaPerformance": noctaliaPerformanceComponent, "NotificationHistory": notificationHistoryComponent, - "PowerProfile": powerProfileComponent, + "PowerProfile"// HEAVY + : powerProfileComponent, "ScreenRecorder": screenRecorderComponent, "SessionMenu": sessionMenuComponent, "Spacer": spacerComponent, "SystemMonitor": systemMonitorComponent, - "Taskbar": taskbarComponent, + "Taskbar"// HEAVY + : taskbarComponent, "TaskbarGrouped": taskbarGroupedComponent, "Tray": trayComponent, - "Volume": volumeComponent, + "Volume"// A BIT HEAVY ? + : volumeComponent, "WiFi": wiFiComponent, "WallpaperSelector": wallpaperSelectorComponent, - "Workspace": workspaceComponent + "Workspace": workspaceComponent // HEAVY }) property var widgetMetadata: ({ diff --git a/Services/ControlCenterWidgetRegistry.qml b/Services/UI/ControlCenterWidgetRegistry.qml similarity index 100% rename from Services/ControlCenterWidgetRegistry.qml rename to Services/UI/ControlCenterWidgetRegistry.qml diff --git a/Services/PanelService.qml b/Services/UI/PanelService.qml similarity index 100% rename from Services/PanelService.qml rename to Services/UI/PanelService.qml diff --git a/Services/ToastService.qml b/Services/UI/ToastService.qml similarity index 100% rename from Services/ToastService.qml rename to Services/UI/ToastService.qml diff --git a/Services/TooltipService.qml b/Services/UI/TooltipService.qml similarity index 100% rename from Services/TooltipService.qml rename to Services/UI/TooltipService.qml diff --git a/Services/WallpaperService.qml b/Services/UI/WallpaperService.qml similarity index 100% rename from Services/WallpaperService.qml rename to Services/UI/WallpaperService.qml diff --git a/Widgets/NButton.qml b/Widgets/NButton.qml index aed27ab7..ce6c68cf 100644 --- a/Widgets/NButton.qml +++ b/Widgets/NButton.qml @@ -2,7 +2,7 @@ import QtQuick import QtQuick.Controls import QtQuick.Layouts import qs.Commons -import qs.Services +import qs.Services.UI Rectangle { id: root diff --git a/Widgets/NColorPickerDialog.qml b/Widgets/NColorPickerDialog.qml index 21c624e6..5bfb56db 100644 --- a/Widgets/NColorPickerDialog.qml +++ b/Widgets/NColorPickerDialog.qml @@ -2,7 +2,6 @@ import QtQuick import QtQuick.Controls import QtQuick.Layouts import qs.Commons -import qs.Services import qs.Widgets Popup { diff --git a/Widgets/NComboBox.qml b/Widgets/NComboBox.qml index deb0ba9d..b90a1d9f 100644 --- a/Widgets/NComboBox.qml +++ b/Widgets/NComboBox.qml @@ -2,7 +2,6 @@ import QtQuick import QtQuick.Controls import QtQuick.Layouts import qs.Commons -import qs.Services import qs.Widgets RowLayout { diff --git a/Widgets/NContextMenu.qml b/Widgets/NContextMenu.qml index 45b55aed..6c951116 100644 --- a/Widgets/NContextMenu.qml +++ b/Widgets/NContextMenu.qml @@ -2,7 +2,6 @@ import QtQuick import QtQuick.Controls import QtQuick.Layouts import qs.Commons -import qs.Services Popup { id: root diff --git a/Widgets/NDropShadows.qml b/Widgets/NDropShadows.qml index 9dc2a4e5..a0fb3bb3 100644 --- a/Widgets/NDropShadows.qml +++ b/Widgets/NDropShadows.qml @@ -1,7 +1,7 @@ import QtQuick import QtQuick.Effects import qs.Commons -import qs.Services +import qs.Services.Power // Unified shadow system Item { diff --git a/Widgets/NFilePicker.qml b/Widgets/NFilePicker.qml index 9489d114..936ce8ba 100644 --- a/Widgets/NFilePicker.qml +++ b/Widgets/NFilePicker.qml @@ -5,7 +5,6 @@ import Qt.labs.folderlistmodel import Quickshell import Quickshell.Io import qs.Commons -import qs.Services import qs.Widgets import "../Helpers/FuzzySort.js" as FuzzySort diff --git a/Widgets/NIconButton.qml b/Widgets/NIconButton.qml index 2fd507e5..c72d7d38 100644 --- a/Widgets/NIconButton.qml +++ b/Widgets/NIconButton.qml @@ -2,7 +2,7 @@ import QtQuick import Quickshell import Quickshell.Widgets import qs.Commons -import qs.Services +import qs.Services.UI Rectangle { id: root diff --git a/Widgets/NIconButtonHot.qml b/Widgets/NIconButtonHot.qml index ff80b3ef..481d526f 100644 --- a/Widgets/NIconButtonHot.qml +++ b/Widgets/NIconButtonHot.qml @@ -3,7 +3,7 @@ import QtQuick.Controls import QtQuick.Layouts import QtQuick.Effects import qs.Commons -import qs.Services +import qs.Services.UI Rectangle { id: root diff --git a/Widgets/NIconPicker.qml b/Widgets/NIconPicker.qml index 2a4916e9..996917ba 100644 --- a/Widgets/NIconPicker.qml +++ b/Widgets/NIconPicker.qml @@ -4,7 +4,7 @@ import QtQuick.Layouts import QtQuick.Window import qs.Commons import qs.Widgets -import qs.Services +import qs.Services.UI Popup { id: root @@ -15,8 +15,8 @@ Popup { signal iconSelected(string iconName) - width: 900 * Style.uiScaleRatio - height: 700 * Style.uiScaleRatio + width: Math.round(900 * Style.uiScaleRatio) + height: Math.round(700 * Style.uiScaleRatio) anchors.centerIn: Overlay.overlay padding: Style.marginXL diff --git a/Widgets/NSearchableComboBox.qml b/Widgets/NSearchableComboBox.qml index b4c82b52..c4a74a19 100644 --- a/Widgets/NSearchableComboBox.qml +++ b/Widgets/NSearchableComboBox.qml @@ -2,7 +2,6 @@ import QtQuick import QtQuick.Controls import QtQuick.Layouts import qs.Commons -import qs.Services import qs.Widgets import "../Helpers/FuzzySort.js" as Fuzzysort diff --git a/Widgets/NSlider.qml b/Widgets/NSlider.qml index 82bbf102..793dd7bf 100644 --- a/Widgets/NSlider.qml +++ b/Widgets/NSlider.qml @@ -2,7 +2,7 @@ import QtQuick import QtQuick.Controls import QtQuick.Effects import qs.Commons -import qs.Services +import qs.Services.UI Slider { id: root diff --git a/shell.qml b/shell.qml index 8217e7e6..af944e62 100644 --- a/shell.qml +++ b/shell.qml @@ -12,7 +12,14 @@ import Quickshell // Commons & Services import qs.Commons -import qs.Services +import qs.Services.Control +import qs.Services.DynamicTheming +import qs.Services.Hardware +import qs.Services.Location +import qs.Services.Networking +import qs.Services.Power +import qs.Services.System +import qs.Services.UI // Modules import qs.Modules.Background @@ -63,11 +70,9 @@ ShellRoot { WallpaperService.init() AppThemeService.init() ColorSchemeService.init() - BarWidgetRegistry.init() LocationService.init() NightLightService.apply() DarkModeService.init() - FontService.init() HooksService.init() BluetoothService.init() BatteryService.init()