From f2bea8969ce8741daea795075e4b31c5993f1fb9 Mon Sep 17 00:00:00 2001
From: Devin G <149845346+DeathSoulYTDev@users.noreply.github.com>
Date: Mon, 26 May 2025 15:15:38 -0700
Subject: [PATCH 01/17] Add files via upload
From 9b56619461313bd2c572cc546af627a0baa722d1 Mon Sep 17 00:00:00 2001
From: Devin G <149845346+DeathSoulYTDev@users.noreply.github.com>
Date: Mon, 26 May 2025 15:16:15 -0700
Subject: [PATCH 02/17] Add files via upload
---
WhackerLinkConsoleV2/ChannelBox.xaml.cs | 5 +
WhackerLinkConsoleV2/MainWindow.xaml | 7 +-
WhackerLinkConsoleV2/MainWindow.xaml.cs | 347 +++++++++++++++++-
WhackerLinkConsoleV2/SettingsManager.cs | 10 +
WhackerLinkConsoleV2/ToneSet.xaml | 30 ++
WhackerLinkConsoleV2/ToneSet.xaml.cs | 72 ++++
.../WhackerLinkConsoleV2.csproj | 4 +
.../WhackerLinkConsoleV2.csproj.user | 4 +
.../WidgetSelectionWindow.xaml | 1 +
.../WidgetSelectionWindow.xaml.cs | 3 +
10 files changed, 477 insertions(+), 6 deletions(-)
create mode 100644 WhackerLinkConsoleV2/ToneSet.xaml
create mode 100644 WhackerLinkConsoleV2/ToneSet.xaml.cs
create mode 100644 WhackerLinkConsoleV2/WhackerLinkConsoleV2.csproj.user
diff --git a/WhackerLinkConsoleV2/ChannelBox.xaml.cs b/WhackerLinkConsoleV2/ChannelBox.xaml.cs
index 18c9d2d..f6750c9 100644
--- a/WhackerLinkConsoleV2/ChannelBox.xaml.cs
+++ b/WhackerLinkConsoleV2/ChannelBox.xaml.cs
@@ -336,5 +336,10 @@ private void PttButton_MouseLeave(object sender, System.Windows.Input.MouseEvent
((Button)sender).Background = new SolidColorBrush((Color)ColorConverter.ConvertFromString("#FFDDDDDD"));
}
+
+ private void SetPageState(bool state)
+ {
+ PageState = state;
+ }
}
}
diff --git a/WhackerLinkConsoleV2/MainWindow.xaml b/WhackerLinkConsoleV2/MainWindow.xaml
index 3cc66f8..58b36fb 100644
--- a/WhackerLinkConsoleV2/MainWindow.xaml
+++ b/WhackerLinkConsoleV2/MainWindow.xaml
@@ -41,8 +41,11 @@
-
-
+
+
+
+
+
diff --git a/WhackerLinkConsoleV2/MainWindow.xaml.cs b/WhackerLinkConsoleV2/MainWindow.xaml.cs
index d9098ad..c8c75c0 100644
--- a/WhackerLinkConsoleV2/MainWindow.xaml.cs
+++ b/WhackerLinkConsoleV2/MainWindow.xaml.cs
@@ -49,6 +49,7 @@
using NWaves.Signals;
using static WhackerLinkConsoleV2.P25Crypto;
using static WhackerLinkLib.Models.Radio.Codeplug;
+using System.Threading.Channels;
namespace WhackerLinkConsoleV2
{
@@ -67,6 +68,9 @@ public partial class MainWindow : Window
private SettingsManager _settingsManager = new SettingsManager();
private SelectedChannelsManager _selectedChannelsManager;
+
+ private List<(double ToneA, double ToneB)> _selectedToneSets = new List<(double, double)>();
+
private FlashingBackgroundManager _flashingManager;
private WaveFilePlaybackManager _emergencyAlertPlayback;
private WebSocketManager _webSocketManager = new WebSocketManager();
@@ -124,6 +128,11 @@ public MainWindow()
Loaded += MainWindow_Loaded;
}
+ private class YamlConfig
+ {
+ public List Tones { get; set; }
+ }
+
private void OpenCodeplug_Click(object sender, RoutedEventArgs e)
{
OpenFileDialog openFileDialog = new OpenFileDialog
@@ -303,8 +312,7 @@ private void GenerateChannelWidgets()
systemStatusBox.ConnectionState = "Disconnected";
}
});
- } else
- {
+ } else {
_fneSystemManager.AddFneSystem(system.Name, system, this);
PeerSystem peer = _fneSystemManager.GetFneSystem(system.Name);
@@ -344,6 +352,7 @@ private void GenerateChannelWidgets()
}
}
+
if (_settingsManager.ShowChannels && Codeplug != null)
{
foreach (var zone in Codeplug.Zones)
@@ -415,6 +424,137 @@ private void GenerateChannelWidgets()
}
}
+ // Add ToneSet boxes if enabled
+ if (_settingsManager.ShowQCTones && Codeplug != null && Codeplug?.Tones != null)
+ {
+ foreach (var tone in Codeplug.Tones)
+ {
+ var toneSetControl = new ToneSet(tone.Name, tone.ToneA, tone.ToneB);
+
+ // Hook up events
+ toneSetControl.PlayClicked += async (s, e) =>
+ {
+ if (_selectedToneSets.Count > 0)
+ {
+ var selectedTones = _selectedToneSets.ToList();
+ var initiallyActiveChannels = _selectedChannelsManager
+ .GetSelectedChannels()
+ .Where(c => c.PageState)
+ .ToList();
+
+ for (int i = 0; i < selectedTones.Count; i++)
+ {
+ var selected = selectedTones[i];
+ var key = (selected.ToneA, selected.ToneB);
+
+ // Check if any of the original channels have lost their PageState
+ var prematurelyCleared = initiallyActiveChannels
+ .Where(c => !c.PageState)
+ .ToList();
+
+ if (prematurelyCleared.Any())
+ {
+ // Pause logic: restore PageState for affected channels
+ foreach (var ch in prematurelyCleared)
+ {
+ ch.PageState = true;
+ Dispatcher.Invoke(() =>
+ {
+ ch.PageSelectButton.Background = ch.orangeGradient;
+ });
+ }
+
+ // Wait a moment to visually reflect the reset before continuing
+ await Task.Delay(300);
+ }
+
+ // Play the tone
+ await PlayTone(selected.ToneA.ToString(), selected.ToneB.ToString());
+
+ // Remove from selected set
+ _selectedToneSets.Remove(key);
+
+ // Deselect the tone visually
+ foreach (var child in ChannelsCanvas.Children)
+ {
+ if (child is ToneSet ts && ts.ToneA == key.ToneA && ts.ToneB == key.ToneB)
+ {
+ ts.SetSelected(false);
+ break;
+ }
+ }
+ }
+
+ // Now that all tones are done, clean up page state
+ foreach (var ch in initiallyActiveChannels)
+ {
+ ch.PageState = false;
+ ch.PageSelectButton.Background = ch.grayGradient;
+ }
+ }
+ else
+ {
+ var hasActivePage = _selectedChannelsManager.GetSelectedChannels().Any(c => c.PageState);
+ if (hasActivePage)
+ {
+ await PlayTone(tone.ToneA.ToString(), tone.ToneB.ToString());
+
+ // Clear PageState after this tone
+ foreach (var channel in _selectedChannelsManager.GetSelectedChannels())
+ {
+ channel.PageState = false;
+ channel.PageSelectButton.Background = channel.grayGradient;
+ }
+ }
+ }
+ };
+
+
+ toneSetControl.SelectToggled += (s, e) =>
+ {
+ var key = (tone.ToneA, tone.ToneB);
+ if (_selectedToneSets.Contains(key))
+ {
+ _selectedToneSets.Remove(key);
+ toneSetControl.SetSelected(false);
+ }
+ else
+ {
+ _selectedToneSets.Add(key);
+ toneSetControl.SetSelected(true);
+ }
+ };
+
+ // Position like ToneSet Boxes using same layout logic
+ if (_settingsManager.QCToneSetPositions.TryGetValue(tone.Name, out var position))
+ {
+ Canvas.SetLeft(toneSetControl, position.X);
+ Canvas.SetTop(toneSetControl, position.Y);
+ }
+ else
+ {
+ Canvas.SetLeft(toneSetControl, offsetX);
+ Canvas.SetTop(toneSetControl, offsetY);
+ }
+
+ toneSetControl.MouseLeftButtonDown += ToneSet_MouseLeftButtonDown;
+ toneSetControl.MouseMove += ToneSet_MouseMove;
+ toneSetControl.MouseRightButtonDown += ToneSet_MouseRightButtonDown;
+
+ ChannelsCanvas.Children.Add(toneSetControl);
+
+ offsetX += 225;
+
+ if (offsetX + 220 > ChannelsCanvas.ActualWidth)
+ {
+ offsetX = 20;
+ offsetY += 106;
+ }
+ }
+ }
+
+
+
playbackChannelBox = new ChannelBox(_selectedChannelsManager, _audioManager, PLAYBACKCHNAME, PLAYBACKSYS, PLAYBACKTG);
if (_settingsManager.ChannelPositions.TryGetValue(PLAYBACKCHNAME, out var pos))
@@ -448,6 +588,95 @@ private void GenerateChannelWidgets()
AdjustCanvasHeight();
}
+ private const int GridSize = 5;
+
+ private void ToneSet_MouseLeftButtonDown(object sender, MouseButtonEventArgs e)
+ {
+ if (!isEditMode || !(sender is UIElement element)) return;
+
+ _draggedElement = element;
+ _startPoint = e.GetPosition(ChannelsCanvas);
+ _offsetX = _startPoint.X - Canvas.GetLeft(_draggedElement);
+ _offsetY = _startPoint.Y - Canvas.GetTop(_draggedElement);
+ _isDragging = true;
+
+ element.CaptureMouse();
+ }
+
+ private void ToneSet_MouseMove(object sender, MouseEventArgs e)
+ {
+ if (!isEditMode || !_isDragging || _draggedElement == null) return;
+
+ Point currentPosition = e.GetPosition(ChannelsCanvas);
+
+ // Calculate the new position with snapping to the grid
+ double newLeft = Math.Round((currentPosition.X - _offsetX) / GridSize) * GridSize;
+ double newTop = Math.Round((currentPosition.Y - _offsetY) / GridSize) * GridSize;
+
+ // Ensure the box stays within canvas bounds
+ newLeft = Math.Max(0, Math.Min(newLeft, ChannelsCanvas.ActualWidth - _draggedElement.RenderSize.Width));
+ newTop = Math.Max(0, Math.Min(newTop, ChannelsCanvas.ActualHeight - _draggedElement.RenderSize.Height));
+
+ // Apply snapped position
+ Canvas.SetLeft(_draggedElement, newLeft);
+ Canvas.SetTop(_draggedElement, newTop);
+
+ // Save the new position if it's a ToneSet
+ if (_draggedElement is ToneSet toneSet)
+ {
+ _settingsManager.UpdateQCToneSetPosition(toneSet.ToneName, newLeft, newTop);
+ }
+
+ AdjustCanvasHeight();
+ }
+
+ private void ToneSet_MouseRightButtonDown(object sender, MouseButtonEventArgs e)
+ {
+ if (!isEditMode || !_isDragging || _draggedElement == null) return;
+
+ _isDragging = false;
+ _draggedElement.ReleaseMouseCapture();
+ _draggedElement = null;
+ }
+
+
+ private async void ToneSet_PlayClicked(object sender, EventArgs e)
+ {
+ if (sender is ToneSet toneSet)
+ {
+ if (_selectedToneSets.Count > 0)
+ {
+ foreach (var selected in _selectedToneSets)
+ {
+ await PlayTone(selected.ToneA.ToString(), selected.ToneB.ToString());
+ }
+ }
+ else
+ {
+ await PlayTone(toneSet.ToneA.ToString(), toneSet.ToneB.ToString());
+ }
+ }
+ }
+
+ private void ToneSet_SelectClicked(object sender, EventArgs e)
+ {
+ if (sender is ToneSet toneSet)
+ {
+ var key = (toneSet.ToneA, toneSet.ToneB);
+
+ if (_selectedToneSets.Contains(key))
+ {
+ _selectedToneSets.Remove(key);
+ toneSet.SetSelected(false);
+ }
+ else
+ {
+ _selectedToneSets.Add(key);
+ toneSet.SetSelected(true);
+ }
+ }
+ }
+
private void WaveIn_RecordingStopped(object sender, EventArgs e)
{
/* stub */
@@ -934,6 +1163,7 @@ private void SelectWidgets_Click(object sender, RoutedEventArgs e)
_settingsManager.ShowSystemStatus = widgetSelectionWindow.ShowSystemStatus;
_settingsManager.ShowChannels = widgetSelectionWindow.ShowChannels;
_settingsManager.ShowAlertTones = widgetSelectionWindow.ShowAlertTones;
+ _settingsManager.ShowQCTones = widgetSelectionWindow.ShowQCTones;
GenerateChannelWidgets();
_settingsManager.SaveSettings();
@@ -1301,8 +1531,6 @@ private void ChannelBox_MouseLeftButtonDown(object sender, MouseButtonEventArgs
element.CaptureMouse();
}
- private const int GridSize = 5;
-
private void ChannelBox_MouseMove(object sender, MouseEventArgs e)
{
if (!isEditMode || !_isDragging || _draggedElement == null) return;
@@ -1455,6 +1683,7 @@ private void MainWindow_Loaded(object sender, RoutedEventArgs e)
if (!string.IsNullOrEmpty(_settingsManager.LastCodeplugPath) && File.Exists(_settingsManager.LastCodeplugPath))
{
LoadCodeplug(_settingsManager.LastCodeplugPath);
+ //LoadToneSets();
}
else
{
@@ -1462,6 +1691,116 @@ private void MainWindow_Loaded(object sender, RoutedEventArgs e)
}
}
+ private async Task PlayTone(string ToneA, string ToneB)
+ {
+ var selectedChannels = _selectedChannelsManager.GetSelectedChannels();
+
+ // Check if any selected channel has PageState = true
+ if (!selectedChannels.Any(ch => ch.PageState))
+ {
+ // No channels with active page state - do nothing
+ return;
+ }
+
+ foreach (ChannelBox channel in selectedChannels)
+ {
+ if (!channel.PageState)
+ continue; // skip channels without page state
+
+ Codeplug.System system = Codeplug.GetSystemForChannel(channel.ChannelName);
+ Codeplug.Channel cpgChannel = Codeplug.GetChannelByName(channel.ChannelName);
+
+ ToneGenerator generator = new ToneGenerator();
+
+ double toneADuration = 1.0;
+ double toneBDuration = 3.0;
+
+ byte[] toneA = generator.GenerateTone(double.Parse(ToneA), toneADuration);
+ byte[] toneB = generator.GenerateTone(double.Parse(ToneB), toneBDuration);
+
+ byte[] combinedAudio = new byte[toneA.Length + toneB.Length];
+ Buffer.BlockCopy(toneA, 0, combinedAudio, 0, toneA.Length);
+ Buffer.BlockCopy(toneB, 0, combinedAudio, toneA.Length, toneB.Length);
+
+ int chunkSize = system.IsDvm ? 320 : 1600;
+ int totalChunks = (combinedAudio.Length + chunkSize - 1) / chunkSize;
+
+ _audioManager.AddTalkgroupStream(cpgChannel.Tgid, combinedAudio);
+
+ await Task.Run(() =>
+ {
+ for (int i = 0; i < totalChunks; i++)
+ {
+ int offset = i * chunkSize;
+ int size = Math.Min(chunkSize, combinedAudio.Length - offset);
+
+ byte[] chunk = new byte[chunkSize];
+ Buffer.BlockCopy(combinedAudio, offset, chunk, 0, size);
+
+ if (!system.IsDvm)
+ {
+ IPeer handler = _webSocketManager.GetWebSocketHandler(system.Name);
+
+ AudioPacket voicePacket = new AudioPacket
+ {
+ Data = chunk,
+ VoiceChannel = new VoiceChannel
+ {
+ Frequency = channel.VoiceChannel,
+ DstId = cpgChannel.Tgid,
+ SrcId = system.Rid,
+ Site = system.Site
+ },
+ Site = system.Site,
+ LopServerVocode = true
+ };
+
+ handler.SendMessage(voicePacket.GetData());
+ }
+ else
+ {
+ PeerSystem handler = _fneSystemManager.GetFneSystem(system.Name);
+
+ if (chunk.Length == 320)
+ {
+ P25EncodeAudioFrame(chunk, handler, channel, cpgChannel, system);
+ }
+ }
+ }
+ });
+
+ double totalDurationMs = (toneADuration + toneBDuration) * 1000 + 750;
+ await Task.Delay((int)totalDurationMs);
+
+ if (!system.IsDvm)
+ {
+ IPeer handler = _webSocketManager.GetWebSocketHandler(system.Name);
+
+ GRP_VCH_RLS release = new GRP_VCH_RLS
+ {
+ SrcId = system.Rid,
+ DstId = cpgChannel.Tgid,
+ Channel = channel.VoiceChannel,
+ Site = system.Site
+ };
+
+ handler.SendMessage(release.GetData());
+ }
+ else
+ {
+ PeerSystem handler = _fneSystemManager.GetFneSystem(system.Name);
+
+ await Task.Delay(4000);
+ handler.SendP25TDU(uint.Parse(system.Rid), uint.Parse(cpgChannel.Tgid), false);
+ }
+
+ Dispatcher.Invoke(() =>
+ {
+ channel.PageSelectButton.Background = channel.grayGradient;
+ });
+ }
+ }
+
private async void OnHoldTimerElapsed(object sender, ElapsedEventArgs e)
{
foreach (ChannelBox channel in _selectedChannelsManager.GetSelectedChannels())
diff --git a/WhackerLinkConsoleV2/SettingsManager.cs b/WhackerLinkConsoleV2/SettingsManager.cs
index 96690b9..5e3f682 100644
--- a/WhackerLinkConsoleV2/SettingsManager.cs
+++ b/WhackerLinkConsoleV2/SettingsManager.cs
@@ -30,6 +30,7 @@ public class SettingsManager
public bool ShowSystemStatus { get; set; } = true;
public bool ShowChannels { get; set; } = true;
public bool ShowAlertTones { get; set; } = true;
+ public bool ShowQCTones { get; set; } = true;
public string LastCodeplugPath { get; set; } = null;
@@ -37,6 +38,7 @@ public class SettingsManager
public Dictionary SystemStatusPositions { get; set; } = new Dictionary();
public List AlertToneFilePaths { get; set; } = new List();
public Dictionary AlertTonePositions { get; set; } = new Dictionary();
+ public Dictionary QCToneSetPositions { get; set; } = new Dictionary();
public Dictionary ChannelOutputDevices { get; set; } = new Dictionary();
public void LoadSettings()
@@ -53,11 +55,13 @@ public void LoadSettings()
ShowSystemStatus = loadedSettings.ShowSystemStatus;
ShowChannels = loadedSettings.ShowChannels;
ShowAlertTones = loadedSettings.ShowAlertTones;
+ ShowQCTones = loadedSettings.ShowQCTones;
LastCodeplugPath = loadedSettings.LastCodeplugPath;
ChannelPositions = loadedSettings.ChannelPositions ?? new Dictionary();
SystemStatusPositions = loadedSettings.SystemStatusPositions ?? new Dictionary();
AlertToneFilePaths = loadedSettings.AlertToneFilePaths ?? new List();
AlertTonePositions = loadedSettings.AlertTonePositions ?? new Dictionary();
+ QCToneSetPositions = loadedSettings.QCToneSetPositions ?? new Dictionary();
ChannelOutputDevices = loadedSettings.ChannelOutputDevices ?? new Dictionary();
}
}
@@ -88,6 +92,12 @@ public void UpdateChannelPosition(string channelName, double x, double y)
SaveSettings();
}
+ public void UpdateQCToneSetPosition(string name, double x, double y)
+ {
+ QCToneSetPositions[name] = new ChannelPosition { X = x, Y = y };
+ SaveSettings();
+ }
+
public void UpdateSystemStatusPosition(string systemName, double x, double y)
{
SystemStatusPositions[systemName] = new ChannelPosition { X = x, Y = y };
diff --git a/WhackerLinkConsoleV2/ToneSet.xaml b/WhackerLinkConsoleV2/ToneSet.xaml
new file mode 100644
index 0000000..b3cc0bc
--- /dev/null
+++ b/WhackerLinkConsoleV2/ToneSet.xaml
@@ -0,0 +1,30 @@
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/WhackerLinkConsoleV2/ToneSet.xaml.cs b/WhackerLinkConsoleV2/ToneSet.xaml.cs
new file mode 100644
index 0000000..66e2c14
--- /dev/null
+++ b/WhackerLinkConsoleV2/ToneSet.xaml.cs
@@ -0,0 +1,72 @@
+using System;
+using System.ComponentModel;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Input;
+using System.Windows.Media;
+
+namespace WhackerLinkConsoleV2.Controls
+{
+ public partial class ToneSet : UserControl, INotifyPropertyChanged
+ {
+ public event PropertyChangedEventHandler PropertyChanged;
+
+ public string ToneName { get; set; }
+ public double ToneA { get; set; }
+ public double ToneB { get; set; }
+
+ public bool IsEditMode { get; set; }
+
+ public event EventHandler PlayClicked;
+ public event EventHandler SelectToggled;
+
+ private bool _isSelected = false;
+
+ public ToneSet(string toneName, double toneA, double toneB)
+ {
+ InitializeComponent();
+ ToneName = toneName;
+ ToneA = toneA;
+ ToneB = toneB;
+
+ MouseLeftButtonDown += ToneSet_MouseLeftButtonDown;
+
+ DataContext = this;
+ }
+
+ private void ToneSet_MouseLeftButtonDown(object sender, MouseButtonEventArgs e)
+ {
+ if (IsEditMode) return;
+ }
+
+
+ private void ToneSetPlayBtn_Click(object sender, RoutedEventArgs e)
+ {
+ PlayClicked?.Invoke(this, EventArgs.Empty);
+ }
+
+ private void ToneSetSelectBtn_Click(object sender, RoutedEventArgs e)
+ {
+ SelectToggled?.Invoke(this, EventArgs.Empty);
+ }
+
+ public void SetSelected(bool selected)
+ {
+ _isSelected = selected;
+ UpdateSelectButton();
+ if (selected)
+ this.Background = System.Windows.Media.Brushes.LightBlue;
+ else
+ this.Background = System.Windows.Media.Brushes.Transparent;
+ }
+
+ private void UpdateSelectButton()
+ {
+ //if (ToneSetSelectBtn != null)
+ {
+ //ToneSetSelectBtn.Content = _isSelected ? "Deselect" : "Select";
+ //ToneSetSelectBtn.Background = _isSelected ? Brushes.LightGreen : Brushes.LightGray;
+ }
+ }
+ }
+}
diff --git a/WhackerLinkConsoleV2/WhackerLinkConsoleV2.csproj b/WhackerLinkConsoleV2/WhackerLinkConsoleV2.csproj
index 5441dd9..77f5a9e 100644
--- a/WhackerLinkConsoleV2/WhackerLinkConsoleV2.csproj
+++ b/WhackerLinkConsoleV2/WhackerLinkConsoleV2.csproj
@@ -13,6 +13,8 @@
+
+
@@ -71,6 +73,8 @@
+
+
diff --git a/WhackerLinkConsoleV2/WhackerLinkConsoleV2.csproj.user b/WhackerLinkConsoleV2/WhackerLinkConsoleV2.csproj.user
new file mode 100644
index 0000000..0f14913
--- /dev/null
+++ b/WhackerLinkConsoleV2/WhackerLinkConsoleV2.csproj.user
@@ -0,0 +1,4 @@
+
+
+
+
\ No newline at end of file
diff --git a/WhackerLinkConsoleV2/WidgetSelectionWindow.xaml b/WhackerLinkConsoleV2/WidgetSelectionWindow.xaml
index d2cd7e3..183fa9a 100644
--- a/WhackerLinkConsoleV2/WidgetSelectionWindow.xaml
+++ b/WhackerLinkConsoleV2/WidgetSelectionWindow.xaml
@@ -7,6 +7,7 @@
+
diff --git a/WhackerLinkConsoleV2/WidgetSelectionWindow.xaml.cs b/WhackerLinkConsoleV2/WidgetSelectionWindow.xaml.cs
index d837eb0..9826dda 100644
--- a/WhackerLinkConsoleV2/WidgetSelectionWindow.xaml.cs
+++ b/WhackerLinkConsoleV2/WidgetSelectionWindow.xaml.cs
@@ -27,6 +27,7 @@ public partial class WidgetSelectionWindow : Window
public bool ShowSystemStatus { get; private set; } = true;
public bool ShowChannels { get; private set; } = true;
public bool ShowAlertTones { get; private set; } = true;
+ public bool ShowQCTones { get; private set; } = true;
public WidgetSelectionWindow()
{
@@ -38,6 +39,8 @@ private void ApplyButton_Click(object sender, RoutedEventArgs e)
ShowSystemStatus = SystemStatusCheckBox.IsChecked ?? false;
ShowChannels = ChannelCheckBox.IsChecked ?? false;
ShowAlertTones = AlertToneCheckBox.IsChecked ?? false;
+ ShowQCTones = QCTonesCheckBox.IsChecked ?? false;
+
DialogResult = true;
Close();
}
From 85b94b3f6eb8dfe47acb6c83df475eb6bac01f06 Mon Sep 17 00:00:00 2001
From: Devin G <149845346+DeathSoulYTDev@users.noreply.github.com>
Date: Mon, 26 May 2025 18:18:41 -0400
Subject: [PATCH 03/17] Update codeplug.yml
---
WhackerLinkConsoleV2/codeplugs/codeplug.yml | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
diff --git a/WhackerLinkConsoleV2/codeplugs/codeplug.yml b/WhackerLinkConsoleV2/codeplugs/codeplug.yml
index ca0f856..0e1bc56 100644
--- a/WhackerLinkConsoleV2/codeplugs/codeplug.yml
+++ b/WhackerLinkConsoleV2/codeplugs/codeplug.yml
@@ -44,6 +44,13 @@ systems:
systemID: 1
siteID: 1
range: 1.5
+tones:
+ - name: "Station 1"
+ toneA: 855.5
+ toneB: 349
+ - name: "Station 2"
+ toneA: 1006.9
+ toneB: 500.9
zones:
- name: "Zone 1"
@@ -71,4 +78,4 @@ zones:
tgid: "16002"
- name: "Channel C"
system: "System 1"
- tgid: "16002"
\ No newline at end of file
+ tgid: "16002"
From 6c59a03e8bc0de7cef740bf0b9c0603adee2976b Mon Sep 17 00:00:00 2001
From: Devin G <149845346+DeathSoulYTDev@users.noreply.github.com>
Date: Mon, 26 May 2025 15:19:37 -0700
Subject: [PATCH 04/17] Add files via upload
---
WhackerLinkConsoleV2/Assets/dualpage.png | Bin 0 -> 16647 bytes
WhackerLinkConsoleV2/Assets/pager.png | Bin 0 -> 6391 bytes
2 files changed, 0 insertions(+), 0 deletions(-)
create mode 100644 WhackerLinkConsoleV2/Assets/dualpage.png
create mode 100644 WhackerLinkConsoleV2/Assets/pager.png
diff --git a/WhackerLinkConsoleV2/Assets/dualpage.png b/WhackerLinkConsoleV2/Assets/dualpage.png
new file mode 100644
index 0000000000000000000000000000000000000000..7ab2bf55fd72a44174ce3fd4f9463477b09d8638
GIT binary patch
literal 16647
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
literal 0
HcmV?d00001
From aef12a6e339023ff56777bf4aa15c50ef30b3c58 Mon Sep 17 00:00:00 2001
From: Devin G <149845346+DeathSoulYTDev@users.noreply.github.com>
Date: Wed, 6 Aug 2025 17:49:42 -0400
Subject: [PATCH 05/17] Added Multi Tone Paging - QC 2
---
WhackerLinkConsoleV2/ChannelBox.xaml.cs | 1 +
WhackerLinkConsoleV2/MainWindow.xaml.cs | 42 ++++++++++-----------
WhackerLinkConsoleV2/ToneSet.xaml | 24 +++++++++---
WhackerLinkConsoleV2/ToneSet.xaml.cs | 33 +++++++++++++++-
WhackerLinkConsoleV2/codeplugs/codeplug.yml | 2 +-
5 files changed, 71 insertions(+), 31 deletions(-)
diff --git a/WhackerLinkConsoleV2/ChannelBox.xaml.cs b/WhackerLinkConsoleV2/ChannelBox.xaml.cs
index f6750c9..b60f7cf 100644
--- a/WhackerLinkConsoleV2/ChannelBox.xaml.cs
+++ b/WhackerLinkConsoleV2/ChannelBox.xaml.cs
@@ -300,6 +300,7 @@ private async void PTTButton_Click(object sender, RoutedEventArgs e)
private void PageSelectButton_Click(object sender, RoutedEventArgs e)
{
if (!IsSelected) return;
+
PageState = !PageState;
PageButtonClicked.Invoke(sender, this);
diff --git a/WhackerLinkConsoleV2/MainWindow.xaml.cs b/WhackerLinkConsoleV2/MainWindow.xaml.cs
index c8c75c0..17b969e 100644
--- a/WhackerLinkConsoleV2/MainWindow.xaml.cs
+++ b/WhackerLinkConsoleV2/MainWindow.xaml.cs
@@ -429,6 +429,7 @@ private void GenerateChannelWidgets()
{
foreach (var tone in Codeplug.Tones)
{
+
var toneSetControl = new ToneSet(tone.Name, tone.ToneA, tone.ToneB);
// Hook up events
@@ -447,34 +448,28 @@ private void GenerateChannelWidgets()
var selected = selectedTones[i];
var key = (selected.ToneA, selected.ToneB);
- // Check if any of the original channels have lost their PageState
- var prematurelyCleared = initiallyActiveChannels
- .Where(c => !c.PageState)
- .ToList();
-
- if (prematurelyCleared.Any())
+ // ✅ Restore PageState for each tone before playback
+ foreach (var ch in initiallyActiveChannels)
{
- // Pause logic: restore PageState for affected channels
- foreach (var ch in prematurelyCleared)
+ ch.PageState = true;
+ Dispatcher.Invoke(() =>
{
- ch.PageState = true;
- Dispatcher.Invoke(() =>
- {
- ch.PageSelectButton.Background = ch.orangeGradient;
- });
- }
+ ch.PageSelectButton.Background = ch.orangeGradient;
+ });
- // Wait a moment to visually reflect the reset before continuing
- await Task.Delay(300);
+ // This ensures PageState on the *server* is activated
+ ChannelBox_PageButtonClicked(ch, ch);
}
- // Play the tone
+ await Task.Delay(2000); // Optional visual buffer
+
+ // ▶️ Play the tone
await PlayTone(selected.ToneA.ToString(), selected.ToneB.ToString());
- // Remove from selected set
+ // ❌ Remove from selected set
_selectedToneSets.Remove(key);
- // Deselect the tone visually
+ // 🔄 Deselect tone visually
foreach (var child in ChannelsCanvas.Children)
{
if (child is ToneSet ts && ts.ToneA == key.ToneA && ts.ToneB == key.ToneB)
@@ -485,21 +480,24 @@ private void GenerateChannelWidgets()
}
}
- // Now that all tones are done, clean up page state
+ // 🧹 Final cleanup: clear PageState on all initially active channels
foreach (var ch in initiallyActiveChannels)
{
ch.PageState = false;
- ch.PageSelectButton.Background = ch.grayGradient;
+ Dispatcher.Invoke(() =>
+ {
+ ch.PageSelectButton.Background = ch.grayGradient;
+ });
}
}
else
{
+ // 🔁 Single tone fallback
var hasActivePage = _selectedChannelsManager.GetSelectedChannels().Any(c => c.PageState);
if (hasActivePage)
{
await PlayTone(tone.ToneA.ToString(), tone.ToneB.ToString());
- // Clear PageState after this tone
foreach (var channel in _selectedChannelsManager.GetSelectedChannels())
{
channel.PageState = false;
diff --git a/WhackerLinkConsoleV2/ToneSet.xaml b/WhackerLinkConsoleV2/ToneSet.xaml
index b3cc0bc..c70c39f 100644
--- a/WhackerLinkConsoleV2/ToneSet.xaml
+++ b/WhackerLinkConsoleV2/ToneSet.xaml
@@ -5,24 +5,36 @@
-
-
diff --git a/WhackerLinkConsoleV2/ToneSet.xaml.cs b/WhackerLinkConsoleV2/ToneSet.xaml.cs
index 66e2c14..642a602 100644
--- a/WhackerLinkConsoleV2/ToneSet.xaml.cs
+++ b/WhackerLinkConsoleV2/ToneSet.xaml.cs
@@ -11,6 +11,9 @@ public partial class ToneSet : UserControl, INotifyPropertyChanged
{
public event PropertyChangedEventHandler PropertyChanged;
+ internal LinearGradientBrush grayGradient;
+ internal LinearGradientBrush orangeGradient;
+
public string ToneName { get; set; }
public double ToneA { get; set; }
public double ToneB { get; set; }
@@ -25,6 +28,27 @@ public partial class ToneSet : UserControl, INotifyPropertyChanged
public ToneSet(string toneName, double toneA, double toneB)
{
InitializeComponent();
+ UpdateBackground();
+
+ grayGradient = new LinearGradientBrush
+ {
+ StartPoint = new Point(0.5, 0),
+ EndPoint = new Point(0.5, 1)
+ };
+
+ grayGradient.GradientStops.Add(new GradientStop((Color)ColorConverter.ConvertFromString("#FFF0F0F0"), 0.485));
+ grayGradient.GradientStops.Add(new GradientStop((Color)ColorConverter.ConvertFromString("#FFDCDCDC"), 0.517));
+
+ orangeGradient = new LinearGradientBrush
+ {
+ StartPoint = new Point(0.5, 0),
+ EndPoint = new Point(0.5, 1)
+ };
+
+ orangeGradient.GradientStops.Add(new GradientStop((Color)ColorConverter.ConvertFromString("#FFFFAF00"), 0.485));
+ orangeGradient.GradientStops.Add(new GradientStop((Color)ColorConverter.ConvertFromString("#FFEEA400"), 0.517));
+ ToneSetSelectBtn.Background = grayGradient;
+
ToneName = toneName;
ToneA = toneA;
ToneB = toneB;
@@ -62,11 +86,16 @@ public void SetSelected(bool selected)
private void UpdateSelectButton()
{
- //if (ToneSetSelectBtn != null)
+ if (ToneSetSelectBtn != null)
{
//ToneSetSelectBtn.Content = _isSelected ? "Deselect" : "Select";
- //ToneSetSelectBtn.Background = _isSelected ? Brushes.LightGreen : Brushes.LightGray;
+ ToneSetSelectBtn.Background = _isSelected ? orangeGradient : grayGradient;
}
}
+
+ private void UpdateBackground()
+ {
+ Background = _isSelected ? (Brush)new BrushConverter().ConvertFrom("#FF0B004B") : Brushes.DarkGray;
+ }
}
}
diff --git a/WhackerLinkConsoleV2/codeplugs/codeplug.yml b/WhackerLinkConsoleV2/codeplugs/codeplug.yml
index 0e1bc56..7ccfa5a 100644
--- a/WhackerLinkConsoleV2/codeplugs/codeplug.yml
+++ b/WhackerLinkConsoleV2/codeplugs/codeplug.yml
@@ -78,4 +78,4 @@ zones:
tgid: "16002"
- name: "Channel C"
system: "System 1"
- tgid: "16002"
+ tgid: "16002"
\ No newline at end of file
From 4d73207a0a5b3dbc40b3c330cc39230f962e90b2 Mon Sep 17 00:00:00 2001
From: Devin G <149845346+DeathSoulYTDev@users.noreply.github.com>
Date: Wed, 6 Aug 2025 18:47:47 -0400
Subject: [PATCH 06/17] Tones Delay
- Removed Delay for First Tone When Using Stacked Tones
- Lowered the Delay from 2000ms to 1750ms
---
WhackerLinkConsoleV2/MainWindow.xaml.cs | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/WhackerLinkConsoleV2/MainWindow.xaml.cs b/WhackerLinkConsoleV2/MainWindow.xaml.cs
index 17b969e..c3b05d6 100644
--- a/WhackerLinkConsoleV2/MainWindow.xaml.cs
+++ b/WhackerLinkConsoleV2/MainWindow.xaml.cs
@@ -461,7 +461,11 @@ private void GenerateChannelWidgets()
ChannelBox_PageButtonClicked(ch, ch);
}
- await Task.Delay(2000); // Optional visual buffer
+ if (i > 0)
+ {
+ await Task.Delay(1750); // delay only after the first tone
+ }
+
// ▶️ Play the tone
await PlayTone(selected.ToneA.ToString(), selected.ToneB.ToString());
From d44cfc3ee4150d373974fb2b9c0e37e0af1d2c8c Mon Sep 17 00:00:00 2001
From: Devin G <149845346+DeathSoulYTDev@users.noreply.github.com>
Date: Sun, 17 Aug 2025 18:48:25 -0400
Subject: [PATCH 07/17] Zone Tabs
- Loaded Zones and there channels into there own tabs
- Added a Zones Filter to QC2 Tones to allow setting Tones Per Zone/Agency
---
WhackerLinkConsoleV2/App.xaml.cs | 15 +
WhackerLinkConsoleV2/MainWindow.xaml | 286 +++----
WhackerLinkConsoleV2/MainWindow.xaml.cs | 974 ++++++++++++++++--------
WhackerLinkConsoleV2/SettingsManager.cs | 9 +
4 files changed, 779 insertions(+), 505 deletions(-)
diff --git a/WhackerLinkConsoleV2/App.xaml.cs b/WhackerLinkConsoleV2/App.xaml.cs
index 6f584cf..af25b44 100644
--- a/WhackerLinkConsoleV2/App.xaml.cs
+++ b/WhackerLinkConsoleV2/App.xaml.cs
@@ -1,6 +1,7 @@
using System.Configuration;
using System.Data;
using System.Windows;
+using WhackerLinkLib.Models.Radio;
namespace WhackerLinkConsoleV2
{
@@ -9,6 +10,20 @@ namespace WhackerLinkConsoleV2
///
public partial class App : Application
{
+ public Codeplug Codeplug { get; set; }
+
+ [System.Runtime.InteropServices.DllImport("kernel32.dll")]
+ private static extern bool AllocConsole();
+
+ public App()
+ {
+ //AllocConsole();
+ //Console.WriteLine($"Debug: {Codeplug}");
+ //if (Codeplug.Systems[0].debug)
+ //{
+ // Console.WriteLine("Hello, world!");
+ //}
+ }
}
}
diff --git a/WhackerLinkConsoleV2/MainWindow.xaml b/WhackerLinkConsoleV2/MainWindow.xaml
index 58b36fb..37d5449 100644
--- a/WhackerLinkConsoleV2/MainWindow.xaml
+++ b/WhackerLinkConsoleV2/MainWindow.xaml
@@ -1,19 +1,22 @@
+
+
+
-
+
+
@@ -23,12 +26,14 @@
+
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -73,151 +105,63 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/WhackerLinkConsoleV2/MainWindow.xaml.cs b/WhackerLinkConsoleV2/MainWindow.xaml.cs
index c3b05d6..a3d28e5 100644
--- a/WhackerLinkConsoleV2/MainWindow.xaml.cs
+++ b/WhackerLinkConsoleV2/MainWindow.xaml.cs
@@ -48,7 +48,7 @@
using WebSocketSharp;
using NWaves.Signals;
using static WhackerLinkConsoleV2.P25Crypto;
-using static WhackerLinkLib.Models.Radio.Codeplug;
+//using static WhackerLinkLib.Models.Radio.Codeplug;
using System.Threading.Channels;
namespace WhackerLinkConsoleV2
@@ -66,7 +66,9 @@ public partial class MainWindow : Window
private double _offsetY;
private bool _isDragging;
+ public List AllowedZones { get; set; }
private SettingsManager _settingsManager = new SettingsManager();
+ private Dictionary _zoneCanvases = new Dictionary();
private SelectedChannelsManager _selectedChannelsManager;
private List<(double ToneA, double ToneB)> _selectedToneSets = new List<(double, double)>();
@@ -97,13 +99,23 @@ public partial class MainWindow : Window
List> fneAffs = new List>();
+ [System.Runtime.InteropServices.DllImport("kernel32.dll")]
+ private static extern bool AllocConsole();
+
public MainWindow()
{
#if !DEBUG
ConsoleNative.ShowConsole();
#endif
InitializeComponent();
+
_settingsManager.LoadSettings();
+
+ if (_settingsManager.DebugMode)
+ {
+ ShowDebugConsole();
+ }
+
_selectedChannelsManager = new SelectedChannelsManager();
_flashingManager = new FlashingBackgroundManager(null, ChannelsCanvas, null, this);
_emergencyAlertPlayback = new WaveFilePlaybackManager(System.IO.Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "emergency.wav"));
@@ -131,6 +143,22 @@ public MainWindow()
private class YamlConfig
{
public List Tones { get; set; }
+ public List Zones { get; set; }
+ }
+
+ public void ShowDebugConsole()
+ {
+ AllocConsole();
+ Console.WriteLine($"Debug Console: Active");
+ if (_settingsManager.DebugMode)
+ {
+ Console.WriteLine($"DebugMode: Enabled");
+ }
+ }
+
+ private void OpenDebugConsole_Click(object sender, RoutedEventArgs e)
+ {
+ ShowDebugConsole();
}
private void OpenCodeplug_Click(object sender, RoutedEventArgs e)
@@ -175,420 +203,638 @@ private void LoadCodeplug(string filePath)
}
}
+ //private void GenerateChannelWidgets()
+ //{
+ // // Clear previous UI
+ // ChannelsTabControl.Items.Clear();
+ // ChannelsCanvas.Children.Clear();
+
+ // double globalOffsetX = 20;
+ // double globalOffsetY = 20;
+
+ // if (Codeplug != null)
+ // {
+ // // 1. Add System Status Boxes (global)
+ // foreach (var system in Codeplug.Systems)
+ // {
+ // AddSystemBox(system, ref globalOffsetX, ref globalOffsetY);
+ // }
+
+ // // 2. Add Zone Tabs (each tab gets its own ScrollViewer + Canvas)
+ // foreach (var zone in Codeplug.Zones)
+ // {
+ // var tabItem = new TabItem { Header = zone.Name };
+
+ // var scrollViewer = new ScrollViewer
+ // {
+ // VerticalScrollBarVisibility = ScrollBarVisibility.Auto,
+ // HorizontalScrollBarVisibility = ScrollBarVisibility.Auto
+ // };
+
+ // var zoneCanvas = new Canvas { Background = Brushes.Transparent };
+
+ // scrollViewer.Content = zoneCanvas;
+ // tabItem.Content = scrollViewer;
+ // ChannelsTabControl.Items.Add(tabItem);
+
+ // double offsetX = 20;
+ // double offsetY = 20;
+
+ // foreach (var channel in zone.Channels)
+ // {
+ // // Add the channel box without capturing a return value
+ // AddChannelBox(channel, zoneCanvas, ref offsetX, ref offsetY);
+
+ // // Dynamically expand canvas as needed
+ // double requiredWidth = offsetX + 40;
+ // double requiredHeight = offsetY + 40;
+ // if (zoneCanvas.Width < requiredWidth)
+ // zoneCanvas.Width = requiredWidth;
+ // if (zoneCanvas.Height < requiredHeight)
+ // zoneCanvas.Height = requiredHeight;
+ // }
+ // }
+
+
+
+
+ // // 3. Add Playback Channel (global)
+ // AddPlaybackChannel(globalOffsetX, globalOffsetY);
+
+ // // 4. Add Alert Tones (global)
+ // AddAlertTones(globalOffsetX, globalOffsetY);
+
+ // // 5. Add QC ToneSets (global)
+ // AddToneSets(globalOffsetX, globalOffsetY);
+ // }
+
+ // AdjustCanvasHeight();
+ //}
+
private void GenerateChannelWidgets()
{
- ChannelsCanvas.Children.Clear();
- double offsetX = 20;
- double offsetY = 20;
+ // Clear previous UI
+ ChannelsTabControl.Items.Clear();
+
+ double globalOffsetX = 20;
+ double globalOffsetY = 20;
if (Codeplug != null)
{
+ // 1. Add System Status Boxes (global)
foreach (var system in Codeplug.Systems)
{
- var systemStatusBox = new SystemStatusBox(system.Name, system.Address, system.Port);
+ AddSystemBox(system, ref globalOffsetX, ref globalOffsetY);
+ }
- if (_settingsManager.SystemStatusPositions.TryGetValue(system.Name, out var position))
+ // 2. Add Zone Tabs
+ foreach (var zone in Codeplug.Zones)
+ {
+ var tabItem = new TabItem { Header = zone.Name };
+
+ var scrollViewer = new ScrollViewer
{
- Canvas.SetLeft(systemStatusBox, position.X);
- Canvas.SetTop(systemStatusBox, position.Y);
- }
- else
+ VerticalScrollBarVisibility = ScrollBarVisibility.Auto,
+ HorizontalScrollBarVisibility = ScrollBarVisibility.Auto
+ };
+
+ var zoneCanvas = new Canvas
{
- Canvas.SetLeft(systemStatusBox, offsetX);
- Canvas.SetTop(systemStatusBox, offsetY);
- }
+ Background = Brushes.Transparent,
+ Width = 1000,
+ Height = 800
+ };
- systemStatusBox.MouseLeftButtonDown += SystemStatusBox_MouseLeftButtonDown;
- systemStatusBox.MouseMove += SystemStatusBox_MouseMove;
- systemStatusBox.MouseRightButtonDown += SystemStatusBox_MouseRightButtonDown;
+ scrollViewer.Content = zoneCanvas;
+ tabItem.Content = scrollViewer;
+ ChannelsTabControl.Items.Add(tabItem);
- ChannelsCanvas.Children.Add(systemStatusBox);
+ double offsetX = 20;
+ double offsetY = 20;
- offsetX += 225;
- if (offsetX + 220 > ChannelsCanvas.ActualWidth)
+ // Add channels first
+ foreach (var channel in zone.Channels)
{
- offsetX = 20;
- offsetY += 106;
+ AddChannelBox(channel, zoneCanvas, ref offsetX, ref offsetY);
}
- if (File.Exists(system.AliasPath))
- system.RidAlias = AliasTools.LoadAliases(system.AliasPath);
+ // Then add tones once for the zone
+ AddToneSets(zoneCanvas, offsetX, offsetY, zone.Name);
- if (!system.IsDvm)
- {
- _webSocketManager.AddWebSocketHandler(system.Name);
+ ChannelsCanvas = zoneCanvas;
- IPeer handler = _webSocketManager.GetWebSocketHandler(system.Name);
- handler.OnVoiceChannelResponse += HandleVoiceResponse;
- handler.OnVoiceChannelRelease += HandleVoiceRelease;
- handler.OnEmergencyAlarmResponse += HandleEmergencyAlarmResponse;
- handler.OnAudioData += HandleReceivedAudio;
- handler.OnAffiliationUpdate += HandleAffiliationUpdate;
- handler.OnCallAlert += HandleCallAlert;
-
- handler.OnUnitRegistrationResponse += (response) =>
+ scrollViewer.Loaded += (s, e) =>
+ {
+ var sv = s as ScrollViewer;
+ if (sv?.Content is Canvas c)
{
- Dispatcher.Invoke(() =>
- {
- if (response.Status == (int)ResponseType.GRANT)
- {
- systemStatusBox.Background = (Brush)new BrushConverter().ConvertFrom("#FF00BC48");
- systemStatusBox.ConnectionState = "Connected";
-
- foreach (ChannelBox channel in _selectedChannelsManager.GetSelectedChannels())
- {
- if (channel.SystemName == PLAYBACKSYS || channel.ChannelName == PLAYBACKCHNAME || channel.DstId == PLAYBACKTG)
- continue;
+ if (sv.ViewportWidth > c.Width) c.Width = sv.ViewportWidth;
+ if (sv.ViewportHeight > c.Height) c.Height = sv.ViewportHeight;
+ }
+ };
+ }
+ }
+ }
- Codeplug.System system = Codeplug.GetSystemForChannel(channel.ChannelName);
- Codeplug.Channel cpgChannel = Codeplug.GetChannelByName(channel.ChannelName);
+ // ---------------------- Helper Methods ----------------------
- if (!system.IsDvm)
- {
- IPeer handler = _webSocketManager.GetWebSocketHandler(system.Name);
+ private void AddSystemBox(Codeplug.System system, ref double offsetX, ref double offsetY)
+ {
+ var systemStatusBox = new SystemStatusBox(system.Name, system.Address, system.Port);
- if (channel.IsSelected && handler.IsConnected)
- {
- Console.WriteLine("sending WLINK master aff");
-
- Task.Run(() =>
- {
- GRP_AFF_REQ release = new GRP_AFF_REQ
- {
- SrcId = system.Rid,
- DstId = cpgChannel.Tgid,
- Site = system.Site
- };
-
- handler.SendMessage(release.GetData());
- });
- }
- }
- }
- }
- else
- {
- systemStatusBox.Background = new SolidColorBrush(Colors.Red);
- systemStatusBox.ConnectionState = "Disconnected";
- }
- });
- };
+ if (_settingsManager.SystemStatusPositions.TryGetValue(system.Name, out var pos))
+ {
+ Canvas.SetLeft(systemStatusBox, pos.X);
+ Canvas.SetTop(systemStatusBox, pos.Y);
+ }
+ else
+ {
+ Canvas.SetLeft(systemStatusBox, offsetX);
+ Canvas.SetTop(systemStatusBox, offsetY);
+ }
- handler.OnClose += () =>
- {
- Dispatcher.Invoke(() =>
- {
- systemStatusBox.Background = new SolidColorBrush(Colors.Red);
- systemStatusBox.ConnectionState = "Disconnected";
- });
- };
+ systemStatusBox.MouseLeftButtonDown += SystemStatusBox_MouseLeftButtonDown;
+ systemStatusBox.MouseMove += SystemStatusBox_MouseMove;
+ systemStatusBox.MouseRightButtonDown += SystemStatusBox_MouseRightButtonDown;
- handler.OnOpen += () =>
- {
- Console.WriteLine("Peer connected");
- U_REG_REQ release = new U_REG_REQ
- {
- SrcId = system.Rid,
- Site = system.Site
- };
+ ChannelsCanvas.Children.Add(systemStatusBox);
- handler.SendMessage(release.GetData());
- };
+ offsetX += 225;
+ if (offsetX + 220 > ChannelsCanvas.ActualWidth)
+ {
+ offsetX = 20;
+ offsetY += 106;
+ }
- handler.OnReconnecting += () =>
- {
- Console.WriteLine("Peer reconnecting");
- };
+ if (File.Exists(system.AliasPath))
+ system.RidAlias = AliasTools.LoadAliases(system.AliasPath);
- Task.Run(() =>
- {
- handler.Connect(system.Address, system.Port, system.AuthKey);
+ if (!system.IsDvm)
+ SetupWebSocketHandler(system, systemStatusBox);
+ else
+ SetupFneSystem(system, systemStatusBox);
- handler.OnGroupAffiliationResponse += (response) => { /* TODO */ };
+ if (!_settingsManager.ShowSystemStatus)
+ systemStatusBox.Visibility = Visibility.Collapsed;
+ }
- if (!handler.IsConnected)
- {
- systemStatusBox.Background = new SolidColorBrush(Colors.Red);
- systemStatusBox.ConnectionState = "Disconnected";
- }
- });
- } else {
- _fneSystemManager.AddFneSystem(system.Name, system, this);
+ private void SetupWebSocketHandler(Codeplug.System system, SystemStatusBox systemStatusBox)
+ {
+ _webSocketManager.AddWebSocketHandler(system.Name);
- PeerSystem peer = _fneSystemManager.GetFneSystem(system.Name);
+ IPeer handler = _webSocketManager.GetWebSocketHandler(system.Name);
- peer.peer.PeerConnected += (sender, response) =>
- {
- Console.WriteLine("FNE Peer connected");
-
- Dispatcher.Invoke(() =>
- {
- systemStatusBox.Background = (Brush)new BrushConverter().ConvertFrom("#FF00BC48");
- systemStatusBox.ConnectionState = "Connected";
- });
- };
+ handler.OnVoiceChannelResponse += HandleVoiceResponse;
+ handler.OnVoiceChannelRelease += HandleVoiceRelease;
+ handler.OnEmergencyAlarmResponse += HandleEmergencyAlarmResponse;
+ handler.OnAudioData += HandleReceivedAudio;
+ handler.OnAffiliationUpdate += HandleAffiliationUpdate;
+ handler.OnCallAlert += HandleCallAlert;
+ handler.OnUnitRegistrationResponse += (response) =>
+ {
+ Dispatcher.Invoke(() =>
+ {
+ if (response.Status == (int)ResponseType.GRANT)
+ {
+ systemStatusBox.Background = (Brush)new BrushConverter().ConvertFrom("#FF00BC48");
+ systemStatusBox.ConnectionState = "Connected";
- peer.peer.PeerDisconnected += (response) =>
+ // Send WLINK master aff for selected channels
+ foreach (ChannelBox channel in _selectedChannelsManager.GetSelectedChannels())
{
- Console.WriteLine("FNE Peer disconnected");
+ if (channel.SystemName == PLAYBACKSYS || channel.ChannelName == PLAYBACKCHNAME || channel.DstId == PLAYBACKTG)
+ continue;
- Dispatcher.Invoke(() =>
- {
- systemStatusBox.Background = new SolidColorBrush(Colors.Red);
- systemStatusBox.ConnectionState = "Disconnected";
- });
- };
+ Codeplug.System sys = Codeplug.GetSystemForChannel(channel.ChannelName);
+ Codeplug.Channel cpgChannel = Codeplug.GetChannelByName(channel.ChannelName);
- Task.Run(() =>
- {
- peer.Start();
- });
+ if (!sys.IsDvm)
+ {
+ IPeer peerHandler = _webSocketManager.GetWebSocketHandler(sys.Name);
+ if (channel.IsSelected && peerHandler.IsConnected)
+ {
+ Task.Run(() =>
+ {
+ GRP_AFF_REQ release = new GRP_AFF_REQ
+ {
+ SrcId = sys.Rid,
+ DstId = cpgChannel.Tgid,
+ Site = sys.Site
+ };
+ peerHandler.SendMessage(release.GetData());
+ });
+ }
+ }
+ }
+ }
+ else
+ {
+ systemStatusBox.Background = new SolidColorBrush(Colors.Red);
+ systemStatusBox.ConnectionState = "Disconnected";
}
+ });
+ };
- if (!_settingsManager.ShowSystemStatus)
- systemStatusBox.Visibility = Visibility.Collapsed;
+ handler.OnClose += () =>
+ {
+ Dispatcher.Invoke(() =>
+ {
+ systemStatusBox.Background = new SolidColorBrush(Colors.Red);
+ systemStatusBox.ConnectionState = "Disconnected";
+ });
+ };
- }
- }
+ handler.OnOpen += () =>
+ {
+ Console.WriteLine("Peer connected");
+ U_REG_REQ release = new U_REG_REQ
+ {
+ SrcId = system.Rid,
+ Site = system.Site
+ };
+ handler.SendMessage(release.GetData());
+ };
+ handler.OnReconnecting += () => Console.WriteLine("Peer reconnecting");
- if (_settingsManager.ShowChannels && Codeplug != null)
+ Task.Run(() =>
{
- foreach (var zone in Codeplug.Zones)
+ handler.Connect(system.Address, system.Port, system.AuthKey);
+ if (!handler.IsConnected)
{
- foreach (var channel in zone.Channels)
+ Dispatcher.Invoke(() =>
{
- var channelBox = new ChannelBox(_selectedChannelsManager, _audioManager, channel.Name, channel.System, channel.Tgid);
+ systemStatusBox.Background = new SolidColorBrush(Colors.Red);
+ systemStatusBox.ConnectionState = "Disconnected";
+ });
+ }
+ });
+ }
- //channelBox.crypter.AddKey(channel.GetKeyId(), channel.GetAlgoId(), channel.GetEncryptionKey());
+ private void SetupFneSystem(Codeplug.System system, SystemStatusBox systemStatusBox)
+ {
+ _fneSystemManager.AddFneSystem(system.Name, system, this);
- systemStatuses.Add(channel.Name, new SlotStatus());
+ PeerSystem peer = _fneSystemManager.GetFneSystem(system.Name);
- if (_settingsManager.ChannelPositions.TryGetValue(channel.Name, out var position))
- {
- Canvas.SetLeft(channelBox, position.X);
- Canvas.SetTop(channelBox, position.Y);
- }
- else
- {
- Canvas.SetLeft(channelBox, offsetX);
- Canvas.SetTop(channelBox, offsetY);
- }
+ peer.peer.PeerConnected += (sender, response) =>
+ {
+ Dispatcher.Invoke(() =>
+ {
+ systemStatusBox.Background = (Brush)new BrushConverter().ConvertFrom("#FF00BC48");
+ systemStatusBox.ConnectionState = "Connected";
+ });
+ };
- channelBox.PTTButtonClicked += ChannelBox_PTTButtonClicked;
- channelBox.PageButtonClicked += ChannelBox_PageButtonClicked;
- channelBox.HoldChannelButtonClicked += ChannelBox_HoldChannelButtonClicked;
+ peer.peer.PeerDisconnected += (response) =>
+ {
+ Dispatcher.Invoke(() =>
+ {
+ systemStatusBox.Background = new SolidColorBrush(Colors.Red);
+ systemStatusBox.ConnectionState = "Disconnected";
+ });
+ };
- channelBox.MouseLeftButtonDown += ChannelBox_MouseLeftButtonDown;
- channelBox.MouseMove += ChannelBox_MouseMove;
- channelBox.MouseRightButtonDown += ChannelBox_MouseRightButtonDown;
- ChannelsCanvas.Children.Add(channelBox);
+ Task.Run(() => peer.Start());
+ }
- offsetX += 225;
+ private void AddChannelBox(Codeplug.Channel channel, Canvas canvas, ref double offsetX, ref double offsetY)
+ {
+ var channelBox = new ChannelBox(_selectedChannelsManager, _audioManager, channel.Name, channel.System, channel.Tgid);
+ systemStatuses.Add(channel.Name, new SlotStatus());
- if (offsetX + 220 > ChannelsCanvas.ActualWidth)
- {
- offsetX = 20;
- offsetY += 106;
- }
- }
- }
+ if (_settingsManager.ChannelPositions.TryGetValue(channel.Name, out var pos))
+ {
+ Canvas.SetLeft(channelBox, pos.X);
+ Canvas.SetTop(channelBox, pos.Y);
}
-
- if (_settingsManager.ShowAlertTones && Codeplug != null)
+ else
{
- foreach (var alertPath in _settingsManager.AlertToneFilePaths)
- {
- var alertTone = new AlertTone(alertPath)
- {
- IsEditMode = isEditMode
- };
+ Canvas.SetLeft(channelBox, offsetX);
+ Canvas.SetTop(channelBox, offsetY);
+ }
- alertTone.OnAlertTone += SendAlertTone;
+ channelBox.PTTButtonClicked += ChannelBox_PTTButtonClicked;
+ channelBox.PageButtonClicked += ChannelBox_PageButtonClicked;
+ channelBox.HoldChannelButtonClicked += ChannelBox_HoldChannelButtonClicked;
- if (_settingsManager.AlertTonePositions.TryGetValue(alertPath, out var position))
- {
- Canvas.SetLeft(alertTone, position.X);
- Canvas.SetTop(alertTone, position.Y);
- }
- else
- {
- Canvas.SetLeft(alertTone, 20);
- Canvas.SetTop(alertTone, 20);
- }
+ channelBox.MouseLeftButtonDown += ChannelBox_MouseLeftButtonDown;
+ channelBox.MouseMove += ChannelBox_MouseMove;
+ channelBox.MouseRightButtonDown += ChannelBox_MouseRightButtonDown;
- alertTone.MouseRightButtonUp += AlertTone_MouseRightButtonUp;
+ canvas.Children.Add(channelBox);
- ChannelsCanvas.Children.Add(alertTone);
- }
+ offsetX += 225;
+ if (offsetX + 220 > canvas.ActualWidth)
+ {
+ offsetX = 20;
+ offsetY += 106;
}
- // Add ToneSet boxes if enabled
- if (_settingsManager.ShowQCTones && Codeplug != null && Codeplug?.Tones != null)
+ AdjustCanvasHeight();
+ }
+
+ private void AddPlaybackChannel(double offsetX, double offsetY)
+ {
+ playbackChannelBox = new ChannelBox(_selectedChannelsManager, _audioManager, PLAYBACKCHNAME, PLAYBACKSYS, PLAYBACKTG);
+
+ if (_settingsManager.ChannelPositions.TryGetValue(PLAYBACKCHNAME, out var pos))
{
- foreach (var tone in Codeplug.Tones)
- {
+ Canvas.SetLeft(playbackChannelBox, pos.X);
+ Canvas.SetTop(playbackChannelBox, pos.Y);
+ }
+ else
+ {
+ Canvas.SetLeft(playbackChannelBox, offsetX);
+ Canvas.SetTop(playbackChannelBox, offsetY);
+ }
- var toneSetControl = new ToneSet(tone.Name, tone.ToneA, tone.ToneB);
+ playbackChannelBox.PTTButtonClicked += ChannelBox_PTTButtonClicked;
+ playbackChannelBox.PageButtonClicked += ChannelBox_PageButtonClicked;
+ playbackChannelBox.HoldChannelButtonClicked += ChannelBox_HoldChannelButtonClicked;
- // Hook up events
- toneSetControl.PlayClicked += async (s, e) =>
- {
- if (_selectedToneSets.Count > 0)
- {
- var selectedTones = _selectedToneSets.ToList();
- var initiallyActiveChannels = _selectedChannelsManager
- .GetSelectedChannels()
- .Where(c => c.PageState)
- .ToList();
+ playbackChannelBox.MouseLeftButtonDown += ChannelBox_MouseLeftButtonDown;
+ playbackChannelBox.MouseMove += ChannelBox_MouseMove;
+ playbackChannelBox.MouseRightButtonDown += ChannelBox_MouseRightButtonDown;
- for (int i = 0; i < selectedTones.Count; i++)
- {
- var selected = selectedTones[i];
- var key = (selected.ToneA, selected.ToneB);
+ ChannelsCanvas.Children.Add(playbackChannelBox);
+ }
- // ✅ Restore PageState for each tone before playback
- foreach (var ch in initiallyActiveChannels)
- {
- ch.PageState = true;
- Dispatcher.Invoke(() =>
- {
- ch.PageSelectButton.Background = ch.orangeGradient;
- });
+ private void AddAlertTones(double offsetX, double offsetY)
+ {
+ if (!_settingsManager.ShowAlertTones) return;
- // This ensures PageState on the *server* is activated
- ChannelBox_PageButtonClicked(ch, ch);
- }
+ foreach (var alertPath in _settingsManager.AlertToneFilePaths)
+ {
+ var alertTone = new AlertTone(alertPath) { IsEditMode = isEditMode };
+ alertTone.OnAlertTone += SendAlertTone;
- if (i > 0)
- {
- await Task.Delay(1750); // delay only after the first tone
- }
+ if (_settingsManager.AlertTonePositions.TryGetValue(alertPath, out var pos))
+ {
+ Canvas.SetLeft(alertTone, pos.X);
+ Canvas.SetTop(alertTone, pos.Y);
+ }
+ else
+ {
+ Canvas.SetLeft(alertTone, 20);
+ Canvas.SetTop(alertTone, 20);
+ }
+ alertTone.MouseRightButtonUp += AlertTone_MouseRightButtonUp;
+ ChannelsCanvas.Children.Add(alertTone);
+ }
+ }
- // ▶️ Play the tone
- await PlayTone(selected.ToneA.ToString(), selected.ToneB.ToString());
+ private void AddToneSets(Canvas zoneCanvas, double offsetX, double offsetY, string zone)
+ {
+ if (!_settingsManager.ShowQCTones || Codeplug?.Tones == null) return;
+ Console.WriteLine($"Zone Name: {zone}");
+ Console.WriteLine($"ShowQCTones: {_settingsManager.ShowQCTones}");
+ Console.WriteLine($"Loaded tones: {Codeplug.Tones?.Count ?? 0}");
+ Console.WriteLine($"Zone canvas size: {zoneCanvas.ActualWidth}x{zoneCanvas.ActualHeight}");
+ Console.WriteLine($"Adding tones for zone: {zone}");
- // ❌ Remove from selected set
- _selectedToneSets.Remove(key);
+ foreach (var tone in Codeplug.Tones)
+ {
+ Console.WriteLine($"Tone {tone.Name}, AllowedZones: {string.Join(",", tone.AllowedZones)}");
- // 🔄 Deselect tone visually
- foreach (var child in ChannelsCanvas.Children)
- {
- if (child is ToneSet ts && ts.ToneA == key.ToneA && ts.ToneB == key.ToneB)
- {
- ts.SetSelected(false);
- break;
- }
- }
- }
+ // Only add tones allowed in this zone
+ if (tone.AllowedZones == null || !tone.AllowedZones.Any(z => string.Equals(z.Trim(), zone.Trim(), StringComparison.OrdinalIgnoreCase)))
+ {
+ continue;
+ }
+
+ var toneSetControl = new ToneSet(tone.Name, tone.ToneA, tone.ToneB);
+
+ // --- Play logic ---
+ toneSetControl.PlayClicked += async (s, e) =>
+ {
+ if (_selectedToneSets.Count > 0)
+ {
+ var selectedTones = _selectedToneSets.ToList();
+ var initiallyActiveChannels = _selectedChannelsManager
+ .GetSelectedChannels()
+ .Where(c => c.PageState)
+ .ToList();
+
+ for (int i = 0; i < selectedTones.Count; i++)
+ {
+ var selected = selectedTones[i];
+ var key = (selected.ToneA, selected.ToneB);
- // 🧹 Final cleanup: clear PageState on all initially active channels
foreach (var ch in initiallyActiveChannels)
{
- ch.PageState = false;
+ ch.PageState = true;
Dispatcher.Invoke(() =>
{
- ch.PageSelectButton.Background = ch.grayGradient;
+ ch.PageSelectButton.Background = ch.orangeGradient;
});
+ ChannelBox_PageButtonClicked(ch, ch);
}
- }
- else
- {
- // 🔁 Single tone fallback
- var hasActivePage = _selectedChannelsManager.GetSelectedChannels().Any(c => c.PageState);
- if (hasActivePage)
- {
- await PlayTone(tone.ToneA.ToString(), tone.ToneB.ToString());
- foreach (var channel in _selectedChannelsManager.GetSelectedChannels())
+ await Task.Delay(2000);
+ await PlayTone(selected.ToneA.ToString(), selected.ToneB.ToString());
+
+ _selectedToneSets.Remove(key);
+
+ foreach (var child in zoneCanvas.Children)
+ {
+ if (child is ToneSet ts && ts.ToneA == key.ToneA && ts.ToneB == key.ToneB)
{
- channel.PageState = false;
- channel.PageSelectButton.Background = channel.grayGradient;
+ ts.SetSelected(false);
+ break;
}
}
}
- };
-
- toneSetControl.SelectToggled += (s, e) =>
- {
- var key = (tone.ToneA, tone.ToneB);
- if (_selectedToneSets.Contains(key))
+ foreach (var ch in initiallyActiveChannels)
{
- _selectedToneSets.Remove(key);
- toneSetControl.SetSelected(false);
+ ch.PageState = false;
+ Dispatcher.Invoke(() =>
+ {
+ ch.PageSelectButton.Background = ch.grayGradient;
+ });
}
- else
+ }
+ else
+ {
+ var hasActivePage = _selectedChannelsManager.GetSelectedChannels().Any(c => c.PageState);
+ if (hasActivePage)
{
- _selectedToneSets.Add(key);
- toneSetControl.SetSelected(true);
+ await PlayTone(tone.ToneA.ToString(), tone.ToneB.ToString());
+
+ foreach (var channel in _selectedChannelsManager.GetSelectedChannels())
+ {
+ channel.PageState = false;
+ channel.PageSelectButton.Background = channel.grayGradient;
+ }
}
- };
+ }
+ };
- // Position like ToneSet Boxes using same layout logic
- if (_settingsManager.QCToneSetPositions.TryGetValue(tone.Name, out var position))
+ // --- Select/Toggle logic ---
+ toneSetControl.SelectToggled += (s, e) =>
+ {
+ var key = (tone.ToneA, tone.ToneB);
+ if (_selectedToneSets.Contains(key))
{
- Canvas.SetLeft(toneSetControl, position.X);
- Canvas.SetTop(toneSetControl, position.Y);
+ _selectedToneSets.Remove(key);
+ toneSetControl.SetSelected(false);
}
else
{
- Canvas.SetLeft(toneSetControl, offsetX);
- Canvas.SetTop(toneSetControl, offsetY);
+ _selectedToneSets.Add(key);
+ toneSetControl.SetSelected(true);
}
+ };
- toneSetControl.MouseLeftButtonDown += ToneSet_MouseLeftButtonDown;
- toneSetControl.MouseMove += ToneSet_MouseMove;
- toneSetControl.MouseRightButtonDown += ToneSet_MouseRightButtonDown;
-
- ChannelsCanvas.Children.Add(toneSetControl);
-
- offsetX += 225;
-
- if (offsetX + 220 > ChannelsCanvas.ActualWidth)
- {
- offsetX = 20;
- offsetY += 106;
- }
+ // --- Positioning ---
+ if (_settingsManager.QCToneSetPositions.TryGetValue(tone.Name, out var pos))
+ {
+ Canvas.SetLeft(toneSetControl, pos.X);
+ Canvas.SetTop(toneSetControl, pos.Y);
+ }
+ else
+ {
+ Canvas.SetLeft(toneSetControl, offsetX);
+ Canvas.SetTop(toneSetControl, offsetY);
}
- }
-
+ toneSetControl.MouseLeftButtonDown += ToneSet_MouseLeftButtonDown;
+ toneSetControl.MouseMove += ToneSet_MouseMove;
+ toneSetControl.MouseRightButtonDown += ToneSet_MouseRightButtonDown;
- playbackChannelBox = new ChannelBox(_selectedChannelsManager, _audioManager, PLAYBACKCHNAME, PLAYBACKSYS, PLAYBACKTG);
+ // Add to current zone canvas
+ zoneCanvas.Children.Add(toneSetControl);
- if (_settingsManager.ChannelPositions.TryGetValue(PLAYBACKCHNAME, out var pos))
- {
- Canvas.SetLeft(playbackChannelBox, pos.X);
- Canvas.SetTop(playbackChannelBox, pos.Y);
- }
- else
- {
- Canvas.SetLeft(playbackChannelBox, offsetX);
- Canvas.SetTop(playbackChannelBox, offsetY);
+ // --- Layout increment ---
+ offsetX += 225;
+ if (offsetX + 220 > zoneCanvas.ActualWidth)
+ {
+ offsetX = 20;
+ offsetY += 106;
+ }
}
+ }
- playbackChannelBox.PTTButtonClicked += ChannelBox_PTTButtonClicked;
- playbackChannelBox.PageButtonClicked += ChannelBox_PageButtonClicked;
- playbackChannelBox.HoldChannelButtonClicked += ChannelBox_HoldChannelButtonClicked;
-
- playbackChannelBox.MouseLeftButtonDown += ChannelBox_MouseLeftButtonDown;
- playbackChannelBox.MouseMove += ChannelBox_MouseMove;
- playbackChannelBox.MouseRightButtonDown += ChannelBox_MouseRightButtonDown;
- ChannelsCanvas.Children.Add(playbackChannelBox);
-
- //offsetX += 225;
- //if (offsetX + 220 > ChannelsCanvas.ActualWidth)
- //{
- // offsetX = 20;
- // offsetY += 106;
- //}
-
- AdjustCanvasHeight();
- }
+ //private void AddToneSets(Canvas zoneCanvas, double offsetX, double offsetY, string zone)
+ //{
+ // if (!_settingsManager.ShowQCTones || Codeplug?.Tones == null) return;
+
+ // foreach (var tone in Codeplug.Tones)
+ // {
+ // var toneSetControl = new ToneSet(tone.Name, tone.ToneA, tone.ToneB);
+
+ // toneSetControl.PlayClicked += async (s, e) =>
+ // {
+ // if (_selectedToneSets.Count > 0)
+ // {
+ // var selectedTones = _selectedToneSets.ToList();
+ // var initiallyActiveChannels = _selectedChannelsManager
+ // .GetSelectedChannels()
+ // .Where(c => c.PageState)
+ // .ToList();
+
+ // for (int i = 0; i < selectedTones.Count; i++)
+ // {
+ // var selected = selectedTones[i];
+ // var key = (selected.ToneA, selected.ToneB);
+
+ // foreach (var ch in initiallyActiveChannels)
+ // {
+ // ch.PageState = true;
+ // Dispatcher.Invoke(() =>
+ // {
+ // ch.PageSelectButton.Background = ch.orangeGradient;
+ // });
+ // ChannelBox_PageButtonClicked(ch, ch);
+ // }
+
+ // await Task.Delay(2000);
+
+ // await PlayTone(selected.ToneA.ToString(), selected.ToneB.ToString());
+
+ // _selectedToneSets.Remove(key);
+
+ // foreach (var child in ChannelsCanvas.Children)
+ // {
+ // if (child is ToneSet ts && ts.ToneA == key.ToneA && ts.ToneB == key.ToneB)
+ // {
+ // ts.SetSelected(false);
+ // break;
+ // }
+ // }
+ // }
+
+ // foreach (var ch in initiallyActiveChannels)
+ // {
+ // ch.PageState = false;
+ // Dispatcher.Invoke(() =>
+ // {
+ // ch.PageSelectButton.Background = ch.grayGradient;
+ // });
+ // }
+ // }
+ // else
+ // {
+ // var hasActivePage = _selectedChannelsManager.GetSelectedChannels().Any(c => c.PageState);
+ // if (hasActivePage)
+ // {
+ // await PlayTone(tone.ToneA.ToString(), tone.ToneB.ToString());
+
+ // foreach (var channel in _selectedChannelsManager.GetSelectedChannels())
+ // {
+ // channel.PageState = false;
+ // channel.PageSelectButton.Background = channel.grayGradient;
+ // }
+ // }
+ // }
+ // };
+
+ // toneSetControl.SelectToggled += (s, e) =>
+ // {
+ // var key = (tone.ToneA, tone.ToneB);
+ // if (_selectedToneSets.Contains(key))
+ // {
+ // _selectedToneSets.Remove(key);
+ // toneSetControl.SetSelected(false);
+ // }
+ // else
+ // {
+ // _selectedToneSets.Add(key);
+ // toneSetControl.SetSelected(true);
+ // }
+ // };
+
+ // if (_settingsManager.QCToneSetPositions.TryGetValue(tone.Name, out var pos))
+ // {
+ // Canvas.SetLeft(toneSetControl, pos.X);
+ // Canvas.SetTop(toneSetControl, pos.Y);
+ // }
+ // else
+ // {
+ // Canvas.SetLeft(toneSetControl, offsetX);
+ // Canvas.SetTop(toneSetControl, offsetY);
+ // }
+
+ // toneSetControl.MouseLeftButtonDown += ToneSet_MouseLeftButtonDown;
+ // toneSetControl.MouseMove += ToneSet_MouseMove;
+ // toneSetControl.MouseRightButtonDown += ToneSet_MouseRightButtonDown;
+
+ // //ChannelsCanvas.Children.Add(toneSetControl);
+
+ // zoneCanvas.Children.Add(toneSetControl);
+
+ // offsetX += 225;
+ // if (offsetX + 220 > zoneCanvas.ActualWidth)
+ // {
+ // offsetX = 20;
+ // offsetY += 106;
+ // }
+ // }
+ //}
private const int GridSize = 5;
@@ -1522,53 +1768,106 @@ private void ChannelBox_PTTButtonClicked(object sender, ChannelBox e)
private void ChannelBox_MouseLeftButtonDown(object sender, MouseButtonEventArgs e)
{
- if (!isEditMode || !(sender is UIElement element)) return;
+ if (!(sender is UIElement element)) return;
- _draggedElement = element;
- _startPoint = e.GetPosition(ChannelsCanvas);
- _offsetX = _startPoint.X - Canvas.GetLeft(_draggedElement);
- _offsetY = _startPoint.Y - Canvas.GetTop(_draggedElement);
- _isDragging = true;
+ if (isEditMode)
+ {
+ _draggedElement = element;
+ _startPoint = e.GetPosition((UIElement)VisualTreeHelper.GetParent(element));
+ _offsetX = _startPoint.X - Canvas.GetLeft(_draggedElement);
+ _offsetY = _startPoint.Y - Canvas.GetTop(_draggedElement);
+ _isDragging = true;
- element.CaptureMouse();
+ element.CaptureMouse();
+ e.Handled = true; // prevent click from toggling state
+ }
+ else
+ {
+ // Normal channel click behavior (toggle state)
+ // You can leave your ChannelBox click handler here
+ }
}
+
+ //private void ChannelBox_MouseMove(object sender, MouseEventArgs e)
+ //{
+ // if (!isEditMode || !_isDragging || _draggedElement == null) return;
+
+ // Point currentPosition = e.GetPosition(ChannelsCanvas);
+
+ // // Calculate the new position with snapping to the grid
+ // double newLeft = Math.Round((currentPosition.X - _offsetX) / GridSize) * GridSize;
+ // double newTop = Math.Round((currentPosition.Y - _offsetY) / GridSize) * GridSize;
+
+ // // Ensure the box stays within canvas bounds
+ // newLeft = Math.Max(0, Math.Min(newLeft, ChannelsCanvas.ActualWidth - _draggedElement.RenderSize.Width));
+ // newTop = Math.Max(0, Math.Min(newTop, ChannelsCanvas.ActualHeight - _draggedElement.RenderSize.Height));
+
+ // // Apply snapped position
+ // Canvas.SetLeft(_draggedElement, newLeft);
+ // Canvas.SetTop(_draggedElement, newTop);
+
+ // // Save the new position if it's a ChannelBox
+ // if (_draggedElement is ChannelBox channelBox)
+ // {
+ // _settingsManager.UpdateChannelPosition(channelBox.ChannelName, newLeft, newTop);
+ // }
+
+ // AdjustCanvasHeight();
+ //}
+
private void ChannelBox_MouseMove(object sender, MouseEventArgs e)
{
- if (!isEditMode || !_isDragging || _draggedElement == null) return;
+ if (!_isDragging || _draggedElement == null) return;
- Point currentPosition = e.GetPosition(ChannelsCanvas);
+ Point currentPosition = e.GetPosition((UIElement)VisualTreeHelper.GetParent(_draggedElement));
- // Calculate the new position with snapping to the grid
double newLeft = Math.Round((currentPosition.X - _offsetX) / GridSize) * GridSize;
double newTop = Math.Round((currentPosition.Y - _offsetY) / GridSize) * GridSize;
- // Ensure the box stays within canvas bounds
newLeft = Math.Max(0, Math.Min(newLeft, ChannelsCanvas.ActualWidth - _draggedElement.RenderSize.Width));
newTop = Math.Max(0, Math.Min(newTop, ChannelsCanvas.ActualHeight - _draggedElement.RenderSize.Height));
- // Apply snapped position
Canvas.SetLeft(_draggedElement, newLeft);
Canvas.SetTop(_draggedElement, newTop);
- // Save the new position if it's a ChannelBox
if (_draggedElement is ChannelBox channelBox)
- {
_settingsManager.UpdateChannelPosition(channelBox.ChannelName, newLeft, newTop);
- }
AdjustCanvasHeight();
}
- private void ChannelBox_MouseRightButtonDown(object sender, MouseButtonEventArgs e)
+ private void ChannelBox_MouseLeftButtonUp(object sender, MouseButtonEventArgs e)
{
- if (!isEditMode || !_isDragging || _draggedElement == null) return;
+ if (_isDragging && _draggedElement != null)
+ {
+ _isDragging = false;
+ _draggedElement.ReleaseMouseCapture();
+ _draggedElement = null;
+ e.Handled = true;
+ }
+ }
- _isDragging = false;
- _draggedElement.ReleaseMouseCapture();
- _draggedElement = null;
+ private void ChannelBox_MouseRightButtonDown(object sender, MouseButtonEventArgs e)
+ {
+ if (_isDragging && _draggedElement != null)
+ {
+ _isDragging = false;
+ _draggedElement.ReleaseMouseCapture();
+ _draggedElement = null;
+ e.Handled = true;
+ }
}
+ //private void ChannelBox_MouseRightButtonDown(object sender, MouseButtonEventArgs e)
+ //{
+ // if (!isEditMode || !_isDragging || _draggedElement == null) return;
+
+ // _isDragging = false;
+ // _draggedElement.ReleaseMouseCapture();
+ // _draggedElement = null;
+ //}
+
private void SystemStatusBox_MouseLeftButtonDown(object sender, MouseButtonEventArgs e) => ChannelBox_MouseLeftButtonDown(sender, e);
private void SystemStatusBox_MouseMove(object sender, MouseEventArgs e) => ChannelBox_MouseMove(sender, e);
@@ -1697,6 +1996,8 @@ private async Task PlayTone(string ToneA, string ToneB)
{
var selectedChannels = _selectedChannelsManager.GetSelectedChannels();
+ Console.WriteLine($"Playing Tones A={ToneA}, B={ToneB}");
+
// Check if any selected channel has PageState = true
if (!selectedChannels.Any(ch => ch.PageState))
{
@@ -2655,5 +2956,10 @@ private void CallHist_Click(object sender, RoutedEventArgs e)
{
callHistoryWindow.Show();
}
+
+ private void MenuItem_Click(object sender, RoutedEventArgs e)
+ {
+
+ }
}
}
diff --git a/WhackerLinkConsoleV2/SettingsManager.cs b/WhackerLinkConsoleV2/SettingsManager.cs
index 5e3f682..71bd526 100644
--- a/WhackerLinkConsoleV2/SettingsManager.cs
+++ b/WhackerLinkConsoleV2/SettingsManager.cs
@@ -32,6 +32,8 @@ public class SettingsManager
public bool ShowAlertTones { get; set; } = true;
public bool ShowQCTones { get; set; } = true;
+ public bool DebugMode { get; set; } = false;
+
public string LastCodeplugPath { get; set; } = null;
public Dictionary ChannelPositions { get; set; } = new Dictionary();
@@ -52,6 +54,7 @@ public void LoadSettings()
if (loadedSettings != null)
{
+ DebugMode = loadedSettings.DebugMode;
ShowSystemStatus = loadedSettings.ShowSystemStatus;
ShowChannels = loadedSettings.ShowChannels;
ShowAlertTones = loadedSettings.ShowAlertTones;
@@ -71,6 +74,12 @@ public void LoadSettings()
}
}
+
+ public void ToggleDebugMode()
+ {
+ DebugMode = !DebugMode;
+ SaveSettings();
+ }
public void UpdateAlertTonePaths(string newFilePath)
{
if (!AlertToneFilePaths.Contains(newFilePath))
From 76ed6f4c3b7b579fd860c929068ce31cdbf2c2ac Mon Sep 17 00:00:00 2001
From: Devin G <149845346+DeathSoulYTDev@users.noreply.github.com>
Date: Sun, 17 Aug 2025 18:50:29 -0400
Subject: [PATCH 08/17] Updated WLLib
---
WhackerLinkLib | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/WhackerLinkLib b/WhackerLinkLib
index 9178526..f1dc49c 160000
--- a/WhackerLinkLib
+++ b/WhackerLinkLib
@@ -1 +1 @@
-Subproject commit 9178526bf07a73374f2bfe016bc0b48602922d3a
+Subproject commit f1dc49c761c53db840becf99188924147d514137
From 33bda3ba334b16d28da0bc39b315ccc9d1d9da8b Mon Sep 17 00:00:00 2001
From: Devin G <149845346+DeathSoulYTDev@users.noreply.github.com>
Date: Thu, 21 Aug 2025 14:45:54 -0400
Subject: [PATCH 09/17] Comments Removal & Tone Delay
- Removed All Unused/Old Code that was Commented Out
- Fixed the Stacked Tones Delay so its not delaying the First Tone
---
WhackerLinkConsoleV2/App.xaml.cs | 15 --
WhackerLinkConsoleV2/ChannelBox.xaml.cs | 1 -
WhackerLinkConsoleV2/MainWindow.xaml.cs | 192 ------------------------
3 files changed, 208 deletions(-)
diff --git a/WhackerLinkConsoleV2/App.xaml.cs b/WhackerLinkConsoleV2/App.xaml.cs
index af25b44..6f584cf 100644
--- a/WhackerLinkConsoleV2/App.xaml.cs
+++ b/WhackerLinkConsoleV2/App.xaml.cs
@@ -1,7 +1,6 @@
using System.Configuration;
using System.Data;
using System.Windows;
-using WhackerLinkLib.Models.Radio;
namespace WhackerLinkConsoleV2
{
@@ -10,20 +9,6 @@ namespace WhackerLinkConsoleV2
///
public partial class App : Application
{
- public Codeplug Codeplug { get; set; }
-
- [System.Runtime.InteropServices.DllImport("kernel32.dll")]
- private static extern bool AllocConsole();
-
- public App()
- {
- //AllocConsole();
- //Console.WriteLine($"Debug: {Codeplug}");
- //if (Codeplug.Systems[0].debug)
- //{
- // Console.WriteLine("Hello, world!");
- //}
- }
}
}
diff --git a/WhackerLinkConsoleV2/ChannelBox.xaml.cs b/WhackerLinkConsoleV2/ChannelBox.xaml.cs
index b60f7cf..cf90922 100644
--- a/WhackerLinkConsoleV2/ChannelBox.xaml.cs
+++ b/WhackerLinkConsoleV2/ChannelBox.xaml.cs
@@ -301,7 +301,6 @@ private void PageSelectButton_Click(object sender, RoutedEventArgs e)
{
if (!IsSelected) return;
-
PageState = !PageState;
PageButtonClicked.Invoke(sender, this);
}
diff --git a/WhackerLinkConsoleV2/MainWindow.xaml.cs b/WhackerLinkConsoleV2/MainWindow.xaml.cs
index a3d28e5..7744313 100644
--- a/WhackerLinkConsoleV2/MainWindow.xaml.cs
+++ b/WhackerLinkConsoleV2/MainWindow.xaml.cs
@@ -202,75 +202,6 @@ private void LoadCodeplug(string filePath)
MessageBox.Show($"Error loading codeplug: {ex.Message}", "Error", MessageBoxButton.OK, MessageBoxImage.Error);
}
}
-
- //private void GenerateChannelWidgets()
- //{
- // // Clear previous UI
- // ChannelsTabControl.Items.Clear();
- // ChannelsCanvas.Children.Clear();
-
- // double globalOffsetX = 20;
- // double globalOffsetY = 20;
-
- // if (Codeplug != null)
- // {
- // // 1. Add System Status Boxes (global)
- // foreach (var system in Codeplug.Systems)
- // {
- // AddSystemBox(system, ref globalOffsetX, ref globalOffsetY);
- // }
-
- // // 2. Add Zone Tabs (each tab gets its own ScrollViewer + Canvas)
- // foreach (var zone in Codeplug.Zones)
- // {
- // var tabItem = new TabItem { Header = zone.Name };
-
- // var scrollViewer = new ScrollViewer
- // {
- // VerticalScrollBarVisibility = ScrollBarVisibility.Auto,
- // HorizontalScrollBarVisibility = ScrollBarVisibility.Auto
- // };
-
- // var zoneCanvas = new Canvas { Background = Brushes.Transparent };
-
- // scrollViewer.Content = zoneCanvas;
- // tabItem.Content = scrollViewer;
- // ChannelsTabControl.Items.Add(tabItem);
-
- // double offsetX = 20;
- // double offsetY = 20;
-
- // foreach (var channel in zone.Channels)
- // {
- // // Add the channel box without capturing a return value
- // AddChannelBox(channel, zoneCanvas, ref offsetX, ref offsetY);
-
- // // Dynamically expand canvas as needed
- // double requiredWidth = offsetX + 40;
- // double requiredHeight = offsetY + 40;
- // if (zoneCanvas.Width < requiredWidth)
- // zoneCanvas.Width = requiredWidth;
- // if (zoneCanvas.Height < requiredHeight)
- // zoneCanvas.Height = requiredHeight;
- // }
- // }
-
-
-
-
- // // 3. Add Playback Channel (global)
- // AddPlaybackChannel(globalOffsetX, globalOffsetY);
-
- // // 4. Add Alert Tones (global)
- // AddAlertTones(globalOffsetX, globalOffsetY);
-
- // // 5. Add QC ToneSets (global)
- // AddToneSets(globalOffsetX, globalOffsetY);
- // }
-
- // AdjustCanvasHeight();
- //}
-
private void GenerateChannelWidgets()
{
// Clear previous UI
@@ -718,124 +649,6 @@ private void AddToneSets(Canvas zoneCanvas, double offsetX, double offsetY, stri
}
}
-
- //private void AddToneSets(Canvas zoneCanvas, double offsetX, double offsetY, string zone)
- //{
- // if (!_settingsManager.ShowQCTones || Codeplug?.Tones == null) return;
-
- // foreach (var tone in Codeplug.Tones)
- // {
- // var toneSetControl = new ToneSet(tone.Name, tone.ToneA, tone.ToneB);
-
- // toneSetControl.PlayClicked += async (s, e) =>
- // {
- // if (_selectedToneSets.Count > 0)
- // {
- // var selectedTones = _selectedToneSets.ToList();
- // var initiallyActiveChannels = _selectedChannelsManager
- // .GetSelectedChannels()
- // .Where(c => c.PageState)
- // .ToList();
-
- // for (int i = 0; i < selectedTones.Count; i++)
- // {
- // var selected = selectedTones[i];
- // var key = (selected.ToneA, selected.ToneB);
-
- // foreach (var ch in initiallyActiveChannels)
- // {
- // ch.PageState = true;
- // Dispatcher.Invoke(() =>
- // {
- // ch.PageSelectButton.Background = ch.orangeGradient;
- // });
- // ChannelBox_PageButtonClicked(ch, ch);
- // }
-
- // await Task.Delay(2000);
-
- // await PlayTone(selected.ToneA.ToString(), selected.ToneB.ToString());
-
- // _selectedToneSets.Remove(key);
-
- // foreach (var child in ChannelsCanvas.Children)
- // {
- // if (child is ToneSet ts && ts.ToneA == key.ToneA && ts.ToneB == key.ToneB)
- // {
- // ts.SetSelected(false);
- // break;
- // }
- // }
- // }
-
- // foreach (var ch in initiallyActiveChannels)
- // {
- // ch.PageState = false;
- // Dispatcher.Invoke(() =>
- // {
- // ch.PageSelectButton.Background = ch.grayGradient;
- // });
- // }
- // }
- // else
- // {
- // var hasActivePage = _selectedChannelsManager.GetSelectedChannels().Any(c => c.PageState);
- // if (hasActivePage)
- // {
- // await PlayTone(tone.ToneA.ToString(), tone.ToneB.ToString());
-
- // foreach (var channel in _selectedChannelsManager.GetSelectedChannels())
- // {
- // channel.PageState = false;
- // channel.PageSelectButton.Background = channel.grayGradient;
- // }
- // }
- // }
- // };
-
- // toneSetControl.SelectToggled += (s, e) =>
- // {
- // var key = (tone.ToneA, tone.ToneB);
- // if (_selectedToneSets.Contains(key))
- // {
- // _selectedToneSets.Remove(key);
- // toneSetControl.SetSelected(false);
- // }
- // else
- // {
- // _selectedToneSets.Add(key);
- // toneSetControl.SetSelected(true);
- // }
- // };
-
- // if (_settingsManager.QCToneSetPositions.TryGetValue(tone.Name, out var pos))
- // {
- // Canvas.SetLeft(toneSetControl, pos.X);
- // Canvas.SetTop(toneSetControl, pos.Y);
- // }
- // else
- // {
- // Canvas.SetLeft(toneSetControl, offsetX);
- // Canvas.SetTop(toneSetControl, offsetY);
- // }
-
- // toneSetControl.MouseLeftButtonDown += ToneSet_MouseLeftButtonDown;
- // toneSetControl.MouseMove += ToneSet_MouseMove;
- // toneSetControl.MouseRightButtonDown += ToneSet_MouseRightButtonDown;
-
- // //ChannelsCanvas.Children.Add(toneSetControl);
-
- // zoneCanvas.Children.Add(toneSetControl);
-
- // offsetX += 225;
- // if (offsetX + 220 > zoneCanvas.ActualWidth)
- // {
- // offsetX = 20;
- // offsetY += 106;
- // }
- // }
- //}
-
private const int GridSize = 5;
private void ToneSet_MouseLeftButtonDown(object sender, MouseButtonEventArgs e)
@@ -2956,10 +2769,5 @@ private void CallHist_Click(object sender, RoutedEventArgs e)
{
callHistoryWindow.Show();
}
-
- private void MenuItem_Click(object sender, RoutedEventArgs e)
- {
-
- }
}
}
From 087a8e13d6173e5edbf348df4eb7adf49d48377b Mon Sep 17 00:00:00 2001
From: Devin G <149845346+DeathSoulYTDev@users.noreply.github.com>
Date: Thu, 21 Aug 2025 17:36:51 -0400
Subject: [PATCH 10/17] UI Fix
- Fixed Canvas Sizing When Window Resizes
- Auto Added A SYSTEMS Tab for Show a Playback Channel and SystemBoxes
---
WhackerLinkConsoleV2/ChannelBox.xaml | 6 +-
WhackerLinkConsoleV2/MainWindow.xaml | 2 +-
WhackerLinkConsoleV2/MainWindow.xaml.cs | 324 +++++++++++++++++-------
WhackerLinkConsoleV2/ToneSet.xaml | 16 +-
4 files changed, 247 insertions(+), 101 deletions(-)
diff --git a/WhackerLinkConsoleV2/ChannelBox.xaml b/WhackerLinkConsoleV2/ChannelBox.xaml
index 705ec69..c5c8576 100644
--- a/WhackerLinkConsoleV2/ChannelBox.xaml
+++ b/WhackerLinkConsoleV2/ChannelBox.xaml
@@ -4,7 +4,7 @@
Width="220" Height="100" Background="#FF0B004B">
-
+
@@ -34,7 +34,7 @@
-
+
@@ -100,7 +100,7 @@
-
From c414ef0aa621c1fce015fb26c24ec92f0cfabd43 Mon Sep 17 00:00:00 2001
From: Devin G <149845346+DeathSoulYTDev@users.noreply.github.com>
Date: Thu, 21 Aug 2025 17:39:23 -0400
Subject: [PATCH 11/17] Comments Removal
- Removed Forgotten Commented out Code
---
WhackerLinkConsoleV2/MainWindow.xaml.cs | 57 -------------------------
1 file changed, 57 deletions(-)
diff --git a/WhackerLinkConsoleV2/MainWindow.xaml.cs b/WhackerLinkConsoleV2/MainWindow.xaml.cs
index 6378555..5934994 100644
--- a/WhackerLinkConsoleV2/MainWindow.xaml.cs
+++ b/WhackerLinkConsoleV2/MainWindow.xaml.cs
@@ -1724,33 +1724,6 @@ private void ChannelBox_MouseLeftButtonDown(object sender, MouseButtonEventArgs
element.CaptureMouse();
}
-
- //private void ChannelBox_MouseMove(object sender, MouseEventArgs e)
- //{
- // if (!isEditMode || !_isDragging || _draggedElement == null) return;
-
- // //Point current = e.GetPosition(ChannelsCanvas);
- // Point currentPosition = e.GetPosition(ChannelsCanvas);
-
- // // snap to grid
- // double newLeft = Math.Round((currentPosition.X - _offsetX) / GridSize) * GridSize;
- // double newTop = Math.Round((currentPosition.Y - _offsetY) / GridSize) * GridSize;
-
- // // keep inside canvas
- // //newLeft = Math.Max(0, Math.Min(newLeft, ChannelsCanvas.ActualWidth - _draggedElement.RenderSize.Width));
- // newLeft = Math.Max(0, Math.Min(newLeft, ChannelsCanvas.ActualWidth - _draggedElement.RenderSize.Width));
- // newTop = Math.Max(0, Math.Min(newTop, ChannelsCanvas.ActualHeight - _draggedElement.RenderSize.Height));
- // //newTop = Math.Max(0, Math.Min(newTop, ChannelsCanvas.ActualHeight - _draggedElement.RenderSize.Height));
-
- // Canvas.SetLeft(_draggedElement, newLeft);
- // Canvas.SetTop(_draggedElement, newTop);
-
- // if (_draggedElement is ChannelBox cb)
- // _settingsManager.UpdateChannelPosition(cb.ChannelName, newLeft, newTop);
-
- // AdjustCanvasHeight();
- //}
-
private void ChannelBox_MouseMove(object sender, MouseEventArgs e)
{
if (!isEditMode || !_isDragging || _draggedElement == null) return;
@@ -1794,36 +1767,6 @@ private void ChannelBox_MouseMove(object sender, MouseEventArgs e)
AdjustCanvasHeight();
}
-
- //private void ChannelBox_MouseMove(object sender, MouseEventArgs e)
- //{
- // if (!isEditMode || !_isDragging || _draggedElement == null) return;
-
- // // current mouse position relative to canvas
- // Point currentPosition = e.GetPosition(ChannelsCanvas);
-
- // // calculate new pos using element-relative offset
- // double newLeft = Math.Round((currentPosition.X - _offsetX) / GridSize) * GridSize;
- // double newTop = Math.Round((currentPosition.Y - _offsetY) / GridSize) * GridSize;
-
- // // snap to grid
- // //newLeft = Math.Round(newLeft / GridSize) * GridSize;
- // //newTop = Math.Round(newTop / GridSize) * GridSize;
-
- // // clamp to canvas bounds
- // newLeft = Math.Max(0, Math.Min(newLeft, ChannelsCanvas.ActualWidth - _draggedElement.RenderSize.Width));
- // newTop = Math.Max(0, Math.Min(newTop, ChannelsCanvas.ActualHeight - _draggedElement.RenderSize.Height));
-
- // Canvas.SetLeft(_draggedElement, newLeft);
- // Canvas.SetTop(_draggedElement, newTop);
-
- // if (_draggedElement is ChannelBox cb)
- // _settingsManager.UpdateChannelPosition(cb.ChannelName, newLeft, newTop);
-
- // AdjustCanvasHeight();
- //}
-
-
private void ChannelBox_MouseRightButtonDown(object sender, MouseButtonEventArgs e)
{
if (!isEditMode || !_isDragging || _draggedElement == null) return;
From d12efcba32d8d235aa950487f32dc467fae8278a Mon Sep 17 00:00:00 2001
From: Devin G <149845346+DeathSoulYTDev@users.noreply.github.com>
Date: Sun, 21 Sep 2025 16:09:40 -0400
Subject: [PATCH 12/17] Update/Bug Fixes
- Fixed The Global Ptt & Alert Tone 3 Buttons as they where previously swaped Somehow
- Updated Styling Of the Channels Groups/ZoneTabs
- Updated Styling to a Dark Mode
---
WhackerLinkConsoleV2/ChannelBox.xaml | 2 +-
WhackerLinkConsoleV2/ChannelBox.xaml.cs | 6 +-
WhackerLinkConsoleV2/MainWindow.xaml | 291 ++++++++++++++++++------
WhackerLinkConsoleV2/MainWindow.xaml.cs | 61 ++++-
WhackerLinkConsoleV2/Themes.xaml | 29 +++
WhackerLinkConsoleV2/ToneSet.xaml | 8 +-
WhackerLinkConsoleV2/ToneSet.xaml.cs | 4 +-
WhackerLinkLib | 2 +-
8 files changed, 323 insertions(+), 80 deletions(-)
create mode 100644 WhackerLinkConsoleV2/Themes.xaml
diff --git a/WhackerLinkConsoleV2/ChannelBox.xaml b/WhackerLinkConsoleV2/ChannelBox.xaml
index c5c8576..544c98c 100644
--- a/WhackerLinkConsoleV2/ChannelBox.xaml
+++ b/WhackerLinkConsoleV2/ChannelBox.xaml
@@ -4,7 +4,7 @@
Width="220" Height="100" Background="#FF0B004B">
-
+
diff --git a/WhackerLinkConsoleV2/ChannelBox.xaml.cs b/WhackerLinkConsoleV2/ChannelBox.xaml.cs
index cf90922..e3bfebc 100644
--- a/WhackerLinkConsoleV2/ChannelBox.xaml.cs
+++ b/WhackerLinkConsoleV2/ChannelBox.xaml.cs
@@ -232,7 +232,7 @@ private void ChannelBox_MouseLeftButtonDown(object sender, MouseButtonEventArgs
if (IsEditMode) return;
IsSelected = !IsSelected;
- Background = IsSelected ? (Brush)new BrushConverter().ConvertFrom("#FF0B004B") : Brushes.Gray;
+ Background = IsSelected ? (Brush)new BrushConverter().ConvertFrom("#FF0B004B") : (Brush)new BrushConverter().ConvertFrom("#888888");
if (IsSelected)
{
@@ -278,11 +278,11 @@ private void UpdateBackground()
{
if (SystemName == MainWindow.PLAYBACKSYS || ChannelName == MainWindow.PLAYBACKCHNAME || DstId == MainWindow.PLAYBACKTG)
{
- Background = IsSelected ? (Brush)new BrushConverter().ConvertFrom("#FFC90000") : Brushes.DarkGray;
+ Background = IsSelected ? (Brush)new BrushConverter().ConvertFrom("#FFC90000") : (Brush)new BrushConverter().ConvertFrom("#888888");
return;
}
- Background = IsSelected ? (Brush)new BrushConverter().ConvertFrom("#FF0B004B") : Brushes.DarkGray;
+ Background = IsSelected ? (Brush)new BrushConverter().ConvertFrom("#FF0B004B") : (Brush)new BrushConverter().ConvertFrom("#888888");
}
private async void PTTButton_Click(object sender, RoutedEventArgs e)
diff --git a/WhackerLinkConsoleV2/MainWindow.xaml b/WhackerLinkConsoleV2/MainWindow.xaml
index 8cb7429..8c85a7a 100644
--- a/WhackerLinkConsoleV2/MainWindow.xaml
+++ b/WhackerLinkConsoleV2/MainWindow.xaml
@@ -2,11 +2,197 @@
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
Title="WhackerLinkConsoleV2" Height="600" Width="1000" Background="#FFF2F2F2">
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
+
+
+
@@ -17,85 +203,54 @@
-
+
-
-
+
+
-
diff --git a/WhackerLinkConsoleV2/MainWindow.xaml.cs b/WhackerLinkConsoleV2/MainWindow.xaml.cs
index 5934994..e0ff649 100644
--- a/WhackerLinkConsoleV2/MainWindow.xaml.cs
+++ b/WhackerLinkConsoleV2/MainWindow.xaml.cs
@@ -50,6 +50,8 @@
using static WhackerLinkConsoleV2.P25Crypto;
//using static WhackerLinkLib.Models.Radio.Codeplug;
using System.Threading.Channels;
+using System.Windows.Controls.Primitives;
+using System.Windows.Media.Animation;
namespace WhackerLinkConsoleV2
{
@@ -108,6 +110,9 @@ public MainWindow()
ConsoleNative.ShowConsole();
#endif
InitializeComponent();
+ ChannelsTabControl.Loaded += (s, e) => UpdateIndicator(false);
+ ChannelsTabControl.SelectionChanged += (s, e) => UpdateIndicator(true);
+ //ChannelsTabControl.SelectionChanged += ChannelsTabControl_SelectionChanged;
_settingsManager.LoadSettings();
@@ -140,6 +145,59 @@ public MainWindow()
Loaded += MainWindow_Loaded;
}
+
+ private void ChannelsTabControl_Loaded(object sender, RoutedEventArgs e)
+ {
+ UpdateIndicator(false);
+ }
+
+ private void ChannelsTabControl_SelectionChanged(object sender, SelectionChangedEventArgs e)
+ {
+ UpdateIndicator(true);
+ }
+
+ private void UpdateIndicator(bool animate)
+ {
+ var indicator = ChannelsTabControl.Template.FindName("SelectionIndicator", ChannelsTabControl) as Border;
+ var transform = indicator?.RenderTransform as TranslateTransform;
+ if (indicator == null || transform == null) return;
+
+ if (ChannelsTabControl.SelectedItem is TabItem selectedTab)
+ {
+ // Force layout update to get correct ActualWidth
+ selectedTab.UpdateLayout();
+ ChannelsTabControl.UpdateLayout();
+
+ // Measure tab position relative to TabControl (not TabPanel)
+ var tabPos = selectedTab.TransformToAncestor(ChannelsTabControl).Transform(new Point(0, 0));
+ double targetX = tabPos.X;
+ double targetWidth = selectedTab.ActualWidth;
+
+ if (animate)
+ {
+ // Animate horizontal position
+ var animX = new DoubleAnimation(transform.X, targetX, TimeSpan.FromMilliseconds(250))
+ {
+ EasingFunction = new CubicEase { EasingMode = EasingMode.EaseInOut }
+ };
+ transform.BeginAnimation(TranslateTransform.XProperty, animX);
+
+ // Animate width
+ var animW = new DoubleAnimation(indicator.Width, targetWidth, TimeSpan.FromMilliseconds(250))
+ {
+ EasingFunction = new CubicEase { EasingMode = EasingMode.EaseInOut }
+ };
+ indicator.BeginAnimation(FrameworkElement.WidthProperty, animW);
+ }
+ else
+ {
+ // Snap immediately (for startup)
+ transform.X = targetX;
+ indicator.Width = targetWidth;
+ }
+ }
+ }
+
private class YamlConfig
{
public List Tones { get; set; }
@@ -1767,6 +1825,7 @@ private void ChannelBox_MouseMove(object sender, MouseEventArgs e)
AdjustCanvasHeight();
}
+
private void ChannelBox_MouseRightButtonDown(object sender, MouseButtonEventArgs e)
{
if (!isEditMode || !_isDragging || _draggedElement == null) return;
@@ -2150,7 +2209,7 @@ private async void btnGlobalPtt_Click(object sender, RoutedEventArgs e)
{
Dispatcher.Invoke(() =>
{
- btnGlobalPtt.Background = channel.grayGradient;
+ btnGlobalPtt.Background = (Brush)new BrushConverter().ConvertFrom("#888888");
});
GRP_VCH_RLS release = new GRP_VCH_RLS
diff --git a/WhackerLinkConsoleV2/Themes.xaml b/WhackerLinkConsoleV2/Themes.xaml
new file mode 100644
index 0000000..745f8a2
--- /dev/null
+++ b/WhackerLinkConsoleV2/Themes.xaml
@@ -0,0 +1,29 @@
+
+
+
+
+ #3A86FF
+ #FFFFFF
+ #F2F2F2
+ #E6E6E6
+ #FFFFFF
+ #222222
+ #999999
+
+
+
+
+ #3A86FF
+ #1E1E1E
+ #2C2C2C
+ #333333
+ #2C2C2C
+ #FFFFFF
+ #777777
+
+
+
+
+
diff --git a/WhackerLinkConsoleV2/ToneSet.xaml b/WhackerLinkConsoleV2/ToneSet.xaml
index 584e105..8fea962 100644
--- a/WhackerLinkConsoleV2/ToneSet.xaml
+++ b/WhackerLinkConsoleV2/ToneSet.xaml
@@ -2,11 +2,11 @@
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
Width="220" Height="100" Background="#FF0B004B">
-
+
-
+
-