From dcf4f0f7d2c1d14feeaaf8ea3ee30f2bee35214a Mon Sep 17 00:00:00 2001
From: ItsLemmy <studio@quadbyte.net>
Date: Tue, 14 Oct 2025 10:46:31 -0400
Subject: [PATCH] Project structure: moving stuff around

---
 Modules/ControlCenter/Cards/ShortcutsCard.qml              | 4 ++--
 .../{Extras => }/ControlCenterWidgetLoader.qml             | 0
 Modules/Settings/Tabs/BarTab.qml                           | 7 +++----
 Modules/Settings/Tabs/ControlCenterTab.qml                 | 5 ++---
 .../Extras/SectionEditor.qml => Widgets/NSectionEditor.qml | 6 +++---
 5 files changed, 10 insertions(+), 12 deletions(-)
 rename Modules/ControlCenter/{Extras => }/ControlCenterWidgetLoader.qml (100%)
 rename Modules/Settings/Extras/SectionEditor.qml => Widgets/NSectionEditor.qml (98%)

diff --git a/Modules/ControlCenter/Cards/ShortcutsCard.qml b/Modules/ControlCenter/Cards/ShortcutsCard.qml
index bf45b879..2100a76b 100644
--- a/Modules/ControlCenter/Cards/ShortcutsCard.qml
+++ b/Modules/ControlCenter/Cards/ShortcutsCard.qml
@@ -2,11 +2,11 @@ import QtQuick
 import QtQuick.Controls
 import QtQuick.Layouts
 import Quickshell
-import qs.Modules.ControlCenter.Cards
 import qs.Commons
 import qs.Services
 import qs.Widgets
-import qs.Modules.ControlCenter.Extras
+import qs.Modules.ControlCenter
+import qs.Modules.ControlCenter.Cards
 
 RowLayout {
   Layout.fillWidth: true
diff --git a/Modules/ControlCenter/Extras/ControlCenterWidgetLoader.qml b/Modules/ControlCenter/ControlCenterWidgetLoader.qml
similarity index 100%
rename from Modules/ControlCenter/Extras/ControlCenterWidgetLoader.qml
rename to Modules/ControlCenter/ControlCenterWidgetLoader.qml
diff --git a/Modules/Settings/Tabs/BarTab.qml b/Modules/Settings/Tabs/BarTab.qml
index b154f1a3..a321083d 100644
--- a/Modules/Settings/Tabs/BarTab.qml
+++ b/Modules/Settings/Tabs/BarTab.qml
@@ -5,7 +5,6 @@ import Quickshell
 import qs.Commons
 import qs.Services
 import qs.Widgets
-import qs.Modules.Settings.Extras
 
 ColumnLayout {
   id: root
@@ -204,7 +203,7 @@ ColumnLayout {
       spacing: Style.marginM
 
       // Left Section
-      SectionEditor {
+      NSectionEditor {
         sectionName: "Left"
         sectionId: "left"
         settingsDialogComponent: Qt.resolvedUrl(Quickshell.shellDir + "/Modules/Settings/Bar/BarWidgetSettingsDialog.qml")
@@ -221,7 +220,7 @@ ColumnLayout {
       }
 
       // Center Section
-      SectionEditor {
+      NSectionEditor {
         sectionName: "Center"
         sectionId: "center"
         settingsDialogComponent: Qt.resolvedUrl(Quickshell.shellDir + "/Modules/Settings/Bar/BarWidgetSettingsDialog.qml")
@@ -238,7 +237,7 @@ ColumnLayout {
       }
 
       // Right Section
-      SectionEditor {
+      NSectionEditor {
         sectionName: "Right"
         sectionId: "right"
         settingsDialogComponent: Qt.resolvedUrl(Quickshell.shellDir + "/Modules/Settings/Bar/BarWidgetSettingsDialog.qml")
diff --git a/Modules/Settings/Tabs/ControlCenterTab.qml b/Modules/Settings/Tabs/ControlCenterTab.qml
index f2212806..4bf62cfb 100644
--- a/Modules/Settings/Tabs/ControlCenterTab.qml
+++ b/Modules/Settings/Tabs/ControlCenterTab.qml
@@ -5,7 +5,6 @@ import Quickshell
 import qs.Commons
 import qs.Services
 import qs.Widgets
-import qs.Modules.Settings.Extras
 
 ColumnLayout {
   id: root
@@ -221,7 +220,7 @@ ColumnLayout {
       spacing: Style.marginM
 
       // Left
-      SectionEditor {
+      NSectionEditor {
         sectionName: I18n.tr("settings.control-center.shortcuts.sectionLeft")
         sectionId: "left"
         settingsDialogComponent: ""
@@ -240,7 +239,7 @@ ColumnLayout {
       }
 
       // Right
-      SectionEditor {
+      NSectionEditor {
         sectionName: I18n.tr("settings.control-center.shortcuts.sectionRight")
         sectionId: "right"
         settingsDialogComponent: ""
diff --git a/Modules/Settings/Extras/SectionEditor.qml b/Widgets/NSectionEditor.qml
similarity index 98%
rename from Modules/Settings/Extras/SectionEditor.qml
rename to Widgets/NSectionEditor.qml
index f6d2ef4a..b1dbefcd 100644
--- a/Modules/Settings/Extras/SectionEditor.qml
+++ b/Widgets/NSectionEditor.qml
@@ -285,19 +285,19 @@ NBox {
                         if (dialog) {
                           dialog.open()
                         } else {
-                          Logger.error("SectionEditor", "Failed to create settings dialog instance")
+                          Logger.error("NSectionEditor", "Failed to create settings dialog instance")
                         }
                       }
                       if (component.status === Component.Ready) {
                         instantiateAndOpen()
                       } else if (component.status === Component.Error) {
-                        Logger.error("SectionEditor", component.errorString())
+                        Logger.error("NSectionEditor", component.errorString())
                       } else {
                         component.statusChanged.connect(function () {
                           if (component.status === Component.Ready) {
                             instantiateAndOpen()
                           } else if (component.status === Component.Error) {
-                            Logger.error("SectionEditor", component.errorString())
+                            Logger.error("NSectionEditor", component.errorString())
                           }
                         })
                       }