From f281de47c3c5e52514a1ab13ccf89acff49806be Mon Sep 17 00:00:00 2001 From: outfoxxed Date: Thu, 10 Jul 2025 04:38:23 -0700 Subject: [PATCH] update qs to use new root paths --- .../quickshell/shell/background/BackgroundImage.qml | 2 +- modules/user/modules/quickshell/shell/bar/Bar.qml | 10 +++++----- .../modules/quickshell/shell/bar/BarContainment.qml | 4 ++-- .../modules/quickshell/shell/bar/BarWidgetInner.qml | 2 +- .../user/modules/quickshell/shell/bar/ClockWidget.qml | 2 +- modules/user/modules/quickshell/shell/bar/Tooltip.qml | 2 +- .../user/modules/quickshell/shell/bar/Workspaces.qml | 4 ++-- .../quickshell/shell/bar/audio/AudioControl.qml | 2 +- .../quickshell/shell/bar/audio/AudioControls.qml | 2 +- .../user/modules/quickshell/shell/bar/audio/Mixer.qml | 4 ++-- .../quickshell/shell/bar/audio/MixerEntryBase.qml | 2 +- .../quickshell/shell/bar/mpris/BackgroundArt.qml | 4 ++-- .../quickshell/shell/bar/mpris/MprisController.qml | 2 +- .../modules/quickshell/shell/bar/mpris/Players.qml | 8 ++++---- .../modules/quickshell/shell/bar/power/BatteryIcon.qml | 2 +- .../user/modules/quickshell/shell/bar/power/Power.qml | 7 +++---- .../quickshell/shell/bar/systray/MenuCheckBox.qml | 2 +- .../modules/quickshell/shell/bar/systray/MenuItem.qml | 2 +- .../quickshell/shell/bar/systray/MenuRadioButton.qml | 2 +- .../modules/quickshell/shell/bar/systray/MenuView.qml | 2 +- .../modules/quickshell/shell/bar/systray/SysTray.qml | 2 +- .../user/modules/quickshell/shell/lock/Controller.qml | 4 ++-- .../user/modules/quickshell/shell/lock/LockButton.qml | 2 +- .../user/modules/quickshell/shell/lock/LockContent.qml | 2 +- .../shell/notifications/FlickableNotification.qml | 2 +- .../shell/notifications/NotificationDisplay.qml | 4 ++-- .../shell/notifications/NotificationWidget.qml | 2 +- .../notifications/StandardNotificationRenderer.qml | 2 +- .../modules/quickshell/shell/screenshot/Controller.qml | 2 +- 29 files changed, 44 insertions(+), 45 deletions(-) diff --git a/modules/user/modules/quickshell/shell/background/BackgroundImage.qml b/modules/user/modules/quickshell/shell/background/BackgroundImage.qml index c2d48c2..eccf02a 100644 --- a/modules/user/modules/quickshell/shell/background/BackgroundImage.qml +++ b/modules/user/modules/quickshell/shell/background/BackgroundImage.qml @@ -1,6 +1,6 @@ import QtQuick import Quickshell -import "../lock" as Lock +import qs.lock as Lock Item { id: root diff --git a/modules/user/modules/quickshell/shell/bar/Bar.qml b/modules/user/modules/quickshell/shell/bar/Bar.qml index ac7edbf..955993c 100644 --- a/modules/user/modules/quickshell/shell/bar/Bar.qml +++ b/modules/user/modules/quickshell/shell/bar/Bar.qml @@ -3,11 +3,11 @@ import QtQuick import QtQuick.Layouts import QtQuick.Controls import Quickshell -import "systray" as SysTray -import "audio" as Audio -import "mpris" as Mpris -import "power" as Power -import "../notifications" as Notifs +import qs.bar.systray as SysTray +import qs.bar.audio as Audio +import qs.bar.mpris as Mpris +import qs.bar.power as Power +import qs.notifications as Notifs BarContainment { id: root diff --git a/modules/user/modules/quickshell/shell/bar/BarContainment.qml b/modules/user/modules/quickshell/shell/bar/BarContainment.qml index c9d9b25..f0a6317 100644 --- a/modules/user/modules/quickshell/shell/bar/BarContainment.qml +++ b/modules/user/modules/quickshell/shell/bar/BarContainment.qml @@ -2,8 +2,8 @@ import QtQuick import Quickshell import Quickshell.Hyprland import Quickshell.Wayland -import ".." -import "../lock" as Lock +import qs +import qs.lock as Lock PanelWindow { id: root diff --git a/modules/user/modules/quickshell/shell/bar/BarWidgetInner.qml b/modules/user/modules/quickshell/shell/bar/BarWidgetInner.qml index 619e7e7..2b943d8 100644 --- a/modules/user/modules/quickshell/shell/bar/BarWidgetInner.qml +++ b/modules/user/modules/quickshell/shell/bar/BarWidgetInner.qml @@ -1,5 +1,5 @@ import QtQuick -import ".." +import qs Rectangle { color: ShellGlobals.colors.widget diff --git a/modules/user/modules/quickshell/shell/bar/ClockWidget.qml b/modules/user/modules/quickshell/shell/bar/ClockWidget.qml index e9a1d9f..08c7f44 100644 --- a/modules/user/modules/quickshell/shell/bar/ClockWidget.qml +++ b/modules/user/modules/quickshell/shell/bar/ClockWidget.qml @@ -2,7 +2,7 @@ import QtQuick import QtQuick.Layouts import QtQuick.Controls import Quickshell -import ".." +import qs BarWidgetInner { id: root diff --git a/modules/user/modules/quickshell/shell/bar/Tooltip.qml b/modules/user/modules/quickshell/shell/bar/Tooltip.qml index 10b8c5a..bf68795 100644 --- a/modules/user/modules/quickshell/shell/bar/Tooltip.qml +++ b/modules/user/modules/quickshell/shell/bar/Tooltip.qml @@ -1,7 +1,7 @@ import QtQuick import Quickshell import Quickshell.Hyprland -import "root:/" +import qs Scope { id: root diff --git a/modules/user/modules/quickshell/shell/bar/Workspaces.qml b/modules/user/modules/quickshell/shell/bar/Workspaces.qml index 5dc18d4..a7456e9 100644 --- a/modules/user/modules/quickshell/shell/bar/Workspaces.qml +++ b/modules/user/modules/quickshell/shell/bar/Workspaces.qml @@ -3,8 +3,8 @@ pragma ComponentBehavior: Bound; import QtQuick import QtQuick.Layouts import Quickshell.Hyprland -import ".." -import "root:." +import qs +import qs.bar FullwidthMouseArea { id: root diff --git a/modules/user/modules/quickshell/shell/bar/audio/AudioControl.qml b/modules/user/modules/quickshell/shell/bar/audio/AudioControl.qml index ab19af8..4e33856 100644 --- a/modules/user/modules/quickshell/shell/bar/audio/AudioControl.qml +++ b/modules/user/modules/quickshell/shell/bar/audio/AudioControl.qml @@ -1,6 +1,6 @@ import QtQuick import Quickshell.Services.Pipewire -import ".." +import qs.bar ClickableIcon { id: root diff --git a/modules/user/modules/quickshell/shell/bar/audio/AudioControls.qml b/modules/user/modules/quickshell/shell/bar/audio/AudioControls.qml index 737f721..f910307 100644 --- a/modules/user/modules/quickshell/shell/bar/audio/AudioControls.qml +++ b/modules/user/modules/quickshell/shell/bar/audio/AudioControls.qml @@ -2,7 +2,7 @@ import QtQuick import QtQuick.Layouts import Quickshell import Quickshell.Services.Pipewire -import ".." +import qs.bar BarWidgetInner { id: root diff --git a/modules/user/modules/quickshell/shell/bar/audio/Mixer.qml b/modules/user/modules/quickshell/shell/bar/audio/Mixer.qml index 98d8d6d..1a44257 100644 --- a/modules/user/modules/quickshell/shell/bar/audio/Mixer.qml +++ b/modules/user/modules/quickshell/shell/bar/audio/Mixer.qml @@ -2,8 +2,8 @@ import QtQuick import QtQuick.Layouts import Quickshell import Quickshell.Services.Pipewire -import ".." -import "../.." +import qs +import qs.bar ColumnLayout { id: root diff --git a/modules/user/modules/quickshell/shell/bar/audio/MixerEntryBase.qml b/modules/user/modules/quickshell/shell/bar/audio/MixerEntryBase.qml index 36491b6..52d3278 100644 --- a/modules/user/modules/quickshell/shell/bar/audio/MixerEntryBase.qml +++ b/modules/user/modules/quickshell/shell/bar/audio/MixerEntryBase.qml @@ -1,7 +1,7 @@ import QtQuick import QtQuick.Layouts import Quickshell.Services.Pipewire -import ".." +import qs.bar RowLayout { id: root diff --git a/modules/user/modules/quickshell/shell/bar/mpris/BackgroundArt.qml b/modules/user/modules/quickshell/shell/bar/mpris/BackgroundArt.qml index bfdacc8..4c7b81c 100644 --- a/modules/user/modules/quickshell/shell/bar/mpris/BackgroundArt.qml +++ b/modules/user/modules/quickshell/shell/bar/mpris/BackgroundArt.qml @@ -2,8 +2,8 @@ import QtQuick import QtQuick.Controls import QtQuick.Layouts import Qt5Compat.GraphicalEffects -import ".." -import "../.." +import qs +import qs.bar BarWidgetInner { id: root diff --git a/modules/user/modules/quickshell/shell/bar/mpris/MprisController.qml b/modules/user/modules/quickshell/shell/bar/mpris/MprisController.qml index 24977f7..09ec3e0 100644 --- a/modules/user/modules/quickshell/shell/bar/mpris/MprisController.qml +++ b/modules/user/modules/quickshell/shell/bar/mpris/MprisController.qml @@ -6,7 +6,7 @@ import QtQuick import Quickshell import Quickshell.Io import Quickshell.Services.Mpris -import "../.." +import qs Singleton { id: root; diff --git a/modules/user/modules/quickshell/shell/bar/mpris/Players.qml b/modules/user/modules/quickshell/shell/bar/mpris/Players.qml index 4f52d96..c772d4f 100644 --- a/modules/user/modules/quickshell/shell/bar/mpris/Players.qml +++ b/modules/user/modules/quickshell/shell/bar/mpris/Players.qml @@ -6,8 +6,8 @@ import QtQuick.Layouts import Qt5Compat.GraphicalEffects import Quickshell import Quickshell.Services.Mpris -import ".." -import "../.." +import qs +import qs.bar FullwidthMouseArea { id: root @@ -679,8 +679,8 @@ FullwidthMouseArea { onColorsChanged: console.log(colors) } - grooveColor: quant.colors.length === 0 ? "#30ceffff" : Qt.alpha(quant.colors[0], 0.2) - barColor: quant.colors.length === 0 ? "#80ceffff" : Qt.alpha(Qt.lighter(quant.colors[0]), 0.5) + grooveColor: quant.colors.length === 0 ? "#30ceffff" : Qt.alpha(quant.colors[0], 0.5) + barColor: quant.colors.length === 0 ? "#80ceffff" : Qt.alpha(Qt.lighter(quant.colors[0]), 0.9) Behavior on grooveColor { ColorAnimation { duration: 200 } } Behavior on barColor { ColorAnimation { duration: 200 } } diff --git a/modules/user/modules/quickshell/shell/bar/power/BatteryIcon.qml b/modules/user/modules/quickshell/shell/bar/power/BatteryIcon.qml index 335e8d9..3c08eee 100644 --- a/modules/user/modules/quickshell/shell/bar/power/BatteryIcon.qml +++ b/modules/user/modules/quickshell/shell/bar/power/BatteryIcon.qml @@ -1,6 +1,6 @@ import QtQuick import Quickshell.Services.UPower -import "root:." +import qs Item { id: root diff --git a/modules/user/modules/quickshell/shell/bar/power/Power.qml b/modules/user/modules/quickshell/shell/bar/power/Power.qml index 93a8ac6..3df1991 100644 --- a/modules/user/modules/quickshell/shell/bar/power/Power.qml +++ b/modules/user/modules/quickshell/shell/bar/power/Power.qml @@ -4,10 +4,9 @@ import QtQuick.Controls import Quickshell import Quickshell.Services.UPower import Quickshell.Widgets -import ".." -import "root:." -import "root:components" -import "power" +import qs +import qs.bar +import qs.components BarWidgetInner { id: root diff --git a/modules/user/modules/quickshell/shell/bar/systray/MenuCheckBox.qml b/modules/user/modules/quickshell/shell/bar/systray/MenuCheckBox.qml index c01e8fe..257229d 100644 --- a/modules/user/modules/quickshell/shell/bar/systray/MenuCheckBox.qml +++ b/modules/user/modules/quickshell/shell/bar/systray/MenuCheckBox.qml @@ -1,6 +1,6 @@ import QtQuick import QtQuick.Shapes -import "../.." +import qs Rectangle { property var checkState: Qt.Unchecked; diff --git a/modules/user/modules/quickshell/shell/bar/systray/MenuItem.qml b/modules/user/modules/quickshell/shell/bar/systray/MenuItem.qml index e7592e2..7271841 100644 --- a/modules/user/modules/quickshell/shell/bar/systray/MenuItem.qml +++ b/modules/user/modules/quickshell/shell/bar/systray/MenuItem.qml @@ -3,7 +3,7 @@ import QtQuick.Layouts import Quickshell import Quickshell.Widgets import Quickshell.DBusMenu -import "../.." +import qs MouseArea { id: root diff --git a/modules/user/modules/quickshell/shell/bar/systray/MenuRadioButton.qml b/modules/user/modules/quickshell/shell/bar/systray/MenuRadioButton.qml index 9a2d8d0..adabdf5 100644 --- a/modules/user/modules/quickshell/shell/bar/systray/MenuRadioButton.qml +++ b/modules/user/modules/quickshell/shell/bar/systray/MenuRadioButton.qml @@ -1,5 +1,5 @@ import QtQuick -import "../.." +import qs Rectangle { property var checkState: Qt.Unchecked; diff --git a/modules/user/modules/quickshell/shell/bar/systray/MenuView.qml b/modules/user/modules/quickshell/shell/bar/systray/MenuView.qml index da02e5c..fc80aea 100644 --- a/modules/user/modules/quickshell/shell/bar/systray/MenuView.qml +++ b/modules/user/modules/quickshell/shell/bar/systray/MenuView.qml @@ -2,7 +2,7 @@ import QtQuick import QtQuick.Layouts import Quickshell import Quickshell.DBusMenu -import "../.." +import qs ColumnLayout { id: root diff --git a/modules/user/modules/quickshell/shell/bar/systray/SysTray.qml b/modules/user/modules/quickshell/shell/bar/systray/SysTray.qml index b393268..2a08868 100644 --- a/modules/user/modules/quickshell/shell/bar/systray/SysTray.qml +++ b/modules/user/modules/quickshell/shell/bar/systray/SysTray.qml @@ -5,7 +5,7 @@ import QtQuick.Layouts import QtQuick.Effects import Quickshell import Quickshell.Services.SystemTray -import ".." +import qs.bar BarWidgetInner { id: root diff --git a/modules/user/modules/quickshell/shell/lock/Controller.qml b/modules/user/modules/quickshell/shell/lock/Controller.qml index 5d9b860..ffa6ac0 100644 --- a/modules/user/modules/quickshell/shell/lock/Controller.qml +++ b/modules/user/modules/quickshell/shell/lock/Controller.qml @@ -7,8 +7,8 @@ import Quickshell.Io import Quickshell.Wayland import Quickshell.Hyprland import Quickshell.Services.Pam -import ".." -import "../background" +import qs +import qs.background Singleton { id: root diff --git a/modules/user/modules/quickshell/shell/lock/LockButton.qml b/modules/user/modules/quickshell/shell/lock/LockButton.qml index 74beede..a7cf394 100644 --- a/modules/user/modules/quickshell/shell/lock/LockButton.qml +++ b/modules/user/modules/quickshell/shell/lock/LockButton.qml @@ -1,5 +1,5 @@ import QtQuick -import "root:." +import qs Item { id: root diff --git a/modules/user/modules/quickshell/shell/lock/LockContent.qml b/modules/user/modules/quickshell/shell/lock/LockContent.qml index c8b6eb2..a2389e3 100644 --- a/modules/user/modules/quickshell/shell/lock/LockContent.qml +++ b/modules/user/modules/quickshell/shell/lock/LockContent.qml @@ -2,7 +2,7 @@ import QtQuick import QtQuick.Layouts import QtQuick.Controls import Quickshell -import ".." +import qs Item { id: root diff --git a/modules/user/modules/quickshell/shell/notifications/FlickableNotification.qml b/modules/user/modules/quickshell/shell/notifications/FlickableNotification.qml index cca2581..192b332 100644 --- a/modules/user/modules/quickshell/shell/notifications/FlickableNotification.qml +++ b/modules/user/modules/quickshell/shell/notifications/FlickableNotification.qml @@ -1,6 +1,6 @@ import QtQuick import Quickshell -import "../components" +import qs.components Item { id: root diff --git a/modules/user/modules/quickshell/shell/notifications/NotificationDisplay.qml b/modules/user/modules/quickshell/shell/notifications/NotificationDisplay.qml index c71a2c8..a395a7b 100644 --- a/modules/user/modules/quickshell/shell/notifications/NotificationDisplay.qml +++ b/modules/user/modules/quickshell/shell/notifications/NotificationDisplay.qml @@ -1,8 +1,8 @@ import QtQuick import QtQuick.Effects import Qt5Compat.GraphicalEffects -import "../components" -import "../shaders" as Shaders +import qs.components +import qs.shaders as Shaders Item { id: root diff --git a/modules/user/modules/quickshell/shell/notifications/NotificationWidget.qml b/modules/user/modules/quickshell/shell/notifications/NotificationWidget.qml index ec75697..6d3d723 100644 --- a/modules/user/modules/quickshell/shell/notifications/NotificationWidget.qml +++ b/modules/user/modules/quickshell/shell/notifications/NotificationWidget.qml @@ -1,6 +1,6 @@ import QtQuick import QtQuick.Controls -import "../bar" +import qs.bar BarWidgetInner { id: root diff --git a/modules/user/modules/quickshell/shell/notifications/StandardNotificationRenderer.qml b/modules/user/modules/quickshell/shell/notifications/StandardNotificationRenderer.qml index 26cad48..88d2946 100644 --- a/modules/user/modules/quickshell/shell/notifications/StandardNotificationRenderer.qml +++ b/modules/user/modules/quickshell/shell/notifications/StandardNotificationRenderer.qml @@ -3,7 +3,7 @@ import QtQuick.Layouts import QtQuick.Controls import Quickshell import Quickshell.Services.Notifications -import ".." +import qs Rectangle { id: root diff --git a/modules/user/modules/quickshell/shell/screenshot/Controller.qml b/modules/user/modules/quickshell/shell/screenshot/Controller.qml index ffb92a2..ad864a8 100644 --- a/modules/user/modules/quickshell/shell/screenshot/Controller.qml +++ b/modules/user/modules/quickshell/shell/screenshot/Controller.qml @@ -5,7 +5,7 @@ import QtQuick import Quickshell import Quickshell.Io import Quickshell.Wayland -import ".." +import qs Scope { id: root