From 4a349b3bc22840a73119ec45d33114f06e019483 Mon Sep 17 00:00:00 2001 From: ItsLemmy Date: Sat, 8 Nov 2025 00:31:15 -0500 Subject: [PATCH] Imports cleanup --- CLAUDE.md | 4 ++-- Commons/Color.qml | 1 - Commons/ThemeIcons.qml | 1 - Commons/Time.qml | 1 - Modules/Background/Background.qml | 1 - Modules/Background/Overview.qml | 3 +-- .../Settings/Bar/WidgetSettings/ActiveWindowSettings.qml | 1 - .../Settings/Bar/WidgetSettings/AudioVisualizerSettings.qml | 1 - .../Panels/Settings/Bar/WidgetSettings/BatterySettings.qml | 1 - .../Panels/Settings/Bar/WidgetSettings/BrightnessSettings.qml | 1 - .../Settings/Bar/WidgetSettings/ControlCenterSettings.qml | 1 - .../Settings/Bar/WidgetSettings/CustomButtonSettings.qml | 1 - .../Settings/Bar/WidgetSettings/KeyboardLayoutSettings.qml | 1 - .../Panels/Settings/Bar/WidgetSettings/LockKeysSettings.qml | 1 - .../Panels/Settings/Bar/WidgetSettings/MediaMiniSettings.qml | 1 - .../Panels/Settings/Bar/WidgetSettings/MicrophoneSettings.qml | 1 - .../Bar/WidgetSettings/NotificationHistorySettings.qml | 1 - Modules/Panels/Settings/Bar/WidgetSettings/SpacerSettings.qml | 1 - .../Settings/Bar/WidgetSettings/SystemMonitorSettings.qml | 1 - .../Panels/Settings/Bar/WidgetSettings/TaskbarSettings.qml | 1 - Modules/Panels/Settings/Bar/WidgetSettings/VolumeSettings.qml | 1 - .../Panels/Settings/Bar/WidgetSettings/WorkspaceSettings.qml | 1 - Modules/Panels/Settings/Tabs/LockScreenTab.qml | 1 - Modules/Panels/Settings/Tabs/ScreenRecorderTab.qml | 1 - Modules/Panels/Settings/Tabs/UserInterfaceTab.qml | 1 - Widgets/NBox.qml | 2 -- Widgets/NBusyIndicator.qml | 1 - Widgets/NCircleStat.qml | 1 - Widgets/NClock.qml | 1 - Widgets/NColorPicker.qml | 1 - Widgets/NDivider.qml | 1 - Widgets/NImageCircled.qml | 1 - Widgets/NImageRounded.qml | 1 - Widgets/NInputAction.qml | 1 - Widgets/NRadioButton.qml | 1 - Widgets/NReorderCheckboxes.qml | 1 - Widgets/NSectionEditor.qml | 1 - Widgets/NSpinBox.qml | 1 - Widgets/NTabBar.qml | 1 - Widgets/NTabButton.qml | 1 - Widgets/NText.qml | 1 - Widgets/NTextInput.qml | 1 - Widgets/NToggle.qml | 1 - Widgets/NValueSlider.qml | 1 - 44 files changed, 3 insertions(+), 47 deletions(-) diff --git a/CLAUDE.md b/CLAUDE.md index 694af961..7f36f0aa 100644 --- a/CLAUDE.md +++ b/CLAUDE.md @@ -134,8 +134,8 @@ Common components used throughout the shell: - **Input**: NButton, NIconButton, NIconButtonHot, NTextInput, NSlider, NSpinBox, NToggle, NCheckbox, NRadioButton, NComboBox, NSearchableComboBox - **Display**: NLabel, NText, NIcon, NHeader, NImageCached, NImageCircled, NImageRounded - **Dialogs**: NColorPickerDialog, NFilePicker -- **Special**: NContextMenu, NColorPicker, NIconPicker, NCircleStat, NCollapsible, NSectionEditor, NReorderCheckboxes, NDateTimeTokens, NBusyIndicator, NShapedRectangle -- **System**: NFullScreenWindow, BarExclusionZone +- **Special**: NContextMenu, NColorPicker, NIconPicker, NCircleStat, NCollapsible, NSectionEditor, NReorderCheckboxes, NDateTimeTokens, NBusyIndicator +- **System**: MainScreen, BarExclusionZone #### `/Helpers/` - JavaScript Utilities Helper JavaScript modules: diff --git a/Commons/Color.qml b/Commons/Color.qml index 91fde33c..1e358344 100644 --- a/Commons/Color.qml +++ b/Commons/Color.qml @@ -4,7 +4,6 @@ import QtQuick import Quickshell import Quickshell.Io import qs.Commons -import qs.Services /* diff --git a/Commons/ThemeIcons.qml b/Commons/ThemeIcons.qml index aa8c4aea..addede93 100644 --- a/Commons/ThemeIcons.qml +++ b/Commons/ThemeIcons.qml @@ -2,7 +2,6 @@ pragma Singleton import QtQuick import Quickshell -import qs.Services Singleton { id: root diff --git a/Commons/Time.qml b/Commons/Time.qml index c346d1e0..b8245808 100644 --- a/Commons/Time.qml +++ b/Commons/Time.qml @@ -3,7 +3,6 @@ pragma Singleton import Quickshell import QtQuick import qs.Commons -import qs.Services Singleton { id: root diff --git a/Modules/Background/Background.qml b/Modules/Background/Background.qml index 8a0f43f3..9c93b40b 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.Widgets Variants { id: backgroundVariants diff --git a/Modules/Background/Overview.qml b/Modules/Background/Overview.qml index 394276a3..a5ee733d 100644 --- a/Modules/Background/Overview.qml +++ b/Modules/Background/Overview.qml @@ -1,10 +1,9 @@ import QtQuick -import QtQuick.Effects import Quickshell +import QtQuick.Effects import Quickshell.Wayland import qs.Commons import qs.Services -import qs.Widgets Loader { active: CompositorService.isNiri && Settings.data.wallpaper.enabled && Settings.data.wallpaper.overviewEnabled diff --git a/Modules/Panels/Settings/Bar/WidgetSettings/ActiveWindowSettings.qml b/Modules/Panels/Settings/Bar/WidgetSettings/ActiveWindowSettings.qml index 514733dd..140fc511 100644 --- a/Modules/Panels/Settings/Bar/WidgetSettings/ActiveWindowSettings.qml +++ b/Modules/Panels/Settings/Bar/WidgetSettings/ActiveWindowSettings.qml @@ -3,7 +3,6 @@ import QtQuick.Controls import QtQuick.Layouts import qs.Commons import qs.Widgets -import qs.Services ColumnLayout { id: root diff --git a/Modules/Panels/Settings/Bar/WidgetSettings/AudioVisualizerSettings.qml b/Modules/Panels/Settings/Bar/WidgetSettings/AudioVisualizerSettings.qml index 936260a6..dea5809d 100644 --- a/Modules/Panels/Settings/Bar/WidgetSettings/AudioVisualizerSettings.qml +++ b/Modules/Panels/Settings/Bar/WidgetSettings/AudioVisualizerSettings.qml @@ -3,7 +3,6 @@ import QtQuick.Controls import QtQuick.Layouts import qs.Commons import qs.Widgets -import qs.Services ColumnLayout { id: root diff --git a/Modules/Panels/Settings/Bar/WidgetSettings/BatterySettings.qml b/Modules/Panels/Settings/Bar/WidgetSettings/BatterySettings.qml index 8377958d..7a5f046c 100644 --- a/Modules/Panels/Settings/Bar/WidgetSettings/BatterySettings.qml +++ b/Modules/Panels/Settings/Bar/WidgetSettings/BatterySettings.qml @@ -3,7 +3,6 @@ import QtQuick.Controls import QtQuick.Layouts import qs.Commons import qs.Widgets -import qs.Services ColumnLayout { id: root diff --git a/Modules/Panels/Settings/Bar/WidgetSettings/BrightnessSettings.qml b/Modules/Panels/Settings/Bar/WidgetSettings/BrightnessSettings.qml index bc572776..ecf4869c 100644 --- a/Modules/Panels/Settings/Bar/WidgetSettings/BrightnessSettings.qml +++ b/Modules/Panels/Settings/Bar/WidgetSettings/BrightnessSettings.qml @@ -3,7 +3,6 @@ import QtQuick.Controls import QtQuick.Layouts import qs.Commons import qs.Widgets -import qs.Services ColumnLayout { id: root diff --git a/Modules/Panels/Settings/Bar/WidgetSettings/ControlCenterSettings.qml b/Modules/Panels/Settings/Bar/WidgetSettings/ControlCenterSettings.qml index 66c30c11..043ec23c 100644 --- a/Modules/Panels/Settings/Bar/WidgetSettings/ControlCenterSettings.qml +++ b/Modules/Panels/Settings/Bar/WidgetSettings/ControlCenterSettings.qml @@ -4,7 +4,6 @@ import QtQuick.Layouts import Quickshell import qs.Commons import qs.Widgets -import qs.Services ColumnLayout { id: root diff --git a/Modules/Panels/Settings/Bar/WidgetSettings/CustomButtonSettings.qml b/Modules/Panels/Settings/Bar/WidgetSettings/CustomButtonSettings.qml index 129613ab..5d11c8de 100644 --- a/Modules/Panels/Settings/Bar/WidgetSettings/CustomButtonSettings.qml +++ b/Modules/Panels/Settings/Bar/WidgetSettings/CustomButtonSettings.qml @@ -4,7 +4,6 @@ import QtQuick.Layouts import QtQuick.Window import qs.Commons import qs.Widgets -import qs.Services ColumnLayout { id: root diff --git a/Modules/Panels/Settings/Bar/WidgetSettings/KeyboardLayoutSettings.qml b/Modules/Panels/Settings/Bar/WidgetSettings/KeyboardLayoutSettings.qml index 86ada35a..5b2bc230 100644 --- a/Modules/Panels/Settings/Bar/WidgetSettings/KeyboardLayoutSettings.qml +++ b/Modules/Panels/Settings/Bar/WidgetSettings/KeyboardLayoutSettings.qml @@ -3,7 +3,6 @@ import QtQuick.Controls import QtQuick.Layouts import qs.Commons import qs.Widgets -import qs.Services ColumnLayout { id: root diff --git a/Modules/Panels/Settings/Bar/WidgetSettings/LockKeysSettings.qml b/Modules/Panels/Settings/Bar/WidgetSettings/LockKeysSettings.qml index 012879cc..dd9b12ef 100644 --- a/Modules/Panels/Settings/Bar/WidgetSettings/LockKeysSettings.qml +++ b/Modules/Panels/Settings/Bar/WidgetSettings/LockKeysSettings.qml @@ -3,7 +3,6 @@ import QtQuick.Controls import QtQuick.Layouts import qs.Commons import qs.Widgets -import qs.Services ColumnLayout { id: root diff --git a/Modules/Panels/Settings/Bar/WidgetSettings/MediaMiniSettings.qml b/Modules/Panels/Settings/Bar/WidgetSettings/MediaMiniSettings.qml index 5f8c039d..808fe3dc 100644 --- a/Modules/Panels/Settings/Bar/WidgetSettings/MediaMiniSettings.qml +++ b/Modules/Panels/Settings/Bar/WidgetSettings/MediaMiniSettings.qml @@ -3,7 +3,6 @@ import QtQuick.Controls import QtQuick.Layouts import qs.Commons import qs.Widgets -import qs.Services ColumnLayout { id: root diff --git a/Modules/Panels/Settings/Bar/WidgetSettings/MicrophoneSettings.qml b/Modules/Panels/Settings/Bar/WidgetSettings/MicrophoneSettings.qml index e62ac1da..3ff2ee58 100644 --- a/Modules/Panels/Settings/Bar/WidgetSettings/MicrophoneSettings.qml +++ b/Modules/Panels/Settings/Bar/WidgetSettings/MicrophoneSettings.qml @@ -3,7 +3,6 @@ import QtQuick.Controls import QtQuick.Layouts import qs.Commons import qs.Widgets -import qs.Services ColumnLayout { id: root diff --git a/Modules/Panels/Settings/Bar/WidgetSettings/NotificationHistorySettings.qml b/Modules/Panels/Settings/Bar/WidgetSettings/NotificationHistorySettings.qml index 61c4e10d..ba6475af 100644 --- a/Modules/Panels/Settings/Bar/WidgetSettings/NotificationHistorySettings.qml +++ b/Modules/Panels/Settings/Bar/WidgetSettings/NotificationHistorySettings.qml @@ -3,7 +3,6 @@ import QtQuick.Controls import QtQuick.Layouts import qs.Commons import qs.Widgets -import qs.Services ColumnLayout { id: root diff --git a/Modules/Panels/Settings/Bar/WidgetSettings/SpacerSettings.qml b/Modules/Panels/Settings/Bar/WidgetSettings/SpacerSettings.qml index 9679c619..423f0d65 100644 --- a/Modules/Panels/Settings/Bar/WidgetSettings/SpacerSettings.qml +++ b/Modules/Panels/Settings/Bar/WidgetSettings/SpacerSettings.qml @@ -3,7 +3,6 @@ import QtQuick.Controls import QtQuick.Layouts import qs.Commons import qs.Widgets -import qs.Services ColumnLayout { id: root diff --git a/Modules/Panels/Settings/Bar/WidgetSettings/SystemMonitorSettings.qml b/Modules/Panels/Settings/Bar/WidgetSettings/SystemMonitorSettings.qml index 323bacfd..9ca62f78 100644 --- a/Modules/Panels/Settings/Bar/WidgetSettings/SystemMonitorSettings.qml +++ b/Modules/Panels/Settings/Bar/WidgetSettings/SystemMonitorSettings.qml @@ -3,7 +3,6 @@ import QtQuick.Controls import QtQuick.Layouts import qs.Commons import qs.Widgets -import qs.Services ColumnLayout { id: root diff --git a/Modules/Panels/Settings/Bar/WidgetSettings/TaskbarSettings.qml b/Modules/Panels/Settings/Bar/WidgetSettings/TaskbarSettings.qml index 9ea560e8..825d32d5 100644 --- a/Modules/Panels/Settings/Bar/WidgetSettings/TaskbarSettings.qml +++ b/Modules/Panels/Settings/Bar/WidgetSettings/TaskbarSettings.qml @@ -3,7 +3,6 @@ import QtQuick.Controls import QtQuick.Layouts import qs.Commons import qs.Widgets -import qs.Services ColumnLayout { id: root diff --git a/Modules/Panels/Settings/Bar/WidgetSettings/VolumeSettings.qml b/Modules/Panels/Settings/Bar/WidgetSettings/VolumeSettings.qml index 3b131d38..09032661 100644 --- a/Modules/Panels/Settings/Bar/WidgetSettings/VolumeSettings.qml +++ b/Modules/Panels/Settings/Bar/WidgetSettings/VolumeSettings.qml @@ -3,7 +3,6 @@ import QtQuick.Controls import QtQuick.Layouts import qs.Commons import qs.Widgets -import qs.Services ColumnLayout { id: root diff --git a/Modules/Panels/Settings/Bar/WidgetSettings/WorkspaceSettings.qml b/Modules/Panels/Settings/Bar/WidgetSettings/WorkspaceSettings.qml index 4beecd41..83d0bbad 100644 --- a/Modules/Panels/Settings/Bar/WidgetSettings/WorkspaceSettings.qml +++ b/Modules/Panels/Settings/Bar/WidgetSettings/WorkspaceSettings.qml @@ -3,7 +3,6 @@ import QtQuick.Controls import QtQuick.Layouts import qs.Commons import qs.Widgets -import qs.Services ColumnLayout { id: root diff --git a/Modules/Panels/Settings/Tabs/LockScreenTab.qml b/Modules/Panels/Settings/Tabs/LockScreenTab.qml index 140ed960..f7b938c5 100644 --- a/Modules/Panels/Settings/Tabs/LockScreenTab.qml +++ b/Modules/Panels/Settings/Tabs/LockScreenTab.qml @@ -3,7 +3,6 @@ import QtQuick.Controls import QtQuick.Layouts import Quickshell import qs.Commons -import qs.Services import qs.Widgets ColumnLayout { diff --git a/Modules/Panels/Settings/Tabs/ScreenRecorderTab.qml b/Modules/Panels/Settings/Tabs/ScreenRecorderTab.qml index d5e45091..580af116 100644 --- a/Modules/Panels/Settings/Tabs/ScreenRecorderTab.qml +++ b/Modules/Panels/Settings/Tabs/ScreenRecorderTab.qml @@ -3,7 +3,6 @@ import QtQuick.Controls import QtQuick.Layouts import Quickshell import qs.Commons -import qs.Services import qs.Widgets ColumnLayout { diff --git a/Modules/Panels/Settings/Tabs/UserInterfaceTab.qml b/Modules/Panels/Settings/Tabs/UserInterfaceTab.qml index 7ccf511c..abe077e4 100644 --- a/Modules/Panels/Settings/Tabs/UserInterfaceTab.qml +++ b/Modules/Panels/Settings/Tabs/UserInterfaceTab.qml @@ -3,7 +3,6 @@ import QtQuick.Controls import QtQuick.Layouts import Quickshell import qs.Commons -import qs.Services import qs.Widgets ColumnLayout { diff --git a/Widgets/NBox.qml b/Widgets/NBox.qml index 10ed50bd..7d775bfb 100644 --- a/Widgets/NBox.qml +++ b/Widgets/NBox.qml @@ -1,7 +1,5 @@ import QtQuick import qs.Commons -import qs.Commons -import qs.Services // Rounded group container using the variant surface color. // To be used in side panels and settings panes to group fields or buttons. diff --git a/Widgets/NBusyIndicator.qml b/Widgets/NBusyIndicator.qml index f65da231..e720debe 100644 --- a/Widgets/NBusyIndicator.qml +++ b/Widgets/NBusyIndicator.qml @@ -1,6 +1,5 @@ import QtQuick import qs.Commons -import qs.Services Item { id: root diff --git a/Widgets/NCircleStat.qml b/Widgets/NCircleStat.qml index 169aa445..9cdb338b 100644 --- a/Widgets/NCircleStat.qml +++ b/Widgets/NCircleStat.qml @@ -1,7 +1,6 @@ import QtQuick import QtQuick.Layouts import qs.Commons -import qs.Services import qs.Widgets // Compact circular statistic display using Layout management diff --git a/Widgets/NClock.qml b/Widgets/NClock.qml index fccc6c0c..5615aa45 100644 --- a/Widgets/NClock.qml +++ b/Widgets/NClock.qml @@ -2,7 +2,6 @@ import QtQuick import QtQuick.Layouts import qs.Commons import qs.Widgets -import qs.Services import Quickshell import "../Helpers/ColorsConvert.js" as ColorsConvert diff --git a/Widgets/NColorPicker.qml b/Widgets/NColorPicker.qml index a37bb6cd..d25087c4 100644 --- a/Widgets/NColorPicker.qml +++ b/Widgets/NColorPicker.qml @@ -2,7 +2,6 @@ import QtQuick import QtQuick.Controls import QtQuick.Layouts import qs.Commons -import qs.Services import qs.Widgets Rectangle { diff --git a/Widgets/NDivider.qml b/Widgets/NDivider.qml index d11e82c7..737807d7 100644 --- a/Widgets/NDivider.qml +++ b/Widgets/NDivider.qml @@ -2,7 +2,6 @@ import QtQuick import Quickshell import Quickshell.Widgets import qs.Commons -import qs.Services Rectangle { width: parent.width diff --git a/Widgets/NImageCircled.qml b/Widgets/NImageCircled.qml index 55ef7568..c97e4440 100644 --- a/Widgets/NImageCircled.qml +++ b/Widgets/NImageCircled.qml @@ -3,7 +3,6 @@ import QtQuick.Effects import Quickshell import Quickshell.Widgets import qs.Commons -import qs.Services Rectangle { id: root diff --git a/Widgets/NImageRounded.qml b/Widgets/NImageRounded.qml index 32987e28..a7a5789f 100644 --- a/Widgets/NImageRounded.qml +++ b/Widgets/NImageRounded.qml @@ -3,7 +3,6 @@ import QtQuick.Effects import Quickshell import Quickshell.Widgets import qs.Commons -import qs.Services Rectangle { id: root diff --git a/Widgets/NInputAction.qml b/Widgets/NInputAction.qml index b4b86879..6fac9618 100644 --- a/Widgets/NInputAction.qml +++ b/Widgets/NInputAction.qml @@ -2,7 +2,6 @@ import QtQuick import QtQuick.Layouts import qs.Commons import qs.Widgets -import qs.Services // Input and button row RowLayout { diff --git a/Widgets/NRadioButton.qml b/Widgets/NRadioButton.qml index d61b0719..ea3cacbd 100644 --- a/Widgets/NRadioButton.qml +++ b/Widgets/NRadioButton.qml @@ -1,7 +1,6 @@ import QtQuick import QtQuick.Controls import qs.Commons -import qs.Services import qs.Widgets RadioButton { diff --git a/Widgets/NReorderCheckboxes.qml b/Widgets/NReorderCheckboxes.qml index a3a7f7e8..078c5e7a 100644 --- a/Widgets/NReorderCheckboxes.qml +++ b/Widgets/NReorderCheckboxes.qml @@ -2,7 +2,6 @@ import QtQuick import QtQuick.Controls import QtQuick.Layouts import qs.Commons -import qs.Services Item { id: root diff --git a/Widgets/NSectionEditor.qml b/Widgets/NSectionEditor.qml index 65fe857f..a2ecbedf 100644 --- a/Widgets/NSectionEditor.qml +++ b/Widgets/NSectionEditor.qml @@ -4,7 +4,6 @@ import QtQuick.Effects import QtQuick.Layouts import qs.Commons import qs.Widgets -import qs.Services NBox { id: root diff --git a/Widgets/NSpinBox.qml b/Widgets/NSpinBox.qml index a0fdbc16..0b96cfc4 100644 --- a/Widgets/NSpinBox.qml +++ b/Widgets/NSpinBox.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/NTabBar.qml b/Widgets/NTabBar.qml index db218606..5c0259b7 100644 --- a/Widgets/NTabBar.qml +++ b/Widgets/NTabBar.qml @@ -2,7 +2,6 @@ import QtQuick import QtQuick.Controls import QtQuick.Layouts import qs.Commons -import qs.Services import qs.Widgets Rectangle { diff --git a/Widgets/NTabButton.qml b/Widgets/NTabButton.qml index d9415836..a1def44b 100644 --- a/Widgets/NTabButton.qml +++ b/Widgets/NTabButton.qml @@ -2,7 +2,6 @@ import QtQuick import QtQuick.Controls import QtQuick.Layouts import qs.Commons -import qs.Services import qs.Widgets Rectangle { diff --git a/Widgets/NText.qml b/Widgets/NText.qml index 4a9060ed..57c20ed0 100644 --- a/Widgets/NText.qml +++ b/Widgets/NText.qml @@ -1,7 +1,6 @@ import QtQuick import QtQuick.Layouts import qs.Commons -import qs.Services import qs.Widgets Text { diff --git a/Widgets/NTextInput.qml b/Widgets/NTextInput.qml index f9ba4f05..b2a5e0ea 100644 --- a/Widgets/NTextInput.qml +++ b/Widgets/NTextInput.qml @@ -2,7 +2,6 @@ import QtQuick import QtQuick.Controls import QtQuick.Layouts import qs.Commons -import qs.Services ColumnLayout { id: root diff --git a/Widgets/NToggle.qml b/Widgets/NToggle.qml index 4cdc91f9..82c54711 100644 --- a/Widgets/NToggle.qml +++ b/Widgets/NToggle.qml @@ -2,7 +2,6 @@ import QtQuick import QtQuick.Controls import QtQuick.Layouts import qs.Commons -import qs.Services RowLayout { id: root diff --git a/Widgets/NValueSlider.qml b/Widgets/NValueSlider.qml index 19cb8e4c..62006780 100644 --- a/Widgets/NValueSlider.qml +++ b/Widgets/NValueSlider.qml @@ -2,7 +2,6 @@ import QtQuick import QtQuick.Controls import QtQuick.Layouts import qs.Commons -import qs.Services import qs.Widgets RowLayout {