never/noctalia-shell
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

feat: settings is now json, refactor panels to be able to dismiss by clicking outside

Browse source
This commit is contained in:
ferreo 2025-07-18 15:43:22 +01:00
parent 8a3d610d22
commit a498671ef1
36 changed files with 1282 additions and 1300 deletions
Download patch file Download diff file Expand all files Collapse all files

31
Services/WallpaperManager.qml
View file

@ -15,18 +15,18 @@ Singleton {
toggleRandomWallpaper();
}
}
property string wallpaperDirectory: Settings.wallpaperFolder
property string wallpaperDirectory: Settings.settings.wallpaperFolder
property var wallpaperList: []
property string currentWallpaper: Settings.currentWallpaper
property string currentWallpaper: Settings.settings.currentWallpaper
property bool scanning: false
property string transitionType: Settings.transitionType
property string transitionType: Settings.settings.transitionType
property var randomChoices: ["fade", "left", "right", "top", "bottom", "wipe", "wave", "grow", "center", "any", "outer"]
function loadWallpapers() {
scanning = true;
wallpaperList = [];
folderModel.folder = "";
folderModel.folder = "file://" + (Settings.wallpaperFolder !== undefined ? Settings.wallpaperFolder : "");
folderModel.folder = "file://" + (Settings.settings.wallpaperFolder !== undefined ? Settings.settings.wallpaperFolder : "");
}
function changeWallpaper(path) {
@ -36,14 +36,13 @@ Singleton {
function setCurrentWallpaper(path, isInitial) {
currentWallpaper = path;
if (!isInitial) {
Settings.currentWallpaper = path;
Settings.saveSettings();
Settings.settings.currentWallpaper = path;
}
if (Settings.useSWWW) {
if (Settings.transitionType === "random") {
if (Settings.settings.useSWWW) {
if (Settings.settings.transitionType === "random") {
transitionType = randomChoices[Math.floor(Math.random() * randomChoices.length)];
} else {
transitionType = Settings.transitionType;
transitionType = Settings.settings.transitionType;
}
changeWallpaperProcess.running = true;
}
@ -60,16 +59,16 @@ Singleton {
}
function toggleRandomWallpaper() {
if (Settings.randomWallpaper && !randomWallpaperTimer.running) {
if (Settings.settings.randomWallpaper && !randomWallpaperTimer.running) {
randomWallpaperTimer.start();
setRandomWallpaper();
} else if (!Settings.randomWallpaper && randomWallpaperTimer.running) {
} else if (!Settings.settings.randomWallpaper && randomWallpaperTimer.running) {
randomWallpaperTimer.stop();
}
}
function restartRandomWallpaperTimer() {
if (Settings.randomWallpaper) {
if (Settings.settings.randomWallpaper) {
randomWallpaperTimer.stop();
randomWallpaperTimer.start();
setRandomWallpaper();
@ -77,14 +76,14 @@ Singleton {
}
function generateTheme() {
if (Settings.useWallpaperTheme) {
if (Settings.settings.useWallpaperTheme) {
generateThemeProcess.running = true;
}
}
Timer {
id: randomWallpaperTimer
interval: Settings.wallpaperInterval * 1000
interval: Settings.settings.wallpaperInterval * 1000
running: false
repeat: true
onTriggered: setRandomWallpaper()
@ -100,7 +99,7 @@ Singleton {
if (status === FolderListModel.Ready) {
var files = [];
for (var i = 0; i < count; i++) {
var fileph = (Settings.wallpaperFolder !== undefined ? Settings.wallpaperFolder : "") + "/" + get(i, "fileName");
var fileph = (Settings.settings.wallpaperFolder !== undefined ? Settings.settings.wallpaperFolder : "") + "/" + get(i, "fileName");
files.push(fileph);
}
wallpaperList = files;
@ -111,7 +110,7 @@ Singleton {
Process {
id: changeWallpaperProcess
command: ["swww", "img", "--resize", Settings.wallpaperResize, "--transition-fps", Settings.transitionFps.toString(), "--transition-type", transitionType, "--transition-duration", Settings.transitionDuration.toString(), currentWallpaper]
command: ["swww", "img", "--resize", Settings.settings.wallpaperResize, "--transition-fps", Settings.settings.transitionFps.toString(), "--transition-type", transitionType, "--transition-duration", Settings.settings.transitionDuration.toString(), currentWallpaper]
running: false
}