Merge branch 'main' of https://github.com/noctalia-dev/noctalia-shell

Assets/settings-default.json

@@ -70,8 +70,7 @@
     "forceBlackScreenCorners": false,
     "radiusRatio": 1,
     "screenRadiusRatio": 1,
-    "animationSpeed": 1,
-    "showOSD": true
+    "animationSpeed": 1
   },
   "location": {
     "name": "Tokyo",
@@ -131,7 +130,8 @@
     "lastSeenTs": 0,
     "lowUrgencyDuration": 3,
     "normalUrgencyDuration": 8,
-    "criticalUrgencyDuration": 15
+    "criticalUrgencyDuration": 15,
+    "enableOSD": true
   },
   "audio": {
     "volumeStep": 5,

Commons/Settings.qml

@@ -54,7 +54,7 @@ Singleton {
     // Then it should be commented out again, regular users don't need to generate
     // default settings on every start
     // TODO: automate this someday!
-    //generateDefaultSettings()
+    // generateDefaultSettings()
 
     // Patch-in the local default, resolved to user's home
     adapter.general.avatarImage = defaultAvatar
@@ -177,7 +177,6 @@ Singleton {
       property real radiusRatio: 1.0
       property real screenRadiusRatio: 1.0
       property real animationSpeed: 1.0
-      property bool showOSD: true
     }
 
     // location
@@ -254,6 +253,7 @@ Singleton {
       property int lowUrgencyDuration: 3
       property int normalUrgencyDuration: 8
       property int criticalUrgencyDuration: 15
+      property bool enableOSD: true
     }
 
     // audio

Modules/OSD/OSD.qml

@@ -294,7 +294,7 @@ Loader {
 
   function showOSD() {
     // Check if OSD is enabled in settings
-    if (!Settings.data.general.showOSD) {
+    if (!Settings.data.notifications.enableOSD) {
       return
     }
 

Modules/Settings/Tabs/NotificationsTab.qml

@@ -42,8 +42,8 @@ ColumnLayout {
     NToggle {
       label: "Enable on screen display"
       description: "Show volume and brightness changes in real-time."
-      checked: Settings.data.general.showOSD
-      onToggled: checked => Settings.data.general.showOSD = checked
+      checked: Settings.data.notifications.enableOSD
+      onToggled: checked => Settings.data.notifications.enableOSD = checked
     }
 
     NComboBox {