diff --git a/DVMConsole/MainWindow.xaml b/DVMConsole/MainWindow.xaml
index 8868269..4a0daaf 100644
--- a/DVMConsole/MainWindow.xaml
+++ b/DVMConsole/MainWindow.xaml
@@ -25,20 +25,22 @@
diff --git a/DVMConsole/MainWindow.xaml.cs b/DVMConsole/MainWindow.xaml.cs
index 09ae7ee..92db99d 100644
--- a/DVMConsole/MainWindow.xaml.cs
+++ b/DVMConsole/MainWindow.xaml.cs
@@ -85,7 +85,7 @@ namespace dvmconsole
CallHistoryWindow callHistoryWindow = new CallHistoryWindow();
public static string PLAYBACKTG = "LOCPLAYBACK";
- public static string PLAYBACKSYS = "LOCPLAYBACKSYS";
+ public static string PLAYBACKSYS = "Local Playback";
public static string PLAYBACKCHNAME = "PLAYBACK";
private readonly WaveInEvent waveIn;
@@ -258,7 +258,7 @@ namespace dvmconsole
Dispatcher.Invoke(() =>
{
- systemStatusBox.Background = new SolidColorBrush(Colors.Red);
+ systemStatusBox.Background = new SolidColorBrush(Colors.DarkRed);
systemStatusBox.ConnectionState = "Disconnected";
});
};
@@ -1625,7 +1625,7 @@ namespace dvmconsole
catch (Exception) { }
if (string.IsNullOrEmpty(alias))
- channel.LastSrcId = "Last SRC: " + e.SrcId;
+ channel.LastSrcId = "Last ID: " + e.SrcId;
else
channel.LastSrcId = "Last: " + alias;
diff --git a/dvmconsole/Controls/ChannelBox.xaml b/dvmconsole/Controls/ChannelBox.xaml
index 1be0e67..9f990a1 100644
--- a/dvmconsole/Controls/ChannelBox.xaml
+++ b/dvmconsole/Controls/ChannelBox.xaml
@@ -1,9 +1,9 @@
+ Width="220" Height="100">
-
+
diff --git a/dvmconsole/Controls/ChannelBox.xaml.cs b/dvmconsole/Controls/ChannelBox.xaml.cs
index 5c16c86..c31f886 100644
--- a/dvmconsole/Controls/ChannelBox.xaml.cs
+++ b/dvmconsole/Controls/ChannelBox.xaml.cs
@@ -8,6 +8,7 @@
* @license AGPLv3 License (https://opensource.org/licenses/AGPL-3.0)
*
* Copyright (C) 2025 Caleb, K4PHP
+* Copyright (C) 2025 Bryan Biedenkapp, N2PLL
*
*/
@@ -26,6 +27,10 @@ namespace dvmconsole.Controls
///
public partial class ChannelBox : UserControl, INotifyPropertyChanged
{
+ private readonly static Brush DESELECTED_COLOR = Brushes.Gray;
+ private readonly static Brush SELECTED_COLOR = (Brush)new BrushConverter().ConvertFrom("#FF0B004B");
+ private readonly static Brush PLYBK_SELECTED_COLOR = (Brush)new BrushConverter().ConvertFrom("#FFC90000");
+
private readonly SelectedChannelsManager selectedChannelsManager;
private readonly AudioManager audioManager;
@@ -310,7 +315,7 @@ namespace dvmconsole.Controls
return;
IsSelected = !IsSelected;
- Background = IsSelected ? (Brush)new BrushConverter().ConvertFrom("#FF0B004B") : Brushes.Gray;
+ ControlBorder.Background = IsSelected ? SELECTED_COLOR : DESELECTED_COLOR;
if (IsSelected)
selectedChannelsManager.AddSelectedChannel(this);
@@ -364,11 +369,11 @@ namespace dvmconsole.Controls
{
if (SystemName == MainWindow.PLAYBACKSYS || ChannelName == MainWindow.PLAYBACKCHNAME || DstId == MainWindow.PLAYBACKTG)
{
- Background = IsSelected ? (Brush)new BrushConverter().ConvertFrom("#FFC90000") : Brushes.DarkGray;
+ ControlBorder.Background = IsSelected ? PLYBK_SELECTED_COLOR : DESELECTED_COLOR;
return;
}
- Background = IsSelected ? (Brush)new BrushConverter().ConvertFrom("#FF0B004B") : Brushes.DarkGray;
+ ControlBorder.Background = IsSelected ? SELECTED_COLOR : DESELECTED_COLOR;
}
///
diff --git a/dvmconsole/Controls/SystemStatusBox.xaml b/dvmconsole/Controls/SystemStatusBox.xaml
index 9b5534f..0646a47 100644
--- a/dvmconsole/Controls/SystemStatusBox.xaml
+++ b/dvmconsole/Controls/SystemStatusBox.xaml
@@ -1,12 +1,11 @@
-
-
-
-
+ Width="105" Height="55">
+
+
+
+
-
\ No newline at end of file
diff --git a/dvmconsole/Controls/SystemStatusBox.xaml.cs b/dvmconsole/Controls/SystemStatusBox.xaml.cs
index 4bc3ad8..7ce1df2 100644
--- a/dvmconsole/Controls/SystemStatusBox.xaml.cs
+++ b/dvmconsole/Controls/SystemStatusBox.xaml.cs
@@ -14,6 +14,7 @@
using System.ComponentModel;
using System.Runtime.CompilerServices;
using System.Windows.Controls;
+using System.Windows.Media;
namespace dvmconsole.Controls
{
@@ -53,6 +54,15 @@ namespace dvmconsole.Controls
}
}
+ ///
+ /// Gets or sets the that fills the area between the bounds of the control border.
+ ///
+ public new Brush Background
+ {
+ get => ControlBorder.Background;
+ set => ControlBorder.Background = value;
+ }
+
/*
** Events
*/