From f31ee5bc0383c36d11189a0c2c8b5a186bac4acb Mon Sep 17 00:00:00 2001
From: ericek111 <erik@brocko.eu>
Date: Sat, 24 Oct 2026 12:31:34 +0000
Subject: [PATCH] Move the bandmap settings to a Configure Bandmap window

The spot timeouts, the QSY spot and CQ frequency distances and the
recent contact minutes leave the telnet Filters tab for a window under
Config. Each is a numeric box with a range.

Co-Authored-By: Claude Sonnet 5.5 <noreply@anthropic.com>
---
 src/Nonemm.App/Dialogs/BandmapDialog.axaml    | 36 +++++++++++++++++
 src/Nonemm.App/Dialogs/BandmapDialog.axaml.cs | 39 +++++++++++++++++++
 src/Nonemm.App/Windows/EntryWindow.Menu.cs    | 11 ++++++
 src/Nonemm.App/Windows/EntryWindow.axaml      |  1 +
 .../Windows/TelnetWindow.Filters.cs           | 12 ------
 src/Nonemm.App/Windows/TelnetWindow.axaml     | 10 -----
 6 files changed, 87 insertions(+), 22 deletions(-)
 create mode 100644 src/Nonemm.App/Dialogs/BandmapDialog.axaml
 create mode 100644 src/Nonemm.App/Dialogs/BandmapDialog.axaml.cs

diff --git a/src/Nonemm.App/Dialogs/BandmapDialog.axaml b/src/Nonemm.App/Dialogs/BandmapDialog.axaml
new file mode 100644
index 0000000..e8aab5f
--- /dev/null
+++ b/src/Nonemm.App/Dialogs/BandmapDialog.axaml
@@ -0,0 +1,36 @@
+<Window xmlns="https://github.com/avaloniaui"
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+        x:Class="Nonemm.App.Dialogs.BandmapDialog"
+        Title="Configure Bandmap" Width="460" SizeToContent="Height"
+        WindowStartupLocation="CenterOwner" CanResize="False">
+  <StackPanel Margin="14" Spacing="6">
+    <TextBlock Text="Spots stay on the bandmap for" FontWeight="SemiBold" />
+    <Grid ColumnDefinitions="*,8,130" RowDefinitions="Auto,Auto" RowSpacing="6">
+      <TextBlock Text="CW and digital" VerticalAlignment="Center" />
+      <NumericUpDown Name="CwDigitalTimeoutBox" Grid.Column="2" Minimum="1" Maximum="600"
+                     Increment="1" FormatString="0 &quot;min&quot;" />
+      <TextBlock Grid.Row="1" Text="Phone" VerticalAlignment="Center" />
+      <NumericUpDown Name="PhoneTimeoutBox" Grid.Row="1" Grid.Column="2" Minimum="1" Maximum="600"
+                     Increment="1" FormatString="0 &quot;min&quot;" />
+    </Grid>
+    <TextBlock Text="Local spots" FontWeight="SemiBold" Margin="0,8,0,0" />
+    <Grid ColumnDefinitions="*,8,130" RowDefinitions="Auto,Auto,Auto" RowSpacing="6">
+      <TextBlock Text="Spot the call in the entry window when the radio moves more than"
+                 TextWrapping="Wrap" VerticalAlignment="Center" />
+      <NumericUpDown Name="QsySpotBox" Grid.Column="2" Minimum="100" Maximum="50000"
+                     Increment="100" FormatString="0 &quot;Hz&quot;" />
+      <TextBlock Grid.Row="1" Text="Go back to search and pounce when the radio moves off the CQ frequency by more than"
+                 TextWrapping="Wrap" VerticalAlignment="Center" />
+      <NumericUpDown Name="CqLeaveBox" Grid.Row="1" Grid.Column="2" Minimum="100" Maximum="50000"
+                     Increment="100" FormatString="0 &quot;Hz&quot;" />
+      <TextBlock Grid.Row="2" Text="On opening and resync, spot the contacts logged in the last (0 for none)"
+                 TextWrapping="Wrap" VerticalAlignment="Center" />
+      <NumericUpDown Name="RecentSpotBox" Grid.Row="2" Grid.Column="2" Minimum="0" Maximum="600"
+                     Increment="1" FormatString="0 &quot;min&quot;" />
+    </Grid>
+    <StackPanel Orientation="Horizontal" HorizontalAlignment="Right" Spacing="6" Margin="0,8,0,0">
+      <Button Content="Cancel" Click="OnCancel" />
+      <Button Content="Save" Click="OnSave" IsDefault="True" />
+    </StackPanel>
+  </StackPanel>
+</Window>
diff --git a/src/Nonemm.App/Dialogs/BandmapDialog.axaml.cs b/src/Nonemm.App/Dialogs/BandmapDialog.axaml.cs
new file mode 100644
index 0000000..a769c87
--- /dev/null
+++ b/src/Nonemm.App/Dialogs/BandmapDialog.axaml.cs
@@ -0,0 +1,39 @@
+using Avalonia.Controls;
+using Avalonia.Interactivity;
+using Nonemm.App.Configuration;
+
+namespace Nonemm.App.Dialogs;
+
+/// How long spots stay on the bandmap, and when the program puts a station on
+/// it by itself.
+public sealed partial class BandmapDialog : Window
+{
+    private readonly Settings settings;
+
+    public BandmapDialog(Settings settings)
+    {
+        this.settings = settings;
+        InitializeComponent();
+        CwDigitalTimeoutBox.Value = settings.CwDigitalSpotTimeoutMinutes;
+        PhoneTimeoutBox.Value = settings.PhoneSpotTimeoutMinutes;
+        QsySpotBox.Value = settings.QsySpotHertz;
+        CqLeaveBox.Value = settings.CqLeaveHertz;
+        RecentSpotBox.Value = settings.RecentContactSpotMinutes;
+    }
+
+    private void OnSave(object? sender, RoutedEventArgs e) =>
+        Close(settings with
+        {
+            CwDigitalSpotTimeoutMinutes = Read(CwDigitalTimeoutBox, settings.CwDigitalSpotTimeoutMinutes),
+            PhoneSpotTimeoutMinutes = Read(PhoneTimeoutBox, settings.PhoneSpotTimeoutMinutes),
+            QsySpotHertz = Read(QsySpotBox, settings.QsySpotHertz),
+            CqLeaveHertz = Read(CqLeaveBox, settings.CqLeaveHertz),
+            RecentContactSpotMinutes = Read(RecentSpotBox, settings.RecentContactSpotMinutes),
+        });
+
+    /// A box the operator emptied keeps the setting it had.
+    private static int Read(NumericUpDown box, int fallback) =>
+        box.Value is { } value ? (int)value : fallback;
+
+    private void OnCancel(object? sender, RoutedEventArgs e) => Close(null);
+}
diff --git a/src/Nonemm.App/Windows/EntryWindow.Menu.cs b/src/Nonemm.App/Windows/EntryWindow.Menu.cs
index 27dd6e9..d5d21dc 100644
--- a/src/Nonemm.App/Windows/EntryWindow.Menu.cs
+++ b/src/Nonemm.App/Windows/EntryWindow.Menu.cs
@@ -572,6 +572,17 @@ public sealed partial class EntryWindow
         }
     }
 
+    private async void OnBandmapSettings(object? sender, RoutedEventArgs e)
+    {
+        BandmapDialog dialog = new(session.Settings);
+        Settings? updated = await dialog.ShowDialog<Settings?>(this);
+        if (updated is not null)
+        {
+            session.Save(updated);
+            Status("bandmap settings saved");
+        }
+    }
+
     private async void OnBroadcastSettings(object? sender, RoutedEventArgs e)
     {
         BroadcastDataDialog dialog = new(session.Settings);
diff --git a/src/Nonemm.App/Windows/EntryWindow.axaml b/src/Nonemm.App/Windows/EntryWindow.axaml
index b77d7c1..f58946a 100644
--- a/src/Nonemm.App/Windows/EntryWindow.axaml
+++ b/src/Nonemm.App/Windows/EntryWindow.axaml
@@ -101,6 +101,7 @@
         <MenuItem Header="Configure Ports, Mode Control, Winkey, etc…" Click="OnKeyerSettings" />
         <MenuItem Header="Configure Radios…" Click="OnRadioSettings" />
         <MenuItem Header="Configure Cluster…" Click="OnClusterSettings" />
+        <MenuItem Header="Configure Bandmap…" Click="OnBandmapSettings" />
         <MenuItem Header="Change Your Station Data…" Click="OnStationSettings" />
         <MenuItem Header="Change Operator…" Click="OnChangeOperator" InputGesture="Ctrl+O" />
         <Separator />
diff --git a/src/Nonemm.App/Windows/TelnetWindow.Filters.cs b/src/Nonemm.App/Windows/TelnetWindow.Filters.cs
index 898778c..d703e78 100644
--- a/src/Nonemm.App/Windows/TelnetWindow.Filters.cs
+++ b/src/Nonemm.App/Windows/TelnetWindow.Filters.cs
@@ -48,11 +48,6 @@ public sealed partial class TelnetWindow
         CallAreasBox.Text = string.Join(' ', filter.CallAreas);
         BlockedSpottersBox.Text = string.Join(' ', filter.BlockedSpotters);
         BlockedCallsBox.Text = string.Join(' ', filter.BlockedCalls);
-        TimeoutBox.Text = session.Settings.CwDigitalSpotTimeoutMinutes.ToString(CultureInfo.InvariantCulture);
-        PhoneTimeoutBox.Text = session.Settings.PhoneSpotTimeoutMinutes.ToString(CultureInfo.InvariantCulture);
-        QsySpotBox.Text = session.Settings.QsySpotHertz.ToString(CultureInfo.InvariantCulture);
-        RecentSpotBox.Text = session.Settings.RecentContactSpotMinutes.ToString(CultureInfo.InvariantCulture);
-        CqLeaveBox.Text = session.Settings.CqLeaveHertz.ToString(CultureInfo.InvariantCulture);
         SpotCommentBox.Text = session.Settings.SpotComment;
     }
 
@@ -75,13 +70,6 @@ public sealed partial class TelnetWindow
                 PreferredSpotters = Words(PreferredSpottersBox.Text),
             },
             RandomizeSpots = RandomizeBox.IsChecked == true,
-            CwDigitalSpotTimeoutMinutes = Minutes(TimeoutBox.Text, session.Settings.CwDigitalSpotTimeoutMinutes),
-            PhoneSpotTimeoutMinutes = Minutes(PhoneTimeoutBox.Text, session.Settings.PhoneSpotTimeoutMinutes),
-            QsySpotHertz = Minutes(QsySpotBox.Text, session.Settings.QsySpotHertz),
-            RecentContactSpotMinutes = int.TryParse(RecentSpotBox.Text, out int recent) && recent >= 0
-                ? recent
-                : session.Settings.RecentContactSpotMinutes,
-            CqLeaveHertz = Minutes(CqLeaveBox.Text, session.Settings.CqLeaveHertz),
         });
         Show("*** filters applied — they hold for the spots that arrive from now on", NoticeColour);
     }
diff --git a/src/Nonemm.App/Windows/TelnetWindow.axaml b/src/Nonemm.App/Windows/TelnetWindow.axaml
index 1419c61..b8b0c7c 100644
--- a/src/Nonemm.App/Windows/TelnetWindow.axaml
+++ b/src/Nonemm.App/Windows/TelnetWindow.axaml
@@ -120,16 +120,6 @@
           <TextBox Name="BlockedSpottersBox" />
           <TextBlock Classes="label" Text="Blacklisted calls" />
           <TextBox Name="BlockedCallsBox" />
-          <TextBlock Classes="label" Text="Bandmap spot timeout for CW and digital (minutes)" />
-          <TextBox Name="TimeoutBox" Width="60" HorizontalAlignment="Left" />
-          <TextBlock Classes="label" Text="Bandmap spot timeout for phone (minutes)" />
-          <TextBox Name="PhoneTimeoutBox" Width="60" HorizontalAlignment="Left" />
-          <TextBlock Classes="label" Text="Spot a call locally when the radio moves more than (Hz)" />
-          <TextBox Name="QsySpotBox" Width="60" HorizontalAlignment="Left" />
-          <TextBlock Classes="label" Text="Go back to search and pounce when the radio moves off the CQ frequency by more than (Hz)" TextWrapping="Wrap" />
-          <TextBox Name="CqLeaveBox" Width="60" HorizontalAlignment="Left" />
-          <TextBlock Classes="label" Text="Spot the contacts logged in the last (minutes) on opening and resync, 0 for none" TextWrapping="Wrap" />
-          <TextBox Name="RecentSpotBox" Width="60" HorizontalAlignment="Left" />
           <Button Content="Apply" Click="OnApplyFilters" Margin="0,10,0,0" />
         </StackPanel>
       </ScrollViewer>