mirror of
https://github.com/zoriya/noctalia-shell.git
synced 2026-08-15 18:43:59 +00:00
Settings: added default wallpaper, that can be usefull for nixOS.
This commit is contained in:
@@ -1,5 +1,5 @@
|
||||
{
|
||||
"settingsVersion": 12,
|
||||
"settingsVersion": 13,
|
||||
"bar": {
|
||||
"position": "top",
|
||||
"backgroundOpacity": 1,
|
||||
@@ -92,6 +92,7 @@
|
||||
"directory": "",
|
||||
"enableMultiMonitorDirectories": false,
|
||||
"setWallpaperOnAllMonitors": true,
|
||||
"defaultWallpaper": "",
|
||||
"fillMode": "crop",
|
||||
"fillColor": "#000000",
|
||||
"randomEnabled": false,
|
||||
@@ -162,9 +163,10 @@
|
||||
"useWallpaperColors": false,
|
||||
"predefinedScheme": "Noctalia (default)",
|
||||
"darkMode": true,
|
||||
"matugenSchemeType": "scheme-fruit-salad"
|
||||
"matugenSchemeType": "scheme-fruit-salad",
|
||||
"generateTemplatesForPredefined": true
|
||||
},
|
||||
"matugen": {
|
||||
"templates": {
|
||||
"gtk": false,
|
||||
"qt": false,
|
||||
"kitty": false,
|
||||
|
||||
@@ -27,8 +27,6 @@ Singleton {
|
||||
property string settingsFile: Quickshell.env("NOCTALIA_SETTINGS_FILE") || (configDir + "settings.json")
|
||||
|
||||
property string defaultLocation: "Tokyo"
|
||||
property string defaultWallpaper: Quickshell.shellDir + "/Assets/Wallpaper/noctalia.png"
|
||||
|
||||
property string defaultAvatar: Quickshell.env("HOME") + "/.face"
|
||||
property string defaultVideosDirectory: Quickshell.env("HOME") + "/Videos"
|
||||
property string defaultWallpapersDirectory: Quickshell.env("HOME") + "/Pictures/Wallpapers"
|
||||
@@ -60,6 +58,7 @@ Singleton {
|
||||
adapter.general.avatarImage = defaultAvatar
|
||||
adapter.screenRecorder.directory = defaultVideosDirectory
|
||||
adapter.wallpaper.directory = defaultWallpapersDirectory
|
||||
adapter.wallpaper.defaultWallpaper = Quickshell.shellDir + "/Assets/Wallpaper/noctalia.png"
|
||||
|
||||
// Set the adapter to the settingsFileView to trigger the real settings load
|
||||
settingsFileView.adapter = adapter
|
||||
@@ -129,7 +128,7 @@ Singleton {
|
||||
JsonAdapter {
|
||||
id: adapter
|
||||
|
||||
property int settingsVersion: 12
|
||||
property int settingsVersion: 13
|
||||
|
||||
// bar
|
||||
property JsonObject bar: JsonObject {
|
||||
@@ -220,6 +219,7 @@ Singleton {
|
||||
property string directory: ""
|
||||
property bool enableMultiMonitorDirectories: false
|
||||
property bool setWallpaperOnAllMonitors: true
|
||||
property string defaultWallpaper: ""
|
||||
property string fillMode: "crop"
|
||||
property color fillColor: "#000000"
|
||||
property bool randomEnabled: false
|
||||
|
||||
@@ -224,7 +224,7 @@ Singleton {
|
||||
// -------------------------------------------------------------------
|
||||
// Get specific monitor wallpaper - now from cache
|
||||
function getWallpaper(screenName) {
|
||||
return currentWallpapers[screenName] || Settings.defaultWallpaper
|
||||
return currentWallpapers[screenName] || Settings.data.wallpaper.defaultWallpaper
|
||||
}
|
||||
|
||||
// -------------------------------------------------------------------
|
||||
|
||||
Reference in New Issue
Block a user