From 50ef79677e08c5ff0b9b621ebd5140b78a3515a9 Mon Sep 17 00:00:00 2001
From: ItsLemmy <studio@quadbyte.net>
Date: Mon, 22 Sep 2025 19:51:57 -0400
Subject: [PATCH] Updating bar widgets ids

---
 Commons/Settings.qml                          | 20 ++++++++++----
 ...{SidePanelToggle.qml => ControlCenter.qml} |  0
 .../{DarkModeToggle.qml => DarkMode.qml}      |  0
 ...corderIndicator.qml => ScreenRecorder.qml} |  0
 .../{PowerToggle.qml => SessionMenu.qml}      |  0
 Services/BarWidgetRegistry.qml                | 26 +++++++++----------
 6 files changed, 28 insertions(+), 18 deletions(-)
 rename Modules/Bar/Widgets/{SidePanelToggle.qml => ControlCenter.qml} (100%)
 rename Modules/Bar/Widgets/{DarkModeToggle.qml => DarkMode.qml} (100%)
 rename Modules/Bar/Widgets/{ScreenRecorderIndicator.qml => ScreenRecorder.qml} (100%)
 rename Modules/Bar/Widgets/{PowerToggle.qml => SessionMenu.qml} (100%)

diff --git a/Commons/Settings.qml b/Commons/Settings.qml
index f481aa92..65428b6a 100644
--- a/Commons/Settings.qml
+++ b/Commons/Settings.qml
@@ -379,15 +379,25 @@ Singleton {
     const sections = ["left", "center", "right"]
 
     // -----------------
-    // 1st. check our settings are not super old, when we only had the widget type as a plain string
+    // 1st. convert old widget id to new id
     for (var s = 0; s < sections.length; s++) {
       const sectionName = sections[s]
       for (var i = 0; i < adapter.bar.widgets[sectionName].length; i++) {
         var widget = adapter.bar.widgets[sectionName][i]
-        if (typeof widget === "string") {
-          adapter.bar.widgets[sectionName][i] = {
-            "id": widget
-          }
+
+        switch (widget.id) {
+          case "DarkModeToggle":
+            widget.id = "DarkMode"
+            break;
+          case "PowerToggle":
+            widget.id = "SessionMenu"
+            break;
+          case "ScreenRecorderIndicator":
+            widget.id = "ScreenRecorder"
+            break;
+          case "SidePanelToggle":
+            widget.id = "ControlCenter"
+            break;
         }
       }
     }
diff --git a/Modules/Bar/Widgets/SidePanelToggle.qml b/Modules/Bar/Widgets/ControlCenter.qml
similarity index 100%
rename from Modules/Bar/Widgets/SidePanelToggle.qml
rename to Modules/Bar/Widgets/ControlCenter.qml
diff --git a/Modules/Bar/Widgets/DarkModeToggle.qml b/Modules/Bar/Widgets/DarkMode.qml
similarity index 100%
rename from Modules/Bar/Widgets/DarkModeToggle.qml
rename to Modules/Bar/Widgets/DarkMode.qml
diff --git a/Modules/Bar/Widgets/ScreenRecorderIndicator.qml b/Modules/Bar/Widgets/ScreenRecorder.qml
similarity index 100%
rename from Modules/Bar/Widgets/ScreenRecorderIndicator.qml
rename to Modules/Bar/Widgets/ScreenRecorder.qml
diff --git a/Modules/Bar/Widgets/PowerToggle.qml b/Modules/Bar/Widgets/SessionMenu.qml
similarity index 100%
rename from Modules/Bar/Widgets/PowerToggle.qml
rename to Modules/Bar/Widgets/SessionMenu.qml
diff --git a/Services/BarWidgetRegistry.qml b/Services/BarWidgetRegistry.qml
index d4594468..ba34b8cc 100644
--- a/Services/BarWidgetRegistry.qml
+++ b/Services/BarWidgetRegistry.qml
@@ -16,7 +16,7 @@ Singleton {
                            "Brightness": brightnessComponent,
                            "Clock": clockComponent,
                            "CustomButton": customButtonComponent,
-                           "DarkModeToggle": darkModeToggle,
+                           "DarkMode": darkMode,
                            "KeepAwake": keepAwakeComponent,
                            "KeyboardLayout": keyboardLayoutComponent,
                            "MediaMini": mediaMiniComponent,
@@ -24,9 +24,9 @@ Singleton {
                            "NightLight": nightLightComponent,
                            "NotificationHistory": notificationHistoryComponent,
                            "PowerProfile": powerProfileComponent,
-                           "PowerToggle": powerToggleComponent,
-                           "ScreenRecorderIndicator": screenRecorderIndicatorComponent,
-                           "SidePanelToggle": sidePanelToggleComponent,
+                           "SessionMenu": sessionMenuComponent,
+                           "ScreenRecorder": screenRecorderComponent,
+                           "ControlCenter": controlCenterComponent,
                            "Spacer": spacerComponent,
                            "SystemMonitor": systemMonitorComponent,
                            "Taskbar": taskbarComponent,
@@ -100,7 +100,7 @@ Singleton {
                                     "showVisualizer": false,
                                     "visualizerType": "linear"
                                   },
-                                  "SidePanelToggle": {
+                                  "ControlCenter": {
                                     "allowUserSettings": true,
                                     "useDistroLogo": false,
                                     "icon": "noctalia",
@@ -135,8 +135,8 @@ Singleton {
   property Component customButtonComponent: Component {
     CustomButton {}
   }
-  property Component darkModeToggle: Component {
-    DarkModeToggle {}
+  property Component darkMode: Component {
+    DarkMode{}
   }
   property Component keyboardLayoutComponent: Component {
     KeyboardLayout {}
@@ -159,14 +159,14 @@ Singleton {
   property Component powerProfileComponent: Component {
     PowerProfile {}
   }
-  property Component powerToggleComponent: Component {
-    PowerToggle {}
+  property Component sessionMenuComponent: Component {
+    SessionMenu {}
   }
-  property Component screenRecorderIndicatorComponent: Component {
-    ScreenRecorderIndicator {}
+  property Component screenRecorderComponent: Component {
+    ScreenRecorder {}
   }
-  property Component sidePanelToggleComponent: Component {
-    SidePanelToggle {}
+  property Component controlCenterComponent: Component {
+    ControlCenter {}
   }
   property Component spacerComponent: Component {
     Spacer {}