Project structure: moving stuff around

This commit is contained in:
ItsLemmy
2025-10-14 10:46:31 -04:00
parent 3cd75b1ed8
commit dcf4f0f7d2
5 changed files with 10 additions and 12 deletions
@@ -2,11 +2,11 @@ import QtQuick
import QtQuick.Controls import QtQuick.Controls
import QtQuick.Layouts import QtQuick.Layouts
import Quickshell import Quickshell
import qs.Modules.ControlCenter.Cards
import qs.Commons import qs.Commons
import qs.Services import qs.Services
import qs.Widgets import qs.Widgets
import qs.Modules.ControlCenter.Extras import qs.Modules.ControlCenter
import qs.Modules.ControlCenter.Cards
RowLayout { RowLayout {
Layout.fillWidth: true Layout.fillWidth: true
+3 -4
View File
@@ -5,7 +5,6 @@ import Quickshell
import qs.Commons import qs.Commons
import qs.Services import qs.Services
import qs.Widgets import qs.Widgets
import qs.Modules.Settings.Extras
ColumnLayout { ColumnLayout {
id: root id: root
@@ -204,7 +203,7 @@ ColumnLayout {
spacing: Style.marginM spacing: Style.marginM
// Left Section // Left Section
SectionEditor { NSectionEditor {
sectionName: "Left" sectionName: "Left"
sectionId: "left" sectionId: "left"
settingsDialogComponent: Qt.resolvedUrl(Quickshell.shellDir + "/Modules/Settings/Bar/BarWidgetSettingsDialog.qml") settingsDialogComponent: Qt.resolvedUrl(Quickshell.shellDir + "/Modules/Settings/Bar/BarWidgetSettingsDialog.qml")
@@ -221,7 +220,7 @@ ColumnLayout {
} }
// Center Section // Center Section
SectionEditor { NSectionEditor {
sectionName: "Center" sectionName: "Center"
sectionId: "center" sectionId: "center"
settingsDialogComponent: Qt.resolvedUrl(Quickshell.shellDir + "/Modules/Settings/Bar/BarWidgetSettingsDialog.qml") settingsDialogComponent: Qt.resolvedUrl(Quickshell.shellDir + "/Modules/Settings/Bar/BarWidgetSettingsDialog.qml")
@@ -238,7 +237,7 @@ ColumnLayout {
} }
// Right Section // Right Section
SectionEditor { NSectionEditor {
sectionName: "Right" sectionName: "Right"
sectionId: "right" sectionId: "right"
settingsDialogComponent: Qt.resolvedUrl(Quickshell.shellDir + "/Modules/Settings/Bar/BarWidgetSettingsDialog.qml") settingsDialogComponent: Qt.resolvedUrl(Quickshell.shellDir + "/Modules/Settings/Bar/BarWidgetSettingsDialog.qml")
+2 -3
View File
@@ -5,7 +5,6 @@ import Quickshell
import qs.Commons import qs.Commons
import qs.Services import qs.Services
import qs.Widgets import qs.Widgets
import qs.Modules.Settings.Extras
ColumnLayout { ColumnLayout {
id: root id: root
@@ -221,7 +220,7 @@ ColumnLayout {
spacing: Style.marginM spacing: Style.marginM
// Left // Left
SectionEditor { NSectionEditor {
sectionName: I18n.tr("settings.control-center.shortcuts.sectionLeft") sectionName: I18n.tr("settings.control-center.shortcuts.sectionLeft")
sectionId: "left" sectionId: "left"
settingsDialogComponent: "" settingsDialogComponent: ""
@@ -240,7 +239,7 @@ ColumnLayout {
} }
// Right // Right
SectionEditor { NSectionEditor {
sectionName: I18n.tr("settings.control-center.shortcuts.sectionRight") sectionName: I18n.tr("settings.control-center.shortcuts.sectionRight")
sectionId: "right" sectionId: "right"
settingsDialogComponent: "" settingsDialogComponent: ""
@@ -285,19 +285,19 @@ NBox {
if (dialog) { if (dialog) {
dialog.open() dialog.open()
} else { } else {
Logger.error("SectionEditor", "Failed to create settings dialog instance") Logger.error("NSectionEditor", "Failed to create settings dialog instance")
} }
} }
if (component.status === Component.Ready) { if (component.status === Component.Ready) {
instantiateAndOpen() instantiateAndOpen()
} else if (component.status === Component.Error) { } else if (component.status === Component.Error) {
Logger.error("SectionEditor", component.errorString()) Logger.error("NSectionEditor", component.errorString())
} else { } else {
component.statusChanged.connect(function () { component.statusChanged.connect(function () {
if (component.status === Component.Ready) { if (component.status === Component.Ready) {
instantiateAndOpen() instantiateAndOpen()
} else if (component.status === Component.Error) { } else if (component.status === Component.Error) {
Logger.error("SectionEditor", component.errorString()) Logger.error("NSectionEditor", component.errorString())
} }
}) })
} }