fly/fgdata
1
0
Fork 0
Code Activity

Merge /u/ltoenning/fgdata/ branch swift_connection into next

Browse source 
https://sourceforge.net/p/flightgear/fgdata/merge-requests/136/
This commit is contained in:
James Turner 2019-05-22 13:35:53 +00:00
commit 217417373b
4 changed files with 143 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
Nasal/gui.nas
View file

@ -147,6 +147,7 @@ _setlistener("/sim/signals/nasal-dir-initialized", func {
menuEnable("rembrandt-buffers-choice", getprop("/sim/rendering/rembrandt/enabled"));
menuEnable("stereoscopic-options", !getprop("/sim/rendering/rembrandt/enabled"));
menuEnable("sound-config", getprop("/sim/sound/working"));
menuEnable("swift_connection", getprop("/sim/swift/available"));
# frame-per-second display
var fps = props.globals.getNode("/sim/rendering/fps-display", 1);

1
Translations/default/menu.xml
View file

@ -85,6 +85,7 @@
<mp-list>Pilot List</mp-list>
<mp-carrier>MPCarrier Selection</mp-carrier>
<lag-adjust>Lag Settings</lag-adjust>
<swift_connection>swift Connection</swift_connection>
<!-- Debug menu -->
<debug>Debug</debug>

133
gui/dialogs/swift_connection.xml Normal file
View file

@ -0,0 +1,133 @@
<?xml version="1.0"?>
<PropertyList>
<name>swift_connection</name>
<layout>vbox</layout>
<resizable>false</resizable>
<!-- titlebar -->
<group>
<layout>hbox</layout>
<empty>
<stretch>1</stretch>
</empty>
<text>
<label>Swift Connection Settings</label>
</text>
<empty>
<stretch>1</stretch>
</empty>
<button>
<pref-width>16</pref-width>
<pref-height>16</pref-height>
<legend></legend>
<keynum>27</keynum>
<border>2</border>
<binding>
<command>dialog-close</command>
</binding>
</button>
</group>
<hrule/>
<!-- main dialog area -->
<group>
<layout>hbox</layout>
<halign>center</halign>
<default-padding>10</default-padding>
<button>
<legend>Start server</legend>
<equal>true</equal>
<enable>
<not>
<property>/sim/swift/serverRunning</property>
</not>
</enable>
<binding>
<command>nasal</command>
<script>
fgcommand("swiftStart", props.Node.new({
"message": getprop("/controls/lighting/landing-lights")}));
</script>
</binding>
</button>
<button>
<legend>Stop server</legend>
<equal>true</equal>
<enable>
<property>/sim/swift/serverRunning</property>
</enable>
<binding>
<command>nasal</command>
<script>
fgcommand("swiftStop", props.Node.new({
"message": getprop("/controls/lighting/landing-lights")}));
</script>
</binding>
</button>
</group>
<group>
<layout>hbox</layout>
<row>4</row>
<col>1</col>
<text>
<width>2</width>
<halign>right</halign>
<label>Adress</label>
</text>
<input>
<pref-width>150</pref-width>
<halign>left</halign>
<property>/sim/swift/adress</property>
<enable>
<not>
<property>/sim/swift/serverRunning</property>
</not>
</enable>
</input>
<text>
<width>2</width>
<halign>right</halign>
<label>Port</label>
</text>
<input>
<pref-width>55</pref-width>
<halign>left</halign>
<property>/sim/swift/port</property>
<enable>
<not>
<property>/sim/swift/serverRunning</property>
</not>
</enable>
</input>
</group>
<group>
<layout>hbox</layout>
<halign>center</halign>
<default-padding>10</default-padding>
<button>
<legend>Apply setting changes</legend>
<equal>true</equal>
<enable>
<not>
<property>/sim/swift/serverRunning</property>
</not>
</enable>
<binding>
<command>dialog-apply</command>
</binding>
</button>
</group>
</PropertyList>

8
gui/menubar.xml
View file

@ -649,6 +649,14 @@
<dialog-name>lag-adjust</dialog-name>
</binding>
</item>
<item>
<name>swift_connection</name>
<binding>
<command>dialog-show</command>
<dialog-name>swift_connection</dialog-name>
</binding>
</item>
</menu>
<menu>