Settings: Fix widget settings upgrade on startup, to never overwrite an existing setting with default value.
This commit is contained in:
parent
d05255c15b
commit
6c93b1b768
1 changed files with 13 additions and 13 deletions
|
|
@ -105,9 +105,9 @@ Singleton {
|
||||||
continue
|
continue
|
||||||
}
|
}
|
||||||
|
|
||||||
// if (upgradeWidget(widget)) {
|
if (upgradeWidget(widget)) {
|
||||||
// Logger.log("Settings", `Upgraded ${widget.id} widget:`, JSON.stringify(widget))
|
Logger.log("Settings", `Upgraded ${widget.id} widget:`, JSON.stringify(widget))
|
||||||
// }
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
@ -120,28 +120,28 @@ Singleton {
|
||||||
// Migrate old bar settings to proper per widget settings
|
// Migrate old bar settings to proper per widget settings
|
||||||
switch (widget.id) {
|
switch (widget.id) {
|
||||||
case "ActiveWindow":
|
case "ActiveWindow":
|
||||||
widget.showIcon = adapter.bar.showActiveWindowIcon
|
widget.showIcon = widget.showIcon !== undefined ? widget.showIcon : adapter.bar.showActiveWindowIcon
|
||||||
break
|
break
|
||||||
case "Battery":
|
case "Battery":
|
||||||
widget.alwaysShowPercentage = adapter.bar.alwaysShowBatteryPercentage
|
widget.alwaysShowPercentage = widget.alwaysShowPercentage!== undefined ? widget.alwaysShowPercentage : adapter.bar.alwaysShowBatteryPercentage
|
||||||
break
|
break
|
||||||
case "Clock":
|
case "Clock":
|
||||||
widget.showDate = adapter.location.showDateWithClock
|
widget.showDate = widget.showDate !== undefined ? widget.showDate : adapter.location.showDateWithClock
|
||||||
widget.use12HourClock = adapter.location.use12HourClock
|
widget.use12HourClock = widget.use12HourClock !== undefined ? widget.use12HourClock : adapter.location.use12HourClock
|
||||||
widget.reverseDayMonth = adapter.location.reverseDayMonth
|
widget.reverseDayMonth = widget.reverseDayMonth !== undefined ? widget.reverseDayMonth : adapter.location.reverseDayMonth
|
||||||
break
|
break
|
||||||
case "MediaMini":
|
case "MediaMini":
|
||||||
widget.showAlbumArt = adapter.audio.showMiniplayerAlbumArt
|
widget.showAlbumArt = widget.showAlbumArt !== undefined ? widget.showAlbumArt : adapter.audio.showMiniplayerAlbumArt
|
||||||
widget.showVisualizer = adapter.audio.showMiniplayerCava
|
widget.showVisualizer = widget.showVisualizer !== undefined ? widget.showVisualizer : adapter.audio.showMiniplayerCava
|
||||||
break
|
break
|
||||||
case "SidePanelToggle":
|
case "SidePanelToggle":
|
||||||
widget.useDistroLogo = adapter.bar.useDistroLogo
|
widget.useDistroLogo = widget.useDistroLogo !== undefined ? widget.useDistroLogo : adapter.bar.useDistroLogo
|
||||||
break
|
break
|
||||||
case "SystemMonitor":
|
case "SystemMonitor":
|
||||||
widget.showNetworkStats = adapter.bar.showNetworkStats
|
widget.showNetworkStats = widget.showNetworkStats !== undefined ? widget.showNetworkStats : adapter.bar.showNetworkStats
|
||||||
break
|
break
|
||||||
case "Workspace":
|
case "Workspace":
|
||||||
widget.labelMode = adapter.bar.showWorkspaceLabel
|
widget.labelMode = widget.labelMode !== undefined ? widget.labelMode : adapter.bar.showWorkspaceLabel
|
||||||
break
|
break
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue