From c3d7fa0bc5c88929e54f0935839793c7e7a89043 Mon Sep 17 00:00:00 2001 From: Damocles Date: Fri, 17 Apr 2026 22:12:16 +0200 Subject: [PATCH] rename bar module files and qmldir types to *Module --- .../{Backlight.qml => BacklightModule.qml} | 0 shell/modules/Bar.qml | 42 +++++++++--------- .../{Battery.qml => BatteryModule.qml} | 0 .../{Bluetooth.qml => BluetoothModule.qml} | 0 shell/modules/{Clock.qml => ClockModule.qml} | 0 shell/modules/{Cpu.qml => CpuModule.qml} | 0 shell/modules/{Disk.qml => DiskModule.qml} | 0 shell/modules/{Gpu.qml => GpuModule.qml} | 0 ...eInhibitor.qml => IdleInhibitorModule.qml} | 0 .../modules/{Memory.qml => MemoryModule.qml} | 0 shell/modules/{Mpris.qml => MprisModule.qml} | 0 .../{Network.qml => NetworkModule.qml} | 0 ...ifications.qml => NotificationsModule.qml} | 0 shell/modules/{Power.qml => PowerModule.qml} | 0 ...owerProfile.qml => PowerProfileModule.qml} | 0 .../{Privacy.qml => PrivacyModule.qml} | 0 ...{Temperature.qml => TemperatureModule.qml} | 0 shell/modules/{Tray.qml => TrayModule.qml} | 0 .../modules/{Volume.qml => VolumeModule.qml} | 0 .../{Weather.qml => WeatherModule.qml} | 0 ...{WindowTitle.qml => WindowTitleModule.qml} | 0 .../{Workspaces.qml => WorkspacesModule.qml} | 0 shell/modules/qmldir | 44 ++++++++++--------- shell/shell.qml | 1 + 24 files changed, 46 insertions(+), 41 deletions(-) rename shell/modules/{Backlight.qml => BacklightModule.qml} (100%) rename shell/modules/{Battery.qml => BatteryModule.qml} (100%) rename shell/modules/{Bluetooth.qml => BluetoothModule.qml} (100%) rename shell/modules/{Clock.qml => ClockModule.qml} (100%) rename shell/modules/{Cpu.qml => CpuModule.qml} (100%) rename shell/modules/{Disk.qml => DiskModule.qml} (100%) rename shell/modules/{Gpu.qml => GpuModule.qml} (100%) rename shell/modules/{IdleInhibitor.qml => IdleInhibitorModule.qml} (100%) rename shell/modules/{Memory.qml => MemoryModule.qml} (100%) rename shell/modules/{Mpris.qml => MprisModule.qml} (100%) rename shell/modules/{Network.qml => NetworkModule.qml} (100%) rename shell/modules/{Notifications.qml => NotificationsModule.qml} (100%) rename shell/modules/{Power.qml => PowerModule.qml} (100%) rename shell/modules/{PowerProfile.qml => PowerProfileModule.qml} (100%) rename shell/modules/{Privacy.qml => PrivacyModule.qml} (100%) rename shell/modules/{Temperature.qml => TemperatureModule.qml} (100%) rename shell/modules/{Tray.qml => TrayModule.qml} (100%) rename shell/modules/{Volume.qml => VolumeModule.qml} (100%) rename shell/modules/{Weather.qml => WeatherModule.qml} (100%) rename shell/modules/{WindowTitle.qml => WindowTitleModule.qml} (100%) rename shell/modules/{Workspaces.qml => WorkspacesModule.qml} (100%) diff --git a/shell/modules/Backlight.qml b/shell/modules/BacklightModule.qml similarity index 100% rename from shell/modules/Backlight.qml rename to shell/modules/BacklightModule.qml diff --git a/shell/modules/Bar.qml b/shell/modules/Bar.qml index 0e85f88..84261d5 100644 --- a/shell/modules/Bar.qml +++ b/shell/modules/Bar.qml @@ -109,11 +109,11 @@ PanelWindow { spacing: S.Theme.groupSpacing M.BarGroup { - M.Privacy {} - M.Clock { + M.PrivacyModule {} + M.ClockModule { visible: S.Modules.clock.enable } - M.Notifications { + M.NotificationsModule { bar: bar visible: S.Modules.notifications.enable } @@ -130,14 +130,14 @@ PanelWindow { M.BarGroup { id: workspacesGroup leftEdge: true - M.Workspaces { + M.WorkspacesModule { bar: bar visible: S.Modules.workspaces.enable } } M.BarGroup { leftEdge: !workspacesGroup.visible - M.Tray { + M.TrayModule { bar: bar } } @@ -146,7 +146,7 @@ PanelWindow { Layout.minimumWidth: 0 clip: true visible: S.Modules.windowTitle.enable && M.NiriIpc.focusedTitle !== "" - M.WindowTitle { + M.WindowTitleModule { id: _windowTitle readonly property real _maxWidth: Math.max(0, centerSection.x - _windowTitleGroup.x - 2 * S.Theme.groupPadding - S.Theme.groupSpacing) width: Math.min(naturalWidth, _maxWidth) @@ -170,52 +170,52 @@ PanelWindow { // Media M.BarGroup { - M.Mpris { + M.MprisModule { bar: bar } - M.Volume { + M.VolumeModule { visible: S.Modules.volume.enable } } // Connectivity M.BarGroup { - M.Network { + M.NetworkModule { bar: bar visible: S.Modules.network.enable } - M.Bluetooth { + M.BluetoothModule { bar: bar } } // Controls M.BarGroup { - M.Backlight {} - M.PowerProfile { + M.BacklightModule {} + M.PowerProfileModule { visible: S.Modules.powerProfile.enable } - M.IdleInhibitor { + M.IdleInhibitorModule { visible: S.Modules.idleInhibitor.enable } } // Stats M.BarGroup { - M.Cpu { + M.CpuModule { visible: S.Modules.cpu.enable } - M.Memory { + M.MemoryModule { visible: S.Modules.memory.enable } - M.Gpu {} - M.Temperature { + M.GpuModule {} + M.TemperatureModule { visible: S.Modules.temperature.enable } - M.Weather { + M.WeatherModule { visible: S.Modules.weather.enable } - M.Disk { + M.DiskModule { visible: S.Modules.disk.enable } } @@ -223,8 +223,8 @@ PanelWindow { // Power M.BarGroup { rightEdge: true - M.Battery {} - M.Power { + M.BatteryModule {} + M.PowerModule { bar: bar visible: S.Modules.power.enable } diff --git a/shell/modules/Battery.qml b/shell/modules/BatteryModule.qml similarity index 100% rename from shell/modules/Battery.qml rename to shell/modules/BatteryModule.qml diff --git a/shell/modules/Bluetooth.qml b/shell/modules/BluetoothModule.qml similarity index 100% rename from shell/modules/Bluetooth.qml rename to shell/modules/BluetoothModule.qml diff --git a/shell/modules/Clock.qml b/shell/modules/ClockModule.qml similarity index 100% rename from shell/modules/Clock.qml rename to shell/modules/ClockModule.qml diff --git a/shell/modules/Cpu.qml b/shell/modules/CpuModule.qml similarity index 100% rename from shell/modules/Cpu.qml rename to shell/modules/CpuModule.qml diff --git a/shell/modules/Disk.qml b/shell/modules/DiskModule.qml similarity index 100% rename from shell/modules/Disk.qml rename to shell/modules/DiskModule.qml diff --git a/shell/modules/Gpu.qml b/shell/modules/GpuModule.qml similarity index 100% rename from shell/modules/Gpu.qml rename to shell/modules/GpuModule.qml diff --git a/shell/modules/IdleInhibitor.qml b/shell/modules/IdleInhibitorModule.qml similarity index 100% rename from shell/modules/IdleInhibitor.qml rename to shell/modules/IdleInhibitorModule.qml diff --git a/shell/modules/Memory.qml b/shell/modules/MemoryModule.qml similarity index 100% rename from shell/modules/Memory.qml rename to shell/modules/MemoryModule.qml diff --git a/shell/modules/Mpris.qml b/shell/modules/MprisModule.qml similarity index 100% rename from shell/modules/Mpris.qml rename to shell/modules/MprisModule.qml diff --git a/shell/modules/Network.qml b/shell/modules/NetworkModule.qml similarity index 100% rename from shell/modules/Network.qml rename to shell/modules/NetworkModule.qml diff --git a/shell/modules/Notifications.qml b/shell/modules/NotificationsModule.qml similarity index 100% rename from shell/modules/Notifications.qml rename to shell/modules/NotificationsModule.qml diff --git a/shell/modules/Power.qml b/shell/modules/PowerModule.qml similarity index 100% rename from shell/modules/Power.qml rename to shell/modules/PowerModule.qml diff --git a/shell/modules/PowerProfile.qml b/shell/modules/PowerProfileModule.qml similarity index 100% rename from shell/modules/PowerProfile.qml rename to shell/modules/PowerProfileModule.qml diff --git a/shell/modules/Privacy.qml b/shell/modules/PrivacyModule.qml similarity index 100% rename from shell/modules/Privacy.qml rename to shell/modules/PrivacyModule.qml diff --git a/shell/modules/Temperature.qml b/shell/modules/TemperatureModule.qml similarity index 100% rename from shell/modules/Temperature.qml rename to shell/modules/TemperatureModule.qml diff --git a/shell/modules/Tray.qml b/shell/modules/TrayModule.qml similarity index 100% rename from shell/modules/Tray.qml rename to shell/modules/TrayModule.qml diff --git a/shell/modules/Volume.qml b/shell/modules/VolumeModule.qml similarity index 100% rename from shell/modules/Volume.qml rename to shell/modules/VolumeModule.qml diff --git a/shell/modules/Weather.qml b/shell/modules/WeatherModule.qml similarity index 100% rename from shell/modules/Weather.qml rename to shell/modules/WeatherModule.qml diff --git a/shell/modules/WindowTitle.qml b/shell/modules/WindowTitleModule.qml similarity index 100% rename from shell/modules/WindowTitle.qml rename to shell/modules/WindowTitleModule.qml diff --git a/shell/modules/Workspaces.qml b/shell/modules/WorkspacesModule.qml similarity index 100% rename from shell/modules/Workspaces.qml rename to shell/modules/WorkspacesModule.qml diff --git a/shell/modules/qmldir b/shell/modules/qmldir index d5a427b..8cb3af5 100644 --- a/shell/modules/qmldir +++ b/shell/modules/qmldir @@ -4,32 +4,32 @@ Bar 1.0 Bar.qml BarGroup 1.0 BarGroup.qml BarSection 1.0 BarSection.qml Flyout 1.0 Flyout.qml -Workspaces 1.0 Workspaces.qml -WindowTitle 1.0 WindowTitle.qml -Clock 1.0 Clock.qml -Volume 1.0 Volume.qml -Tray 1.0 Tray.qml +WorkspacesModule 1.0 WorkspacesModule.qml +WindowTitleModule 1.0 WindowTitleModule.qml +ClockModule 1.0 ClockModule.qml +VolumeModule 1.0 VolumeModule.qml +TrayModule 1.0 TrayModule.qml TrayMenu 1.0 TrayMenu.qml PopupBackground 1.0 PopupBackground.qml HoverPanel 1.0 HoverPanel.qml PowerMenu 1.0 PowerMenu.qml ScreenCorners 1.0 ScreenCorners.qml ThemedIcon 1.0 ThemedIcon.qml -Battery 1.0 Battery.qml -Mpris 1.0 Mpris.qml -Network 1.0 Network.qml +BatteryModule 1.0 BatteryModule.qml +MprisModule 1.0 MprisModule.qml +NetworkModule 1.0 NetworkModule.qml NetworkMenu 1.0 NetworkMenu.qml -Bluetooth 1.0 Bluetooth.qml +BluetoothModule 1.0 BluetoothModule.qml BluetoothMenu 1.0 BluetoothMenu.qml -Backlight 1.0 Backlight.qml -Cpu 1.0 Cpu.qml -Memory 1.0 Memory.qml -Disk 1.0 Disk.qml -Temperature 1.0 Temperature.qml -Weather 1.0 Weather.qml -PowerProfile 1.0 PowerProfile.qml -IdleInhibitor 1.0 IdleInhibitor.qml -Notifications 1.0 Notifications.qml +BacklightModule 1.0 BacklightModule.qml +CpuModule 1.0 CpuModule.qml +MemoryModule 1.0 MemoryModule.qml +DiskModule 1.0 DiskModule.qml +TemperatureModule 1.0 TemperatureModule.qml +WeatherModule 1.0 WeatherModule.qml +PowerProfileModule 1.0 PowerProfileModule.qml +IdleInhibitorModule 1.0 IdleInhibitorModule.qml +NotificationsModule 1.0 NotificationsModule.qml singleton NiriIpc 1.0 NiriIpc.qml singleton PowerProfileService 1.0 PowerProfileService.qml ProcessList 1.0 ProcessList.qml @@ -37,7 +37,11 @@ singleton NotifService 1.0 NotifService.qml NotifItem 1.0 NotifItem.qml NotifPopup 1.0 NotifPopup.qml NotifCenter 1.0 NotifCenter.qml -Power 1.0 Power.qml -Privacy 1.0 Privacy.qml +NotifCard 1.0 NotifCard.qml +PowerModule 1.0 PowerModule.qml +PrivacyModule 1.0 PrivacyModule.qml BackgroundOverlay 1.0 BackgroundOverlay.qml OverviewBackdrop 1.0 OverviewBackdrop.qml +GpuModule 1.0 GpuModule.qml +BarIcon 1.0 BarIcon.qml +BarLabel 1.0 BarLabel.qml diff --git a/shell/shell.qml b/shell/shell.qml index a429291..6fe03cf 100644 --- a/shell/shell.qml +++ b/shell/shell.qml @@ -1,6 +1,7 @@ //@ pragma Env QS_NO_RELOAD_POPUP=1 import "modules" +import "services" import "lock" as Lock import Quickshell