ericek111/Nonemm
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Walk the entry boxes the way N1MM walks them

Browse Source 
Space and tab were moving through every box in turn, and since the name and
comment boxes arrived, into those as well. N1MM does neither.

Its EntryWindow.NextTab walks the boxes the contest declares plus the callsign,
skips SNTText and RCVText, and comes round to the callsign from the last one.
For CQ WW that means the callsign and the zone, and nothing else: the entry
items are SNTText, RCVText and CQZoneText, and the first two are stepped over.
So this steps over report boxes as well, and the name and comment boxes are out
of the walk, as they are out of N1MM's.

Skipping the reports only works because they are filled in. N1MM's TabPressed
puts the report for the mode into an empty Snt or Rcv box when the callsign box
is left, and FillReports does the same here: 599 on CW and digital, 59 on phone.
A report the operator typed is left alone, and a report box is still there to
click when a contact is not 599.

The test that said space walks every box in turn now says it steps over the
report, which is the behaviour that was asked for.

Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
This commit is contained in:
ericek111
2026-08-28 10:04:48 +00:00
parent 7c2a2ed768
commit f102e0a304
5 changed files with 103 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
src/Nonemm.App/Windows/EntryWindow.axaml.cs
View File

@@ -311,7 +311,7 @@ public sealed partial class EntryWindow : Window
e.Handled = true;
session.SwapRadio();
break;
case Key.Tab when FocusedIsEntryBox() || FocusedIsNoteBox():
case Key.Tab when FocusedIsEntryBox():
e.Handled = true;
MoveFocus(forward: !e.KeyModifiers.HasFlag(KeyModifiers.Shift));
break;
@@ -394,40 +394,24 @@ public sealed partial class EntryWindow : Window
boxes[0].Focus();
}
/// Tab and space walk the callsign box, the exchange boxes, then the name
/// and comment boxes, and round again.
/// Tab and space walk the callsign box and the exchange boxes, and round
/// again, as N1MM's do. The name and comment boxes are not in the walk,
/// because they are not part of the exchange; they are there for the mouse.
private void MoveFocus(bool forward)
{
if (Logging is null || boxes.Count == 0)
{
return;
}
List<TextBox> notes = [.. new[] { nameBox, commentBox }.OfType<TextBox>()];
int inNotes = notes.FindIndex(box => box.IsFocused);
if (inNotes >= 0)
{
int next = inNotes + (forward ? 1 : -1);
if (next >= 0 && next < notes.Count)
{
notes[next].Focus();
return;
}
Logging.Entry.FocusOn(forward ? 0 : Logging.Entry.FieldCount - 1);
FocusEntryBox();
return;
}
if (forward && notes.Count > 0 && Logging.Entry.Focus == Logging.Entry.FieldCount - 1)
{
notes[0].Focus();
return;
}
if (forward)
{
// leaving the callsign box is the moment the call is settled, which
// is when the call history can say what the exchange will be
// is when the call history can say what the exchange will be and
// the reports can be filled in
if (Logging.Entry.Focus == 0)
{
bool filled = Logging.FillFromHistory();
bool filled = Logging.FillReports();
filled |= Logging.FillFromHistory();
filled |= FillNameFromHistory();
if (filled)
{
@@ -472,8 +456,6 @@ public sealed partial class EntryWindow : Window
private bool FocusedIsEntryBox() => boxes.Any(b => b.IsFocused);
private bool FocusedIsNoteBox() => nameBox?.IsFocused == true || commentBox?.IsFocused == true;
/// The buttons N1MM puts under its function keys. Each one does what its
/// key does, so there is one place deciding what happens.
private void OnStopSending(object? sender, RoutedEventArgs e)

24
src/Nonemm.Session/EntryFields.cs
View File

@@ -64,11 +64,27 @@ public sealed class EntryFields
public void FocusOn(int field) => Focus = Math.Clamp(field, 0, FieldCount - 1);
/// What space does: move to the next box, and round to the callsign again
/// from the last one.
public void Advance() => Focus = (Focus + 1) % FieldCount;
/// What space and tab do: move to the next box the operator types in, and
/// round to the callsign again from the last one. The report boxes are
/// stepped over, because nobody types 599 — N1MM steps over them too, and
/// fills them in instead.
public void Advance() => Focus = Next(1);
public void Retreat() => Focus = (Focus + FieldCount - 1) % FieldCount;
public void Retreat() => Focus = Next(-1);
private int Next(int by)
{
int at = Focus;
for (int step = 0; step < FieldCount; step++)
{
at = (at + by + FieldCount) % FieldCount;
if (at == 0 || Exchange[at - 1].Kind != ExchangeFieldKind.Report)
{
return at;
}
}
return Focus;
}
/// True when everything the contest asks for has been typed.
public bool IsComplete =>

22
src/Nonemm.Session/RadioPosition.cs
View File

@@ -97,6 +97,28 @@ public sealed class RadioPosition
return stored;
}
/// Puts the report the operator would send anyway into the report boxes
/// that are empty: 599 on CW and digital modes, 59 on phone. N1MM does the
/// same when the callsign box is left, which is why neither program stops
/// on a report box.
public bool FillReports()
{
bool filled = false;
for (int at = 0; at < Entry.Exchange.Count; at++)
{
if (Entry.Exchange[at].Kind == ExchangeFieldKind.Report && Entry[at + 1].Trim().Length == 0)
{
Entry[at + 1] = DefaultReport();
filled = true;
}
}
if (filled)
{
Session.NotifyChanged();
}
return filled;
}
/// Fills what the call history knows into the exchange boxes that are still
/// empty. What the other station actually sends wins, so a box with
/// something in it is left alone. Returns true when anything was filled.