diff --git a/Assets/Translations/de.json b/Assets/Translations/de.json index 04c00e4a..d152316c 100644 --- a/Assets/Translations/de.json +++ b/Assets/Translations/de.json @@ -1761,4 +1761,4 @@ "note": "Nur ein paar Grundeinstellungen – alle Optionen befinden sich in den Einstellungen" } } -} \ No newline at end of file +} diff --git a/Assets/Translations/es.json b/Assets/Translations/es.json index 2c2205b5..6de64c7e 100644 --- a/Assets/Translations/es.json +++ b/Assets/Translations/es.json @@ -1761,4 +1761,4 @@ "note": "Solo algunos conceptos básicos para empezar: todas las opciones están en Configuración." } } -} \ No newline at end of file +} diff --git a/Assets/Translations/fr.json b/Assets/Translations/fr.json index dee39c6a..756e51c4 100644 --- a/Assets/Translations/fr.json +++ b/Assets/Translations/fr.json @@ -1761,4 +1761,4 @@ "note": "Quelques réglages de base pour démarrer — toutes les options sont dans Paramètres" } } -} \ No newline at end of file +} diff --git a/Assets/Translations/pt.json b/Assets/Translations/pt.json index 159a22d9..7be3bbe3 100644 --- a/Assets/Translations/pt.json +++ b/Assets/Translations/pt.json @@ -1761,4 +1761,4 @@ "note": "Apenas alguns ajustes básicos para começar - o restante está em Configurações" } } -} \ No newline at end of file +} diff --git a/Assets/Translations/zh-CN.json b/Assets/Translations/zh-CN.json index 6d9d27df..d99dd440 100644 --- a/Assets/Translations/zh-CN.json +++ b/Assets/Translations/zh-CN.json @@ -1761,4 +1761,4 @@ "note": "先进行一些基础设置——更多选项可在“设置”中找到" } } -} \ No newline at end of file +} diff --git a/Assets/settings-default.json b/Assets/settings-default.json index 0582a0d3..e4f3accf 100644 --- a/Assets/settings-default.json +++ b/Assets/settings-default.json @@ -24,8 +24,7 @@ ], "center": [ { - "id": "Workspace", - "characterCount": 2 + "id": "Workspace" } ], "right": [ @@ -76,7 +75,8 @@ "useFahrenheit": false, "use12hourFormat": false, "showWeekNumberInCalendar": false, - "showCalendarEvents": true + "showCalendarEvents": true, + "analogClockInCalendar": false }, "screenRecorder": { "directory": "", @@ -174,32 +174,32 @@ "displayMode": "always_visible", "backgroundOpacity": 1, "floatingRatio": 1, + "size": 1, "onlySameOutput": true, "monitors": [], "pinnedApps": [], - "colorizeIcons": false, - "size": 1 + "colorizeIcons": false }, "network": { "wifiEnabled": true }, - "notifications": { - "doNotDisturb": false, - "monitors": [], - "location": "top_right", - "overlayLayer": true, - "respectExpireTimeout": false, - "lowUrgencyDuration": 3, - "normalUrgencyDuration": 8, - "criticalUrgencyDuration": 15 - }, - "osd": { - "enabled": true, - "location": "top_right", - "monitors": [], - "autoHideMs": 2000, - "overlayLayer": true - }, + "notifications": { + "doNotDisturb": false, + "monitors": [], + "location": "top_right", + "overlayLayer": true, + "respectExpireTimeout": false, + "lowUrgencyDuration": 3, + "normalUrgencyDuration": 8, + "criticalUrgencyDuration": 15 + }, + "osd": { + "enabled": true, + "location": "top_right", + "monitors": [], + "autoHideMs": 2000, + "overlayLayer": true + }, "audio": { "volumeStep": 5, "volumeOverdrive": false, @@ -217,12 +217,16 @@ "panelsOverlayLayer": true }, "brightness": { - "brightnessStep": 5 + "brightnessStep": 5, + "enforceMinimum": true }, "colorSchemes": { "useWallpaperColors": false, "predefinedScheme": "Noctalia (default)", "darkMode": true, + "schedulingMode": "off", + "manualSunrise": "06:30", + "manualSunset": "18:30", "matugenSchemeType": "scheme-fruit-salad", "generateTemplatesForPredefined": true }, @@ -242,6 +246,7 @@ "discord_lightcord": false, "discord_dorion": false, "pywalfox": false, + "vicinae": false, "enableUserTemplates": false }, "nightLight": { @@ -261,4 +266,4 @@ "battery": { "chargingMode": 0 } -} +} \ No newline at end of file diff --git a/Modules/Settings/Tabs/DisplayTab.qml b/Modules/Settings/Tabs/DisplayTab.qml index 8d626d0f..f8bfb3ef 100644 --- a/Modules/Settings/Tabs/DisplayTab.qml +++ b/Modules/Settings/Tabs/DisplayTab.qml @@ -156,13 +156,13 @@ ColumnLayout { onValueChanged: Settings.data.brightness.brightnessStep = value } - NToggle { - Layout.fillWidth: true - label: I18n.tr("settings.display.monitors.enforce-minimum.label") - description: I18n.tr("settings.display.monitors.enforce-minimum.description") - checked: Settings.data.brightness.enforceMinimum - onToggled: checked => Settings.data.brightness.enforceMinimum = checked - } + NToggle { + Layout.fillWidth: true + label: I18n.tr("settings.display.monitors.enforce-minimum.label") + description: I18n.tr("settings.display.monitors.enforce-minimum.description") + checked: Settings.data.brightness.enforceMinimum + onToggled: checked => Settings.data.brightness.enforceMinimum = checked + } } NDivider { diff --git a/Services/BrightnessService.qml b/Services/BrightnessService.qml index cf510c07..fbaaf7b3 100644 --- a/Services/BrightnessService.qml +++ b/Services/BrightnessService.qml @@ -233,8 +233,8 @@ Singleton { } } - readonly property real stepSize: Settings.data.brightness.brightnessStep / 100.0 - readonly property real minBrightnessValue: (Settings.data.brightness.enforceMinimum ? 0.01 : 0.0) + readonly property real stepSize: Settings.data.brightness.brightnessStep / 100.0 + readonly property real minBrightnessValue: (Settings.data.brightness.enforceMinimum ? 0.01 : 0.0) // Timer for debouncing rapid changes readonly property Timer timer: Timer {