Fix Matugen, NPanel overlay and probably SWWW
This commit is contained in:
parent
dd471581cd
commit
867444a29c
4 changed files with 22 additions and 7 deletions
|
|
@ -97,8 +97,14 @@ Singleton {
|
|||
id: customColorsFile
|
||||
path: Settings.configDir + "colors.json"
|
||||
watchChanges: true
|
||||
onFileChanged: reload()
|
||||
onAdapterUpdated: writeAdapter()
|
||||
onFileChanged: {
|
||||
console.log("[Colors] reloading colors file from disk")
|
||||
reload()
|
||||
}
|
||||
onAdapterUpdated: {
|
||||
console.log("[Colors] writing colors to disk, primary color:", mPrimary)
|
||||
writeAdapter()
|
||||
}
|
||||
onLoadFailed: function (error) {
|
||||
if (error.toString().includes("No such file") || error === 2) {
|
||||
// File doesn't exist, create it with default values
|
||||
|
|
|
|||
|
|
@ -48,7 +48,7 @@ Singleton {
|
|||
console.log("[Settings] Loaded")
|
||||
Qt.callLater(function () {
|
||||
if (adapter.wallpaper.current !== "") {
|
||||
console.log("[Settings] Set current wallpaper")
|
||||
console.log("[Settings] Set current wallpaper", adapter.wallpaper.current)
|
||||
Wallpapers.setCurrentWallpaper(adapter.wallpaper.current, true)
|
||||
}
|
||||
})
|
||||
|
|
|
|||
|
|
@ -19,6 +19,8 @@ Singleton {
|
|||
property var wallpaperList: []
|
||||
property string currentWallpaper: Settings.data.wallpaper.current
|
||||
property bool scanning: false
|
||||
|
||||
// SWWW
|
||||
property string transitionType: Settings.data.wallpaper.swww.transitionType
|
||||
property var randomChoices: ["simple", "fade", "left", "right", "top", "bottom", "wipe", "wave", "grow", "center", "any", "outer"]
|
||||
|
||||
|
|
@ -120,7 +122,8 @@ Singleton {
|
|||
if (status === FolderListModel.Ready) {
|
||||
var files = []
|
||||
for (var i = 0; i < count; i++) {
|
||||
var filepath = folderModel.folder + "/" + get(i, "fileName")
|
||||
var directory = (Settings.data.wallpaper.directory !== undefined ? Settings.data.wallpaper.directory : "")
|
||||
var filepath = directory + "/" + get(i, "fileName")
|
||||
files.push(filepath)
|
||||
}
|
||||
wallpaperList = files
|
||||
|
|
@ -157,8 +160,14 @@ Singleton {
|
|||
running: false
|
||||
stdout: StdioCollector {
|
||||
onStreamFinished: {
|
||||
|
||||
//console.log(this.text)
|
||||
console.log("[Wallpapers] generated colors from image")
|
||||
}
|
||||
}
|
||||
stderr: StdioCollector {
|
||||
onStreamFinished: {
|
||||
if (this.text !== "") {
|
||||
console.error(this.text)
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue