mirror of
https://github.com/zoriya/noctalia-shell.git
synced 2026-08-15 18:43:59 +00:00
FolderListModel: improve robustness by reusing the same path
This commit is contained in:
@@ -14,8 +14,6 @@ Singleton {
|
||||
}
|
||||
|
||||
property var schemes: []
|
||||
property string baseDirectory: "file://" + Quickshell.shellDir + "/Assets/ColorSchemes"
|
||||
// //property string currentScheme: Settings.data.wallpaper.current
|
||||
property bool scanning: false
|
||||
|
||||
function loadColorSchemes() {
|
||||
@@ -24,7 +22,7 @@ Singleton {
|
||||
schemes = []
|
||||
// Unsetting, then setting the folder will re-trigger the parsing!
|
||||
folderModel.folder = ""
|
||||
folderModel.folder = baseDirectory
|
||||
folderModel.folder = "file://" + Quickshell.shellDir + "/Assets/ColorSchemes"
|
||||
}
|
||||
|
||||
FolderListModel {
|
||||
@@ -36,7 +34,7 @@ Singleton {
|
||||
if (status === FolderListModel.Ready) {
|
||||
var files = []
|
||||
for (var i = 0; i < count; i++) {
|
||||
var filepath = baseDirectory + "/" + get(i, "fileName")
|
||||
var filepath = folderModel.folder + "/" + get(i, "fileName")
|
||||
files.push(filepath)
|
||||
}
|
||||
schemes = files
|
||||
|
||||
@@ -120,8 +120,7 @@ Singleton {
|
||||
if (status === FolderListModel.Ready) {
|
||||
var files = []
|
||||
for (var i = 0; i < count; i++) {
|
||||
var filepath = (Settings.data.wallpaper.directory !== undefined ? Settings.data.wallpaper.directory : "") + "/" + get(
|
||||
i, "fileName")
|
||||
var filepath = folderModel.folder + "/" + get(i, "fileName")
|
||||
files.push(filepath)
|
||||
}
|
||||
wallpaperList = files
|
||||
|
||||
Reference in New Issue
Block a user