fly/fgdata
1
0
Fork 0
Code Activity

Support multiple directories in OverlaySelector

Browse source 
Previously only a single directory of logos etc. were
supported by OverlaySelector.  Now multiple directories
may be passed in.

Patch from MERSPIELER.
This commit is contained in:
Stuart Buchanan 2023-12-07 11:29:34 +00:00
parent b0dbba2944
commit ba10103ccd
1 changed files with 28 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

44
Nasal/gui.nas
View file

@ -301,7 +301,7 @@ var Dialog = {
# OverlaySelector.new(<title>, <dir>, <nameprop> [, <sortprop> [, <mpprop> [, <callback>]]]); # OverlaySelector.new(<title>, <dir>, <nameprop> [, <sortprop> [, <mpprop> [, <callback>]]]);
# #
# title ... dialog title # title ... dialog title
# dir ... directory where to find the XML overlay files, # dirs ... directory or vector of directories where to find the XML overlay files,
# relative to FG_ROOT # relative to FG_ROOT
# nameprop ... property in an overlay file that contains the name # nameprop ... property in an overlay file that contains the name
# The result is written to this place in the # The result is written to this place in the
@ -327,7 +327,10 @@ var Dialog = {
# #
# #
var OverlaySelector = { var OverlaySelector = {
new: func(title, dir, nameprop, sortprop = nil, mpprop = nil, callback = nil) { new: func(title, dirs, nameprop, sortprop = nil, mpprop = nil, callback = nil) {
if (!isvec(dirs)) {
dirs = [dirs];
}
var name = "overlay-select-"; var name = "overlay-select-";
var data = props.globals.getNode("/sim/gui/dialogs/", 1); var data = props.globals.getNode("/sim/gui/dialogs/", 1);
for (var i = 1; 1; i += 1) for (var i = 1; 1; i += 1)
@ -339,7 +342,10 @@ var OverlaySelector = {
m.parents = [OverlaySelector, Dialog]; m.parents = [OverlaySelector, Dialog];
# resolve the path in FG_ROOT, and --fg-aircraft dir, etc # resolve the path in FG_ROOT, and --fg-aircraft dir, etc
m.dir = resolvepath(dir) ~ "/"; m.dirs = [];
for (var i = 0; i < size(dirs); i += 1) {
append(m.dirs, os.path.new(resolvepath(dirs[i])));
}
var relpath = func(p) substr(p, p[0] == `/`); var relpath = func(p) substr(p, p[0] == `/`);
m.nameprop = relpath(nameprop); m.nameprop = relpath(nameprop);
@ -375,21 +381,27 @@ var OverlaySelector = {
}, },
rescan: func { rescan: func {
me.data = []; me.data = [];
var files = directory(me.dir); var files = [];
if (size(files)) { foreach (var dir; me.dirs) {
foreach (var file; files) { files = directory(dir.realpath);
if (substr(file, -4) != ".xml")
continue; if (size(files)) {
var n = io.read_properties(me.dir ~ file); foreach (var file; files) {
var name = n.getNode(me.nameprop, 1).getValue(); path = os.path.new(dir.realpath);
var index = n.getNode(me.sortprop, 1).getValue(); path.append(file);
if (name == nil or index == nil) if (path.lower_extension != "xml")
continue; continue;
append(me.data, [name, index, substr(file, 0, size(file) - 4), me.dir ~ file]); var n = io.read_properties(path.realpath);
var name = n.getNode(me.nameprop, 1).getValue();
var index = n.getNode(me.sortprop, 1).getValue();
if (name == nil or index == nil)
continue;
append(me.data, [name, index, substr(file, 0, size(file) - 4), path.realpath]);
}
} }
me.data = sort(me.data, func(a, b) num(a[1]) == nil or num(b[1]) == nil
? cmp(a[1], b[1]) : a[1] - b[1]);
} }
me.data = sort(me.data, func(a, b) num(a[1]) == nil or num(b[1]) == nil
? cmp(a[1], b[1]) : a[1] - b[1]);
me.list.removeChildren("value"); me.list.removeChildren("value");
forindex (var i; me.data) forindex (var i; me.data)