1
0
Fork 0

Further updates to the Multiplayer Settings dialog

- Now enabled even when no MP settings configured on command-line
- Add Server Status button to launch the MP Server status URL
- Minor layout cleanup.
This commit is contained in:
Stuart Buchanan 2012-01-04 21:53:25 +00:00
parent 31c20892ab
commit 34eb640a76
2 changed files with 23 additions and 6 deletions

View file

@ -134,7 +134,6 @@ _setlistener("/sim/signals/nasal-dir-initialized", func {
return 1;
}
menuEnable("autopilot", isAutopilotMenuEnabled() );
menuEnable("multiplayer", multiplayer.is_active());
menuEnable("joystick-info", size(props.globals.getNode("/input/joysticks").getChildren("js")));
# frame-per-second display

View file

@ -42,10 +42,8 @@
<pref-width>16</pref-width>
<pref-height>16</pref-height>
<legend></legend>
<default>1</default>
<keynum>27</keynum>
<border>2</border>
<binding>
<command>dialog-close</command>
</binding>
@ -66,6 +64,11 @@
<halign>left</halign>
<property>/sim/multiplay/callsign</property>
</input>
<text>
<row>0</row><col>2</col>
<halign>left</halign>
<label>(requires reconnect)</label>
</text>
<text>
<row>1</row><col>0</col>
<halign>right</halign>
@ -74,6 +77,7 @@
<combo>
<name>host</name>
<row>1</row><col>1</col>
<colspan>2</colspan>
<pref-width>350</pref-width>
<property>/sim/multiplay/selected-server</property>
<editable>false</editable>
@ -90,7 +94,6 @@
<value>mpserver12.flightgear.org (Amsterdam, Netherlands)</value>
<value>mpserver13.flightgear.org (Grenoble, France)</value>
</combo>
<!-- status area -->
<text>
<visible>
@ -99,7 +102,7 @@
<row>3</row>
<col>1</col>
<halign>left</halign>
<label>Not connected</label>
<label>Not connected</label>
</text>
<text>
@ -124,6 +127,7 @@
<button>
<legend>Connect</legend>
<equal>true</equal>
<enable>
<not>
<property>/sim/multiplay/online</property>
@ -140,6 +144,10 @@
# the hostname and the comment.
server = split(" ", server)[0];
setprop("/sim/multiplay/txhost", server);
# Standard port is 5000
setprop("/sim/multiplay/txport", 5000);
setprop("/sim/multiplay/rxport", 5000);
</script>
</binding>
<binding>
@ -149,6 +157,7 @@
</button>
<button>
<legend>Disconnect</legend>
<equal>true</equal>
<enable>
<property>/sim/multiplay/online</property>
</enable>
@ -158,7 +167,7 @@
<binding>
<command>nasal</command>
<script>
setprop("/sim/multiplay/txhost", "0.0.0.0");
setprop("/sim/multiplay/txhost", "");
</script>
</binding>
<binding>
@ -166,8 +175,17 @@
<subsystem>mp</subsystem>
</binding>
</button>
<button>
<row>1</row><col>2</col>
<legend>Server Status</legend>
<binding>
<command>open-browser</command>
<path>http://mpmap01.flightgear.org/mpstatus/</path>
</binding>
</button>
<button>
<legend>Close</legend>
<default>true</default>
<equal>true</equal>
<binding>
<command>dialog-close</command>