zoriya/noctalia-shell
1
0
Fork 0
mirror of https://github.com/zoriya/noctalia-shell.git synced 2026-08-15 18:43:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'main' into system_monitor_high_pressure_highlight

Browse Source
This commit is contained in:
Lemmy
2025-11-14 14:03:56 -05:00
committed by GitHub
parent 26d30bdaa5 9890174aeb
commit b1dfcb58ba
32 changed files with 1422 additions and 213 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Commons/Settings.qml
+24 -19
View File
@@ -453,13 +453,6 @@ Singleton {
property bool code: false
property bool spicetify: false
property bool enableUserTemplates: false
property bool discord_vesktop: false // To be deleted soon
property bool discord_webcord: false // To be deleted soon
property bool discord_armcord: false // To be deleted soon
property bool discord_equibop: false // To be deleted soon
property bool discord_lightcord: false // To be deleted soon
property bool discord_dorion: false // To be deleted soon
}
// night light
@@ -669,22 +662,34 @@ Singleton {
// 5th. Migrate Discord templates (version 20 → 21)
// Consolidate individual discord_* properties into unified discord property
if (adapter.settingsVersion < 21) {
var anyDiscordEnabled = false
// Read raw JSON file to access properties not in adapter schema
try {
var rawJson = settingsFileView.text()
// Check if any Discord client was enabled
const discordClients = ["discord_vesktop", "discord_webcord", "discord_armcord", "discord_equibop", "discord_lightcord", "discord_dorion"]
if (rawJson) {
var parsed = JSON.parse(rawJson)
var anyDiscordEnabled = false
for (var i = 0; i < discordClients.length; i++) {
if (adapter.templates[discordClients[i]]) {
anyDiscordEnabled = true
break
// Check if any Discord client was enabled
const discordClients = ["discord_vesktop", "discord_webcord", "discord_armcord", "discord_equibop", "discord_lightcord", "discord_dorion", "discord_vencord"]
if (parsed.templates) {
for (var i = 0; i < discordClients.length; i++) {
if (parsed.templates[discordClients[i]]) {
anyDiscordEnabled = true
break
}
}
}
// Set unified discord property
adapter.templates.discord = anyDiscordEnabled
Logger.i("Settings", "Migrated Discord templates to unified 'discord' property (enabled:", anyDiscordEnabled + ")")
}
} catch (error) {
Logger.w("Settings", "Failed to read raw JSON for Discord migration:", error)
}
// Set unified discord property
adapter.templates.discord = anyDiscordEnabled
Logger.i("Settings", "Migrated Discord templates to unified 'discord' property (enabled:", anyDiscordEnabled + ")")
}
// -----------------