overlay-select.xml, gui.nas: fix overlay-dialog close(); add relpath() func
aircraft.nas: remove redundant data.add()
This commit is contained in:
parent
94211721cf
commit
c5fe446f58
3 changed files with 9 additions and 11 deletions
|
@ -514,7 +514,6 @@ var livery = {
|
||||||
me.parents = [gui.OverlaySelector.new("Select Livery", dir, nameprop, sortprop,
|
me.parents = [gui.OverlaySelector.new("Select Livery", dir, nameprop, sortprop,
|
||||||
"sim/model/livery/file")];
|
"sim/model/livery/file")];
|
||||||
me.dialog = me.parents[0];
|
me.dialog = me.parents[0];
|
||||||
data.add(nameprop);
|
|
||||||
},
|
},
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
@ -311,21 +311,19 @@ var OverlaySelector = {
|
||||||
m.parents = [OverlaySelector, Dialog];
|
m.parents = [OverlaySelector, Dialog];
|
||||||
|
|
||||||
m.dir = string.normpath(getprop("/sim/fg-root") ~ '/' ~ dir) ~ '/';
|
m.dir = string.normpath(getprop("/sim/fg-root") ~ '/' ~ dir) ~ '/';
|
||||||
m.nameprop = nameprop;
|
var relpath = func(p) substr(p, p[0] == `/`);
|
||||||
m.sortprop = sortprop or nameprop;
|
m.nameprop = relpath(nameprop);
|
||||||
|
m.sortprop = relpath(sortprop or nameprop);
|
||||||
m.mpprop = mpprop;
|
m.mpprop = mpprop;
|
||||||
m.callback = callback;
|
m.callback = callback;
|
||||||
m.result = props.initNode(data.getNode("result", 1), "");
|
m.result = props.initNode(data.getNode("result", 1), "");
|
||||||
m.listener = setlistener(m.result, func(n) m.select(n.getValue()));
|
m.listener = setlistener(m.result, func(n) m.select(n.getValue()));
|
||||||
|
|
||||||
m.prop.getNode("group/text/label").setValue(title);
|
m.prop.getNode("group/text/label").setValue(title);
|
||||||
|
m.prop.getNode("group/button/binding/script").setValue('gui.Dialog.instance["' ~ name ~ '"].close()');
|
||||||
m.list = m.prop.getNode("list");
|
m.list = m.prop.getNode("list");
|
||||||
m.list.getNode("property").setValue(m.result.getPath());
|
m.list.getNode("property").setValue(m.result.getPath());
|
||||||
|
|
||||||
if (m.nameprop[0] == `/`)
|
|
||||||
m.nameprop = substr(m.nameprop, 1);
|
|
||||||
if (m.sortprop[0] == `/`)
|
|
||||||
m.sortprop = substr(m.sortprop, 1);
|
|
||||||
if (m.mpprop)
|
if (m.mpprop)
|
||||||
aircraft.data.add(m.nameprop);
|
aircraft.data.add(m.nameprop);
|
||||||
|
|
||||||
|
|
|
@ -11,7 +11,7 @@
|
||||||
<empty><stretch>1</stretch></empty>
|
<empty><stretch>1</stretch></empty>
|
||||||
|
|
||||||
<text>
|
<text>
|
||||||
<label>set by gui.OverlaySelector</label>
|
<label>$name</label>
|
||||||
</text>
|
</text>
|
||||||
|
|
||||||
<empty><stretch>1</stretch></empty>
|
<empty><stretch>1</stretch></empty>
|
||||||
|
@ -25,7 +25,8 @@
|
||||||
<border>2</border>
|
<border>2</border>
|
||||||
|
|
||||||
<binding>
|
<binding>
|
||||||
<command>dialog-close</command>
|
<command>nasal</command>
|
||||||
|
<script>$close</script>
|
||||||
</binding>
|
</binding>
|
||||||
</button>
|
</button>
|
||||||
</group>
|
</group>
|
||||||
|
@ -35,10 +36,10 @@
|
||||||
<list>
|
<list>
|
||||||
<halign>fill</halign>
|
<halign>fill</halign>
|
||||||
<pref-height>200</pref-height>
|
<pref-height>200</pref-height>
|
||||||
<property>set by gui.OverlaySelector</property>
|
<property>$result</property>
|
||||||
<binding>
|
<binding>
|
||||||
<command>dialog-apply</command>
|
<command>dialog-apply</command>
|
||||||
</binding>
|
</binding>
|
||||||
<value>set by gui.OverlaySelector</value>
|
<value>$value</value>
|
||||||
</list>
|
</list>
|
||||||
</PropertyList>
|
</PropertyList>
|
||||||
|
|
Loading…
Add table
Reference in a new issue