1
0
Fork 0

Small improvement to terrasync download dialogue.

Show number of errors separately, don't override status if there are a non-zero
number of errors - this was unhelpful if we've managed to resume after errors.
This commit is contained in:
Julian Smith 2020-06-28 01:02:17 +01:00
parent 986369f6ea
commit 0bbc7d9f1c

View file

@ -17,10 +17,6 @@ var computeStatusText = func {
if (!getprop('/sim/terrasync/active'))
return "Automatic download inactive";
var errCount = getprop('/sim/terrasync/error-count');
if (errCount > 0)
return "Errors occurred during download";
# we need to suggest some remedial action here!
if (getprop('/sim/terrasync/stalled'))
return "Downloading has stalled. Check your network connection and settings";
@ -303,17 +299,31 @@ setprop("/sim/gui/dialogs/terrasync/display-mode", "0");
</equals>
</visible>
<!-- status text is generated by Nasal dynamically -->
<text>
<row>0</row>
<col>0</col>
<halign>left</halign>
<label>Status:</label>
<live>true</live>
<color>
<red>0.7</red>
<green>0.7</green>
<blue>0.7</blue>
<alpha>1</alpha>
</color>
</text>
<text>
<row>0</row>
<col>1</col>
<colspan>2</colspan>
<halign>left</halign>
<pref-width>200</pref-width>
<format>Status: %s</format>
<!-- status text is generated by Nasal dynamically -->
<property>/sim/gui/dialogs/terrasync/status</property>
<live>true</live>
<halign>right</halign>
<color>
<red>0.7</red>
<green>0.7</green>
@ -405,6 +415,34 @@ setprop("/sim/gui/dialogs/terrasync/display-mode", "0");
<alpha>1</alpha>
</color>
</text>
<text>
<halign>left</halign>
<row>4</row>
<col>0</col>
<label>Number of errors:</label>
<color>
<red>0.7</red>
<green>0.7</green>
<blue>0.7</blue>
<alpha>1</alpha>
</color>
</text>
<text>
<row>4</row>
<col>1</col>
<format>%s</format>
<property>/sim/terrasync/error-count</property>
<live>true</live>
<stretch>true</stretch>
<halign>right</halign>
<color>
<red>0.7</red>
<green>0.7</green>
<blue>0.7</blue>
<alpha>1</alpha>
</color>
</text>
</group>
<loglist>