Lay the menu bar out the way N1MM lays it out, and fill in the Edit menu
The menu tree comes from N1MM's EntryWindow.Designer.cs: File, Edit, View, Tools, Config, Window, with the items under the names N1MM gives them. The window list moved out of View into Window; the call history file moved from Config into File > Import. Ctrl+W, Ctrl+L and Ctrl+M now work, so the keys printed in the menu are real. Two commands that had no menu item before: the CW and SSB function key definitions, and the QTC setup area. The rest of the Edit menu: - Ctrl+N asks for a note and puts it in the comment of the contact in the boxes, or of the last logged contact when nothing is typed. - Edit Current Contact opens the Edit Contact form over what is typed but not logged. Update hands the values back to the entry boxes. - Ctrl+Q and Ctrl+A load a logged contact into the boxes and paint them pale yellow. Enter writes the change back, Esc puts back what was being typed, and stepping forward past the newest contact leaves quick edit. - Ctrl+U raises the received serial, or a numeric exchange box when the contest has no serial. - Ctrl+F shows the call being typed in the log window, then the next contact with that call. RadioPosition is now OperatingPosition: it is the operator at one radio, not a place on a band. Looked at under Xvfb on a 3775-contact log: quick edit back and forward, Esc, the note dialog, find, and Edit Current Contact putting a zone back into the entry boxes. Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
This commit is contained in:
@@ -19,7 +19,7 @@ public sealed class AppSession : IDisposable
|
||||
{
|
||||
private LogStore? store;
|
||||
private readonly List<RigctldRadio> radios = [];
|
||||
private readonly List<RadioPosition> positions = [];
|
||||
private readonly List<OperatingPosition> positions = [];
|
||||
private int activeRadio;
|
||||
private ClusterClient? cluster;
|
||||
private StationNetwork? network;
|
||||
@@ -88,15 +88,15 @@ public sealed class AppSession : IDisposable
|
||||
|
||||
/// The radio the operator is not on, or null at a one-radio station. The
|
||||
/// message macros that pass a station to the other band need it.
|
||||
public RadioPosition? Other(RadioPosition position) =>
|
||||
public OperatingPosition? Other(OperatingPosition position) =>
|
||||
positions.FirstOrDefault(p => p.RadioNumber != position.RadioNumber);
|
||||
|
||||
/// One per radio, in radio-number order. There is always at least one, so
|
||||
/// the program works with no radio connected.
|
||||
public IReadOnlyList<RadioPosition> Positions => positions;
|
||||
public IReadOnlyList<OperatingPosition> Positions => positions;
|
||||
|
||||
/// The radio the operator is on.
|
||||
public RadioPosition? Position =>
|
||||
public OperatingPosition? Position =>
|
||||
activeRadio < positions.Count ? positions[activeRadio] : null;
|
||||
|
||||
public CheckWindowSources? Check { get; private set; }
|
||||
@@ -185,7 +185,7 @@ public sealed class AppSession : IDisposable
|
||||
positions.Clear();
|
||||
for (int number = 1; number <= PositionCount; number++)
|
||||
{
|
||||
positions.Add(new RadioPosition(Logging, number));
|
||||
positions.Add(new OperatingPosition(Logging, number));
|
||||
}
|
||||
activeRadio = Math.Min(activeRadio, positions.Count - 1);
|
||||
Logging.Changed += (_, _) => Changed?.Invoke(this, EventArgs.Empty);
|
||||
@@ -370,7 +370,7 @@ public sealed class AppSession : IDisposable
|
||||
/// alternating CQ; the operator's own F1 goes through the entry window.
|
||||
private async Task CallCqOnAsync(int radioNumber)
|
||||
{
|
||||
RadioPosition position = positions.FirstOrDefault(p => p.RadioNumber == radioNumber)
|
||||
OperatingPosition position = positions.FirstOrDefault(p => p.RadioNumber == radioNumber)
|
||||
?? throw new InvalidOperationException($"there is no radio {radioNumber}");
|
||||
if (keyer is null)
|
||||
{
|
||||
@@ -438,7 +438,7 @@ public sealed class AppSession : IDisposable
|
||||
/// but it must not drag the entry window off the contact being worked.
|
||||
private void RadioMoved(Radio moved, RadioState state)
|
||||
{
|
||||
RadioPosition? position = positions.FirstOrDefault(p => p.RadioNumber == moved.Number);
|
||||
OperatingPosition? position = positions.FirstOrDefault(p => p.RadioNumber == moved.Number);
|
||||
if (position is null)
|
||||
{
|
||||
return;
|
||||
|
||||
Reference in New Issue
Block a user