diff --git a/DCS-SR-Client/Input/InputDeviceManager.cs b/DCS-SR-Client/Input/InputDeviceManager.cs index 862afed0..523936cb 100644 --- a/DCS-SR-Client/Input/InputDeviceManager.cs +++ b/DCS-SR-Client/Input/InputDeviceManager.cs @@ -690,15 +690,15 @@ public void StartDetectPtt(DetectPttCallback callback) { //run on main Application.Current.Dispatcher.Invoke( - () => { _toggleOverlayCallback(false, 8); }); - break; + () => { _toggleOverlayCallback(false, 8); }); // Change second digit to match overlay window number you want to open + break; // TODO Replace "8" with 10T panel ID number } else if (bindState.IsActive && bindState.MainDevice.InputBind == InputBinding.AwacsOverlayToggle) { //run on main Application.Current.Dispatcher.Invoke( - () => { _toggleOverlayCallback(false, 7); }); - break; + () => { _toggleOverlayCallback(false, 7); }); // Change second digit to match overlay window number you want to open + break; } else if ((int)bindState.MainDevice.InputBind >= (int)InputBinding.Up100 && (int)bindState.MainDevice.InputBind <= (int)InputBinding.AwacsOverlayToggle) diff --git a/DCS-SR-Client/UI/ClientWindow/InputBindingControl.xaml b/DCS-SR-Client/UI/ClientWindow/InputBindingControl.xaml index 6548e645..5b39547c 100644 --- a/DCS-SR-Client/UI/ClientWindow/InputBindingControl.xaml +++ b/DCS-SR-Client/UI/ClientWindow/InputBindingControl.xaml @@ -5,18 +5,20 @@ xmlns:local="clr-namespace:Ciribob.DCS.SimpleRadio.Standalone.Client.UI" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" d:DesignHeight="100" - d:DesignWidth="300" + d:DesignWidth="500" + BorderBrush="Black" + BorderThickness="0,1,0,0" mc:Ignorable="d"> - - - - + + + + @@ -29,10 +31,13 @@ Grid.Row="0" Grid.Column="0" VerticalContentAlignment="Center" + BorderBrush="Black" + BorderThickness="0,0,1,0" Content="Control" /> diff --git a/DCS-SR-Client/UI/ClientWindow/InputBindingControl.xaml.cs b/DCS-SR-Client/UI/ClientWindow/InputBindingControl.xaml.cs index 0c8fbbb8..8d686d95 100644 --- a/DCS-SR-Client/UI/ClientWindow/InputBindingControl.xaml.cs +++ b/DCS-SR-Client/UI/ClientWindow/InputBindingControl.xaml.cs @@ -35,7 +35,7 @@ public InputDeviceManager InputDeviceManager public void LoadInputSettings() { DeviceLabel.Content = InputName; - ModifierLabel.Content = InputName + " Modifier"; + ModifierLabel.Content = " + Modifier"; ModifierBinding = (InputBinding)((int)ControlInputBinding) + 100; //add 100 gets the enum of the modifier var currentInputProfile = GlobalSettingsStore.Instance.ProfileSettingsStore.GetCurrentInputProfile(); diff --git a/DCS-SR-Client/UI/ClientWindow/MainWindow.xaml b/DCS-SR-Client/UI/ClientWindow/MainWindow.xaml index 13f7ba22..43d781a8 100644 --- a/DCS-SR-Client/UI/ClientWindow/MainWindow.xaml +++ b/DCS-SR-Client/UI/ClientWindow/MainWindow.xaml @@ -512,7 +512,7 @@ - + @@ -520,18 +520,20 @@ - +