From 4631239b9294ef15c7dbf8c5d4626f6e4ce8ad47 Mon Sep 17 00:00:00 2001 From: quadbyte Date: Fri, 15 Aug 2025 21:55:32 -0400 Subject: [PATCH] Post refactoring fixes 1/?? --- Modules/Bar/Brightness.qml | 2 +- Modules/Bar/Volume.qml | 2 +- Modules/Bar/WiFiMenu.qml | 4 ++-- Modules/{Settings => SettingsPanel}/SettingsPanel.qml | 2 +- Modules/{Settings => SettingsPanel}/Tabs/AboutTab.qml | 0 Modules/{Settings => SettingsPanel}/Tabs/AudioTab.qml | 2 -- Modules/{Settings => SettingsPanel}/Tabs/BarTab.qml | 0 Modules/{Settings => SettingsPanel}/Tabs/ColorSchemeTab.qml | 0 Modules/{Settings => SettingsPanel}/Tabs/DisplayTab.qml | 0 Modules/{Settings => SettingsPanel}/Tabs/GeneralTab.qml | 0 Modules/{Settings => SettingsPanel}/Tabs/NetworkTab.qml | 0 .../{Settings => SettingsPanel}/Tabs/ScreenRecorderTab.qml | 0 Modules/{Settings => SettingsPanel}/Tabs/TimeWeatherTab.qml | 0 .../{Settings => SettingsPanel}/Tabs/WallpaperSelectorTab.qml | 0 Modules/{Settings => SettingsPanel}/Tabs/WallpaperTab.qml | 0 Modules/SidePanel/Cards/ProfileCard.qml | 2 +- Modules/SidePanel/Cards/UtilitiesCard.qml | 2 +- Services/PanelService.qml | 1 - shell.qml | 2 +- 19 files changed, 8 insertions(+), 11 deletions(-) rename Modules/{Settings => SettingsPanel}/SettingsPanel.qml (99%) rename Modules/{Settings => SettingsPanel}/Tabs/AboutTab.qml (100%) rename Modules/{Settings => SettingsPanel}/Tabs/AudioTab.qml (99%) rename Modules/{Settings => SettingsPanel}/Tabs/BarTab.qml (100%) rename Modules/{Settings => SettingsPanel}/Tabs/ColorSchemeTab.qml (100%) rename Modules/{Settings => SettingsPanel}/Tabs/DisplayTab.qml (100%) rename Modules/{Settings => SettingsPanel}/Tabs/GeneralTab.qml (100%) rename Modules/{Settings => SettingsPanel}/Tabs/NetworkTab.qml (100%) rename Modules/{Settings => SettingsPanel}/Tabs/ScreenRecorderTab.qml (100%) rename Modules/{Settings => SettingsPanel}/Tabs/TimeWeatherTab.qml (100%) rename Modules/{Settings => SettingsPanel}/Tabs/WallpaperSelectorTab.qml (100%) rename Modules/{Settings => SettingsPanel}/Tabs/WallpaperTab.qml (100%) diff --git a/Modules/Bar/Brightness.qml b/Modules/Bar/Brightness.qml index 8b12050..d336c14 100644 --- a/Modules/Bar/Brightness.qml +++ b/Modules/Bar/Brightness.qml @@ -1,7 +1,7 @@ import QtQuick import Quickshell -import qs.Modules.Settings import qs.Commons +import qs.Modules.SettingsPanel import qs.Services import qs.Widgets diff --git a/Modules/Bar/Volume.qml b/Modules/Bar/Volume.qml index 03a3889..4293e0c 100644 --- a/Modules/Bar/Volume.qml +++ b/Modules/Bar/Volume.qml @@ -1,8 +1,8 @@ import QtQuick import Quickshell import Quickshell.Services.Pipewire -import qs.Modules.Settings import qs.Commons +import qs.Modules.SettingsPanel import qs.Services import qs.Widgets diff --git a/Modules/Bar/WiFiMenu.qml b/Modules/Bar/WiFiMenu.qml index 44ad9bc..e052a11 100644 --- a/Modules/Bar/WiFiMenu.qml +++ b/Modules/Bar/WiFiMenu.qml @@ -188,11 +188,11 @@ NLoader { // Loading indicator ColumnLayout { anchors.centerIn: parent - visible: Settings.data.network.wifiEnabled && network.isLoading + visible: Settings.data.network.wifiEnabled && NetworkService.isLoading spacing: Style.marginMedium * scaling NBusyIndicator { - running: network.isLoading + running: NetworkService.isLoading color: Colors.mPrimary size: Style.baseWidgetSize * scaling Layout.alignment: Qt.AlignHCenter diff --git a/Modules/Settings/SettingsPanel.qml b/Modules/SettingsPanel/SettingsPanel.qml similarity index 99% rename from Modules/Settings/SettingsPanel.qml rename to Modules/SettingsPanel/SettingsPanel.qml index d423b3f..aa600cb 100644 --- a/Modules/Settings/SettingsPanel.qml +++ b/Modules/SettingsPanel/SettingsPanel.qml @@ -3,7 +3,7 @@ import QtQuick.Controls import QtQuick.Layouts import Quickshell import Quickshell.Wayland -import qs.Modules.Settings.Tabs as Tabs +import qs.Modules.SettingsPanel.Tabs as Tabs import qs.Commons import qs.Services import qs.Widgets diff --git a/Modules/Settings/Tabs/AboutTab.qml b/Modules/SettingsPanel/Tabs/AboutTab.qml similarity index 100% rename from Modules/Settings/Tabs/AboutTab.qml rename to Modules/SettingsPanel/Tabs/AboutTab.qml diff --git a/Modules/Settings/Tabs/AudioTab.qml b/Modules/SettingsPanel/Tabs/AudioTab.qml similarity index 99% rename from Modules/Settings/Tabs/AudioTab.qml rename to Modules/SettingsPanel/Tabs/AudioTab.qml index 8944043..3ac41ea 100644 --- a/Modules/Settings/Tabs/AudioTab.qml +++ b/Modules/SettingsPanel/Tabs/AudioTab.qml @@ -2,8 +2,6 @@ import QtQuick import QtQuick.Controls import QtQuick.Layouts import Quickshell.Services.Pipewire - -import qs.Modules.Settings import qs.Widgets import qs.Commons import qs.Services diff --git a/Modules/Settings/Tabs/BarTab.qml b/Modules/SettingsPanel/Tabs/BarTab.qml similarity index 100% rename from Modules/Settings/Tabs/BarTab.qml rename to Modules/SettingsPanel/Tabs/BarTab.qml diff --git a/Modules/Settings/Tabs/ColorSchemeTab.qml b/Modules/SettingsPanel/Tabs/ColorSchemeTab.qml similarity index 100% rename from Modules/Settings/Tabs/ColorSchemeTab.qml rename to Modules/SettingsPanel/Tabs/ColorSchemeTab.qml diff --git a/Modules/Settings/Tabs/DisplayTab.qml b/Modules/SettingsPanel/Tabs/DisplayTab.qml similarity index 100% rename from Modules/Settings/Tabs/DisplayTab.qml rename to Modules/SettingsPanel/Tabs/DisplayTab.qml diff --git a/Modules/Settings/Tabs/GeneralTab.qml b/Modules/SettingsPanel/Tabs/GeneralTab.qml similarity index 100% rename from Modules/Settings/Tabs/GeneralTab.qml rename to Modules/SettingsPanel/Tabs/GeneralTab.qml diff --git a/Modules/Settings/Tabs/NetworkTab.qml b/Modules/SettingsPanel/Tabs/NetworkTab.qml similarity index 100% rename from Modules/Settings/Tabs/NetworkTab.qml rename to Modules/SettingsPanel/Tabs/NetworkTab.qml diff --git a/Modules/Settings/Tabs/ScreenRecorderTab.qml b/Modules/SettingsPanel/Tabs/ScreenRecorderTab.qml similarity index 100% rename from Modules/Settings/Tabs/ScreenRecorderTab.qml rename to Modules/SettingsPanel/Tabs/ScreenRecorderTab.qml diff --git a/Modules/Settings/Tabs/TimeWeatherTab.qml b/Modules/SettingsPanel/Tabs/TimeWeatherTab.qml similarity index 100% rename from Modules/Settings/Tabs/TimeWeatherTab.qml rename to Modules/SettingsPanel/Tabs/TimeWeatherTab.qml diff --git a/Modules/Settings/Tabs/WallpaperSelectorTab.qml b/Modules/SettingsPanel/Tabs/WallpaperSelectorTab.qml similarity index 100% rename from Modules/Settings/Tabs/WallpaperSelectorTab.qml rename to Modules/SettingsPanel/Tabs/WallpaperSelectorTab.qml diff --git a/Modules/Settings/Tabs/WallpaperTab.qml b/Modules/SettingsPanel/Tabs/WallpaperTab.qml similarity index 100% rename from Modules/Settings/Tabs/WallpaperTab.qml rename to Modules/SettingsPanel/Tabs/WallpaperTab.qml diff --git a/Modules/SidePanel/Cards/ProfileCard.qml b/Modules/SidePanel/Cards/ProfileCard.qml index c5e8c5a..544f129 100644 --- a/Modules/SidePanel/Cards/ProfileCard.qml +++ b/Modules/SidePanel/Cards/ProfileCard.qml @@ -4,7 +4,7 @@ import QtQuick.Layouts import Quickshell import Quickshell.Io import Quickshell.Widgets -import qs.Modules.Settings +import qs.Modules.SettingsPanel import qs.Modules.SidePanel import qs.Commons import qs.Services diff --git a/Modules/SidePanel/Cards/UtilitiesCard.qml b/Modules/SidePanel/Cards/UtilitiesCard.qml index 11c8a96..f5fc449 100644 --- a/Modules/SidePanel/Cards/UtilitiesCard.qml +++ b/Modules/SidePanel/Cards/UtilitiesCard.qml @@ -2,8 +2,8 @@ import QtQuick import QtQuick.Controls import QtQuick.Layouts import Quickshell -import qs.Modules.Settings import qs.Commons +import qs.Modules.SettingsPanel import qs.Services import qs.Widgets diff --git a/Services/PanelService.qml b/Services/PanelService.qml index 1c50d60..2e56987 100644 --- a/Services/PanelService.qml +++ b/Services/PanelService.qml @@ -1,7 +1,6 @@ pragma Singleton import Quickshell -import qs.Modules.Settings Singleton { id: root diff --git a/shell.qml b/shell.qml index 262772f..9ab1894 100644 --- a/shell.qml +++ b/shell.qml @@ -13,7 +13,7 @@ import qs.Modules.Demo import qs.Modules.Dock import qs.Modules.LockScreen import qs.Modules.Notification -import qs.Modules.Settings +import qs.Modules.SettingsPanel import qs.Modules.SidePanel import qs.Services import qs.Widgets