From 58826b7deb07f187d2c2c8cac3bf651a008b4646 Mon Sep 17 00:00:00 2001
From: 2 * r + 2 * t <61896496+soramanew@users.noreply.github.com>
Date: Sat, 19 Jul 2025 16:59:32 +1000
Subject: [PATCH] internal: move launcher stuff into subfolders

---
 modules/launcher/AppList.qml                     | 2 ++
 modules/launcher/WallpaperList.qml               | 2 +-
 modules/launcher/{ => items}/ActionItem.qml      | 1 +
 modules/launcher/{ => items}/AppItem.qml         | 1 +
 modules/launcher/{ => items}/CalcItem.qml        | 0
 modules/launcher/{ => items}/SchemeItem.qml      | 3 +--
 modules/launcher/{ => items}/VariantItem.qml     | 1 +
 modules/launcher/{ => items}/WallpaperItem.qml   | 0
 modules/launcher/{ => services}/Actions.qml      | 3 +--
 {services => modules/launcher/services}/Apps.qml | 0
 modules/launcher/{ => services}/M3Variants.qml   | 0
 modules/launcher/{ => services}/Schemes.qml      | 0
 12 files changed, 8 insertions(+), 5 deletions(-)
 rename modules/launcher/{ => items}/ActionItem.qml (98%)
 rename modules/launcher/{ => items}/AppItem.qml (98%)
 rename modules/launcher/{ => items}/CalcItem.qml (100%)
 rename modules/launcher/{ => items}/SchemeItem.qml (98%)
 rename modules/launcher/{ => items}/VariantItem.qml (98%)
 rename modules/launcher/{ => items}/WallpaperItem.qml (100%)
 rename modules/launcher/{ => services}/Actions.qml (99%)
 rename {services => modules/launcher/services}/Apps.qml (100%)
 rename modules/launcher/{ => services}/M3Variants.qml (100%)
 rename modules/launcher/{ => services}/Schemes.qml (100%)

diff --git a/modules/launcher/AppList.qml b/modules/launcher/AppList.qml
index 857515a1..3a994d34 100644
--- a/modules/launcher/AppList.qml
+++ b/modules/launcher/AppList.qml
@@ -1,5 +1,7 @@
 pragma ComponentBehavior: Bound
 
+import "items"
+import "services"
 import qs.widgets
 import qs.services
 import qs.config
diff --git a/modules/launcher/WallpaperList.qml b/modules/launcher/WallpaperList.qml
index f59dd29d..5979b69e 100644
--- a/modules/launcher/WallpaperList.qml
+++ b/modules/launcher/WallpaperList.qml
@@ -1,4 +1,4 @@
-import qs.widgets
+import "items"
 import qs.services
 import qs.config
 import Quickshell
diff --git a/modules/launcher/ActionItem.qml b/modules/launcher/items/ActionItem.qml
similarity index 98%
rename from modules/launcher/ActionItem.qml
rename to modules/launcher/items/ActionItem.qml
index 82f5caaa..acaceded 100644
--- a/modules/launcher/ActionItem.qml
+++ b/modules/launcher/items/ActionItem.qml
@@ -1,3 +1,4 @@
+import "../services"
 import qs.widgets
 import qs.services
 import qs.config
diff --git a/modules/launcher/AppItem.qml b/modules/launcher/items/AppItem.qml
similarity index 98%
rename from modules/launcher/AppItem.qml
rename to modules/launcher/items/AppItem.qml
index 2bb6b048..6c77166a 100644
--- a/modules/launcher/AppItem.qml
+++ b/modules/launcher/items/AppItem.qml
@@ -1,3 +1,4 @@
+import "../services"
 import qs.widgets
 import qs.services
 import qs.config
diff --git a/modules/launcher/CalcItem.qml b/modules/launcher/items/CalcItem.qml
similarity index 100%
rename from modules/launcher/CalcItem.qml
rename to modules/launcher/items/CalcItem.qml
diff --git a/modules/launcher/SchemeItem.qml b/modules/launcher/items/SchemeItem.qml
similarity index 98%
rename from modules/launcher/SchemeItem.qml
rename to modules/launcher/items/SchemeItem.qml
index 33ec6723..94c1818f 100644
--- a/modules/launcher/SchemeItem.qml
+++ b/modules/launcher/items/SchemeItem.qml
@@ -1,8 +1,7 @@
+import "../services"
 import qs.widgets
 import qs.services
 import qs.config
-import Quickshell
-import Quickshell.Widgets
 import QtQuick
 
 Item {
diff --git a/modules/launcher/VariantItem.qml b/modules/launcher/items/VariantItem.qml
similarity index 98%
rename from modules/launcher/VariantItem.qml
rename to modules/launcher/items/VariantItem.qml
index a44983f4..973564ab 100644
--- a/modules/launcher/VariantItem.qml
+++ b/modules/launcher/items/VariantItem.qml
@@ -1,3 +1,4 @@
+import "../services"
 import qs.widgets
 import qs.services
 import qs.config
diff --git a/modules/launcher/WallpaperItem.qml b/modules/launcher/items/WallpaperItem.qml
similarity index 100%
rename from modules/launcher/WallpaperItem.qml
rename to modules/launcher/items/WallpaperItem.qml
diff --git a/modules/launcher/Actions.qml b/modules/launcher/services/Actions.qml
similarity index 99%
rename from modules/launcher/Actions.qml
rename to modules/launcher/services/Actions.qml
index afe831b3..be1fc728 100644
--- a/modules/launcher/Actions.qml
+++ b/modules/launcher/services/Actions.qml
@@ -1,5 +1,6 @@
 pragma Singleton
 
+import ".."
 import qs.services
 import qs.config
 import qs.utils
@@ -9,8 +10,6 @@ import QtQuick
 Searcher {
     id: root
 
-    property string qalcResult
-
     readonly property list<Action> actions: [
         Action {
             name: qsTr("Calculator")
diff --git a/services/Apps.qml b/modules/launcher/services/Apps.qml
similarity index 100%
rename from services/Apps.qml
rename to modules/launcher/services/Apps.qml
diff --git a/modules/launcher/M3Variants.qml b/modules/launcher/services/M3Variants.qml
similarity index 100%
rename from modules/launcher/M3Variants.qml
rename to modules/launcher/services/M3Variants.qml
diff --git a/modules/launcher/Schemes.qml b/modules/launcher/services/Schemes.qml
similarity index 100%
rename from modules/launcher/Schemes.qml
rename to modules/launcher/services/Schemes.qml