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:
parent
31c20892ab
commit
34eb640a76
2 changed files with 23 additions and 6 deletions
|
@ -134,7 +134,6 @@ _setlistener("/sim/signals/nasal-dir-initialized", func {
|
||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
menuEnable("autopilot", isAutopilotMenuEnabled() );
|
menuEnable("autopilot", isAutopilotMenuEnabled() );
|
||||||
menuEnable("multiplayer", multiplayer.is_active());
|
|
||||||
menuEnable("joystick-info", size(props.globals.getNode("/input/joysticks").getChildren("js")));
|
menuEnable("joystick-info", size(props.globals.getNode("/input/joysticks").getChildren("js")));
|
||||||
|
|
||||||
# frame-per-second display
|
# frame-per-second display
|
||||||
|
|
|
@ -42,10 +42,8 @@
|
||||||
<pref-width>16</pref-width>
|
<pref-width>16</pref-width>
|
||||||
<pref-height>16</pref-height>
|
<pref-height>16</pref-height>
|
||||||
<legend></legend>
|
<legend></legend>
|
||||||
<default>1</default>
|
|
||||||
<keynum>27</keynum>
|
<keynum>27</keynum>
|
||||||
<border>2</border>
|
<border>2</border>
|
||||||
|
|
||||||
<binding>
|
<binding>
|
||||||
<command>dialog-close</command>
|
<command>dialog-close</command>
|
||||||
</binding>
|
</binding>
|
||||||
|
@ -66,6 +64,11 @@
|
||||||
<halign>left</halign>
|
<halign>left</halign>
|
||||||
<property>/sim/multiplay/callsign</property>
|
<property>/sim/multiplay/callsign</property>
|
||||||
</input>
|
</input>
|
||||||
|
<text>
|
||||||
|
<row>0</row><col>2</col>
|
||||||
|
<halign>left</halign>
|
||||||
|
<label>(requires reconnect)</label>
|
||||||
|
</text>
|
||||||
<text>
|
<text>
|
||||||
<row>1</row><col>0</col>
|
<row>1</row><col>0</col>
|
||||||
<halign>right</halign>
|
<halign>right</halign>
|
||||||
|
@ -74,6 +77,7 @@
|
||||||
<combo>
|
<combo>
|
||||||
<name>host</name>
|
<name>host</name>
|
||||||
<row>1</row><col>1</col>
|
<row>1</row><col>1</col>
|
||||||
|
<colspan>2</colspan>
|
||||||
<pref-width>350</pref-width>
|
<pref-width>350</pref-width>
|
||||||
<property>/sim/multiplay/selected-server</property>
|
<property>/sim/multiplay/selected-server</property>
|
||||||
<editable>false</editable>
|
<editable>false</editable>
|
||||||
|
@ -90,7 +94,6 @@
|
||||||
<value>mpserver12.flightgear.org (Amsterdam, Netherlands)</value>
|
<value>mpserver12.flightgear.org (Amsterdam, Netherlands)</value>
|
||||||
<value>mpserver13.flightgear.org (Grenoble, France)</value>
|
<value>mpserver13.flightgear.org (Grenoble, France)</value>
|
||||||
</combo>
|
</combo>
|
||||||
|
|
||||||
<!-- status area -->
|
<!-- status area -->
|
||||||
<text>
|
<text>
|
||||||
<visible>
|
<visible>
|
||||||
|
@ -99,7 +102,7 @@
|
||||||
<row>3</row>
|
<row>3</row>
|
||||||
<col>1</col>
|
<col>1</col>
|
||||||
<halign>left</halign>
|
<halign>left</halign>
|
||||||
<label>Not connected</label>
|
<label>Not connected</label>
|
||||||
</text>
|
</text>
|
||||||
|
|
||||||
<text>
|
<text>
|
||||||
|
@ -124,6 +127,7 @@
|
||||||
|
|
||||||
<button>
|
<button>
|
||||||
<legend>Connect</legend>
|
<legend>Connect</legend>
|
||||||
|
<equal>true</equal>
|
||||||
<enable>
|
<enable>
|
||||||
<not>
|
<not>
|
||||||
<property>/sim/multiplay/online</property>
|
<property>/sim/multiplay/online</property>
|
||||||
|
@ -140,6 +144,10 @@
|
||||||
# the hostname and the comment.
|
# the hostname and the comment.
|
||||||
server = split(" ", server)[0];
|
server = split(" ", server)[0];
|
||||||
setprop("/sim/multiplay/txhost", server);
|
setprop("/sim/multiplay/txhost", server);
|
||||||
|
|
||||||
|
# Standard port is 5000
|
||||||
|
setprop("/sim/multiplay/txport", 5000);
|
||||||
|
setprop("/sim/multiplay/rxport", 5000);
|
||||||
</script>
|
</script>
|
||||||
</binding>
|
</binding>
|
||||||
<binding>
|
<binding>
|
||||||
|
@ -149,6 +157,7 @@
|
||||||
</button>
|
</button>
|
||||||
<button>
|
<button>
|
||||||
<legend>Disconnect</legend>
|
<legend>Disconnect</legend>
|
||||||
|
<equal>true</equal>
|
||||||
<enable>
|
<enable>
|
||||||
<property>/sim/multiplay/online</property>
|
<property>/sim/multiplay/online</property>
|
||||||
</enable>
|
</enable>
|
||||||
|
@ -158,7 +167,7 @@
|
||||||
<binding>
|
<binding>
|
||||||
<command>nasal</command>
|
<command>nasal</command>
|
||||||
<script>
|
<script>
|
||||||
setprop("/sim/multiplay/txhost", "0.0.0.0");
|
setprop("/sim/multiplay/txhost", "");
|
||||||
</script>
|
</script>
|
||||||
</binding>
|
</binding>
|
||||||
<binding>
|
<binding>
|
||||||
|
@ -166,8 +175,17 @@
|
||||||
<subsystem>mp</subsystem>
|
<subsystem>mp</subsystem>
|
||||||
</binding>
|
</binding>
|
||||||
</button>
|
</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>
|
<button>
|
||||||
<legend>Close</legend>
|
<legend>Close</legend>
|
||||||
|
<default>true</default>
|
||||||
<equal>true</equal>
|
<equal>true</equal>
|
||||||
<binding>
|
<binding>
|
||||||
<command>dialog-close</command>
|
<command>dialog-close</command>
|
||||||
|
|
Loading…
Add table
Reference in a new issue