- use <hrule/> and <vrule/> without dummy children
- minor improvements/cosmetics
This commit is contained in:
parent
c018eb9ca4
commit
c1c86bb8a5
24 changed files with 48 additions and 43 deletions
|
@ -38,7 +38,7 @@
|
||||||
<label>Target Task Selection</label>
|
<label>Target Task Selection</label>
|
||||||
</text>
|
</text>
|
||||||
|
|
||||||
<hrule><dummy/></hrule>
|
<hrule/>
|
||||||
|
|
||||||
<group>
|
<group>
|
||||||
<layout>hbox</layout>
|
<layout>hbox</layout>
|
||||||
|
|
|
@ -8,7 +8,7 @@
|
||||||
<label>Select an Airport</label>
|
<label>Select an Airport</label>
|
||||||
</text>
|
</text>
|
||||||
|
|
||||||
<hrule><empty/></hrule>
|
<hrule/>
|
||||||
|
|
||||||
<nasal>
|
<nasal>
|
||||||
<open>
|
<open>
|
||||||
|
|
|
@ -11,7 +11,7 @@
|
||||||
<label>ATC/AI Options</label>
|
<label>ATC/AI Options</label>
|
||||||
</text>
|
</text>
|
||||||
|
|
||||||
<hrule><dummy/></hrule>
|
<hrule/>
|
||||||
|
|
||||||
<group>
|
<group>
|
||||||
<layout>hbox</layout>
|
<layout>hbox</layout>
|
||||||
|
@ -56,7 +56,7 @@
|
||||||
<empty><stretch>true</stretch></empty>
|
<empty><stretch>true</stretch></empty>
|
||||||
</group>
|
</group>
|
||||||
|
|
||||||
<hrule><dummy/></hrule>
|
<hrule/>
|
||||||
|
|
||||||
<text>
|
<text>
|
||||||
<halign>left</halign>
|
<halign>left</halign>
|
||||||
|
|
|
@ -8,7 +8,7 @@
|
||||||
<label>ATC Communication</label>
|
<label>ATC Communication</label>
|
||||||
</text>
|
</text>
|
||||||
|
|
||||||
<hrule><dummy/></hrule>
|
<hrule/>
|
||||||
|
|
||||||
<group>
|
<group>
|
||||||
<name>transmission-choice</name>
|
<name>transmission-choice</name>
|
||||||
|
|
|
@ -7,7 +7,7 @@
|
||||||
<label>TITLE ("ICAO Frequencies")</label>
|
<label>TITLE ("ICAO Frequencies")</label>
|
||||||
</text>
|
</text>
|
||||||
|
|
||||||
<hrule><dummy/></hrule>
|
<hrule/>
|
||||||
|
|
||||||
<group>
|
<group>
|
||||||
<name>frequency-list</name>
|
<name>frequency-list</name>
|
||||||
|
|
|
@ -7,7 +7,7 @@
|
||||||
<label>Display Airport Frequencies</label>
|
<label>Display Airport Frequencies</label>
|
||||||
</text>
|
</text>
|
||||||
|
|
||||||
<hrule><dummy/></hrule>
|
<hrule/>
|
||||||
|
|
||||||
<group>
|
<group>
|
||||||
<name>quick-buttons</name>
|
<name>quick-buttons</name>
|
||||||
|
|
|
@ -20,7 +20,7 @@
|
||||||
|
|
||||||
<text><label>Autopilot Settings</label></text>
|
<text><label>Autopilot Settings</label></text>
|
||||||
|
|
||||||
<hrule><dummy/></hrule>
|
<hrule/>
|
||||||
|
|
||||||
<nasal>
|
<nasal>
|
||||||
<open>
|
<open>
|
||||||
|
@ -227,7 +227,7 @@
|
||||||
</radio>
|
</radio>
|
||||||
</group>
|
</group>
|
||||||
|
|
||||||
<hrule><dummy/></hrule>
|
<hrule/>
|
||||||
|
|
||||||
<group>
|
<group>
|
||||||
<layout>hbox</layout>
|
<layout>hbox</layout>
|
||||||
|
@ -291,7 +291,7 @@
|
||||||
</group> <!-- End of Heading/Speed -->
|
</group> <!-- End of Heading/Speed -->
|
||||||
|
|
||||||
|
|
||||||
<vrule><dummy/></vrule>
|
<vrule/>
|
||||||
|
|
||||||
|
|
||||||
<group> <!-- Pitch/Altitude -->
|
<group> <!-- Pitch/Altitude -->
|
||||||
|
@ -451,7 +451,7 @@
|
||||||
</group> <!-- End of Pitch/Altitude VBox -->
|
</group> <!-- End of Pitch/Altitude VBox -->
|
||||||
</group>
|
</group>
|
||||||
|
|
||||||
<hrule><dummy/></hrule>
|
<hrule/>
|
||||||
|
|
||||||
<group> <!-- Passive Mode Toggle -->
|
<group> <!-- Passive Mode Toggle -->
|
||||||
<layout>hbox</layout>
|
<layout>hbox</layout>
|
||||||
|
@ -469,7 +469,7 @@
|
||||||
</checkbox>
|
</checkbox>
|
||||||
</group>
|
</group>
|
||||||
|
|
||||||
<hrule><dummy/></hrule>
|
<hrule/>
|
||||||
|
|
||||||
<button>
|
<button>
|
||||||
<legend>Close</legend>
|
<legend>Close</legend>
|
||||||
|
|
|
@ -9,7 +9,7 @@
|
||||||
<label>Multiplayer Chat</label>
|
<label>Multiplayer Chat</label>
|
||||||
</text>
|
</text>
|
||||||
|
|
||||||
<hrule><dummy/></hrule>
|
<hrule/>
|
||||||
|
|
||||||
<textbox>
|
<textbox>
|
||||||
<halign>fill</halign>
|
<halign>fill</halign>
|
||||||
|
|
|
@ -10,7 +10,7 @@
|
||||||
<label>HUD Configuration</label>
|
<label>HUD Configuration</label>
|
||||||
</text>
|
</text>
|
||||||
|
|
||||||
<hrule><dummy/></hrule>
|
<hrule/>
|
||||||
|
|
||||||
<checkbox>
|
<checkbox>
|
||||||
<label>Transparent</label>
|
<label>Transparent</label>
|
||||||
|
@ -64,7 +64,7 @@
|
||||||
</slider>
|
</slider>
|
||||||
</group>
|
</group>
|
||||||
|
|
||||||
<hrule><whatever/></hrule>
|
<hrule/>
|
||||||
|
|
||||||
<group>
|
<group>
|
||||||
<layout>hbox</layout>
|
<layout>hbox</layout>
|
||||||
|
|
|
@ -29,7 +29,7 @@
|
||||||
</button>
|
</button>
|
||||||
</group>
|
</group>
|
||||||
|
|
||||||
<hrule><empty/></hrule>
|
<hrule/>
|
||||||
|
|
||||||
<nasal>
|
<nasal>
|
||||||
<open>
|
<open>
|
||||||
|
|
|
@ -40,7 +40,7 @@
|
||||||
<label>Location (in air)</label>
|
<label>Location (in air)</label>
|
||||||
</text>
|
</text>
|
||||||
|
|
||||||
<hrule><dummy/></hrule>
|
<hrule/>
|
||||||
|
|
||||||
<text>
|
<text>
|
||||||
<label>Surface Point</label>
|
<label>Surface Point</label>
|
||||||
|
|
|
@ -7,7 +7,7 @@
|
||||||
<label>Select tower for the Tower View</label>
|
<label>Select tower for the Tower View</label>
|
||||||
</text>
|
</text>
|
||||||
|
|
||||||
<hrule><dummy/></hrule>
|
<hrule/>
|
||||||
|
|
||||||
<group>
|
<group>
|
||||||
<layout>table</layout>
|
<layout>table</layout>
|
||||||
|
|
|
@ -8,7 +8,7 @@
|
||||||
<label>Set New Location</label>
|
<label>Set New Location</label>
|
||||||
</text>
|
</text>
|
||||||
|
|
||||||
<hrule><empty/></hrule>
|
<hrule/>
|
||||||
|
|
||||||
<nasal>
|
<nasal>
|
||||||
<open>
|
<open>
|
||||||
|
|
|
@ -35,7 +35,7 @@
|
||||||
</button>
|
</button>
|
||||||
</group>
|
</group>
|
||||||
|
|
||||||
<hrule><whatever/></hrule>
|
<hrule/>
|
||||||
|
|
||||||
<nasal>
|
<nasal>
|
||||||
<open>
|
<open>
|
||||||
|
|
|
@ -10,7 +10,7 @@
|
||||||
<label>Nasal Console</label>
|
<label>Nasal Console</label>
|
||||||
</text>
|
</text>
|
||||||
|
|
||||||
<hrule><dummy/></hrule>
|
<hrule/>
|
||||||
|
|
||||||
<textbox>
|
<textbox>
|
||||||
<halign>fill</halign>
|
<halign>fill</halign>
|
||||||
|
|
|
@ -14,9 +14,16 @@
|
||||||
<pref-width>16</pref-width>
|
<pref-width>16</pref-width>
|
||||||
<pref-height>16</pref-height>
|
<pref-height>16</pref-height>
|
||||||
<border>2</border>
|
<border>2</border>
|
||||||
|
<!-- looks better in anthrax style
|
||||||
|
<color>
|
||||||
|
<red>0.34</red>
|
||||||
|
<green>0.33</green>
|
||||||
|
<blue>0.35</blue>
|
||||||
|
</color>
|
||||||
|
-->
|
||||||
<binding>
|
<binding>
|
||||||
<command>nasal</command>
|
<command>nasal</command>
|
||||||
<script>clone()</script>
|
<script>clone(dir)</script>
|
||||||
</binding>
|
</binding>
|
||||||
</button>
|
</button>
|
||||||
|
|
||||||
|
@ -42,7 +49,7 @@
|
||||||
</button>
|
</button>
|
||||||
</group>
|
</group>
|
||||||
|
|
||||||
<hrule><empty/></hrule>
|
<hrule/>
|
||||||
|
|
||||||
<property-list>
|
<property-list>
|
||||||
<name>property-list</name>
|
<name>property-list</name>
|
||||||
|
@ -114,7 +121,7 @@
|
||||||
}
|
}
|
||||||
|
|
||||||
squeeze = func(s, n) {
|
squeeze = func(s, n) {
|
||||||
if (size(s) <= n or n < 7) {
|
if (n >= size(s) or 7 > n ) {
|
||||||
return s;
|
return s;
|
||||||
}
|
}
|
||||||
var l = substr(s, 0, (n - 3) / 2);
|
var l = substr(s, 0, (n - 3) / 2);
|
||||||
|
@ -165,10 +172,10 @@
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
clone = func {
|
clone = func(startdir) {
|
||||||
var name = "property-browser--" ~ int(rand() * 10000000);
|
var name = "property-browser--" ~ int(rand() * 10000000);
|
||||||
var base = "/sim/gui/dialogs/" ~ name ~ "/";
|
var base = "/sim/gui/dialogs/" ~ name ~ "/";
|
||||||
setprop(base ~ "/last", dir);
|
setprop(base ~ "/last", startdir);
|
||||||
self.setValues({
|
self.setValues({
|
||||||
"name": name,
|
"name": name,
|
||||||
"dialog-name": name,
|
"dialog-name": name,
|
||||||
|
|
|
@ -9,7 +9,7 @@
|
||||||
<label>Rendering Options</label>
|
<label>Rendering Options</label>
|
||||||
</text>
|
</text>
|
||||||
|
|
||||||
<hrule><dummy/></hrule>
|
<hrule/>
|
||||||
|
|
||||||
<group>
|
<group>
|
||||||
<layout>vbox</layout>
|
<layout>vbox</layout>
|
||||||
|
@ -115,7 +115,7 @@
|
||||||
</checkbox>
|
</checkbox>
|
||||||
</group>
|
</group>
|
||||||
|
|
||||||
<hrule><dummy/></hrule>
|
<hrule/>
|
||||||
|
|
||||||
<group>
|
<group>
|
||||||
<padding>8</padding>
|
<padding>8</padding>
|
||||||
|
@ -200,7 +200,7 @@
|
||||||
</group>
|
</group>
|
||||||
</group>
|
</group>
|
||||||
|
|
||||||
<hrule><dummy/></hrule>
|
<hrule/>
|
||||||
|
|
||||||
<group>
|
<group>
|
||||||
<padding>8</padding>
|
<padding>8</padding>
|
||||||
|
|
|
@ -7,7 +7,7 @@
|
||||||
<text>
|
<text>
|
||||||
<label>Instant Replay</label>
|
<label>Instant Replay</label>
|
||||||
</text>
|
</text>
|
||||||
<hrule><dummy/></hrule>
|
<hrule/>
|
||||||
|
|
||||||
<group>
|
<group>
|
||||||
<layout>table</layout>
|
<layout>table</layout>
|
||||||
|
|
|
@ -20,7 +20,7 @@ command interface /autopilot/route-manager/input:
|
||||||
<label>Route Manager</label>
|
<label>Route Manager</label>
|
||||||
</text>
|
</text>
|
||||||
|
|
||||||
<hrule><empty/></hrule>
|
<hrule/>
|
||||||
|
|
||||||
<nasal>
|
<nasal>
|
||||||
<open>
|
<open>
|
||||||
|
@ -34,7 +34,7 @@ command interface /autopilot/route-manager/input:
|
||||||
|
|
||||||
var list = cmdarg().getNode("list");
|
var list = cmdarg().getNode("list");
|
||||||
var cmd = props.globals.getNode("/autopilot/route-manager/input", 1);
|
var cmd = props.globals.getNode("/autopilot/route-manager/input", 1);
|
||||||
var routemgr = props.globals.getNode("/autopilot/route-manager/route", 1);
|
var route = props.globals.getNode("/autopilot/route-manager/route", 1);
|
||||||
|
|
||||||
sel_index = func {
|
sel_index = func {
|
||||||
var s = selection.getValue();
|
var s = selection.getValue();
|
||||||
|
@ -58,7 +58,7 @@ command interface /autopilot/route-manager/input:
|
||||||
|
|
||||||
route_changed = func {
|
route_changed = func {
|
||||||
list.removeChildren("value");
|
list.removeChildren("value");
|
||||||
var wp = routemgr.getChildren("wp");
|
var wp = route.getChildren("wp");
|
||||||
forindex (var i; wp) {
|
forindex (var i; wp) {
|
||||||
var id = wp[i].getNode("id").getValue();
|
var id = wp[i].getNode("id").getValue();
|
||||||
var lon = wp[i].getNode("longitude-deg").getValue();
|
var lon = wp[i].getNode("longitude-deg").getValue();
|
||||||
|
|
|
@ -10,7 +10,7 @@
|
||||||
<label>Sound Configuration</label>
|
<label>Sound Configuration</label>
|
||||||
</text>
|
</text>
|
||||||
|
|
||||||
<hrule><dummy/></hrule>
|
<hrule/>
|
||||||
|
|
||||||
<group>
|
<group>
|
||||||
<layout>hbox</layout>
|
<layout>hbox</layout>
|
||||||
|
|
|
@ -8,7 +8,7 @@
|
||||||
<label>Static Scenery Level Of Detail</label>
|
<label>Static Scenery Level Of Detail</label>
|
||||||
</text>
|
</text>
|
||||||
|
|
||||||
<hrule><empty/></hrule>
|
<hrule/>
|
||||||
|
|
||||||
<group>
|
<group>
|
||||||
<layout>table</layout>
|
<layout>table</layout>
|
||||||
|
|
|
@ -10,7 +10,7 @@
|
||||||
<label>Set Time of Day</label>
|
<label>Set Time of Day</label>
|
||||||
</text>
|
</text>
|
||||||
|
|
||||||
<hrule><dummy/></hrule>
|
<hrule/>
|
||||||
|
|
||||||
<group>
|
<group>
|
||||||
<layout>hbox</layout>
|
<layout>hbox</layout>
|
||||||
|
@ -28,7 +28,7 @@
|
||||||
</text>
|
</text>
|
||||||
|
|
||||||
<empty><pref-height>6</pref-height></empty>
|
<empty><pref-height>6</pref-height></empty>
|
||||||
<hrule><dummy/></hrule>
|
<hrule/>
|
||||||
<empty><pref-height>6</pref-height></empty>
|
<empty><pref-height>6</pref-height></empty>
|
||||||
|
|
||||||
<text>
|
<text>
|
||||||
|
@ -41,7 +41,7 @@
|
||||||
</text>
|
</text>
|
||||||
|
|
||||||
<empty><pref-height>6</pref-height></empty>
|
<empty><pref-height>6</pref-height></empty>
|
||||||
<hrule><dummy/></hrule>
|
<hrule/>
|
||||||
<empty><pref-height>6</pref-height></empty>
|
<empty><pref-height>6</pref-height></empty>
|
||||||
|
|
||||||
<empty>
|
<empty>
|
||||||
|
|
|
@ -9,11 +9,10 @@
|
||||||
<label>Select Tutorial</label>
|
<label>Select Tutorial</label>
|
||||||
</text>
|
</text>
|
||||||
|
|
||||||
<hrule><empty/></hrule>
|
<hrule/>
|
||||||
|
|
||||||
<nasal>
|
<nasal>
|
||||||
<open>
|
<open>
|
||||||
tutorial.stopTutorial();
|
|
||||||
var list = cmdarg().getNode("group[1]/group/list");
|
var list = cmdarg().getNode("group[1]/group/list");
|
||||||
var node = props.globals.getNode("/sim/tutorials", 1);
|
var node = props.globals.getNode("/sim/tutorials", 1);
|
||||||
var tut = node.getChildren("tutorial");
|
var tut = node.getChildren("tutorial");
|
||||||
|
@ -30,7 +29,7 @@
|
||||||
list.getChild("value", i, 1).setValue(name);
|
list.getChild("value", i, 1).setValue(name);
|
||||||
}
|
}
|
||||||
|
|
||||||
select = func {
|
var select = func {
|
||||||
var name = current.getValue();
|
var name = current.getValue();
|
||||||
foreach (var t; tut) {
|
foreach (var t; tut) {
|
||||||
if (t.getNode("name").getValue() == name) {
|
if (t.getNode("name").getValue() == name) {
|
||||||
|
@ -43,7 +42,6 @@
|
||||||
"dialog-name": "tutorial"}));
|
"dialog-name": "tutorial"}));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
if (current.getType() == "NONE" or current.getValue() == "") {
|
if (current.getType() == "NONE" or current.getValue() == "") {
|
||||||
current.setValue(tut[0].getNode("name").getValue());
|
current.setValue(tut[0].getNode("name").getValue());
|
||||||
select();
|
select();
|
||||||
|
|
|
@ -9,7 +9,7 @@
|
||||||
<label>Weather Scenario</label>
|
<label>Weather Scenario</label>
|
||||||
</text>
|
</text>
|
||||||
|
|
||||||
<hrule><dummy/></hrule>
|
<hrule/>
|
||||||
|
|
||||||
<text>
|
<text>
|
||||||
<label></label>
|
<label></label>
|
||||||
|
|
Loading…
Reference in a new issue