diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 48e254cf..372361b8 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -31,7 +31,7 @@ jobs:
uses: nuget/setup-nuget@v1
- name: Build & Package
- run: ./build.bat ".\SRS-Radio-Presets" ${{ steps.version.outputs.version_tag }}
+ run: ./build.bat ${{ steps.version.outputs.version_tag }}
- name: Setup VSTest
uses: Malcolmnixon/Setup-VSTest@v3
@@ -50,6 +50,6 @@ jobs:
tag: ${{ steps.version.outputs.version_tag }}
name: Release ${{ steps.version.outputs.version_tag }}
body: "Please update Release notes"
- artifacts: "Vanguard-SRS-${{ steps.version.outputs.version_tag }}.zip"
+ artifacts: "VCS-SRS-${{ steps.version.outputs.version_tag }}.zip"
token: ${{ secrets.GITHUB_TOKEN }}
draft: true
diff --git a/DCS-SR-Client/DCS-SR-Client.csproj b/DCS-SR-Client/DCS-SR-Client.csproj
index 0cbaf465..87c3ed8e 100644
--- a/DCS-SR-Client/DCS-SR-Client.csproj
+++ b/DCS-SR-Client/DCS-SR-Client.csproj
@@ -380,8 +380,8 @@
LegacyPage.xaml
-
- MiscellaneousPage.xaml
+
+ BalancingPage.xamlRadioEffectsPage.xaml
@@ -564,7 +564,7 @@
-
+
@@ -893,9 +893,6 @@
Always
-
-
-
diff --git a/DCS-SR-Client/Input/InputDeviceManager.cs b/DCS-SR-Client/Input/InputDeviceManager.cs
index 63275402..89e5f90a 100644
--- a/DCS-SR-Client/Input/InputDeviceManager.cs
+++ b/DCS-SR-Client/Input/InputDeviceManager.cs
@@ -7,6 +7,7 @@
using System.Windows;
using System.Xml.Serialization;
using System.Windows.Interop;
+using System.Windows.Threading;
using Ciribob.DCS.SimpleRadio.Standalone.Client.Network;
using Ciribob.DCS.SimpleRadio.Standalone.Client.Settings;
using Ciribob.DCS.SimpleRadio.Standalone.Client.Singletons;
@@ -64,6 +65,7 @@ public class InputDeviceManager : IDisposable
private readonly DirectInput _directInput;
private readonly Dictionary _inputDevices = new Dictionary();
private readonly MainWindow.ToggleOverlayCallback _toggleOverlayCallback;
+ private readonly MainWindow.UpdateChannelCallback _updateChannelCallback;
private volatile bool _detectPtt;
@@ -74,7 +76,7 @@ public class InputDeviceManager : IDisposable
private readonly Settings.GlobalSettingsStore _globalSettings = Settings.GlobalSettingsStore.Instance;
- public InputDeviceManager(Window window, MainWindow.ToggleOverlayCallback _toggleOverlayCallback)
+ public InputDeviceManager(Window window, MainWindow.ToggleOverlayCallback _toggleOverlayCallback, MainWindow.UpdateChannelCallback _updateChannelCallback)
{
_directInput = new DirectInput();
@@ -83,6 +85,7 @@ public InputDeviceManager(Window window, MainWindow.ToggleOverlayCallback _toggl
new WindowInteropHelper(window);
this._toggleOverlayCallback = _toggleOverlayCallback;
+ this._updateChannelCallback = _updateChannelCallback;
LoadWhiteList();
@@ -691,6 +694,8 @@ public void StartDetectPtt(DetectPttCallback callback)
if (dcsPlayerRadioInfo != null && dcsPlayerRadioInfo.IsCurrent())
{
+ var currentChannel = GetCurrentChannel();
+ var currentBalance = 0.0f;
switch (bindState.MainDevice.InputBind)
{
case InputBinding.Up100:
@@ -766,7 +771,6 @@ public void StartDetectPtt(DetectPttCallback callback)
var radioId = dcsPlayerRadioInfo.selected;
var freq = dcsPlayerRadioInfo.radios[dcsPlayerRadioInfo.selected].freq;
var standbyFreq = dcsPlayerRadioInfo.radios[dcsPlayerRadioInfo.selected].standbyfreq ;
-
RadioHelper.UpdateStandbyRadioFrequency(freq, radioId, false, false);
RadioHelper.UpdateRadioFrequency(standbyFreq, radioId, false, false);
break;
@@ -813,16 +817,25 @@ public void StartDetectPtt(DetectPttCallback callback)
Application.Current.Dispatcher.Invoke(() => { _toggleOverlayCallback(false, MainWindow.SwitchIndex); });
break;
case InputBinding.LeftBalance:
- // TODO: Call back new UI for update
- _globalSettings.ProfileSettingsStore.SetClientSettingFloat(GetCurrentChannel(), Math.Max(_globalSettings.ProfileSettingsStore.GetClientSettingFloat(GetCurrentChannel()) - 0.1f, -1.0f));
+ currentChannel = GetCurrentChannel();
+ currentBalance = Math.Max(_globalSettings.ProfileSettingsStore.GetClientSettingFloat(currentChannel) - 0.1f, -1.0f);
+ _globalSettings.ProfileSettingsStore.SetClientSettingFloat(currentChannel, currentBalance);
+ Application.Current.Dispatcher.Invoke(DispatcherPriority.Background,
+ new ThreadStart(delegate { _updateChannelCallback(currentChannel, currentBalance); }));
break;
case InputBinding.RightBalance:
- // TODO: Call back new UI for update
- _globalSettings.ProfileSettingsStore.SetClientSettingFloat(GetCurrentChannel(), Math.Min(_globalSettings.ProfileSettingsStore.GetClientSettingFloat(GetCurrentChannel()) + 0.1f, 1.0f));
+ currentChannel = GetCurrentChannel();
+ currentBalance = Math.Min(_globalSettings.ProfileSettingsStore.GetClientSettingFloat(currentChannel) + 0.1f, 1.0f);
+ _globalSettings.ProfileSettingsStore.SetClientSettingFloat(currentChannel, currentBalance);
+ Application.Current.Dispatcher.Invoke(DispatcherPriority.Background,
+ new ThreadStart(delegate { _updateChannelCallback(currentChannel, currentBalance); }));
break;
case InputBinding.CenterBalance:
- // TODO: Call back new UI for update
- _globalSettings.ProfileSettingsStore.SetClientSettingFloat(GetCurrentChannel(), 0f);
+ currentChannel = GetCurrentChannel();
+ currentBalance = 0f;
+ _globalSettings.ProfileSettingsStore.SetClientSettingFloat(currentChannel, currentBalance);
+ Application.Current.Dispatcher.Invoke(DispatcherPriority.Background,
+ new ThreadStart(delegate { _updateChannelCallback(currentChannel, currentBalance); }));
break;
case InputBinding.PanelNightMode:
// TODO: Call back UI for update
diff --git a/DCS-SR-Client/Network/DCS/DCSRadioSyncManager.cs b/DCS-SR-Client/Network/DCS/DCSRadioSyncManager.cs
index 9d95fe15..f3088b3f 100644
--- a/DCS-SR-Client/Network/DCS/DCSRadioSyncManager.cs
+++ b/DCS-SR-Client/Network/DCS/DCSRadioSyncManager.cs
@@ -11,6 +11,7 @@
using Ciribob.DCS.SimpleRadio.Standalone.Common.Network;
using Newtonsoft.Json;
using NLog;
+using Xamarin.Forms.Internals;
/**
Keeps radio information in Sync Between DCS and
@@ -105,6 +106,10 @@ public void StartExternalAWACSModeLoop()
{
radioJson = File.ReadAllText(AWACS_RADIOS_FILE);
awacsRadios = JsonConvert.DeserializeObject(radioJson);
+ foreach (var radio in awacsRadios)
+ {
+ Logger.Debug($"Loaded AWACS radio file: '{radio.name}': freq: {radio.freq}, stbyfreq: {radio.standbyfreq}");
+ }
}
}
catch (Exception ex)
diff --git a/DCS-SR-Client/Network/SRSClientSyncHandler.cs b/DCS-SR-Client/Network/SRSClientSyncHandler.cs
index bb239439..80433595 100644
--- a/DCS-SR-Client/Network/SRSClientSyncHandler.cs
+++ b/DCS-SR-Client/Network/SRSClientSyncHandler.cs
@@ -40,6 +40,8 @@ public class SRSClientSyncHandler
private IPEndPoint _serverEndpoint;
private TcpClient _tcpClient;
+ private DateTime _connectedAt;
+
private readonly ClientStateSingleton _clientStateSingleton = ClientStateSingleton.Instance;
private readonly SyncedServerSettings _serverSettings = SyncedServerSettings.Instance;
private readonly ConnectedClientsSingleton _clients = ConnectedClientsSingleton.Instance;
@@ -159,7 +161,7 @@ private void Connect()
_vaicomSync.Start();
_tcpClient.NoDelay = true;
-
+ _connectedAt = DateTime.Now;
CallOnMain(true);
ClientSyncLoop();
}
@@ -343,7 +345,6 @@ private void ClientSyncLoop()
break;
case NetworkMessage.MessageType.RADIO_UPDATE:
case NetworkMessage.MessageType.UPDATE:
-
if (serverMessage.ServerSettings != null)
{
_serverSettings.Decode(serverMessage.ServerSettings);
@@ -403,10 +404,13 @@ private void ClientSyncLoop()
if (_clientStateSingleton.ExternalAWACSModelSelected &&
!_serverSettings.GetSettingAsBool(Common.Setting.ServerSettingsKeys.EXTERNAL_AWACS_MODE))
{
- Logger.Debug("Closing AWACS Mode after Update message...");
- Logger.Debug($"Mode selected: {_clientStateSingleton.ExternalAWACSModelSelected}");
- Logger.Debug($"Server AWACS Settings: {_serverSettings.GetSettingAsBool(Common.Setting.ServerSettingsKeys.EXTERNAL_AWACS_MODE)}");
- DisconnectExternalAWACSMode();
+ if (_connectedAt.AddSeconds(2) < DateTime.Now)
+ {
+ Logger.Debug("Closing AWACS Mode after Update message...");
+ Logger.Debug($"Mode selected: {_clientStateSingleton.ExternalAWACSModelSelected}");
+ Logger.Debug($"Server AWACS Settings: {_serverSettings.GetSettingAsBool(Common.Setting.ServerSettingsKeys.EXTERNAL_AWACS_MODE)}");
+ DisconnectExternalAWACSMode();
+ }
}
CallUpdateUIOnMain();
diff --git a/DCS-SR-Client/UI/AwacsRadioOverlayWindow/AwacsRadioControlGroup.xaml b/DCS-SR-Client/UI/AwacsRadioOverlayWindow/AwacsRadioControlGroup.xaml
index 5267caae..dc29350a 100644
--- a/DCS-SR-Client/UI/AwacsRadioOverlayWindow/AwacsRadioControlGroup.xaml
+++ b/DCS-SR-Client/UI/AwacsRadioOverlayWindow/AwacsRadioControlGroup.xaml
@@ -235,7 +235,6 @@
+ Width="15" >
+
+
+
+
+ Width="15" >
+
+
+
+
+ x:Name="TxEnd">
+
+
+
+
+
+
+
@@ -60,7 +73,6 @@
+ x:Name="RxStart">
+
+
+
+
+
+
+
+ x:Name="RxEnd">
+
+
+
+
+
+
+
diff --git a/DCS-SR-Client/UI/ClientWindow/SettingPages/RadioEffectsPage.xaml.cs b/DCS-SR-Client/UI/ClientWindow/SettingPages/RadioEffectsPage.xaml.cs
index 8ca59e2d..9fef8643 100644
--- a/DCS-SR-Client/UI/ClientWindow/SettingPages/RadioEffectsPage.xaml.cs
+++ b/DCS-SR-Client/UI/ClientWindow/SettingPages/RadioEffectsPage.xaml.cs
@@ -17,9 +17,13 @@ public RadioEffectsPage()
InitializeComponent();
TxStart.Background = _globalSettings.ProfileSettingsStore.GetClientSettingBool(ProfileSettingsKeys.RadioTxEffects_Start) ? _enabledBrush : _disabledBrush;
+ TxStartText.Text = _globalSettings.ProfileSettingsStore.GetClientSettingBool(ProfileSettingsKeys.RadioTxEffects_Start) ? "On" : "Off";
TxEnd.Background = _globalSettings.ProfileSettingsStore.GetClientSettingBool(ProfileSettingsKeys.RadioTxEffects_End) ? _enabledBrush : _disabledBrush;
+ TxEndText.Text = _globalSettings.ProfileSettingsStore.GetClientSettingBool(ProfileSettingsKeys.RadioTxEffects_Start) ? "On" : "Off";
RxStart.Background = _globalSettings.ProfileSettingsStore.GetClientSettingBool(ProfileSettingsKeys.RadioRxEffects_Start) ? _enabledBrush : _disabledBrush;
+ RxStartText.Text = _globalSettings.ProfileSettingsStore.GetClientSettingBool(ProfileSettingsKeys.RadioTxEffects_Start) ? "On" : "Off";
RxEnd.Background = _globalSettings.ProfileSettingsStore.GetClientSettingBool(ProfileSettingsKeys.RadioRxEffects_End) ? _enabledBrush : _disabledBrush;
+ RxEndText.Text = _globalSettings.ProfileSettingsStore.GetClientSettingBool(ProfileSettingsKeys.RadioTxEffects_Start) ? "On" : "Off";
RadioEndTransmitEffect.IsEnabled = false;
RadioEndTransmitEffect.ItemsSource = CachedAudioEffectProvider.Instance.RadioTransmissionEnd;
@@ -49,6 +53,7 @@ private void TxEnd_OnClick(object sender, RoutedEventArgs e)
var enabled = !_globalSettings.ProfileSettingsStore.GetClientSettingBool(ProfileSettingsKeys.RadioTxEffects_End);
_globalSettings.ProfileSettingsStore.SetClientSettingBool(ProfileSettingsKeys.RadioTxEffects_End, enabled);
TxEnd.Background = enabled ? _enabledBrush : _disabledBrush;
+ TxEndText.Text = enabled ? "On" : "Off";
}
private void TxStart_OnClick(object sender, RoutedEventArgs e)
@@ -56,6 +61,7 @@ private void TxStart_OnClick(object sender, RoutedEventArgs e)
var enabled = !_globalSettings.ProfileSettingsStore.GetClientSettingBool(ProfileSettingsKeys.RadioTxEffects_Start);
_globalSettings.ProfileSettingsStore.SetClientSettingBool(ProfileSettingsKeys.RadioTxEffects_Start, enabled);
TxStart.Background = enabled ? _enabledBrush : _disabledBrush;
+ TxStartText.Text = enabled ? "On" : "Off";
}
private void RxStart_OnClick(object sender, RoutedEventArgs e)
@@ -63,6 +69,7 @@ private void RxStart_OnClick(object sender, RoutedEventArgs e)
var enabled = !_globalSettings.ProfileSettingsStore.GetClientSettingBool(ProfileSettingsKeys.RadioRxEffects_Start);
_globalSettings.ProfileSettingsStore.SetClientSettingBool(ProfileSettingsKeys.RadioRxEffects_Start, enabled);
RxStart.Background = enabled ? _enabledBrush : _disabledBrush;
+ RxStartText.Text = enabled ? "On" : "Off";
}
private void RxEnd_OnClick(object sender, RoutedEventArgs e)
@@ -70,6 +77,7 @@ private void RxEnd_OnClick(object sender, RoutedEventArgs e)
var enabled = !_globalSettings.ProfileSettingsStore.GetClientSettingBool(ProfileSettingsKeys.RadioRxEffects_End);
_globalSettings.ProfileSettingsStore.SetClientSettingBool(ProfileSettingsKeys.RadioRxEffects_End, enabled);
RxEnd.Background = enabled ? _enabledBrush : _disabledBrush;
+ RxEndText.Text = enabled ? "On" : "Off";
}
}
}
\ No newline at end of file
diff --git a/DCS-SR-Client/UI/ClientWindow/SettingPages/SettingsPage.xaml b/DCS-SR-Client/UI/ClientWindow/SettingPages/SettingsPage.xaml
index e5934fcc..d804d6cc 100644
--- a/DCS-SR-Client/UI/ClientWindow/SettingPages/SettingsPage.xaml
+++ b/DCS-SR-Client/UI/ClientWindow/SettingPages/SettingsPage.xaml
@@ -41,6 +41,7 @@
HorizontalAlignment="Center"
Margin="0,-10,0,0" />
+
+
+
@@ -164,8 +180,7 @@
+ Width="185">
-
+
+ Width="185">
-
+
-
+ Margin="0,10,0,0"
+ Style="{StaticResource MaterialDesignHeadline3TextBlock}"
+ Text="Vanguard Communications System" />
+ Margin="0,-10,0,0" />
+
+
- VCS-SRS Standard Operating Procedures (SOP)
+ VCS Standard Operating Procedures Manual
- The Vanguard SRS SOP can be found here
+ The VCS (Vanguard Communication System) SOP can be found here
, as well as on the vngd.net website under the Command Library section.
@@ -156,14 +168,13 @@
FontSize="16"
FontWeight="Bold"
Grid.Row="0">
- Vanguard VCS-SRS Server Information
+ VCS Server Information
- The Vanguard SRS server information can be found on the Vanguard website or in the Vanguard Discord channel#srs-status
- .
+ The VCS server information can be found on the Vanguard website or in the Vanguard Discord channel #srs-status.
Credits & Acknowledgments
- This software was originally developed by Ciribob (which can be foundhere
- ),
+ This software was originally developed by Ciribob (which can be found here),
who was gracious enough to allow us to modify it to suit Vanguard's needs.
This software has additional versions planned, but due to our real life commitments, will take some time to accomplish.
If you are interested in assisting with the continued development of SRS for Vanguard, please do not hesitate to reach
out to the SRS Development Team.
- The main author for this version is FPGSchiba, with additional support from Archangel-93, AdamCelestial, Gweezlebur, and Dabble1.
- VCS-SRS Development Team
+ The main author for this version is FPGSchiba, with additional support from Gweezlebur, and Dabble1.
+ VCS Development Team
- Dabble1, FPGSchiba, Volts_Alpaca, Gweezlebur, Archangel-93, AdamCelestial
+ Dabble1, FPGSchiba, Gweezlebur, Archangel-93
- VCS-SRS Graphic Design Team
+ VCS Graphic Design Team
Cheekermonkey, FPGElphi, Noah_Prinzrot, pr0x
@@ -241,13 +251,13 @@
AdamCelestial, Archangel-93
- Check the videos out here:Vanguard SRS Tutorial Videos
+ Check the videos out here: VCS Tutorial VideosHonorable Mentions
Quantum-Physicist, Esdin, TheAlexi, ZZGooch, Hohh2O, and SpaceHarvest for believing in the project.
Without their support, we would not be where we are today. Additionally, we would like to thank Krehl
- and Cold_Kill for playing an intregal part initially getting the Vanguard SRS server setup.
+ and Cold_Kill for playing an intregal part initially getting the VCS server setup.
Finally, thank you to everyone of you who has helped provide guidance, feedback, and support for the project.
None of this would be important without all of you. On behalf of the entire development team, thank you!
@@ -281,7 +291,79 @@
FontSize="14"
PagePadding="10,0">
- To be filled out later. Dont copy it without our permission. Common Use license.
+
+ GNU GENERAL PUBLIC LICENSE Version 3, 29 June 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc.
+
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+ Exact License: here
+
+ Preamble
+
+ The GNU General Public License is a free, copyleft license for
+ software and other kinds of works.
+
+ The licenses for most software and other practical works are designed
+ to take away your freedom to share and change the works. By contrast,
+ the GNU General Public License is intended to guarantee your freedom to
+ share and change all versions of a program--to make sure it remains free
+ software for all its users. We, the Free Software Foundation, use the
+ GNU General Public License for most of our software; it applies also to
+ any other work released this way by its authors. You can apply it to
+ your programs, too.
+
+ When we speak of free software, we are referring to freedom, not
+ price. Our General Public Licenses are designed to make sure that you
+ have the freedom to distribute copies of free software (and charge for
+ them if you wish), that you receive source code or can get it if you
+ want it, that you can change the software or use pieces of it in new
+ free programs, and that you know you can do these things.
+
+ To protect your rights, we need to prevent others from denying you
+ these rights or asking you to surrender the rights. Therefore, you have
+ certain responsibilities if you distribute copies of the software, or if
+ you modify it: responsibilities to respect the freedom of others.
+
+ For example, if you distribute copies of such a program, whether
+ gratis or for a fee, you must pass on to the recipients the same
+ freedoms that you received. You must make sure that they, too, receive
+ or can get the source code. And you must show them these terms so they
+ know their rights.
+
+ Developers that use the GNU GPL protect your rights with two steps:
+ (1) assert copyright on the software, and (2) offer you this License
+ giving you legal permission to copy, distribute and/or modify it.
+
+ For the developers' and authors' protection, the GPL clearly explains
+ that there is no warranty for this free software. For both users' and
+ authors' sake, the GPL requires that modified versions be marked as
+ changed, so that their problems will not be attributed erroneously to
+ authors of previous versions.
+
+ Some devices are designed to deny users access to install or run
+ modified versions of the software inside them, although the manufacturer
+ can do so. This is fundamentally incompatible with the aim of
+ protecting users' freedom to change the software. The systematic
+ pattern of such abuse occurs in the area of products for individuals to
+ use, which is precisely where it is most unacceptable. Therefore, we
+ have designed this version of the GPL to prohibit the practice for those
+ products. If such problems arise substantially in other domains, we
+ stand ready to extend this provision to those domains in future versions
+ of the GPL, as needed to protect the freedom of users.
+
+ Finally, every program is threatened constantly by software patents.
+ States should not allow patents to restrict development and use of
+ software on general-purpose computers, but in those that do, we wish to
+ avoid the special danger that patents applied to a free program could
+ make it effectively proprietary. To prevent this, the GPL assures that
+ patents cannot be used to render the program non-free.
+
+ The precise terms and conditions for copying, distribution and
+ modification follow.
+
We aren’t affiliated with RSI, CIG, SRS, or any other entity.
@@ -315,14 +397,13 @@
PagePadding="10,0">
Latest Version & Updates
- While we wish to eventually add one, VCS-SRS does not currently have an autoupdater. You can always get the latest version from GitHub’s Release section for VNGD-SRS:
+ While we wish to eventually add one, VCS does not currently have an autoupdater. You can always get the latest version from GitHub’s Release section for VNGD-SRS:
https://github.com/FPGSchiba/VNGD-SimpleRadioStandalone/releases/latest
- Old Versions arehere
- .
+ Old Versions are here.
@@ -397,10 +478,12 @@
materialDesign:HintAssist.Hint="Input your Feedback here"
AcceptsReturn="True"
SpellCheck.IsEnabled="True"
+ TextChanged="FeedbackText_OnTextChanged"
Style="{StaticResource MaterialDesignOutlinedTextBox}"
TextWrapping="Wrap"
VerticalScrollBarVisibility="Auto"
VerticalAlignment="Stretch"
+ MaxLength="4000"
Margin="5,0,5,5"
x:Name="FeedbackText"
/>
@@ -408,12 +491,14 @@
Grid.Row="2"
Grid.Column="1"
Click="Submit_OnClick"
+ IsEnabled="False"
Content="SUBMIT"
Margin="5,5,5,5"
VerticalAlignment="Stretch"
HorizontalAlignment="Stretch"
Style="{StaticResource MaterialDesignFlatDarkBgButton}"
materialDesign:ButtonAssist.CornerRadius="15"
+ Name="SubmitButton"
/>
diff --git a/DCS-SR-Client/UI/ClientWindow/SupportPage.xaml.cs b/DCS-SR-Client/UI/ClientWindow/SupportPage.xaml.cs
index 3f124344..84066d76 100644
--- a/DCS-SR-Client/UI/ClientWindow/SupportPage.xaml.cs
+++ b/DCS-SR-Client/UI/ClientWindow/SupportPage.xaml.cs
@@ -2,6 +2,7 @@
using System.Collections.Generic;
using System.Diagnostics;
using System.Linq;
+using System.Net.Mail;
using System.Text;
using System.Threading.Tasks;
using System.Windows;
@@ -37,9 +38,39 @@ private void Hyperlink_RequestNavigate(object sender, RequestNavigateEventArgs e
Process.Start(new ProcessStartInfo(e.Uri.AbsoluteUri));
e.Handled = true;
}
+
+ private static bool IsValid(string email)
+ {
+ var valid = true;
+
+ try
+ {
+ var _ = new MailAddress(email);
+ }
+ catch
+ {
+ valid = false;
+ }
+
+ return valid;
+ }
private void Submit_OnClick(object sender, RoutedEventArgs e)
{
+ if (string.IsNullOrEmpty(FeedbackText.Text) || string.IsNullOrEmpty(FeedbackType.Text) || string.IsNullOrEmpty(EmailText.Text))
+ {
+ MessageBox.Show("Please provide all necessary information before submitting.", "Missing Feedback", MessageBoxButton.OK,
+ MessageBoxImage.Error);
+ return;
+ }
+
+ if (!IsValid(EmailText.Text))
+ {
+ MessageBox.Show("Please provide a valid Email Address.", "Invalid Email", MessageBoxButton.OK,
+ MessageBoxImage.Error);
+ return;
+ }
+
var eventId = SentrySdk.CaptureMessage($"Feedback: {FeedbackType.Text}");
SentrySdk.CaptureUserFeedback(eventId, EmailText.Text, FeedbackText.Text, _mainWindow.GetPlayerName());
@@ -51,5 +82,15 @@ private void Submit_OnClick(object sender, RoutedEventArgs e)
MessageBoxImage.Information);
}
+
+ private void FeedbackText_OnTextChanged(object sender, TextChangedEventArgs e)
+ {
+ SubmitButton.IsEnabled = !string.IsNullOrEmpty(FeedbackText.Text);
+ }
+
+ private void Back_OnClick(object sender, RoutedEventArgs e)
+ {
+ _mainWindow.On_SupportBackClicked();
+ }
}
}
diff --git a/DCS-SR-Client/UI/ClientWindow/WelcomePages/WelcomePage.xaml b/DCS-SR-Client/UI/ClientWindow/WelcomePages/WelcomePage.xaml
index 6a7b6702..ef0303bf 100644
--- a/DCS-SR-Client/UI/ClientWindow/WelcomePages/WelcomePage.xaml
+++ b/DCS-SR-Client/UI/ClientWindow/WelcomePages/WelcomePage.xaml
@@ -31,6 +31,7 @@
+
+
diff --git a/DCS-SR-Client/UI/Components/KeybindingControl.xaml b/DCS-SR-Client/UI/Components/KeybindingControl.xaml
index a8bb364d..d8c1db14 100644
--- a/DCS-SR-Client/UI/Components/KeybindingControl.xaml
+++ b/DCS-SR-Client/UI/Components/KeybindingControl.xaml
@@ -34,10 +34,10 @@
-
+
-
+
+ SelectedItem="{Binding Path=SelectedPresetChannel}"
+ Margin="0,0,0,12">
+
+
+
+
+
+
-
+
\ No newline at end of file
diff --git a/DCS-SR-Client/UI/RadioOverlayWindow/PresetChannels/PresetChannelsViewTransparent1.xaml b/DCS-SR-Client/UI/RadioOverlayWindow/PresetChannels/PresetChannelsViewTransparent1.xaml
index a32ee740..d40d5eda 100644
--- a/DCS-SR-Client/UI/RadioOverlayWindow/PresetChannels/PresetChannelsViewTransparent1.xaml
+++ b/DCS-SR-Client/UI/RadioOverlayWindow/PresetChannels/PresetChannelsViewTransparent1.xaml
@@ -26,8 +26,13 @@
DropDownClosed="{mvvmEventBinding:EventBinding DropDownClosedCommand}"
ItemsSource="{Binding PresetChannels}"
SelectedItem="{Binding SelectedPresetChannel}"
- ToolTip="Select a predefined radio frequency via a dropdown menu" SelectionChanged="FrequencyDropDown_SelectionChanged"/>
-
+ ToolTip="Select a predefined radio frequency via a dropdown menu" SelectionChanged="FrequencyDropDown_SelectionChanged">
+
+
+
+
+
+
diff --git a/DCS-SR-Client/UI/RadioOverlayWindow/RadioOverlayTenSwitch.xaml b/DCS-SR-Client/UI/RadioOverlayWindow/RadioOverlayTenSwitch.xaml
index edf1ad9d..3230e7c4 100644
--- a/DCS-SR-Client/UI/RadioOverlayWindow/RadioOverlayTenSwitch.xaml
+++ b/DCS-SR-Client/UI/RadioOverlayWindow/RadioOverlayTenSwitch.xaml
@@ -13,7 +13,6 @@
MinHeight="260"
AllowsTransparency="True"
Background="#444"
- LocationChanged="RadioOverlayWindow_OnLocationChanged"
Opacity="1.0"
ResizeMode="CanResizeWithGrip"
Style="{x:Null}"
diff --git a/DCS-SR-Client/UI/RadioOverlayWindow/RadioOverlayTenSwitch.xaml.cs b/DCS-SR-Client/UI/RadioOverlayWindow/RadioOverlayTenSwitch.xaml.cs
index e5ee4a5a..64824ae4 100644
--- a/DCS-SR-Client/UI/RadioOverlayWindow/RadioOverlayTenSwitch.xaml.cs
+++ b/DCS-SR-Client/UI/RadioOverlayWindow/RadioOverlayTenSwitch.xaml.cs
@@ -6,8 +6,6 @@
using System.Windows.Input;
using System.Windows.Interop;
using System.Windows.Threading;
-using Ciribob.DCS.SimpleRadio.Standalone.Client;
-using Ciribob.DCS.SimpleRadio.Standalone.Client.Network;
using Ciribob.DCS.SimpleRadio.Standalone.Client.Settings;
using Ciribob.DCS.SimpleRadio.Standalone.Client.Singletons;
using Ciribob.DCS.SimpleRadio.Standalone.Client.UI;
@@ -15,11 +13,6 @@
using NLog;
using Ciribob.DCS.SimpleRadio.Standalone.Common;
using System.Windows.Forms;
-using Ciribob.DCS.SimpleRadio.Standalone.Client.UI.AwacsRadioOverlayWindow;
-using MessageBox = System.Windows.Forms.MessageBox;
-using System.Reflection.Metadata;
-using Xamarin.Forms.Shapes;
-using System.Windows.Media.Imaging;
using System.Windows.Media;
namespace Ciribob.DCS.SimpleRadio.Standalone.Overlay
@@ -41,10 +34,8 @@ public partial class RadioOverlayWindowTenSwitch : Window
private readonly GlobalSettingsStore _globalSettings = GlobalSettingsStore.Instance;
- private readonly double _originalMinHeight;
-
- private double radioHeight = 20;
- private double currentHeight;
+ private static readonly double RadioHeight = 20;
+ private double _currentHeight;
private long _lastUnitId;
@@ -72,14 +63,11 @@ public RadioOverlayWindowTenSwitch(Action ToggleOverlay)
//expand = Contracted
//contract = Expanded
buttonExpandText.Text = "expand";
-
-
this.WindowStartupLocation = WindowStartupLocation.Manual;
_aspectRatio = MinWidth / MinHeight;
-
- _originalMinHeight = MinHeight;
+
WindowInteropHelper windowInteropHelper = new WindowInteropHelper(MainWindow.GetWindow(this));
Screen screen = System.Windows.Forms.Screen.FromHandle(windowInteropHelper.Handle);
MaxHeight = screen.Bounds.Height;
@@ -108,12 +96,11 @@ public RadioOverlayWindowTenSwitch(Action ToggleOverlay)
Width = _globalSettings.GetPositionSetting(GlobalSettingsKeys.RadioTenSwitchWidth).DoubleValue;
Height = _globalSettings.GetPositionSetting(GlobalSettingsKeys.RadioTenSwitchHeight).DoubleValue;
- currentHeight = Height;
+ _currentHeight = Height;
- // Window_Loaded(null, null);
+ // Calculate initial scale and layout
CalculateScale();
-
- LocationChanged += Location_Changed;
+ containerPanel_SizeChanged(this, null);
RadioRefresh(null, null);
@@ -124,144 +111,83 @@ public RadioOverlayWindowTenSwitch(Action ToggleOverlay)
this._toggleOverlay = ToggleOverlay;
}
-
- private void Location_Changed(object sender, EventArgs e)
- {
- }
-
- private void RadioRefresh(object sender, EventArgs eventArgs)
+
+ private int getNumVisibleRadios()
{
- var dcsPlayerRadioInfo = _clientStateSingleton.DcsPlayerRadioInfo;
int numVisibleRadios = 0;
foreach (var radio in radioControlGroupSwitch)
{
- radioHeight = !double.IsNaN(radio.Height) ? radio.Height : 0;
radio.RepaintRadioStatus();
radio.RepaintRadioReceive();
- if ((buttonShowText.Text != null) && (buttonShowText.Text == "Hide"))
- {
- radio.Visibility = Visibility.Visible;
- numVisibleRadios++;
- // Console.WriteLine("radio " + radio.RadioLabel.ToString() + " set Visible");
- }
- else if (((buttonShowText.Text != null) && (buttonShowText.Text == "Show")) && (radio.RadioEnabled.Content == "On"))
+ if (buttonShowText.Text == "Hide")
{
radio.Visibility = Visibility.Visible;
numVisibleRadios++;
- // Console.WriteLine("radio " + radio.RadioLabel.ToString() + " set visible");
}
else
{
- radio.Visibility = Visibility.Collapsed;
- // Console.WriteLine("radio " + radio.RadioLabel.ToString() + " set collapsed");
+ if (radio.IsEnabled)
+ {
+ radio.Visibility = Visibility.Visible;
+ numVisibleRadios++;
+ }
+ else
+ {
+ radio.Visibility = Visibility.Collapsed;
+ }
}
}
- CalculateHeight(numVisibleRadios);
+ return numVisibleRadios;
+ }
+ private void RadioRefresh(object sender, EventArgs eventArgs)
+ {
+ var dcsPlayerRadioInfo = _clientStateSingleton.DcsPlayerRadioInfo;
+
+ int numVisibleRadios = getNumVisibleRadios();
+ CalculateHeight(numVisibleRadios);
Intercom.RepaintRadioStatus();
- if ((dcsPlayerRadioInfo != null) && dcsPlayerRadioInfo.IsCurrent())
+ if (dcsPlayerRadioInfo != null && dcsPlayerRadioInfo.IsCurrent())
{
- //reset when we switch planes
if (_lastUnitId != dcsPlayerRadioInfo.unitId)
{
_lastUnitId = dcsPlayerRadioInfo.unitId;
}
- var availableRadios = 0;
-
- for (var i = 0; i < dcsPlayerRadioInfo.radios.Length; i++)
- {
- if (dcsPlayerRadioInfo.radios[i].modulation != RadioInformation.Modulation.DISABLED)
- {
- availableRadios++;
-
- }
- }
+ var availableRadios = dcsPlayerRadioInfo.radios.Count(r => r.modulation != RadioInformation.Modulation.DISABLED);
- if (availableRadios > 1)
- {
- if (dcsPlayerRadioInfo.control == DCSPlayerRadioInfo.RadioSwitchControls.HOTAS)
- {
- ControlText.Text = "Compact Radio Panel - New";
- }
- else
- {
- ControlText.Text = "Compact Radio Panel - New";
- }
- }
- else
- {
- ControlText.Text = "Compact Radio Panel - New (Disconnected)";
-
- }
+ ControlText.Text = availableRadios > 1
+ ? "Compact Radio Panel - New"
+ : "Compact Radio Panel - New (Disconnected)";
}
else
{
ControlText.Text = "Compact Radio Panel - New (Disconnected)";
}
-
- FocusDCS();
}
private void CalculateHeight(int numVisibleRadios)
{
-
- double neededRadioHeight = !double.IsNaN(radioHeight) ? radioHeight * numVisibleRadios : 0;
- double neededHeaderHeight = !double.IsNaN(Header.ActualHeight) && Header.ActualHeight != 0 ? 14 : 0; // Using the expand button to determine the window state
- double neededFooterHeight = !double.IsNaN(Footer.ActualHeight) && Footer.ActualHeight != 0 ? 10 : 0;
- double newNeededHeight = neededRadioHeight + neededFooterHeight + neededHeaderHeight + 31;
- if (newNeededHeight != currentHeight && !double.IsNaN(newNeededHeight))
+ double neededRadioHeight = RadioHeight * numVisibleRadios;
+ double neededHeaderHeight = !double.IsNaN(Header.ActualHeight) && Header.ActualHeight != 0 ? 15 : 0; // Using the expand button to determine the window state
+ double neededFooterHeight = !double.IsNaN(Footer.ActualHeight) && Footer.ActualHeight != 0 ? 15 : 0;
+ double newNeededHeight = neededRadioHeight + neededFooterHeight + neededHeaderHeight + 30;
+ if (!double.IsNaN(newNeededHeight) && newNeededHeight != _currentHeight)
{
MinHeight = newNeededHeight;
_aspectRatio = MinWidth / newNeededHeight;
+ _currentHeight = newNeededHeight;
containerPanel_SizeChanged(null, null);
- Height = Height + 1;
- currentHeight = newNeededHeight;
+ Height += 1;
}
- /* May be use this code if it gets unstable with self adjusting.
- * This is not recommended, due to performance
- * It requires quite a bit of calculation and should not be done without reason.
- else
- {
- containerPanel_SizeChanged(null, null);
- }
- */
}
-
- private long _lastFocus;
+
private RadioCapabilities _radioCapabilitiesWindow;
- private void FocusDCS()
- {
- if (_globalSettings.GetClientSettingBool(GlobalSettingsKeys.RefocusDCS))
- {
- var overlayWindow = new WindowInteropHelper(this).Handle;
-
- //focus DCS if needed
- var foreGround = WindowHelper.GetForegroundWindow();
-
- Process[] localByName = Process.GetProcessesByName("dcs");
-
- if (localByName != null && localByName.Length > 0)
- {
- //either DCS is in focus OR Overlay window is not in focus
- if (foreGround == localByName[0].MainWindowHandle || overlayWindow != foreGround ||
- this.IsMouseOver)
- {
- _lastFocus = DateTime.Now.Ticks;
- }
- else if (DateTime.Now.Ticks > _lastFocus + 20000000 && overlayWindow == foreGround)
- {
- WindowHelper.BringProcessToFront(localByName[0]);
- }
- }
- }
- }
-
private void WrapPanel_MouseLeftButtonDown(object sender, MouseButtonEventArgs e)
{
DragMove();
@@ -269,8 +195,29 @@ private void WrapPanel_MouseLeftButtonDown(object sender, MouseButtonEventArgs e
protected override void OnClosing(CancelEventArgs e)
{
- _globalSettings.SetPositionSetting(GlobalSettingsKeys.RadioTenSwitchWidth, Width);
- _globalSettings.SetPositionSetting(GlobalSettingsKeys.RadioTenSwitchHeight, Height);
+ int numVisibleRadios = 0;
+
+ foreach (var radio in radioControlGroupSwitch)
+ {
+ radio.RepaintRadioStatus();
+ radio.RepaintRadioReceive();
+
+ if (radio.IsEnabled)
+ {
+ numVisibleRadios++;
+ }
+ }
+
+ Logger.Debug("Closing Radio Overlay Window, with {0} visible radios", numVisibleRadios);
+
+ CalculateHeight(numVisibleRadios);
+ containerPanel_SizeChanged(this, null);
+
+ // This is a bit of a hack to ensure the window is closed properly and saved so it opens the same size next time
+ _globalSettings.SetPositionSetting(GlobalSettingsKeys.RadioTenSwitchWidth, Width * 0.747);
+ _globalSettings.SetPositionSetting(GlobalSettingsKeys.RadioTenSwitchHeight, Height * 0.747);
+
+ // Save the position of the window
_globalSettings.SetPositionSetting(GlobalSettingsKeys.RadioTenSwitchBackgroundOpacity, Opacity);
_globalSettings.SetPositionSetting(GlobalSettingsKeys.RadioTenSwitchTextOpacity, Opacity);
_globalSettings.SetPositionSetting(GlobalSettingsKeys.RadioTenSwitchX, Left);
@@ -293,40 +240,30 @@ private void Button_Minimise(object sender, RoutedEventArgs e)
WindowState = WindowState.Minimized;
}
}
-
- private void Button_About(object sender, RoutedEventArgs e)
- {
- //Show Radio Capabilities
- if ((_radioCapabilitiesWindow == null) || !_radioCapabilitiesWindow.IsVisible ||
- (_radioCapabilitiesWindow.WindowState == WindowState.Minimized))
- {
- _radioCapabilitiesWindow?.Close();
-
- _radioCapabilitiesWindow = new RadioCapabilities();
- _radioCapabilitiesWindow.WindowStartupLocation = WindowStartupLocation.CenterOwner;
- _radioCapabilitiesWindow.Owner = this;
- _radioCapabilitiesWindow.ShowDialog();
- }
- else
- {
- _radioCapabilitiesWindow?.Close();
- _radioCapabilitiesWindow = null;
- }
-
- }
private void Button_ShowAllRadios(object sender, RoutedEventArgs e)
{
- if ((buttonShowText.Text == null) || (buttonShowText.Text == "Hide"))
+ if (buttonShowText.Text == "Hide")
{
buttonShowText.Text = "Show";
-
}
else
{
buttonShowText.Text = "Hide";
-
}
+
+ // Refresh the radio visibility
+ RadioRefresh(sender, e);
+
+ // Scale and height recalculation
+ CalculateScale();
+ CalculateHeight(getNumVisibleRadios());
+ containerPanel_SizeChanged(sender, null);
+
+ // Force the UI to update
+ InvalidateVisual();
+ UpdateLayout();
+ Dispatcher.Invoke(() => { }, DispatcherPriority.Render);
}
private void Button_Expand(object sender, RoutedEventArgs e)
@@ -337,7 +274,7 @@ private void Button_Expand(object sender, RoutedEventArgs e)
buttonExpandText.Background = _expandIcon;
Header.Visibility = Visibility.Collapsed;
Footer.Visibility = Visibility.Collapsed;
-
+
Logger.Debug("button expanded pressed - window now in contract mode");
}
else
@@ -349,6 +286,10 @@ private void Button_Expand(object sender, RoutedEventArgs e)
Logger.Debug("button contract pressed - window now in expand mode");
}
+
+ CalculateScale();
+ CalculateHeight(getNumVisibleRadios());
+ containerPanel_SizeChanged(sender, null);
}
@@ -517,8 +458,6 @@ private void textOpacitySlider_ValueChanged(object sender, RoutedPropertyChanged
private void backgroundOpacitySlider_ValueChanged(object sender, RoutedPropertyChangedEventArgs e)
{
Background.Opacity = e.NewValue;
-
- //Opacity = e.NewValue;
}
private void containerPanel_SizeChanged(object sender, SizeChangedEventArgs e)
@@ -527,16 +466,18 @@ private void containerPanel_SizeChanged(object sender, SizeChangedEventArgs e)
CalculateScale();
WindowState = WindowState.Normal;
- Logger.Debug("Size Changed Switch Panel");
}
private void CalculateScale()
{
var yScale = ActualHeight / RadioOverlayWin.MinHeight;
- var xScale = ActualWidth / RadioOverlayWin.MinHeight;
+ var xScale = ActualWidth / RadioOverlayWin.MinWidth;
var value = Math.Min(xScale, yScale);
- ScaleValue = (double) OnCoerceScaleValue(RadioOverlayWin, value);
+ ScaleValue = (double)OnCoerceScaleValue(RadioOverlayWin, value);
+
+ // Recalculate the layout after changing the scale
+ WindowState = WindowState.Normal;
}
protected override void OnRenderSizeChanged(SizeChangedInfo sizeInfo)
@@ -545,23 +486,19 @@ protected override void OnRenderSizeChanged(SizeChangedInfo sizeInfo)
Width = sizeInfo.NewSize.Height * _aspectRatio;
else
Height = sizeInfo.NewSize.Width / _aspectRatio;
-
-
- // Console.WriteLine(this.Height +" width:"+ this.Width);
}
#region ScaleValue Depdency Property //StackOverflow: http://stackoverflow.com/questions/3193339/tips-on-developing-resolution-independent-application/5000120#5000120
public static readonly DependencyProperty ScaleValueProperty = DependencyProperty.Register("ScaleValue",
typeof(double), typeof(RadioOverlayWindowTenSwitch),
- new UIPropertyMetadata(1.0, OnScaleValueChanged,
- OnCoerceScaleValue));
+ new UIPropertyMetadata(1.0, OnScaleValueChanged, OnCoerceScaleValue));
private static object OnCoerceScaleValue(DependencyObject o, object value)
{
var mainWindow = o as RadioOverlayWindowTenSwitch;
if (mainWindow != null)
- return mainWindow.OnCoerceScaleValue((double) value);
+ return mainWindow.OnCoerceScaleValue((double)value);
return value;
}
@@ -569,7 +506,7 @@ private static void OnScaleValueChanged(DependencyObject o, DependencyPropertyCh
{
var mainWindow = o as RadioOverlayWindowTenSwitch;
if (mainWindow != null)
- mainWindow.OnScaleValueChanged((double) e.OldValue, (double) e.NewValue);
+ mainWindow.OnScaleValueChanged((double)e.OldValue, (double)e.NewValue);
}
protected virtual double OnCoerceScaleValue(double value)
@@ -583,22 +520,18 @@ protected virtual double OnCoerceScaleValue(double value)
protected virtual void OnScaleValueChanged(double oldValue, double newValue)
{
+ ApplicationScaleTransform.ScaleX = newValue;
+ ApplicationScaleTransform.ScaleY = newValue;
}
public double ScaleValue
{
- get { return (double) GetValue(ScaleValueProperty); }
+ get { return (double)GetValue(ScaleValueProperty); }
set { SetValue(ScaleValueProperty, value); }
}
#endregion
- private void RadioOverlayWindow_OnLocationChanged(object sender, EventArgs e)
- {
- //reset last focus so we dont switch back to dcs while dragging
- _lastFocus = DateTime.Now.Ticks;
- }
-
private void ShowOverlayMenuSelect_OnClick(object sender, RoutedEventArgs e)
{
Close();
diff --git a/DCS-SR-Client/UI/RadioOverlayWindow/RadioOverlayTenTransparent.xaml b/DCS-SR-Client/UI/RadioOverlayWindow/RadioOverlayTenTransparent.xaml
index ffd1d62d..e7218675 100644
--- a/DCS-SR-Client/UI/RadioOverlayWindow/RadioOverlayTenTransparent.xaml
+++ b/DCS-SR-Client/UI/RadioOverlayWindow/RadioOverlayTenTransparent.xaml
@@ -4,23 +4,18 @@
xmlns:local="clr-namespace:Ciribob.DCS.SimpleRadio.Standalone.Overlay"
xmlns:awacsOverlayWindow="clr-namespace:Ciribob.DCS.SimpleRadio.Standalone.Client.UI.AwacsRadioOverlayWindow"
xmlns:presetChannels="clr-namespace:Ciribob.DCS.SimpleRadio.Standalone.Client.UI.RadioOverlayWindow.PresetChannels"
-
-
-
Name="RadioOverlayWin"
- Title="DCS-SimpleRadio"
- Width="180"
- Height= "155"
- MinWidth="178"
- MinHeight="155"
- AllowsTransparency="True"
- Background="#444"
- LocationChanged="RadioOverlayWindow_OnLocationChanged"
- Opacity="1.0"
- ResizeMode="CanResizeWithGrip"
- Style="{x:Null}"
- Topmost="True"
- WindowStyle="None">
+ Title="DCS-SimpleRadio"
+ Width="180"
+ Height= "245"
+ MinWidth="180"
+ MinHeight="245"
+ AllowsTransparency="True"
+ Background="#444"
+ ResizeMode="CanResizeWithGrip"
+ Style="{x:Null}"
+ Topmost="True"
+ WindowStyle="None">