From fb650907a0b18fab4f996c2fdc110d2d091e4060 Mon Sep 17 00:00:00 2001 From: 2 * r + 2 * t <61896496+soramanew@users.noreply.github.com> Date: Tue, 5 Aug 2025 16:19:58 +1000 Subject: [PATCH] internal: rename dcontent -> controlcenter --- config/Config.qml | 4 ++-- config/{DContentConfig.qml => ControlCenterConfig.qml} | 0 modules/bar/popouts/Wrapper.qml | 6 ++---- .../DetachedContent.qml => controlcenter/ControlCenter.qml} | 4 ++-- modules/{detachedcontent => controlcenter}/NavRail.qml | 2 +- modules/{detachedcontent => controlcenter}/Panes.qml | 0 modules/{detachedcontent => controlcenter}/Session.qml | 0 .../{detachedcontent => controlcenter}/bluetooth/BtPane.qml | 0 .../bluetooth/Details.qml | 0 .../bluetooth/DeviceList.qml | 0 .../bluetooth/Settings.qml | 0 11 files changed, 7 insertions(+), 9 deletions(-) rename config/{DContentConfig.qml => ControlCenterConfig.qml} (100%) rename modules/{detachedcontent/DetachedContent.qml => controlcenter/ControlCenter.qml} (90%) rename modules/{detachedcontent => controlcenter}/NavRail.qml (98%) rename modules/{detachedcontent => controlcenter}/Panes.qml (100%) rename modules/{detachedcontent => controlcenter}/Session.qml (100%) rename modules/{detachedcontent => controlcenter}/bluetooth/BtPane.qml (100%) rename modules/{detachedcontent => controlcenter}/bluetooth/Details.qml (100%) rename modules/{detachedcontent => controlcenter}/bluetooth/DeviceList.qml (100%) rename modules/{detachedcontent => controlcenter}/bluetooth/Settings.qml (100%) diff --git a/config/Config.qml b/config/Config.qml index ea7f3f4d..a4a4a870 100644 --- a/config/Config.qml +++ b/config/Config.qml @@ -12,7 +12,7 @@ Singleton { property alias bar: adapter.bar property alias border: adapter.border property alias dashboard: adapter.dashboard - property alias dcontent: adapter.dcontent + property alias controlCenter: adapter.controlCenter property alias launcher: adapter.launcher property alias notifs: adapter.notifs property alias osd: adapter.osd @@ -36,7 +36,7 @@ Singleton { property BarConfig bar: BarConfig {} property BorderConfig border: BorderConfig {} property DashboardConfig dashboard: DashboardConfig {} - property DContentConfig dcontent: DContentConfig {} + property ControlCenterConfig controlCenter: ControlCenterConfig {} property LauncherConfig launcher: LauncherConfig {} property NotifsConfig notifs: NotifsConfig {} property OsdConfig osd: OsdConfig {} diff --git a/config/DContentConfig.qml b/config/ControlCenterConfig.qml similarity index 100% rename from config/DContentConfig.qml rename to config/ControlCenterConfig.qml diff --git a/modules/bar/popouts/Wrapper.qml b/modules/bar/popouts/Wrapper.qml index 4ef74920..bb80ad03 100644 --- a/modules/bar/popouts/Wrapper.qml +++ b/modules/bar/popouts/Wrapper.qml @@ -3,7 +3,7 @@ pragma ComponentBehavior: Bound import qs.services import qs.config import qs.modules.windowinfo -import qs.modules.detachedcontent +import qs.modules.controlcenter import Quickshell import Quickshell.Wayland import Quickshell.Hyprland @@ -94,13 +94,11 @@ Item { } Comp { - id: detachedContent - shouldBeActive: root.detachedMode === "any" asynchronous: true anchors.centerIn: parent - sourceComponent: DetachedContent { + sourceComponent: ControlCenter { screen: root.screen active: root.queuedMode } diff --git a/modules/detachedcontent/DetachedContent.qml b/modules/controlcenter/ControlCenter.qml similarity index 90% rename from modules/detachedcontent/DetachedContent.qml rename to modules/controlcenter/ControlCenter.qml index cf564cba..2e7ce075 100644 --- a/modules/detachedcontent/DetachedContent.qml +++ b/modules/controlcenter/ControlCenter.qml @@ -17,8 +17,8 @@ Item { id: session } - implicitWidth: implicitHeight * Config.dcontent.sizes.ratio - implicitHeight: screen.height * Config.dcontent.sizes.heightMult + implicitWidth: implicitHeight * Config.controlCenter.sizes.ratio + implicitHeight: screen.height * Config.controlCenter.sizes.heightMult RowLayout { anchors.fill: parent diff --git a/modules/detachedcontent/NavRail.qml b/modules/controlcenter/NavRail.qml similarity index 98% rename from modules/detachedcontent/NavRail.qml rename to modules/controlcenter/NavRail.qml index 826e8ca3..a6314656 100644 --- a/modules/detachedcontent/NavRail.qml +++ b/modules/controlcenter/NavRail.qml @@ -115,7 +115,7 @@ Item { PropertyChanges { expandedLabel.opacity: 1 smallLabel.opacity: 0 - background.implicitWidth: Config.dcontent.sizes.expandedNavWidth + background.implicitWidth: Config.controlCenter.sizes.expandedNavWidth background.implicitHeight: icon.implicitHeight + Appearance.padding.normal * 2 item.implicitHeight: background.implicitHeight } diff --git a/modules/detachedcontent/Panes.qml b/modules/controlcenter/Panes.qml similarity index 100% rename from modules/detachedcontent/Panes.qml rename to modules/controlcenter/Panes.qml diff --git a/modules/detachedcontent/Session.qml b/modules/controlcenter/Session.qml similarity index 100% rename from modules/detachedcontent/Session.qml rename to modules/controlcenter/Session.qml diff --git a/modules/detachedcontent/bluetooth/BtPane.qml b/modules/controlcenter/bluetooth/BtPane.qml similarity index 100% rename from modules/detachedcontent/bluetooth/BtPane.qml rename to modules/controlcenter/bluetooth/BtPane.qml diff --git a/modules/detachedcontent/bluetooth/Details.qml b/modules/controlcenter/bluetooth/Details.qml similarity index 100% rename from modules/detachedcontent/bluetooth/Details.qml rename to modules/controlcenter/bluetooth/Details.qml diff --git a/modules/detachedcontent/bluetooth/DeviceList.qml b/modules/controlcenter/bluetooth/DeviceList.qml similarity index 100% rename from modules/detachedcontent/bluetooth/DeviceList.qml rename to modules/controlcenter/bluetooth/DeviceList.qml diff --git a/modules/detachedcontent/bluetooth/Settings.qml b/modules/controlcenter/bluetooth/Settings.qml similarity index 100% rename from modules/detachedcontent/bluetooth/Settings.qml rename to modules/controlcenter/bluetooth/Settings.qml