diff --git a/Modules/Background/Background.qml b/Modules/Background/Background.qml index 7f588e73..4dd653b2 100644 --- a/Modules/Background/Background.qml +++ b/Modules/Background/Background.qml @@ -3,7 +3,6 @@ import Quickshell import Quickshell.Wayland import qs.Commons import qs.Services -import qs.Modules.SettingsPanel import qs.Widgets Variants { diff --git a/Modules/Bar/Calendar/Calendar.qml b/Modules/Bar/Calendar/CalendarPanel.qml similarity index 100% rename from Modules/Bar/Calendar/Calendar.qml rename to Modules/Bar/Calendar/CalendarPanel.qml diff --git a/Modules/Bar/Widgets/Brightness.qml b/Modules/Bar/Widgets/Brightness.qml index e81ef351..652660c0 100644 --- a/Modules/Bar/Widgets/Brightness.qml +++ b/Modules/Bar/Widgets/Brightness.qml @@ -1,10 +1,10 @@ import QtQuick import Quickshell import qs.Commons -import qs.Modules.SettingsPanel +import qs.Modules.Bar.Extras +import qs.Modules.Settings import qs.Services import qs.Widgets -import qs.Modules.Bar.Extras Item { id: root diff --git a/Modules/Bar/Widgets/CustomButton.qml b/Modules/Bar/Widgets/CustomButton.qml index a2343238..3973b4cd 100644 --- a/Modules/Bar/Widgets/CustomButton.qml +++ b/Modules/Bar/Widgets/CustomButton.qml @@ -5,7 +5,7 @@ import Quickshell.Io import qs.Commons import qs.Services import qs.Widgets -import qs.Modules.SettingsPanel +import qs.Modules.Settings import qs.Modules.Bar.Extras Item { diff --git a/Modules/Bar/Widgets/Microphone.qml b/Modules/Bar/Widgets/Microphone.qml index 6e1eda5c..41e5dbff 100644 --- a/Modules/Bar/Widgets/Microphone.qml +++ b/Modules/Bar/Widgets/Microphone.qml @@ -3,7 +3,7 @@ import Quickshell import Quickshell.Io import Quickshell.Services.Pipewire import qs.Commons -import qs.Modules.SettingsPanel +import qs.Modules.Settings import qs.Services import qs.Widgets import qs.Modules.Bar.Extras diff --git a/Modules/Bar/Widgets/NightLight.qml b/Modules/Bar/Widgets/NightLight.qml index 840224c2..b1801dd5 100644 --- a/Modules/Bar/Widgets/NightLight.qml +++ b/Modules/Bar/Widgets/NightLight.qml @@ -4,7 +4,7 @@ import QtQuick.Controls import Quickshell import Quickshell.Wayland import qs.Commons -import qs.Modules.SettingsPanel +import qs.Modules.Settings import qs.Services import qs.Widgets diff --git a/Modules/Bar/Widgets/SidePanelToggle.qml b/Modules/Bar/Widgets/SidePanelToggle.qml index 91b53406..c1d348f7 100644 --- a/Modules/Bar/Widgets/SidePanelToggle.qml +++ b/Modules/Bar/Widgets/SidePanelToggle.qml @@ -43,7 +43,7 @@ NIconButton { colorBgHover: useDistroLogo ? Color.mSurfaceVariant : Color.mTertiary colorBorder: Color.transparent colorBorderHover: useDistroLogo ? Color.mTertiary : Color.transparent - onClicked: PanelService.getPanel("sidePanel")?.toggle(this) + onClicked: PanelService.getPanel("controlCenterPanel")?.toggle(this) onRightClicked: PanelService.getPanel("settingsPanel")?.toggle() IconImage { diff --git a/Modules/Bar/Widgets/Volume.qml b/Modules/Bar/Widgets/Volume.qml index e39a23f1..03ac13c9 100644 --- a/Modules/Bar/Widgets/Volume.qml +++ b/Modules/Bar/Widgets/Volume.qml @@ -3,7 +3,7 @@ import Quickshell import Quickshell.Io import Quickshell.Services.Pipewire import qs.Commons -import qs.Modules.SettingsPanel +import qs.Modules.Settings import qs.Services import qs.Widgets import qs.Modules.Bar.Extras diff --git a/Modules/Bar/Widgets/WallpaperSelector.qml b/Modules/Bar/Widgets/WallpaperSelector.qml index 8743be2d..05163d2f 100644 --- a/Modules/Bar/Widgets/WallpaperSelector.qml +++ b/Modules/Bar/Widgets/WallpaperSelector.qml @@ -19,5 +19,5 @@ NIconButton { colorFg: Color.mOnSurface colorBorder: Color.transparent colorBorderHover: Color.transparent - onClicked: PanelService.getPanel("wallpaperSelector")?.toggle(this) + onClicked: PanelService.getPanel("wallpaperPanel")?.toggle(this) } diff --git a/Modules/SidePanel/Cards/MediaCard.qml b/Modules/ControlCenter/Cards/MediaCard.qml similarity index 100% rename from Modules/SidePanel/Cards/MediaCard.qml rename to Modules/ControlCenter/Cards/MediaCard.qml diff --git a/Modules/SidePanel/Cards/PowerProfilesCard.qml b/Modules/ControlCenter/Cards/PowerProfilesCard.qml similarity index 100% rename from Modules/SidePanel/Cards/PowerProfilesCard.qml rename to Modules/ControlCenter/Cards/PowerProfilesCard.qml diff --git a/Modules/SidePanel/Cards/ProfileCard.qml b/Modules/ControlCenter/Cards/ProfileCard.qml similarity index 94% rename from Modules/SidePanel/Cards/ProfileCard.qml rename to Modules/ControlCenter/Cards/ProfileCard.qml index b4771315..efff07b3 100644 --- a/Modules/SidePanel/Cards/ProfileCard.qml +++ b/Modules/ControlCenter/Cards/ProfileCard.qml @@ -4,8 +4,8 @@ import QtQuick.Layouts import Quickshell import Quickshell.Io import Quickshell.Widgets -import qs.Modules.SettingsPanel -import qs.Modules.SidePanel +import qs.Modules.Settings +import qs.Modules.ControlCenter import qs.Commons import qs.Services import qs.Widgets @@ -69,7 +69,7 @@ NBox { tooltipText: "Power panel" onClicked: { powerPanel.open() - sidePanel.close() + controlCenterPanel.close() } } @@ -78,7 +78,7 @@ NBox { icon: "close" tooltipText: "Close side panel" onClicked: { - sidePanel.close() + controlCenterPanel.close() } } } diff --git a/Modules/SidePanel/Cards/SystemMonitorCard.qml b/Modules/ControlCenter/Cards/SystemMonitorCard.qml similarity index 100% rename from Modules/SidePanel/Cards/SystemMonitorCard.qml rename to Modules/ControlCenter/Cards/SystemMonitorCard.qml diff --git a/Modules/SidePanel/Cards/UtilitiesCard.qml b/Modules/ControlCenter/Cards/UtilitiesCard.qml similarity index 90% rename from Modules/SidePanel/Cards/UtilitiesCard.qml rename to Modules/ControlCenter/Cards/UtilitiesCard.qml index ad0dde03..9bfae591 100644 --- a/Modules/SidePanel/Cards/UtilitiesCard.qml +++ b/Modules/ControlCenter/Cards/UtilitiesCard.qml @@ -3,7 +3,7 @@ import QtQuick.Controls import QtQuick.Layouts import Quickshell import qs.Commons -import qs.Modules.SettingsPanel +import qs.Modules.Settings import qs.Services import qs.Widgets @@ -33,8 +33,8 @@ NBox { ScreenRecorderService.toggleRecording() // If we were not recording and we just initiated a start, close the panel if (!ScreenRecorderService.isRecording) { - var panel = PanelService.getPanel("sidePanel") - panel && panel.close() + var panel = PanelService.getPanel("controlCenterPanel") + panel?.close() } } } @@ -55,7 +55,7 @@ NBox { visible: Settings.data.wallpaper.enabled icon: "wallpaper-selector" tooltipText: "Left click: Open wallpaper selector.\nRight click: Set random wallpaper." - onClicked: PanelService.getPanel("wallpaperSelector")?.toggle(this) + onClicked: PanelService.getPanel("wallpaperPanel")?.toggle(this) onRightClicked: WallpaperService.setRandomWallpaper() } diff --git a/Modules/SidePanel/Cards/WeatherCard.qml b/Modules/ControlCenter/Cards/WeatherCard.qml similarity index 100% rename from Modules/SidePanel/Cards/WeatherCard.qml rename to Modules/ControlCenter/Cards/WeatherCard.qml diff --git a/Modules/SidePanel/SidePanel.qml b/Modules/ControlCenter/ControlCenterPanel.qml similarity index 98% rename from Modules/SidePanel/SidePanel.qml rename to Modules/ControlCenter/ControlCenterPanel.qml index bfd4e850..de1e7753 100644 --- a/Modules/SidePanel/SidePanel.qml +++ b/Modules/ControlCenter/ControlCenterPanel.qml @@ -2,7 +2,7 @@ import QtQuick import QtQuick.Controls import QtQuick.Layouts import Quickshell -import qs.Modules.SidePanel.Cards +import qs.Modules.ControlCenter.Cards import qs.Commons import qs.Services import qs.Widgets diff --git a/Modules/SettingsPanel/Bar/BarSectionEditor.qml b/Modules/Settings/Bar/BarSectionEditor.qml similarity index 100% rename from Modules/SettingsPanel/Bar/BarSectionEditor.qml rename to Modules/Settings/Bar/BarSectionEditor.qml diff --git a/Modules/SettingsPanel/Bar/BarWidgetSettingsDialog.qml b/Modules/Settings/Bar/BarWidgetSettingsDialog.qml similarity index 100% rename from Modules/SettingsPanel/Bar/BarWidgetSettingsDialog.qml rename to Modules/Settings/Bar/BarWidgetSettingsDialog.qml diff --git a/Modules/SettingsPanel/Bar/WidgetSettings/ActiveWindowSettings.qml b/Modules/Settings/Bar/WidgetSettings/ActiveWindowSettings.qml similarity index 100% rename from Modules/SettingsPanel/Bar/WidgetSettings/ActiveWindowSettings.qml rename to Modules/Settings/Bar/WidgetSettings/ActiveWindowSettings.qml diff --git a/Modules/SettingsPanel/Bar/WidgetSettings/BatterySettings.qml b/Modules/Settings/Bar/WidgetSettings/BatterySettings.qml similarity index 100% rename from Modules/SettingsPanel/Bar/WidgetSettings/BatterySettings.qml rename to Modules/Settings/Bar/WidgetSettings/BatterySettings.qml diff --git a/Modules/SettingsPanel/Bar/WidgetSettings/BrightnessSettings.qml b/Modules/Settings/Bar/WidgetSettings/BrightnessSettings.qml similarity index 100% rename from Modules/SettingsPanel/Bar/WidgetSettings/BrightnessSettings.qml rename to Modules/Settings/Bar/WidgetSettings/BrightnessSettings.qml diff --git a/Modules/SettingsPanel/Bar/WidgetSettings/ClockSettings.qml b/Modules/Settings/Bar/WidgetSettings/ClockSettings.qml similarity index 100% rename from Modules/SettingsPanel/Bar/WidgetSettings/ClockSettings.qml rename to Modules/Settings/Bar/WidgetSettings/ClockSettings.qml diff --git a/Modules/SettingsPanel/Bar/WidgetSettings/CustomButtonSettings.qml b/Modules/Settings/Bar/WidgetSettings/CustomButtonSettings.qml similarity index 100% rename from Modules/SettingsPanel/Bar/WidgetSettings/CustomButtonSettings.qml rename to Modules/Settings/Bar/WidgetSettings/CustomButtonSettings.qml diff --git a/Modules/SettingsPanel/Bar/WidgetSettings/KeyboardLayoutSettings.qml b/Modules/Settings/Bar/WidgetSettings/KeyboardLayoutSettings.qml similarity index 100% rename from Modules/SettingsPanel/Bar/WidgetSettings/KeyboardLayoutSettings.qml rename to Modules/Settings/Bar/WidgetSettings/KeyboardLayoutSettings.qml diff --git a/Modules/SettingsPanel/Bar/WidgetSettings/MediaMiniSettings.qml b/Modules/Settings/Bar/WidgetSettings/MediaMiniSettings.qml similarity index 100% rename from Modules/SettingsPanel/Bar/WidgetSettings/MediaMiniSettings.qml rename to Modules/Settings/Bar/WidgetSettings/MediaMiniSettings.qml diff --git a/Modules/SettingsPanel/Bar/WidgetSettings/MicrophoneSettings.qml b/Modules/Settings/Bar/WidgetSettings/MicrophoneSettings.qml similarity index 100% rename from Modules/SettingsPanel/Bar/WidgetSettings/MicrophoneSettings.qml rename to Modules/Settings/Bar/WidgetSettings/MicrophoneSettings.qml diff --git a/Modules/SettingsPanel/Bar/WidgetSettings/NotificationHistorySettings.qml b/Modules/Settings/Bar/WidgetSettings/NotificationHistorySettings.qml similarity index 100% rename from Modules/SettingsPanel/Bar/WidgetSettings/NotificationHistorySettings.qml rename to Modules/Settings/Bar/WidgetSettings/NotificationHistorySettings.qml diff --git a/Modules/SettingsPanel/Bar/WidgetSettings/SidePanelToggleSettings.qml b/Modules/Settings/Bar/WidgetSettings/SidePanelToggleSettings.qml similarity index 100% rename from Modules/SettingsPanel/Bar/WidgetSettings/SidePanelToggleSettings.qml rename to Modules/Settings/Bar/WidgetSettings/SidePanelToggleSettings.qml diff --git a/Modules/SettingsPanel/Bar/WidgetSettings/SpacerSettings.qml b/Modules/Settings/Bar/WidgetSettings/SpacerSettings.qml similarity index 100% rename from Modules/SettingsPanel/Bar/WidgetSettings/SpacerSettings.qml rename to Modules/Settings/Bar/WidgetSettings/SpacerSettings.qml diff --git a/Modules/SettingsPanel/Bar/WidgetSettings/SystemMonitorSettings.qml b/Modules/Settings/Bar/WidgetSettings/SystemMonitorSettings.qml similarity index 100% rename from Modules/SettingsPanel/Bar/WidgetSettings/SystemMonitorSettings.qml rename to Modules/Settings/Bar/WidgetSettings/SystemMonitorSettings.qml diff --git a/Modules/SettingsPanel/Bar/WidgetSettings/VolumeSettings.qml b/Modules/Settings/Bar/WidgetSettings/VolumeSettings.qml similarity index 100% rename from Modules/SettingsPanel/Bar/WidgetSettings/VolumeSettings.qml rename to Modules/Settings/Bar/WidgetSettings/VolumeSettings.qml diff --git a/Modules/SettingsPanel/Bar/WidgetSettings/WorkspaceSettings.qml b/Modules/Settings/Bar/WidgetSettings/WorkspaceSettings.qml similarity index 100% rename from Modules/SettingsPanel/Bar/WidgetSettings/WorkspaceSettings.qml rename to Modules/Settings/Bar/WidgetSettings/WorkspaceSettings.qml diff --git a/Modules/SettingsPanel/SettingsPanel.qml b/Modules/Settings/SettingsPanel.qml similarity index 99% rename from Modules/SettingsPanel/SettingsPanel.qml rename to Modules/Settings/SettingsPanel.qml index 81772ff9..c60762d8 100644 --- a/Modules/SettingsPanel/SettingsPanel.qml +++ b/Modules/Settings/SettingsPanel.qml @@ -3,7 +3,7 @@ import QtQuick.Controls import QtQuick.Layouts import Quickshell import Quickshell.Wayland -import qs.Modules.SettingsPanel.Tabs as Tabs +import qs.Modules.Settings.Tabs as Tabs import qs.Commons import qs.Services import qs.Widgets diff --git a/Modules/SettingsPanel/Tabs/AboutTab.qml b/Modules/Settings/Tabs/AboutTab.qml similarity index 100% rename from Modules/SettingsPanel/Tabs/AboutTab.qml rename to Modules/Settings/Tabs/AboutTab.qml diff --git a/Modules/SettingsPanel/Tabs/AudioTab.qml b/Modules/Settings/Tabs/AudioTab.qml similarity index 100% rename from Modules/SettingsPanel/Tabs/AudioTab.qml rename to Modules/Settings/Tabs/AudioTab.qml diff --git a/Modules/SettingsPanel/Tabs/BarTab.qml b/Modules/Settings/Tabs/BarTab.qml similarity index 99% rename from Modules/SettingsPanel/Tabs/BarTab.qml rename to Modules/Settings/Tabs/BarTab.qml index c332092c..3ad30376 100644 --- a/Modules/SettingsPanel/Tabs/BarTab.qml +++ b/Modules/Settings/Tabs/BarTab.qml @@ -5,7 +5,7 @@ import Quickshell import qs.Commons import qs.Services import qs.Widgets -import qs.Modules.SettingsPanel.Bar +import qs.Modules.Settings.Bar ColumnLayout { id: root diff --git a/Modules/SettingsPanel/Tabs/ColorSchemeTab.qml b/Modules/Settings/Tabs/ColorSchemeTab.qml similarity index 100% rename from Modules/SettingsPanel/Tabs/ColorSchemeTab.qml rename to Modules/Settings/Tabs/ColorSchemeTab.qml diff --git a/Modules/SettingsPanel/Tabs/DisplayTab.qml b/Modules/Settings/Tabs/DisplayTab.qml similarity index 100% rename from Modules/SettingsPanel/Tabs/DisplayTab.qml rename to Modules/Settings/Tabs/DisplayTab.qml diff --git a/Modules/SettingsPanel/Tabs/DockTab.qml b/Modules/Settings/Tabs/DockTab.qml similarity index 100% rename from Modules/SettingsPanel/Tabs/DockTab.qml rename to Modules/Settings/Tabs/DockTab.qml diff --git a/Modules/SettingsPanel/Tabs/GeneralTab.qml b/Modules/Settings/Tabs/GeneralTab.qml similarity index 100% rename from Modules/SettingsPanel/Tabs/GeneralTab.qml rename to Modules/Settings/Tabs/GeneralTab.qml diff --git a/Modules/SettingsPanel/Tabs/HooksTab.qml b/Modules/Settings/Tabs/HooksTab.qml similarity index 100% rename from Modules/SettingsPanel/Tabs/HooksTab.qml rename to Modules/Settings/Tabs/HooksTab.qml diff --git a/Modules/SettingsPanel/Tabs/LauncherTab.qml b/Modules/Settings/Tabs/LauncherTab.qml similarity index 100% rename from Modules/SettingsPanel/Tabs/LauncherTab.qml rename to Modules/Settings/Tabs/LauncherTab.qml diff --git a/Modules/SettingsPanel/Tabs/LocationTab.qml b/Modules/Settings/Tabs/LocationTab.qml similarity index 100% rename from Modules/SettingsPanel/Tabs/LocationTab.qml rename to Modules/Settings/Tabs/LocationTab.qml diff --git a/Modules/SettingsPanel/Tabs/NetworkTab.qml b/Modules/Settings/Tabs/NetworkTab.qml similarity index 100% rename from Modules/SettingsPanel/Tabs/NetworkTab.qml rename to Modules/Settings/Tabs/NetworkTab.qml diff --git a/Modules/SettingsPanel/Tabs/NotificationsTab.qml b/Modules/Settings/Tabs/NotificationsTab.qml similarity index 100% rename from Modules/SettingsPanel/Tabs/NotificationsTab.qml rename to Modules/Settings/Tabs/NotificationsTab.qml diff --git a/Modules/SettingsPanel/Tabs/ScreenRecorderTab.qml b/Modules/Settings/Tabs/ScreenRecorderTab.qml similarity index 100% rename from Modules/SettingsPanel/Tabs/ScreenRecorderTab.qml rename to Modules/Settings/Tabs/ScreenRecorderTab.qml diff --git a/Modules/SettingsPanel/Tabs/WallpaperTab.qml b/Modules/Settings/Tabs/WallpaperTab.qml similarity index 100% rename from Modules/SettingsPanel/Tabs/WallpaperTab.qml rename to Modules/Settings/Tabs/WallpaperTab.qml diff --git a/Modules/WallpaperSelector/WallpaperSelector.qml b/Modules/Wallpaper/WallpaperPanel.qml similarity index 100% rename from Modules/WallpaperSelector/WallpaperSelector.qml rename to Modules/Wallpaper/WallpaperPanel.qml diff --git a/Modules/IPC/IPCManager.qml b/Services/IPCService.qml similarity index 95% rename from Modules/IPC/IPCManager.qml rename to Services/IPCService.qml index ba644c75..380222b0 100644 --- a/Modules/IPC/IPCManager.qml +++ b/Services/IPCService.qml @@ -117,10 +117,11 @@ Item { } IpcHandler { + // TODO: upgrade when breaking changes target: "sidePanel" function toggle() { // Will attempt to open the panel next to the bar button if any. - sidePanel.toggle(BarService.lookupWidget("SidePanelToggle")) + controlCenterPanel.toggle(BarService.lookupWidget("SidePanelToggle")) } } @@ -129,7 +130,7 @@ Item { target: "wallpaper" function toggle() { if (Settings.data.wallpaper.enabled) { - wallpaperSelector.toggle() + wallpaperPanel.toggle() } } diff --git a/shell.qml b/shell.qml index e021743b..18071540 100644 --- a/shell.qml +++ b/shell.qml @@ -23,7 +23,6 @@ import qs.Widgets // Core Modules import qs.Modules.Background import qs.Modules.Dock -import qs.Modules.IPC import qs.Modules.LockScreen // Bar & Bar Components @@ -35,12 +34,12 @@ import qs.Modules.Bar.Power import qs.Modules.Bar.WiFi // Panels & UI Components +import qs.Modules.ControlCenter import qs.Modules.Launcher import qs.Modules.Notification -import qs.Modules.SettingsPanel -import qs.Modules.SidePanel +import qs.Modules.Settings import qs.Modules.Toast -import qs.Modules.WallpaperSelector +import qs.Modules.Wallpaper ShellRoot { id: shellRoot @@ -61,7 +60,9 @@ ShellRoot { ToastOverlay {} - IPCManager {} + // IPCService is treated as a service + // but it's actually an Item that needs to exists in the shell. + IPCService {} // ------------------------------ // All the NPanels @@ -70,12 +71,12 @@ ShellRoot { objectName: "launcherPanel" } - SidePanel { - id: sidePanel - objectName: "sidePanel" + ControlCenterPanel { + id: controlCenterPanel + objectName: "controlCenterPanel" } - Calendar { + CalendarPanel { id: calendarPanel objectName: "calendarPanel" } @@ -105,9 +106,9 @@ ShellRoot { objectName: "bluetoothPanel" } - WallpaperSelector { - id: wallpaperSelector - objectName: "wallpaperSelector" + WallpaperPanel { + id: wallpaperPanel + objectName: "wallpaperPanel" } Component.onCompleted: {