internal: refactor widgets folder

Split into subdirs and rename to components

components/StateLayer.qml

@@ -1,4 +1,3 @@
-import qs.widgets
 import qs.services
 import qs.config
 import QtQuick

components/controls/CustomSpinBox.qml

@@ -1,5 +1,6 @@
 pragma ComponentBehavior: Bound
 
+import ".."
 import qs.services
 import qs.config
 import QtQuick

components/controls/StyledScrollBar.qml

@@ -1,3 +1,4 @@
+import ".."
 import qs.services
 import qs.config
 import QtQuick

components/controls/StyledSwitch.qml

@@ -1,3 +1,4 @@
+import ".."
 import qs.services
 import qs.config
 import QtQuick

components/controls/StyledTextField.qml

@@ -1,5 +1,6 @@
 pragma ComponentBehavior: Bound
 
+import ".."
 import qs.services
 import qs.config
 import QtQuick

components/controls/VerticalSlider.qml

@@ -1,4 +1,5 @@
-import qs.widgets
+import ".."
+import "../effects"
 import qs.services
 import qs.config
 import QtQuick

components/effects/InnerBorder.qml

@@ -1,5 +1,6 @@
 pragma ComponentBehavior: Bound
 
+import ".."
 import qs.services
 import qs.config
 import QtQuick

components/filedialog/FolderContents.qml

@@ -1,6 +1,8 @@
 pragma ComponentBehavior: Bound
 
 import ".."
+import "../controls"
+import "../images"
 import qs.services
 import qs.config
 import qs.utils

components/widgets/ExtraIndicator.qml

@@ -1,3 +1,5 @@
+import ".."
+import "../effects"
 import qs.services
 import qs.config
 import QtQuick

modules/Shortcuts.qml

@@ -1,4 +1,4 @@
-import qs.widgets
+import qs.components.misc
 import qs.services
 import Quickshell
 import Quickshell.Io

modules/areapicker/AreaPicker.qml

@@ -1,6 +1,7 @@
 pragma ComponentBehavior: Bound
 
-import qs.widgets
+import qs.components.containers
+import qs.components.misc
 import Quickshell
 import Quickshell.Wayland
 import Quickshell.Io

modules/areapicker/Picker.qml

@@ -1,6 +1,6 @@
 pragma ComponentBehavior: Bound
 
-import qs.widgets
+import qs.components
 import qs.services
 import qs.config
 import Quickshell

modules/background/Background.qml

@@ -1,4 +1,4 @@
-import qs.widgets
+import qs.components.containers
 import qs.config
 import Quickshell
 import Quickshell.Wayland

modules/background/DesktopClock.qml

@@ -1,4 +1,4 @@
-import qs.widgets
+import qs.components
 import qs.services
 import qs.config
 import QtQuick

modules/background/Wallpaper.qml

@@ -1,7 +1,8 @@
 pragma ComponentBehavior: Bound
 
-import qs.widgets
+import qs.components
-import qs.widgets.filedialog
+import qs.components.images
+import qs.components.filedialog
 import qs.services
 import qs.config
 import qs.utils

modules/bar/Bar.qml

@@ -1,4 +1,5 @@
-import qs.widgets
+import qs.components
+import qs.components.controls
 import qs.services
 import qs.config
 import "popouts" as BarPopouts

modules/bar/components/ActiveWindow.qml

@@ -1,6 +1,7 @@
 pragma ComponentBehavior: Bound
 
-import qs.widgets
+import qs.components
+import qs.components.controls
 import qs.services
 import qs.utils
 import qs.config

modules/bar/components/Clock.qml

@@ -1,4 +1,4 @@
-import qs.widgets
+import qs.components
 import qs.services
 import qs.config
 import QtQuick

modules/bar/components/OsIcon.qml

@@ -1,4 +1,4 @@
-import qs.widgets
+import qs.components
 import qs.services
 import qs.utils
 import qs.config

modules/bar/components/Power.qml

@@ -1,4 +1,4 @@
-import qs.widgets
+import qs.components
 import qs.services
 import qs.config
 import Quickshell

modules/bar/components/StatusIcons.qml

@@ -1,6 +1,6 @@
 pragma ComponentBehavior: Bound
 
-import qs.widgets
+import qs.components
 import qs.services
 import qs.utils
 import qs.config

modules/bar/components/workspaces/ActiveIndicator.qml

@@ -1,4 +1,5 @@
-import qs.widgets
+import qs.components
+import qs.components.effects
 import qs.services
 import qs.config
 import QtQuick

modules/bar/components/workspaces/OccupiedBg.qml

@@ -1,6 +1,6 @@
 pragma ComponentBehavior: Bound
 
-import qs.widgets
+import qs.components
 import qs.services
 import qs.config
 import Quickshell

modules/bar/components/workspaces/Workspace.qml

@@ -1,4 +1,4 @@
-import qs.widgets
+import qs.components
 import qs.services
 import qs.utils
 import qs.config

modules/bar/components/workspaces/Workspaces.qml

@@ -1,6 +1,5 @@
 pragma ComponentBehavior: Bound
 
-import qs.widgets
 import qs.services
 import qs.config
 import QtQuick

modules/bar/popouts/ActiveWindow.qml

@@ -1,4 +1,4 @@
-import qs.widgets
+import qs.components
 import qs.services
 import qs.utils
 import qs.config

modules/bar/popouts/Audio.qml

@@ -1,4 +1,5 @@
-import qs.widgets
+import qs.components
+import qs.components.controls
 import qs.services
 import qs.config
 import QtQuick.Layouts

modules/bar/popouts/Battery.qml

@@ -1,6 +1,6 @@
 pragma ComponentBehavior: Bound
 
-import qs.widgets
+import qs.components
 import qs.services
 import qs.config
 import Quickshell.Services.UPower

modules/bar/popouts/Bluetooth.qml

@@ -1,6 +1,7 @@
 pragma ComponentBehavior: Bound
 
-import qs.widgets
+import qs.components
+import qs.components.controls
 import qs.services
 import qs.config
 import qs.utils

modules/bar/popouts/Network.qml

@@ -1,6 +1,7 @@
 pragma ComponentBehavior: Bound
 
-import qs.widgets
+import qs.components
+import qs.components.controls
 import qs.services
 import qs.config
 import qs.utils

modules/bar/popouts/TrayMenu.qml

@@ -1,6 +1,6 @@
 pragma ComponentBehavior: Bound
 
-import qs.widgets
+import qs.components
 import qs.services
 import qs.config
 import Quickshell

modules/dashboard/Dash.qml

@@ -1,4 +1,4 @@
-import qs.widgets
+import qs.components
 import qs.services
 import qs.config
 import "dash"

modules/dashboard/Media.qml

@@ -1,6 +1,8 @@
 pragma ComponentBehavior: Bound
 
-import qs.widgets
+import qs.components
+import qs.components.effects
+import qs.components.misc
 import qs.services
 import qs.utils
 import qs.config

modules/dashboard/Performance.qml

@@ -1,4 +1,5 @@
-import qs.widgets
+import qs.components
+import qs.components.misc
 import qs.services
 import qs.config
 import QtQuick

modules/dashboard/Tabs.qml

@@ -1,6 +1,7 @@
 pragma ComponentBehavior: Bound
 
-import qs.widgets
+import qs.components
+import qs.components.controls
 import qs.services
 import qs.config
 import Quickshell

modules/dashboard/Wrapper.qml

@@ -1,6 +1,6 @@
 pragma ComponentBehavior: Bound
 
-import qs.widgets.filedialog
+import qs.components.filedialog
 import qs.config
 import qs.utils
 import Quickshell

modules/dashboard/dash/Calendar.qml

@@ -1,6 +1,6 @@
 pragma ComponentBehavior: Bound
 
-import qs.widgets
+import qs.components
 import qs.services
 import qs.config
 import QtQuick
@@ -55,7 +55,7 @@ Column {
                 implicitHeight: parent.implicitHeight
 
                 radius: Appearance.rounding.full
-                color: model.today ? Colours.palette.m3primary : "transparent"
+                color: day.model.today ? Colours.palette.m3primary : "transparent"
 
                 StyledText {
                     id: text

modules/dashboard/dash/DateTime.qml

@@ -1,6 +1,6 @@
 pragma ComponentBehavior: Bound
 
-import qs.widgets
+import qs.components
 import qs.services
 import qs.config
 import QtQuick

modules/dashboard/dash/Media.qml

@@ -1,4 +1,4 @@
-import qs.widgets
+import qs.components
 import qs.services
 import qs.config
 import qs.utils

modules/dashboard/dash/Resources.qml

@@ -1,4 +1,5 @@
-import qs.widgets
+import qs.components
+import qs.components.misc
 import qs.services
 import qs.config
 import QtQuick

modules/dashboard/dash/User.qml

@@ -1,11 +1,11 @@
-import qs.widgets
+import qs.components
+import qs.components.images
 import qs.services
 import qs.config
 import qs.utils
 import Quickshell
 import Quickshell.Io
 import QtQuick
-import QtQuick.Dialogs
 
 Row {
     id: root

modules/dashboard/dash/Weather.qml

@@ -1,4 +1,4 @@
-import qs.widgets
+import qs.components
 import qs.services
 import qs.config
 import qs.utils

modules/detachedcontent/DetachedContent.qml

@@ -1,6 +1,7 @@
 pragma ComponentBehavior: Bound
 
-import qs.widgets
+import qs.components
+import qs.components.controls
 import qs.services
 import qs.config
 import Quickshell

modules/detachedcontent/NavRail.qml

@@ -1,6 +1,6 @@
 pragma ComponentBehavior: Bound
 
-import qs.widgets
+import qs.components
 import qs.services
 import qs.config
 import QtQuick

modules/detachedcontent/Panes.qml

@@ -1,7 +1,8 @@
 pragma ComponentBehavior: Bound
 
 import "bluetooth"
-import qs.widgets
+import qs.components
+import qs.components.effects
 import qs.services
 import qs.config
 import Quickshell.Widgets

modules/detachedcontent/bluetooth/BtPane.qml

@@ -1,7 +1,8 @@
 pragma ComponentBehavior: Bound
 
 import ".."
-import qs.widgets
+import qs.components.effects
+import qs.components.containers
 import qs.config
 import Quickshell.Bluetooth
 import QtQuick

modules/detachedcontent/bluetooth/Details.qml

@@ -1,7 +1,10 @@
 pragma ComponentBehavior: Bound
 
 import ".."
-import qs.widgets
+import qs.components
+import qs.components.controls
+import qs.components.effects
+import qs.components.containers
 import qs.services
 import qs.config
 import qs.utils

modules/detachedcontent/bluetooth/DeviceList.qml

@@ -1,7 +1,9 @@
 pragma ComponentBehavior: Bound
 
 import ".."
-import qs.widgets
+import qs.components
+import qs.components.controls
+import qs.components.containers
 import qs.services
 import qs.config
 import qs.utils

modules/detachedcontent/bluetooth/Settings.qml

@@ -1,7 +1,9 @@
 pragma ComponentBehavior: Bound
 
 import ".."
-import qs.widgets
+import qs.components
+import qs.components.controls
+import qs.components.effects
 import qs.services
 import qs.config
 import Quickshell.Bluetooth

modules/drawers/Border.qml

@@ -1,6 +1,6 @@
 pragma ComponentBehavior: Bound
 
-import qs.widgets
+import qs.components
 import qs.services
 import qs.config
 import QtQuick

modules/drawers/Drawers.qml

@@ -1,6 +1,7 @@
 pragma ComponentBehavior: Bound
 
-import qs.widgets
+import qs.components
+import qs.components.containers
 import qs.services
 import qs.config
 import qs.modules.bar

modules/drawers/Exclusions.qml

@@ -1,6 +1,6 @@
 pragma ComponentBehavior: Bound
 
-import qs.widgets
+import qs.components.containers
 import qs.config
 import Quickshell
 import QtQuick

modules/launcher/AppList.qml

@@ -2,7 +2,9 @@ pragma ComponentBehavior: Bound
 
 import "items"
 import "services"
-import qs.widgets
+import qs.components
+import qs.components.controls
+import qs.components.containers
 import qs.services
 import qs.config
 import Quickshell

modules/launcher/Content.qml

@@ -1,7 +1,8 @@
 pragma ComponentBehavior: Bound
 
 import "services"
-import qs.widgets
+import qs.components
+import qs.components.controls
 import qs.services
 import qs.config
 import Quickshell

modules/launcher/ContentList.qml

@@ -1,6 +1,6 @@
 pragma ComponentBehavior: Bound
 
-import qs.widgets
+import qs.components
 import qs.services
 import qs.config
 import qs.utils

modules/launcher/items/ActionItem.qml

@@ -1,5 +1,5 @@
 import "../services"
-import qs.widgets
+import qs.components
 import qs.services
 import qs.config
 import QtQuick

modules/launcher/items/AppItem.qml

@@ -1,5 +1,5 @@
 import "../services"
-import qs.widgets
+import qs.components
 import qs.services
 import qs.config
 import Quickshell

modules/launcher/items/CalcItem.qml

@@ -1,4 +1,4 @@
-import qs.widgets
+import qs.components
 import qs.services
 import qs.config
 import Quickshell

modules/launcher/items/SchemeItem.qml

@@ -1,5 +1,5 @@
 import "../services"
-import qs.widgets
+import qs.components
 import qs.services
 import qs.config
 import QtQuick

modules/launcher/items/VariantItem.qml

@@ -1,5 +1,5 @@
 import "../services"
-import qs.widgets
+import qs.components
 import qs.services
 import qs.config
 import QtQuick

modules/launcher/items/WallpaperItem.qml

@@ -1,4 +1,6 @@
-import qs.widgets
+import qs.components
+import qs.components.effects
+import qs.components.images
 import qs.services
 import qs.config
 import Quickshell

modules/lock/Backgrounds.qml

@@ -1,6 +1,6 @@
 pragma ComponentBehavior: Bound
 
-import qs.widgets
+import qs.components
 import qs.services
 import qs.config
 import QtQuick

modules/lock/Buttons.qml

@@ -1,6 +1,6 @@
 pragma ComponentBehavior: Bound
 
-import qs.widgets
+import qs.components
 import qs.services
 import qs.config
 import Quickshell

modules/lock/Clock.qml

@@ -1,6 +1,6 @@
 pragma ComponentBehavior: Bound
 
-import qs.widgets
+import qs.components
 import qs.services
 import qs.config
 import QtQuick

modules/lock/Input.qml

@@ -1,4 +1,5 @@
-import qs.widgets
+import qs.components
+import qs.components.images
 import qs.services
 import qs.config
 import qs.utils

modules/lock/Lock.qml

@@ -1,6 +1,6 @@
 pragma ComponentBehavior: Bound
 
-import qs.widgets
+import qs.components.misc
 import Quickshell
 import Quickshell.Io
 import Quickshell.Wayland

modules/lock/MediaPlaying.qml

@@ -1,4 +1,4 @@
-import qs.widgets
+import qs.components
 import qs.services
 import qs.config
 import Quickshell.Widgets

modules/lock/Notification.qml

@@ -1,6 +1,7 @@
 pragma ComponentBehavior: Bound
 
-import qs.widgets
+import qs.components
+import qs.components.effects
 import qs.services
 import qs.config
 import qs.utils

modules/lock/Status.qml

@@ -1,4 +1,5 @@
-import qs.widgets
+import qs.components
+import qs.components.widgets
 import qs.services
 import qs.config
 import qs.utils

modules/lock/WeatherInfo.qml

@@ -1,4 +1,4 @@
-import qs.widgets
+import qs.components
 import qs.services
 import qs.config
 import QtQuick

modules/notifications/Content.qml

@@ -1,4 +1,5 @@
-import qs.widgets
+import qs.components.containers
+import qs.components.widgets
 import qs.services
 import qs.config
 import Quickshell

modules/notifications/Notification.qml

@@ -1,6 +1,7 @@
 pragma ComponentBehavior: Bound
 
-import qs.widgets
+import qs.components
+import qs.components.effects
 import qs.services
 import qs.config
 import qs.utils
@@ -441,49 +442,49 @@ StyledRect {
                 }
             }
         }
+    }
 
-        component Action: StyledRect {
+    component Action: StyledRect {
-            id: action
+        id: action
 
-            required property var modelData
+        required property var modelData
 
+        radius: Appearance.rounding.full
+        color: root.modelData.urgency === NotificationUrgency.Critical ? Colours.palette.m3secondary : Colours.palette.m3surfaceContainerHigh
+
+        Layout.preferredWidth: actionText.width + Appearance.padding.normal * 2
+        Layout.preferredHeight: actionText.height + Appearance.padding.small * 2
+        implicitWidth: actionText.width + Appearance.padding.normal * 2
+        implicitHeight: actionText.height + Appearance.padding.small * 2
+
+        StateLayer {
             radius: Appearance.rounding.full
-            color: root.modelData.urgency === NotificationUrgency.Critical ? Colours.palette.m3secondary : Colours.palette.m3surfaceContainerHigh
+            color: root.modelData.urgency === NotificationUrgency.Critical ? Colours.palette.m3onSecondary : Colours.palette.m3onSurface
 
-            Layout.preferredWidth: actionText.width + Appearance.padding.normal * 2
+            function onClicked(): void {
-            Layout.preferredHeight: actionText.height + Appearance.padding.small * 2
+                action.modelData.invoke();
-            implicitWidth: actionText.width + Appearance.padding.normal * 2
-            implicitHeight: actionText.height + Appearance.padding.small * 2
-
-            StateLayer {
-                radius: Appearance.rounding.full
-                color: root.modelData.urgency === NotificationUrgency.Critical ? Colours.palette.m3onSecondary : Colours.palette.m3onSurface
-
-                function onClicked(): void {
-                    action.modelData.invoke();
-                }
             }
+        }
 
-            StyledText {
+        StyledText {
-                id: actionText
+            id: actionText
 
-                anchors.centerIn: parent
+            anchors.centerIn: parent
-                text: actionTextMetrics.elidedText
+            text: actionTextMetrics.elidedText
-                color: root.modelData.urgency === NotificationUrgency.Critical ? Colours.palette.m3onSecondary : Colours.palette.m3onSurfaceVariant
+            color: root.modelData.urgency === NotificationUrgency.Critical ? Colours.palette.m3onSecondary : Colours.palette.m3onSurfaceVariant
-                font.pointSize: Appearance.font.size.small
+            font.pointSize: Appearance.font.size.small
-            }
+        }
 
-            TextMetrics {
+        TextMetrics {
-                id: actionTextMetrics
+            id: actionTextMetrics
 
-                text: action.modelData.text
+            text: action.modelData.text
-                font.family: actionText.font.family
+            font.family: actionText.font.family
-                font.pointSize: actionText.font.pointSize
+            font.pointSize: actionText.font.pointSize
-                elide: Text.ElideRight
+            elide: Text.ElideRight
-                elideWidth: {
+            elideWidth: {
-                    const numActions = root.modelData.actions.length + 1;
+                const numActions = root.modelData.actions.length + 1;
-                    return (inner.width - actions.spacing * (numActions - 1)) / numActions - Appearance.padding.normal * 2;
+                return (inner.width - actions.spacing * (numActions - 1)) / numActions - Appearance.padding.normal * 2;
-                }
             }
         }
     }

modules/osd/Content.qml

@@ -1,4 +1,4 @@
-import qs.widgets
+import qs.components.controls
 import qs.services
 import qs.config
 import QtQuick

modules/session/Content.qml

@@ -1,6 +1,6 @@
 pragma ComponentBehavior: Bound
 
-import qs.widgets
+import qs.components
 import qs.services
 import qs.config
 import qs.utils

modules/utilities/Content.qml

@@ -1,4 +1,4 @@
-import qs.widgets
+import qs.components
 import qs.services
 import qs.config
 import Quickshell

modules/windowinfo/Buttons.qml

@@ -1,4 +1,4 @@
-import qs.widgets
+import qs.components
 import qs.services
 import qs.config
 import Quickshell.Widgets

modules/windowinfo/Details.qml

@@ -1,4 +1,4 @@
-import qs.widgets
+import qs.components
 import qs.services
 import qs.config
 import Quickshell.Hyprland

modules/windowinfo/Preview.qml

@@ -1,6 +1,6 @@
 pragma ComponentBehavior: Bound
 
-import qs.widgets
+import qs.components
 import qs.services
 import qs.config
 import Quickshell

modules/windowinfo/WindowInfo.qml

@@ -1,4 +1,4 @@
-import qs.widgets
+import qs.components
 import qs.services
 import qs.config
 import Quickshell