remove qmldir and simplify import logic

This commit is contained in:
lucy 2026-01-19 12:45:35 +01:00
parent d2ea695644
commit eab6135f93
19 changed files with 33 additions and 46 deletions

View File

@ -1,7 +1,7 @@
import Quickshell import Quickshell
import QtQuick import QtQuick
import "../../settings/" import qs
import "../../" import qs.settings
Variants { Variants {
model: Quickshell.screens model: Quickshell.screens

View File

@ -3,9 +3,9 @@ import QtQuick
import Quickshell.Widgets import Quickshell.Widgets
import Qt5Compat.GraphicalEffects import Qt5Compat.GraphicalEffects
import Quickshell import Quickshell
import "../../reusables/" import qs
import "../../settings/" import qs.reusables
import "../../" import qs.settings
Loader { Loader {
id: batLoader id: batLoader

View File

@ -1,8 +1,8 @@
import Quickshell import Quickshell
import QtQuick import QtQuick
import "../../reusables/" import qs
import "../../settings/" import qs.settings
import "../../" import qs.reusables
Rectangle { Rectangle {
id: container id: container

View File

@ -1,7 +1,6 @@
import Quickshell.Services.SystemTray import Quickshell.Services.SystemTray
import QtQuick import QtQuick
import "." import qs.settings
import "../../settings/"
Item { Item {
id: root id: root

View File

@ -1,8 +1,8 @@
import QtQuick import QtQuick
import "../../reusables/"
import "../../settings/"
import "../../"
import Quickshell.Wayland import Quickshell.Wayland
import qs
import qs.settings
import qs.reusables
Rectangle { Rectangle {
id: container id: container

View File

@ -2,9 +2,9 @@ import Quickshell
import Quickshell.Io import Quickshell.Io
import QtQuick import QtQuick
import Quickshell.Services.Pipewire import Quickshell.Services.Pipewire
import "../../reusables/" import qs.settings
import "../../settings/" import qs.reusables
import "../../" import qs
Rectangle { Rectangle {
id: container id: container

View File

@ -1,10 +1,10 @@
pragma ComponentBehavior: Bound pragma ComponentBehavior: Bound
import "../../reusables/"
import Quickshell.Hyprland import Quickshell.Hyprland
import Quickshell import Quickshell
import QtQuick import QtQuick
import "../../" import qs
import "../../settings/" import qs.settings
import qs.reusables
Item { Item {
id: root id: root

View File

@ -1,6 +1,6 @@
import QtQuick import QtQuick
import Quickshell.Io import Quickshell.Io
import "../../settings/" import qs.settings
Item { Item {
IpcHandler { IpcHandler {

View File

@ -2,7 +2,7 @@ pragma ComponentBehavior: Bound
import QtQuick import QtQuick
import Quickshell import Quickshell
import Quickshell.Wayland import Quickshell.Wayland
import "../../settings/" import qs.settings
Variants { Variants {
model: Quickshell.screens model: Quickshell.screens

View File

@ -1,7 +1,7 @@
import QtQuick import QtQuick
import QtQuick.Layouts import QtQuick.Layouts
import "../../" import qs
import "../../reusables" import qs.reusables
import Quickshell.Widgets import Quickshell.Widgets
Rectangle { Rectangle {

View File

@ -1,4 +0,0 @@
singleton NotiServer 1.0 NotiServer.qml
Notification 1.0 Notification.qml
NotificationCard 1.0 NotificationCard.qml

View File

@ -2,7 +2,7 @@ pragma ComponentBehavior: Bound
import Quickshell import Quickshell
import QtQuick import QtQuick
import Quickshell.Wayland import Quickshell.Wayland
import "../../settings/" import qs.settings
Variants { Variants {
id: root id: root

View File

@ -1,5 +0,0 @@
import Quickshell
import Quickshell.Services.Polkit

1
qmldir
View File

@ -1 +0,0 @@
singleton Colors 1.0 Colors.qml

View File

@ -1,6 +1,6 @@
import QtQuick import QtQuick
import "../settings/" import qs.settings
import "../" import qs
Text { Text {
font.family: "Material Symbols Rounded" font.family: "Material Symbols Rounded"

View File

@ -1,6 +1,6 @@
import QtQuick import QtQuick
import "../settings/" import qs
import "../" import qs.settings
Text { Text {
color: Colors.foreground color: Colors.foreground

View File

@ -1 +0,0 @@
singleton Settings 1.0 Settings.qml

View File

@ -1,11 +1,10 @@
//@ pragma UseQApplication //@ pragma UseQApplication
import Quickshell import Quickshell
import QtQuick import QtQuick
import "./settings/" import qs.modules.ipc
import "./modules/bar/" import qs.modules.bar
import "./modules/overlays/" import qs.modules.overlays
import "./modules/ipc/" import qs.modules.notifications
import "./modules/notifications/"
ShellRoot { ShellRoot {
id: root id: root