diff options
103 files changed, 152 insertions, 110 deletions
diff --git a/widgets/MaterialIcon.qml b/components/MaterialIcon.qml index a1d19d3..a1d19d3 100644 --- a/widgets/MaterialIcon.qml +++ b/components/MaterialIcon.qml diff --git a/widgets/StateLayer.qml b/components/StateLayer.qml index 6d263cb..da30217 100644 --- a/widgets/StateLayer.qml +++ b/components/StateLayer.qml @@ -1,4 +1,3 @@ -import qs.widgets import qs.services import qs.config import QtQuick diff --git a/widgets/StyledClippingRect.qml b/components/StyledClippingRect.qml index 8e15c4c..8e15c4c 100644 --- a/widgets/StyledClippingRect.qml +++ b/components/StyledClippingRect.qml diff --git a/widgets/StyledRect.qml b/components/StyledRect.qml index c052b2a..c052b2a 100644 --- a/widgets/StyledRect.qml +++ b/components/StyledRect.qml diff --git a/widgets/StyledText.qml b/components/StyledText.qml index 554c20c..554c20c 100644 --- a/widgets/StyledText.qml +++ b/components/StyledText.qml diff --git a/widgets/StyledFlickable.qml b/components/containers/StyledFlickable.qml index 7b2a75e..7b2a75e 100644 --- a/widgets/StyledFlickable.qml +++ b/components/containers/StyledFlickable.qml diff --git a/widgets/StyledListView.qml b/components/containers/StyledListView.qml index b59eca8..b59eca8 100644 --- a/widgets/StyledListView.qml +++ b/components/containers/StyledListView.qml diff --git a/widgets/StyledWindow.qml b/components/containers/StyledWindow.qml index 3b402b5..3b402b5 100644 --- a/widgets/StyledWindow.qml +++ b/components/containers/StyledWindow.qml diff --git a/widgets/CustomMouseArea.qml b/components/controls/CustomMouseArea.qml index 7c973c2..7c973c2 100644 --- a/widgets/CustomMouseArea.qml +++ b/components/controls/CustomMouseArea.qml diff --git a/widgets/CustomSpinBox.qml b/components/controls/CustomSpinBox.qml index 7bd4d2b..4611bed 100644 --- a/widgets/CustomSpinBox.qml +++ b/components/controls/CustomSpinBox.qml @@ -1,5 +1,6 @@ pragma ComponentBehavior: Bound +import ".." import qs.services import qs.config import QtQuick diff --git a/widgets/StyledBusyIndicator.qml b/components/controls/StyledBusyIndicator.qml index 060870f..060870f 100644 --- a/widgets/StyledBusyIndicator.qml +++ b/components/controls/StyledBusyIndicator.qml diff --git a/widgets/StyledScrollBar.qml b/components/controls/StyledScrollBar.qml index 9e1f891..61ddc6d 100644 --- a/widgets/StyledScrollBar.qml +++ b/components/controls/StyledScrollBar.qml @@ -1,3 +1,4 @@ +import ".." import qs.services import qs.config import QtQuick diff --git a/widgets/StyledSwitch.qml b/components/controls/StyledSwitch.qml index 9a7448c..c9d7330 100644 --- a/widgets/StyledSwitch.qml +++ b/components/controls/StyledSwitch.qml @@ -1,3 +1,4 @@ +import ".." import qs.services import qs.config import QtQuick diff --git a/widgets/StyledTextField.qml b/components/controls/StyledTextField.qml index d4a470a..30db314 100644 --- a/widgets/StyledTextField.qml +++ b/components/controls/StyledTextField.qml @@ -1,5 +1,6 @@ pragma ComponentBehavior: Bound +import ".." import qs.services import qs.config import QtQuick diff --git a/widgets/VerticalSlider.qml b/components/controls/VerticalSlider.qml index 9b55a0d..306cc24 100644 --- a/widgets/VerticalSlider.qml +++ b/components/controls/VerticalSlider.qml @@ -1,4 +1,5 @@ -import qs.widgets +import ".." +import "../effects" import qs.services import qs.config import QtQuick diff --git a/widgets/Colouriser.qml b/components/effects/Colouriser.qml index b621ecd..b621ecd 100644 --- a/widgets/Colouriser.qml +++ b/components/effects/Colouriser.qml diff --git a/widgets/Elevation.qml b/components/effects/Elevation.qml index 999b199..999b199 100644 --- a/widgets/Elevation.qml +++ b/components/effects/Elevation.qml diff --git a/widgets/InnerBorder.qml b/components/effects/InnerBorder.qml index 83d4e96..e5092ca 100644 --- a/widgets/InnerBorder.qml +++ b/components/effects/InnerBorder.qml @@ -1,5 +1,6 @@ pragma ComponentBehavior: Bound +import ".." import qs.services import qs.config import QtQuick diff --git a/widgets/filedialog/CurrentItem.qml b/components/filedialog/CurrentItem.qml index e042445..e042445 100644 --- a/widgets/filedialog/CurrentItem.qml +++ b/components/filedialog/CurrentItem.qml diff --git a/widgets/filedialog/DialogButtons.qml b/components/filedialog/DialogButtons.qml index a64195a..a64195a 100644 --- a/widgets/filedialog/DialogButtons.qml +++ b/components/filedialog/DialogButtons.qml diff --git a/widgets/filedialog/FileDialog.qml b/components/filedialog/FileDialog.qml index a533243..a533243 100644 --- a/widgets/filedialog/FileDialog.qml +++ b/components/filedialog/FileDialog.qml diff --git a/widgets/filedialog/FolderContents.qml b/components/filedialog/FolderContents.qml index 4a24ef5..45930ba 100644 --- a/widgets/filedialog/FolderContents.qml +++ b/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 diff --git a/widgets/filedialog/HeaderBar.qml b/components/filedialog/HeaderBar.qml index 4af9672..4af9672 100644 --- a/widgets/filedialog/HeaderBar.qml +++ b/components/filedialog/HeaderBar.qml diff --git a/widgets/filedialog/Sidebar.qml b/components/filedialog/Sidebar.qml index 82a1dd5..82a1dd5 100644 --- a/widgets/filedialog/Sidebar.qml +++ b/components/filedialog/Sidebar.qml diff --git a/widgets/filedialog/Sizes.qml b/components/filedialog/Sizes.qml index 2ad31f9..2ad31f9 100644 --- a/widgets/filedialog/Sizes.qml +++ b/components/filedialog/Sizes.qml diff --git a/widgets/CachingIconImage.qml b/components/images/CachingIconImage.qml index 522a947..522a947 100644 --- a/widgets/CachingIconImage.qml +++ b/components/images/CachingIconImage.qml diff --git a/widgets/CachingImage.qml b/components/images/CachingImage.qml index 1d42238..1d42238 100644 --- a/widgets/CachingImage.qml +++ b/components/images/CachingImage.qml diff --git a/widgets/CustomShortcut.qml b/components/misc/CustomShortcut.qml index aa35ed8..aa35ed8 100644 --- a/widgets/CustomShortcut.qml +++ b/components/misc/CustomShortcut.qml diff --git a/widgets/Ref.qml b/components/misc/Ref.qml index 679f52f..679f52f 100644 --- a/widgets/Ref.qml +++ b/components/misc/Ref.qml diff --git a/widgets/ExtraIndicator.qml b/components/widgets/ExtraIndicator.qml index fd6f6ee..6034b33 100644 --- a/widgets/ExtraIndicator.qml +++ b/components/widgets/ExtraIndicator.qml @@ -1,3 +1,5 @@ +import ".." +import "../effects" import qs.services import qs.config import QtQuick diff --git a/modules/Shortcuts.qml b/modules/Shortcuts.qml index 61ff11d..628a8ce 100644 --- a/modules/Shortcuts.qml +++ b/modules/Shortcuts.qml @@ -1,4 +1,4 @@ -import qs.widgets +import qs.components.misc import qs.services import Quickshell import Quickshell.Io diff --git a/modules/areapicker/AreaPicker.qml b/modules/areapicker/AreaPicker.qml index a670100..7ff051f 100644 --- a/modules/areapicker/AreaPicker.qml +++ b/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 diff --git a/modules/areapicker/Picker.qml b/modules/areapicker/Picker.qml index bcde0ca..2f0bafc 100644 --- a/modules/areapicker/Picker.qml +++ b/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 diff --git a/modules/background/Background.qml b/modules/background/Background.qml index 09eed3c..3da8bf9 100644 --- a/modules/background/Background.qml +++ b/modules/background/Background.qml @@ -1,4 +1,4 @@ -import qs.widgets +import qs.components.containers import qs.config import Quickshell import Quickshell.Wayland diff --git a/modules/background/DesktopClock.qml b/modules/background/DesktopClock.qml index a0e3f13..6dc6b6b 100644 --- a/modules/background/DesktopClock.qml +++ b/modules/background/DesktopClock.qml @@ -1,4 +1,4 @@ -import qs.widgets +import qs.components import qs.services import qs.config import QtQuick diff --git a/modules/background/Wallpaper.qml b/modules/background/Wallpaper.qml index 2ec4927..a427d4f 100644 --- a/modules/background/Wallpaper.qml +++ b/modules/background/Wallpaper.qml @@ -1,7 +1,8 @@ pragma ComponentBehavior: Bound -import qs.widgets -import qs.widgets.filedialog +import qs.components +import qs.components.images +import qs.components.filedialog import qs.services import qs.config import qs.utils diff --git a/modules/bar/Bar.qml b/modules/bar/Bar.qml index 8d6f2bb..d661b86 100644 --- a/modules/bar/Bar.qml +++ b/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 diff --git a/modules/bar/components/ActiveWindow.qml b/modules/bar/components/ActiveWindow.qml index 1ce33ff..ed4c90d 100644 --- a/modules/bar/components/ActiveWindow.qml +++ b/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 diff --git a/modules/bar/components/Clock.qml b/modules/bar/components/Clock.qml index f045f9d..46f0e47 100644 --- a/modules/bar/components/Clock.qml +++ b/modules/bar/components/Clock.qml @@ -1,4 +1,4 @@ -import qs.widgets +import qs.components import qs.services import qs.config import QtQuick diff --git a/modules/bar/components/OsIcon.qml b/modules/bar/components/OsIcon.qml index 4ba9417..ecc69b5 100644 --- a/modules/bar/components/OsIcon.qml +++ b/modules/bar/components/OsIcon.qml @@ -1,4 +1,4 @@ -import qs.widgets +import qs.components import qs.services import qs.utils import qs.config diff --git a/modules/bar/components/Power.qml b/modules/bar/components/Power.qml index 05c9dd5..71dc296 100644 --- a/modules/bar/components/Power.qml +++ b/modules/bar/components/Power.qml @@ -1,4 +1,4 @@ -import qs.widgets +import qs.components import qs.services import qs.config import Quickshell diff --git a/modules/bar/components/StatusIcons.qml b/modules/bar/components/StatusIcons.qml index f5b3d8a..ad8c35e 100644 --- a/modules/bar/components/StatusIcons.qml +++ b/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 diff --git a/modules/bar/components/workspaces/ActiveIndicator.qml b/modules/bar/components/workspaces/ActiveIndicator.qml index a338d4e..b44ba87 100644 --- a/modules/bar/components/workspaces/ActiveIndicator.qml +++ b/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 diff --git a/modules/bar/components/workspaces/OccupiedBg.qml b/modules/bar/components/workspaces/OccupiedBg.qml index 10cd6c0..567510a 100644 --- a/modules/bar/components/workspaces/OccupiedBg.qml +++ b/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 diff --git a/modules/bar/components/workspaces/Workspace.qml b/modules/bar/components/workspaces/Workspace.qml index dc410ba..fcf8ba4 100644 --- a/modules/bar/components/workspaces/Workspace.qml +++ b/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 diff --git a/modules/bar/components/workspaces/Workspaces.qml b/modules/bar/components/workspaces/Workspaces.qml index bc49a33..0a806f7 100644 --- a/modules/bar/components/workspaces/Workspaces.qml +++ b/modules/bar/components/workspaces/Workspaces.qml @@ -1,6 +1,5 @@ pragma ComponentBehavior: Bound -import qs.widgets import qs.services import qs.config import QtQuick diff --git a/modules/bar/popouts/ActiveWindow.qml b/modules/bar/popouts/ActiveWindow.qml index 0c48798..cad2bd8 100644 --- a/modules/bar/popouts/ActiveWindow.qml +++ b/modules/bar/popouts/ActiveWindow.qml @@ -1,4 +1,4 @@ -import qs.widgets +import qs.components import qs.services import qs.utils import qs.config diff --git a/modules/bar/popouts/Audio.qml b/modules/bar/popouts/Audio.qml index 6714eb8..e6e5514 100644 --- a/modules/bar/popouts/Audio.qml +++ b/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 diff --git a/modules/bar/popouts/Battery.qml b/modules/bar/popouts/Battery.qml index df2f95d..254e2af 100644 --- a/modules/bar/popouts/Battery.qml +++ b/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 diff --git a/modules/bar/popouts/Bluetooth.qml b/modules/bar/popouts/Bluetooth.qml index 97cb01e..09ed768 100644 --- a/modules/bar/popouts/Bluetooth.qml +++ b/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 diff --git a/modules/bar/popouts/Network.qml b/modules/bar/popouts/Network.qml index 80e1732..6c21f24 100644 --- a/modules/bar/popouts/Network.qml +++ b/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 diff --git a/modules/bar/popouts/TrayMenu.qml b/modules/bar/popouts/TrayMenu.qml index 59f310b..67305b5 100644 --- a/modules/bar/popouts/TrayMenu.qml +++ b/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 diff --git a/modules/dashboard/Dash.qml b/modules/dashboard/Dash.qml index 2331f95..09d7e93 100644 --- a/modules/dashboard/Dash.qml +++ b/modules/dashboard/Dash.qml @@ -1,4 +1,4 @@ -import qs.widgets +import qs.components import qs.services import qs.config import "dash" diff --git a/modules/dashboard/Media.qml b/modules/dashboard/Media.qml index 25364f6..c12db22 100644 --- a/modules/dashboard/Media.qml +++ b/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 diff --git a/modules/dashboard/Performance.qml b/modules/dashboard/Performance.qml index 4717b30..2667a1e 100644 --- a/modules/dashboard/Performance.qml +++ b/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 diff --git a/modules/dashboard/Tabs.qml b/modules/dashboard/Tabs.qml index d29ee42..a041bf3 100644 --- a/modules/dashboard/Tabs.qml +++ b/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 diff --git a/modules/dashboard/Wrapper.qml b/modules/dashboard/Wrapper.qml index 184a2ab..9863e01 100644 --- a/modules/dashboard/Wrapper.qml +++ b/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 diff --git a/modules/dashboard/dash/Calendar.qml b/modules/dashboard/dash/Calendar.qml index 836b202..51771cc 100644 --- a/modules/dashboard/dash/Calendar.qml +++ b/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 diff --git a/modules/dashboard/dash/DateTime.qml b/modules/dashboard/dash/DateTime.qml index 9d81741..cdba4db 100644 --- a/modules/dashboard/dash/DateTime.qml +++ b/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 diff --git a/modules/dashboard/dash/Media.qml b/modules/dashboard/dash/Media.qml index 1346886..cdb2c1a 100644 --- a/modules/dashboard/dash/Media.qml +++ b/modules/dashboard/dash/Media.qml @@ -1,4 +1,4 @@ -import qs.widgets +import qs.components import qs.services import qs.config import qs.utils diff --git a/modules/dashboard/dash/Resources.qml b/modules/dashboard/dash/Resources.qml index 3e15a99..3edba0c 100644 --- a/modules/dashboard/dash/Resources.qml +++ b/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 diff --git a/modules/dashboard/dash/User.qml b/modules/dashboard/dash/User.qml index 7bc225b..9b029ba 100644 --- a/modules/dashboard/dash/User.qml +++ b/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 diff --git a/modules/dashboard/dash/Weather.qml b/modules/dashboard/dash/Weather.qml index 6bb9792..0160229 100644 --- a/modules/dashboard/dash/Weather.qml +++ b/modules/dashboard/dash/Weather.qml @@ -1,4 +1,4 @@ -import qs.widgets +import qs.components import qs.services import qs.config import qs.utils diff --git a/modules/detachedcontent/DetachedContent.qml b/modules/detachedcontent/DetachedContent.qml index c77a7da..cf564cb 100644 --- a/modules/detachedcontent/DetachedContent.qml +++ b/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 diff --git a/modules/detachedcontent/NavRail.qml b/modules/detachedcontent/NavRail.qml index de654d2..826e8ca 100644 --- a/modules/detachedcontent/NavRail.qml +++ b/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 diff --git a/modules/detachedcontent/Panes.qml b/modules/detachedcontent/Panes.qml index d26a71d..d1ec581 100644 --- a/modules/detachedcontent/Panes.qml +++ b/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 diff --git a/modules/detachedcontent/bluetooth/BtPane.qml b/modules/detachedcontent/bluetooth/BtPane.qml index d0ea8b0..c6dbbcc 100644 --- a/modules/detachedcontent/bluetooth/BtPane.qml +++ b/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 diff --git a/modules/detachedcontent/bluetooth/Details.qml b/modules/detachedcontent/bluetooth/Details.qml index 9d434c0..f856002 100644 --- a/modules/detachedcontent/bluetooth/Details.qml +++ b/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 diff --git a/modules/detachedcontent/bluetooth/DeviceList.qml b/modules/detachedcontent/bluetooth/DeviceList.qml index 8876be7..d975e17 100644 --- a/modules/detachedcontent/bluetooth/DeviceList.qml +++ b/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 diff --git a/modules/detachedcontent/bluetooth/Settings.qml b/modules/detachedcontent/bluetooth/Settings.qml index 663badc..f298432 100644 --- a/modules/detachedcontent/bluetooth/Settings.qml +++ b/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 diff --git a/modules/drawers/Border.qml b/modules/drawers/Border.qml index 5aa8465..b7cb374 100644 --- a/modules/drawers/Border.qml +++ b/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 diff --git a/modules/drawers/Drawers.qml b/modules/drawers/Drawers.qml index 86c2a1a..8b043a1 100644 --- a/modules/drawers/Drawers.qml +++ b/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 diff --git a/modules/drawers/Exclusions.qml b/modules/drawers/Exclusions.qml index 778c9f6..b214408 100644 --- a/modules/drawers/Exclusions.qml +++ b/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 diff --git a/modules/launcher/AppList.qml b/modules/launcher/AppList.qml index 3317cd0..2ede78e 100644 --- a/modules/launcher/AppList.qml +++ b/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 diff --git a/modules/launcher/Content.qml b/modules/launcher/Content.qml index 0c41456..d7acd55 100644 --- a/modules/launcher/Content.qml +++ b/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 diff --git a/modules/launcher/ContentList.qml b/modules/launcher/ContentList.qml index be7b4d3..e363c7b 100644 --- a/modules/launcher/ContentList.qml +++ b/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 diff --git a/modules/launcher/items/ActionItem.qml b/modules/launcher/items/ActionItem.qml index acacede..102b3fd 100644 --- a/modules/launcher/items/ActionItem.qml +++ b/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 diff --git a/modules/launcher/items/AppItem.qml b/modules/launcher/items/AppItem.qml index 6c77166..6012356 100644 --- a/modules/launcher/items/AppItem.qml +++ b/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 diff --git a/modules/launcher/items/CalcItem.qml b/modules/launcher/items/CalcItem.qml index 84c66a7..5e578d8 100644 --- a/modules/launcher/items/CalcItem.qml +++ b/modules/launcher/items/CalcItem.qml @@ -1,4 +1,4 @@ -import qs.widgets +import qs.components import qs.services import qs.config import Quickshell diff --git a/modules/launcher/items/SchemeItem.qml b/modules/launcher/items/SchemeItem.qml index 94c1818..8cc2e33 100644 --- a/modules/launcher/items/SchemeItem.qml +++ b/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 diff --git a/modules/launcher/items/VariantItem.qml b/modules/launcher/items/VariantItem.qml index 973564a..4d33a38 100644 --- a/modules/launcher/items/VariantItem.qml +++ b/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 diff --git a/modules/launcher/items/WallpaperItem.qml b/modules/launcher/items/WallpaperItem.qml index 401e852..103bc38 100644 --- a/modules/launcher/items/WallpaperItem.qml +++ b/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 diff --git a/modules/lock/Backgrounds.qml b/modules/lock/Backgrounds.qml index aee3f64..eba7c7b 100644 --- a/modules/lock/Backgrounds.qml +++ b/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 diff --git a/modules/lock/Buttons.qml b/modules/lock/Buttons.qml index 1995151..78675ec 100644 --- a/modules/lock/Buttons.qml +++ b/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 diff --git a/modules/lock/Clock.qml b/modules/lock/Clock.qml index 53c1b36..d024dd4 100644 --- a/modules/lock/Clock.qml +++ b/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 diff --git a/modules/lock/Input.qml b/modules/lock/Input.qml index d988164..b1d2ae3 100644 --- a/modules/lock/Input.qml +++ b/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 diff --git a/modules/lock/Lock.qml b/modules/lock/Lock.qml index c618705..d0f27ec 100644 --- a/modules/lock/Lock.qml +++ b/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 diff --git a/modules/lock/MediaPlaying.qml b/modules/lock/MediaPlaying.qml index d3bcdf9..08f1490 100644 --- a/modules/lock/MediaPlaying.qml +++ b/modules/lock/MediaPlaying.qml @@ -1,4 +1,4 @@ -import qs.widgets +import qs.components import qs.services import qs.config import Quickshell.Widgets diff --git a/modules/lock/Notification.qml b/modules/lock/Notification.qml index 145645f..c06db56 100644 --- a/modules/lock/Notification.qml +++ b/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 diff --git a/modules/lock/Status.qml b/modules/lock/Status.qml index 08e396a..d273628 100644 --- a/modules/lock/Status.qml +++ b/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 diff --git a/modules/lock/WeatherInfo.qml b/modules/lock/WeatherInfo.qml index c5d1cf5..b944d2f 100644 --- a/modules/lock/WeatherInfo.qml +++ b/modules/lock/WeatherInfo.qml @@ -1,4 +1,4 @@ -import qs.widgets +import qs.components import qs.services import qs.config import QtQuick diff --git a/modules/notifications/Content.qml b/modules/notifications/Content.qml index a41933d..2ece7f4 100644 --- a/modules/notifications/Content.qml +++ b/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 diff --git a/modules/notifications/Notification.qml b/modules/notifications/Notification.qml index f9940b3..cdb6804 100644 --- a/modules/notifications/Notification.qml +++ b/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 { - id: action + component Action: StyledRect { + 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 + 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 + 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.m3onSecondary : Colours.palette.m3onSurface + StateLayer { + radius: Appearance.rounding.full + color: root.modelData.urgency === NotificationUrgency.Critical ? Colours.palette.m3onSecondary : Colours.palette.m3onSurface - function onClicked(): void { - action.modelData.invoke(); - } + function onClicked(): void { + action.modelData.invoke(); } + } - StyledText { - id: actionText + StyledText { + id: actionText - anchors.centerIn: parent - text: actionTextMetrics.elidedText - color: root.modelData.urgency === NotificationUrgency.Critical ? Colours.palette.m3onSecondary : Colours.palette.m3onSurfaceVariant - font.pointSize: Appearance.font.size.small - } + anchors.centerIn: parent + text: actionTextMetrics.elidedText + color: root.modelData.urgency === NotificationUrgency.Critical ? Colours.palette.m3onSecondary : Colours.palette.m3onSurfaceVariant + font.pointSize: Appearance.font.size.small + } - TextMetrics { - id: actionTextMetrics + TextMetrics { + id: actionTextMetrics - text: action.modelData.text - font.family: actionText.font.family - font.pointSize: actionText.font.pointSize - elide: Text.ElideRight - elideWidth: { - const numActions = root.modelData.actions.length + 1; - return (inner.width - actions.spacing * (numActions - 1)) / numActions - Appearance.padding.normal * 2; - } + text: action.modelData.text + font.family: actionText.font.family + font.pointSize: actionText.font.pointSize + elide: Text.ElideRight + elideWidth: { + const numActions = root.modelData.actions.length + 1; + return (inner.width - actions.spacing * (numActions - 1)) / numActions - Appearance.padding.normal * 2; } } } diff --git a/modules/osd/Content.qml b/modules/osd/Content.qml index a707fb4..3177ee9 100644 --- a/modules/osd/Content.qml +++ b/modules/osd/Content.qml @@ -1,4 +1,4 @@ -import qs.widgets +import qs.components.controls import qs.services import qs.config import QtQuick diff --git a/modules/session/Content.qml b/modules/session/Content.qml index 4c0bc88..a75de10 100644 --- a/modules/session/Content.qml +++ b/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 diff --git a/modules/utilities/Content.qml b/modules/utilities/Content.qml index 02e198a..49fdaa4 100644 --- a/modules/utilities/Content.qml +++ b/modules/utilities/Content.qml @@ -1,4 +1,4 @@ -import qs.widgets +import qs.components import qs.services import qs.config import Quickshell diff --git a/modules/windowinfo/Buttons.qml b/modules/windowinfo/Buttons.qml index dd933ae..dea5059 100644 --- a/modules/windowinfo/Buttons.qml +++ b/modules/windowinfo/Buttons.qml @@ -1,4 +1,4 @@ -import qs.widgets +import qs.components import qs.services import qs.config import Quickshell.Widgets diff --git a/modules/windowinfo/Details.qml b/modules/windowinfo/Details.qml index 6f83ac1..f9ee66a 100644 --- a/modules/windowinfo/Details.qml +++ b/modules/windowinfo/Details.qml @@ -1,4 +1,4 @@ -import qs.widgets +import qs.components import qs.services import qs.config import Quickshell.Hyprland diff --git a/modules/windowinfo/Preview.qml b/modules/windowinfo/Preview.qml index 7bbf16e..2cae647 100644 --- a/modules/windowinfo/Preview.qml +++ b/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 diff --git a/modules/windowinfo/WindowInfo.qml b/modules/windowinfo/WindowInfo.qml index 4349d93..713122a 100644 --- a/modules/windowinfo/WindowInfo.qml +++ b/modules/windowinfo/WindowInfo.qml @@ -1,4 +1,4 @@ -import qs.widgets +import qs.components import qs.services import qs.config import Quickshell diff --git a/services/Brightness.qml b/services/Brightness.qml index cbd1739..954f76d 100644 --- a/services/Brightness.qml +++ b/services/Brightness.qml @@ -1,7 +1,7 @@ pragma Singleton pragma ComponentBehavior: Bound -import qs.widgets +import qs.components.misc import Quickshell import Quickshell.Io import QtQuick diff --git a/services/Notifs.qml b/services/Notifs.qml index a24c4aa..87ecca5 100644 --- a/services/Notifs.qml +++ b/services/Notifs.qml @@ -1,7 +1,7 @@ pragma Singleton pragma ComponentBehavior: Bound -import qs.widgets +import qs.components.misc import qs.config import Quickshell import Quickshell.Io diff --git a/services/Players.qml b/services/Players.qml index 3e259d3..9c197f1 100644 --- a/services/Players.qml +++ b/services/Players.qml @@ -1,6 +1,6 @@ pragma Singleton -import qs.widgets +import qs.components.misc import Quickshell import Quickshell.Io import Quickshell.Services.Mpris |