fly/fgdata
1
0
Fork 0
Code Activity

Error-reporting strings, MP enable UI

Browse source 
Add a checkbox to the MP dialog to control reporting of errors
relating to MP pilots
This commit is contained in:
James Turner 2021-03-07 13:15:52 +00:00
parent 40603267fb
commit 8ede81e4bd
3 changed files with 30 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Translations/default/sys.xml
View file

@ -47,6 +47,7 @@
<error-category-unknown>Errors occurred in an unknown part of FlightGear. Please report this bug to the FlightGear development team.</error-category-unknown>
<error-category-ai-traffic-schedule>The traffic schedule '%VALUE%' contains errors, and can't be loaded.</error-category-ai-traffic-schedule>
<error-category-out-of-memory>Allocating memory failed. Some resources will not be loaded. Adjust your settings to reduce view distance or number of objects loaded.</error-category-out-of-memory>
<error-category-multiplayer>Loading a model for another pilot (via multi-player) failed. The other pilot will appear as a default model. (You can disable these errors from the multiplayer settings dialog)</error-category-multiplayer>
<error-type-unknown>Unknown error</error-type-unknown>
<error-type-not-found>The file or resource was not found</error-type-not-found>
@ -60,6 +61,7 @@
<error-missing-shader>Shader / Effect problems</error-missing-shader>
<error-loading-texture>Texture failed to load</error-loading-texture>
<error-xml-model-load>Errors loading model XML</error-xml-model-load>
<error-3D-model-load>Error loading 3D model</error-3D-model-load>
<error-btg-load>Errors loading terrain (BTG)</error-btg-load>
<error-scenery-load>Errors loading scenery</error-scenery-load>
<error-dialog-load>Errors loading user-interface</error-dialog-load>

4
defaults.xml
View file

@ -949,6 +949,10 @@ Started September 2000 by David Megginson, david@megginson.com
<auto-attach type="bool" userarchive="y">true</auto-attach>
</mp-carriers>
<freeze-mouse-flight-controls-on-pause type="bool" userarchive="n">true</freeze-mouse-flight-controls-on-pause>
<error-report userarchive="y">
<enabled type="bool">false</enabled>
<mp-report-enabled type="bool">true</mp-report-enabled>
</error-report>
</sim>
<!-- accelerations -->
<accelerations>

33
gui/dialogs/multiplayer.xml
View file

@ -213,14 +213,29 @@
</binding>
</checkbox>
<text>
<checkbox>
<row>5</row>
<col>1</col>
<colspan>2</colspan>
<halign>left</halign>
<property>sim/error-report/mp-report-enabled</property>
<live>true</live>
<label>Report problems with other pilots' models</label>
<binding>
<command>property-toggle</command>
<property>sim/error-report/mp-report-enabled</property>
</binding>
</checkbox>
<text>
<row>6</row>
<col>0</col>
<halign>right</halign>
<label>Compatibility</label>
</text>
<combo>
<row>5</row>
<row>6</row>
<col>1</col>
<halign>left</halign>
<name>protocol-version</name>
@ -248,13 +263,13 @@
</combo>
<text>
<row>6</row>
<row>7</row>
<col>0</col>
<halign>right</halign>
<label> Callsign:</label>
</text>
<input>
<row>6</row>
<row>7</row>
<col>1</col>
<halign>left</halign>
<property>/sim/multiplay/callsign</property>
@ -266,7 +281,7 @@
</input>
<group>
<layout>hbox</layout>
<row>6</row>
<row>7</row>
<col>1</col>
<text>
<width>2</width>
@ -289,7 +304,7 @@
<combo>
<name>host</name>
<halign>left</halign>
<row>7</row>
<row>8</row>
<col>1</col>
<colspan>2</colspan>
<pref-width>350</pref-width>
@ -300,7 +315,7 @@
</combo>
<text>
<row>8</row>
<row>9</row>
<col>0</col>
<halign>right</halign>
<label>Server:</label>
@ -309,13 +324,13 @@
<visible>
<not><property>/sim/multiplay/online</property></not>
</visible>
<row>8</row>
<row>9</row>
<col>1</col>
<halign>left</halign>
<label>Not connected</label>
</text>
<text>
<row>8</row>
<row>9</row>
<col>1</col>
<visible>
<property>/sim/multiplay/online</property>