Compare commits

..

2 Commits

Author SHA1 Message Date
714cf335eb Merge pull request #47 from MaSzyna-EU07/feat/terrain-directive
feat: check the terrain files a scenery's terrain directive names
2026-11-16 09:14:52 +00:00
maj00r
dee54a34bb feat: check the terrain files a scenery's terrain directive names
eu07 reads static terrain from files named by "terrain ... endterrain":
text (.txtf) or its binary version (.btf). The scenery check now tells a
terrain file of which neither is there (MissingTerrainFile).

Such a file also takes the place of the scenery's .sbt, so the terrain
includes after it are read after all and a missing one is told again. When
the .sbt was already used before the directive - a terrain include or
terrain geometry passed over, or FirstInit - the simulator passes the file
over instead, which is told too (TerrainFileBehindSbt). The parser takes
the lookup of files and whether there is an .sbt as one SceneryFileLookup.
2026-11-13 17:46:27 +01:00
88 changed files with 500 additions and 5018 deletions

View File

@@ -24,10 +24,6 @@ public sealed class DefaultBlackBoxStrings : IBlackBoxStrings
["LiveTip"] = "Reads what the simulator adds to the file every 2 seconds",
["Play"] = "Play",
["Pause"] = "Pause",
["PlaySpeed"] = "Playback speed",
["TimelineHelp"] = "The arrows go 10 seconds back or on, with Ctrl a minute, Page Up and Page Down ten minutes, Home and End to the start and the end.",
["TimetableHelp"] = "The up and down arrows go through the stations, Enter goes to the moment the train was there.",
["MapHelp"] = "The map of the run. What it shows is also in the events and the timetable, and on the run below it.",
["Follow"] = "Follow the train",
["Fit"] = "Whole map",
["NoFile"] = "Open a black box: physicslog/*.blackbox, written with the physics logs on.",
@@ -299,10 +295,6 @@ public sealed class DefaultBlackBoxStrings : IBlackBoxStrings
["LiveTip"] = "Co 2 sekundy doczytuje to, co symulator dopisał do pliku",
["Play"] = "Odtwarzaj",
["Pause"] = "Pauza",
["PlaySpeed"] = "Prędkość odtwarzania",
["TimelineHelp"] = "Strzałki przesuwają o 10 sekund, z Ctrl o minutę, Page Up i Page Down o dziesięć minut, Home i End na początek i koniec.",
["TimetableHelp"] = "Strzałki w górę i w dół przechodzą po stacjach, Enter przenosi do chwili, gdy pociąg tam był.",
["MapHelp"] = "Mapa przejazdu. To, co pokazuje, jest też w zdarzeniach, w rozkładzie i na przebiegu jazdy pod nią.",
["Follow"] = "Śledź pociąg",
["Fit"] = "Cała mapa",
["NoFile"] = "Otwórz czarną skrzynkę: physicslog/*.blackbox, zapisywaną razem z logami fizyki.",

View File

@@ -6,7 +6,6 @@ using System.IO;
using System.Linq;
using System.Threading.Tasks;
using Avalonia;
using Avalonia.Automation;
using Avalonia.Controls;
using Avalonia.Layout;
using Avalonia.Media;
@@ -107,13 +106,6 @@ public sealed class BlackBoxWindow : Window
_play.Click += (_, _) => Playing = !Playing;
_speed.ItemsSource = Speeds.Select(s => $"×{s.ToString(CultureInfo.InvariantCulture)}").ToArray();
_speed.SelectedIndex = 3;
// What a screen reader calls the parts that have no label of their own on the screen.
AutomationProperties.SetName(_speed, _strings["PlaySpeed"]);
AutomationProperties.SetName(_timeline, _strings["PanelTimeline"]);
AutomationProperties.SetName(_timetable, _strings["TabTimetable"]);
AutomationProperties.SetName(_cab, _strings["Cab"]);
AutomationProperties.SetName(_map, _strings["PanelMap"]);
AutomationProperties.SetHelpText(_map, _strings["MapHelp"]);
var titles = new StackPanel { VerticalAlignment = VerticalAlignment.Center, Children = { _title, _subtitle } };
var transport = new StackPanel { Orientation = Orientation.Horizontal, Spacing = 10, VerticalAlignment = VerticalAlignment.Center, Children = { _play, _clock, _speed, _delayText } };
@@ -463,7 +455,6 @@ public sealed class BlackBoxWindow : Window
_clock.Text = recording.ClockAt(_time).ToString(@"hh\:mm\:ss", CultureInfo.InvariantCulture);
_events.ShowTime(_time);
ShowReadout(null);
_timeline.Spoken = _readout.Text;
ShowDelay(recording);
TimeChanged?.Invoke(_time);
}

View File

@@ -3,9 +3,7 @@ using System.Collections.Generic;
using System.Globalization;
using System.Linq;
using Avalonia;
using Avalonia.Automation.Peers;
using Avalonia.Controls;
using Avalonia.Input;
using Avalonia.Media;
namespace Eu07.BlackBox.Views;
@@ -38,36 +36,6 @@ public sealed class CabPanel : Control
{
ClipToBounds = true;
Height = 696;
// Reached with Tab, where a screen reader reads what the panel shows.
Focusable = true;
}
// What the panel showed when last drawn, a line a figure, as a screen reader is told it.
private List<string>? _saying;
private string? _said;
/// <summary>What the panel shows, said in words: the figures and the lamps that are lit.</summary>
public string? Said => _said;
private void Say(string text)
{
if (!string.IsNullOrWhiteSpace(text))
_saying?.Add(text.Trim());
}
protected override AutomationPeer OnCreateAutomationPeer() =>
new SpokenPeer(this, AutomationControlType.Pane, () => null, () => _said);
protected override void OnGotFocus(FocusChangedEventArgs e)
{
base.OnGotFocus(e);
InvalidateVisual();
}
protected override void OnLostFocus(FocusChangedEventArgs e)
{
base.OnLostFocus(e);
InvalidateVisual();
}
public IBlackBoxStrings Strings { get; set; } = new DefaultBlackBoxStrings();
@@ -94,22 +62,6 @@ public sealed class CabPanel : Control
}
public override void Render(DrawingContext context)
{
_saying = new List<string>();
try
{
DrawPanel(context);
}
finally
{
_said = string.Join(". ", _saying);
_saying = null;
}
if (IsFocused)
context.DrawRectangle(null, Palette.FocusPen, new Rect(Bounds.Size).Deflate(1));
}
private void DrawPanel(DrawingContext context)
{
var size = Bounds.Size;
double width = size.Width - 2 * Pad, right = size.Width - Pad;
@@ -118,150 +70,95 @@ public sealed class CabPanel : Control
if (_recording is not { } recording || recording.CabAt(_time) is not { } s || _time - s.Time > 1.5)
{
context.DrawText(MapView.Text(Strings["CabNoData"], Palette.DimText, 12), new Point(Pad, 40));
Say(Strings["CabNoData"]);
return;
}
Measure(recording);
var culture = CultureInfo.CurrentCulture;
var extra = s.Extra;
DrawHeader(context, recording.Vehicle(s.Vehicle)?.Name ?? "", s, right);
DrawSpeed(context, s, width, right, culture);
DrawControls(context, s, width, right, culture);
double y = DrawBrakes(context, s, width, right, culture);
// The traction at the left, as fits what drives the vehicle; the lights of both ends of the train at the right.
double half = Pad + width / 2;
double driveTop = y + BrakeRow + 4;
double top = Section(context, Strings["CabSectionDrive"], Pad, driveTop, half - 10);
Section(context, Strings["CabLights"], half + 4, driveTop, right);
DrawDrive(context, s, top, half - 10 - Pad, culture);
DrawLights(context, s, new Rect(half, top, right - half, 0), culture);
top = DrawDevices(context, s, new Rect(Pad, top + 3 * DriveRow + 6, width, size.Height), culture);
DrawDoors(context, s, top, width, size.Height);
}
private const double BrakeRow = 17;
/// <summary>The vehicle at the left; who drives, from which cab, at the right.</summary>
private void DrawHeader(DrawingContext context, string name, CabSample s, double right)
{
string? end = s.CabEnd == 0 ? null : Strings[s.CabEnd > 0 ? "CabEndFront" : "CabEndRear"];
// The vehicle at the left; who drives, from which cab, at the right.
double chipX = right;
if (end is not null)
chipX -= ChipLeft(context, end, Palette.Text, chipX, 4) + 5;
var (driverText, driverBrush) = DriverChip(s);
if (s.CabEnd != 0)
chipX -= ChipLeft(context, Strings[s.CabEnd > 0 ? "CabEndFront" : "CabEndRear"], Palette.Text, chipX, 4) + 5;
var (driverText, driverBrush) = !s.InCab ? (Strings["CabOutside"], Palette.DimText)
: s.Driving == Driver.Ai ? (Strings["CabDriverAi"], Palette.Autopilot)
: (Strings["CabDriverUser"], Palette.UserTrain);
chipX -= ChipLeft(context, driverText, driverBrush, chipX, 4) + 10;
Say(name);
Say(driverText);
if (end is not null)
Say(end);
using (context.PushClip(new Rect(Pad, 0, Math.Max(0, chipX - Pad), 28)))
context.DrawText(MapView.Text(name, Palette.Text, 12, FontWeight.SemiBold), new Point(Pad, 6));
}
context.DrawText(MapView.Text(recording.Vehicle(s.Vehicle)?.Name ?? "", Palette.Text, 12, FontWeight.SemiBold), new Point(Pad, 6));
private (string Text, IBrush Brush) DriverChip(CabSample s)
{
if (!s.InCab)
return (Strings["CabOutside"], Palette.DimText);
return s.Driving == Driver.Ai ? (Strings["CabDriverAi"], Palette.Autopilot) : (Strings["CabDriverUser"], Palette.UserTrain);
}
/// <summary>The speed, large, what the AI would do under it, the accelerations at the right.</summary>
private void DrawSpeed(DrawingContext context, CabSample s, double width, double right, CultureInfo culture)
{
string kmh = s.AbsSpeedKmh.ToString("0", culture);
var speed = MapView.Text(kmh, SpeedBrush(DrivingSummary.Judge(s)), 36, FontWeight.SemiBold);
// The speed, large, what the AI would do under it, the accelerations at the right.
var judgement = DrivingSummary.Judge(s);
var speed = MapView.Text(s.AbsSpeedKmh.ToString("0", culture), judgement is SpeedJudgement.Over ? Palette.Bad
: judgement is SpeedJudgement.Slightly ? Palette.Warn : Palette.Text, 36, FontWeight.SemiBold);
context.DrawText(speed, new Point(Pad, 24));
Say($"{kmh} km/h");
context.DrawText(MapView.Text("km/h", Palette.DimText, 12), new Point(Pad + speed.Width + 4, 24 + speed.Height - 21));
double gaugeX = Pad + Math.Max(150, width * 0.42);
if (s.AiValid)
{
using (context.PushClip(new Rect(Pad, 76, gaugeX - Pad - 8, 40)))
{
string target = string.Format(culture, Strings["CabAiTarget"], s.Ai.TargetKmh);
context.DrawText(MapView.Text(target, Palette.Target, 12), new Point(Pad, 76));
Say(target);
context.DrawText(MapView.Text(string.Format(culture, Strings["CabAiTarget"], s.Ai.TargetKmh), Palette.Target, 12), new Point(Pad, 76));
if (s.Ai.HasNextLimit)
{
string limit = string.Format(culture, Strings["LimitAt"], s.Ai.NextLimitKmh, s.Ai.NextLimitDistance);
Say(limit);
context.DrawText(MapView.Text(limit, Palette.Limit, 11), new Point(Pad, 93));
}
context.DrawText(MapView.Text(string.Format(culture, Strings["LimitAt"], s.Ai.NextLimitKmh, s.Ai.NextLimitDistance), Palette.Limit, 11),
new Point(Pad, 93));
}
}
double gaugeWidth = right - gaugeX;
Balance(context, Strings["CabAcceleration"], s.Acceleration, 1.5, gaugeX, 34, gaugeWidth);
Balance(context, Strings["CabLateral"], s.LateralAcceleration, 1.5, gaugeX, 70, gaugeWidth);
}
private static IBrush SpeedBrush(SpeedJudgement judgement) => judgement switch
{
SpeedJudgement.Over => Palette.Bad,
SpeedJudgement.Slightly => Palette.Warn,
_ => Palette.Text
};
/// <summary>The controllers.</summary>
private void DrawControls(DrawingContext context, CabSample s, double width, double right, CultureInfo culture)
{
// The controllers.
double top = Section(context, Strings["CabSectionControls"], Pad, 118, right);
double column = width / 4;
Value(context, Strings["CabController"], s.MainController.ToString(culture), Pad, top);
Steps(context, s.MainController, _controllerTop, Pad, top + 34, column - 14);
if (s.Extra is { } handle && _integrated.Contains(s.Vehicle))
if (extra is { } handle && _integrated.Contains(s.Vehicle))
Value(context, Strings["CabIntegrated"], (handle.IntegratedController * 100).ToString("+0;−0;0", culture) + " %", Pad + column, top);
else
Value(context, Strings["CabShunt"], s.ScndController.ToString(culture), Pad + column, top);
string reverser = s.Reverser switch { > 0 => "CabForward", < 0 => "CabBackward", _ => "CabNeutral" };
Value(context, Strings["CabReverser"], Strings[reverser], Pad + 2 * column, top);
Value(context, Strings["CabReverser"], Strings[s.Reverser > 0 ? "CabForward" : s.Reverser < 0 ? "CabBackward" : "CabNeutral"], Pad + 2 * column, top);
Value(context, Strings["CabTrainBrake"], s.TrainBrake.ToString("0.0", culture), Pad + 3 * column, top);
}
/// <summary>The brakes, as gauges, the setting (G, P, R) at the right of the title.</summary>
/// <returns>Where the last gauge stands.</returns>
private double DrawBrakes(DrawingContext context, CabSample s, double width, double right, CultureInfo culture)
{
var extra = s.Extra;
// The brakes, as gauges, the setting (G, P, R) at the right of the title.
string? setting = extra is { } e && (e.BrakeDelay | e.BrakeMode) != 0
? string.Format(culture, Strings["CabBrakeSetting"], string.Join(" · ", new[] { BrakeSetting(e.BrakeDelay), BrakeMode(e.BrakeMode) }.Where(t => t.Length > 0)))
: null;
double y = Section(context, Strings["CabSectionBrakes"], Pad, 180, right, setting);
var gauges = new List<GaugeReading>
top = Section(context, Strings["CabSectionBrakes"], Pad, 180, right, setting);
const double gauge = 17;
Gauge(context, Strings["CabPipe"], s.BrakePipe, 6, 5, $"{s.BrakePipe:0.00} bar", Palette.Station, Pad, top, width);
double y = top + gauge;
if (extra is { } x1)
{
new(Strings["CabPipe"], s.BrakePipe, 6, 5, $"{s.BrakePipe:0.00} bar", Palette.Station)
};
// what the driver's brake valve shows: its equalizing reservoir, the FV4a's time reservoir
if (extra is { } valve)
gauges.Add(new(Strings["CabDriverValve"], valve.DriverValve, 6, null, $"{valve.DriverValve:0.00} bar", Palette.Target));
gauges.Add(new(Strings["CabCylinder"], s.BrakeCylinder, 6, null, $"{s.BrakeCylinder:0.0} bar", Palette.Brakes));
// the most braked vehicle of the train
if (extra is { } most)
gauges.Add(new(Strings["CabConsistCylinder"], most.ConsistBrakeCylinder, 6, null, $"{most.ConsistBrakeCylinder:0.0} bar", Palette.Brakes));
gauges.Add(new(Strings["CabReservoir"], s.MainReservoir, 10, null, $"{s.MainReservoir:0.0} bar", Palette.Controller));
if (extra is { } feed)
gauges.Add(FeedPipe(s, feed));
gauges.Add(new(Strings["CabLocalBrake"], s.LocalBrake, 1, null, $"{s.LocalBrake * 100:0} %", Palette.Brakes));
for (int i = 0; i < gauges.Count; i++)
{
if (i > 0)
y += BrakeRow;
Gauge(context, gauges[i], Pad, y, width);
// what the driver's brake valve shows: its equalizing reservoir, the FV4a's time reservoir
Gauge(context, Strings["CabDriverValve"], x1.DriverValve, 6, null, $"{x1.DriverValve:0.00} bar", Palette.Target, Pad, y, width);
y += gauge;
}
return y;
}
Gauge(context, Strings["CabCylinder"], s.BrakeCylinder, 6, null, $"{s.BrakeCylinder:0.0} bar", Palette.Brakes, Pad, y, width);
y += gauge;
if (extra is { } x3)
{
// the most braked vehicle of the train
Gauge(context, Strings["CabConsistCylinder"], x3.ConsistBrakeCylinder, 6, null, $"{x3.ConsistBrakeCylinder:0.0} bar", Palette.Brakes, Pad, y, width);
y += gauge;
}
Gauge(context, Strings["CabReservoir"], s.MainReservoir, 10, null, $"{s.MainReservoir:0.0} bar", Palette.Controller, Pad, y, width);
y += gauge;
if (extra is { } x2)
{
bool has = _feedPipe.Contains(s.Vehicle);
Gauge(context, Strings["CabFeedPipe"], has ? x2.FeedPipe : 0, 10, null, has ? $"{x2.FeedPipe:0.0} bar" : "—", Palette.Controller, Pad, y, width);
y += gauge;
}
Gauge(context, Strings["CabLocalBrake"], s.LocalBrake, 1, null, $"{s.LocalBrake * 100:0} %", Palette.Brakes, Pad, y, width);
private GaugeReading FeedPipe(CabSample s, CabExtra feed) => _feedPipe.Contains(s.Vehicle)
? new(Strings["CabFeedPipe"], feed.FeedPipe, 10, null, $"{feed.FeedPipe:0.0} bar", Palette.Controller)
: new(Strings["CabFeedPipe"], 0, 10, null, "—", Palette.Controller);
/// <summary>The lights of both ends: the signal shown, green as it is to be, red otherwise with the one it is to show.</summary>
/// <param name="area">Left edge, top and width of the column; its height is not used.</param>
private void DrawLights(DrawingContext context, CabSample s, Rect area, CultureInfo culture)
{
double half = area.X, right = area.Right, row = area.Y;
// The traction at the left, as fits what drives the vehicle; the lights of both ends of the train at the right.
double half = Pad + width / 2;
double driveTop = y + gauge + 4;
top = Section(context, Strings["CabSectionDrive"], Pad, driveTop, half - 10);
Section(context, Strings["CabLights"], half + 4, driveTop, right);
DrawDrive(context, s, top, half - 10 - Pad, culture);
double row = top;
foreach (var (key, lights, equipped, required, isRight) in new[]
{
("CabLightsHead", s.LightsHead, s.EquippedHead, HeadCodes.RequiredHead(s), HeadCodes.HeadRight(s)),
@@ -269,9 +166,14 @@ public sealed class CabPanel : Control
})
{
DrawFace(context, lights, new Point(half + 4 + 17, row + 15));
string text = LightsText(HeadCodes.Of(lights), HeadCodes.NoLamps(equipped), required, isRight, culture);
IBrush brush = isRight switch { null => Palette.DimText, true => Palette.Good, false => Palette.Bad };
Say($"{Strings[key]}: {text}");
// the end, and under it the signal it shows: green as it is to be (with the lamps the vehicle has),
// red otherwise with the one it is to show
var shown = HeadCodes.Of(lights);
var text = HeadCodes.NoLamps(equipped) ? Strings["CabLightsNone"]
: isRight == false && required is { } want
? string.Format(culture, Strings["CabLightsWant"], HeadCodes.Name(shown), HeadCodes.Name(want))
: isRight == true && required is { } met ? HeadCodes.Name(met) : HeadCodes.Name(shown);
var brush = isRight is null ? Palette.DimText : isRight.Value ? Palette.Good : Palette.Bad;
using (context.PushClip(new Rect(half + 44, row, right - half - 44, 28)))
{
context.DrawText(MapView.Text(Strings[key], Palette.DimText, 10), new Point(half + 46, row));
@@ -279,24 +181,9 @@ public sealed class CabPanel : Control
}
row += 27;
}
}
private string LightsText(HeadCode shown, bool noLamps, HeadCode? required, bool? isRight, CultureInfo culture)
{
if (noLamps)
return Strings["CabLightsNone"];
if (isRight == false && required is { } want)
return string.Format(culture, Strings["CabLightsWant"], HeadCodes.Name(shown), HeadCodes.Name(want));
return isRight == true && required is { } met ? HeadCodes.Name(met) : HeadCodes.Name(shown);
}
/// <summary>The devices, in three groups side by side: lit as their lamps are in the cab, the ones off faint.</summary>
/// <param name="area">Left edge, top, width and the height of the whole panel.</param>
/// <returns>Where the doors go, under them.</returns>
private double DrawDevices(DrawingContext context, CabSample s, Rect area, CultureInfo culture)
{
double width = area.Width, height = area.Height;
double top = Section(context, Strings["CabSectionDevices"], area.X, area.Y, area.X + width);
// The devices, in three groups side by side: lit as their lamps are in the cab, the ones off faint.
top = Section(context, Strings["CabSectionDevices"], Pad, top + 3 * DriveRow + 6, right);
var groups = Devices(s, culture);
var widths = new double[groups.Length];
for (int g = 0; g < groups.Length; g++)
@@ -307,42 +194,33 @@ public sealed class CabPanel : Control
}
// each group as wide as its longest name, what is left shared between them
double spare = (width - widths.Sum()) / groups.Length;
double x = area.X, bottom = top;
double x = Pad, bottom = top;
for (int g = 0; g < groups.Length; g++)
{
double groupWidth = Math.Max(20, widths[g] + spare);
using (context.PushClip(new Rect(x, top, groupWidth, height - top)))
bottom = Math.Max(bottom, DrawGroup(context, groups[g], x, top));
using (context.PushClip(new Rect(x, top, groupWidth, size.Height - top)))
{
context.DrawText(MapView.Text(Strings[groups[g].Title], Palette.DimText, 10, FontWeight.SemiBold), new Point(x, top));
double lampY = top + 16;
foreach (var (text, brush) in groups[g].Lamps)
{
Lamp(context, text, brush, x, lampY);
lampY += LampRow;
}
bottom = Math.Max(bottom, lampY);
}
x += groupWidth;
}
return Math.Max(bottom, top + 16 + 9 * LampRow) + 6;
}
/// <returns>Where the group ends.</returns>
private double DrawGroup(DrawingContext context, (string Title, (string Text, IBrush? Lit)[] Lamps) group, double x, double top)
{
context.DrawText(MapView.Text(Strings[group.Title], Palette.DimText, 10, FontWeight.SemiBold), new Point(x, top));
Say(Strings[group.Title]);
double lampY = top + 16;
foreach (var (text, brush) in group.Lamps)
{
Lamp(context, text, brush, x, lampY);
lampY += LampRow;
}
return lampY;
}
/// <summary>The doors, in two columns: open, permitted, the departure signal, the steps and the lock.</summary>
private void DrawDoors(DrawingContext context, CabSample s, double top, double width, double height)
{
// The doors under them, in two columns: open, permitted, the departure signal, the steps and the lock.
top = Math.Max(bottom, top + 16 + 9 * LampRow) + 6;
context.DrawText(MapView.Text(Strings["CabGroupDoors"], Palette.DimText, 10, FontWeight.SemiBold), new Point(Pad, top));
Say(Strings["CabGroupDoors"]);
var doors = Doors(s);
double doorColumn = width / DoorColumns;
for (int i = 0; i < doors.Length; i++)
{
double doorX = Pad + i % DoorColumns * doorColumn;
using (context.PushClip(new Rect(doorX, top, doorColumn, height - top)))
using (context.PushClip(new Rect(doorX, top, doorColumn, size.Height - top)))
Lamp(context, doors[i].Text, doors[i].Lit, doorX, top + 16 + i / DoorColumns * LampRow);
}
}
@@ -401,7 +279,6 @@ public sealed class CabPanel : Control
break;
default:
context.DrawText(MapView.Text(Strings["CabNoDrive"], Palette.DimText, 11), new Point(Pad, top + 2));
Say(Strings["CabNoDrive"]);
return;
}
double column = width / 2;
@@ -444,9 +321,8 @@ public sealed class CabPanel : Control
}
/// <summary>The title of a part of the panel, with a line from it to the right (and a note at its end); the top of the part returned.</summary>
private double Section(DrawingContext context, string title, double x, double y, double right, string? note = null)
private static double Section(DrawingContext context, string title, double x, double y, double right, string? note = null)
{
Say(note is null ? title : $"{title}, {note}");
var text = MapView.Text(title.ToUpper(CultureInfo.CurrentCulture), Palette.DimText, 9, FontWeight.SemiBold);
context.DrawText(text, new Point(x, y));
double end = right;
@@ -494,9 +370,8 @@ public sealed class CabPanel : Control
_measured = recording.Revision;
}
private void Value(DrawingContext context, string label, string value, double x, double y, IBrush? brush = null)
private static void Value(DrawingContext context, string label, string value, double x, double y, IBrush? brush = null)
{
Say($"{label}: {value}");
context.DrawText(MapView.Text(label, Palette.DimText, 10), new Point(x, y));
context.DrawText(MapView.Text(value, brush ?? Palette.Text, 14, FontWeight.SemiBold), new Point(x, y + 13));
}
@@ -512,10 +387,9 @@ public sealed class CabPanel : Control
}
/// <summary>A gauge: its name, a bar up to the value against the scale, a mark where it should stand, the value.</summary>
private void Gauge(DrawingContext context, GaugeReading reading, double x, double y, double width)
private static void Gauge(DrawingContext context, string label, float value, double scale, double? mark, string text,
IBrush brush, double x, double y, double width)
{
var (label, value, scale, mark, text, brush) = reading;
Say($"{label}: {text}");
const double labelWidth = 118, valueWidth = 64;
context.DrawText(MapView.Text(label, Palette.DimText, 11), new Point(x, y));
double barX = x + labelWidth, barWidth = width - labelWidth - valueWidth;
@@ -534,10 +408,9 @@ public sealed class CabPanel : Control
}
/// <summary>A value either way of nought: a bar from the middle, to the right above it.</summary>
private void Balance(DrawingContext context, string label, float value, double scale, double x, double y, double width)
private static void Balance(DrawingContext context, string label, float value, double scale, double x, double y, double width)
{
var culture = CultureInfo.CurrentCulture;
Say($"{label}: {value.ToString("+0.00;−0.00;0.00", culture)} m/s²");
context.DrawText(MapView.Text(label, Palette.DimText, 10), new Point(x, y));
var v = MapView.Text($"{value.ToString("+0.00;−0.00;0.00", culture)} m/s²", Palette.Text, 11, FontWeight.SemiBold);
context.DrawText(v, new Point(x + width - v.Width, y));
@@ -582,11 +455,8 @@ public sealed class CabPanel : Control
}
/// <summary>A device's lamp and its name: lit in its colour, the name bright; off, both faint.</summary>
private void Lamp(DrawingContext context, string text, IBrush? lit, double x, double y)
private static void Lamp(DrawingContext context, string text, IBrush? lit, double x, double y)
{
// Only the lamps that are lit are told: the dark ones are the panel, not the moment.
if (lit is not null)
Say(text);
var center = new Point(x + 4, y + 7);
if (lit is not null)
context.DrawEllipse(Palette.Faded(lit, 0.3), null, center, 6, 6);
@@ -694,7 +564,4 @@ public sealed class CabPanel : Control
doors.Add(On("DevDepartureSignal", CabDevices.DepartureSignal, Palette.LampWarning));
return doors.ToArray();
}
/// <summary>What one gauge shows: its name, the value against the scale, the mark, the value written out.</summary>
private readonly record struct GaugeReading(string Label, float Value, double Scale, double? Mark, string Text, IBrush Brush);
}

View File

@@ -14,10 +14,6 @@
<PackageReference Include="Avalonia" Version="12.1.4" />
</ItemGroup>
<ItemGroup>
<InternalsVisibleTo Include="StarterNG.Tests" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\Eu07.BlackBox\Eu07.BlackBox.csproj" />
</ItemGroup>

View File

@@ -26,8 +26,6 @@ public static class Palette
public static readonly IBrush AccentFill = Brush("#177F00");
public static readonly IBrush AccentFillHover = Brush("#1E9000");
public static readonly IBrush AccentText = Brush("#FFFFFF");
/// <summary>The ring round a drawn control that has the keyboard, in the green of the starter's own.</summary>
public static readonly IPen FocusPen = new Pen(Accent, 2);
public static readonly IBrush Good = Brush("#4cc46e");
/// <summary>A delay: green on time, yellow a little late, red late, blue early.</summary>

View File

@@ -1,47 +0,0 @@
using System;
using Avalonia.Automation;
using Avalonia.Automation.Peers;
using Avalonia.Automation.Provider;
using Avalonia.Controls;
namespace Eu07.BlackBox.Views;
/// <summary>
/// What a screen reader is told of a control that draws itself: a name, the moment or
/// the row it stands at as its value - read again whenever it changes under the focus,
/// as a slider's is - and a description of what it shows or how to work it.
/// </summary>
internal sealed class SpokenPeer : ControlAutomationPeer, IValueProvider
{
private readonly AutomationControlType _type;
private readonly Func<string?> _value;
private readonly Func<string?> _help;
public SpokenPeer(Control owner, AutomationControlType type, Func<string?> value, Func<string?> help) : base(owner)
{
_type = type;
_value = value;
_help = help;
}
/// <summary>Tells the reader the value changed, so it reads the new one.</summary>
public void Told(string? before, string? now)
{
if (before != now)
RaisePropertyChangedEvent(ValuePatternIdentifiers.ValueProperty, before, now);
}
protected override AutomationControlType GetAutomationControlTypeCore() => _type;
protected override string? GetHelpTextCore() => base.GetHelpTextCore() is { Length: > 0 } own ? own : _help();
protected override bool IsContentElementCore() => true;
protected override bool IsControlElementCore() => true;
string? IValueProvider.Value => _value();
bool IValueProvider.IsReadOnly => true;
void IValueProvider.SetValue(string? value) => throw new InvalidOperationException("The value is read only.");
}

View File

@@ -2,7 +2,6 @@ using System;
using System.Collections.Generic;
using System.Globalization;
using Avalonia;
using Avalonia.Automation.Peers;
using Avalonia.Controls;
using Avalonia.Input;
using Avalonia.Media;
@@ -52,67 +51,6 @@ public sealed class TimelineView : Control
{
ClipToBounds = true;
MinHeight = 160;
// Walked from the keyboard too: the arrows step through the time.
Focusable = true;
}
private string? _spoken;
/// <summary>
/// What the moment played is said as - the clock, the speed, what the AI held - the
/// value a screen reader reads, again whenever it changes.
/// </summary>
public string? Spoken
{
get => _spoken;
set
{
string? before = _spoken;
_spoken = value;
(ControlAutomationPeer.FromElement(this) as SpokenPeer)?.Told(before, value);
}
}
protected override AutomationPeer OnCreateAutomationPeer() =>
new SpokenPeer(this, AutomationControlType.Slider, () => _spoken, () => Strings["TimelineHelp"]);
/// <summary>How far one press of an arrow goes, in seconds: Ctrl a minute, Page Up and Down ten.</summary>
public const double Step = 10, CtrlStep = 60, PageStep = 600;
protected override void OnKeyDown(KeyEventArgs e)
{
base.OnKeyDown(e);
if (_recording is not { } recording || recording.Duration <= 0)
return;
bool ctrl = e.KeyModifiers.HasFlag(KeyModifiers.Control);
double? to = e.Key switch
{
Key.Left => _time - (ctrl ? CtrlStep : Step),
Key.Right => _time + (ctrl ? CtrlStep : Step),
Key.PageUp => _time - PageStep,
Key.PageDown => _time + PageStep,
Key.Home => 0,
Key.End => recording.Duration,
_ => null
};
if (to is not { } t)
return;
Seek?.Invoke(Math.Clamp(t, 0, recording.Duration));
e.Handled = true;
}
protected override void OnGotFocus(FocusChangedEventArgs e)
{
base.OnGotFocus(e);
InvalidateVisual();
}
protected override void OnLostFocus(FocusChangedEventArgs e)
{
base.OnLostFocus(e);
InvalidateVisual();
}
public IBlackBoxStrings Strings { get; set; } = new DefaultBlackBoxStrings();
@@ -162,8 +100,6 @@ public sealed class TimelineView : Control
public override void Render(DrawingContext context)
{
var size = Bounds.Size;
if (IsFocused)
context.DrawRectangle(null, Palette.FocusPen, new Rect(size).Deflate(1));
var recording = _recording;
if (recording is null || recording.Duration <= 0)
return;

View File

@@ -1,9 +1,7 @@
using System;
using System.Collections.Generic;
using System.Globalization;
using System.Linq;
using Avalonia;
using Avalonia.Automation.Peers;
using Avalonia.Controls;
using Avalonia.Input;
using Avalonia.Media;
@@ -38,84 +36,6 @@ public sealed class TimetablePanel : Control
{
ClipToBounds = true;
Cursor = new Cursor(StandardCursorType.Hand);
// The stations walked from the keyboard as well: the arrows go up and down the rows,
// Enter goes to the moment as a click does.
Focusable = true;
}
// The row the keyboard stands at; -1 until it is moved, when the station played is meant.
private int _keyRow = -1;
private string? _spoken;
protected override AutomationPeer OnCreateAutomationPeer() =>
new SpokenPeer(this, AutomationControlType.List, () => _spoken ?? RowText(KeyRow), () => Strings["TimetableHelp"]);
private int KeyRow => _keyRow >= 0 && _keyRow < _rows.Count ? _keyRow : Current();
/// <summary>A row as it is read: the station, the times of the timetable, the kilometre and what happened there.</summary>
private string? RowText(int i)
{
if (_timetable is null)
return Strings["TimetableNone"];
if (i < 0 || i >= _rows.Count)
return null;
var row = _rows[i];
var culture = CultureInfo.CurrentCulture;
string planned = row.Row.IsStop
? $"{Minutes(row.Row.Arrival)} – {Minutes(row.Row.Departure)}"
: Minutes(row.Row.Departure);
var parts = new List<string> { StationNames.Display(row.Row.Station), planned };
if (row.Row.Km > 0 || i > 0)
parts.Add($"km {row.Row.Km.ToString("0.0", culture)}");
parts.AddRange(Chips(row, culture).Select(c => c.Text));
return $"{i + 1}/{_rows.Count}. {string.Join(", ", parts)}";
}
protected override void OnKeyDown(KeyEventArgs e)
{
base.OnKeyDown(e);
if (_rows.Count == 0)
return;
int at = KeyRow;
int? to = e.Key switch
{
Key.Up => at - 1,
Key.Down => at + 1,
Key.Home => 0,
Key.End => _rows.Count - 1,
_ => null
};
if (e.Key == Key.Enter && at >= 0 && (_rows[at].ArrivedAt ?? _rows[at].DepartedAt) is { } t)
{
Seek?.Invoke(Math.Max(0, t - 5));
e.Handled = true;
return;
}
if (to is not { } row)
return;
_keyRow = Math.Clamp(row, 0, _rows.Count - 1);
string? before = _spoken;
_spoken = RowText(_keyRow);
(ControlAutomationPeer.FromElement(this) as SpokenPeer)?.Told(before, _spoken);
this.BringIntoView(new Rect(0, HeaderHeight + _keyRow * RowHeight, Bounds.Width, RowHeight));
InvalidateVisual();
e.Handled = true;
}
protected override void OnGotFocus(FocusChangedEventArgs e)
{
base.OnGotFocus(e);
_spoken = null;
InvalidateVisual();
}
protected override void OnLostFocus(FocusChangedEventArgs e)
{
base.OnLostFocus(e);
_keyRow = -1;
InvalidateVisual();
}
public Recording? Recording
@@ -183,8 +103,6 @@ public sealed class TimetablePanel : Control
{
var size = Bounds.Size;
var culture = CultureInfo.CurrentCulture;
if (IsFocused)
context.DrawRectangle(null, Palette.FocusPen, new Rect(size).Deflate(1));
if (_timetable is not { } timetable)
{
context.DrawText(MapView.Text(Strings["TimetableNone"], Palette.DimText, 12), new Point(Pad, Pad));
@@ -212,8 +130,6 @@ public sealed class TimetablePanel : Control
}
else if (i == _hover)
context.DrawRectangle(Palette.Faded(Palette.CardHover, 0.6), null, new Rect(0, top, size.Width, RowHeight - 1));
if (IsFocused && i == KeyRow)
context.DrawRectangle(null, Palette.FocusPen, new Rect(1, top + 1, size.Width - 2, RowHeight - 3));
// The line of the route through the stations, a dot each: hollow ahead, filled when done.
var outcome = row.Outcome;

View File

@@ -1,8 +1,5 @@
using System;
using Avalonia;
using Avalonia.Automation;
using Avalonia.Automation.Peers;
using Avalonia.Automation.Provider;
using Avalonia.Controls;
using Avalonia.Controls.Primitives;
using Avalonia.Layout;
@@ -238,13 +235,10 @@ internal static class UiKit
BorderBrush = Palette.CardBorder;
BorderThickness = new Thickness(0, 0, 0, 1);
Child = _row;
// Read as the tabs they are, which of them is picked.
AutomationProperties.SetControlTypeOverride(_row, AutomationControlType.Tab);
AutomationProperties.SetAccessibilityView(_row, AccessibilityView.Content);
for (int i = 0; i < choices.Length; i++)
{
int index = i;
var button = new SegmentButton
var button = new Button
{
Content = choices[i],
Padding = new Thickness(14, 3),
@@ -273,9 +267,8 @@ internal static class UiKit
_selected = value;
for (int i = 0; i < _row.Children.Count; i++)
{
var button = (SegmentButton)_row.Children[i];
var button = (Button)_row.Children[i];
bool on = i == value;
button.IsOn = on;
var line = on ? Palette.Accent : Brushes.Transparent;
button.Background = on ? Palette.Panel : Brushes.Transparent;
button.BorderBrush = line;
@@ -287,51 +280,4 @@ internal static class UiKit
}
}
}
/// <summary>
/// A choice of <see cref="Segmented"/>: a button to look at, a tab to a screen reader,
/// which says whether it is the one picked.
/// </summary>
private sealed class SegmentButton : Button
{
private bool _on;
protected override Type StyleKeyOverride => typeof(Button);
public bool IsOn
{
get => _on;
set
{
if (_on == value)
return;
_on = value;
(ControlAutomationPeer.FromElement(this) as Peer)?.Told(!value, value);
}
}
public void Pick() => OnClick();
protected override AutomationPeer OnCreateAutomationPeer() => new Peer(this);
private sealed class Peer(SegmentButton owner) : ButtonAutomationPeer(owner), ISelectionItemProvider
{
public void Told(bool before, bool now) =>
RaisePropertyChangedEvent(SelectionItemPatternIdentifiers.IsSelectedProperty, before, now);
protected override AutomationControlType GetAutomationControlTypeCore() => AutomationControlType.TabItem;
public bool IsSelected => owner.IsOn;
public ISelectionProvider? SelectionContainer => null;
public void Select() => owner.Pick();
public void AddToSelection() => owner.Pick();
public void RemoveFromSelection()
{
}
}
}
}

View File

@@ -1,125 +0,0 @@
using Avalonia.Automation;
using Avalonia.Automation.Peers;
using Avalonia.Controls;
using Avalonia.Controls.Primitives;
using Avalonia.VisualTree;
using StarterNG.Controls;
namespace StarterNG.Tests;
[Collection(AvaloniaControls.Name)]
public class AnnouncerTests
{
private DateTime _now = new(2026, 11, 15, 12, 0, 0, DateTimeKind.Utc);
private Announcer NewAnnouncer() => new(() => _now);
[Fact]
public void A_message_is_read_while_fresh_and_then_forgotten()
{
var announcer = NewAnnouncer();
announcer.Say(" Jakość grafiki: Wysoka ");
Assert.Equal("Jakość grafiki: Wysoka", announcer.Message);
_now += Announcer.Shown;
Assert.Null(announcer.Message);
}
[Fact]
public void Nothing_to_say_says_nothing()
{
var announcer = NewAnnouncer();
announcer.Say("Zapisano ustawienia");
announcer.Say(" ");
Assert.Equal("Zapisano ustawienia", announcer.Message);
}
[Fact]
public void A_control_inside_says_it_through_the_window_announcer()
{
var button = new Button();
var announcer = NewAnnouncer();
announcer.Child = new Border { Child = button };
Announcer.Say(button, "Godzina: 07:05");
Assert.Equal("Godzina: 07:05", announcer.Message);
}
[Fact]
public void A_control_outside_any_announcer_is_not_heard()
{
var button = new Button();
var thrown = Record.Exception(() => Announcer.Say(button, "Godzina: 07:05"));
Assert.Null(thrown);
Assert.Null(button.FindAncestorOfType<Announcer>());
}
[Fact]
public void A_marked_text_is_read_when_it_changes()
{
var status = new TextBlock();
Announcer.SetChanges(status, true);
var plain = new TextBlock();
var announcer = NewAnnouncer();
announcer.Child = new StackPanel { Children = { status, plain } };
plain.Text = "Ścieżka";
Assert.Null(announcer.Message);
status.Text = "Niezapisane zmiany";
Assert.True(Announcer.GetChanges(status));
Assert.Equal("Niezapisane zmiany", announcer.Message);
}
[Fact]
public void A_screen_reader_hears_it_as_a_polite_live_region()
{
var announcer = NewAnnouncer();
var peer = ControlAutomationPeer.CreatePeerForElement(announcer);
announcer.Say("Przywrócono domyślne");
Assert.Equal("Przywrócono domyślne", peer.GetName());
Assert.Equal(AutomationLiveSetting.Polite, peer.GetLiveSetting());
Assert.Equal(AutomationControlType.Group, peer.GetAutomationControlType());
}
}
[Collection(AvaloniaControls.Name)]
public class NamedGroupTests
{
static NamedGroupTests() => ScreenReaderNames.Install();
[Fact]
public void A_panel_with_a_title_is_a_group_named_by_it()
{
var panel = new HeaderedContentControl { Header = "Scenerie" };
Assert.Equal("Scenerie", AutomationProperties.GetName(panel));
Assert.Equal(AutomationControlType.Group, AutomationProperties.GetControlTypeOverride(panel));
Assert.Equal(AccessibilityView.Content, AutomationProperties.GetAccessibilityView(panel));
}
[Fact]
public void A_panel_whose_title_goes_is_no_longer_a_group()
{
var panel = new HeaderedContentControl { Header = "Skład" };
panel.Header = null;
Assert.Null(AutomationProperties.GetName(panel));
Assert.Null(AutomationProperties.GetControlTypeOverride(panel));
Assert.Equal(AccessibilityView.Default, AutomationProperties.GetAccessibilityView(panel));
}
[Fact]
public void A_tab_keeps_its_own_way_of_speaking()
{
var tab = new TabItem { Header = "Pogoda" };
Assert.Null(AutomationProperties.GetName(tab));
Assert.Equal(AutomationControlType.TabItem, AutomationProperties.GetControlTypeOverride(tab));
}
}

View File

@@ -1,11 +0,0 @@
namespace StarterNG.Tests;
/// <summary>
/// Tests that build Avalonia controls run one after another: a control belongs to the
/// thread that made the first one, and run side by side they now and then failed.
/// </summary>
[CollectionDefinition(Name)]
public sealed class AvaloniaControls
{
public const string Name = "Avalonia controls";
}

View File

@@ -1,284 +0,0 @@
using Avalonia.Automation;
using Avalonia.Automation.Peers;
using Avalonia.Automation.Provider;
using Avalonia.Controls;
using Avalonia.Input;
using Avalonia.VisualTree;
using Eu07.BlackBox;
using Eu07.BlackBox.Views;
namespace StarterNG.Tests.BlackBox;
/// <summary>
/// The black box's own drawn panels as a screen reader user meets them: reached with Tab,
/// walked with the keys, their value and description read, what they show said aloud.
/// </summary>
[Collection(AvaloniaControls.Name)]
public class BlackBoxViewsTests
{
private const uint Head = 1;
/// <summary>
/// The user in vehicle 1 from t = 0 to 120: timetable ROJ1 standing at A, stopping at B
/// from 60 to 70, passing C at 100; the clock at 10:34 (634 min).
/// </summary>
private static Recording Journey(bool extended = true, byte? engine = null)
{
var f = new BlackBoxFile().Info()
.Vehicle(Head, "EU07-005", "ROJ1")
.User(0, Head, true, 1)
.Timetable(0, Head, "ROJ1", "A", "C", ("A", -1, 634), ("Stacja_B", 635, 635.5f), ("C", 637.5f, 638))
.Station(1, Head, 4, 1, "A", 1150);
for (double t = 0; t <= 120; t += 0.5)
{
float speed = t is >= 55 and < 70 ? 0 : 40;
f.Cab(t, Head, 1150 + t * 10, speed, extended: extended, engine: engine, nextLimit: 60, nextDistance: 500,
brakeCylinder: t is >= 50 and < 70 ? 2.5f : 0, devices: 0x0207);
}
f.Station(60, Head, 1, 2, "Stacja_B", 1300)
.Station(100, Head, 3, 3, "C", 2150);
return BlackBoxReader.Read(f.End(120).Stream());
}
private static IValueProvider Value(Control control) =>
Assert.IsAssignableFrom<IValueProvider>(Controls.Peer(control));
// --- timeline ---
[Fact]
public void The_timeline_is_a_slider_read_as_the_moment_with_how_to_walk_it()
{
var timeline = new TimelineView { Spoken = "10:35:12, 40 km/h" };
var peer = Controls.Peer(timeline);
var value = Value(timeline);
Assert.Equal(AutomationControlType.Slider, peer.GetAutomationControlType());
Assert.Equal("10:35:12, 40 km/h", value.Value);
Assert.True(value.IsReadOnly);
Assert.False(string.IsNullOrEmpty(peer.GetHelpText()));
Assert.True(peer.IsContentElement());
Assert.True(peer.IsControlElement());
Assert.Throws<InvalidOperationException>(() => value.SetValue("x"));
timeline.Spoken = "10:35:22, 40 km/h";
Assert.Equal("10:35:22, 40 km/h", value.Value);
}
[Fact]
public void A_description_set_on_the_timeline_wins_over_its_own()
{
var timeline = new TimelineView();
AutomationProperties.SetHelpText(timeline, "own words");
Assert.Equal("own words", Controls.Peer(timeline).GetHelpText());
}
[Theory]
[InlineData(Key.Right, KeyModifiers.None, 70)]
[InlineData(Key.Left, KeyModifiers.None, 50)]
[InlineData(Key.Right, KeyModifiers.Control, 120)]
[InlineData(Key.Left, KeyModifiers.Control, 0)]
[InlineData(Key.PageDown, KeyModifiers.None, 120)]
[InlineData(Key.PageUp, KeyModifiers.None, 0)]
[InlineData(Key.Home, KeyModifiers.None, 0)]
[InlineData(Key.End, KeyModifiers.None, 120)]
public void The_keys_take_the_timeline_through_the_recording(Key key, KeyModifiers modifiers, double expected)
{
var timeline = new TimelineView { Recording = Journey(), Time = 60 };
double? sought = null;
timeline.Seek += t => sought = t;
Assert.True(Controls.Press(timeline, key, modifiers));
Assert.Equal(expected, sought);
}
[Fact]
public void Other_keys_and_an_empty_timeline_are_left_alone()
{
var empty = new TimelineView();
var timeline = new TimelineView { Recording = Journey(), Time = 60 };
bool sought = false;
empty.Seek += _ => sought = true;
timeline.Seek += _ => sought = true;
Assert.False(Controls.Press(empty, Key.Right));
Assert.False(Controls.Press(timeline, Key.A));
Assert.False(sought);
}
[Fact]
public void The_timeline_draws_with_and_without_the_focus()
{
var timeline = new TimelineView { Recording = Journey(), Time = 60 };
var window = Controls.Show(timeline, 900, 300);
try
{
timeline.Fit();
Controls.Draw(timeline);
Assert.True(timeline.IsFocused);
timeline.Time = 119;
Controls.Draw(timeline);
window.Focus();
Controls.Draw(timeline);
}
finally
{
window.Close();
}
}
// --- timetable ---
[Fact]
public void The_timetable_is_a_list_read_row_by_row_from_the_keys()
{
var table = new TimetablePanel { Recording = Journey(), Time = 30 };
var peer = Controls.Peer(table);
var value = Value(table);
Assert.Equal(AutomationControlType.List, peer.GetAutomationControlType());
Assert.False(string.IsNullOrEmpty(peer.GetHelpText()));
Assert.StartsWith("1/3. A", value.Value);
Assert.True(Controls.Press(table, Key.Down));
Assert.StartsWith("2/3. Stacja B", value.Value);
Assert.True(Controls.Press(table, Key.Up));
Assert.StartsWith("1/3. A", value.Value);
Assert.True(Controls.Press(table, Key.End));
Assert.StartsWith("3/3. C", value.Value);
Assert.True(Controls.Press(table, Key.Down));
Assert.StartsWith("3/3. C", value.Value);
Assert.True(Controls.Press(table, Key.Home));
Assert.StartsWith("1/3. A", value.Value);
Assert.Contains("km 2.5", value.Value.Replace(',', '.'));
Assert.False(Controls.Press(table, Key.A));
}
[Fact]
public void Enter_on_a_station_passed_goes_to_a_little_before_it()
{
var table = new TimetablePanel { Recording = Journey(), Time = 110 };
double? sought = null;
table.Seek += t => sought = t;
Controls.Press(table, Key.Home);
Controls.Press(table, Key.Down);
Assert.True(Controls.Press(table, Key.Enter));
Assert.Equal(55, sought);
}
[Fact]
public void A_recording_without_a_timetable_says_so_and_ignores_the_keys()
{
var recording = BlackBoxReader.Read(new BlackBoxFile().Info().Vehicle(Head, "EU07-005")
.Cab(0, Head, 1150, 40).End(1).Stream());
var table = new TimetablePanel { Recording = recording, Time = 0 };
Assert.False(string.IsNullOrEmpty(Value(table).Value));
Assert.False(Controls.Press(table, Key.Down));
table.Recording = null;
Controls.Lay(table);
Controls.Draw(table);
}
[Fact]
public void The_timetable_draws_its_rows_and_the_one_the_keys_stand_at()
{
var table = new TimetablePanel { Recording = Journey(), Time = 65 };
var window = Controls.Show(table, 600, 400);
try
{
Controls.Draw(table);
Controls.Press(table, Key.Down);
Controls.Draw(table);
window.Focus();
Controls.Draw(table);
}
finally
{
window.Close();
}
}
// --- cab ---
[Theory]
[InlineData(true, null)]
[InlineData(true, (byte)1)]
[InlineData(true, (byte)2)]
[InlineData(false, null)]
public void The_cab_says_what_it_draws(bool extended, byte? engine)
{
var cab = new CabPanel { Recording = Journey(extended, engine), Time = 30 };
Controls.Lay(cab, 600, 900);
Controls.Draw(cab);
Assert.NotNull(cab.Said);
Assert.Contains("EU07-005", cab.Said);
Assert.Contains("40 km/h", cab.Said);
Assert.Equal(AutomationControlType.Pane, Controls.Peer(cab).GetAutomationControlType());
Assert.Equal(cab.Said, Controls.Peer(cab).GetHelpText());
}
[Fact]
public void The_cab_stopped_under_the_brakes_and_out_of_the_recording()
{
var cab = new CabPanel { Recording = Journey(), Time = 60 };
var window = Controls.Show(cab, 600, 900);
try
{
Controls.Draw(cab);
Assert.Contains("0 km/h", cab.Said);
cab.Time = 500;
Controls.Draw(cab);
Assert.DoesNotContain("km/h", cab.Said);
}
finally
{
window.Close();
}
}
[Fact]
public void An_empty_cab_says_there_is_nothing_to_show()
{
var cab = new CabPanel();
Controls.Lay(cab);
Controls.Draw(cab);
Assert.False(string.IsNullOrEmpty(cab.Said));
}
// --- segmented choice ---
[Fact]
public void A_segmented_choice_is_a_row_of_tabs_one_of_them_selected()
{
var choice = new UiKit.Segmented("Mapa", "Profil", "Rozkład");
int? picked = null;
choice.SelectedChanged += i => picked = i;
var tabs = choice.GetVisualDescendants().OfType<Button>().ToList();
if (tabs.Count == 0)
tabs = ((Panel)choice.Child!).Children.OfType<Button>().ToList();
var second = Assert.IsAssignableFrom<ISelectionItemProvider>(Controls.Peer(tabs[1]));
Assert.Equal(AutomationControlType.TabItem, Controls.Peer(tabs[1]).GetAutomationControlType());
Assert.Null(second.SelectionContainer);
second.Select();
Assert.Equal(1, picked);
Assert.True(second.IsSelected);
Assert.Equal(1, choice.Selected);
var third = Assert.IsAssignableFrom<ISelectionItemProvider>(Controls.Peer(tabs[2]));
third.AddToSelection();
Assert.Equal(2, choice.Selected);
Assert.False(second.IsSelected);
third.RemoveFromSelection();
Assert.Equal(2, choice.Selected);
}
}

View File

@@ -1,101 +0,0 @@
using StarterNG.Views;
using Unit = StarterNG.Views.ConsistNarration.Unit;
namespace StarterNG.Tests;
public class ConsistNarrationTests
{
// Each text shows its key and its arguments, so a test sees which sentence was picked and with what.
private static string Loc(string key) => key switch
{
"ConsistSaidEmpty" => "empty",
"ConsistSaidAdded" => "added {0} at {1}/{2}",
"ConsistSaidRemoved" => "removed {0}, {1} left",
"ConsistSaidTurned" => "turned {0}",
"ConsistSaidUnturned" => "unturned {0}",
"ConsistSaidTurnedMany" => "turned {0}",
"ConsistSaidMoved" => "moved {0} to {1}/{2}",
"ConsistSaidReordered" => "reordered",
"ConsistSaidReplaced" => "replaced {0} with {1}",
"ConsistSaidChangedMany" => "changed {0}, {1} now",
_ => throw new KeyNotFoundException(key)
};
private static Unit[] Units(params string[] labels) =>
labels.Select(l => new Unit(l.TrimEnd('^'), l.EndsWith('^'))).ToArray();
private static string? Say(string[] before, string[] after, int? vehicles = null) =>
ConsistNarration.Describe(Units(before), Units(after), vehicles ?? after.Length, Loc);
[Fact]
public void Nothing_changed_says_nothing() =>
Assert.Null(Say(["EU07", "Bdhpumn"], ["EU07", "Bdhpumn"]));
[Fact]
public void An_empty_consist_staying_empty_says_nothing() =>
Assert.Null(Say([], []));
[Fact]
public void Clearing_the_consist_says_it_is_empty() =>
Assert.Equal("empty", Say(["EU07", "Bdhpumn"], []));
[Fact]
public void A_vehicle_added_at_the_end_is_named_with_its_place() =>
Assert.Equal("added Bdhpumn at 2/2", Say(["EU07"], ["EU07", "Bdhpumn"]));
[Fact]
public void A_vehicle_added_in_the_middle_is_named_with_its_place() =>
Assert.Equal("added WRmnouz at 2/3", Say(["EU07", "Bdhpumn"], ["EU07", "WRmnouz", "Bdhpumn"]));
[Fact]
public void Two_vehicles_added_at_once_are_both_named() =>
Assert.Equal("added A, B at 1/3", Say(["EU07"], ["A", "B", "EU07"]));
[Fact]
public void A_removed_vehicle_is_named_with_the_count_left() =>
Assert.Equal("removed WRmnouz, 2 left", Say(["EU07", "WRmnouz", "Bdhpumn"], ["EU07", "Bdhpumn"]));
[Fact]
public void The_count_left_counts_vehicles_not_units() =>
Assert.Equal("removed EU07, 3 left", Say(["EU07", "EN57"], ["EN57"], vehicles: 3));
[Fact]
public void A_vehicle_turned_round_is_named() =>
Assert.Equal("turned Bdhpumn", Say(["EU07", "Bdhpumn"], ["EU07", "Bdhpumn^"]));
[Fact]
public void A_vehicle_turned_back_is_told_apart_from_one_turned() =>
Assert.Equal("unturned Bdhpumn", Say(["EU07", "Bdhpumn^"], ["EU07", "Bdhpumn"]));
[Fact]
public void Several_turned_at_once_are_counted() =>
Assert.Equal("turned 3", Say(["A", "B", "C"], ["A^", "B^", "C^"]));
[Fact]
public void A_vehicle_moved_towards_the_end_is_named_with_its_new_place() =>
Assert.Equal("moved A to 3/4", Say(["A", "B", "C", "D"], ["B", "C", "A", "D"]));
[Fact]
public void A_vehicle_moved_towards_the_front_is_named_with_its_new_place() =>
Assert.Equal("moved C to 1/4", Say(["A", "B", "C", "D"], ["C", "A", "B", "D"]));
[Fact]
public void Neighbours_swapped_are_told_as_one_moved() =>
Assert.Equal("moved A to 2/2", Say(["A", "B"], ["B", "A"]));
[Fact]
public void The_same_vehicles_shuffled_are_told_as_a_new_order() =>
Assert.Equal("reordered", Say(["A", "B", "C", "D"], ["B", "A", "D", "C"]));
[Fact]
public void One_vehicle_swapped_for_another_names_both() =>
Assert.Equal("replaced B with X", Say(["A", "B", "C"], ["A", "X", "C"]));
[Fact]
public void A_bigger_change_counts_the_vehicles_it_touched() =>
Assert.Equal("changed 2, 3 now", Say(["A", "B", "C"], ["A", "X", "Y"]));
[Fact]
public void Same_named_vehicles_next_to_each_other_still_count_one_added() =>
Assert.Equal("added Bdhpumn at 3/3", Say(["EU07", "Bdhpumn"], ["EU07", "Bdhpumn", "Bdhpumn"]));
}

View File

@@ -1,75 +0,0 @@
using Avalonia;
using Avalonia.Automation.Peers;
using Avalonia.Controls;
using Avalonia.Input;
using Avalonia.Interactivity;
using Avalonia.Media;
using Avalonia.Themes.Fluent;
using Avalonia.Threading;
namespace StarterNG.Tests;
/// <summary>Keys, focus, layout and drawing for the tests of controls, with no one at the keyboard.</summary>
internal static class Controls
{
/// <summary>Presses a key on the control as the keyboard would; true when the control took it.</summary>
public static bool Press(Control control, Key key, KeyModifiers modifiers = KeyModifiers.None)
{
var e = new KeyEventArgs { RoutedEvent = InputElement.KeyDownEvent, Key = key, KeyModifiers = modifiers, Source = control };
control.RaiseEvent(e);
return e.Handled;
}
/// <summary>
/// The control in a window of its own, shown, laid out and focused if it can be;
/// themed, its parts are built from the templates the application uses.
/// </summary>
public static Window Show(Control control, double width = 640, double height = 720, bool themed = false)
{
HeadlessDrawing.Ensure();
if (themed)
Theme();
var window = new Window { Width = width, Height = height, Content = control };
window.Show();
window.UpdateLayout();
Settle();
if (control.Focusable)
control.Focus();
return window;
}
/// <summary>Lays the control out alone at the size given.</summary>
public static void Lay(Control control, double width = 640, double height = 720)
{
HeadlessDrawing.Ensure();
control.Measure(new Size(width, height));
control.Arrange(new Rect(0, 0, width, height));
}
/// <summary>Has the control draw itself once.</summary>
public static void Draw(Control control)
{
HeadlessDrawing.Ensure();
var group = new DrawingGroup();
using var context = group.Open();
control.Render(context);
}
private static bool _themed;
// Where the application keeps it: given to a window alone, a slider or a number box was left without its parts.
private static void Theme()
{
if (_themed)
return;
Avalonia.Application.Current!.Styles.Add(new FluentTheme());
_themed = true;
}
/// <summary>Runs what was left for the dispatcher to do later, such as naming a row once it is laid out.</summary>
public static void Settle() => Dispatcher.UIThread.RunJobs();
public static AutomationPeer Peer(Control control) => ControlAutomationPeer.CreatePeerForElement(control);
public static RoutedEventArgs Click() => new(Button.ClickEvent);
}

View File

@@ -1,376 +0,0 @@
using Avalonia;
using Avalonia.Automation;
using Avalonia.Automation.Peers;
using Avalonia.Automation.Provider;
using Avalonia.Controls;
using Avalonia.Controls.Primitives;
using Avalonia.Controls.Templates;
using Avalonia.Input;
using Avalonia.VisualTree;
using StarterNG.Controls;
namespace StarterNG.Tests;
/// <summary>
/// Windows opened over another, searches and the starter's own controls as someone at the
/// keyboard with a screen reader meets them, in windows built as the application builds them.
/// </summary>
[Collection(AvaloniaControls.Name)]
public class DialogControlsTests
{
static DialogControlsTests()
{
HeadlessDrawing.Ensure();
DialogKeyboard.Install();
ScreenReaderNames.Install();
}
private static (Window Owner, Window Dialog) Dialog(Control content, bool escapeCloses = true)
{
var owner = new Window();
owner.Show();
var dialog = new Window { Width = 300, Height = 200, Content = content };
DialogKeyboard.SetEscapeCloses(dialog, escapeCloses);
_ = dialog.ShowDialog(owner);
// Headless a window says it opened before it is given its owner; it says so again once it has one.
Assert.Same(owner, dialog.Owner);
dialog.RaiseEvent(new Avalonia.Interactivity.RoutedEventArgs(Window.WindowOpenedEvent));
Controls.Settle();
return (owner, dialog);
}
// --- windows over another ---
[Fact]
public void A_dialog_opens_on_its_default_button_and_esc_closes_it()
{
var other = new Button { Content = "Nie" };
var yes = new Button { Content = "Tak", IsDefault = true };
var (owner, dialog) = Dialog(new StackPanel { Children = { other, yes } });
bool closed = false;
dialog.Closed += (_, _) => closed = true;
Assert.True(yes.IsFocused);
Assert.False(Controls.Press(dialog, Key.Escape, KeyModifiers.Shift));
Assert.True(Controls.Press(dialog, Key.Escape));
Assert.True(closed);
owner.Close();
}
[Fact]
public void Without_a_default_button_focus_goes_to_the_first_control()
{
var first = new TextBox();
var (owner, dialog) = Dialog(new StackPanel { Children = { first, new Button { Content = "OK" } } });
Assert.True(first.IsFocused);
dialog.Close();
owner.Close();
}
[Fact]
public void A_window_that_placed_the_focus_itself_keeps_it()
{
var first = new Button { Content = "1" };
var chosen = new Button { Content = "2" };
var (owner, dialog) = Dialog(new StackPanel { Children = { first, chosen } });
chosen.Focus();
Assert.False(first.IsFocused);
DialogKeyboard.FocusFirst(dialog);
Assert.True(chosen.IsFocused);
dialog.Close();
owner.Close();
}
[Fact]
public void Esc_does_not_close_a_window_that_stays_beside_the_main_one()
{
var (owner, dialog) = Dialog(new Button { Content = "OK" }, escapeCloses: false);
bool closed = false;
dialog.Closed += (_, _) => closed = true;
Assert.False(DialogKeyboard.GetEscapeCloses(dialog));
Assert.False(Controls.Press(dialog, Key.Escape));
Assert.False(closed);
dialog.Close();
owner.Close();
}
[Fact]
public void Tab_with_only_the_window_focused_starts_from_the_first_control()
{
var first = new Button { Content = "1" };
// Opened with nothing to focus, its controls put in afterwards.
var (owner, dialog) = Dialog(new TextBlock { Text = "…" });
dialog.Content = new StackPanel { Children = { first, new Button { Content = "2" } } };
dialog.UpdateLayout();
Assert.False(first.IsFocused);
Assert.True(Controls.Press(dialog, Key.Tab));
Assert.True(first.IsFocused);
dialog.Close();
owner.Close();
}
[Fact]
public void A_window_of_its_own_is_left_to_its_own_ways()
{
var button = new Button { Content = "1" };
var window = Controls.Show(button);
Assert.False(Controls.Press(window, Key.Escape));
window.Close();
}
// --- searches ---
[Fact]
public void A_search_says_how_many_entries_are_left_once_typing_pauses()
{
var box = new TextBox();
var announcer = new Announcer { Child = box };
var window = Controls.Show(announcer);
try
{
var teller = new SearchResultsTeller(box, () => 3);
box.Focus();
box.Text = "EU07";
teller.Changed();
Thread.Sleep(SearchResultsTeller.Pause + TimeSpan.FromMilliseconds(300));
Controls.Settle();
Assert.NotNull(announcer.Message);
}
finally
{
window.Close();
}
}
[Fact]
public void An_empty_search_or_one_left_says_nothing()
{
var box = new TextBox();
var elsewhere = new Button { Content = "x" };
var announcer = new Announcer { Child = new StackPanel { Children = { box, elsewhere } } };
var window = Controls.Show(announcer);
try
{
var teller = new SearchResultsTeller(box, () => 3);
box.Focus();
box.Text = " ";
teller.Changed();
Thread.Sleep(SearchResultsTeller.Pause + TimeSpan.FromMilliseconds(300));
Controls.Settle();
Assert.Null(announcer.Message);
box.Text = "EU07";
elsewhere.Focus();
teller.Changed();
Thread.Sleep(SearchResultsTeller.Pause + TimeSpan.FromMilliseconds(300));
Controls.Settle();
Assert.Null(announcer.Message);
}
finally
{
window.Close();
}
}
// --- tree entries ---
[Fact]
public void Every_part_of_a_row_tells_whether_the_entry_is_open()
{
var words = ExpandableTreeViewItem.StateWords;
ExpandableTreeViewItem.StateWords = s => s switch
{
ExpandCollapseState.Expanded => "rozwinięte",
ExpandCollapseState.Collapsed => "zwinięte",
_ => null
};
var child = new ExpandableTreeViewItem { Header = "test32" };
var group = new ExpandableTreeViewItem { Header = "Całkowo", Items = { child } };
AutomationProperties.SetName(group, "Całkowo");
var tree = new TreeView { Items = { group } };
var window = Controls.Show(tree, themed: true);
try
{
var row = group.GetVisualDescendants().OfType<Control>().First(c => c.Name == "PART_LayoutRoot");
Assert.Equal("zwinięte", AutomationProperties.GetHelpText(row));
Assert.Equal("Całkowo", AutomationProperties.GetName(row));
var peer = Controls.Peer(group);
((IExpandCollapseProvider)peer).Expand();
Controls.Settle();
Assert.Equal("rozwinięte", AutomationProperties.GetHelpText(row));
AutomationProperties.SetName(group, "Całkowo i okolice");
Assert.Equal("Całkowo i okolice", AutomationProperties.GetName(row));
group.Header = "Całkowo 2";
Controls.Settle();
window.UpdateLayout();
Assert.Same(group, child.ReadableParent);
Assert.Same(peer, Controls.Peer(child).GetParent());
var leafRow = child.GetVisualDescendants().OfType<Control>().First(c => c.Name == "PART_LayoutRoot");
Assert.Null(AutomationProperties.GetHelpText(leafRow));
tree.Items.Clear();
Controls.Settle();
}
finally
{
ExpandableTreeViewItem.StateWords = words;
window.Close();
}
}
// --- sliders and number boxes ---
[Fact]
public void The_track_and_knob_of_a_slider_are_named_with_its_value()
{
var fog = new ReadableSlider { Minimum = 0, Maximum = 1000, Value = 500, ValueText = "2,4 km" };
AutomationProperties.SetName(fog, "Widoczność");
var window = Controls.Show(fog, themed: true);
try
{
var track = fog.GetVisualDescendants().OfType<Avalonia.Controls.Primitives.Track>().Single();
Assert.Equal("Widoczność: 2,4 km", AutomationProperties.GetName(track));
fog.ValueText = "3 km";
Assert.Equal("Widoczność: 3 km", AutomationProperties.GetName(track));
var value = Assert.IsAssignableFrom<IValueProvider>(Controls.Peer(fog));
Assert.False(value.IsReadOnly);
Assert.Equal("Slider", Controls.Peer(fog).GetClassName());
Assert.Throws<ArgumentException>(() => value.SetValue("duĹĽo"));
}
finally
{
window.Close();
}
}
[Fact]
public void A_number_box_gives_its_name_to_the_text_inside_and_its_arrows_say_what_they_do()
{
var box = new NumericUpDown { Value = 3 };
AutomationProperties.SetName(box, "Liczba wagonĂłw");
var window = Controls.Show(box, themed: true);
try
{
var text = box.GetVisualDescendants().OfType<TextBox>().Single();
Assert.Equal("Liczba wagonĂłw", AutomationProperties.GetName(text));
var arrows = box.GetVisualDescendants().OfType<Control>()
.Where(c => c.Name is "PART_IncreaseButton" or "PART_DecreaseButton").ToList();
Assert.NotEmpty(arrows);
Assert.All(arrows, a => Assert.False(KeyboardNavigation.GetIsTabStop(a)));
Assert.All(arrows, a => Assert.False(string.IsNullOrEmpty(AutomationProperties.GetName(a))));
}
finally
{
window.Close();
}
}
[Fact]
public void A_picker_is_reached_through_its_button_named_with_the_label_and_value()
{
var date = new DatePicker { SelectedDate = new DateTimeOffset(2026, 11, 15, 0, 0, 0, TimeSpan.Zero) };
var time = new TimePicker { SelectedTime = new TimeSpan(7, 5, 0) };
AutomationProperties.SetName(date, "Data");
AutomationProperties.SetName(time, "Godzina");
var window = Controls.Show(new StackPanel { Children = { date, time } }, themed: true);
try
{
var dateButton = date.GetVisualDescendants().OfType<Button>().First(b => b.Name == "PART_FlyoutButton");
var timeButton = time.GetVisualDescendants().OfType<Button>().First(b => b.Name == "PART_FlyoutButton");
Assert.StartsWith("Data", AutomationProperties.GetName(dateButton));
Assert.StartsWith("Godzina", AutomationProperties.GetName(timeButton));
time.SelectedTime = new TimeSpan(8, 0, 0);
Assert.StartsWith("Godzina", AutomationProperties.GetName(timeButton));
}
finally
{
window.Close();
}
}
[Fact]
public void A_list_says_its_new_choice_when_the_arrows_change_it()
{
var combo = new ComboBox { ItemsSource = new[] { "Niska", "Ĺšrednia", "Wysoka" }, SelectedIndex = 0 };
var announcer = new Announcer { Child = combo };
var window = Controls.Show(announcer, themed: true);
try
{
combo.Focus();
combo.SelectedIndex = 2;
Assert.Equal("Wysoka", announcer.Message);
}
finally
{
window.Close();
}
}
// --- settings sections ---
private static SettingsSection Section() => new()
{
Template = new FuncControlTemplate<SettingsSection>((_, scope) =>
{
var reset = new Button { Name = "PART_Reset" };
scope.Register(reset.Name, reset);
return reset;
})
};
[Fact]
public void A_sections_reset_button_says_which_section_it_puts_back()
{
var section = Section();
section.Header = "Grafika";
section.ResetLabel = "Przywróć";
SettingsSection? asked = null;
section.ResetRequested += s => asked = s;
Controls.Lay(section);
section.ApplyTemplate();
var reset = (Button)section.GetVisualChildren().Single();
Assert.Equal("Przywróć: Grafika", AutomationProperties.GetName(reset));
section.Header = "Dźwięk";
Assert.Equal("Przywróć: Dźwięk", AutomationProperties.GetName(reset));
section.ResetLabel = null;
section.Header = null;
Assert.True(string.IsNullOrEmpty(AutomationProperties.GetName(reset)));
reset.RaiseEvent(Controls.Click());
Assert.Same(section, asked);
section.Template = Section().Template;
section.ApplyTemplate();
Assert.Null(section.ToggleKey);
Assert.Null(section.Toggle);
}
[Fact]
public void A_sections_list_of_levels_is_named_as_the_level_of_that_section()
{
var level = new ComboBox();
var section = new SettingsSection { Level = level, Header = "Grafika", ToggleKey = "shadows", Toggle = new CheckBox() };
Assert.EndsWith("Grafika", AutomationProperties.GetName(level));
Assert.Same(level, section.Level);
Assert.Equal("shadows", section.ToggleKey);
}
}

View File

@@ -1,53 +0,0 @@
using StarterNG.Views;
namespace StarterNG.Tests;
public class ExecutableListTests
{
[Fact]
public void A_build_copied_in_joins_the_list_and_the_choice_stays()
{
var (entries, chosen) = ExecutableList.Refreshed(["eu07_new.exe", "eu07.exe"], "eu07.exe");
Assert.Equal(new[] { "eu07_new.exe", "eu07.exe" }, entries);
Assert.Equal(1, chosen);
}
[Fact]
public void Automatic_stays_automatic()
{
var (entries, chosen) = ExecutableList.Refreshed(["eu07_new.exe", "eu07.exe"], null);
Assert.Equal(new[] { "eu07_new.exe", "eu07.exe" }, entries);
Assert.Equal(-1, chosen);
}
[Fact]
public void A_simulator_picked_from_elsewhere_stays_on_the_list_and_chosen()
{
const string picked = @"D:\build\eu07.exe";
var (entries, chosen) = ExecutableList.Refreshed(["eu07.exe"], picked);
Assert.Equal(new[] { "eu07.exe", picked }, entries);
Assert.Equal(1, chosen);
}
[Fact]
public void A_chosen_file_since_removed_stays_chosen_rather_than_switch_silently()
{
var (entries, chosen) = ExecutableList.Refreshed(["eu07.exe"], "eu07_old.exe");
Assert.Equal(new[] { "eu07.exe", "eu07_old.exe" }, entries);
Assert.Equal(1, chosen);
}
[Fact]
public void The_choice_is_found_whatever_the_case_of_its_name()
{
var (entries, chosen) = ExecutableList.Refreshed(["EU07.exe"], "eu07.exe");
Assert.Equal(new[] { "EU07.exe" }, entries);
Assert.Equal(0, chosen);
}
}

View File

@@ -1,82 +0,0 @@
using StarterNG.Domain.Settings;
using StarterNG.Infrastructure.Settings;
using StarterNG.Tests.Fakes;
namespace StarterNG.Tests;
public class ExecutableNoAvx2Tests
{
private const string Elf = "\u007fELF binary";
private static readonly DateTime Older = new(2026, 11, 1, 0, 0, 0, DateTimeKind.Utc);
private static readonly DateTime Newer = new(2026, 11, 15, 0, 0, 0, DateTimeKind.Utc);
private static InMemoryFileSystem With(params string[] names)
{
var files = new InMemoryFileSystem();
foreach (string name in names)
files.WithExecutable(TestInstallation.At(name), Elf);
return files;
}
private static string Automatic(InMemoryFileSystem files, bool lacksAvx2) =>
Path.GetFileName(new TestInstallation(files, lacksAvx2: lacksAvx2).Executables
.Resolve(new SimulatorSettings(), out _));
[Theory]
[InlineData("eu07_noavx2", true)]
[InlineData("eu07-x64_2026-11-15_abc1234_noavx2.exe", true)]
[InlineData("EU07_NOAVX2.EXE", true)]
[InlineData("eu07", false)]
[InlineData("eu07-x64_2026-11-15_abc1234.exe", false)]
[InlineData("eu07_noavx2_old.exe", false)]
public void A_build_without_avx2_is_known_by_the_end_of_its_name(string name, bool noAvx2) =>
Assert.Equal(noAvx2, ExecutableLocator.IsNoAvx2(name));
[Fact]
public void Without_avx2_the_build_without_it_is_chosen_over_the_canonical_one() =>
Assert.Equal("eu07_noavx2", Automatic(With("eu07", "eu07_noavx2"), lacksAvx2: true));
[Fact]
public void With_avx2_the_build_made_for_it_stays_first() =>
Assert.Equal("eu07", Automatic(With("eu07", "eu07_noavx2"), lacksAvx2: false));
[Fact]
public void With_avx2_a_build_without_it_is_used_when_it_is_the_only_one() =>
Assert.Equal("eu07_noavx2", Automatic(With("eu07_noavx2"), lacksAvx2: false));
[Fact]
public void Without_avx2_the_newest_build_without_it_is_chosen()
{
var files = With("eu07_2026-11-01_aaa_noavx2", "eu07_2026-11-15_bbb_noavx2")
.WrittenAt(TestInstallation.At("eu07_2026-11-01_aaa_noavx2"), Older)
.WrittenAt(TestInstallation.At("eu07_2026-11-15_bbb_noavx2"), Newer);
Assert.Equal("eu07_2026-11-15_bbb_noavx2", Automatic(files, lacksAvx2: true));
}
[Fact]
public void Without_avx2_and_no_build_without_it_the_usual_choice_stands() =>
Assert.Equal("eu07", Automatic(With("eu07-dev", "eu07"), lacksAvx2: true));
[Fact]
public void Only_a_build_with_avx2_on_a_processor_without_it_will_not_run()
{
var lacking = new TestInstallation(lacksAvx2: true).Executables;
var able = new TestInstallation(lacksAvx2: false).Executables;
Assert.True(lacking.WillNotRunHere("eu07.exe"));
Assert.False(lacking.WillNotRunHere("eu07-x64_noavx2.exe"));
Assert.False(able.WillNotRunHere("eu07.exe"));
}
[Fact]
public void The_newest_build_without_avx2_is_offered_by_name()
{
var files = With("eu07", "eu07_2026-11-01_aaa_noavx2", "eu07_2026-11-15_bbb_noavx2")
.WrittenAt(TestInstallation.At("eu07_2026-11-01_aaa_noavx2"), Older)
.WrittenAt(TestInstallation.At("eu07_2026-11-15_bbb_noavx2"), Newer);
Assert.Equal("eu07_2026-11-15_bbb_noavx2", new TestInstallation(files).Executables.NewestNoAvx2());
Assert.Null(new TestInstallation(With("eu07")).Executables.NewestNoAvx2());
}
}

View File

@@ -1,63 +0,0 @@
using Avalonia.Automation;
using Avalonia.Automation.Peers;
using Avalonia.Automation.Provider;
using StarterNG.Controls;
namespace StarterNG.Tests;
[Collection(AvaloniaControls.Name)]
public class ExpandableTreeViewItemTests
{
private static IExpandCollapseProvider Peer(ExpandableTreeViewItem item) =>
Assert.IsAssignableFrom<IExpandCollapseProvider>(ControlAutomationPeer.CreatePeerForElement(item));
[Fact]
public void A_scenery_with_nothing_under_it_is_a_leaf()
{
var peer = Peer(new ExpandableTreeViewItem { Header = "test32" });
Assert.Equal(ExpandCollapseState.LeafNode, peer.ExpandCollapseState);
Assert.False(peer.ShowsMenu);
}
[Fact]
public void A_group_says_whether_it_is_open()
{
Assert.Equal(ExpandCollapseState.Collapsed, ExpandableTreeViewItem.StateFor(hasChildren: true, expanded: false));
Assert.Equal(ExpandCollapseState.Expanded, ExpandableTreeViewItem.StateFor(hasChildren: true, expanded: true));
Assert.Equal(ExpandCollapseState.LeafNode, ExpandableTreeViewItem.StateFor(hasChildren: false, expanded: true));
}
[Fact]
public void A_screen_reader_can_open_and_close_an_entry()
{
var item = new ExpandableTreeViewItem { Header = "Całkowo" };
var peer = Peer(item);
peer.Expand();
Assert.True(item.IsExpanded);
peer.Collapse();
Assert.False(item.IsExpanded);
}
[Fact]
public void An_entry_on_its_own_has_nothing_over_it()
{
var item = new ExpandableTreeViewItem { Header = "Całkowo", IsExpanded = true };
var peer = ControlAutomationPeer.CreatePeerForElement(item);
Assert.Null(item.ReadableParent);
Assert.Null(peer.GetParent());
}
[Fact]
public void The_row_under_the_mouse_is_told_open_or_closed_and_a_leaf_nothing()
{
static string Loc(string key) => key == "TreeExpanded" ? "rozwinięte" : "zwinięte";
Assert.Equal("rozwinięte", ExpandableTreeViewItem.WordFor(ExpandCollapseState.Expanded, Loc));
Assert.Equal("zwinięte", ExpandableTreeViewItem.WordFor(ExpandCollapseState.Collapsed, Loc));
Assert.Null(ExpandableTreeViewItem.WordFor(ExpandCollapseState.LeafNode, Loc));
}
}

View File

@@ -14,7 +14,7 @@ public sealed class TestInstallation
{
public const string Root = "game";
public TestInstallation(InMemoryFileSystem? files = null, DateTime? now = null, bool lacksAvx2 = false)
public TestInstallation(InMemoryFileSystem? files = null, DateTime? now = null)
{
Files = files ?? new InMemoryFileSystem();
Paths = new GamePaths(Root);
@@ -35,8 +35,7 @@ public sealed class TestInstallation
SettingsPaths.VehicleCacheDirectory());
Library = new GameLibrary(VehicleCache, Sceneries, MiniTextures, Physics, Log);
// The processor of the machine running the tests is not the one tested.
Executables = new ExecutableLocator(Files, Paths, Environment, Log, lacksAvx2);
Executables = new ExecutableLocator(Files, Paths, Environment, Log);
SettingsStore = new SettingsStore(Files, Clock, Log, SettingsPaths, new SettingsSerializer(), Executables);
Tapes = new HaslerTapes(Files, Paths, Log, Clock, new TimetableLocator(Files), () => SimulatorRunning);
}

View File

@@ -1,98 +0,0 @@
using Avalonia.Automation;
using Avalonia.Controls;
using StarterNG.Controls;
namespace StarterNG.Tests;
[Collection(AvaloniaControls.Name)]
public class FieldLabelTests
{
static FieldLabelTests() => ScreenReaderNames.Install();
private static T At<T>(T control, int row, int column) where T : Control
{
Grid.SetRow(control, row);
Grid.SetColumn(control, column);
return control;
}
[Fact]
public void A_field_is_named_by_the_nearest_label_left_of_it_in_its_row()
{
var far = At(new TextBlock { Text = "Pogoda" }, 0, 0);
var near = At(new TextBlock { Text = "Temperatura" }, 0, 1);
var value = At(new TextBlock { Text = "-5 °C" }, 0, 3);
var other = At(new TextBlock { Text = "Widoczność" }, 1, 1);
var slider = At(new Slider(), 0, 2);
_ = new Grid { Children = { far, near, value, other, slider } };
ScreenReaderNames.NameByLabel(slider);
Assert.Equal("Temperatura", AutomationProperties.GetName(slider));
}
[Fact]
public void A_field_with_nothing_to_its_left_is_named_by_the_label_above()
{
var label = At(new TextBlock { Text = "Klasa" }, 0, 1);
var combo = At(new ComboBox(), 1, 1);
_ = new Grid { Children = { label, combo } };
Assert.Same(label, ScreenReaderNames.LabelOf(combo));
}
[Fact]
public void In_a_panel_the_label_is_the_text_just_before_the_field()
{
var label = new TextBlock { Text = "Profil" };
var box = new TextBox();
var after = new TextBox();
_ = new StackPanel { Children = { label, box, new Button(), after } };
ScreenReaderNames.NameByLabel(box);
Assert.Equal("Profil", AutomationProperties.GetName(box));
Assert.Null(ScreenReaderNames.LabelOf(after));
}
[Fact]
public void A_hidden_text_or_a_long_description_is_no_label()
{
var hidden = new TextBlock { Text = "Ukryte", IsVisible = false };
var first = new ComboBox();
var description = new TextBlock { Text = new string('x', 61) };
var second = new ComboBox();
_ = new StackPanel { Children = { hidden, first, description, second } };
Assert.Null(ScreenReaderNames.LabelOf(first));
Assert.Null(ScreenReaderNames.LabelOf(second));
Assert.Null(ScreenReaderNames.LabelOf(new ComboBox()));
}
[Fact]
public void The_name_follows_the_label_into_another_language()
{
var label = new TextBlock { Text = "Data" };
var picker = new DatePicker();
_ = new DockPanel { Children = { label, picker } };
ScreenReaderNames.NameByLabel(picker);
ScreenReaderNames.NameByLabel(picker);
label.Text = "Date";
Assert.Equal("Date", AutomationProperties.GetName(picker));
}
[Fact]
public void A_name_given_on_purpose_beats_the_label()
{
var label = new TextBlock { Text = "Szukaj" };
var box = new TextBox();
AutomationProperties.SetName(box, "Szukaj pojazdów");
_ = new StackPanel { Children = { label, box } };
ScreenReaderNames.NameByLabel(box);
Assert.Equal("Szukaj pojazdów", AutomationProperties.GetName(box));
}
}

View File

@@ -1,27 +0,0 @@
using Avalonia;
using Avalonia.Headless;
namespace StarterNG.Tests;
/// <summary>
/// Text and drawing for tests of controls that draw themselves: the headless platform
/// with its stand-in fonts, set up once, on the thread the control tests run on.
/// </summary>
public static class HeadlessDrawing
{
private static readonly object Gate = new();
private static bool _ready;
public static void Ensure()
{
lock (Gate)
{
if (_ready)
return;
AppBuilder.Configure<Avalonia.Application>()
.UseHeadless(new AvaloniaHeadlessPlatformOptions { UseHeadlessDrawing = true })
.SetupWithoutStarting();
_ready = true;
}
}
}

View File

@@ -1,105 +0,0 @@
using Avalonia.Automation;
using Avalonia.Controls;
using Avalonia.Input;
using Avalonia.VisualTree;
using StarterNG.Application;
using StarterNG.Classes;
using StarterNG.Controls;
using StarterNG.Tests.Fakes;
using StarterNG.Views;
namespace StarterNG.Tests;
/// <summary>The key bindings as someone at the keyboard binds a key: the list of commands, and the keyboard drawn beside it walked with the arrows.</summary>
[Collection(AvaloniaControls.Name)]
public class KeyBindingsTabTests
{
static KeyBindingsTabTests()
{
if (AppServices.CurrentOrNull is null)
{
var installation = new TestInstallation(new InMemoryFileSystem());
AppServices.Initialize(installation.Paths, installation.Files, installation.Clock, installation.Environment);
}
}
private sealed record Shown(Window Window, KeyBindingsTab Tab, Grid Host, Announcer Announcer) : IDisposable
{
public List<Border> Caps() =>
Host.GetVisualDescendants().OfType<Border>().Where(b => b.Classes.Contains("KeyCap")).ToList();
public void Dispose() => Window.Close();
}
private static Shown Open()
{
KeyboardConfig.Instance.Parse("hornhighactivate a\nhornlowactivate none\n");
var host = new Grid();
var search = new TextBox();
var tab = new KeyBindingsTab(host, search);
var announcer = new Announcer { Child = new DockPanel { Children = { search, host } } };
var window = Controls.Show(announcer, 1600, 1000, themed: true);
window.AddHandler(InputElement.KeyDownEvent, tab.OnKeyDown, Avalonia.Interactivity.RoutingStrategies.Tunnel);
tab.Build();
window.UpdateLayout();
Controls.Settle();
return new Shown(window, tab, host, announcer);
}
[Fact]
public void The_arrows_walk_the_keys_as_they_lie()
{
using var shown = Open();
var caps = shown.Caps();
Assert.True(caps.Count > 50);
Assert.All(caps, c => Assert.False(string.IsNullOrEmpty(AutomationProperties.GetName(c))));
caps[0].Focus();
Assert.True(Controls.Press(caps[0], Key.Right));
Assert.True(caps[1].IsFocused);
Assert.True(Controls.Press(caps[1], Key.Left));
Assert.True(caps[0].IsFocused);
Assert.True(Controls.Press(caps[0], Key.Left));
Assert.True(caps[0].IsFocused);
Assert.True(Controls.Press(caps[0], Key.End));
Assert.True(caps[^1].IsFocused);
Assert.True(Controls.Press(caps[^1], Key.Right));
Assert.True(caps[^1].IsFocused);
Assert.True(Controls.Press(caps[^1], Key.Home));
Assert.True(caps[0].IsFocused);
Assert.True(Controls.Press(caps[0], Key.Down));
var below = caps.Single(c => c.IsFocused);
Assert.NotSame(caps[0], below);
Assert.True(Controls.Press(below, Key.Up));
var above = caps.Single(c => c.IsFocused);
Assert.NotSame(below, above);
Assert.True(Controls.Press(above, Key.Up));
Assert.True(above.IsFocused);
Assert.False(Controls.Press(caps[0], Key.F24));
}
[Fact]
public void A_binding_takes_the_next_key_pressed_and_esc_gives_up_waiting()
{
using var shown = Open();
Assert.True(shown.Tab.ShownCount >= 2);
var combos = shown.Host.GetVisualDescendants().OfType<Button>()
.Where(b => b.Classes.Contains("Flat") && b.MinWidth == 140).ToList();
Assert.NotEmpty(combos);
combos[0].RaiseEvent(Controls.Click());
Assert.True(shown.Tab.IsCapturing);
Assert.True(Controls.Press(combos[0], Key.Escape));
Assert.False(shown.Tab.IsCapturing);
combos[0].RaiseEvent(Controls.Click());
Assert.False(Controls.Press(combos[0], Key.LeftShift));
Assert.True(shown.Tab.IsCapturing);
Assert.True(Controls.Press(combos[0], Key.J, KeyModifiers.Control | KeyModifiers.Shift));
Assert.False(shown.Tab.IsCapturing);
Assert.True(KeyboardConfig.Instance.Dirty);
}
}

View File

@@ -1,40 +0,0 @@
using Avalonia.Controls;
using Avalonia.Input;
using StarterNG.Controls;
namespace StarterNG.Tests;
[Collection(AvaloniaControls.Name)]
public class KeyboardFocusTests
{
private readonly Button _window = new();
private readonly Button _first = new();
private readonly Button _last = new();
private IInputElement? Tab(Key key, KeyModifiers modifiers, IInputElement? focused) =>
KeyboardFocus.TabFromNowhere(key, modifiers, focused, _window, () => _first, () => _last);
[Fact]
public void Tab_with_nothing_focused_starts_from_the_first_control()
{
Assert.Same(_first, Tab(Key.Tab, KeyModifiers.None, null));
}
[Fact]
public void Shift_tab_with_only_the_window_focused_starts_from_the_last_control()
{
Assert.Same(_last, Tab(Key.Tab, KeyModifiers.Shift, _window));
}
[Fact]
public void Tab_from_a_focused_control_is_left_to_the_usual_order()
{
Assert.Null(Tab(Key.Tab, KeyModifiers.None, new TextBox()));
}
[Fact]
public void Other_keys_are_left_alone()
{
Assert.Null(Tab(Key.Enter, KeyModifiers.None, null));
}
}

View File

@@ -1,102 +0,0 @@
using Avalonia.Automation;
using Avalonia.Controls;
using StarterNG.Controls;
using StarterNG.Infrastructure;
namespace StarterNG.Tests;
[Collection(AvaloniaControls.Name)]
public class MouseReadingTests
{
static MouseReadingTests() => ScreenReaderNames.Install();
[Fact]
public void A_picture_on_a_button_is_read_as_the_button()
{
var logo = new Image();
var button = new Button { Content = logo };
ScreenReaderNames.NamePicture(logo);
Assert.Same(button, AutomationProperties.GetLabeledBy(logo));
}
[Fact]
public void A_picture_beside_a_caption_is_read_as_the_caption()
{
var mini = new Image();
var caption = new TextBlock { Text = "EU07" };
_ = new StackPanel { Children = { mini, new TextBlock { IsVisible = false, Text = "ukryte" }, caption } };
ScreenReaderNames.NamePicture(mini);
Assert.Same(caption, AutomationProperties.GetLabeledBy(mini));
}
[Fact]
public void A_picture_in_a_card_is_read_as_the_card_tooltip()
{
var mini = new Image();
var card = new Border { Child = new Panel { Children = { mini } } };
ToolTip.SetTip(card, "EP09-018");
ScreenReaderNames.NamePicture(mini);
Assert.Equal("EP09-018", AutomationProperties.GetName(mini));
}
[Fact]
public void A_picture_named_on_purpose_or_far_from_any_name_is_left_alone()
{
var named = new Image();
AutomationProperties.SetName(named, "Obraz scenerii: baltyk");
var far = new Image();
var outer = new Border { Child = new Border { Child = new Border { Child = new Border { Child = far } } } };
ToolTip.SetTip(outer, "Opis");
_ = new Button { Content = named };
ScreenReaderNames.NamePicture(named);
ScreenReaderNames.NamePicture(far);
Assert.Equal("Obraz scenerii: baltyk", AutomationProperties.GetName(named));
Assert.Null(AutomationProperties.GetLabeledBy(named));
Assert.Null(AutomationProperties.GetName(far));
}
[Fact]
public void A_list_entry_is_read_as_its_text()
{
var named = new ComboBoxItem { Content = "Lato" };
AutomationProperties.SetName(named, "Pora: lato");
Assert.Equal("Pogodnie", ScreenReaderNames.SpokenItem(new ComboBoxItem { Content = "Pogodnie" }));
Assert.Equal("Pora: lato", ScreenReaderNames.SpokenItem(named));
Assert.Equal("12", ScreenReaderNames.SpokenItem(12));
Assert.Null(ScreenReaderNames.SpokenItem(null));
}
[Fact]
public void A_list_not_in_focus_says_nothing_of_its_new_choice()
{
var combo = new ComboBox();
var announcer = new Announcer();
announcer.Child = combo;
ScreenReaderNames.TellChoice(combo);
Assert.Null(announcer.Message);
}
[Fact]
public void A_figure_says_its_label_and_its_value_together()
{
var host = new StackPanel();
StatsBar.Fill(host, new[] { ("Masa [t]:", "440"), ("Tor:", "tor0325") });
var figure = Assert.IsType<TextBlock>(host.Children[0]);
Assert.Equal("Masa [t]: 440", figure.Inlines!.Text);
Assert.Equal(22, figure.Margin.Right);
Assert.Equal(0, ((TextBlock)host.Children[1]).Margin.Right);
}
}

View File

@@ -1,76 +0,0 @@
using System.Globalization;
using Avalonia.Automation;
using Avalonia.Automation.Peers;
using Avalonia.Automation.Provider;
using Avalonia.Controls;
using StarterNG.Controls;
namespace StarterNG.Tests;
[Collection(AvaloniaControls.Name)]
public class ReadableSliderTests
{
[Fact]
public void The_track_under_the_mouse_says_the_name_and_the_value()
{
var fog = new ReadableSlider { ValueText = "2,4 km" };
Assert.Equal("2,4 km", fog.TrackText);
AutomationProperties.SetName(fog, "Widoczność ");
Assert.Equal("Widoczność: 2,4 km", fog.TrackText);
}
[Fact]
public void A_slider_is_read_as_the_value_shown_beside_it()
{
var fog = new ReadableSlider { Minimum = 0, Maximum = 1000, Value = 523, ValueText = " 2,4 km " };
Assert.Equal("2,4 km", fog.SpokenValue);
}
[Fact]
public void Without_a_shown_value_the_number_itself_is_read()
{
var before = CultureInfo.CurrentCulture;
CultureInfo.CurrentCulture = CultureInfo.GetCultureInfo("pl-PL");
try
{
Assert.Equal("-5", ReadableSlider.SpokenText(null, -5));
Assert.Equal("1,25", ReadableSlider.SpokenText(" ", 1.25));
}
finally
{
CultureInfo.CurrentCulture = before;
}
}
[Fact]
public void A_setting_row_gives_its_value_to_the_slider_in_it()
{
var slider = new ReadableSlider { Minimum = 0, Maximum = 100, Value = 40 };
var row = new SettingRow { Content = new Border { Child = slider } };
row.ValueText = "40%";
Assert.Equal("40%", slider.SpokenValue);
row.ValueText = null;
Assert.Equal("40", slider.SpokenValue);
}
[Fact]
public void A_screen_reader_is_given_the_text_and_may_set_a_number()
{
var slider = new ReadableSlider { Minimum = 0, Maximum = 1000, Value = 523, ValueText = "2 km" };
var peer = ControlAutomationPeer.CreatePeerForElement(slider);
var value = Assert.IsAssignableFrom<IValueProvider>(peer);
Assert.Equal(AutomationControlType.Slider, peer.GetAutomationControlType());
Assert.Equal("Slider", peer.GetClassName());
Assert.Equal("2 km", value.Value);
Assert.False(value.IsReadOnly);
value.SetValue("300");
Assert.Equal(300, slider.Value);
Assert.Throws<ArgumentException>(() => value.SetValue("dużo"));
}
}

View File

@@ -273,7 +273,7 @@ public class ScenerySyntaxTests
include koniec.scm
""";
var scenery = TestScenery.Parser().Parse("scenery/x.scn", scn, _ => true);
var scenery = TestScenery.Parser().Parse("scenery/x.scn", scn, new SceneryFileLookup(_ => true));
Assert.Empty(scenery.Faults);
Assert.Equal("td/rozklad", Assert.Single(scenery.Trainsets).Name);
@@ -326,7 +326,7 @@ public class ScenerySyntaxTests
endoptional
""";
var faults = TestScenery.Parser().Parse("scenery/x.scn", scn, name => name is "tory.scm" or "budynek.inc").Faults;
var faults = TestScenery.Parser().Parse("scenery/x.scn", scn, new SceneryFileLookup(name => name is "tory.scm" or "budynek.inc")).Faults;
Assert.Equal((SceneryFaultKind.MissingInclude, "x.scn", 2, null, "brak.scm"), Seen(Assert.Single(faults)));
}
@@ -378,4 +378,58 @@ public class ScenerySyntaxTests
Assert.Equal(sbt, scenery.HasCompanionTimetable);
Assert.Equal(sbt ? 0 : 1, scenery.Faults.Count);
}
private static IReadOnlyList<SceneryFault> TerrainFaults(string scn, bool sbt, params string[] onDisk)
{
var files = new InMemoryFileSystem(caseSensitive: true).WithLegacyFile("game/scenery/Mapa.scn", scn);
if (sbt)
files.WithFile("game/scenery/mapa.sbt", "EU07");
foreach (string file in onDisk)
files.WithFile("game/scenery/" + file, "");
return TestScenery.Repository(files).Load("game/scenery/Mapa.scn")!.Faults;
}
[Theory]
[InlineData("Teren/Mapa.txtf")]
[InlineData("teren/mapa.btf")]
[InlineData("TEREN/MAPA.BTF")]
public void A_terrain_file_found_as_text_or_binary_is_no_fault(string onDisk) =>
Assert.Empty(TerrainFaults("terrain teren/mapa.txtf endterrain\nFirstInit\n", sbt: false, onDisk));
[Fact]
public void A_terrain_file_missing_both_ways_is_reported_but_an_sbt_named_with_it_is_not()
{
var faults = TerrainFaults("// teren\nterrain teren/mapa.btf teren/stara.sbt\nendterrain\nFirstInit\n", sbt: false);
Assert.Equal((SceneryFaultKind.MissingTerrainFile, "Mapa.scn", 2, null, "teren/mapa.btf"),
Seen(Assert.Single(faults)));
}
[Fact]
public void A_terrain_file_takes_the_place_of_the_sbt_so_terrain_includes_are_read_after_all()
{
var faults = TerrainFaults("terrain teren/mapa.txtf endterrain\ninclude nmt/brak_ter.scm end\nFirstInit\n",
sbt: true, "teren/mapa.txtf");
Assert.Equal((SceneryFaultKind.MissingInclude, "Mapa.scn", 2, null, "nmt/brak_ter.scm"),
Seen(Assert.Single(faults)));
}
[Theory]
[InlineData("include nmt/brak_ter.scm end\nterrain teren/mapa.txtf endterrain\nFirstInit\n", 2)]
[InlineData("node -1 0 t1 triangles trawa\n0 0 0 0 0 0 0 0 end\nendtri\nterrain teren/mapa.txtf endterrain\nFirstInit\n", 4)]
[InlineData("node -1 -1 t1 model 0 0 0 0 teren.t3d none endmodel\nterrain teren/mapa.txtf endterrain\nFirstInit\n", 2)]
[InlineData("FirstInit\nterrain teren/mapa.txtf endterrain\n", 2)]
public void A_terrain_file_behind_what_the_sbt_already_gave_is_passed_over(string scn, int line)
{
var faults = TerrainFaults(scn, sbt: true, "teren/mapa.txtf");
Assert.Equal((SceneryFaultKind.TerrainFileBehindSbt, "Mapa.scn", line, null, "teren/mapa.txtf"),
Seen(Assert.Single(faults)));
}
[Fact]
public void A_model_not_of_the_terrain_leaves_the_sbt_free_to_give_way() =>
Assert.Empty(TerrainFaults("node 500 0 m1 model 0 0 0 0 dom.t3d none endmodel\nterrain teren/mapa.txtf endterrain\nFirstInit\n",
sbt: true, "teren/mapa.txtf"));
}

View File

@@ -1,229 +0,0 @@
using System.Globalization;
using Avalonia.Automation;
using Avalonia.Controls;
using Avalonia.Controls.Documents;
using StarterNG.Controls;
namespace StarterNG.Tests;
[Collection(AvaloniaControls.Name)]
public class ScreenReaderNamesTests
{
static ScreenReaderNamesTests() => ScreenReaderNames.Install();
private static StackPanel Row(params Control[] children)
{
var panel = new StackPanel();
panel.Children.AddRange(children);
return panel;
}
[Fact]
public void An_icon_button_is_named_by_its_tooltip()
{
var button = new Button { Content = new Image() };
ToolTip.SetTip(button, "Otwórz ostatni log symulatora");
Assert.Equal("Otwórz ostatni log symulatora", AutomationProperties.GetName(button));
}
[Fact]
public void A_button_without_a_tooltip_is_named_by_the_text_it_shows()
{
var button = new Button { Content = Row(new Image(), new TextBlock { Text = "Dodaj" }) };
Assert.Equal("Dodaj", AutomationProperties.GetName(button));
}
[Fact]
public void A_button_with_text_of_its_own_keeps_it()
{
var button = new Button { Content = "Zapisz" };
ToolTip.SetTip(button, "Zapisz ustawienia");
Assert.Null(AutomationProperties.GetName(button));
}
[Fact]
public void A_name_given_on_purpose_is_left_alone()
{
var button = new Button();
AutomationProperties.SetName(button, "Discord");
button.Content = new Image();
ToolTip.SetTip(button, "Dołącz do nas");
Assert.Equal("Discord", AutomationProperties.GetName(button));
}
[Fact]
public void A_new_tooltip_replaces_the_name_it_gave()
{
var button = new Button { Content = new Image() };
ToolTip.SetTip(button, "Undo");
ToolTip.SetTip(button, "Cofnij");
Assert.Equal("Cofnij", AutomationProperties.GetName(button));
}
[Fact]
public void Text_put_on_a_button_later_takes_back_the_name_it_was_given()
{
var button = new Button { Content = new Image() };
ToolTip.SetTip(button, "Pomoc");
button.Content = "Pomoc";
Assert.Null(AutomationProperties.GetName(button));
}
[Fact]
public void A_button_with_only_a_sign_on_it_is_named_by_its_tooltip()
{
var button = new Button { Content = "?" };
ToolTip.SetTip(button, "Pomoc");
Assert.Equal("Pomoc", AutomationProperties.GetName(button));
}
[Fact]
public void A_tree_entry_is_named_by_the_visible_text_of_its_header()
{
var hidden = new TextBlock { Text = "ukryte", IsVisible = false };
var item = new TreeViewItem
{
Header = Row(new Image(), new TextBlock { Text = "baltyk_cargo" }, hidden, new TextBlock { Text = " " })
};
Assert.Equal("baltyk_cargo", AutomationProperties.GetName(item));
}
[Fact]
public void A_list_entry_joins_the_texts_it_shows()
{
var item = new ListBoxItem
{
Content = new Border { Child = Row(new TextBlock { Text = "PKPIC" }, new TextBlock { Text = "303E-EP-426" }) }
};
Assert.Equal("PKPIC, 303E-EP-426", AutomationProperties.GetName(item));
}
[Fact]
public void Text_made_of_runs_is_read_whole()
{
var block = new TextBlock();
block.Inlines!.Add(new Run("EP07"));
block.Inlines.Add(new LineBreak());
block.Inlines.Add(new Span { Inlines = { new Run("544") } });
Assert.Equal("EP07 544", ScreenReaderNames.TextOf(block));
}
[Fact]
public void Nothing_to_read_gives_no_name()
{
Assert.Null(ScreenReaderNames.TextOf(null));
Assert.Null(ScreenReaderNames.TextOf(new Image()));
Assert.Null(ScreenReaderNames.TextOf(" "));
Assert.Equal("Opis", ScreenReaderNames.TextOf(new ContentControl { Content = " Opis " }));
}
[Fact]
public void A_field_is_named_by_the_hint_written_in_it()
{
var search = new TextBox { PlaceholderText = "Szukaj…" };
var category = new ComboBox { PlaceholderText = "Kategoria" };
Assert.Equal("Szukaj…", AutomationProperties.GetName(search));
Assert.Equal("Kategoria", AutomationProperties.GetName(category));
}
[Fact]
public void A_setting_row_names_its_inputs_by_its_label()
{
var combo = new ComboBox();
var slider = new Slider();
var browse = new Button { Content = "Wybierz plik…" };
var row = new SettingRow { Content = new Border { Child = Row(combo, slider, browse) } };
row.Label = "Wybór exe";
Assert.Equal("Wybór exe", AutomationProperties.GetName(combo));
Assert.Equal("Wybór exe", AutomationProperties.GetName(slider));
Assert.Null(AutomationProperties.GetName(browse));
}
[Fact]
public void A_setting_row_describes_its_inputs_with_its_explanation()
{
var check = new CheckBox { Content = "Tryb pełnoekranowy" };
var slider = new Slider();
var row = new SettingRow { Label = "Ekran", Content = Row(check, slider) };
row.Description = "Gra zajmie cały ekran.";
row.IdleNote = "Ten symulator nie zna tego ustawienia.";
Assert.Equal("Gra zajmie cały ekran., Ten symulator nie zna tego ustawienia.", AutomationProperties.GetHelpText(check));
Assert.Equal(AutomationProperties.GetHelpText(check), AutomationProperties.GetHelpText(slider));
Assert.Null(AutomationProperties.GetName(check));
row.Description = null;
row.IdleNote = null;
Assert.Null(AutomationProperties.GetHelpText(check));
}
[Fact]
public void A_description_given_on_purpose_is_left_alone()
{
var box = new TextBox();
AutomationProperties.SetHelpText(box, "Ścieżka do exe");
_ = new SettingRow { Content = box, Description = "Plik symulatora" };
Assert.Equal("Ścieżka do exe", AutomationProperties.GetHelpText(box));
}
[Fact]
public void A_setting_row_without_a_label_leaves_its_input_unnamed()
{
var box = new TextBox();
_ = new SettingRow { Content = box };
Assert.Null(AutomationProperties.GetName(box));
}
}
[Collection(AvaloniaControls.Name)]
public class PickerNameTests
{
[Fact]
public void A_picker_is_read_as_its_label_and_its_value()
{
Assert.Equal("Godzina: 07:05", ScreenReaderNames.PickerText("Godzina", "07:05"));
Assert.Equal("Data", ScreenReaderNames.PickerText("Data", null));
Assert.Equal("07:05", ScreenReaderNames.PickerText(null, "07:05"));
Assert.Null(ScreenReaderNames.PickerText("", null));
}
[Fact]
public void A_date_is_read_in_words_with_the_year_only_when_shown()
{
var before = CultureInfo.CurrentCulture;
CultureInfo.CurrentCulture = CultureInfo.GetCultureInfo("pl-PL");
try
{
var date = new DateTimeOffset(2026, 10, 27, 0, 0, 0, TimeSpan.FromHours(1));
Assert.Equal("27 października", ScreenReaderNames.DateText(date, withYear: false));
Assert.Equal("wtorek, 27 października 2026", ScreenReaderNames.DateText(date, withYear: true));
Assert.Null(ScreenReaderNames.DateText(null, withYear: false));
}
finally
{
CultureInfo.CurrentCulture = before;
}
}
[Fact]
public void A_time_is_read_as_hours_and_minutes()
{
Assert.Equal("07:05", ScreenReaderNames.TimeText(new TimeSpan(7, 5, 30)));
Assert.Null(ScreenReaderNames.TimeText(null));
}
}

View File

@@ -1,45 +0,0 @@
using Avalonia;
using StarterNG.Infrastructure;
namespace StarterNG.Tests;
public class SoftwareRenderTests
{
[Theory]
[InlineData("--software-render")]
[InlineData("--Software-Render")]
public void The_switch_asks_for_it_in_any_case(string arg)
{
Assert.True(SoftwareRender.AskedIn(new[] { "--other", arg }));
}
[Fact]
public void Without_the_switch_the_graphics_card_draws()
{
Assert.False(SoftwareRender.AskedIn(Array.Empty<string>()));
Assert.False(SoftwareRender.AskedIn(new[] { "--software" }));
}
[Fact]
public void Windows_draws_on_the_processor_into_a_plain_window_surface()
{
var options = SoftwareRender.Win32Options;
Assert.Equal(new[] { Win32RenderingMode.Software }, options.RenderingMode);
Assert.Equal(new[] { Win32CompositionMode.RedirectionSurface }, options.CompositionMode);
}
[Fact]
public void X11_draws_on_the_processor()
{
Assert.Equal(new[] { X11RenderingMode.Software }, SoftwareRender.X11Options.RenderingMode);
}
[Fact]
public void Both_platforms_options_go_to_the_same_builder()
{
var builder = AppBuilder.Configure<Avalonia.Application>();
Assert.Same(builder, SoftwareRender.ApplyTo(builder));
}
}

View File

@@ -8,7 +8,6 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Avalonia.Headless" Version="12.1.4" />
<PackageReference Include="coverlet.collector" Version="6.0.2" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
<PackageReference Include="xunit" Version="2.9.2" />

View File

@@ -1,98 +0,0 @@
using StarterNG.Infrastructure;
namespace StarterNG.Tests;
public class SystemGraphicsLibrariesTests
{
private const string System32 = @"C:\Windows\System32";
private const string Game = @"E:\SteamLibrary\steamapps\common\MaSzyna";
private static readonly IntPtr Dxgi = new(0x1000);
private static readonly IntPtr D3d11 = new(0x2000);
private static SystemGraphicsLibraries Take(Func<string, bool> beside, Dictionary<string, IntPtr> system)
{
return SystemGraphicsLibraries.Take(System32, Game, beside, Load);
bool Load(string path, out IntPtr handle)
{
handle = system.GetValueOrDefault(Path.GetFileName(path));
return handle != IntPtr.Zero;
}
}
private static SystemGraphicsLibraries WithDxgiAndD3d11(Func<string, bool> beside) =>
Take(beside, new Dictionary<string, IntPtr> { ["dxgi.dll"] = Dxgi, ["d3d11.dll"] = D3d11 });
[Fact]
public void An_import_by_name_gets_the_system_library_with_or_without_its_extension()
{
var taken = WithDxgiAndD3d11(_ => false);
Assert.Equal(Dxgi, taken.Resolve("dxgi"));
Assert.Equal(Dxgi, taken.Resolve("dxgi.dll"));
Assert.Equal(D3d11, taken.Resolve("D3D11.DLL"));
}
[Fact]
public void Other_libraries_and_ones_the_system_lacks_are_left_to_the_usual_search()
{
var taken = WithDxgiAndD3d11(_ => false);
Assert.Equal(IntPtr.Zero, taken.Resolve("user32.dll"));
Assert.Equal(IntPtr.Zero, taken.Resolve("opengl32"));
}
[Fact]
public void They_are_loaded_from_the_system_folder_dxgi_first()
{
var asked = new List<string>();
SystemGraphicsLibraries.Take(System32, Game, _ => false, Load);
Assert.Equal(SystemGraphicsLibraries.Names.Select(n => Path.Combine(System32, n + ".dll")), asked);
Assert.Equal("dxgi", SystemGraphicsLibraries.Names[0]);
bool Load(string path, out IntPtr handle)
{
asked.Add(path);
handle = IntPtr.Zero;
return false;
}
}
[Fact]
public void A_wrapper_beside_the_starter_is_noted()
{
var taken = WithDxgiAndD3d11(path => path == Path.Combine(Game, "dxgi.dll"));
Assert.Equal(new[] { "dxgi.dll" }, taken.Shadowed);
Assert.Contains("dxgi.dll", taken.Note);
}
[Fact]
public void With_nothing_beside_the_starter_there_is_nothing_to_note()
{
var taken = WithDxgiAndD3d11(_ => false);
Assert.Empty(taken.Shadowed);
Assert.Null(taken.Note);
}
[Fact]
public void Only_windows_has_system_libraries_to_take()
{
var taken = SystemGraphicsLibraries.TakeOnWindows();
Assert.Equal(OperatingSystem.IsWindows(), taken is not null);
}
[Fact]
public void An_assembly_with_a_resolver_of_its_own_keeps_it()
{
var taken = WithDxgiAndD3d11(_ => false);
var assembly = typeof(SystemGraphicsLibrariesTests).Assembly;
Assert.True(taken.ServeTo(assembly));
Assert.False(taken.ServeTo(assembly));
}
}

View File

@@ -1,175 +0,0 @@
using Avalonia.Automation.Peers;
using Avalonia.Automation.Provider;
using Avalonia.Input;
using StarterNG.Application;
using StarterNG.Domain.Tapes;
using StarterNG.Tests.Fakes;
using StarterNG.Views.Tapes;
namespace StarterNG.Tests;
/// <summary>A recorded trip walked from the keyboard and read by a screen reader, on both ways of drawing it.</summary>
[Collection(AvaloniaControls.Name)]
public class TapeViewTests
{
// The electronic tape writes its legend in the starter's language.
static TapeViewTests()
{
if (AppServices.CurrentOrNull is null)
{
var installation = new TestInstallation(new InMemoryFileSystem());
AppServices.Initialize(installation.Paths, installation.Files, installation.Clock, installation.Environment);
}
}
public static TheoryData<string> Views => new() { "hasler", "electronic" };
private static TapeView View(string kind) => kind == "hasler" ? new HaslerTapeView() : new ElectronicTapeView();
/// <summary>Two minutes, a sample a second, 15 m a second; running from 10 s to 110 s, braking after 100 s.</summary>
private static HaslerTape Trip() =>
new(Enumerable.Range(0, 121)
.Select(i => new TapeSample(i, i is > 10 and < 110 ? 54 : 0, i * 15.0, i > 100 ? 2 : 0, 5,
i < 50 ? 300 : 0, i == 70))
.ToList());
private static (TapeView View, List<TapeSample?> Hovered) Walking(string kind, bool byDistance = true)
{
var view = View(kind);
view.Tape = Trip();
view.ByDistance = byDistance;
var hovered = new List<TapeSample?>();
view.Hovered += s => hovered.Add(s);
return (view, hovered);
}
[Theory]
[MemberData(nameof(Views))]
public void The_trip_is_a_slider_read_as_the_moment_under_the_cursor(string kind)
{
var view = View(kind);
var peer = Controls.Peer(view);
var value = Assert.IsAssignableFrom<IValueProvider>(peer);
view.Spoken = "10:00:12, km 0,2, 54 km/h";
Assert.Equal(AutomationControlType.Slider, peer.GetAutomationControlType());
Assert.True(peer.IsContentElement());
Assert.True(peer.IsControlElement());
Assert.Equal("10:00:12, km 0,2, 54 km/h", value.Value);
Assert.True(value.IsReadOnly);
Assert.Throws<InvalidOperationException>(() => value.SetValue("x"));
view.Spoken = "10:00:13, km 0,2, 54 km/h";
Assert.Equal("10:00:13, km 0,2, 54 km/h", value.Value);
}
[Theory]
[MemberData(nameof(Views))]
public void The_first_arrow_starts_at_the_beginning_and_the_next_go_a_hundred_metres(string kind)
{
var (view, hovered) = Walking(kind);
Assert.True(Controls.Press(view, Key.Right));
Assert.Equal(0, hovered[^1]!.Value.Time);
Assert.True(Controls.Press(view, Key.Right));
Assert.InRange(hovered[^1]!.Value.DistanceM, TapeView.DistanceStep - 15, TapeView.DistanceStep + 15);
Assert.True(Controls.Press(view, Key.Right, KeyModifiers.Control));
Assert.True(hovered[^1]!.Value.DistanceM >= TapeView.DistanceStep * TapeView.CtrlTimes - 15);
Assert.True(Controls.Press(view, Key.Left, KeyModifiers.Control));
Assert.True(hovered[^1]!.Value.DistanceM <= TapeView.DistanceStep + 15);
Assert.True(Controls.Press(view, Key.End));
Assert.Equal(120, hovered[^1]!.Value.Time);
Assert.True(Controls.Press(view, Key.Right));
Assert.Equal(120, hovered[^1]!.Value.Time);
Assert.True(Controls.Press(view, Key.Home));
Assert.Equal(0, hovered[^1]!.Value.Time);
Assert.True(Controls.Press(view, Key.Left));
Assert.Equal(0, hovered[^1]!.Value.Time);
}
[Theory]
[MemberData(nameof(Views))]
public void By_time_an_arrow_goes_ten_seconds(string kind)
{
var (view, hovered) = Walking(kind, byDistance: false);
Controls.Press(view, Key.Left);
Assert.Equal(0, hovered[^1]!.Value.Time);
Controls.Press(view, Key.Right);
Assert.Equal(TapeView.TimeStep, hovered[^1]!.Value.Time);
Controls.Press(view, Key.Left);
Assert.Equal(0, hovered[^1]!.Value.Time);
}
[Theory]
[MemberData(nameof(Views))]
public void Enter_picks_the_sample_the_keys_stand_at_once_they_have_moved(string kind)
{
var (view, _) = Walking(kind);
TapeSample? picked = null;
view.Picked += s => picked = s;
Assert.False(Controls.Press(view, Key.Enter));
Assert.Null(picked);
Controls.Press(view, Key.End);
Assert.True(Controls.Press(view, Key.Enter));
Assert.Equal(120, picked!.Value.Time);
}
[Theory]
[MemberData(nameof(Views))]
public void A_new_trip_starts_the_keys_from_its_beginning(string kind)
{
var (view, hovered) = Walking(kind);
Controls.Press(view, Key.End);
view.Tape = Trip();
Controls.Press(view, Key.Right);
Assert.Equal(0, hovered[^1]!.Value.Time);
}
[Theory]
[MemberData(nameof(Views))]
public void Other_keys_and_an_empty_trip_are_left_alone(string kind)
{
var (view, hovered) = Walking(kind);
var empty = View(kind);
var blank = View(kind);
blank.Tape = new HaslerTape([]);
Assert.False(Controls.Press(view, Key.A));
Assert.False(Controls.Press(empty, Key.Right));
Assert.False(Controls.Press(blank, Key.Right));
Assert.Empty(hovered);
}
[Theory]
[MemberData(nameof(Views))]
public void The_trip_draws_with_and_without_the_focus(string kind)
{
var (view, _) = Walking(kind);
view.Mark = 60;
var window = Controls.Show(view, 1200, 600);
try
{
Assert.True(view.Focusable);
view.Focus();
Controls.Press(view, Key.Right);
Controls.Settle();
window.Focus();
Controls.Settle();
}
finally
{
window.Close();
}
}
}

View File

@@ -7,7 +7,6 @@ using Avalonia.Markup.Xaml;
using Avalonia.Threading;
using StarterNG.Application;
using StarterNG.Classes;
using StarterNG.Controls;
using StarterNG.Infrastructure;
using StarterNG.Services;
@@ -25,10 +24,6 @@ public partial class App : Avalonia.Application
public override void Initialize()
{
// Before any control exists: the names are given as controls are filled in.
ScreenReaderNames.Install();
DialogKeyboard.Install();
AvaloniaXamlLoader.Load(this);
AppServices.Current.SettingsStore.Load();
@@ -207,12 +202,8 @@ public partial class App : Avalonia.Application
if (check.ExecutableMissing())
await main.OfferExecutablePickAsync();
// A build without AVX2 in the folder is started instead, and needs no notice.
var services = AppServices.Current;
if (services.Settings.CpuNotice
&& services.Executables.Resolve(services.Settings, out _) is var executable
&& services.Executables.WillNotRunHere(executable))
await main.ShowCpuNoticeAsync(executable);
if (CpuFeatures.LacksAvx2 && AppServices.Current.Settings.CpuNotice)
await main.ShowCpuNoticeAsync();
});
});
}

View File

@@ -81,9 +81,6 @@ public sealed class AppServices
_current ?? throw new InvalidOperationException(
"AppServices.Current read before Initialize(); the composition root must be built first.");
/// <summary>The services once built, or null before: for what may run either way, such as a control in a test.</summary>
public static AppServices? CurrentOrNull => _current;
public static AppServices Initialize(IGamePaths? paths = null, IFileSystem? files = null, IClock? clock = null,
IEnvironment? environment = null)
{

View File

@@ -1,89 +0,0 @@
using System;
using Avalonia;
using Avalonia.Automation;
using Avalonia.Automation.Peers;
using Avalonia.Controls;
using Avalonia.VisualTree;
namespace StarterNG.Controls;
/// <summary>
/// Says what a click changed out of sight, such as a quality level that moved a dozen
/// sliders or a time set to now. It wraps the whole window: a screen reader learns of
/// an element only on its way to the focused one, and this lies on every such way.
/// A text marked <see cref="ChangesProperty"/> is read whenever it changes.
/// </summary>
public class Announcer : Decorator
{
/// <summary>How long a message stays its name, so it is not read again later on.</summary>
public static readonly TimeSpan Shown = TimeSpan.FromSeconds(3);
public static readonly AttachedProperty<bool> ChangesProperty =
AvaloniaProperty.RegisterAttached<Announcer, TextBlock, bool>("Changes");
public static bool GetChanges(TextBlock block) => block.GetValue(ChangesProperty);
public static void SetChanges(TextBlock block, bool value) => block.SetValue(ChangesProperty, value);
static Announcer()
{
TextBlock.TextProperty.Changed.AddClassHandler<TextBlock>((block, _) =>
{
if (GetChanges(block))
Say(block, block.Text);
});
}
private readonly Func<DateTime> _now;
private string? _message;
private DateTime _saidAt;
public Announcer() : this(() => DateTime.UtcNow)
{
}
public Announcer(Func<DateTime> now) => _now = now;
/// <summary>The message while it is fresh, then nothing.</summary>
public string? Message => _message is not null && _now() - _saidAt < Shown ? _message : null;
/// <summary>Says the text through the announcer of the window <paramref name="from"/> is in.</summary>
public static void Say(Visual from, string? text)
{
var announcer = from as Announcer ?? from.FindAncestorOfType<Announcer>();
announcer?.Say(text);
}
public void Say(string? text)
{
if (string.IsNullOrWhiteSpace(text))
return;
string? before = Message;
_message = text.Trim();
_saidAt = _now();
// Its name changing is what makes a live region speak.
if (ControlAutomationPeer.CreatePeerForElement(this) is Peer peer)
peer.Told(before, _message);
}
protected override AutomationPeer OnCreateAutomationPeer() => new Peer(this);
private sealed class Peer : ControlAutomationPeer
{
public Peer(Announcer owner) : base(owner)
{
}
private Announcer Announcer => (Announcer)Owner;
public void Told(string? before, string now) =>
RaisePropertyChangedEvent(AutomationElementIdentifiers.NameProperty, before, now);
protected override string? GetNameCore() => Announcer.Message;
protected override AutomationLiveSetting GetLiveSettingCore() => AutomationLiveSetting.Polite;
protected override AutomationControlType GetAutomationControlTypeCore() => AutomationControlType.Group;
}
}

View File

@@ -1,28 +0,0 @@
using System;
using StarterNG.Application;
namespace StarterNG.Controls;
/// <summary>
/// The starter's texts as the controls here read them: in its language once the
/// application is built, the key itself before that, as in a test.
/// </summary>
internal static class AppLanguage
{
public static string Text(string key) => AppServices.CurrentOrNull?.Localization[key] ?? key;
/// <summary>Raised when the language is changed; nothing is raised before the application is built.</summary>
public static event Action? Changed
{
add
{
if (AppServices.CurrentOrNull?.Localization is { } loc)
loc.LanguageChanged += value;
}
remove
{
if (AppServices.CurrentOrNull?.Localization is { } loc)
loc.LanguageChanged -= value;
}
}
}

View File

@@ -1,77 +0,0 @@
using System.Linq;
using Avalonia.Controls;
using Avalonia.Input;
using Avalonia.Interactivity;
using Avalonia.Threading;
using Avalonia.VisualTree;
namespace StarterNG.Controls;
/// <summary>
/// What every window opened over another does for someone at the keyboard, as a dialog
/// of Windows does: it opens with focus on its default button or else its first
/// control, where it opened with nothing focused and a screen reader said only its
/// title; Esc closes it; Tab with nothing focused starts from the first control.
/// </summary>
public static class DialogKeyboard
{
/// <summary>False for a window that stays open beside the main one, such as the tapes: Esc there is not a way out.</summary>
public static readonly Avalonia.AttachedProperty<bool> EscapeClosesProperty =
Avalonia.AvaloniaProperty.RegisterAttached<Window, bool>("EscapeCloses", typeof(DialogKeyboard), defaultValue: true);
public static bool GetEscapeCloses(Window window) => window.GetValue(EscapeClosesProperty);
public static void SetEscapeCloses(Window window, bool value) => window.SetValue(EscapeClosesProperty, value);
public static void Install() =>
Window.WindowOpenedEvent.AddClassHandler<Window>((window, _) => OnOpened(window));
private static void OnOpened(Window window)
{
// The main window and the splash have no owner, and their own ways.
if (window.Owner is null)
return;
window.AddHandler(InputElement.KeyDownEvent, (_, e) => OnTab(window, e), RoutingStrategies.Tunnel);
window.AddHandler(InputElement.KeyDownEvent, (_, e) => OnEscape(window, e));
Dispatcher.UIThread.Post(() => FocusFirst(window), DispatcherPriority.Loaded);
}
// Bubbling and only when nothing took it: a list closing its drop-down, a cancel
// button or a window of its own that handles the key keep it.
private static void OnEscape(Window window, KeyEventArgs e)
{
if (e.Handled || e.Key != Key.Escape || e.KeyModifiers != KeyModifiers.None || !GetEscapeCloses(window))
return;
window.Close();
e.Handled = true;
}
private static void OnTab(Window window, KeyEventArgs e)
{
if (window.FocusManager is not { } focus)
return;
var next = KeyboardFocus.TabFromNowhere(e.Key, e.KeyModifiers, focus.GetFocusedElement(), window,
focus.FindFirstFocusableElement, focus.FindLastFocusableElement);
if (next is not null && next.Focus(NavigationMethod.Tab))
e.Handled = true;
}
/// <summary>Focus on the default button, or the first control when there is none; left alone when the window placed it itself.</summary>
public static void FocusFirst(Window window)
{
if (window.FocusManager is not { } focus)
return;
var focused = focus.GetFocusedElement();
if (focused is not null && !ReferenceEquals(focused, window))
return;
IInputElement? target = window.GetVisualDescendants().OfType<Button>()
.FirstOrDefault(b => b.IsDefault && b.IsEffectivelyVisible && b.IsEffectivelyEnabled)
?? focus.FindFirstFocusableElement();
target?.Focus(NavigationMethod.Tab);
}
}

View File

@@ -1,157 +0,0 @@
using System;
using System.Linq;
using Avalonia;
using Avalonia.Automation;
using Avalonia.Automation.Peers;
using Avalonia.Automation.Provider;
using Avalonia.Controls;
using Avalonia.Controls.Primitives;
using Avalonia.Interactivity;
using Avalonia.Threading;
using Avalonia.VisualTree;
using StarterNG.Application;
namespace StarterNG.Controls;
/// <summary>
/// A tree entry that tells a screen reader whether it opens and what lies under it.
/// Avalonia's own says only that it is an entry, and hangs the entries under a group
/// on the panel inside the group, so a reader heard every scenery at level one: a
/// group such as Całkowo sounded like a scenery, and what was in it like its neighbours.
/// Under the mouse a reader hears only what lies there, the name in the row; the row
/// is told the state as well, so the mouse also hears that an entry opens.
/// </summary>
public class ExpandableTreeViewItem : TreeViewItem
{
protected override Type StyleKeyOverride => typeof(TreeViewItem);
protected override AutomationPeer OnCreateAutomationPeer() => new Peer(this);
/// <summary>The words for an open and a closed entry, in the starter's language.</summary>
public static Func<ExpandCollapseState, string?> StateWords { get; set; } = DefaultStateWords;
private static string? DefaultStateWords(ExpandCollapseState state) =>
AppServices.Current?.Localization is { } loc
? WordFor(state, key => loc[key])
: null;
public static string? WordFor(ExpandCollapseState state, Func<string, string> loc) => state switch
{
ExpandCollapseState.Expanded => loc("TreeExpanded"),
ExpandCollapseState.Collapsed => loc("TreeCollapsed"),
_ => null,
};
private Control? _row;
private string? _rowName;
protected override void OnApplyTemplate(TemplateAppliedEventArgs e)
{
base.OnApplyTemplate(e);
_row = e.NameScope.Find<Control>("PART_LayoutRoot");
// A part of a template is passed over when Windows looks for what lies under the
// mouse, so the gaps beside the arrow and the name led to the entry, which told no
// state. As a control the row itself is found there.
if (_row is not null)
AutomationProperties.SetAccessibilityView(_row, AccessibilityView.Control);
TellRowLater();
}
protected override void OnLoaded(RoutedEventArgs e)
{
base.OnLoaded(e);
if (AppServices.Current?.Localization is { } loc)
loc.LanguageChanged += TellRowLater;
TellRow();
}
protected override void OnUnloaded(RoutedEventArgs e)
{
base.OnUnloaded(e);
if (AppServices.Current?.Localization is { } loc)
loc.LanguageChanged -= TellRowLater;
}
protected override void OnPropertyChanged(AvaloniaPropertyChangedEventArgs change)
{
base.OnPropertyChanged(change);
if (change.Property == IsExpandedProperty || change.Property == ItemCountProperty
|| change.Property == AutomationProperties.NameProperty)
TellRow();
else if (change.Property == HeaderProperty)
TellRowLater();
}
// A new header is laid out only after it is set.
private void TellRowLater() => Dispatcher.UIThread.Post(TellRow, DispatcherPriority.Loaded);
/// <summary>
/// Gives whatever the mouse may point at in the row the entry's state, and its name
/// where it shows no text of its own, such as the arrow or an icon.
/// </summary>
private void TellRow()
{
if (_row is null)
return;
string? state = StateWords(ExpandState);
string? name = AutomationProperties.GetName(this);
foreach (var part in _row.GetVisualDescendants().OfType<Control>().Prepend(_row))
{
if (string.IsNullOrEmpty(state))
part.ClearValue(AutomationProperties.HelpTextProperty);
else
AutomationProperties.SetHelpText(part, state);
if (part is TextBlock)
continue;
string? had = AutomationProperties.GetName(part);
if (string.IsNullOrEmpty(had) || had == _rowName)
AutomationProperties.SetName(part, name);
}
_rowName = name;
}
/// <summary>What a screen reader is told: a leaf, or open or closed.</summary>
public ExpandCollapseState ExpandState => StateFor(ItemCount > 0, IsExpanded);
public static ExpandCollapseState StateFor(bool hasChildren, bool expanded) => (hasChildren, expanded) switch
{
(false, _) => ExpandCollapseState.LeafNode,
(true, true) => ExpandCollapseState.Expanded,
(true, false) => ExpandCollapseState.Collapsed
};
/// <summary>The entry this one hangs under, or null at the top of the tree.</summary>
public ExpandableTreeViewItem? ReadableParent => ItemsControlFromItemContainer(this) as ExpandableTreeViewItem;
private sealed class Peer : TreeViewItemAutomationPeer, IExpandCollapseProvider
{
private readonly ExpandableTreeViewItem _item;
public Peer(ExpandableTreeViewItem item) : base(item)
{
_item = item;
item.PropertyChanged += (_, e) =>
{
if (e.Property == IsExpandedProperty && e.OldValue is bool was && e.NewValue is bool now)
RaisePropertyChangedEvent(ExpandCollapsePatternIdentifiers.ExpandCollapseStateProperty,
StateFor(item.ItemCount > 0, was), StateFor(item.ItemCount > 0, now));
};
}
// Only the way up changes: a reader counts the entries over this one to tell its
// level. The way down stays the controls on screen, so whatever the mouse points
// at still leads up through its entry to the window.
protected override AutomationPeer? GetParentCore() =>
_item.ReadableParent is { } parent ? GetOrCreate(parent) : base.GetParentCore();
public ExpandCollapseState ExpandCollapseState => _item.ExpandState;
public bool ShowsMenu => false;
public void Expand() => _item.IsExpanded = true;
public void Collapse() => _item.IsExpanded = false;
}
}

View File

@@ -1,24 +0,0 @@
using System;
using Avalonia.Input;
namespace StarterNG.Controls;
public static class KeyboardFocus
{
/// <summary>
/// Focus that fell out with a control taken away or switched off leaves the window
/// itself focused, and Tab then went nowhere until something was clicked - for
/// someone without a mouse, nowhere at all. Tab starts again from the first
/// control, Shift+Tab from the last. Null when focus is somewhere and Tab moves it
/// as usual.
/// </summary>
public static IInputElement? TabFromNowhere(Key key, KeyModifiers modifiers, IInputElement? focused,
IInputElement window, Func<IInputElement?> first,
Func<IInputElement?> last)
{
if (key != Key.Tab || focused is not null && !ReferenceEquals(focused, window))
return null;
return modifiers.HasFlag(KeyModifiers.Shift) ? last() : first();
}
}

View File

@@ -1,108 +0,0 @@
using System;
using System.Globalization;
using System.Linq;
using Avalonia;
using Avalonia.Automation;
using Avalonia.Automation.Peers;
using Avalonia.Automation.Provider;
using Avalonia.Controls;
using Avalonia.Controls.Primitives;
using Avalonia.Interactivity;
using Avalonia.VisualTree;
namespace StarterNG.Controls;
/// <summary>
/// A slider that tells a screen reader the value it shows beside it. Avalonia's own
/// gives only the bare number, which NVDA reads as a share of the slider's length:
/// -5 °C was read as 45, a fog of 2 km as wherever the knob stood on its scale.
/// The track under the mouse says the same, where its bare buttons and knob said nothing.
/// </summary>
public class ReadableSlider : Slider
{
public static readonly StyledProperty<string?> ValueTextProperty =
AvaloniaProperty.Register<ReadableSlider, string?>(nameof(ValueText));
/// <summary>The value as written for the reader, such as "2,4 km"; the number when unset.</summary>
public string? ValueText
{
get => GetValue(ValueTextProperty);
set => SetValue(ValueTextProperty, value);
}
protected override Type StyleKeyOverride => typeof(Slider);
protected override AutomationPeer OnCreateAutomationPeer() => new Peer(this);
/// <summary>What a screen reader is told the slider holds.</summary>
public string SpokenValue => SpokenText(ValueText, Value);
public static string SpokenText(string? valueText, double value) =>
string.IsNullOrWhiteSpace(valueText)
? value.ToString("0.##", CultureInfo.CurrentCulture)
: valueText.Trim();
/// <summary>What the mouse finds over the track: the slider's name and its value.</summary>
public string TrackText =>
AutomationProperties.GetName(this) is { } name && !string.IsNullOrWhiteSpace(name)
? $"{name.Trim()}: {SpokenValue}"
: SpokenValue;
private Track? _track;
protected override void OnApplyTemplate(TemplateAppliedEventArgs e)
{
base.OnApplyTemplate(e);
_track = e.NameScope.Find<Track>("PART_Track");
NameTrack();
}
// The knob gets its own template only when first laid out.
protected override void OnLoaded(RoutedEventArgs e)
{
base.OnLoaded(e);
NameTrack();
}
protected override void OnPropertyChanged(AvaloniaPropertyChangedEventArgs change)
{
base.OnPropertyChanged(change);
if (change.Property == ValueProperty || change.Property == ValueTextProperty
|| change.Property == AutomationProperties.NameProperty)
NameTrack();
}
private void NameTrack()
{
if (_track is null)
return;
string text = TrackText;
foreach (var part in _track.GetVisualDescendants().OfType<Control>().Prepend(_track))
AutomationProperties.SetName(part, text);
}
private sealed class Peer : RangeBaseAutomationPeer, IValueProvider
{
private readonly ReadableSlider _slider;
// A moved knob is told by the range peer already; the reader then asks for this
// text, set by then. Telling the text's change too would have it spoken twice.
public Peer(ReadableSlider slider) : base(slider) => _slider = slider;
protected override AutomationControlType GetAutomationControlTypeCore() => AutomationControlType.Slider;
protected override string GetClassNameCore() => "Slider";
string? IValueProvider.Value => _slider.SpokenValue;
bool IValueProvider.IsReadOnly => !_slider.IsEnabled;
void IValueProvider.SetValue(string? value)
{
if (!double.TryParse(value, NumberStyles.Float, CultureInfo.CurrentCulture, out double number))
throw new ArgumentException($"Not a number: {value}", nameof(value));
_slider.Value = number;
}
}
}

View File

@@ -1,433 +0,0 @@
using System;
using System.Collections.Generic;
using System.Globalization;
using System.Linq;
using System.Runtime.CompilerServices;
using Avalonia;
using Avalonia.Automation;
using Avalonia.Automation.Peers;
using Avalonia.Controls;
using Avalonia.Controls.Documents;
using Avalonia.Controls.Primitives;
using Avalonia.Input;
namespace StarterNG.Controls;
/// <summary>
/// The names a screen reader says for controls that show no plain text of their own.
/// Without one it said the type of whatever was inside: an icon button was read as
/// "Material.Icons.Avalonia.MaterialIcon", a scenery in the tree as nothing at all.
/// An icon button is named by its tooltip, a list or tree entry by the text it shows,
/// a field by the hint written in it. A name given on purpose is left alone.
/// </summary>
public static class ScreenReaderNames
{
// What was given here last, so a later change replaces it but nothing else.
private static readonly ConditionalWeakTable<StyledElement, string> Given = new();
public static void Install()
{
ContentControl.ContentProperty.Changed.AddClassHandler<Button>((b, _) => NameButton(b));
ToolTip.TipProperty.Changed.AddClassHandler<Button>((b, _) => NameButton(b));
ContentControl.ContentProperty.Changed.AddClassHandler<ListBoxItem>((i, _) => Give(i, TextOf(i.Content)));
HeaderedItemsControl.HeaderProperty.Changed.AddClassHandler<TreeViewItem>((i, _) => Give(i, TextOf(i.Header)));
HeaderedContentControl.HeaderProperty.Changed.AddClassHandler<HeaderedContentControl>((c, _) => NameGroup(c));
ComboBox.PlaceholderTextProperty.Changed.AddClassHandler<ComboBox>((c, _) => Give(c, c.PlaceholderText));
TextBox.PlaceholderTextProperty.Changed.AddClassHandler<TextBox>((t, _) => Give(t, t.PlaceholderText));
SelectingItemsControl.SelectionChangedEvent.AddClassHandler<ComboBox>((c, _) => TellChoice(c));
Control.LoadedEvent.AddClassHandler<ComboBox>((c, _) => NameByLabel(c));
Control.LoadedEvent.AddClassHandler<TextBox>((c, _) => NameByLabel(c));
Control.LoadedEvent.AddClassHandler<Slider>((c, _) => NameByLabel(c));
Control.LoadedEvent.AddClassHandler<NumericUpDown>((c, _) => NameByLabel(c));
Control.LoadedEvent.AddClassHandler<DatePicker>((c, _) => NameByLabel(c));
Control.LoadedEvent.AddClassHandler<TimePicker>((c, _) => NameByLabel(c));
Control.LoadedEvent.AddClassHandler<Image>((i, _) => NamePicture(i));
Control.LoadedEvent.AddClassHandler<PathIcon>((i, _) => NamePicture(i));
TemplatedControl.TemplateAppliedEvent.AddClassHandler<DatePicker>((p, e) => KeepPickerButton(p, e));
TemplatedControl.TemplateAppliedEvent.AddClassHandler<TimePicker>((p, e) => KeepPickerButton(p, e));
DatePicker.SelectedDateProperty.Changed.AddClassHandler<DatePicker>((p, _) => NamePicker(p));
TimePicker.SelectedTimeProperty.Changed.AddClassHandler<TimePicker>((p, _) => NamePicker(p));
AutomationProperties.NameProperty.Changed.AddClassHandler<DatePicker>((p, _) => NamePicker(p));
AutomationProperties.NameProperty.Changed.AddClassHandler<TimePicker>((p, _) => NamePicker(p));
TemplatedControl.TemplateAppliedEvent.AddClassHandler<NumericUpDown>((n, e) => ForwardToTextBox(n, e));
TemplatedControl.TemplateAppliedEvent.AddClassHandler<ButtonSpinner>((s, e) => NameSpinButtons(s, e));
AutomationProperties.NameProperty.Changed.AddClassHandler<Control>((c, e) => TranslateTemplateName(c, e));
AppLanguage.Changed += RetranslateTemplateNames;
}
/// <summary>
/// A number box is reached through the text box inside it, which had no name: the
/// reader heard "edit, 0,1" and not what the number is. It takes the box's name and
/// explanation, and keeps them when they change.
/// </summary>
private static void ForwardToTextBox(NumericUpDown box, TemplateAppliedEventArgs e)
{
if (e.NameScope.Find<TextBox>("PART_TextBox") is not { } text)
return;
text.Bind(AutomationProperties.NameProperty, box.GetObservable(AutomationProperties.NameProperty));
text.Bind(AutomationProperties.HelpTextProperty, box.GetObservable(AutomationProperties.HelpTextProperty));
}
/// <summary>
/// The arrows of a number box were read as "Avalonia.Controls.Shapes.Path" and were two
/// more stops for Tab. They say what they do, and Tab passes them: the arrow keys in the
/// box do the same, as in any spin box of Windows.
/// </summary>
private static void NameSpinButtons(ButtonSpinner spinner, TemplateAppliedEventArgs e)
{
foreach (var (part, key) in new[] { ("PART_IncreaseButton", "SpinUp"), ("PART_DecreaseButton", "SpinDown") })
{
if (e.NameScope.Find<Control>(part) is not { } button)
continue;
KeyboardNavigation.SetIsTabStop(button, false);
TemplateNames.AddOrUpdate(button, key);
AutomationProperties.SetName(button, AppLanguage.Text(key));
}
}
/// <summary>
/// The English names Avalonia's own templates give their parts - the window's buttons,
/// the arrows of a scroll bar - and the texts they are read as instead.
/// </summary>
private static readonly Dictionary<string, string> EnglishTemplateNames = new(StringComparer.Ordinal)
{
["Minimize"] = "ChromeMinimize",
["Maximize"] = "ChromeMaximize",
["Restore"] = "ChromeRestore",
["Close"] = "ChromeClose",
["Line up"] = "ScrollLineUp",
["Line down"] = "ScrollLineDown",
["Page up"] = "ScrollPageUp",
["Page down"] = "ScrollPageDown",
["Column left"] = "ScrollColumnLeft",
["Column right"] = "ScrollColumnRight",
["Page left"] = "ScrollPageLeft",
["Page right"] = "ScrollPageRight",
["Position"] = "ScrollPosition",
};
// The parts given a translated name, with the text they were given it from.
private static readonly ConditionalWeakTable<Control, string> TemplateNames = new();
/// <summary>An English name set by a template is replaced by the same thing in the starter's language.</summary>
private static void TranslateTemplateName(Control control, AvaloniaPropertyChangedEventArgs e)
{
if (e.Priority == Avalonia.Data.BindingPriority.LocalValue || e.NewValue is not string english
|| !EnglishTemplateNames.TryGetValue(english, out string? key)
|| AppLanguage.Text(key) is not { Length: > 0 } text || text == english)
return;
TemplateNames.AddOrUpdate(control, key);
AutomationProperties.SetName(control, text);
}
private static void RetranslateTemplateNames()
{
foreach (var (control, key) in TemplateNames)
AutomationProperties.SetName(control, AppLanguage.Text(key));
}
// A date or time picker is reached through the button inside it, which was read as
// "Avalonia.Controls.Grid": its texts are filled in only after the name is looked for.
private static readonly ConditionalWeakTable<TemplatedControl, Button> PickerButtons = new();
private static void KeepPickerButton(TemplatedControl picker, TemplateAppliedEventArgs e)
{
if (e.NameScope.Find<Button>("PART_FlyoutButton") is not { } button)
return;
PickerButtons.AddOrUpdate(picker, button);
NamePicker(picker);
}
private static void NamePicker(TemplatedControl picker)
{
if (!PickerButtons.TryGetValue(picker, out var button))
return;
string? value = picker switch
{
DatePicker date => DateText(date.SelectedDate, date.YearVisible),
TimePicker time => TimeText(time.SelectedTime),
_ => null
};
AutomationProperties.SetName(button, PickerText(AutomationProperties.GetName(picker), value));
}
/// <summary>The picker's label and what it holds, as the button inside it is read.</summary>
public static string? PickerText(string? label, string? value)
{
if (string.IsNullOrEmpty(label))
return value;
return string.IsNullOrEmpty(value) ? label : $"{label}: {value}";
}
/// <summary>Day and month in words, the year too when the picker shows one.</summary>
public static string? DateText(DateTimeOffset? date, bool withYear) =>
date?.ToString(withYear ? "D" : "M", CultureInfo.CurrentCulture);
public static string? TimeText(TimeSpan? time) =>
time?.ToString(@"hh\:mm", CultureInfo.InvariantCulture);
// The labels already followed, so a label read again is not followed twice.
private static readonly ConditionalWeakTable<TextBlock, Control> Followed = new();
/// <summary>Longer than this, a text beside a field is a description, not its label.</summary>
private const int LabelLength = 60;
/// <summary>
/// A field named by the label a sighted reader sees beside it, and named again when
/// the label changes with the language. A name given otherwise is left alone.
/// </summary>
public static void NameByLabel(Control input)
{
if (LabelOf(input) is not { } label)
return;
Give(input, TextOf(label));
if (Followed.TryAdd(label, input))
label.PropertyChanged += (_, e) =>
{
if (e.Property == TextBlock.TextProperty)
Give(input, TextOf(label));
};
}
/// <summary>
/// The text that labels a field: to its left in the same grid row, above it in the
/// same grid column, or just before it in any other panel. Null when there is none.
/// </summary>
public static TextBlock? LabelOf(Control input)
{
if (input.Parent is not Panel panel)
return null;
var labels = panel.Children.OfType<TextBlock>().Where(IsLabel).ToList();
// A panel that only holds inputs - a number box and the list shown in its place -
// is labelled where it stands itself.
if (labels.Count == 0)
return panel.Parent is Panel ? LabelOf(panel) : null;
if (panel is Grid)
{
int row = Grid.GetRow(input), column = Grid.GetColumn(input);
return labels.Where(t => Grid.GetRow(t) == row && Grid.GetColumn(t) < column)
.OrderByDescending(Grid.GetColumn).FirstOrDefault()
?? labels.FirstOrDefault(t => Grid.GetColumn(t) == column && Grid.GetRow(t) == row - 1);
}
int at = panel.Children.IndexOf(input);
return at > 0 && panel.Children[at - 1] is TextBlock before && labels.Contains(before) ? before : null;
}
private static bool IsLabel(TextBlock block) =>
block.IsVisible && TextOf(block) is { Length: <= LabelLength };
/// <summary>
/// A panel with a title, such as Scenerie or Skład, made a named group: the reader
/// says where focus went in, where before the panel was not there for it at all.
/// Tabs and expanders, which are panels with a title too, speak for themselves.
/// </summary>
private static void NameGroup(HeaderedContentControl panel)
{
if (panel.GetType() != typeof(HeaderedContentControl) && panel is not SettingsSection)
return;
string? name = TextOf(panel.Header);
Give(panel, name);
AutomationProperties.SetControlTypeOverride(panel, name is null ? null : AutomationControlType.Group);
// Content as well as control: NVDA passes over a group that is not both.
AutomationProperties.SetAccessibilityView(panel, name is null ? AccessibilityView.Default : AccessibilityView.Content);
}
// How far up a picture looks for what it shows: the button or card it sits in,
// not the panel around them.
private const int PictureReach = 3;
/// <summary>
/// Names a picture after the caption beside it or the button or card it lies in. Under the mouse a reader
/// hears what lies there, and a bare picture said nothing: a vehicle in the consist,
/// the logo, an icon on a button.
/// </summary>
public static void NamePicture(Control picture)
{
if ((!string.IsNullOrEmpty(AutomationProperties.GetName(picture)) && !Given.TryGetValue(picture, out _))
|| AutomationProperties.GetLabeledBy(picture) is not null)
return;
// A caption beside it says what it shows, such as a vehicle class by its picture.
if (picture.Parent is Panel row
&& row.Children.OfType<TextBlock>().FirstOrDefault(t => t.IsVisible && !string.IsNullOrWhiteSpace(t.Text)) is { } caption)
{
AutomationProperties.SetLabeledBy(picture, caption);
return;
}
var holder = picture.Parent as Control;
for (int i = 0; i < PictureReach && holder is not null; i++, holder = holder.Parent as Control)
{
if (!string.IsNullOrEmpty(AutomationProperties.GetName(holder)) || holder is Button)
{
AutomationProperties.SetLabeledBy(picture, holder);
return;
}
if (TextOf(ToolTip.GetTip(holder)) is { } tip)
{
Give(picture, tip);
return;
}
}
}
/// <summary>
/// Says what a closed list now holds when the arrow keys change it. Avalonia tells
/// Windows of a new value only for a list one types into, so NVDA said nothing.
/// </summary>
public static void TellChoice(ComboBox combo)
{
if (combo.IsKeyboardFocusWithin && !combo.IsDropDownOpen && !combo.IsEditable)
Announcer.Say(combo, SpokenItem(combo.SelectedItem));
}
/// <summary>What a reader is told a list entry is, as Avalonia tells it.</summary>
public static string? SpokenItem(object? item) => item switch
{
null => null,
Control c when AutomationProperties.GetName(c) is { Length: > 0 } name => name,
ContentControl c => TextOf(c.Content) ?? c.Content?.ToString(),
_ => TextOf(item) ?? item.ToString(),
};
// A sign such as "?" says nothing read aloud; its tooltip says what it does.
private static void NameButton(Button button) =>
Give(button, button.Content is string text && text.Any(char.IsLetterOrDigit)
? null
: TextOf(ToolTip.GetTip(button)) ?? TextOf(button.Content));
// The descriptions given here, so a later one replaces it but nothing else.
private static readonly ConditionalWeakTable<StyledElement, string> Described = new();
/// <summary>
/// The inputs of a setting row, described by the row's explanation and the note on
/// why the simulator would pass it over: a reader hears them after the name, where
/// a sighted one sees them under it.
/// </summary>
public static void DescribeInputs(object? content, params string?[] notes)
{
string? text = Join(notes) is { Length: > 0 } joined ? joined : null;
foreach (var input in DescribedInputs(content))
Describe(input, text);
}
private static void Describe(StyledElement target, string? text)
{
string? current = AutomationProperties.GetHelpText(target);
bool ours = Described.TryGetValue(target, out string? given) && current == given;
if (!string.IsNullOrEmpty(current) && !ours)
return;
if (string.IsNullOrEmpty(text))
{
if (ours)
target.ClearValue(AutomationProperties.HelpTextProperty);
Described.Remove(target);
return;
}
AutomationProperties.SetHelpText(target, text);
Described.AddOrUpdate(target, text);
}
/// <summary>
/// The inputs of a setting row, named by the row's label: a list, a slider or a box
/// beside the label otherwise had no name at all.
/// </summary>
public static void NameInputs(object? content, string? label)
{
foreach (var input in Inputs(content))
Give(input, label);
}
/// <summary>
/// The value a setting row shows, given to the slider in it, so the reader hears
/// "100%" or "Wyłączone" and not where the knob stands.
/// </summary>
public static void TellValue(object? content, string? valueText)
{
foreach (var slider in Inputs(content).OfType<ReadableSlider>())
slider.ValueText = valueText;
}
private static IEnumerable<Control> Inputs(object? content) => content switch
{
ComboBox or Slider or TextBox or NumericUpDown => new[] { (Control)content },
Panel panel => panel.Children.SelectMany(Inputs),
Decorator decorator => Inputs(decorator.Child),
_ => Array.Empty<Control>()
};
// A check box says its own text, so it is described but never named by the row.
private static IEnumerable<Control> DescribedInputs(object? content) => content switch
{
CheckBox box => new[] { (Control)box },
Panel panel => panel.Children.SelectMany(DescribedInputs),
Decorator decorator => DescribedInputs(decorator.Child),
_ => Inputs(content)
};
/// <summary>The text a reader would see on it, or null when it shows none.</summary>
public static string? TextOf(object? content)
{
string? text = content switch
{
string s => s,
// A sign such as a dot is given the words it stands for.
TextBlock block when AutomationProperties.GetName(block) is { Length: > 0 } name => name,
TextBlock block => block.Inlines is { Count: > 0 } inlines ? TextOf(inlines) : block.Text,
ContentControl inner => TextOf(inner.Content),
Decorator decorator => TextOf(decorator.Child),
Panel panel => Join(panel.Children.Where(c => c.IsVisible).Select(TextOf)),
_ => null
};
return string.IsNullOrWhiteSpace(text) ? null : text.Trim();
}
private static string TextOf(InlineCollection inlines) =>
string.Concat(inlines.Select(i => i switch
{
Run run => run.Text,
LineBreak => " ",
Span span => TextOf(span.Inlines),
_ => null
}));
private static string Join(IEnumerable<string?> parts) =>
string.Join(", ", parts.Where(p => !string.IsNullOrWhiteSpace(p)));
private static void Give(StyledElement target, string? name)
{
string? current = AutomationProperties.GetName(target);
bool ours = Given.TryGetValue(target, out string? given) && current == given;
if (!string.IsNullOrEmpty(current) && !ours)
return;
if (string.IsNullOrEmpty(name))
{
if (ours)
target.ClearValue(AutomationProperties.NameProperty);
Given.Remove(target);
return;
}
AutomationProperties.SetName(target, name);
Given.AddOrUpdate(target, name);
}
}

View File

@@ -1,43 +0,0 @@
using System;
using Avalonia.Controls;
using Avalonia.Threading;
namespace StarterNG.Controls;
/// <summary>
/// Says how many entries a search box left once typing pauses: the list filled itself
/// out of sight, and a screen reader heard only the letters typed. Nothing is said
/// while focus is elsewhere or the box is empty.
/// </summary>
public sealed class SearchResultsTeller
{
/// <summary>The pause after the last key that counts as done typing.</summary>
public static readonly TimeSpan Pause = TimeSpan.FromMilliseconds(900);
private readonly TextBox _box;
private readonly Func<int> _count;
private readonly DispatcherTimer _timer = new() { Interval = Pause };
public SearchResultsTeller(TextBox box, Func<int> count)
{
_box = box;
_count = count;
_timer.Tick += (_, _) => Tell();
}
/// <summary>The text changed: the count is said after the pause, once.</summary>
public void Changed()
{
_timer.Stop();
_timer.Start();
}
private void Tell()
{
_timer.Stop();
if (!_box.IsKeyboardFocusWithin || string.IsNullOrWhiteSpace(_box.Text))
return;
Announcer.Say(_box, string.Format(AppLanguage.Text("SearchFound"), _count()));
}
}

View File

@@ -1,6 +1,5 @@
using Avalonia;
using Avalonia.Controls;
using Avalonia.Interactivity;
namespace StarterNG.Controls;
@@ -74,25 +73,6 @@ public class SettingRow : ContentControl
if (change.Property == IdleNoteProperty)
ToolTip.SetTip(this, string.IsNullOrEmpty(IdleNote) ? null : IdleNote);
if (change.Property == LabelProperty || change.Property == ContentProperty)
ScreenReaderNames.NameInputs(Content, Label);
if (change.Property == ValueTextProperty || change.Property == ContentProperty)
ScreenReaderNames.TellValue(Content, ValueText);
if (change.Property == DescriptionProperty || change.Property == IdleNoteProperty ||
change.Property == ContentProperty)
ScreenReaderNames.DescribeInputs(Content, Description, IdleNote);
}
// Again once in the window: a panel given as content may be filled after it was set.
protected override void OnLoaded(RoutedEventArgs e)
{
base.OnLoaded(e);
ScreenReaderNames.NameInputs(Content, Label);
ScreenReaderNames.TellValue(Content, ValueText);
ScreenReaderNames.DescribeInputs(Content, Description, IdleNote);
}
private void UpdatePseudoClasses()

View File

@@ -59,43 +59,6 @@ public class SettingsSection : HeaderedContentControl
_reset = e.NameScope.Find<Button>("PART_Reset");
if (_reset is not null)
_reset.Click += OnResetClick;
NameReset();
}
protected override void OnPropertyChanged(AvaloniaPropertyChangedEventArgs change)
{
base.OnPropertyChanged(change);
if (change.Property == HeaderProperty || change.Property == ResetLabelProperty)
NameReset();
if (change.Property == HeaderProperty || change.Property == LevelProperty)
NameLevel();
}
/// <summary>
/// The header's list of levels was named by the word it shows with nothing chosen,
/// "Własne"; it is named as the level of this section.
/// </summary>
private void NameLevel()
{
if (Level is Control level)
Avalonia.Automation.AutomationProperties.SetName(level, ScreenReaderNames.PickerText(
AppLanguage.Text("SectionLevel"), ScreenReaderNames.TextOf(Header)));
}
/// <summary>
/// Every section has a button with the same words; a reader is told which section
/// it puts back, as a sighted one sees from where it stands.
/// </summary>
private void NameReset()
{
if (_reset is null)
return;
string? name = ScreenReaderNames.PickerText(ResetLabel, ScreenReaderNames.TextOf(Header));
if (string.IsNullOrEmpty(name))
_reset.ClearValue(Avalonia.Automation.AutomationProperties.NameProperty);
else
Avalonia.Automation.AutomationProperties.SetName(_reset, name);
}
private void OnResetClick(object? sender, Avalonia.Interactivity.RoutedEventArgs e) => ResetRequested?.Invoke(this);

View File

@@ -61,6 +61,19 @@ public enum SceneryFaultKind
/// <summary>An include whose file is not there; <see cref="SceneryFault.Token"/> names it.</summary>
MissingInclude,
/// <summary>
/// A terrain file named by a terrain directive whose text (.txtf) and binary
/// file (.btf) are both missing; <see cref="SceneryFault.Token"/> names it.
/// </summary>
MissingTerrainFile,
/// <summary>
/// A terrain file the simulator passes over: the scenery's terrain comes from its
/// .sbt, which something before the directive was already taken from;
/// <see cref="SceneryFault.Token"/> names it.
/// </summary>
TerrainFileBehindSbt,
/// <summary>An include with no <c>end</c>, which swallows what follows it.</summary>
IncludeNotClosed,

View File

@@ -5,6 +5,14 @@ using System.Linq;
namespace StarterNG.Domain.Sceneries;
/// <summary>What the simulator finds of the files a scenery names.</summary>
/// <param name="Opens">Whether it opens a file of the scenery folder, named as the scenery names it.</param>
/// <param name="HasSbt">
/// Whether the scenery has its own .sbt: while that is in use, its terrain includes
/// (<c>_ter.scm</c>) and terrain geometry are passed over, the .sbt holding them.
/// </param>
public sealed record SceneryFileLookup(Func<string, bool> Opens, bool HasSbt = false);
/// <summary>
/// Goes through a scenery's text for the parts the starter reads - trainsets,
/// vehicles, includes - finding where each trainset and loose vehicle is, and
@@ -29,17 +37,17 @@ public static class ScenerySyntax
/// <param name="text">The scenery's text, its includes put in place.</param>
/// <param name="file">The scenery's file name, for faults in its own text.</param>
/// <param name="opensInclude">
/// Whether the simulator opens an include, named as the include names it; null
/// leaves includes unchecked.
/// <param name="files">
/// What the simulator finds of the files the scenery names - includes and terrain
/// files; null leaves them unchecked.
/// </param>
public static Result Scan(string text, string file, Func<string, bool>? opensInclude = null)
public static Result Scan(string text, string file, SceneryFileLookup? files = null)
{
string code = SceneryCode.Mask(text, out int unclosed);
var tokens = SceneryCode.Tokens(code);
var lines = new SceneryLines(text, file);
var simulator = new Reading(tokens, lines, opensInclude, asSimulator: true);
var simulator = new Reading(tokens, lines, files, asSimulator: true);
simulator.Run();
var author = new Reading(tokens, lines, null, asSimulator: false);
author.Run();
@@ -110,8 +118,14 @@ public static class ScenerySyntax
}
private sealed class Reading(
List<SceneryCode.Token> tokens, SceneryLines lines, Func<string, bool>? opensInclude, bool asSimulator)
List<SceneryCode.Token> tokens, SceneryLines lines, SceneryFileLookup? files, bool asSimulator)
{
// Whether the scenery's .sbt is in use, and whether the simulator passed over
// something of the text on its account already - or got past FirstInit - after
// which a terrain file can no longer take its place.
private bool _sbt = files?.HasSbt ?? false;
private bool _sbtTaken;
public readonly List<(int Start, int End, string Name)> Trainsets = new();
public readonly List<(int, int)> Loose = new();
public readonly List<SceneryFault> Faults = new();
@@ -156,12 +170,20 @@ public static class ScenerySyntax
{
// Not a vehicle: only its kind is stepped over, what follows is its own.
if (i + 4 >= tokens.Count || !tokens[i + 4].Is("dynamic"))
{
if (_sbt && TerrainGeometry(i))
_sbtTaken = true;
i += 4;
}
else
i = Vehicle(i);
}
else if (token.Is("include"))
i = Include(i);
else if (token.Is("terrain") && asSimulator)
i = Terrain(i);
else if (token.Is("firstinit"))
_sbtTaken |= _sbt;
}
if (_open is { } last)
@@ -369,8 +391,13 @@ public static class ScenerySyntax
return stop < tokens.Count && tokens[stop].Is("end") ? stop : stop - 1;
}
if (opensInclude is not null && Plain(name) && !opensInclude(name))
Fault(SceneryFaultKind.MissingInclude, token.Index, token: name);
if (files is not null && Plain(name))
{
if (_sbt && SimulatorNames.Lower(name).Contains("_ter.scm"))
_sbtTaken = true;
else if (!files.Opens(name))
Fault(SceneryFaultKind.MissingInclude, token.Index, token: name);
}
// The simulator takes its parameters up to the word "end", written just so,
// whatever comes before it.
@@ -383,6 +410,52 @@ public static class ScenerySyntax
return last;
}
/// <summary>
/// A terrain directive: the files it names up to <c>endterrain</c>. Of a terrain
/// file (.txtf, .btf) the simulator takes the text or the binary file of the same
/// name, whichever is there; an .sbt it passes over quietly when it cannot use it.
/// </summary>
private int Terrain(int at)
{
int end = at + 1;
while (end < tokens.Count && !tokens[end].Is("endterrain"))
end++;
for (int named = at + 1; named < end && files is not null; named++)
{
string name = tokens[named].Text;
string lower = SimulatorNames.Lower(name);
if (!Plain(name) || !(lower.EndsWith(".txtf") || lower.EndsWith(".btf")))
continue;
string stem = name[..name.LastIndexOf('.')];
if (!files.Opens(stem + ".txtf") && !files.Opens(stem + ".btf"))
Fault(SceneryFaultKind.MissingTerrainFile, tokens[named].Index, token: name);
else if (_sbtTaken)
Fault(SceneryFaultKind.TerrainFileBehindSbt, tokens[named].Index, token: name);
else
// The .sbt gives way: the terrain includes from here on are read after all.
_sbt = false;
}
return Math.Min(end, tokens.Count - 1);
}
/// <summary>
/// Whether the node starting at the given word is terrain geometry, which an .sbt
/// in use holds in its place: triangles or lines, or a model shown from any distance.
/// </summary>
private bool TerrainGeometry(int at)
{
if (at + 4 >= tokens.Count)
return false;
var kind = tokens[at + 4];
if (kind.Is("model"))
return double.TryParse(tokens[at + 2].Text, NumberStyles.Float, CultureInfo.InvariantCulture,
out double nearest) && nearest < 0;
return kind.Is("triangles") || kind.Is("triangle_strip") || kind.Is("triangle_fan") ||
kind.Is("lines") || kind.Is("line_strip") || kind.Is("line_loop");
}
// A vehicle with no trainset around it, written as within one - offset, crew,
// coupling - where its track, offset and crew belong.
private bool TrainsetStyle(int at) =>

View File

@@ -20,11 +20,11 @@ public sealed class SceneryParser
_random = random;
}
/// <param name="opensInclude">
/// Whether the simulator opens an include, as the include names it; null leaves
/// includes unchecked.
/// <param name="files">
/// What the simulator finds of the files the scenery names; null leaves them
/// unchecked.
/// </param>
public Scenery Parse(string path, string content, Func<string, bool>? opensInclude = null)
public Scenery Parse(string path, string content, SceneryFileLookup? files = null)
{
string original = content;
@@ -38,7 +38,7 @@ public sealed class SceneryParser
// Read from the text with its optional includes blanked, which keeps every
// place where it was, so a fault's line is the line in the file.
var syntax = ScenerySyntax.Scan(content, System.IO.Path.GetFileName(path), opensInclude);
var syntax = ScenerySyntax.Scan(content, System.IO.Path.GetFileName(path), files);
var faults = syntax.Faults.ToList();
var inlined = SceneryIncludes.Ranges(content);

View File

@@ -7,7 +7,6 @@ using System.Text;
using System.Threading;
using System.Threading.Tasks;
using StarterNG.Application.Abstractions;
using StarterNG.Domain;
using StarterNG.Domain.Sceneries;
using StarterNG.Infrastructure.Adapters;
@@ -78,10 +77,9 @@ public sealed class SceneryRepository : ISceneryRepository
var encodings = new Dictionary<string, Encoding>(StringComparer.Ordinal);
// With its own .sbt the scenery's terrain comes from it, and the simulator
// passes its terrain includes over without opening them.
// passes its terrain includes over without opening them - unless a terrain
// file takes its place.
bool binaryTerrain = Opens(Path.GetFileNameWithoutExtension(path) + ".sbt");
bool OpensInclude(string name) =>
Opens(name) || (binaryTerrain && SimulatorNames.Lower(name).Contains("_ter.scm"));
(string File, string Text)? ReadInclude(string name)
{
@@ -98,7 +96,7 @@ public sealed class SceneryRepository : ISceneryRepository
string own = LegacyText.Decode(_files.ReadAllBytes(path), out var ownEncoding);
string text = SceneryIncludes.Inline(own, ReadInclude);
var scenery = _parser.Parse(path, text, OpensInclude);
var scenery = _parser.Parse(path, text, new SceneryFileLookup(Opens, binaryTerrain));
scenery.HasCompanionTimetable = binaryTerrain;
scenery.Sources = sources;
scenery.TextEncoding = ownEncoding;

View File

@@ -22,37 +22,15 @@ public sealed class ExecutableLocator
private string? _wine;
private bool _wineLookedUp;
private string? _missingPickLogged;
private readonly bool _lacksAvx2;
/// <param name="lacksAvx2">Whether this processor runs no AVX2; asked of it when left out.</param>
public ExecutableLocator(IFileSystem files, IGamePaths paths, IEnvironment environment, IDiagnosticsLog log,
bool? lacksAvx2 = null)
public ExecutableLocator(IFileSystem files, IGamePaths paths, IEnvironment environment, IDiagnosticsLog log)
{
_files = files;
_paths = paths;
_environment = environment;
_log = log;
_lacksAvx2 = lacksAvx2 ?? CpuFeatures.LacksAvx2;
}
/// <summary>
/// The end of the name of a simulator built without AVX2, last before any extension:
/// eu07-x64_2026-11-15_abc1234_noavx2.exe, eu07_noavx2. It runs on any x86-64 processor.
/// </summary>
public const string NoAvx2Suffix = "_noavx2";
public static bool IsNoAvx2(string path) =>
Path.GetFileNameWithoutExtension(path).EndsWith(NoAvx2Suffix, StringComparison.OrdinalIgnoreCase);
/// <summary>
/// Whether <paramref name="executable"/> stops at its first instruction here: a build
/// with AVX2 on a processor without it. Such a processor is told so before a start.
/// </summary>
public bool WillNotRunHere(string executable) => _lacksAvx2 && !IsNoAvx2(executable);
/// <summary>The newest build without AVX2 in the installation, or null where there is none.</summary>
public string? NewestNoAvx2() => ListCandidates().FirstOrDefault(IsNoAvx2);
public string CanonicalName => _environment.IsWindows ? "eu07.exe" : "eu07";
/// <summary>
@@ -93,8 +71,7 @@ public sealed class ExecutableLocator
{
var candidates = _files.GetFiles(_paths.Root, "eu07*")
.Where(IsCandidate)
.OrderBy(Rank)
.ThenByDescending(path => _lacksAvx2 && IsNoAvx2(path) ? _files.GetLastWriteTimeUtc(path) : DateTime.MinValue)
.OrderBy(path => IsExeOnLinux(path) ? 1 : 0)
.ThenBy(path => string.Equals(Path.GetFileName(path), CanonicalName,
StringComparison.OrdinalIgnoreCase) ? 0 : 1)
.ThenBy(path => Path.GetFileName(path).Length);
@@ -124,18 +101,6 @@ public sealed class ExecutableLocator
return CanonicalName;
}
/// <summary>
/// The order of the search. Without AVX2 a build without it comes first, the newest of
/// them, even through Wine: the others stop at once. With AVX2 one is the last resort,
/// as the build made for the processor runs faster; native before Wine either way.
/// </summary>
private int Rank(string path)
{
int wine = IsExeOnLinux(path) ? 1 : 0;
int noAvx2 = IsNoAvx2(path) ? 1 : 0;
return _lacksAvx2 ? (1 - noAvx2) * 2 + wine : wine * 2 + noAvx2;
}
public List<string> ListCandidates(string? directory = null)
{
try

View File

@@ -1,32 +0,0 @@
using System;
using System.Collections.Generic;
using System.Linq;
using Avalonia;
namespace StarterNG.Infrastructure;
/// <summary>
/// Drawn by the processor instead of the graphics card, for a machine on which the
/// window comes up empty. Each platform reads only its own options, so both are given.
/// </summary>
public static class SoftwareRender
{
public const string Switch = "--software-render";
public static bool AskedIn(IEnumerable<string> args) =>
args.Any(a => string.Equals(a, Switch, StringComparison.OrdinalIgnoreCase));
public static Win32PlatformOptions Win32Options => new()
{
RenderingMode = new[] { Win32RenderingMode.Software },
CompositionMode = new[] { Win32CompositionMode.RedirectionSurface }
};
public static X11PlatformOptions X11Options => new()
{
RenderingMode = new[] { X11RenderingMode.Software }
};
public static AppBuilder ApplyTo(AppBuilder builder) =>
builder.With(Win32Options).With(X11Options);
}

View File

@@ -1,8 +1,6 @@
using System.Collections.Generic;
using Avalonia.Controls;
using Avalonia.Controls.Documents;
using Avalonia.Layout;
using Avalonia.Markup.Xaml.MarkupExtensions;
using Avalonia.Media;
namespace StarterNG.Infrastructure;
@@ -15,34 +13,31 @@ public static class StatsBar
for (int i = 0; i < fields.Count; i++)
{
var (label, value) = fields[i];
host.Children.Add(Figure(label, value, last: i == fields.Count - 1));
var pair = new StackPanel
{
Orientation = Orientation.Horizontal,
Spacing = 5,
// no trailing gap on the last pair - these sit in a panel title,
// flush with its right edge
Margin = new Avalonia.Thickness(0, 0, i == fields.Count - 1 ? 0 : 22, 0),
VerticalAlignment = VerticalAlignment.Center
};
pair.Children.Add(new TextBlock
{
Text = label,
FontSize = 12,
Opacity = 0.65,
VerticalAlignment = VerticalAlignment.Center
});
pair.Children.Add(new TextBlock
{
Text = value,
FontSize = 12,
FontWeight = FontWeight.SemiBold,
VerticalAlignment = VerticalAlignment.Center,
TextTrimming = TextTrimming.CharacterEllipsis
});
host.Children.Add(pair);
}
}
/// <summary>
/// One text holding the label and the value: under the mouse a reader hears the
/// text that lies there, and with two it heard "Masa [t]:" without the mass.
/// </summary>
public static TextBlock Figure(string label, string value, bool last)
{
var name = new Run(label);
// The label dimmed, as the panel titles' other labels.
name.Bind(TextElement.ForegroundProperty, new DynamicResourceExtension("CarbonFgDim"));
return new TextBlock
{
FontSize = 12,
// no trailing gap on the last pair - these sit in a panel title,
// flush with its right edge
Margin = new Avalonia.Thickness(0, 0, last ? 0 : 22, 0),
VerticalAlignment = VerticalAlignment.Center,
TextTrimming = TextTrimming.CharacterEllipsis,
Inlines = new InlineCollection
{
name,
new Run(" "),
new Run(value) { FontWeight = FontWeight.SemiBold },
},
};
}
}

View File

@@ -1,90 +0,0 @@
using System;
using System.Collections.Generic;
using System.IO;
using System.Reflection;
using System.Runtime.InteropServices;
namespace StarterNG.Infrastructure;
/// <summary>
/// The starter sits in the simulator's folder, and so do the graphics wrappers a player
/// puts there for the simulator - ReShade and the like, named after the system library
/// they stand in for. Windows looks in the program's own folder first, so the starter's
/// window drew through them too, and with some of them it drew nothing at all.
/// Loaded from System32 by full path before anything asks for them, these names are
/// taken: a native library that asks by name gets the system one. .NET looks beside the
/// program by full path before it asks by name, so the window code's own imports are
/// handed the same libraries. The simulator is a process of its own and still finds its
/// wrappers.
/// Elsewhere there is nothing of the kind to keep out. Under Wine or Proton the system
/// folder is the prefix's, so what is taken there is what would have been taken anyway.
/// </summary>
public sealed class SystemGraphicsLibraries
{
public delegate bool Loader(string path, out IntPtr handle);
// dxgi ahead of d3d11, which asks for it.
public static readonly IReadOnlyList<string> Names = new[] { "dxgi", "d3d11", "d3d9", "opengl32" };
private readonly Dictionary<string, IntPtr> _loaded = new(StringComparer.OrdinalIgnoreCase);
private readonly List<string> _shadowed = new();
private SystemGraphicsLibraries()
{
}
/// <summary>The files of these names that lay beside the starter.</summary>
public IReadOnlyList<string> Shadowed => _shadowed;
/// <summary>What goes to the log about them, or null when none lay there.</summary>
public string? Note => _shadowed.Count > 0
? $"Graphics libraries beside the starter, left to the simulator: {string.Join(", ", _shadowed)}"
: null;
/// <summary>The libraries of this Windows, or null on any other system.</summary>
public static SystemGraphicsLibraries? TakeOnWindows() =>
OperatingSystem.IsWindows()
? Take(Environment.SystemDirectory, AppContext.BaseDirectory, File.Exists, NativeLibrary.TryLoad)
: null;
public static SystemGraphicsLibraries Take(string systemDirectory, string ownDirectory,
Func<string, bool> exists, Loader load)
{
var taken = new SystemGraphicsLibraries();
foreach (string name in Names)
{
string file = name + ".dll";
if (exists(Path.Combine(ownDirectory, file)))
taken._shadowed.Add(file);
if (load(Path.Combine(systemDirectory, file), out IntPtr handle))
taken._loaded[name] = handle;
}
return taken;
}
/// <summary>The system library for an import of one of these names; zero leaves it to the usual search.</summary>
public IntPtr Resolve(string libraryName)
{
string name = libraryName.EndsWith(".dll", StringComparison.OrdinalIgnoreCase)
? libraryName[..^4]
: libraryName;
return _loaded.TryGetValue(name, out IntPtr handle) ? handle : IntPtr.Zero;
}
/// <summary>
/// The assembly's imports of these names get the system libraries. False when it
/// has a resolver of its own already; that one decides.
/// </summary>
public bool ServeTo(Assembly importer)
{
try
{
NativeLibrary.SetDllImportResolver(importer, (name, _, _) => Resolve(name));
return true;
}
catch (InvalidOperationException)
{
return false;
}
}
}

View File

@@ -8,129 +8,124 @@
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:views="clr-namespace:StarterNG.Views"
xmlns:starterNg="clr-namespace:StarterNG"
xmlns:ctl="clr-namespace:StarterNG.Controls"
Title="Starter MaSzyna"
Icon="/Assets/starter.ico"
Width="1010" Height="768" MinWidth="1010" MinHeight="666"
WindowStartupLocation="CenterScreen">
<!-- Says what a click changed out of sight; see Announcer. -->
<ctl:Announcer>
<DockPanel LastChildFill="True">
<DockPanel LastChildFill="True">
<Border x:Name="TopBar" DockPanel.Dock="Top" TabIndex="0"
Background="{StaticResource CarbonPanelBg}"
BorderBrush="{StaticResource CarbonBorderLight}"
BorderThickness="0,0,0,1"
PointerPressed="TitleBar_OnPointerPressed">
<Grid RowDefinitions="44">
<Border x:Name="TopBar" DockPanel.Dock="Top"
Background="{StaticResource CarbonPanelBg}"
BorderBrush="{StaticResource CarbonBorderLight}"
BorderThickness="0,0,0,1"
PointerPressed="TitleBar_OnPointerPressed">
<Grid RowDefinitions="44">
<Grid ColumnDefinitions="Auto,*,Auto" Background="Transparent">
<Grid ColumnDefinitions="Auto,*,Auto" Background="Transparent">
<StackPanel x:Name="TopBarLeft" Grid.Column="0" AutomationProperties.LandmarkType="Navigation" AutomationProperties.ControlTypeOverride="Group" AutomationProperties.AccessibilityView="Content" Orientation="Horizontal" VerticalAlignment="Stretch">
<RadioButton x:Name="NavScenarios" GroupName="nav" Theme="{StaticResource NavTab}"
Tag="scenarios" IsChecked="True"
IsCheckedChanged="Nav_OnCheckedChanged"
Content="{Binding [NavScenarios], Source={x:Static starterNg:App.Loc}}" />
<RadioButton x:Name="NavDepot" GroupName="nav" Theme="{StaticResource NavTab}"
Tag="depot"
IsCheckedChanged="Nav_OnCheckedChanged"
Content="{Binding [NavDepot], Source={x:Static starterNg:App.Loc}}" />
<RadioButton x:Name="NavSettings" GroupName="nav" Theme="{StaticResource NavTab}"
Tag="settings"
IsCheckedChanged="Nav_OnCheckedChanged"
Content="{Binding [NavSettings], Source={x:Static starterNg:App.Loc}}" />
<Button Classes="Basic" Click="openLastLogClick" Width="48" Cursor="Hand"
HorizontalContentAlignment="Center"
ToolTip.Tip="{Binding [ShowLatestLogTooltip], Source={x:Static starterNg:App.Loc}}">
<materialIcons:MaterialIcon Kind="FileDocument" Height="16" Width="16" />
</Button>
<Button Classes="Basic" Click="openHaslerTapesClick" Width="48" Cursor="Hand"
HorizontalContentAlignment="Center"
ToolTip.Tip="{Binding [HaslerTapesTooltip], Source={x:Static starterNg:App.Loc}}">
<materialIcons:MaterialIcon Kind="ChartLine" Height="16" Width="16" />
</Button>
<Button x:Name="HelpButton" Classes="Basic" Width="48" Cursor="Hand"
ToolTip.Tip="{Binding [Help], Source={x:Static starterNg:App.Loc}}"
Click="HelpButton_OnClick"
Content="?" FontWeight="Bold" FontSize="16"
HorizontalContentAlignment="Center" />
<StackPanel x:Name="TopBarLeft" Grid.Column="0" Orientation="Horizontal" VerticalAlignment="Stretch">
<RadioButton x:Name="NavScenarios" GroupName="nav" Theme="{StaticResource NavTab}"
Tag="scenarios" IsChecked="True"
IsCheckedChanged="Nav_OnCheckedChanged"
Content="{Binding [NavScenarios], Source={x:Static starterNg:App.Loc}}" />
<RadioButton x:Name="NavDepot" GroupName="nav" Theme="{StaticResource NavTab}"
Tag="depot"
IsCheckedChanged="Nav_OnCheckedChanged"
Content="{Binding [NavDepot], Source={x:Static starterNg:App.Loc}}" />
<RadioButton x:Name="NavSettings" GroupName="nav" Theme="{StaticResource NavTab}"
Tag="settings"
IsCheckedChanged="Nav_OnCheckedChanged"
Content="{Binding [NavSettings], Source={x:Static starterNg:App.Loc}}" />
<Button Classes="Basic" Click="openLastLogClick" Width="48" Cursor="Hand"
HorizontalContentAlignment="Center"
ToolTip.Tip="{Binding [ShowLatestLogTooltip], Source={x:Static starterNg:App.Loc}}">
<materialIcons:MaterialIcon Kind="FileDocument" Height="16" Width="16" />
</Button>
<Button Classes="Basic" Click="openHaslerTapesClick" Width="48" Cursor="Hand"
HorizontalContentAlignment="Center"
ToolTip.Tip="{Binding [HaslerTapesTooltip], Source={x:Static starterNg:App.Loc}}">
<materialIcons:MaterialIcon Kind="ChartLine" Height="16" Width="16" />
</Button>
<Button x:Name="HelpButton" Classes="Basic" Width="48" Cursor="Hand"
ToolTip.Tip="{Binding [Help], Source={x:Static starterNg:App.Loc}}"
Click="HelpButton_OnClick"
Content="?" FontWeight="Bold" FontSize="16"
HorizontalContentAlignment="Center" />
</StackPanel>
<StackPanel x:Name="TopBarRight" Grid.Column="2" Orientation="Horizontal"
VerticalAlignment="Center" Margin="0,0,3,0" Spacing="0">
<StackPanel x:Name="VersionPanel" Orientation="Vertical" VerticalAlignment="Center" Margin="0,0,6,0">
<Label Content="{Binding [Version], Source={x:Static starterNg:App.Loc}}"
FontSize="12" Foreground="{StaticResource CarbonFgDim}" Padding="0" />
<Label Content="{x:Static starterNg:AppInfo.Version}"
FontSize="12" Foreground="{StaticResource CarbonFg}" Padding="0" />
</StackPanel>
<StackPanel x:Name="TopBarRight" Grid.Column="2" Orientation="Horizontal"
VerticalAlignment="Center" Margin="0,0,3,0" Spacing="0">
<StackPanel x:Name="VersionPanel" Orientation="Vertical" VerticalAlignment="Center" Margin="0,0,6,0">
<Label Content="{Binding [Version], Source={x:Static starterNg:App.Loc}}"
FontSize="12" Foreground="{StaticResource CarbonFgDim}" Padding="0" />
<Label Content="{x:Static starterNg:AppInfo.Version}"
FontSize="12" Foreground="{StaticResource CarbonFg}" Padding="0" />
</StackPanel>
<ComboBox x:Name="LangCombo" Width="96" VerticalAlignment="Center"
SelectionChanged="LangCombo_OnSelectionChanged" />
<ComboBox x:Name="LangCombo" Width="96" VerticalAlignment="Center"
AutomationProperties.Name="{Binding [Language], Source={x:Static starterNg:App.Loc}}"
SelectionChanged="LangCombo_OnSelectionChanged" />
<Button Classes="Basic" Cursor="Hand" Tag="https://discord.gg/eu07" Click="linkClick"
ToolTip.Tip="Discord">
<PathIcon Data="{StaticResource DiscordLogo}" Height="12" />
</Button>
<Button Classes="Basic" Cursor="Hand" Tag="http://www.facebook.com/MaSzynaeu07pl" Click="linkClick"
ToolTip.Tip="Facebook">
<materialIcons:MaterialIcon Kind="Facebook" />
</Button>
<Button Classes="Basic" Cursor="Hand" Tag="http://www.youtube.com/@eu07official" Click="linkClick"
ToolTip.Tip="YouTube">
<materialIcons:MaterialIcon Kind="Youtube" />
</Button>
<Button Classes="Basic" Cursor="Hand" Tag="http://github.com/MaSzyna-EU07/" Click="linkClick"
ToolTip.Tip="GitHub">
<materialIcons:MaterialIcon Kind="Github" />
</Button>
<Button Classes="Basic" Cursor="Hand" Tag="https://discord.gg/eu07" Click="linkClick"
ToolTip.Tip="Discord">
<PathIcon Data="{StaticResource DiscordLogo}" Height="12" />
</Button>
<Button Classes="Basic" Cursor="Hand" Tag="http://www.facebook.com/MaSzynaeu07pl" Click="linkClick"
ToolTip.Tip="Facebook">
<materialIcons:MaterialIcon Kind="Facebook" />
</Button>
<Button Classes="Basic" Cursor="Hand" Tag="http://www.youtube.com/@eu07official" Click="linkClick"
ToolTip.Tip="YouTube">
<materialIcons:MaterialIcon Kind="Youtube" />
</Button>
<Button Classes="Basic" Cursor="Hand" Tag="http://github.com/MaSzyna-EU07/" Click="linkClick"
ToolTip.Tip="GitHub">
<materialIcons:MaterialIcon Kind="Github" />
</Button>
<Button x:Name="LogoLink" Classes="Basic" Cursor="Hand" Tag="http://eu07.pl/" Click="linkClick"
Padding="6,0" Margin="4,0,0,0"
ToolTip.Tip="eu07.pl">
<Image Source="/Assets/Logo/maszyna_white.png" Height="26" />
</Button>
</StackPanel>
</Grid>
<Button x:Name="LogoLink" Classes="Basic" Cursor="Hand" Tag="http://eu07.pl/" Click="linkClick"
Padding="6,0" Margin="4,0,0,0"
ToolTip.Tip="eu07.pl">
<Image Source="/Assets/Logo/maszyna_white.png" Height="26" />
</Button>
</StackPanel>
</Grid>
</Border>
<!-- The other ways to start - without saving, free fly - were only under the
right button; the arrow beside it says they exist. The editor is not one
of them: it opens the scenery itself, so it has a button of its own. -->
<Grid DockPanel.Dock="Bottom" ColumnDefinitions="*,Auto,Auto,Auto" ColumnSpacing="4" Margin="3">
<Button Name="startButton" Classes="Start" Height="42"
TabIndex="9"
Click="StartButton_OnClick"
Content="{Binding [Start], Source={x:Static starterNg:App.Loc}}" />
<Button Name="startMoreButton" Grid.Column="1" Classes="Start" Width="36" Height="42"
TabIndex="10" Cursor="Hand"
Click="StartMoreButton_OnClick"
ToolTip.Tip="{Binding [StartMore], Source={x:Static starterNg:App.Loc}}">
<materialIcons:MaterialIcon Kind="ChevronUp" Width="20" Height="20" />
</Button>
<Button Name="startEditorButton" Grid.Column="2" Classes="Flat" Height="42" Padding="14,0"
TabIndex="11" Cursor="Hand" VerticalContentAlignment="Center"
Click="StartEditorButton_OnClick" />
<Button Name="startEditorMoreButton" Grid.Column="3" Classes="Flat" Width="36" Height="42" Padding="0"
TabIndex="12" Cursor="Hand" HorizontalContentAlignment="Center" VerticalContentAlignment="Center"
Click="StartEditorMoreButton_OnClick"
ToolTip.Tip="{Binding [StartEditorWizard], Source={x:Static starterNg:App.Loc}}">
<materialIcons:MaterialIcon Kind="ChevronUp" Width="20" Height="20" />
</Button>
</Grid>
</Border>
<!-- Scrolls only below the size the pages are laid out for; see KeepPagesUsable. -->
<ScrollViewer x:Name="PageScroll" AutomationProperties.LandmarkType="Main" AutomationProperties.AccessibilityView="Content" Margin="3,3,3,0" TabIndex="1"
HorizontalScrollBarVisibility="Disabled" VerticalScrollBarVisibility="Disabled">
<Panel x:Name="PageHost">
<views:Scenarios x:Name="ScenariosView" />
<views:Depot x:Name="DepotView" IsVisible="False" />
<views:Settings x:Name="SettingsView" IsVisible="False" />
</Panel>
</ScrollViewer>
</DockPanel>
</ctl:Announcer>
<!-- The other ways to start - without saving, free fly - were only under the
right button; the arrow beside it says they exist. The editor is not one
of them: it opens the scenery itself, so it has a button of its own. -->
<Grid DockPanel.Dock="Bottom" ColumnDefinitions="*,Auto,Auto,Auto" ColumnSpacing="4" Margin="3">
<Button Name="startButton" Classes="Start" Height="42"
TabIndex="9"
Click="StartButton_OnClick"
Content="{Binding [Start], Source={x:Static starterNg:App.Loc}}" />
<Button Name="startMoreButton" Grid.Column="1" Classes="Start" Width="36" Height="42"
TabIndex="10" Cursor="Hand"
Click="StartMoreButton_OnClick"
ToolTip.Tip="{Binding [StartMore], Source={x:Static starterNg:App.Loc}}">
<materialIcons:MaterialIcon Kind="ChevronUp" Width="20" Height="20" />
</Button>
<Button Name="startEditorButton" Grid.Column="2" Classes="Flat" Height="42" Padding="14,0"
TabIndex="11" Cursor="Hand" VerticalContentAlignment="Center"
Click="StartEditorButton_OnClick" />
<Button Name="startEditorMoreButton" Grid.Column="3" Classes="Flat" Width="36" Height="42" Padding="0"
TabIndex="12" Cursor="Hand" HorizontalContentAlignment="Center" VerticalContentAlignment="Center"
Click="StartEditorMoreButton_OnClick"
ToolTip.Tip="{Binding [StartEditorWizard], Source={x:Static starterNg:App.Loc}}">
<materialIcons:MaterialIcon Kind="ChevronUp" Width="20" Height="20" />
</Button>
</Grid>
<!-- Scrolls only below the size the pages are laid out for; see KeepPagesUsable. -->
<ScrollViewer x:Name="PageScroll" Margin="3,3,3,0" TabIndex="1"
HorizontalScrollBarVisibility="Disabled" VerticalScrollBarVisibility="Disabled">
<Panel x:Name="PageHost">
<views:Scenarios x:Name="ScenariosView" />
<views:Depot x:Name="DepotView" IsVisible="False" />
<views:Settings x:Name="SettingsView" IsVisible="False" />
</Panel>
</ScrollViewer>
</DockPanel>
</Window>

View File

@@ -13,7 +13,6 @@ using Avalonia.Layout;
using Avalonia.Threading;
using Avalonia.VisualTree;
using StarterNG.Classes;
using StarterNG.Controls;
using StarterNG.Infrastructure;
using StarterNG.Views;
using StarterNG.Application;
@@ -99,7 +98,6 @@ public partial class MainWindow : Window
// Tunnelling: the shortcuts are checked before any view sees the key, which is
// why OnShortcutKey has to be careful about text entry and key capture.
AddHandler(KeyDownEvent, OnShortcutKey, RoutingStrategies.Tunnel);
AddHandler(KeyDownEvent, OnTabWithNothingFocused, RoutingStrategies.Tunnel);
AppServices.Current.State.Changed += UpdateStartButton;
Opened += (_, _) =>
@@ -110,13 +108,7 @@ public partial class MainWindow : Window
_sceneryFilesTimer.Start();
FollowLastRun();
};
Activated += (_, _) =>
{
CheckExternalSettings();
// Back from a build or a download: a new simulator is on the list already.
if (SettingsView.IsVisible)
SettingsView.RefreshExecutables();
};
Activated += (_, _) => CheckExternalSettings();
_sceneryFilesTimer.Tick += async (_, _) => await LookAtSceneryFilesAsync();
Closed += (_, _) => _sceneryFilesTimer.Stop();
}
@@ -245,17 +237,6 @@ public partial class MainWindow : Window
win.ShowDialog(this);
}
private void OnTabWithNothingFocused(object? sender, KeyEventArgs e)
{
if (FocusManager is not { } focus)
return;
var next = KeyboardFocus.TabFromNowhere(e.Key, e.KeyModifiers, focus.GetFocusedElement(), this,
focus.FindFirstFocusableElement, focus.FindLastFocusableElement);
if (next is not null && next.Focus(NavigationMethod.Tab))
e.Handled = true;
}
private void OnShortcutKey(object? sender, KeyEventArgs e)
{
// A cab-control binding in Settings is waiting for this very keypress.
@@ -527,34 +508,11 @@ public partial class MainWindow : Window
private const string SimulatorBuildGuide = "https://github.com/MaSzyna-EU07/maszyna#getting-started";
/// <summary>
/// Tells a user whose processor lacks AVX2 that the simulator that would start will
/// not run. With a build without AVX2 in the folder, chosen away from by hand, the
/// notice offers to go back to the automatic choice, which takes it; with none, it
/// says what such a build is called and where the instructions for one's own are.
/// Tells a user whose processor lacks AVX2 that the published simulator will
/// not run, and where the instructions for a build of their own are.
/// </summary>
public async Task ShowCpuNoticeAsync(string executable)
public async Task ShowCpuNoticeAsync()
{
var services = AppServices.Current;
if (services.Executables.NewestNoAvx2() is { } noAvx2)
{
var (useIt, quiet) = await MessageBox.ShowNotice(
this, string.Format(App.Loc["CpuNoAvx2Chosen"], Path.GetFileName(executable), noAvx2),
App.Loc["CpuNoAvx2Title"], App.Loc["CpuNoAvx2UseIt"], App.Loc["DontShowAgain"]);
if (useIt)
{
services.Settings.SelectExeAutomatically = true;
services.SettingsStore.Save();
SettingsView.ReloadFromSettings();
UpdateStartButton();
}
if (quiet)
{
services.Settings.CpuNotice = false;
services.SettingsStore.Save();
}
return;
}
var (open, silence) = await MessageBox.ShowNotice(
this, string.Format(App.Loc["CpuNoAvx2"], SimulatorBuildGuide), App.Loc["CpuNoAvx2Title"],
App.Loc["CpuNoAvx2Open"], App.Loc["DontShowAgain"]);

View File

@@ -10,22 +10,12 @@ namespace StarterNG;
static class Program
{
private static bool _softwareRender;
[STAThread]
public static void Main(string[] args)
{
// Ahead of everything that could draw: what lies beside the starter is the simulator's.
var graphics = SystemGraphicsLibraries.TakeOnWindows();
graphics?.ServeTo(typeof(Win32PlatformOptions).Assembly);
_softwareRender = SoftwareRender.AskedIn(args);
// Composition root first: everything below, including the crash handlers,
// resolves its collaborators from this graph.
AppServices.Initialize();
if (graphics?.Note is { } note)
Diagnostics.Log(note);
AppDomain.CurrentDomain.UnhandledException += (_, e) =>
{
@@ -73,13 +63,9 @@ static class Program
};
}
private static AppBuilder WithSoftwareRenderIfAsked(this AppBuilder builder) =>
_softwareRender ? SoftwareRender.ApplyTo(builder) : builder;
public static AppBuilder BuildAvaloniaApp()
=> AppBuilder.Configure<App>()
.UsePlatformDetect()
.WithSoftwareRenderIfAsked()
.WithInterFont()
.WithDiagnosticsLogging()
.AfterSetup(_ => LogUiExceptions());

View File

@@ -2,7 +2,6 @@
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:starterNg="clr-namespace:StarterNG"
x:Class="StarterNG.SplashWindow"
Title="Starter MaSzyna"
SystemDecorations="None"
CanResize="False"
ShowInTaskbar="True"
@@ -19,7 +18,6 @@
TextTrimming="CharacterEllipsis"
Text="{Binding [LoadingVehicles], Source={x:Static starterNg:App.Loc}}" />
<ProgressBar x:Name="progressBar"
AutomationProperties.Name="{Binding #statusText.Text}"
Minimum="0" Maximum="1" Value="0" Height="6" />
</StackPanel>
</Border>

View File

@@ -43,10 +43,6 @@
<ProjectReference Include="..\Eu07.BlackBox.Views\Eu07.BlackBox.Views.csproj" />
</ItemGroup>
<ItemGroup>
<InternalsVisibleTo Include="StarterNG.Tests" />
</ItemGroup>
<ItemGroup>
<Folder Include="Assets\Logo\" />
</ItemGroup>

View File

@@ -17,8 +17,6 @@
<SolidColorBrush x:Key="CarbonInputBg" Color="#262C31" />
<SolidColorBrush x:Key="CarbonBorderLight" Color="#3A424A" />
<!-- Frames of things you type in or tick: 3:1 against the panels they sit on, so the field can be found without hovering. -->
<SolidColorBrush x:Key="CarbonInputBorder" Color="#737C86" />
<SolidColorBrush x:Key="CarbonBorderDark" Color="#0E0F12" />
<SolidColorBrush x:Key="CarbonFg" Color="#E6E8EA" />
<SolidColorBrush x:Key="CarbonFgDim" Color="#9098A0" />
@@ -79,7 +77,7 @@
Height="{StaticResource CarbonCheckSize}"
VerticalAlignment="Center"
Background="{StaticResource CarbonInputBg}"
BorderBrush="{StaticResource CarbonInputBorder}"
BorderBrush="{StaticResource CarbonBorderLight}"
BorderThickness="1" CornerRadius="2">
<Path Name="glyph" Margin="3" Stretch="Uniform"
Data="M 0,4 L 3,7 L 9,0"
@@ -141,7 +139,7 @@
the same shape and height as a combo box. -->
<ControlTheme x:Key="{x:Type ButtonSpinner}" TargetType="ButtonSpinner">
<Setter Property="Background" Value="{StaticResource CarbonInputBg}" />
<Setter Property="BorderBrush" Value="{StaticResource CarbonInputBorder}" />
<Setter Property="BorderBrush" Value="{StaticResource CarbonBorderLight}" />
<Setter Property="BorderThickness" Value="1" />
<Setter Property="CornerRadius" Value="2" />
<Setter Property="MinHeight" Value="{StaticResource CarbonControlHeight}" />
@@ -189,7 +187,7 @@
MinHeight="{StaticResource CarbonControlHeight}"
Padding="0"
BorderThickness="1"
BorderBrush="{StaticResource CarbonInputBorder}"
BorderBrush="{StaticResource CarbonBorderLight}"
Background="{StaticResource CarbonInputBg}"
CornerRadius="2"
HorizontalAlignment="Stretch"
@@ -306,14 +304,12 @@
<Setter Property="FontSize" Value="12" />
<Setter Property="Padding" Value="8,1" />
<Setter Property="CornerRadius" Value="2" />
<Setter Property="BorderBrush" Value="{StaticResource CarbonInputBorder}" />
</Style>
<Style Selector="TextBox">
<Setter Property="MinHeight" Value="{StaticResource CarbonControlHeight}" />
<Setter Property="FontSize" Value="12" />
<Setter Property="Padding" Value="6,1" />
<Setter Property="CornerRadius" Value="2" />
<Setter Property="BorderBrush" Value="{StaticResource CarbonInputBorder}" />
</Style>
<!-- Fluent gives the spinner and the check controls a 32 px floor of their own,
inside the template, so setting MinHeight on the control alone does nothing. -->

View File

@@ -61,10 +61,8 @@
with no label hides PART_Label, and without this the
column would collapse onto the key and every
explanation would start at a different place again. -->
<!-- Selectable for copying, but no stop for Tab: a reader found
nothing there to say between one setting and the next. -->
<SelectableTextBlock Name="PART_ConfigKey"
Grid.Row="1" Grid.Column="0" IsTabStop="False"
Grid.Row="1" Grid.Column="0"
Text="{TemplateBinding ConfigKey}"
FontFamily="Consolas, DejaVu Sans Mono, Liberation Mono, Menlo, Courier New"
FontSize="11"

View File

@@ -82,8 +82,6 @@ public static class AboutWindow
};
close.Classes.Add("Accent");
close.Click += (_, _) => win.Close();
close.IsDefault = true;
close.IsCancel = true;
var footer = new StackPanel
{

View File

@@ -81,12 +81,11 @@
PointerWheelChanged="Combo_OnPointerWheel"
SelectionChanged="ClassCombo_OnSelectionChanged" />
<TextBox Name="searchBox" AutomationProperties.LandmarkType="Search" Grid.Row="3" Margin="0,0,0,6"
<TextBox Name="searchBox" Grid.Row="3" Margin="0,0,0,6"
PlaceholderText="{Binding [SearchAllVehicles], Source={x:Static starterNg:App.Loc}}"
TextChanged="SearchBox_OnTextChanged" />
<ListBox Name="vehicleListBox" Grid.Row="4" Classes="Compact" MinHeight="60"
AutomationProperties.Name="{Binding [Vehicles], Source={x:Static starterNg:App.Loc}}"
SelectionChanged="VehicleListBox_OnSelectionChanged"
DoubleTapped="VehicleListBox_OnDoubleTapped"
PointerPressed="VehicleListBox_OnPointerPressed" />
@@ -127,8 +126,7 @@
BorderThickness="1" CornerRadius="2" Padding="6">
<!-- The tab picks what the consist strip edits: a consist of the scenery,
or a consist kept in the warehouse. -->
<TabControl Name="consistSourceTabs" AutomationProperties.Name="{Binding [DepotConsistSources], Source={x:Static starterNg:App.Loc}}"
SelectionChanged="ConsistSourceTabs_OnSelectionChanged">
<TabControl Name="consistSourceTabs" SelectionChanged="ConsistSourceTabs_OnSelectionChanged">
<TabItem Name="sceneryConsistsTab"
Header="{Binding [SceneryConsists], Source={x:Static starterNg:App.Loc}}">
<DockPanel LastChildFill="True">
@@ -147,7 +145,6 @@
Content="{Binding [ShowAiVehicles], Source={x:Static starterNg:App.Loc}}" />
</StackPanel>
<ListBox Name="sceneryConsistList" Classes="Compact"
AutomationProperties.Name="{Binding [SceneryConsists], Source={x:Static starterNg:App.Loc}}"
SelectionChanged="SceneryConsistList_OnSelectionChanged"
KeyDown="SceneryConsistList_OnKeyDown" />
</DockPanel>
@@ -163,8 +160,7 @@
<TextBlock DockPanel.Dock="Bottom" Margin="2,6,0,0" FontSize="12" Opacity="0.6"
TextWrapping="Wrap"
Text="{Binding [WarehouseEditHint], Source={x:Static starterNg:App.Loc}}" />
<ListBox Name="warehouseList" Classes="Compact"
AutomationProperties.Name="{Binding [WarehouseConsists], Source={x:Static starterNg:App.Loc}}" />
<ListBox Name="warehouseList" Classes="Compact" />
</DockPanel>
</TabItem>
</TabControl>
@@ -199,7 +195,7 @@
Background="{StaticResource CarbonPanelBg}"
BorderBrush="{StaticResource CarbonBorderLight}"
BorderThickness="1" CornerRadius="2" Padding="6">
<TabControl AutomationProperties.Name="{Binding [DepotVehicleInfo], Source={x:Static starterNg:App.Loc}}">
<TabControl>
<TabItem Header="{Binding [GeneralInfo], Source={x:Static starterNg:App.Loc}}">
<ScrollViewer VerticalScrollBarVisibility="Auto">
<StackPanel Name="generalPanel" Margin="4" Grid.IsSharedSizeScope="True" />
@@ -217,7 +213,7 @@
Background="{StaticResource CarbonPanelBg}"
BorderBrush="{StaticResource CarbonBorderLight}"
BorderThickness="1" CornerRadius="2" Padding="6">
<TabControl AutomationProperties.Name="{Binding [DepotVehicleEdit], Source={x:Static starterNg:App.Loc}}">
<TabControl>
<TabItem Header="{Binding [Coupling], Source={x:Static starterNg:App.Loc}}">
<!-- The coupling grid now uses the full tab width. The two
actions sit underneath, so they do not steal horizontal
@@ -322,12 +318,7 @@
<Panel>
<!-- Tab reaches the strip once and lands on the selected
card; the arrow keys walk it from there. -->
<!-- Read as the list of cards it is, so a reader hears where it is
and how many cards it holds. -->
<StackPanel Name="consistStack" Orientation="Horizontal"
AutomationProperties.Name="{Binding [Consist], Source={x:Static starterNg:App.Loc}}"
AutomationProperties.ControlTypeOverride="List"
AutomationProperties.AccessibilityView="Content"
KeyboardNavigation.TabNavigation="Once"
VerticalAlignment="Center" Spacing="0" />
<Canvas Name="consistOverlay" IsHitTestVisible="False" />

View File

@@ -369,41 +369,6 @@ public partial class Depot : UserControl
// The cards are thrown away and rebuilt on every change, so a keyboard-driven
// edit has to be handed its card back or focus escapes the strip.
_cards.FocusSelectedCard(onlyIfRequested: true);
TellChange();
}
// The consist as it was last told, and whose it was.
private List<ConsistNarration.Unit> _told = new();
private Trainset? _toldTrainset;
// While an undo or a redo loads the consist: the word said before what it changed.
private string? _restoreWord;
/// <summary>
/// Says what the change did to the consist: nothing on the strip told a screen
/// reader of a vehicle added from the list, removed, turned or of an undo. Another
/// consist taken up is not told, its entry on the list says what it is.
/// </summary>
private void TellChange()
{
var now = _consist.Select(item => new ConsistNarration.Unit(
string.Join(", ", item.Cars.Select(car => TrainsetDisplay.VehicleLabel(car))), item.Flipped)).ToList();
var trainset = _consist.EditingTrainset;
bool same = trainset is not null && ReferenceEquals(trainset, _toldTrainset);
var before = _told;
_told = now;
_toldTrainset = trainset;
if (!same)
return;
// A card moved or turned from the keyboard is focused again, and says its new place itself.
if (_restoreWord is null && before.Count == now.Count && consistStack.IsKeyboardFocusWithin)
return;
string? said = ConsistNarration.Describe(before, now, _consist.VehicleCount, key => App.Loc[key]);
if (_restoreWord is not null)
said = string.Format(App.Loc[_restoreWord], said ?? string.Empty).Trim();
Controls.Announcer.Say(this, said);
}
private void WriteBackToScenery()
@@ -527,11 +492,11 @@ public partial class Depot : UserControl
redoButton.IsEnabled = editing is not null && _history.CanRedo(editing);
}
public void Undo() => Restore(_history.Undo, "ConsistSaidUndone");
public void Undo() => Restore(_history.Undo);
public void Redo() => Restore(_history.Redo, "ConsistSaidRedone");
public void Redo() => Restore(_history.Redo);
private void Restore(Func<Trainset, int, ConsistHistory.State?> step, string word)
private void Restore(Func<Trainset, int, ConsistHistory.State?> step)
{
if (_consist.EditingTrainset is not { } trainset ||
step(trainset, SelectedIndex()) is not { } state)
@@ -539,7 +504,6 @@ public partial class Depot : UserControl
trainset.Vehicles = state.Vehicles.ToList();
_restoring = true;
_restoreWord = word;
try
{
_consist.LoadFrom(trainset, state.Selected);
@@ -547,7 +511,6 @@ public partial class Depot : UserControl
finally
{
_restoring = false;
_restoreWord = null;
}
}
@@ -719,8 +682,6 @@ public partial class Depot : UserControl
Foreground = new SolidColorBrush(Color.Parse("#E0A030"))
};
ToolTip.SetTip(dot, App.Loc["ConsistUnsaved"]);
// Read as its meaning in the entry's name, not as "black circle".
Avalonia.Automation.AutomationProperties.SetName(dot, App.Loc["ConsistUnsaved"]);
var row = new DockPanel();
DockPanel.SetDock(dot, Dock.Left);
row.Children.Add(dot);

View File

@@ -1,102 +0,0 @@
using System;
using System.Collections.Generic;
using System.Linq;
namespace StarterNG.Views;
/// <summary>
/// What a change to the consist is said as, to someone who cannot see the strip: a
/// vehicle added from the list, removed with Delete, turned, moved, or a whole undo,
/// each of which changed only pictures before. Worked out from the consist as it was
/// and as it is, so every way of making the change - a button, a key, the menu, a
/// drag - is told the same way.
/// </summary>
public static class ConsistNarration
{
/// <summary>One position of the consist as it is told: what stands there, and whether it is turned.</summary>
public readonly record struct Unit(string Label, bool Turned);
/// <summary>
/// The sentence for the change from <paramref name="before"/> to <paramref name="after"/>;
/// null when nothing a listener would notice changed, such as a coupling or the crew.
/// </summary>
/// <param name="vehicles">How many vehicles the consist has now, its units counted car by car.</param>
/// <param name="loc">The starter's texts by key.</param>
public static string? Describe(IReadOnlyList<Unit> before, IReadOnlyList<Unit> after, int vehicles,
Func<string, string> loc)
{
if (after.Count == 0)
return before.Count == 0 ? null : loc("ConsistSaidEmpty");
var (head, tail) = Common(before, after);
var gone = before.Skip(head).Take(before.Count - head - tail).ToList();
var come = after.Skip(head).Take(after.Count - head - tail).ToList();
if (gone.Count == 0 && come.Count == 0)
return null;
if (gone.Count == 0)
return string.Format(loc("ConsistSaidAdded"), Labels(come), head + 1, after.Count);
if (come.Count == 0)
return string.Format(loc("ConsistSaidRemoved"), Labels(gone), vehicles);
if (gone.Count == come.Count && SameCount(gone, come, head, after.Count, loc) is { } said)
return said;
return string.Format(loc("ConsistSaidChangedMany"), Math.Max(gone.Count, come.Count), vehicles);
}
/// <summary>How many units at the front and at the back stayed as they were.</summary>
private static (int Head, int Tail) Common(IReadOnlyList<Unit> before, IReadOnlyList<Unit> after)
{
int head = 0;
while (head < before.Count && head < after.Count && before[head] == after[head])
head++;
int tail = 0;
while (tail < before.Count - head && tail < after.Count - head
&& before[before.Count - 1 - tail] == after[after.Count - 1 - tail])
tail++;
return (head, tail);
}
/// <summary>A change that left as many units as there were: turned, moved, reordered or one replaced; or null.</summary>
private static string? SameCount(List<Unit> gone, List<Unit> come, int head, int count, Func<string, string> loc)
{
// The same vehicles in the same places: some of them turned round.
if (gone.Select(u => u.Label).SequenceEqual(come.Select(u => u.Label)))
return Turned(gone, come, loc);
// One vehicle taken out and put back elsewhere: the rest keep their order.
if (MovedOne(gone, come) is { } moved)
return string.Format(loc("ConsistSaidMoved"), moved.Unit.Label, head + moved.To + 1, count);
if (gone.OrderBy(u => u.Label, StringComparer.Ordinal).SequenceEqual(
come.OrderBy(u => u.Label, StringComparer.Ordinal)))
return loc("ConsistSaidReordered");
return gone.Count == 1 ? string.Format(loc("ConsistSaidReplaced"), gone[0].Label, come[0].Label) : null;
}
private static string Turned(List<Unit> gone, List<Unit> come, Func<string, string> loc)
{
var turned = come.Where((u, i) => u.Turned != gone[i].Turned).ToList();
if (turned.Count != 1)
return string.Format(loc("ConsistSaidTurnedMany"), turned.Count);
string key = turned[0].Turned ? "ConsistSaidTurned" : "ConsistSaidUnturned";
return string.Format(loc(key), turned[0].Label);
}
/// <summary>The unit and the place it went to when one alone moved, or null.</summary>
private static (Unit Unit, int To)? MovedOne(List<Unit> gone, List<Unit> come)
{
// The run that differs starts and ends with a change, so the mover is at one end of it.
if (come.Count >= 2 && come.Take(come.Count - 1).SequenceEqual(gone.Skip(1)) && come[^1] == gone[0])
return (come[^1], come.Count - 1);
if (come.Count >= 2 && come.Skip(1).SequenceEqual(gone.Take(gone.Count - 1)) && come[0] == gone[^1])
return (come[0], 0);
return null;
}
private static string Labels(IEnumerable<Unit> units) => string.Join(", ", units.Select(u => u.Label));
}

View File

@@ -77,9 +77,6 @@ public sealed class TextureRandomizerDialog
FontSize = 12
};
// Each box stands beside the choice it belongs to, which is no label a reader finds.
Avalonia.Automation.AutomationProperties.SetName(age, App.Loc["RandomizeTexturesRevDiff"]);
Avalonia.Automation.AutomationProperties.SetName(year, App.Loc["RandomizeTexturesVsYear"]);
revDiff.IsCheckedChanged += (_, _) => age.IsEnabled = revDiff.IsChecked == true;
vsYear.IsCheckedChanged += (_, _) => year.IsEnabled = vsYear.IsChecked == true;
@@ -121,8 +118,6 @@ public sealed class TextureRandomizerDialog
};
cancel.Classes.Add("Flat");
cancel.Click += (_, _) => win.Close(false);
ok.IsDefault = true;
cancel.IsCancel = true;
win.Content = new StackPanel
{

View File

@@ -2,7 +2,6 @@ using System;
using System.Collections.Generic;
using System.Linq;
using Avalonia;
using Avalonia.Automation;
using Avalonia.Controls;
using Avalonia.Controls.Templates;
using Avalonia.Input;
@@ -60,8 +59,6 @@ public sealed class VehicleBrowser
private DispatcherTimer? _searchTimer;
private readonly SearchResultsTeller _searchResults;
private Func<string?, bool>? _categoryFilter;
private string? _classFilter;
@@ -84,7 +81,6 @@ public sealed class VehicleBrowser
vehicleListBox.ContextRequested += List_OnContextRequested;
_searchResults = new SearchResultsTeller(searchBox, () => vehicleListBox.ItemCount);
_searchTimer = new DispatcherTimer { Interval = TimeSpan.FromMilliseconds(220) };
_searchTimer.Tick += (_, _) =>
{
@@ -342,7 +338,6 @@ public sealed class VehicleBrowser
Selected = null;
miniPreview.Source = null;
miniPreview.ClearValue(AutomationProperties.NameProperty);
addVehicleButton.IsEnabled = false;
vehicleListBox.Items.Clear();
@@ -386,12 +381,10 @@ public sealed class VehicleBrowser
public void VehicleListBox_OnSelectionChanged(object? sender, SelectionChangedEventArgs e)
{
if (vehicleListBox.SelectedItem is ListBoxItem { Tag: VehicleTexture texture } row)
if (vehicleListBox.SelectedItem is ListBoxItem { Tag: VehicleTexture texture })
{
Selected = texture;
miniPreview.Source = _minis.Get(_db.ResolveMiniName(texture), MiniPreviewHeight);
// Under the mouse a reader hears which vehicle the picture shows.
AutomationProperties.SetName(miniPreview, ScreenReaderNames.TextOf(row.Content));
addVehicleButton.IsEnabled = true;
SyncCombosTo(texture);
@@ -404,7 +397,6 @@ public sealed class VehicleBrowser
{
Selected = null;
miniPreview.Source = null;
miniPreview.ClearValue(AutomationProperties.NameProperty);
addVehicleButton.IsEnabled = false;
}
}
@@ -567,7 +559,6 @@ public sealed class VehicleBrowser
if (_suppress || _searchTimer is null) return;
_searchTimer.Stop();
_searchTimer.Start();
_searchResults.Changed();
}
public void HideArchivalCheck_OnChanged(object? sender, Avalonia.Interactivity.RoutedEventArgs e)
@@ -587,29 +578,12 @@ public sealed class VehicleBrowser
var set = _db.ResolveSet(texture);
var browserTex = set is { Count: > 0 } ? set[0] : texture;
KeepingKeyboardFocus(() => WhileSyncing(() =>
WhileSyncing(() =>
{
ApplyFilters(VehicleInfo.CategoryOf(browserTex), VehicleInfo.ClassOf(browserTex));
Rebuild();
SelectListEntry(browserTex);
}));
}
/// <summary>
/// The list is rebuilt under the keyboard: the add button is switched off for a
/// moment and the rows are replaced, and focus fell out of the window with them -
/// Tab then went nowhere until something was clicked. It is handed back.
/// </summary>
private void KeepingKeyboardFocus(Action rebuild)
{
bool onAdd = addVehicleButton.IsFocused;
bool inList = vehicleListBox.IsKeyboardFocusWithin;
rebuild();
if (onAdd && addVehicleButton.IsEnabled)
addVehicleButton.Focus(NavigationMethod.Tab);
else if (onAdd || inList)
(vehicleListBox.SelectedItem as Control ?? vehicleListBox).Focus(NavigationMethod.Tab);
});
}
private void SyncCombosTo(VehicleTexture texture)
@@ -617,7 +591,7 @@ public sealed class VehicleBrowser
if (_syncingCombos || !ApplyFilters(VehicleInfo.CategoryOf(texture), VehicleInfo.ClassOf(texture)))
return;
PostSyncing(() => KeepingKeyboardFocus(() => { Rebuild(); SelectListEntry(texture); }));
PostSyncing(() => { Rebuild(); SelectListEntry(texture); });
}
private void WhileSyncing(Action work)

View File

@@ -2,8 +2,6 @@ using System;
using System.Collections.Generic;
using System.Linq;
using Avalonia;
using Avalonia.Automation;
using Avalonia.Automation.Peers;
using Avalonia.Controls;
using Avalonia.Input;
using Avalonia.Layout;
@@ -15,7 +13,6 @@ using Material.Icons.Avalonia;
using StarterNG.Classes;
using StarterNG.Domain;
using StarterNG.Domain.Vehicles;
using StarterNG.Controls;
namespace StarterNG.Views;
@@ -149,10 +146,6 @@ public sealed class VehicleCards
Focusable = true
};
card.Classes.Add("ConsistCard");
// The card shows pictures only; without a name a screen reader said nothing on it.
AutomationProperties.SetName(card, CardName(item, index));
AutomationProperties.SetControlTypeOverride(card, AutomationControlType.ListItem);
AutomationProperties.SetIsControlElementOverride(card, true);
card.GotFocus += (_, _) => Select(item, null);
card.KeyDown += (_, e) => OnCardKey(card, item, e);
card.PointerPressed += (_, e) =>
@@ -186,11 +179,6 @@ public sealed class VehicleCards
return card;
}
/// <summary>Its place in the consist and what it holds, as a screen reader says it.</summary>
private string CardName(ConsistItem item, int index) =>
$"{index + 1}. {string.Join(", ", item.Cars.Select(car => CardCaption(item, car, index)))}"
+ (item.Flipped ? $", {App.Loc["Reversed"]}" : string.Empty);
private string CardCaption(ConsistItem item, Dynamic car, int index) =>
TrainsetDisplay.VehicleLabel(car,
head: index == 0 && ReferenceEquals(car, Consist.HeadCar(item)) && TrainsetDisplay.IsPowered(car));
@@ -423,22 +411,12 @@ public sealed class VehicleCards
panel.Children.Add(apply);
var flyout = new Flyout { Content = panel, Placement = PlacementMode.Top };
void Apply()
apply.Click += (_, _) =>
{
_consist.SetWagonNumber(car, (int)(num.Value ?? 0));
flyout.Hide();
}
apply.Click += (_, _) => Apply();
// As the flyout for several vehicles does: typed into at once, Enter sets it.
num.KeyDown += (_, e) =>
{
if (e.Key != Key.Enter) return;
e.Handled = true;
Apply();
};
flyout.ShowAt(anchor);
num.Focus();
}
/// <summary>
@@ -645,10 +623,6 @@ public sealed class VehicleCards
btn.Content = glyph;
btn.Foreground = new SolidColorBrush(Color.Parse(color));
// "2" alone said nothing read aloud: the reader hears who rides in it.
int choice = CrewChoices.IndexOf(type);
AutomationProperties.SetName(btn, ScreenReaderNames.PickerText(
App.Loc["CrewLabel"], choice >= 0 ? App.Loc[CrewChoices.All[choice].Key] : glyph));
}
/// <summary>
@@ -694,7 +668,7 @@ public sealed class VehicleCards
var crew = new MenuItem { Header = App.Loc["CrewLabel"] };
foreach (var (type, key) in CrewChoices.All)
crew.Items.Add(MenuItems.Choice(App.Loc[key], item.Driver == type, () => _consist.SetCrew(item, type)));
crew.AddItem((item.Driver == type ? "● " : "○ ") + App.Loc[key], () => _consist.SetCrew(item, type));
menu.Items.Add(crew);
// The member the panels show, not always the first car of a unit.

View File

@@ -595,9 +595,6 @@ public sealed class VehicleDetails
return Row(content: ready);
var why = PanelNote(App.Loc["ConsistReadyOverridden"]);
why.Margin = new Thickness(0);
// The reader is told it too, with the box, and not only by a text it may never come to.
Avalonia.Automation.AutomationProperties.SetHelpText(ready,
$"{App.Loc["ConsistReadyOverridden"]} {App.Loc["ConsistReadyDesc"]}");
return Row(content: new StackPanel { Spacing = 2, Children = { ready, why } });
}

View File

@@ -116,8 +116,8 @@ public sealed class Warehouse
}
private MenuItem SortItem(PresetSort mode, string locKey) =>
MenuItems.Choice(App.Loc[locKey], PresetStore.SortMode == mode,
() => { PresetStore.SortMode = mode; Refresh(); });
MenuItems.Item((PresetStore.SortMode == mode ? "● " : "○ ") + App.Loc[locKey],
() => { PresetStore.SortMode = mode; Refresh(); });
/// <summary>Asks for a name at the button pressed, and says where the consist went.</summary>
public void SaveCurrent(Control anchor) =>

View File

@@ -1,31 +0,0 @@
using System;
using System.Collections.Generic;
using System.Linq;
namespace StarterNG.Views;
/// <summary>
/// The simulators offered in the settings after the folder was looked at again: a build
/// copied in while the starter runs joins the list, and what was chosen stays chosen, even
/// a file picked from elsewhere or one since removed - looking again never changes the choice.
/// </summary>
public static class ExecutableList
{
/// <summary>The entries that follow "automatic", and the place of <paramref name="chosen"/> among them.</summary>
/// <param name="found">The simulators in the folder now, newest first.</param>
/// <param name="chosen">The entry chosen, or null for "automatic" or nothing chosen yet.</param>
/// <returns>Entries, and the index of the chosen one in them, -1 when <paramref name="chosen"/> is null.</returns>
public static (IReadOnlyList<string> Entries, int Chosen) Refreshed(IReadOnlyList<string> found, string? chosen)
{
var entries = found.ToList();
if (chosen is null)
return (entries, -1);
int at = entries.FindIndex(entry => string.Equals(entry, chosen, StringComparison.OrdinalIgnoreCase));
if (at >= 0)
return (entries, at);
entries.Add(chosen);
return (entries, entries.Count - 1);
}
}

View File

@@ -46,8 +46,6 @@ internal static class IniChangesWindow
var closeBtn = new Button { Content = App.Loc["Close"], MinWidth = 80 };
closeBtn.Classes.Add("Flat");
closeBtn.Click += (_, _) => win.Close();
saveBtn.IsDefault = true;
closeBtn.IsCancel = true;
body.Children.Add(MessageBox.ButtonRow(saveBtn, closeBtn));
win.Content = body;

View File

@@ -1,15 +1,12 @@
using System;
using System.Collections.Generic;
using Avalonia;
using Avalonia.Automation;
using Avalonia.Automation.Peers;
using Avalonia.Controls;
using Avalonia.Controls.Primitives;
using Avalonia.Input;
using Avalonia.Layout;
using Avalonia.Media;
using StarterNG.Classes;
using StarterNG.Controls;
using StarterNG.Infrastructure;
using KeyBinding = StarterNG.Classes.KeyBinding;
@@ -37,14 +34,6 @@ internal sealed class KeyBindingsTab(Grid host, TextBox search)
private KeyBinding? _capturing;
private Button? _capturingButton;
// The row buttons of each binding on the list, so focus goes back to the row it
// left when the list is drawn anew after an edit.
private readonly Dictionary<KeyBinding, (Button Combo, Button Clear)> _rowButtons = new();
// The keys of the drawn keyboard that can be bound, in reading order, with the block
// and the row each lies in: the arrow keys walk them as they lie.
private readonly List<(Border Cap, int Block, int Row)> _caps = new();
private readonly Dictionary<string, Grid> _keyCells = new(StringComparer.OrdinalIgnoreCase);
private bool _flyoutLoading;
@@ -59,7 +48,6 @@ internal sealed class KeyBindingsTab(Grid host, TextBox search)
private static readonly IBrush FgBrush = new SolidColorBrush(Color.Parse("#E6E8EA"));
private static readonly IBrush FgDimBrush = new SolidColorBrush(Color.Parse("#9098A0"));
private static readonly IBrush ConflictBrush = new SolidColorBrush(Color.Parse("#E06C5A"));
private static readonly IBrush KeyFocusBrush = new SolidColorBrush(Color.Parse("#41C400"));
// The four combinations a key can be on. After the brushes: static fields start in text order.
private static readonly (bool Shift, bool Ctrl, string SlotTextKey, IBrush Colour)[] ModifierSlots =
@@ -163,27 +151,11 @@ internal sealed class KeyBindingsTab(Grid host, TextBox search)
RedrawBindings();
}
private void BindingsEdited(KeyBinding? focusRow = null)
private void BindingsEdited()
{
KeyboardConfig.Instance.Dirty = true;
Changed?.Invoke();
RedrawBindings();
if (focusRow is not null)
FocusRow(focusRow);
}
/// <summary>
/// Puts focus back on a binding's row once the list is drawn anew: it went with the
/// old row, and a keyboard user was left nowhere.
/// </summary>
private void FocusRow(KeyBinding binding)
{
if (!_rowButtons.TryGetValue(binding, out var row))
return;
// The key button, which says what the binding is now.
row.Combo.Focus(NavigationMethod.Tab);
row.Combo.BringIntoView();
}
private void RedrawBindings()
@@ -192,16 +164,12 @@ internal sealed class KeyBindingsTab(Grid host, TextBox search)
RebuildKeyboard();
}
/// <summary>How many bindings the list shows, after the search.</summary>
public int ShownCount => _rowButtons.Count;
public void RebuildList()
{
if (_bindingListPanel is null)
return;
_bindingListPanel.Children.Clear();
_rowButtons.Clear();
// The sidebar search box serves this list too - see Settings.ApplyFilter.
string filter = search.Text?.Trim() ?? string.Empty;
var conflicts = KeyboardConfig.Instance.ConflictingCombos();
@@ -285,7 +253,6 @@ internal sealed class KeyBindingsTab(Grid host, TextBox search)
ToolTip.SetTip(comboButton, SimulatorUseText(b.Key, b.Shift, b.Ctrl, use));
else if (conflict)
ToolTip.SetTip(comboButton, App.Loc["ConflictTooltip"]);
NameCombo(comboButton, b, comboButton.Content as string);
comboButton.Click += (_, _) => StartCapture(b, comboButton);
Grid.SetColumn(comboButton, 1);
grid.Children.Add(comboButton);
@@ -298,15 +265,12 @@ internal sealed class KeyBindingsTab(Grid host, TextBox search)
};
clearButton.Classes.Add("Basic");
ToolTip.SetTip(clearButton, App.Loc["ClearBinding"]);
// Every row has one: the reader is told whose it is.
AutomationProperties.SetName(clearButton, ScreenReaderNames.PickerText(App.Loc["ClearBinding"], CommandLabel(b)));
clearButton.Click += (_, _) =>
{
CancelCapture();
b.Clear();
BindingsEdited(b);
BindingsEdited();
};
_rowButtons[b] = (comboButton, clearButton);
Grid.SetColumn(clearButton, 2);
grid.Children.Add(clearButton);
@@ -325,39 +289,22 @@ internal sealed class KeyBindingsTab(Grid host, TextBox search)
{
if (_capturing is not null && _capturingButton is not null)
Show(_capturingButton, _capturing, ComboText(_capturing));
_capturingButton.Content = ComboText(_capturing);
_capturing = b;
_capturingButton = button;
button.Content = App.Loc["PressKey"];
button.Focus();
Show(button, b, App.Loc["PressKey"], say: true);
}
private void CancelCapture()
{
if (_capturing is not null && _capturingButton is not null)
Show(_capturingButton, _capturing, ComboText(_capturing), say: _capturingButton.IsKeyboardFocusWithin);
_capturingButton.Content = ComboText(_capturing);
_capturing = null;
_capturingButton = null;
}
/// <summary>
/// Writes on a binding's button what it shows and names it after its command too, so
/// a reader hears "Odluźniacz: Num 4" and not a key alone. Said aloud when the change
/// happens under the focus, where nothing else would tell of it.
/// </summary>
private static void Show(Button button, KeyBinding b, string text, bool say = false)
{
button.Content = text;
NameCombo(button, b, text);
if (say)
Announcer.Say(button, text);
}
private static void NameCombo(Button button, KeyBinding b, string? shown) =>
AutomationProperties.SetName(button, ScreenReaderNames.PickerText(
CommandLabel(b), b.IsAssigned || shown != ComboText(b) ? shown : App.Loc["KbUnassigned"]));
public void OnKeyDown(object? sender, KeyEventArgs e)
{
if (_capturing is null)
@@ -386,19 +333,18 @@ internal sealed class KeyBindingsTab(Grid host, TextBox search)
{
// Bound here it would never fire: the wait for a key goes on.
if (_capturingButton is not null)
Show(_capturingButton, _capturing, string.Format(App.Loc["KbTaken"], App.Loc[taken.TextKey]), say: true);
_capturingButton.Content = string.Format(App.Loc["KbTaken"], App.Loc[taken.TextKey]);
e.Handled = true;
return;
}
// As the key flyout does: the combination moves here, not doubled up.
var bound = _capturing;
KeyboardConfig.Instance.Put(bound, token, shift, ctrl);
KeyboardConfig.Instance.Put(_capturing, token, shift, ctrl);
e.Handled = true;
_capturing = null;
_capturingButton = null;
BindingsEdited(bound);
BindingsEdited();
}
private void RebuildKeyboard()
@@ -407,16 +353,13 @@ internal sealed class KeyBindingsTab(Grid host, TextBox search)
return;
_keyCells.Clear();
_caps.Clear();
_keyboardPanel.Children.Clear();
// Tab reaches the keyboard once; the arrow keys walk it from there.
KeyboardNavigation.SetTabNavigation(_keyboardPanel, KeyboardNavigationMode.Once);
var states = ComputeKeyStates();
var row = new StackPanel { Orientation = Orientation.Horizontal, Spacing = 14 };
row.Children.Add(BuildKeyBlock(KeyMap.MainBlock, states, 0));
row.Children.Add(BuildKeyBlock(KeyMap.NavBlock, states, 1));
row.Children.Add(BuildKeyBlock(KeyMap.NumpadBlock, states, 2));
row.Children.Add(BuildKeyBlock(KeyMap.MainBlock, states));
row.Children.Add(BuildKeyBlock(KeyMap.NavBlock, states));
row.Children.Add(BuildKeyBlock(KeyMap.NumpadBlock, states));
_keyboardPanel.Children.Add(row);
}
@@ -429,27 +372,24 @@ internal sealed class KeyBindingsTab(Grid host, TextBox search)
content.Children.RemoveAt(0);
content.Children.Insert(0, BuildKeyBackground(token, states));
states.TryGetValue(token, out var state);
string tip = BuildKeyTooltip(token, state);
ToolTip.SetTip(content, tip);
if (content.Parent is Border cap)
NameCap(cap, tip);
ToolTip.SetTip(content, BuildKeyTooltip(token, state));
}
}
private StackPanel BuildKeyBlock(KeyCap[][] rows, Dictionary<string, KeyState> states, int blockIndex)
private Control BuildKeyBlock(KeyCap[][] rows, Dictionary<string, KeyState> states)
{
var block = new StackPanel { Spacing = KeyGap, VerticalAlignment = VerticalAlignment.Top };
for (int r = 0; r < rows.Length; r++)
foreach (var rowCaps in rows)
{
var rowPanel = new StackPanel { Orientation = Orientation.Horizontal, Spacing = KeyGap };
foreach (var cap in rows[r])
rowPanel.Children.Add(BuildKeyCap(cap, states, blockIndex, r));
foreach (var cap in rowCaps)
rowPanel.Children.Add(BuildKeyCap(cap, states));
block.Children.Add(rowPanel);
}
return block;
}
private Border BuildKeyCap(KeyCap cap, Dictionary<string, KeyState> states, int blockIndex, int rowIndex)
private Control BuildKeyCap(KeyCap cap, Dictionary<string, KeyState> states)
{
double width = cap.Width * KeyUnit + (cap.Width - 1) * KeyGap;
var content = new Grid { Width = width, Height = KeyHeight };
@@ -498,84 +438,14 @@ internal sealed class KeyBindingsTab(Grid host, TextBox search)
HorizontalAlignment = HorizontalAlignment.Center,
VerticalAlignment = VerticalAlignment.Center
});
string tip = BuildKeyTooltip(token, st);
ToolTip.SetTip(content, tip);
ToolTip.SetTip(content, BuildKeyTooltip(token, st));
keyBorder.Cursor = new Cursor(StandardCursorType.Hand);
keyBorder.PointerPressed += (_, _) => ShowKeyFlyout(token, keyBorder);
// Reached and opened from the keyboard as well, and read as the button it is.
keyBorder.Focusable = true;
keyBorder.Classes.Add("KeyCap");
AutomationProperties.SetControlTypeOverride(keyBorder, AutomationControlType.Button);
AutomationProperties.SetIsControlElementOverride(keyBorder, true);
NameCap(keyBorder, tip);
keyBorder.KeyDown += (_, e) => OnCapKey(keyBorder, token, e);
// The ring the theme gives focus, drawn here: the key clips anything outside it.
keyBorder.GotFocus += (_, _) => keyBorder.BorderBrush = KeyFocusBrush;
keyBorder.LostFocus += (_, _) => keyBorder.BorderBrush = KeyBorderBrush;
_caps.Add((keyBorder, blockIndex, rowIndex));
_keyCells[token] = content;
return keyBorder;
}
// The tooltip says the key and what is on it, one thing a line; read as one sentence.
private static void NameCap(Border cap, string tip) =>
AutomationProperties.SetName(cap, tip.Replace("\n", ", "));
private void OnCapKey(Border cap, string token, KeyEventArgs e)
{
int at = _caps.FindIndex(c => ReferenceEquals(c.Cap, cap));
if (at < 0)
return;
if (e.Key is Key.Enter or Key.Space)
{
ShowKeyFlyout(token, cap);
e.Handled = true;
return;
}
Border? next;
switch (e.Key)
{
case Key.Left: next = at > 0 ? _caps[at - 1].Cap : null; break;
case Key.Right: next = at < _caps.Count - 1 ? _caps[at + 1].Cap : null; break;
case Key.Home: next = _caps[0].Cap; break;
case Key.End: next = _caps[^1].Cap; break;
case Key.Up: next = CapNextRow(at, -1); break;
case Key.Down: next = CapNextRow(at, 1); break;
default: return;
}
next?.Focus(NavigationMethod.Directional);
e.Handled = true;
}
/// <summary>The key in the next row up or down of the same block that lies nearest over or under this one.</summary>
private Border? CapNextRow(int at, int step)
{
var (cap, block, row) = _caps[at];
if (_keyboardPanel is null || cap.TranslatePoint(new Point(cap.Bounds.Width / 2, 0), _keyboardPanel) is not { } from)
return null;
Border? best = null;
double nearest = double.MaxValue;
foreach (var (other, otherBlock, otherRow) in _caps)
{
if (otherBlock != block || otherRow != row + step
|| other.TranslatePoint(new Point(other.Bounds.Width / 2, 0), _keyboardPanel) is not { } to)
continue;
double distance = Math.Abs(to.X - from.X);
if (distance < nearest)
{
nearest = distance;
best = other;
}
}
return best;
}
private Control BuildKeyBackground(string token, Dictionary<string, KeyState> states)
{
states.TryGetValue(token.ToLowerInvariant(), out var state);
@@ -675,8 +545,6 @@ internal sealed class KeyBindingsTab(Grid host, TextBox search)
Margin = new Thickness(0, 4),
HorizontalAlignment = HorizontalAlignment.Stretch
};
// Its label is a swatch and a text in a panel, which a reader does not take for one.
AutomationProperties.SetName(cb, KeyMap.ComboText(token, shift, ctrl));
if (KeyMap.SimulatorUse(token, shift, ctrl) is { } use)
{
ToolTip.SetTip(cb, SimulatorUseText(token, shift, ctrl, use));

View File

@@ -34,7 +34,6 @@ public sealed class LogAndToolsWindow : Window
WindowStartupLocation = WindowStartupLocation.CenterOwner;
var tabs = new TabControl();
Avalonia.Automation.AutomationProperties.SetName(tabs, App.Loc["LogAndTools"]);
tabs.Items.Add(new TabItem { Header = App.Loc["AdvLogPage"], Content = BuildLogPage() });
tabs.Items.Add(new TabItem { Header = App.Loc["Tools"], Content = BuildToolsPage() });
@@ -48,7 +47,6 @@ public sealed class LogAndToolsWindow : Window
};
close.Classes.Add("Accent");
close.Click += (_, _) => Close();
close.IsCancel = true;
var root = new DockPanel { Margin = new Avalonia.Thickness(10) };
DockPanel.SetDock(close, Dock.Bottom);

View File

@@ -15,18 +15,6 @@ internal static class MenuItems
return item;
}
/// <summary>
/// One of a set of entries of which one is chosen, marked as a radio entry. A dot
/// written before the text was read out as "black circle" and told no state.
/// </summary>
public static MenuItem Choice(string header, bool chosen, Action run)
{
var item = Item(header, run);
item.ToggleType = MenuItemToggleType.Radio;
item.IsChecked = chosen;
return item;
}
/// <summary>The entry at the end of a menu or a submenu.</summary>
public static MenuItem AddItem(this ItemsControl menu, object header, Action run, bool enabled = true,
KeyGesture? gesture = null)

View File

@@ -1,6 +1,5 @@
using System;
using System.Threading.Tasks;
using Avalonia.Automation;
using Avalonia.Controls;
using Avalonia.Layout;
using Avalonia.Media;
@@ -27,13 +26,6 @@ public static class MessageBox
"Accent", 80, () => { yes = true; win.Close(); });
var noBtn = DialogButton(noText ?? App.Loc["No"], "Flat", 80, () => win.Close());
noBtn.IsVisible = buttons != MessageBoxButtons.Ok;
// Enter answers, Esc declines - or only closes, where OK is all there is.
yesBtn.IsDefault = true;
if (buttons == MessageBoxButtons.Ok)
yesBtn.IsCancel = true;
else
noBtn.IsCancel = true;
ReadMessage(win, yesBtn, message);
win.Content = new StackPanel
{
@@ -64,9 +56,6 @@ public static class MessageBox
var okBtn = DialogButton(App.Loc["Ok"], "Flat", 80, () => win.Close());
var silence = new CheckBox { Content = silenceText, VerticalAlignment = VerticalAlignment.Center };
actBtn.IsDefault = true;
okBtn.IsCancel = true;
ReadMessage(win, actBtn, message);
win.Content = new StackPanel
{
@@ -90,16 +79,6 @@ public static class MessageBox
return (act, silence.IsChecked == true);
}
/// <summary>
/// The message is told with the window and with the button focus opens on: a
/// screen reader said only the title, and the question it asked went unheard.
/// </summary>
internal static void ReadMessage(Window win, Control first, string message)
{
AutomationProperties.SetHelpText(win, message);
AutomationProperties.SetHelpText(first, message);
}
/// <summary>A dialog over its owner, as tall as what it holds, not to be resized.</summary>
internal static Window FixedDialog(string title, double width) => new()
{

View File

@@ -80,7 +80,6 @@ public sealed class RulesWindow : Window
};
cancel.Classes.Add("Flat");
cancel.Click += (_, _) => Close();
cancel.IsCancel = true;
var footer = new StackPanel
{

View File

@@ -4,7 +4,6 @@
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:starterNg="clr-namespace:StarterNG"
xmlns:infra="clr-namespace:StarterNG.Infrastructure"
xmlns:ctl="clr-namespace:StarterNG.Controls"
xmlns:materialIcons="clr-namespace:Material.Icons.Avalonia;assembly=Material.Icons.Avalonia"
mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
x:Class="StarterNG.Views.Scenarios"
@@ -34,7 +33,6 @@
IsCheckedChanged="ArchivalSwitch_OnChanged"
Content="{Binding [HideArchivalSceneries], Source={x:Static starterNg:App.Loc}}" />
<TreeView Name="sceneryList" Classes="Compact"
AutomationProperties.Name="{Binding [Sceneries], Source={x:Static starterNg:App.Loc}}"
SelectionChanged="SceneryList_OnSelectionChanged"
ContextRequested="SceneryList_OnContextRequested">
<TreeView.ContextMenu>
@@ -51,7 +49,7 @@
</DockPanel>
</HeaderedContentControl>
<GridSplitter IsTabStop="False" AutomationProperties.Name="{Binding [PanelSplitter], Source={x:Static starterNg:App.Loc}}" Grid.Column="1" Grid.Row="0" Width="6"
<GridSplitter Grid.Column="1" Grid.Row="0" Width="6"
Background="Transparent" ResizeDirection="Columns" />
<Grid Grid.Column="2" Grid.Row="0">
@@ -72,14 +70,13 @@
</HeaderedContentControl.Tag>
<ListBox Name="vehicleList" Classes="Compact"
AutomationProperties.Name="{Binding [SceneryConsists], Source={x:Static starterNg:App.Loc}}"
SelectionChanged="VehicleList_OnSelectionChanged" />
</HeaderedContentControl>
<GridSplitter IsTabStop="False" AutomationProperties.Name="{Binding [PanelSplitter], Source={x:Static starterNg:App.Loc}}" Grid.Row="1" Height="4" HorizontalAlignment="Stretch"
<GridSplitter Grid.Row="1" Height="4" HorizontalAlignment="Stretch"
Background="Transparent" ResizeDirection="Rows" />
<TabControl Grid.Row="2" Name="infoTabs" AutomationProperties.Name="{Binding [ScenarioDetails], Source={x:Static starterNg:App.Loc}}">
<TabControl Grid.Row="2" Name="infoTabs">
<TabItem Header="{Binding [TabDescription], Source={x:Static starterNg:App.Loc}}">
<Grid RowDefinitions="2*,6,*" Margin="4">
<Grid Grid.Row="0" ColumnDefinitions="*,3,225">
@@ -111,11 +108,11 @@
Foreground="{StaticResource CarbonFgDim}"
Text="{Binding [Date], Source={x:Static starterNg:App.Loc}}" />
<Grid Grid.Row="0" Grid.Column="2" ColumnDefinitions="150,10,150,10,*">
<DatePicker Grid.Column="0" Name="weatherDate" AutomationProperties.Name="{Binding [Date], Source={x:Static starterNg:App.Loc}}"
<DatePicker Grid.Column="0" Name="weatherDate"
YearVisible="False" MinWidth="0"
VerticalAlignment="Center" HorizontalAlignment="Stretch"
SelectedDateChanged="WeatherDate_OnChanged" />
<ComboBox Grid.Column="2" Name="weatherSeason" AutomationProperties.Name="{Binding [Season], Source={x:Static starterNg:App.Loc}}" Classes="Localized"
<ComboBox Grid.Column="2" Name="weatherSeason" Classes="Localized"
HorizontalAlignment="Stretch" VerticalAlignment="Center"
SelectionChanged="WeatherSeason_OnChanged">
<ComboBoxItem Tag="0" Content="{Binding [SeasonNow], Source={x:Static starterNg:App.Loc}}" />
@@ -133,7 +130,7 @@
Foreground="{StaticResource CarbonFgDim}"
Text="{Binding [Time], Source={x:Static starterNg:App.Loc}}" />
<Grid Grid.Row="2" Grid.Column="2" ColumnDefinitions="150,8,*">
<TimePicker Grid.Column="0" Name="weatherTime" AutomationProperties.Name="{Binding [Time], Source={x:Static starterNg:App.Loc}}"
<TimePicker Grid.Column="0" Name="weatherTime"
ClockIdentifier="24HourClock" MinuteIncrement="1"
MinWidth="0" VerticalAlignment="Center"
HorizontalAlignment="Stretch"
@@ -148,7 +145,7 @@
<TextBlock Grid.Row="4" Grid.Column="0" VerticalAlignment="Center"
Foreground="{StaticResource CarbonFgDim}"
Text="{Binding [Temperature], Source={x:Static starterNg:App.Loc}}" />
<ctl:ReadableSlider Grid.Row="4" Grid.Column="2" Name="weatherTemp" AutomationProperties.Name="{Binding [Temperature], Source={x:Static starterNg:App.Loc}}"
<Slider Grid.Row="4" Grid.Column="2" Name="weatherTemp"
Minimum="-50" Maximum="50"
TickFrequency="1" IsSnapToTickEnabled="True"
ValueChanged="Weather_OnSliderChanged" />
@@ -165,8 +162,8 @@
<TextBlock Grid.Row="7" Grid.Column="0" VerticalAlignment="Center"
Foreground="{StaticResource CarbonFgDim}"
Text="{Binding [Visibility], Source={x:Static starterNg:App.Loc}}" />
<ctl:ReadableSlider Grid.Row="7" Grid.Column="2" Name="weatherFog" AutomationProperties.Name="{Binding [Visibility], Source={x:Static starterNg:App.Loc}}"
Minimum="0" Maximum="1000" SmallChange="20" LargeChange="100"
<Slider Grid.Row="7" Grid.Column="2" Name="weatherFog"
Minimum="0" Maximum="1000"
TickFrequency="1" IsSnapToTickEnabled="True"
ValueChanged="Weather_OnSliderChanged" />
<TextBlock Grid.Row="7" Grid.Column="4" Name="weatherFogLabel"
@@ -183,7 +180,7 @@
<TextBlock Grid.Row="10" Grid.Column="0" VerticalAlignment="Center"
Foreground="{StaticResource CarbonFgDim}"
Text="{Binding [Overcast], Source={x:Static starterNg:App.Loc}}" />
<ComboBox Grid.Row="10" Grid.Column="2" Name="weatherOvercast" AutomationProperties.Name="{Binding [Overcast], Source={x:Static starterNg:App.Loc}}" Classes="Localized"
<ComboBox Grid.Row="10" Grid.Column="2" Name="weatherOvercast" Classes="Localized"
HorizontalAlignment="Stretch"
SelectionChanged="Weather_OnSelectionChanged">
<ComboBoxItem Tag="random" Content="{Binding [OvercastRandom], Source={x:Static starterNg:App.Loc}}" />

View File

@@ -8,7 +8,6 @@ using System.Linq;
using System.Text.RegularExpressions;
using System.Threading.Tasks;
using Avalonia;
using Avalonia.Automation;
using Avalonia.Animation;
using Avalonia.Controls;
using Avalonia.Input;
@@ -18,7 +17,6 @@ using Avalonia.Media.Imaging;
using Avalonia.Threading;
using Avalonia.VisualTree;
using StarterNG.Classes;
using StarterNG.Controls;
using StarterNG.Domain;
using StarterNG.Application;
using StarterNG.Domain.Sceneries;
@@ -101,9 +99,9 @@ public partial class Scenarios : UserControl
sceneryList.Items.Add(ToTreeItem(node, expandGroups));
}
private ExpandableTreeViewItem ToTreeItem(SceneryTreeNode node, bool expandGroups)
private TreeViewItem ToTreeItem(SceneryTreeNode node, bool expandGroups)
{
var item = new ExpandableTreeViewItem
var item = new TreeViewItem
{
Header = node.IsGroup ? node.Label : SceneryHeader(node.Label, Sceneries[node.SceneryIndex]),
Tag = node.IsGroup ? null : node.SceneryIndex,
@@ -411,8 +409,6 @@ public partial class Scenarios : UserControl
sceneryDescription.Text = scenery.LocalizedDescription(AppServices.Current.SceneryTexts);
string? imagePath = AppServices.Current.SceneryImages.Resolve(scenery);
// Under the mouse a reader hears what the picture is of.
AutomationProperties.SetName(sceneryImage, $"{App.Loc["SceneryImage"]}: {scenery.Name}");
if (imagePath is not null)
{
try
@@ -763,8 +759,6 @@ public partial class Scenarios : UserControl
{
weatherTempLabel.Text = $"{(int)weatherTemp.Value} °C";
weatherFogLabel.Text = FogScale2(FogScale.ToMetres(weatherFog.Value));
weatherTemp.ValueText = weatherTempLabel.Text;
weatherFog.ValueText = weatherFogLabel.Text;
weatherDayDate.Text = string.Format(LanguageCulture, App.Loc["DayOfYear"], SelectedDayOfYear());
weatherRestore.IsEnabled = _currentScenery?.Weather.Changed ?? false;
@@ -837,7 +831,6 @@ public partial class Scenarios : UserControl
{
var now = DateTime.Now;
weatherTime.SelectedTime = new TimeSpan(now.Hour, now.Minute, 0);
Announcer.Say(this, ScreenReaderNames.PickerText(App.Loc["Time"], ScreenReaderNames.TimeText(weatherTime.SelectedTime)));
}
private void WeatherRestore_OnClick(object? sender, RoutedEventArgs e)
@@ -845,18 +838,8 @@ public partial class Scenarios : UserControl
if (_currentScenery is null) return;
_currentScenery.Weather.Restore();
ShowWeather(_currentScenery);
Announcer.Say(this, WeatherSummary());
}
/// <summary>The weather as a reader hears it once put back: every field and its value.</summary>
private string WeatherSummary() => string.Join(", ",
ScreenReaderNames.PickerText(App.Loc["Date"], ScreenReaderNames.DateText(weatherDate.SelectedDate, weatherDate.YearVisible)),
ScreenReaderNames.PickerText(App.Loc["Season"], ScreenReaderNames.TextOf(weatherSeason.SelectedItem)),
ScreenReaderNames.PickerText(App.Loc["Time"], ScreenReaderNames.TimeText(weatherTime.SelectedTime)),
ScreenReaderNames.PickerText(App.Loc["Temperature"], weatherTempLabel.Text),
ScreenReaderNames.PickerText(App.Loc["Visibility"], weatherFogLabel.Text),
ScreenReaderNames.PickerText(App.Loc["Overcast"], ScreenReaderNames.TextOf(weatherOvercast.SelectedItem)));
private static TimeSpan? ParseTime(string? text)
{
if (string.IsNullOrWhiteSpace(text))

View File

@@ -22,7 +22,7 @@
TextTrimming="LeadingCharacterEllipsis" />
</DockPanel>
<StackPanel Grid.Column="1" Orientation="Horizontal" Spacing="12" HorizontalAlignment="Right">
<TextBlock x:Name="SaveStatus" ctl:Announcer.Changes="True" VerticalAlignment="Center" Opacity="0.8" Text="" />
<TextBlock x:Name="SaveStatus" VerticalAlignment="Center" Opacity="0.8" Text="" />
<Button x:Name="ChangesButton" Classes="Flat" Click="ChangesButton_OnClick"
Content="{Binding [IniChangesButton], Source={x:Static starterNg:App.Loc}}" />
<Button x:Name="ResetButton" Classes="Flat" Click="ResetButton_OnClick"
@@ -40,15 +40,14 @@
<Border Grid.Column="0" Background="{StaticResource CarbonPanelBg}"
BorderBrush="{StaticResource CarbonBorderLight}" BorderThickness="0,0,1,0">
<DockPanel Margin="8,10,8,10">
<TextBox x:Name="SettingsSearch" AutomationProperties.LandmarkType="Search" DockPanel.Dock="Top" Margin="0,0,0,10"
<TextBox x:Name="SettingsSearch" DockPanel.Dock="Top" Margin="0,0,0,10"
PlaceholderText="{Binding [Search], Source={x:Static starterNg:App.Loc}}"
TextChanged="SettingsSearch_OnTextChanged" />
<StackPanel DockPanel.Dock="Bottom" Spacing="6" Margin="0,14,0,0">
<TextBlock Classes="FieldLabel"
Text="{Binding [SettingsProfile], Source={x:Static starterNg:App.Loc}}" />
<ComboBox x:Name="ProfileCb" HorizontalAlignment="Stretch"
AutomationProperties.Name="{Binding [ProfilePick], Source={x:Static starterNg:App.Loc}}" />
<ComboBox x:Name="ProfileCb" HorizontalAlignment="Stretch" />
<Button x:Name="ProfileApplyBtn" Classes="Flat" HorizontalAlignment="Stretch"
HorizontalContentAlignment="Center"
Content="{Binding [ProfileApply], Source={x:Static starterNg:App.Loc}}"
@@ -69,7 +68,7 @@
Click="ExportIniButton_OnClick" />
</StackPanel>
<ListBox x:Name="CategoryList" AutomationProperties.LandmarkType="Navigation" AutomationProperties.Name="{Binding [SettingsCategories], Source={x:Static starterNg:App.Loc}}" Classes="SettingsNav" SelectedIndex="0"
<ListBox x:Name="CategoryList" Classes="SettingsNav" SelectedIndex="0"
ItemContainerTheme="{StaticResource SettingsNavItem}"
SelectionChanged="CategoryList_OnSelectionChanged">
<ListBoxItem Tag="general" Content="{Binding [General], Source={x:Static starterNg:App.Loc}}" />
@@ -94,7 +93,7 @@
<TextBlock VerticalAlignment="Center" FontWeight="Bold"
Text="{Binding [GfxColPresets], Source={x:Static starterNg:App.Loc}}" />
<StackPanel x:Name="PresetButtons" Grid.Column="1" Orientation="Horizontal" Spacing="6" />
<TextBlock x:Name="PresetStateText" ctl:Announcer.Changes="True" Grid.Column="2" VerticalAlignment="Center" FontSize="12"
<TextBlock x:Name="PresetStateText" Grid.Column="2" VerticalAlignment="Center" FontSize="12"
Foreground="{StaticResource CarbonFgDim}" />
</Grid>
<Grid ColumnDefinitions="Auto,*" ColumnSpacing="10">
@@ -142,7 +141,7 @@
</ctl:SettingRow>
<ctl:SettingRow ConfigKey="mousescale" x:Name="CursorSensitivityRow"
Label="{Binding [CursorSensitivity], Source={x:Static starterNg:App.Loc}}">
<ctl:ReadableSlider x:Name="CursorSensitivitySlider" Minimum="1" Maximum="5" TickFrequency="1"
<Slider x:Name="CursorSensitivitySlider" Minimum="1" Maximum="5" TickFrequency="1"
IsSnapToTickEnabled="True" Value="3"
ValueChanged="QualitySlider_OnValueChanged" />
</ctl:SettingRow>
@@ -259,13 +258,13 @@
Label="{Binding [BufforResolution], Source={x:Static starterNg:App.Loc}}"
Description="{Binding [BufforResolutionDesc], Source={x:Static starterNg:App.Loc}}"
ValueText="{Binding #bufferScale.Value, StringFormat='{}{0:0}%'}">
<ctl:ReadableSlider Name="bufferScale" Minimum="25" Maximum="200" TickFrequency="1"
<Slider Name="bufferScale" Minimum="25" Maximum="200" TickFrequency="1"
IsSnapToTickEnabled="True" Value="100" />
</ctl:SettingRow>
<ctl:SettingRow ConfigKey="fieldofview" Label="{Binding [FieldOfView], Source={x:Static starterNg:App.Loc}}"
Description="{Binding [FieldOfViewDesc], Source={x:Static starterNg:App.Loc}}"
ValueText="{Binding #fovSlider.Value, StringFormat='{}{0:0}°'}">
<ctl:ReadableSlider Name="fovSlider" Minimum="10" Maximum="75" TickFrequency="5"
<Slider Name="fovSlider" Minimum="10" Maximum="75" TickFrequency="5"
IsSnapToTickEnabled="True" Value="45" />
</ctl:SettingRow>
<ctl:SettingRow ConfigKey="gfx.antialiasing, multisampling"
@@ -297,7 +296,7 @@
Description="{Binding [FpsLimitDesc], Source={x:Static starterNg:App.Loc}}">
<StackPanel Spacing="4">
<!-- Moves through no limit and Steps.FrameRateLimits; see SliderSteps. -->
<ctl:ReadableSlider x:Name="FpsLimitSlider" ValueChanged="QualitySlider_OnValueChanged" />
<Slider x:Name="FpsLimitSlider" ValueChanged="QualitySlider_OnValueChanged" />
<!-- The screens found, each with a button to match the limit to it. -->
<WrapPanel x:Name="MonitorRates" IsVisible="False" />
</StackPanel>
@@ -313,14 +312,14 @@
Label="{Binding [RenderRange], Source={x:Static starterNg:App.Loc}}"
Description="{Binding [RenderRangeDesc], Source={x:Static starterNg:App.Loc}}">
<!-- Moves through Steps.DrawRangeFactors; see SliderSteps. -->
<ctl:ReadableSlider x:Name="RenderRangeSlider"
<Slider x:Name="RenderRangeSlider"
ValueChanged="QualitySlider_OnValueChanged" />
</ctl:SettingRow>
<ctl:KeySlot Key="sleeperdistance" />
<ctl:SettingRow ConfigKey="splinefidelity" x:Name="TrackCurvesRow"
Label="{Binding [TrackCurvesQuality], Source={x:Static starterNg:App.Loc}}"
Description="{Binding [TrackCurvesQualityDesc], Source={x:Static starterNg:App.Loc}}">
<ctl:ReadableSlider x:Name="TrackCurvesSlider" Minimum="1" Maximum="4" TickFrequency="1"
<Slider x:Name="TrackCurvesSlider" Minimum="1" Maximum="4" TickFrequency="1"
IsSnapToTickEnabled="True" Value="4"
ValueChanged="QualitySlider_OnValueChanged" />
</ctl:SettingRow>
@@ -331,13 +330,13 @@
<StackPanel>
<ctl:SettingRow ConfigKey="maxtexturesize" x:Name="TexResolutionRow"
Label="{Binding [MaxTexResolution], Source={x:Static starterNg:App.Loc}}">
<ctl:ReadableSlider Name="textureResolutionSlider" Minimum="6" Maximum="13" TickFrequency="1"
<Slider Name="textureResolutionSlider" Minimum="6" Maximum="13" TickFrequency="1"
IsSnapToTickEnabled="True" Value="12"
ValueChanged="TextureResolutionSlider_OnValueChanged" />
</ctl:SettingRow>
<ctl:SettingRow ConfigKey="maxcabtexturesize" x:Name="CabTexResolutionRow"
Label="{Binding [MaxTexCabResolution], Source={x:Static starterNg:App.Loc}}">
<ctl:ReadableSlider Name="cabTextureResolutionSlider" Minimum="9" Maximum="13" TickFrequency="1"
<Slider Name="cabTextureResolutionSlider" Minimum="9" Maximum="13" TickFrequency="1"
IsSnapToTickEnabled="True" Value="12"
ValueChanged="CabTextureResolutionSlider_OnValueChanged" />
</ctl:SettingRow>
@@ -345,7 +344,7 @@
Label="{Binding [TexFilteringQuality], Source={x:Static starterNg:App.Loc}}"
Description="{Binding [TexFilteringQualityDesc], Source={x:Static starterNg:App.Loc}}">
<!-- Moves through Steps.Anisotropy; see SliderSteps. -->
<ctl:ReadableSlider x:Name="TexFilteringSlider"
<Slider x:Name="TexFilteringSlider"
ValueChanged="QualitySlider_OnValueChanged" />
</ctl:SettingRow>
<ctl:KeySlot Key="gfx.textures.streaming" />
@@ -398,7 +397,7 @@
</ctl:SettingRow>
<ctl:SettingRow ConfigKey="shadowtune" x:Name="ShadowResolutionRow"
Label="{Binding [ShadowsResolution], Source={x:Static starterNg:App.Loc}}">
<ctl:ReadableSlider Name="shaderResolutionSlider" Minimum="9" Maximum="13" TickFrequency="1"
<Slider Name="shaderResolutionSlider" Minimum="9" Maximum="13" TickFrequency="1"
IsSnapToTickEnabled="True" Value="12"
ValueChanged="shaderResolutionSlider_OnValueChanged" />
</ctl:SettingRow>
@@ -406,14 +405,14 @@
Label="{Binding [ShaderRange], Source={x:Static starterNg:App.Loc}}"
Description="{Binding [ShaderRangeDesc], Source={x:Static starterNg:App.Loc}}">
<!-- The simulator's floor follows the map size: see shaderResolutionSlider_OnValueChanged. -->
<ctl:ReadableSlider Name="shaderRange" Minimum="75" Maximum="600" TickFrequency="5"
<Slider Name="shaderRange" Minimum="75" Maximum="600" TickFrequency="5"
IsSnapToTickEnabled="True" Value="150"
ValueChanged="QualitySlider_OnValueChanged" />
</ctl:SettingRow>
<ctl:SettingRow ConfigKey="gfx.shadows.cab.range" x:Name="CabShadowRangeRow"
Label="{Binding [CabShadowsRange], Source={x:Static starterNg:App.Loc}}"
Description="{Binding [CabShadowsRangeDesc], Source={x:Static starterNg:App.Loc}}">
<ctl:ReadableSlider Name="cabShaderSourceRange" Minimum="0" Maximum="100" TickFrequency="10"
<Slider Name="cabShaderSourceRange" Minimum="0" Maximum="100" TickFrequency="10"
IsSnapToTickEnabled="True" Value="30"
ValueChanged="QualitySlider_OnValueChanged" />
</ctl:SettingRow>
@@ -421,7 +420,7 @@
Label="{Binding [ShadowAngleLimit], Source={x:Static starterNg:App.Loc}}"
Description="{Binding [ShadowAngleLimitDesc], Source={x:Static starterNg:App.Loc}}">
<StackPanel>
<ctl:ReadableSlider x:Name="ShadowAngleLimitSlider" Minimum="0.2" Maximum="1.0"
<Slider x:Name="ShadowAngleLimitSlider" Minimum="0.2" Maximum="1.0"
TickFrequency="0.05" IsSnapToTickEnabled="True" Value="0.2" HorizontalAlignment="Stretch"
ValueChanged="QualitySlider_OnValueChanged" />
<DockPanel>
@@ -439,7 +438,7 @@
<StackPanel>
<ctl:SettingRow x:Name="DynamicLightsRow" Description="{Binding [DynamicLightsDesc], Source={x:Static starterNg:App.Loc}}" ConfigKey="dynamiclights" Label="{Binding [DynamicLights], Source={x:Static starterNg:App.Loc}}"
ValueText="{Binding #DynamicLightsSlider.Value, StringFormat='{}{0:0}'}">
<ctl:ReadableSlider x:Name="DynamicLightsSlider" Minimum="0" Maximum="7" TickFrequency="1"
<Slider x:Name="DynamicLightsSlider" Minimum="0" Maximum="7" TickFrequency="1"
IsSnapToTickEnabled="True" Value="7" />
</ctl:SettingRow>
</StackPanel>
@@ -463,7 +462,7 @@
Label="{Binding [ReflectionsFramerate], Source={x:Static starterNg:App.Loc}}"
Description="{Binding [ReflectionsFramerateDesc], Source={x:Static starterNg:App.Loc}}">
<!-- Moves through Steps.ReflectionUpdates; see SliderSteps. -->
<ctl:ReadableSlider Name="reflectionsFramerate"
<Slider Name="reflectionsFramerate"
ValueChanged="QualitySlider_OnValueChanged" />
</ctl:SettingRow>
<ctl:KeySlot Key="gfx.reflections.range_instances" />
@@ -492,7 +491,7 @@
<ctl:SettingRow ConfigKey="gfx.smoke.fidelity" x:Name="SmokeParticlesRow"
Label="{Binding [SmokeParticlesMultiplier], Source={x:Static starterNg:App.Loc}}"
IsEnabled="{Binding #SmokeDisplayCb.IsChecked}">
<ctl:ReadableSlider x:Name="SmokeParticlesSlider" Minimum="1" Maximum="4" TickFrequency="1"
<Slider x:Name="SmokeParticlesSlider" Minimum="1" Maximum="4" TickFrequency="1"
IsSnapToTickEnabled="True" Value="2"
ValueChanged="QualitySlider_OnValueChanged" />
</ctl:SettingRow>
@@ -512,27 +511,27 @@
<StackPanel IsEnabled="{Binding #EnableSoundsCb.IsChecked}">
<ctl:SettingRow ConfigKey="sound.volume" Label="{Binding [Volume], Source={x:Static starterNg:App.Loc}}"
ValueText="{Binding #VolumeSlider.Value, StringFormat='{}{0:0}%'}">
<ctl:ReadableSlider x:Name="VolumeSlider" Minimum="0" Maximum="100" TickFrequency="5"
<Slider x:Name="VolumeSlider" Minimum="0" Maximum="100" TickFrequency="5"
IsSnapToTickEnabled="True" Value="100" />
</ctl:SettingRow>
<ctl:SettingRow ConfigKey="sound.volume.radio" Label="{Binding [RadiophoneVolume], Source={x:Static starterNg:App.Loc}}"
ValueText="{Binding #RadioVolumeSlider.Value, StringFormat='{}{0:0}%'}">
<ctl:ReadableSlider x:Name="RadioVolumeSlider" Minimum="0" Maximum="100" TickFrequency="5"
<Slider x:Name="RadioVolumeSlider" Minimum="0" Maximum="100" TickFrequency="5"
IsSnapToTickEnabled="True" Value="100" />
</ctl:SettingRow>
<ctl:SettingRow ConfigKey="sound.volume.vehicle" Label="{Binding [VehiclesVolume], Source={x:Static starterNg:App.Loc}}"
ValueText="{Binding #VehiclesVolumeSlider.Value, StringFormat='{}{0:0}%'}">
<ctl:ReadableSlider x:Name="VehiclesVolumeSlider" Minimum="0" Maximum="100" TickFrequency="5"
<Slider x:Name="VehiclesVolumeSlider" Minimum="0" Maximum="100" TickFrequency="5"
IsSnapToTickEnabled="True" Value="100" />
</ctl:SettingRow>
<ctl:SettingRow ConfigKey="sound.volume.positional" Label="{Binding [PositionedSoundsVolume], Source={x:Static starterNg:App.Loc}}"
ValueText="{Binding #PositionalVolumeSlider.Value, StringFormat='{}{0:0}%'}">
<ctl:ReadableSlider x:Name="PositionalVolumeSlider" Minimum="0" Maximum="100" TickFrequency="5"
<Slider x:Name="PositionalVolumeSlider" Minimum="0" Maximum="100" TickFrequency="5"
IsSnapToTickEnabled="True" Value="100" />
</ctl:SettingRow>
<ctl:SettingRow ConfigKey="sound.volume.ambient" Label="{Binding [AmbientVolume], Source={x:Static starterNg:App.Loc}}"
ValueText="{Binding #AmbientVolumeSlider.Value, StringFormat='{}{0:0}%'}">
<ctl:ReadableSlider x:Name="AmbientVolumeSlider" Minimum="0" Maximum="100" TickFrequency="5"
<Slider x:Name="AmbientVolumeSlider" Minimum="0" Maximum="100" TickFrequency="5"
IsSnapToTickEnabled="True" Value="100" />
</ctl:SettingRow>
</StackPanel>
@@ -575,17 +574,17 @@
<ctl:SettingRow ConfigKey="friction" x:Name="FrictionRow" Label="{Binding [Friction], Source={x:Static starterNg:App.Loc}}"
Description="{Binding [FrictionDesc], Source={x:Static starterNg:App.Loc}}">
<ctl:ReadableSlider x:Name="FrictionSlider" Minimum="0.1" Maximum="3.0" TickFrequency="0.1" Value="1.0"
<Slider x:Name="FrictionSlider" Minimum="0.1" Maximum="3.0" TickFrequency="0.1" Value="1.0"
ValueChanged="QualitySlider_OnValueChanged" />
</ctl:SettingRow>
<ctl:SettingRow ConfigKey="brakestep" x:Name="BrakeStepRow" Label="{Binding [BrakeStep], Source={x:Static starterNg:App.Loc}}"
Description="{Binding [BrakeStepDesc], Source={x:Static starterNg:App.Loc}}">
<ctl:ReadableSlider x:Name="BrakeStepSlider" Minimum="0.4" Maximum="3.0" TickFrequency="0.1" Value="1.0"
<Slider x:Name="BrakeStepSlider" Minimum="0.4" Maximum="3.0" TickFrequency="0.1" Value="1.0"
ValueChanged="QualitySlider_OnValueChanged" />
</ctl:SettingRow>
<ctl:SettingRow ConfigKey="brakespeed" x:Name="BrakeSpeedRow" Label="{Binding [BrakeSpeed], Source={x:Static starterNg:App.Loc}}"
Description="{Binding [BrakeSpeedDesc], Source={x:Static starterNg:App.Loc}}">
<ctl:ReadableSlider x:Name="BrakeSpeedSlider" Minimum="0.4" Maximum="3.0" TickFrequency="0.1" Value="1.0"
<Slider x:Name="BrakeSpeedSlider" Minimum="0.4" Maximum="3.0" TickFrequency="0.1" Value="1.0"
ValueChanged="QualitySlider_OnValueChanged" />
</ctl:SettingRow>
</StackPanel>
@@ -700,7 +699,7 @@
<ctl:SettingRow ConfigKey="async.trainThreads" x:Name="TrainThreadsRow"
Label="{Binding [TrainPhysicsThreads], Source={x:Static starterNg:App.Loc}}"
Description="{Binding [TrainPhysicsThreadsDesc], Source={x:Static starterNg:App.Loc}}">
<ctl:ReadableSlider x:Name="TrainThreadsSlider" Minimum="0" Maximum="16" TickFrequency="1"
<Slider x:Name="TrainThreadsSlider" Minimum="0" Maximum="16" TickFrequency="1"
IsSnapToTickEnabled="True" ValueChanged="QualitySlider_OnValueChanged" />
</ctl:SettingRow>
<ctl:SettingRow ConfigKey="starter.ignoreirrelevant" Description="{Binding [IgnoreIrrelevantTrainsDesc], Source={x:Static starterNg:App.Loc}}">
@@ -775,7 +774,7 @@
<ctl:SettingRow x:Name="RayTracingRangeRow" ConfigKey="gfx.raytracing.range"
Label="{Binding [RayTracingRange], Source={x:Static starterNg:App.Loc}}"
ValueText="{Binding #RayTracingRangeSlider.Value, StringFormat='{}{0:0} m'}">
<ctl:ReadableSlider x:Name="RayTracingRangeSlider" Minimum="50" Maximum="2000" TickFrequency="50" IsSnapToTickEnabled="True" Value="500" />
<Slider x:Name="RayTracingRangeSlider" Minimum="50" Maximum="2000" TickFrequency="50" IsSnapToTickEnabled="True" Value="500" />
</ctl:SettingRow>
<ctl:SettingRow ConfigKey="gfx.ssr" Label="{Binding [Ssr], Source={x:Static starterNg:App.Loc}}"
Description="{Binding [SsrDesc], Source={x:Static starterNg:App.Loc}}">
@@ -852,7 +851,7 @@
Label="{Binding [CabProbeBounce], Source={x:Static starterNg:App.Loc}}"
Description="{Binding [CabProbeBounceDesc], Source={x:Static starterNg:App.Loc}}"
ValueText="{Binding #CabProbeBounceSlider.Value, StringFormat='{}{0:0.0}'}">
<ctl:ReadableSlider x:Name="CabProbeBounceSlider" Minimum="0" Maximum="4" TickFrequency="0.1" IsSnapToTickEnabled="True" Value="1" />
<Slider x:Name="CabProbeBounceSlider" Minimum="0" Maximum="4" TickFrequency="0.1" IsSnapToTickEnabled="True" Value="1" />
</ctl:SettingRow>
<ctl:SettingRow x:Name="CabProbeReflectionsRow" ConfigKey="gfx.cabprobe.reflections" Description="{Binding [CabProbeReflectionsDesc], Source={x:Static starterNg:App.Loc}}">
<CheckBox x:Name="CabProbeReflectionsCb" Content="{Binding [CabProbeReflections], Source={x:Static starterNg:App.Loc}}" />
@@ -893,12 +892,12 @@
<ctl:SettingRow x:Name="GrassDistanceRow" ConfigKey="gfx.grass.distance, gfx.grass.fadedistance"
Label="{Binding [GrassDistance], Source={x:Static starterNg:App.Loc}}"
ValueText="{Binding #GrassDistanceSlider.Value, StringFormat='{}{0:0} m'}">
<ctl:ReadableSlider x:Name="GrassDistanceSlider" Minimum="20" Maximum="300" TickFrequency="10" IsSnapToTickEnabled="True" Value="60" />
<Slider x:Name="GrassDistanceSlider" Minimum="20" Maximum="300" TickFrequency="10" IsSnapToTickEnabled="True" Value="60" />
</ctl:SettingRow>
<ctl:SettingRow x:Name="GrassDensityRow" ConfigKey="gfx.grass.density"
Label="{Binding [GrassDensity], Source={x:Static starterNg:App.Loc}}"
ValueText="{Binding #GrassDensitySlider.Value, StringFormat='{}{0:0.00}'}">
<ctl:ReadableSlider x:Name="GrassDensitySlider" Minimum="0.25" Maximum="2.0" TickFrequency="0.25" IsSnapToTickEnabled="True" Value="1.0" />
<Slider x:Name="GrassDensitySlider" Minimum="0.25" Maximum="2.0" TickFrequency="0.25" IsSnapToTickEnabled="True" Value="1.0" />
</ctl:SettingRow>
<ctl:SettingRow ConfigKey="gfx.precipitation.particles" Label="{Binding [Precipitation], Source={x:Static starterNg:App.Loc}}"
Description="{Binding [PrecipitationDesc], Source={x:Static starterNg:App.Loc}}">

View File

@@ -105,13 +105,6 @@ public partial class Settings : UserControl, ISettingsCapture
FeedbackCb.SelectionChanged += FeedbackCb_OnSelectionChanged;
SelectExeCb.SelectionChanged += (_, _) => UpdateIdleNotes();
// Coming to the page or to the list is when a new build is looked for.
SelectExeCb.GotFocus += (_, _) => RefreshExecutables();
PropertyChanged += (_, e) =>
{
if (e.Property == IsVisibleProperty && IsVisible)
RefreshExecutables();
};
FullscreenWindowedCb.IsCheckedChanged += (_, _) => UpdateIdleNotes();
App.Loc.LanguageChanged += UpdateIdleNotes;
App.Loc.LanguageChanged += UpdateGpuNote;
@@ -253,33 +246,16 @@ public partial class Settings : UserControl, ISettingsCapture
private void PopulateExeCombo()
{
int index = SelectExeCb.SelectedIndex;
string? chosen = index > 0 ? (SelectExeCb.SelectedItem as ComboBoxItem)?.Content?.ToString() : null;
var (entries, at) = ExecutableList.Refreshed(AppServices.Current.Executables.ListCandidates(), chosen);
// The same files as shown: left alone, so a reader on the list hears nothing change.
var shown = SelectExeCb.Items.Skip(1).Select(item => (item as ComboBoxItem)?.Content?.ToString() ?? "");
if (SelectExeCb.Items.Count > 0 && shown.SequenceEqual(entries, StringComparer.Ordinal))
return;
string? current = (SelectExeCb.SelectedItem as ComboBoxItem)?.Content?.ToString();
SelectExeCb.Items.Clear();
SelectExeCb.Items.Add(new ComboBoxItem { Content = App.Loc["SelectEXEAuto"] });
foreach (string exe in entries)
foreach (string exe in AppServices.Current.Executables.ListCandidates())
SelectExeCb.Items.Add(new ComboBoxItem { Content = exe });
if (index >= 0)
SelectExeCb.SelectedIndex = at >= 0 ? at + 1 : 0;
}
/// <summary>
/// Looks at the simulator folder again, so a build copied in while the starter runs is
/// on the list without reopening anything. The choice stays as it was and is no edit:
/// nothing waits for Save after it. Not while the list is open under the user's hand.
/// </summary>
public void RefreshExecutables()
{
if (SelectExeCb.IsDropDownOpen)
return;
WhileLoading(PopulateExeCombo);
if (current is not null)
{
int idx = FindComboIndexByContent(SelectExeCb, current);
SelectExeCb.SelectedIndex = idx >= 0 ? idx : 0;
}
}
private async void BrowseExeButton_OnClick(object? sender, RoutedEventArgs e) =>
@@ -604,7 +580,6 @@ public partial class Settings : UserControl, ISettingsCapture
// Chosen as a whole, its values are choices, not ones the screen could not show.
ForgetShown(applied.ChosenKeys);
UpdatePresetMarks();
Announcer.Say(this, ScreenReaderNames.PickerText(App.Loc["GfxColPresets"], App.Loc[preset.NameKey]));
}
/// <summary>Puts one part at a level, as edits waiting for Save.</summary>
@@ -772,7 +747,6 @@ public partial class Settings : UserControl, ISettingsCapture
// Put back by hand, a value is a choice like any other.
ForgetShown(keys);
Announcer.Say(this, ScreenReaderNames.PickerText(ScreenReaderNames.TextOf(section.Header), App.Loc["DefaultsRestored"]));
}
// ── Values the screen shows otherwise than the file has them ─────────────
@@ -1173,7 +1147,6 @@ public partial class Settings : UserControl, ISettingsCapture
_keyBindings.Reload();
_dirty = false;
UpdateSaveState();
Announcer.Say(this, App.Loc["SettingsRestored"]);
}
/// <summary>The list as <see cref="ResolutionChoices"/> has it for the monitors there are now, with the size selected.</summary>
@@ -1350,15 +1323,8 @@ public partial class Settings : UserControl, ISettingsCapture
return;
ApplyFilter();
_searchResults ??= new SearchResultsTeller(SettingsSearch, () => _shownCount);
_searchResults.Changed();
}
private SearchResultsTeller? _searchResults;
// How many settings - or key bindings - the last filter left on the screen.
private int _shownCount;
/// <summary>
/// Single owner of what is on screen. With an empty query it shows the selected
/// category; with a query it stacks every category and keeps only the rows that
@@ -1381,13 +1347,11 @@ public partial class Settings : UserControl, ISettingsCapture
if (bindings)
{
_keyBindings.RebuildList();
_shownCount = _keyBindings.ShownCount;
foreach (var entry in CategoryList.Items.OfType<ListBoxItem>())
entry.Classes.Set("NoHits", false);
return;
}
_shownCount = 0;
foreach (var panel in SettingsStack.Children.OfType<StackPanel>())
{
bool anyRow = false;
@@ -1402,8 +1366,6 @@ public partial class Settings : UserControl, ISettingsCapture
(!searching || TextMatch.Contains(RowSearchText(row), query));
row.IsVisible = visible;
anyInSection |= visible;
if (visible && searching)
_shownCount++;
}
section.IsVisible = anyInSection;

View File

@@ -70,7 +70,7 @@ internal sealed class SimulatorKeyRows
Control input = key.Kind switch
{
SimulatorKeyKind.Toggle => new CheckBox(),
SimulatorKeyKind.Number => new ReadableSlider
SimulatorKeyKind.Number => new Slider
{
Minimum = key.Minimum,
Maximum = key.Maximum,

View File

@@ -14,7 +14,6 @@ using Avalonia.Platform.Storage;
using Avalonia.Threading;
using Eu07.BlackBox.Views;
using StarterNG.Application;
using StarterNG.Controls;
using StarterNG.Domain.Settings;
using StarterNG.Domain.Tapes;
@@ -86,8 +85,6 @@ public sealed class HaslerTapeWindow : Window
MinWidth = 700;
MinHeight = 420;
WindowStartupLocation = WindowStartupLocation.CenterOwner;
// A window to keep open beside the starter, not a question to answer.
DialogKeyboard.SetEscapeCloses(this, false);
_feed.ItemsSource = new[] { App.Loc["HaslerByDistance"], App.Loc["HaslerByTime"] };
_feed.SelectedIndex = 0;
@@ -288,16 +285,9 @@ public sealed class HaslerTapeWindow : Window
private RecorderKind Recorder => _recorder.SelectedIndex == 1 ? RecorderKind.Electronic : RecorderKind.Hasler;
private static TapeView NewView(RecorderKind kind)
{
TapeView view = kind == RecorderKind.Electronic
? new ElectronicTapeView { HorizontalAlignment = HorizontalAlignment.Left, VerticalAlignment = VerticalAlignment.Top }
: new HaslerTapeView { HorizontalAlignment = HorizontalAlignment.Left, VerticalAlignment = VerticalAlignment.Top };
// A picture to the eye; to a screen reader a slider along the trip, read sample by sample.
Avalonia.Automation.AutomationProperties.SetName(view, App.Loc["HaslerTapes"]);
Avalonia.Automation.AutomationProperties.SetHelpText(view, App.Loc["TapeKeysHelp"]);
return view;
}
private static TapeView NewView(RecorderKind kind) => kind == RecorderKind.Electronic
? new ElectronicTapeView { HorizontalAlignment = HorizontalAlignment.Left, VerticalAlignment = VerticalAlignment.Top }
: new HaslerTapeView { HorizontalAlignment = HorizontalAlignment.Left, VerticalAlignment = VerticalAlignment.Top };
/// <summary>
/// The same trip drawn the other way. Hasler paper is fed by distance and
@@ -399,7 +389,7 @@ public sealed class HaslerTapeWindow : Window
_list.SelectedItem = chosen.Tape;
}
private ExpandableTreeViewItem SessionItem(TapeSession session, bool open)
private TreeViewItem SessionItem(TapeSession session, bool open)
{
string title = session.Launch is { } launch
? string.Join(" · ", new[] { string.IsNullOrWhiteSpace(launch.SceneryName) ? launch.Scenery : launch.SceneryName, launch.Train }
@@ -428,7 +418,7 @@ public sealed class HaslerTapeWindow : Window
var name = new TextBlock { Text = title, FontWeight = FontWeight.SemiBold, TextTrimming = TextTrimming.CharacterEllipsis };
ToolTip.SetTip(name, title);
var item = new ExpandableTreeViewItem
var item = new TreeViewItem
{
Header = new StackPanel { Spacing = 1, Children = { name, details } },
Tag = session,
@@ -441,7 +431,7 @@ public sealed class HaslerTapeWindow : Window
return item;
}
private ExpandableTreeViewItem BlackBoxItem(BlackBoxRecording box)
private TreeViewItem BlackBoxItem(BlackBoxRecording box)
{
var text = new StackPanel { Spacing = 1 };
text.Children.Add(new TextBlock { Text = App.Loc["HaslerBlackBox"], FontWeight = FontWeight.SemiBold });
@@ -452,7 +442,7 @@ public sealed class HaslerTapeWindow : Window
Opacity = 0.7
});
ToolTip.SetTip(text, App.Loc["HaslerBlackBoxTip"]);
var item = new ExpandableTreeViewItem { Header = text, Tag = box };
var item = new TreeViewItem { Header = text, Tag = box };
// Also when it is the one picked already, and its window was closed since.
item.Tapped += async (_, _) => await OpenBlackBoxAsync(box);
return item;
@@ -476,8 +466,6 @@ public sealed class HaslerTapeWindow : Window
CanOpenFiles = false,
Live = _liveBlackBoxes.Contains(box.Path)
};
// It stays open beside the tapes, as they stay beside the starter.
DialogKeyboard.SetEscapeCloses(window, false);
_blackBoxes[box.Path] = window;
if (at is { } first)
_wantedAt[box.Path] = first;
@@ -585,7 +573,7 @@ public sealed class HaslerTapeWindow : Window
}
}
private static ExpandableTreeViewItem TapeItem(TapeFile file)
private static TreeViewItem TapeItem(TapeFile file)
{
var text = new StackPanel { Spacing = 1 };
text.Children.Add(new TextBlock
@@ -604,7 +592,7 @@ public sealed class HaslerTapeWindow : Window
};
if (role is not null)
text.Children.Add(new TextBlock { Text = role, FontSize = 11, Opacity = 0.7 });
return new ExpandableTreeViewItem { Header = text, Tag = file };
return new TreeViewItem { Header = text, Tag = file };
}
/// <summary>
@@ -781,18 +769,6 @@ public sealed class HaslerTapeWindow : Window
_cursor.Text = "";
return;
}
try
{
ShowCursorText(s);
}
finally
{
_view.Spoken = _cursor.Text;
}
}
private void ShowCursorText(TapeSample s)
{
// Only what the record in view shows: a Hasler tape has no brake pipe and
// marks current as on or off, and the electronic screen draws the current
// and the vigilance alarm as channels, not values.

View File

@@ -1,8 +1,5 @@
using System;
using Avalonia;
using Avalonia.Automation;
using Avalonia.Automation.Peers;
using Avalonia.Automation.Provider;
using Avalonia.Controls;
using Avalonia.Input;
using Avalonia.Media;
@@ -51,118 +48,6 @@ public abstract class TapeView : Control
AffectsRender<TapeView>(TapeProperty, ByDistanceProperty, ScaleProperty, StartClockProperty, MarkProperty);
}
private static readonly IPen FocusPen = new Pen(new SolidColorBrush(Color.Parse("#41C400")), 2);
protected TapeView()
{
// Read from the keyboard as well as with the pointer: the arrows move the read-out along the trip.
Focusable = true;
}
// The sample the keyboard stands at, -1 before it has moved.
private int _keyIndex = -1;
private string? _spoken;
/// <summary>
/// The read-out of the sample under the cursor as words - time, kilometre, speed -
/// the value a screen reader reads, again whenever it changes.
/// </summary>
public string? Spoken
{
get => _spoken;
set
{
string? before = _spoken;
_spoken = value;
if (before != value && ControlAutomationPeer.FromElement(this) is Peer peer)
peer.Told(before, value);
}
}
/// <summary>How far an arrow moves the read-out: metres by distance, seconds by time; Ctrl ten times as far.</summary>
public const double DistanceStep = 100, TimeStep = 10, CtrlTimes = 10;
protected override void OnKeyDown(KeyEventArgs e)
{
base.OnKeyDown(e);
var tape = Tape;
if (tape is null || tape.IsEmpty)
return;
int at = _keyIndex >= 0 && _keyIndex < tape.Samples.Count ? _keyIndex : -1;
var here = at >= 0 ? tape.Samples[at] : tape.Samples[0];
if (e.Key == Key.Enter && at >= 0)
{
Picked?.Invoke(here);
e.Handled = true;
return;
}
double step = (ByDistance ? DistanceStep : TimeStep) * (e.KeyModifiers.HasFlag(KeyModifiers.Control) ? CtrlTimes : 1);
double position = ByDistance ? here.DistanceM : here.Time;
int? to = e.Key switch
{
Key.Right when at < 0 => 0,
Key.Left when at < 0 => 0,
Key.Right => Math.Max(at + 1, tape.IndexAt(position + step, ByDistance)),
Key.Left => Math.Min(at - 1, tape.IndexAt(position - step, ByDistance)),
Key.Home => 0,
Key.End => tape.Samples.Count - 1,
_ => null
};
if (to is not { } index)
return;
_keyIndex = Math.Clamp(index, 0, tape.Samples.Count - 1);
var sample = tape.Samples[_keyIndex];
double x = XOf(sample);
CursorX = x;
InvalidateVisual();
this.BringIntoView(new Rect(Math.Max(0, x - 80), 0, 160, TapeHeight));
Hovered?.Invoke(sample);
e.Handled = true;
}
protected override void OnGotFocus(FocusChangedEventArgs e)
{
base.OnGotFocus(e);
InvalidateVisual();
}
protected override void OnLostFocus(FocusChangedEventArgs e)
{
base.OnLostFocus(e);
InvalidateVisual();
}
protected override void OnPropertyChanged(AvaloniaPropertyChangedEventArgs change)
{
base.OnPropertyChanged(change);
if (change.Property == TapeProperty)
_keyIndex = -1;
}
protected override AutomationPeer OnCreateAutomationPeer() => new Peer(this);
/// <summary>The trip as a screen reader is told it: a slider whose value is the read-out at the cursor.</summary>
private sealed class Peer(TapeView owner) : ControlAutomationPeer(owner), IValueProvider
{
public void Told(string? before, string? now) =>
RaisePropertyChangedEvent(ValuePatternIdentifiers.ValueProperty, before, now);
protected override AutomationControlType GetAutomationControlTypeCore() => AutomationControlType.Slider;
protected override bool IsContentElementCore() => true;
protected override bool IsControlElementCore() => true;
string? IValueProvider.Value => owner.Spoken;
bool IValueProvider.IsReadOnly => true;
void IValueProvider.SetValue(string? value) => throw new InvalidOperationException("The value is read only.");
}
public HaslerTape? Tape
{
get => GetValue(TapeProperty);
@@ -263,8 +148,6 @@ public abstract class TapeView : Control
DrawTape(context, tape);
DrawMark(context);
DrawCursor(context);
if (IsFocused)
context.DrawRectangle(null, FocusPen, new Rect(Bounds.Size).Deflate(1));
}
/// <summary>What is there with no trip on it.</summary>

View File

@@ -77,7 +77,7 @@
<Grid RowDefinitions="Auto,*,4,Auto,*,Auto,Auto">
<TextBlock Grid.Row="0" Classes="Heading" Text="{Binding [Category], Source={x:Static starterNg:App.Loc}}" />
<ListBox Name="categoryList" Grid.Row="1" Classes="Compact" />
<GridSplitter IsTabStop="False" AutomationProperties.Name="{Binding [PanelSplitter], Source={x:Static starterNg:App.Loc}}" Grid.Row="2" Height="4" HorizontalAlignment="Stretch"
<GridSplitter Grid.Row="2" Height="4" HorizontalAlignment="Stretch"
Background="Transparent" ResizeDirection="Rows" />
<TextBlock Grid.Row="3" Classes="Heading" Text="{Binding [Class], Source={x:Static starterNg:App.Loc}}" />
<ListBox Name="classList" Grid.Row="4" Classes="Compact">
@@ -97,7 +97,7 @@
</Grid>
</Border>
<GridSplitter IsTabStop="False" AutomationProperties.Name="{Binding [PanelSplitter], Source={x:Static starterNg:App.Loc}}" Grid.Column="1" Width="3" Background="Transparent" ResizeDirection="Columns" />
<GridSplitter Grid.Column="1" Width="3" Background="Transparent" ResizeDirection="Columns" />
<Border Grid.Column="2" Classes="Panel">
<Grid RowDefinitions="Auto,*">

View File

@@ -1,7 +1,6 @@
using System;
using System.Collections.Generic;
using System.Linq;
using Avalonia.Automation;
using Avalonia.Controls;
using Avalonia.Input;
using Avalonia.Interactivity;
@@ -181,7 +180,6 @@ public partial class VehicleBaseWindow : Window
if (row is null)
{
preview.Source = null;
preview.ClearValue(AutomationProperties.NameProperty);
detailTitle.Text = "";
detailText.Text = App.Loc["TextureBasePick"];
ToolTip.SetTip(detailText, null);
@@ -190,7 +188,6 @@ public partial class VehicleBaseWindow : Window
preview.Source = _minis.Get(_db.ResolveMiniName(row.Texture), PreviewHeight);
detailTitle.Text = string.Join(" · ", new[] { row.Skin, row.Class, row.Operator }.Where(s => s.Length > 0));
AutomationProperties.SetName(preview, detailTitle.Text);
var lines = new[]
{

View File

@@ -563,47 +563,6 @@
<String key="Save">Uložit</String>
<String key="Reset">Obnovit</String>
<String key="SettingsSaved">Nastavení uloženo</String>
<String key="DefaultsRestored">Výchozí hodnoty obnoveny</String>
<String key="SettingsRestored">Uložené nastavení obnoveno</String>
<String key="TreeExpanded">rozbaleno</String>
<String key="TreeCollapsed">sbaleno</String>
<String key="DepotConsistSources">Zdroje soupravy</String>
<String key="DepotVehicleInfo">Informace o vozidle</String>
<String key="DepotVehicleEdit">Nastavení vozidla</String>
<String key="ScenarioDetails">Podrobnosti scénáře</String>
<String key="SectionLevel">Úroveň sekce</String>
<String key="SearchFound">Nalezeno: {0}</String>
<String key="SpinUp">Zvýšit</String>
<String key="SpinDown">Snížit</String>
<String key="ChromeMinimize">Minimalizovat</String>
<String key="ChromeMaximize">Maximalizovat</String>
<String key="ChromeRestore">Obnovit</String>
<String key="ChromeClose">Zavřít</String>
<String key="ScrollLineUp">Řádek nahoru</String>
<String key="ScrollLineDown">Řádek dolů</String>
<String key="ScrollPageUp">Stránka nahoru</String>
<String key="ScrollPageDown">Stránka dolů</String>
<String key="ScrollColumnLeft">Sloupec vlevo</String>
<String key="ScrollColumnRight">Sloupec vpravo</String>
<String key="ScrollPageLeft">Stránka vlevo</String>
<String key="ScrollPageRight">Stránka vpravo</String>
<String key="ScrollPosition">Poloha</String>
<String key="TapeKeysHelp">Šipky vlevo a vpravo posouvají po pásce, s Ctrl desetkrát dál, Home a End jdou na její konce, Enter přenese černou skříňku do tohoto okamžiku.</String>
<String key="ConsistSaidEmpty">Souprava prázdná</String>
<String key="ConsistSaidAdded">Přidáno {0} na pozici {1} z {2}</String>
<String key="ConsistSaidRemoved">Odebráno {0}, zbývá vozidel: {1}</String>
<String key="ConsistSaidTurned">{0} otočeno</String>
<String key="ConsistSaidUnturned">{0} otočeno zpět</String>
<String key="ConsistSaidTurnedMany">Otočeno vozidel: {0}</String>
<String key="ConsistSaidMoved">{0} přesunuto na pozici {1} z {2}</String>
<String key="ConsistSaidReordered">Pořadí změněno</String>
<String key="ConsistSaidReplaced">{0} nahrazeno za {1}</String>
<String key="ConsistSaidChangedMany">Změněno vozidel: {0}, v soupravě: {1}</String>
<String key="ConsistSaidUndone">Vráceno zpět. {0}</String>
<String key="ConsistSaidRedone">Znovu provedeno. {0}</String>
<String key="SceneryImage">Obrázek scenérie</String>
<String key="PanelSplitter">Oddělovač panelů</String>
<String key="SettingsCategories">Kategorie nastavení</String>
<String key="SettingsNotSaved">Nastavení se nepodařilo uložit</String>
<String key="UnsavedChanges">Neuložené změny</String>
@@ -633,10 +592,8 @@
<String key="About">O programu</String>
<String key="Close">Zavřít</String>
<String key="CpuNoAvx2Title">Procesor bez AVX2</String>
<String key="CpuNoAvx2">Tento procesor nemá AVX2 a oficiální simulátor ho vyžaduje: nespustí se.&#10;&#10;Existuje verze simulátoru bez AVX2 - název jejího souboru končí na _noavx2. Vložte ji do složky hry a starter ji sám použije. Simulátor lze také sestavit sám (CMake -DENABLE_AVX2=OFF). Návod:&#10;{0}</String>
<String key="CpuNoAvx2">Tento procesor nemá AVX2 a oficiální simulátor ho vyžaduje: nespustí se.&#10;&#10;Simulátor lze sestavit bez AVX2 (CMake -DENABLE_AVX2=OFF). Návod:&#10;{0}</String>
<String key="CpuNoAvx2Open">Otevřít návod</String>
<String key="CpuNoAvx2Chosen">Tento procesor nemá AVX2 a zvolený simulátor {0} ho vyžaduje: nespustí se.&#10;&#10;Ve složce hry je verze bez AVX2: {1}. Automatická volba vezme právě ji.</String>
<String key="CpuNoAvx2UseIt">Volit automaticky</String>
<String key="DontShowAgain">Znovu nezobrazovat</String>
<String key="SettingsPath">Nastavení načteno z:</String>
@@ -785,6 +742,8 @@
<String key="SyntaxVehicleOutsideTrainset">Vozidlo {0} stojí mimo soupravu: chybí záhlaví trainset?</String>
<String key="SyntaxNotANumber">{0}: „{1}“ místo čísla</String>
<String key="SyntaxMissingInclude">Soubor {1} nenalezen (include)</String>
<String key="SyntaxMissingTerrainFile">Soubor terénu {1} nenalezen, ani .txtf, ani .btf (terrain)</String>
<String key="SyntaxTerrainFileBehindSbt">Soubor terénu {1} ignorován: terén už pochází ze souboru .sbt scenérie</String>
<String key="SyntaxIncludeNotClosed">include {1} bez end</String>
<String key="SyntaxTrainsetUnreadable">Soupravu {0} se nepodařilo načíst</String>
<String key="SyntaxVehicleUnreadable">Vozidlo {0} se nepodařilo načíst</String>

View File

@@ -589,47 +589,6 @@
<String key="Save">Save</String>
<String key="Reset">Reset</String>
<String key="SettingsSaved">Settings saved</String>
<String key="DefaultsRestored">Defaults restored</String>
<String key="SettingsRestored">Saved settings restored</String>
<String key="TreeExpanded">expanded</String>
<String key="TreeCollapsed">collapsed</String>
<String key="DepotConsistSources">Consist sources</String>
<String key="DepotVehicleInfo">Vehicle information</String>
<String key="DepotVehicleEdit">Vehicle settings</String>
<String key="ScenarioDetails">Scenario details</String>
<String key="SectionLevel">Section level</String>
<String key="SearchFound">{0} found</String>
<String key="SpinUp">Increase</String>
<String key="SpinDown">Decrease</String>
<String key="ChromeMinimize">Minimize</String>
<String key="ChromeMaximize">Maximize</String>
<String key="ChromeRestore">Restore</String>
<String key="ChromeClose">Close</String>
<String key="ScrollLineUp">Line up</String>
<String key="ScrollLineDown">Line down</String>
<String key="ScrollPageUp">Page up</String>
<String key="ScrollPageDown">Page down</String>
<String key="ScrollColumnLeft">Column left</String>
<String key="ScrollColumnRight">Column right</String>
<String key="ScrollPageLeft">Page left</String>
<String key="ScrollPageRight">Page right</String>
<String key="ScrollPosition">Position</String>
<String key="TapeKeysHelp">Left and Right arrows step along the tape, Ctrl with them steps ten times further, Home and End go to its ends, Enter takes the black box to that moment.</String>
<String key="ConsistSaidEmpty">Consist empty</String>
<String key="ConsistSaidAdded">Added {0} at position {1} of {2}</String>
<String key="ConsistSaidRemoved">Removed {0}, {1} vehicles left</String>
<String key="ConsistSaidTurned">{0} reversed</String>
<String key="ConsistSaidUnturned">{0} turned back</String>
<String key="ConsistSaidTurnedMany">{0} vehicles turned</String>
<String key="ConsistSaidMoved">{0} moved to position {1} of {2}</String>
<String key="ConsistSaidReordered">Order changed</String>
<String key="ConsistSaidReplaced">{0} replaced with {1}</String>
<String key="ConsistSaidChangedMany">{0} vehicles changed, {1} in the consist</String>
<String key="ConsistSaidUndone">Undone. {0}</String>
<String key="ConsistSaidRedone">Redone. {0}</String>
<String key="SceneryImage">Scenery picture</String>
<String key="PanelSplitter">Panel divider</String>
<String key="SettingsCategories">Settings categories</String>
<String key="SettingsNotSaved">Could not save the settings</String>
<String key="UnsavedChanges">Unsaved changes</String>
@@ -659,10 +618,8 @@
<String key="About">About</String>
<String key="Close">Close</String>
<String key="CpuNoAvx2Title">Processor without AVX2</String>
<String key="CpuNoAvx2">This processor has no AVX2 and the official simulator needs it: it will not start.&#10;&#10;There is a simulator build without AVX2 - its file name ends in _noavx2. Put it in the game folder and the starter will use it. You can also build the simulator yourself (CMake -DENABLE_AVX2=OFF). Instructions:&#10;{0}</String>
<String key="CpuNoAvx2">This processor has no AVX2 and the official simulator needs it: it will not start.&#10;&#10;You can build the simulator without AVX2 (CMake -DENABLE_AVX2=OFF). Instructions:&#10;{0}</String>
<String key="CpuNoAvx2Open">Open the instructions</String>
<String key="CpuNoAvx2Chosen">This processor has no AVX2 and the chosen simulator {0} needs it: it will not start.&#10;&#10;The game folder has a build without AVX2: {1}. The automatic choice takes that one.</String>
<String key="CpuNoAvx2UseIt">Choose automatically</String>
<String key="DontShowAgain">Don't show again</String>
<String key="SettingsPath">Settings loaded from:</String>
@@ -815,6 +772,8 @@
<String key="SyntaxVehicleOutsideTrainset">Vehicle {0} stands outside a trainset: header missing?</String>
<String key="SyntaxNotANumber">{0}: “{1}” instead of a number</String>
<String key="SyntaxMissingInclude">File {1} not found (include)</String>
<String key="SyntaxMissingTerrainFile">Terrain file {1} not found, neither .txtf nor .btf (terrain)</String>
<String key="SyntaxTerrainFileBehindSbt">Terrain file {1} ignored: the terrain already comes from the .sbt of the scenery</String>
<String key="SyntaxIncludeNotClosed">include {1} without end</String>
<String key="SyntaxTrainsetUnreadable">Trainset {0} could not be read</String>
<String key="SyntaxVehicleUnreadable">Vehicle {0} could not be read</String>

View File

@@ -563,47 +563,6 @@
<String key="Save">Mentés</String>
<String key="Reset">Visszaállítás</String>
<String key="SettingsSaved">A beállítások elmentve</String>
<String key="DefaultsRestored">Alapértékek visszaállítva</String>
<String key="SettingsRestored">A mentett beállítások visszaállítva</String>
<String key="TreeExpanded">kibontva</String>
<String key="TreeCollapsed">összecsukva</String>
<String key="DepotConsistSources">Szerelvény forrásai</String>
<String key="DepotVehicleInfo">Jármű adatai</String>
<String key="DepotVehicleEdit">Jármű beállításai</String>
<String key="ScenarioDetails">Forgatókönyv részletei</String>
<String key="SectionLevel">Szakasz szintje</String>
<String key="SearchFound">Találatok: {0}</String>
<String key="SpinUp">Növelés</String>
<String key="SpinDown">Csökkentés</String>
<String key="ChromeMinimize">Kis méret</String>
<String key="ChromeMaximize">Teljes méret</String>
<String key="ChromeRestore">Előző méret</String>
<String key="ChromeClose">Bezárás</String>
<String key="ScrollLineUp">Sor fel</String>
<String key="ScrollLineDown">Sor le</String>
<String key="ScrollPageUp">Oldal fel</String>
<String key="ScrollPageDown">Oldal le</String>
<String key="ScrollColumnLeft">Oszlop balra</String>
<String key="ScrollColumnRight">Oszlop jobbra</String>
<String key="ScrollPageLeft">Oldal balra</String>
<String key="ScrollPageRight">Oldal jobbra</String>
<String key="ScrollPosition">Pozíció</String>
<String key="TapeKeysHelp">A bal és jobb nyíl a szalagon lépked, Ctrl-lel tízszer messzebb, a Home és az End a végeire ugrik, az Enter a fekete dobozt ehhez a pillanathoz viszi.</String>
<String key="ConsistSaidEmpty">A szerelvény üres</String>
<String key="ConsistSaidAdded">{0} hozzáadva, {1}. hely a(z) {2}-ből</String>
<String key="ConsistSaidRemoved">{0} eltávolítva, maradt jármű: {1}</String>
<String key="ConsistSaidTurned">{0} megfordítva</String>
<String key="ConsistSaidUnturned">{0} visszafordítva</String>
<String key="ConsistSaidTurnedMany">Megfordított járművek: {0}</String>
<String key="ConsistSaidMoved">{0} áthelyezve, {1}. hely a(z) {2}-ből</String>
<String key="ConsistSaidReordered">Sorrend megváltozott</String>
<String key="ConsistSaidReplaced">{0} helyett {1}</String>
<String key="ConsistSaidChangedMany">Megváltozott járművek: {0}, a szerelvényben: {1}</String>
<String key="ConsistSaidUndone">Visszavonva. {0}</String>
<String key="ConsistSaidRedone">Újra végrehajtva. {0}</String>
<String key="SceneryImage">A pálya képe</String>
<String key="PanelSplitter">Panelelválasztó</String>
<String key="SettingsCategories">Beállítási kategóriák</String>
<String key="SettingsNotSaved">A beállításokat nem sikerült elmenteni</String>
<String key="UnsavedChanges">Nem mentett módosítások</String>
@@ -633,10 +592,8 @@
<String key="About">Névjegy</String>
<String key="Close">Bezárás</String>
<String key="CpuNoAvx2Title">AVX2 nélküli processzor</String>
<String key="CpuNoAvx2">Ez a processzor nem tudja az AVX2-t, a hivatalos szimulátornak pedig kell: nem indul el.&#10;&#10;Van AVX2 nélküli szimulátor-változat - a fájl neve _noavx2-re végződik. Tegye a játék mappájába, és az indító magától azt használja. A szimulátor saját maga is lefordítható (CMake -DENABLE_AVX2=OFF). Útmutató:&#10;{0}</String>
<String key="CpuNoAvx2">Ez a processzor nem tudja az AVX2-t, a hivatalos szimulátornak pedig kell: nem indul el.&#10;&#10;A szimulátor lefordítható AVX2 nélkül (CMake -DENABLE_AVX2=OFF). Útmutató:&#10;{0}</String>
<String key="CpuNoAvx2Open">Útmutató megnyitása</String>
<String key="CpuNoAvx2Chosen">Ez a processzor nem tudja az AVX2-t, a kiválasztott {0} szimulátornak pedig kell: nem indul el.&#10;&#10;A játék mappájában van AVX2 nélküli változat: {1}. Az automatikus választás ezt veszi.</String>
<String key="CpuNoAvx2UseIt">Automatikus választás</String>
<String key="DontShowAgain">Ne mutasd többé</String>
<String key="SettingsPath">Beállítások betöltve innen:</String>
@@ -785,6 +742,8 @@
<String key="SyntaxVehicleOutsideTrainset">A(z) {0} jármű szerelvényen kívül áll: hiányzik a trainset fejléc?</String>
<String key="SyntaxNotANumber">{0}: „{1}” szám helyett</String>
<String key="SyntaxMissingInclude">A(z) {1} fájl nem található (include)</String>
<String key="SyntaxMissingTerrainFile">A(z) {1} terepfájl nem található, sem .txtf, sem .btf (terrain)</String>
<String key="SyntaxTerrainFileBehindSbt">A(z) {1} terepfájl kimarad: a terep már a díszlet .sbt fájljából jön</String>
<String key="SyntaxIncludeNotClosed">include {1} end nélkül</String>
<String key="SyntaxTrainsetUnreadable">A(z) {0} szerelvényt nem sikerült beolvasni</String>
<String key="SyntaxVehicleUnreadable">A(z) {0} járművet nem sikerült beolvasni</String>

View File

@@ -589,47 +589,6 @@
<String key="Save">Zapisz</String>
<String key="Reset">Przywróć</String>
<String key="SettingsSaved">Zapisano ustawienia</String>
<String key="DefaultsRestored">Przywrócono domyślne</String>
<String key="SettingsRestored">Przywrócono zapisane ustawienia</String>
<String key="TreeExpanded">rozwinięte</String>
<String key="TreeCollapsed">zwinięte</String>
<String key="DepotConsistSources">Źródła zestawienia</String>
<String key="DepotVehicleInfo">Informacje o pojeździe</String>
<String key="DepotVehicleEdit">Ustawienia pojazdu</String>
<String key="ScenarioDetails">Szczegóły scenariusza</String>
<String key="SectionLevel">Poziom sekcji</String>
<String key="SearchFound">Znaleziono: {0}</String>
<String key="SpinUp">Zwiększ</String>
<String key="SpinDown">Zmniejsz</String>
<String key="ChromeMinimize">Minimalizuj</String>
<String key="ChromeMaximize">Maksymalizuj</String>
<String key="ChromeRestore">Przywróć</String>
<String key="ChromeClose">Zamknij</String>
<String key="ScrollLineUp">Wiersz w górę</String>
<String key="ScrollLineDown">Wiersz w dół</String>
<String key="ScrollPageUp">Strona w górę</String>
<String key="ScrollPageDown">Strona w dół</String>
<String key="ScrollColumnLeft">Kolumna w lewo</String>
<String key="ScrollColumnRight">Kolumna w prawo</String>
<String key="ScrollPageLeft">Strona w lewo</String>
<String key="ScrollPageRight">Strona w prawo</String>
<String key="ScrollPosition">Położenie</String>
<String key="TapeKeysHelp">Strzałki w lewo i w prawo przesuwają po taśmie, z Ctrl dziesięć razy dalej, Home i End idą na jej końce, Enter przenosi czarną skrzynkę do tej chwili.</String>
<String key="ConsistSaidEmpty">Zestawienie puste</String>
<String key="ConsistSaidAdded">Dodano {0} na pozycji {1} z {2}</String>
<String key="ConsistSaidRemoved">Usunięto {0}, zostało pojazdów: {1}</String>
<String key="ConsistSaidTurned">{0} obrócony</String>
<String key="ConsistSaidUnturned">{0} obrócony z powrotem</String>
<String key="ConsistSaidTurnedMany">Obrócono pojazdów: {0}</String>
<String key="ConsistSaidMoved">{0} przesunięty na pozycję {1} z {2}</String>
<String key="ConsistSaidReordered">Zmieniono kolejność</String>
<String key="ConsistSaidReplaced">{0} zastąpiony przez {1}</String>
<String key="ConsistSaidChangedMany">Zmieniono pojazdów: {0}, w zestawieniu: {1}</String>
<String key="ConsistSaidUndone">Cofnięto. {0}</String>
<String key="ConsistSaidRedone">Przywrócono. {0}</String>
<String key="SceneryImage">Obraz scenerii</String>
<String key="PanelSplitter">Rozdzielacz paneli</String>
<String key="SettingsCategories">Kategorie ustawień</String>
<String key="SettingsNotSaved">Nie udało się zapisać ustawień</String>
<String key="UnsavedChanges">Niezapisane zmiany</String>
@@ -659,10 +618,8 @@
<String key="About">O programie</String>
<String key="Close">Zamknij</String>
<String key="CpuNoAvx2Title">Procesor bez AVX2</String>
<String key="CpuNoAvx2">Ten procesor nie ma AVX2, a oficjalny symulator go wymaga: nie uruchomi się.&#10;&#10;Istnieje wersja symulatora bez AVX2 - nazwa jej pliku kończy się na _noavx2. Umieść ją w folderze gry, a starter sam jej użyje. Można też zbudować symulator samemu (CMake -DENABLE_AVX2=OFF). Instrukcja:&#10;{0}</String>
<String key="CpuNoAvx2">Ten procesor nie ma AVX2, a oficjalny symulator go wymaga: nie uruchomi się.&#10;&#10;Można zbudować symulator bez AVX2 (CMake -DENABLE_AVX2=OFF). Instrukcja:&#10;{0}</String>
<String key="CpuNoAvx2Open">Otwórz instrukcję</String>
<String key="CpuNoAvx2Chosen">Ten procesor nie ma AVX2, a wybrany symulator {0} go wymaga: nie uruchomi się.&#10;&#10;W folderze gry jest wersja bez AVX2: {1}. Wybór automatyczny weźmie właśnie ją.</String>
<String key="CpuNoAvx2UseIt">Wybieraj automatycznie</String>
<String key="DontShowAgain">Nie pokazuj więcej</String>
<String key="SettingsPath">Lokalizacja wczytanych ustawień:</String>
@@ -812,6 +769,8 @@
<String key="SyntaxVehicleOutsideTrainset">Pojazd {0} stoi poza składem: brak nagłówka trainset?</String>
<String key="SyntaxNotANumber">{0}: „{1}” zamiast liczby</String>
<String key="SyntaxMissingInclude">Brak pliku {1} (include)</String>
<String key="SyntaxMissingTerrainFile">Brak pliku terenu {1}, ani .txtf, ani .btf (terrain)</String>
<String key="SyntaxTerrainFileBehindSbt">Plik terenu {1} pominięty: teren pochodzi już z pliku .sbt scenerii</String>
<String key="SyntaxIncludeNotClosed">include {1} bez end</String>
<String key="SyntaxTrainsetUnreadable">Nie udało się odczytać składu {0}</String>
<String key="SyntaxVehicleUnreadable">Nie udało się odczytać pojazdu {0}</String>

View File

@@ -563,47 +563,6 @@
<String key="Save">Сохранить</String>
<String key="Reset">Сбросить</String>
<String key="SettingsSaved">Настройки сохранены</String>
<String key="DefaultsRestored">Восстановлены значения по умолчанию</String>
<String key="SettingsRestored">Восстановлены сохранённые настройки</String>
<String key="TreeExpanded">развёрнуто</String>
<String key="TreeCollapsed">свёрнуто</String>
<String key="DepotConsistSources">Источники состава</String>
<String key="DepotVehicleInfo">Сведения о единице</String>
<String key="DepotVehicleEdit">Настройки единицы</String>
<String key="ScenarioDetails">Подробности сценария</String>
<String key="SectionLevel">Уровень раздела</String>
<String key="SearchFound">Найдено: {0}</String>
<String key="SpinUp">Увеличить</String>
<String key="SpinDown">Уменьшить</String>
<String key="ChromeMinimize">Свернуть</String>
<String key="ChromeMaximize">Развернуть</String>
<String key="ChromeRestore">Восстановить</String>
<String key="ChromeClose">Закрыть</String>
<String key="ScrollLineUp">На строку вверх</String>
<String key="ScrollLineDown">На строку вниз</String>
<String key="ScrollPageUp">На страницу вверх</String>
<String key="ScrollPageDown">На страницу вниз</String>
<String key="ScrollColumnLeft">На столбец влево</String>
<String key="ScrollColumnRight">На столбец вправо</String>
<String key="ScrollPageLeft">На страницу влево</String>
<String key="ScrollPageRight">На страницу вправо</String>
<String key="ScrollPosition">Положение</String>
<String key="TapeKeysHelp">Стрелки влево и вправо двигают по ленте, с Ctrl в десять раз дальше, Home и End ведут к её концам, Enter переносит чёрный ящик в этот момент.</String>
<String key="ConsistSaidEmpty">Состав пуст</String>
<String key="ConsistSaidAdded">Добавлено {0} на позицию {1} из {2}</String>
<String key="ConsistSaidRemoved">Удалено {0}, осталось единиц: {1}</String>
<String key="ConsistSaidTurned">{0} развёрнут</String>
<String key="ConsistSaidUnturned">{0} развёрнут обратно</String>
<String key="ConsistSaidTurnedMany">Развёрнуто единиц: {0}</String>
<String key="ConsistSaidMoved">{0} перемещён на позицию {1} из {2}</String>
<String key="ConsistSaidReordered">Порядок изменён</String>
<String key="ConsistSaidReplaced">{0} заменён на {1}</String>
<String key="ConsistSaidChangedMany">Изменено единиц: {0}, в составе: {1}</String>
<String key="ConsistSaidUndone">Отменено. {0}</String>
<String key="ConsistSaidRedone">Повторено. {0}</String>
<String key="SceneryImage">Изображение сценерии</String>
<String key="PanelSplitter">Разделитель панелей</String>
<String key="SettingsCategories">Категории настроек</String>
<String key="SettingsNotSaved">Не удалось сохранить настройки</String>
<String key="UnsavedChanges">Несохранённые изменения</String>
@@ -633,10 +592,8 @@
<String key="About">О программе</String>
<String key="Close">Закрыть</String>
<String key="CpuNoAvx2Title">Процессор без AVX2</String>
<String key="CpuNoAvx2">Этот процессор не поддерживает AVX2, а официальному симулятору он нужен: симулятор не запустится.&#10;&#10;Есть версия симулятора без AVX2 - имя её файла оканчивается на _noavx2. Положите её в папку игры, и стартер сам её использует. Симулятор можно также собрать самому (CMake -DENABLE_AVX2=OFF). Инструкция:&#10;{0}</String>
<String key="CpuNoAvx2">Этот процессор не поддерживает AVX2, а официальному симулятору он нужен: симулятор не запустится.&#10;&#10;Можно собрать симулятор без AVX2 (CMake -DENABLE_AVX2=OFF). Инструкция:&#10;{0}</String>
<String key="CpuNoAvx2Open">Открыть инструкцию</String>
<String key="CpuNoAvx2Chosen">Этот процессор не поддерживает AVX2, а выбранному симулятору {0} он нужен: он не запустится.&#10;&#10;В папке игры есть версия без AVX2: {1}. Автоматический выбор возьмёт именно её.</String>
<String key="CpuNoAvx2UseIt">Выбирать автоматически</String>
<String key="DontShowAgain">Больше не показывать</String>
<String key="SettingsPath">Настройки загружены из:</String>
@@ -785,6 +742,8 @@
<String key="SyntaxVehicleOutsideTrainset">Транспорт {0} стоит вне состава: нет заголовка trainset?</String>
<String key="SyntaxNotANumber">{0}: «{1}» вместо числа</String>
<String key="SyntaxMissingInclude">Файл {1} не найден (include)</String>
<String key="SyntaxMissingTerrainFile">Файл рельефа {1} не найден, ни .txtf, ни .btf (terrain)</String>
<String key="SyntaxTerrainFileBehindSbt">Файл рельефа {1} пропущен: рельеф уже берётся из файла .sbt сценария</String>
<String key="SyntaxIncludeNotClosed">include {1} без end</String>
<String key="SyntaxTrainsetUnreadable">Не удалось прочитать состав {0}</String>
<String key="SyntaxVehicleUnreadable">Не удалось прочитать единицу {0}</String>