migrate to qs imports and .qmlls.ini pattern

2026-01-26 06:22:50 -05:00 · 2025-07-16 18:47:51 -04:00
parent a49911863d
commit 457bbcd131
70 changed files with 129 additions and 212 deletions
--- a/Widgets/AppLauncher.qml
+++ b/Widgets/AppLauncher.qml
@@ -5,8 +5,8 @@ import Quickshell
 import Quickshell.Widgets
 import Quickshell.Wayland
 import Quickshell.Io
-import "../Common"
-import "../Services"
+import qs.Common
+import qs.Services

 PanelWindow {
    id: launcher
--- a/Widgets/BatteryControlPopup.qml
+++ b/Widgets/BatteryControlPopup.qml
@@ -3,8 +3,8 @@ import QtQuick.Controls
 import Quickshell
 import Quickshell.Widgets
 import Quickshell.Wayland
-import "../Common"
-import "../Services"
+import qs.Common
+import qs.Services

 PanelWindow {
    id: batteryControlPopup
--- a/Widgets/BatteryWidget.qml
+++ b/Widgets/BatteryWidget.qml
@@ -1,6 +1,6 @@
 import QtQuick
-import "../Common"
-import "../Services"
+import qs.Common
+import qs.Services

 Rectangle {
    id: batteryWidget
--- a/Widgets/CenterCommandCenter/CalendarWidget.qml
+++ b/Widgets/CenterCommandCenter/CalendarWidget.qml
@@ -1,8 +1,8 @@
 import QtQuick
 import QtQuick.Controls
 import QtQuick.Effects
-import "../../Common"
-import "../../Services"
+import qs.Common
+import qs.Services

 Column {
    id: calendarWidget
--- a/Widgets/CenterCommandCenter/CenterCommandCenter.qml
+++ b/Widgets/CenterCommandCenter/CenterCommandCenter.qml
@@ -5,8 +5,8 @@ import Quickshell
 import Quickshell.Widgets
 import Quickshell.Wayland
 import Quickshell.Services.Mpris
-import "../../Common"
-import "../../Services"
+import qs.Common
+import qs.Services

 PanelWindow {
    id: centerCommandCenter
--- a/Widgets/CenterCommandCenter/EventsWidget.qml
+++ b/Widgets/CenterCommandCenter/EventsWidget.qml
@@ -1,8 +1,8 @@
 import QtQuick
 import QtQuick.Controls
 import QtQuick.Effects
-import "../../Common"
-import "../../Services"
+import qs.Common
+import qs.Services

 // Events widget for selected date - Material Design 3 style
 Rectangle {
--- a/Widgets/CenterCommandCenter/MediaPlayerWidget.qml
+++ b/Widgets/CenterCommandCenter/MediaPlayerWidget.qml
@@ -3,8 +3,8 @@ import QtQuick.Controls
 import QtQuick.Effects
 import Quickshell
 import Quickshell.Services.Mpris
-import "../../Common"
-import "../../Services"
+import qs.Common
+import qs.Services

 Rectangle {
    id: mediaPlayerWidget
--- a/Widgets/CenterCommandCenter/WeatherWidget.qml
+++ b/Widgets/CenterCommandCenter/WeatherWidget.qml
@@ -1,8 +1,8 @@
 import QtQuick
 import QtQuick.Controls
 import QtQuick.Effects
-import "../../Common"
-import "../../Services"
+import qs.Common
+import qs.Services

 Rectangle {
    id: weatherWidget
--- a/Widgets/CenterCommandCenter/qmldir
+++ b/Widgets/CenterCommandCenter/qmldir
@@ -1,5 +0,0 @@
-CenterCommandCenter 1.0 CenterCommandCenter.qml
-MediaPlayerWidget 1.0 MediaPlayerWidget.qml
-WeatherWidget 1.0 WeatherWidget.qml
-CalendarWidget 1.0 CalendarWidget.qml
-EventsWidget 1.0 EventsWidget.qml
--- a/Widgets/ClipboardHistory.qml
+++ b/Widgets/ClipboardHistory.qml
@@ -4,7 +4,7 @@ import Quickshell
 import Quickshell.Widgets
 import Quickshell.Wayland
 import Quickshell.Io
-import "../Common"
+import qs.Common

 PanelWindow {
    id: clipboardHistory
--- a/Widgets/ControlCenter/AudioTab.qml
+++ b/Widgets/ControlCenter/AudioTab.qml
@@ -3,8 +3,8 @@ import QtQuick.Controls
 import Quickshell
 import Quickshell.Widgets
 import Quickshell.Io
-import "../../Common"
-import "../../Services"
+import qs.Common
+import qs.Services

 Item {
    id: audioTab
--- a/Widgets/ControlCenter/BluetoothTab.qml
+++ b/Widgets/ControlCenter/BluetoothTab.qml
@@ -3,8 +3,8 @@ import QtQuick.Controls
 import Quickshell
 import Quickshell.Widgets
 import Quickshell.Io
-import "../../Common"
-import "../../Services"
+import qs.Common
+import qs.Services

 Item {
    id: bluetoothTab
--- a/Widgets/ControlCenter/ControlCenterPopup.qml
+++ b/Widgets/ControlCenter/ControlCenterPopup.qml
@@ -5,8 +5,8 @@ import Quickshell
 import Quickshell.Widgets
 import Quickshell.Wayland
 import Quickshell.Io
-import "../../Common"
-import "../../Services"
+import qs.Common
+import qs.Services

 PanelWindow {
    id: controlCenterPopup
--- a/Widgets/ControlCenter/DisplayTab.qml
+++ b/Widgets/ControlCenter/DisplayTab.qml
@@ -3,9 +3,9 @@ import QtQuick.Controls
 import Quickshell
 import Quickshell.Widgets
 import Quickshell.Io
-import "../../Common"
-import "../../Services"
-import "../"
+import qs.Common
+import qs.Services
+import qs.Widgets

 ScrollView {
    id: displayTab
--- a/Widgets/ControlCenter/NetworkTab.qml
+++ b/Widgets/ControlCenter/NetworkTab.qml
@@ -3,8 +3,8 @@ import QtQuick.Controls
 import Quickshell
 import Quickshell.Widgets
 import Quickshell.Io
-import "../../Common"
-import "../../Services"
+import qs.Common
+import qs.Services

 Item {
    id: networkTab
--- a/Widgets/ControlCenter/qmldir
+++ b/Widgets/ControlCenter/qmldir
@@ -1,5 +0,0 @@
-ControlCenterPopup 1.0 ControlCenterPopup.qml
-NetworkTab 1.0 NetworkTab.qml
-AudioTab 1.0 AudioTab.qml
-BluetoothTab 1.0 BluetoothTab.qml
-DisplayTab 1.0 DisplayTab.qml
--- a/Widgets/CpuMonitorWidget.qml
+++ b/Widgets/CpuMonitorWidget.qml
@@ -1,7 +1,7 @@
 import QtQuick
 import QtQuick.Controls
-import "../Common"
-import "../Services"
+import qs.Common
+import qs.Services
 import "."

 Rectangle {
--- a/Widgets/CustomSlider.qml
+++ b/Widgets/CustomSlider.qml
@@ -1,5 +1,5 @@
 import QtQuick
-import "../Common"
+import qs.Common

 Item {
    id: slider
--- a/Widgets/GroupedNotificationCard.qml
+++ b/Widgets/GroupedNotificationCard.qml
@@ -4,8 +4,8 @@ import QtQuick.Effects
 import Quickshell
 import Quickshell.Widgets
 import Quickshell.Services.Notifications
-import "../Common"
-import "../Services"
+import qs.Common
+import qs.Services

 Rectangle {
    id: root
--- a/Widgets/InputDialog.qml
+++ b/Widgets/InputDialog.qml
@@ -3,7 +3,7 @@ import QtQuick.Controls
 import Quickshell
 import Quickshell.Widgets
 import Quickshell.Wayland
-import "../Common"
+import qs.Common

 PanelWindow {
    id: inputDialog
--- a/Widgets/NotificationCenter.qml
+++ b/Widgets/NotificationCenter.qml
@@ -4,8 +4,8 @@ import QtQuick.Controls
 import Quickshell
 import Quickshell.Widgets
 import Quickshell.Wayland
-import "../Common"
-import "../Services"
+import qs.Common
+import qs.Services

 PanelWindow {
    id: notificationHistoryPopup
--- a/Widgets/NotificationInit.qml
+++ b/Widgets/NotificationInit.qml
@@ -3,8 +3,8 @@ import QtQuick.Controls
 import Quickshell
 import Quickshell.Widgets
 import Quickshell.Wayland
-import "../Common"
-import "../Services"
+import qs.Common
+import qs.Services

 PanelWindow {
    id: notificationPopup
--- a/Widgets/NotificationItem.qml
+++ b/Widgets/NotificationItem.qml
@@ -4,8 +4,8 @@ import QtQuick.Effects
 import Quickshell
 import Quickshell.Widgets
 import Quickshell.Services.Notifications
-import "../Common"
-import "../Services"
+import qs.Common
+import qs.Services

 Rectangle {
    id: root
--- a/Widgets/PowerConfirmDialog.qml
+++ b/Widgets/PowerConfirmDialog.qml
@@ -4,7 +4,7 @@ import Quickshell
 import Quickshell.Widgets
 import Quickshell.Wayland
 import Quickshell.Io
-import "../Common"
+import qs.Common

 PanelWindow {
    id: powerConfirmDialog
--- a/Widgets/PowerMenuPopup.qml
+++ b/Widgets/PowerMenuPopup.qml
@@ -4,7 +4,7 @@ import Quickshell
 import Quickshell.Widgets
 import Quickshell.Wayland
 import Quickshell.Io
-import "../Common"
+import qs.Common

 PanelWindow {
    id: powerMenuPopup
--- a/Widgets/ProcessListDropdown.qml
+++ b/Widgets/ProcessListDropdown.qml
@@ -6,8 +6,8 @@ import Quickshell
 import Quickshell.Widgets
 import Quickshell.Wayland
 import Quickshell.Io
-import "../Common"
-import "../Services"
+import qs.Common
+import qs.Services

 PanelWindow {
    id: processDropdown
--- a/Widgets/ProcessListWidget.qml
+++ b/Widgets/ProcessListWidget.qml
@@ -6,8 +6,8 @@ import Quickshell
 import Quickshell.Widgets
 import Quickshell.Wayland
 import Quickshell.Io
-import "../Common"
-import "../Services"
+import qs.Common
+import qs.Services

 PanelWindow {
    id: processListWidget
--- a/Widgets/RamMonitorWidget.qml
+++ b/Widgets/RamMonitorWidget.qml
@@ -1,7 +1,7 @@
 import QtQuick
 import QtQuick.Controls
-import "../Common"
-import "../Services"
+import qs.Common
+import qs.Services
 import "."

 Rectangle {
--- a/Widgets/SettingsPopup.qml
+++ b/Widgets/SettingsPopup.qml
@@ -5,7 +5,7 @@ import Quickshell
 import Quickshell.Widgets
 import Quickshell.Wayland
 import Quickshell.Io
-import "../Common"
+import qs.Common

 PanelWindow {
    id: settingsPopup
--- a/Widgets/SettingsSection.qml
+++ b/Widgets/SettingsSection.qml
@@ -1,5 +1,5 @@
 import QtQuick
-import "../Common"
+import qs.Common

 Column {
    id: root
--- a/Widgets/SettingsToggle.qml
+++ b/Widgets/SettingsToggle.qml
@@ -1,5 +1,5 @@
 import QtQuick
-import "../Common"
+import qs.Common

 Rectangle {
    id: root
--- a/Widgets/SpotlightLauncher.qml
+++ b/Widgets/SpotlightLauncher.qml
@@ -5,8 +5,8 @@ import Quickshell
 import Quickshell.Widgets
 import Quickshell.Wayland
 import Quickshell.Io
-import "../Common"
-import "../Services"
+import qs.Common
+import qs.Services

 PanelWindow {
    id: spotlightLauncher
--- a/Widgets/ThemePicker.qml
+++ b/Widgets/ThemePicker.qml
@@ -1,5 +1,5 @@
 import QtQuick
-import "../Common"
+import qs.Common

 Column {
    id: themePicker
--- a/Widgets/TopBar/AudioVisualization.qml
+++ b/Widgets/TopBar/AudioVisualization.qml
@@ -2,7 +2,7 @@ import QtQuick
 import Quickshell
 import Quickshell.Io
 import Quickshell.Services.Mpris
-import "../../Common"
+import qs.Common

 Item {
    id: root
--- a/Widgets/TopBar/ClockWidget.qml
+++ b/Widgets/TopBar/ClockWidget.qml
@@ -1,6 +1,6 @@
 import QtQuick
 import Quickshell
-import "../../Common"
+import qs.Common

 Rectangle {
    id: root
--- a/Widgets/TopBar/ControlCenterButton.qml
+++ b/Widgets/TopBar/ControlCenterButton.qml
@@ -1,6 +1,6 @@
 import QtQuick
-import "../../Common"
-import "../../Services"
+import qs.Common
+import qs.Services

 Rectangle {
    id: root
--- a/Widgets/TopBar/FocusedAppWidget.qml
+++ b/Widgets/TopBar/FocusedAppWidget.qml
@@ -1,6 +1,6 @@
 import QtQuick
-import "../../Common"
-import "../../Services"
+import qs.Common
+import qs.Services

 Rectangle {
    id: root
--- a/Widgets/TopBar/LauncherButton.qml
+++ b/Widgets/TopBar/LauncherButton.qml
@@ -1,6 +1,6 @@
 import QtQuick
-import "../../Common"
-import "../../Services"
+import qs.Common
+import qs.Services

 Rectangle {
    id: root
--- a/Widgets/TopBar/MediaWidget.qml
+++ b/Widgets/TopBar/MediaWidget.qml
@@ -1,6 +1,6 @@
 import QtQuick
 import Quickshell.Services.Mpris
-import "../../Common"
+import qs.Common

 Rectangle {
    id: root
--- a/Widgets/TopBar/NotificationCenterButton.qml
+++ b/Widgets/TopBar/NotificationCenterButton.qml
@@ -1,5 +1,5 @@
 import QtQuick
-import "../../Common"
+import qs.Common

 Rectangle {
    id: root
--- a/Widgets/TopBar/SystemTrayWidget.qml
+++ b/Widgets/TopBar/SystemTrayWidget.qml
@@ -1,6 +1,6 @@
 import QtQuick
 import Quickshell.Services.SystemTray
-import "../../Common"
+import qs.Common

 Rectangle {
    id: root
--- a/Widgets/TopBar/TopBar.qml
+++ b/Widgets/TopBar/TopBar.qml
@@ -8,10 +8,10 @@ import Quickshell.Io
 import Quickshell.Services.SystemTray
 import Quickshell.Services.Notifications
 import Quickshell.Services.Mpris
-import "../../Common"
+import qs.Common
+import qs.Services
+import qs.Widgets
 import "../../Common/Utilities.js" as Utils
-import "../../Services"
-import ".."

 PanelWindow {
    id: topBar
--- a/Widgets/TopBar/WeatherWidget.qml
+++ b/Widgets/TopBar/WeatherWidget.qml
@@ -1,6 +1,6 @@
 import QtQuick
-import "../../Common"
-import "../../Services"
+import qs.Common
+import qs.Services

 Rectangle {
    id: root
--- a/Widgets/TopBar/WorkspaceSwitcher.qml
+++ b/Widgets/TopBar/WorkspaceSwitcher.qml
@@ -1,7 +1,7 @@
 import QtQuick
 import Quickshell
-import "../../Common"
-import "../../Services"
+import qs.Common
+import qs.Services

 Rectangle {
    id: root
--- a/Widgets/TopBar/qmldir
+++ b/Widgets/TopBar/qmldir
@@ -1,11 +0,0 @@
-TopBar 1.0 TopBar.qml
-LauncherButton 1.0 LauncherButton.qml
-WorkspaceSwitcher 1.0 WorkspaceSwitcher.qml
-FocusedAppWidget 1.0 FocusedAppWidget.qml
-ClockWidget 1.0 ClockWidget.qml
-MediaWidget 1.0 MediaWidget.qml
-WeatherWidget 1.0 WeatherWidget.qml
-SystemTrayWidget 1.0 SystemTrayWidget.qml
-NotificationCenterButton 1.0 NotificationCenterButton.qml
-ControlCenterButton 1.0 ControlCenterButton.qml
-AudioVisualization 1.0 AudioVisualization.qml
--- a/Widgets/TrayMenuPopup.qml
+++ b/Widgets/TrayMenuPopup.qml
@@ -3,7 +3,7 @@ import QtQuick.Controls
 import Quickshell
 import Quickshell.Widgets
 import Quickshell.Wayland
-import "../Common"
+import qs.Common

 PanelWindow {
    id: trayMenuPopup
--- a/Widgets/WifiPasswordDialog.qml
+++ b/Widgets/WifiPasswordDialog.qml
@@ -3,8 +3,8 @@ import QtQuick.Controls
 import Quickshell
 import Quickshell.Widgets
 import Quickshell.Wayland
-import "../Common"
-import "../Services"
+import qs.Common
+import qs.Services

 PanelWindow {
    id: wifiPasswordDialog
--- a/Widgets/qmldir
+++ b/Widgets/qmldir
@@ -1,24 +0,0 @@
-TopBar 1.0 TopBar/TopBar.qml
-TrayMenuPopup 1.0 TrayMenuPopup.qml
-NotificationItem 1.0 NotificationItem.qml
-NotificationInit 1.0 NotificationInit.qml
-NotificationCenter 1.0 NotificationCenter.qml
-GroupedNotificationCard 1.0 GroupedNotificationCard.qml
-WifiPasswordDialog 1.0 WifiPasswordDialog.qml
-AppLauncher 1.0 AppLauncher.qml
-ClipboardHistory 1.0 ClipboardHistory.qml
-CustomSlider 1.0 CustomSlider.qml
-InputDialog 1.0 InputDialog.qml
-BatteryWidget 1.0 BatteryWidget.qml
-BatteryControlPopup 1.0 BatteryControlPopup.qml
-PowerMenuPopup 1.0 PowerMenuPopup.qml
-PowerConfirmDialog 1.0 PowerConfirmDialog.qml
-ThemePicker 1.0 ThemePicker.qml
-CpuMonitorWidget 1.0 CpuMonitorWidget.qml
-RamMonitorWidget 1.0 RamMonitorWidget.qml
-ProcessListDropdown 1.0 ProcessListDropdown.qml
-ProcessListWidget 1.0 ProcessListWidget.qml
-SpotlightLauncher 1.0 SpotlightLauncher.qml
-SettingsPopup 1.0 SettingsPopup.qml
-SettingsSection 1.0 SettingsSection.qml
-SettingsToggle 1.0 SettingsToggle.qml