diff --git a/BuildPortable.bat b/BuildPortable.bat
new file mode 100644
index 00000000..284e7c78
--- /dev/null
+++ b/BuildPortable.bat
@@ -0,0 +1 @@
+cd InternetTest\InternetTest && dotnet publish -r win-x64 -c Release --self-contained false -p:DefineConstants=PORTABLE
diff --git a/InternetTest/InternetTest/App.xaml b/InternetTest/InternetTest/App.xaml
index 185f26e5..a766fcf8 100644
--- a/InternetTest/InternetTest/App.xaml
+++ b/InternetTest/InternetTest/App.xaml
@@ -33,24 +33,24 @@
-
+
-
+
-
+
-
+
@@ -82,20 +82,20 @@
-
+
-
+
-
+
@@ -127,7 +127,7 @@
-
+
@@ -140,7 +140,61 @@
-
+
+
+
+
+
+
+
+
+
-
+
-
+
-
+
@@ -1047,7 +1145,7 @@
Color="Transparent">
@@ -1134,7 +1232,7 @@
Color="Transparent">
@@ -1210,7 +1308,7 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Text="{x:Static lang:Resources.QuickActions}" />
+ Grid.Row="5"
+ Orientation="Horizontal">
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/InternetTest/InternetTest/Pages/HomePage.xaml.cs b/InternetTest/InternetTest/Pages/HomePage.xaml.cs
index a29f4145..d3b02e5c 100644
--- a/InternetTest/InternetTest/Pages/HomePage.xaml.cs
+++ b/InternetTest/InternetTest/Pages/HomePage.xaml.cs
@@ -24,11 +24,19 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
using InternetTest.Classes;
using InternetTest.Enums;
using InternetTest.UserControls;
+using ManagedNativeWifi;
using PeyrSharp.Core;
+using PeyrSharp.Env;
+using System;
using System.Collections.Generic;
+using System.Diagnostics;
+using System.IO;
using System.Linq;
+using System.Net.Http;
+using System.Threading.Tasks;
+using System.Windows;
using System.Windows.Controls;
-using System.Windows.Media;
+using System.Xml.Serialization;
namespace InternetTest.Pages;
///
@@ -46,16 +54,13 @@ internal async void InitUI()
{
// Load "Get started" section
List relevantPages = Enumerable.Empty().ToList();
- List relevantActions = Enumerable.Empty().ToList();
if (Global.SynethiaConfig is not null)
{
relevantPages = Global.GetMostRelevantPages(Global.SynethiaConfig);
- Global.GetMostRelevantActions(Global.SynethiaConfig).ForEach((ActionInfo actionInfo) => relevantActions.Add(actionInfo.Action));
}
else
{
relevantPages = Global.DefaultRelevantPages;
- Global.DefaultRelevantActions.ForEach((ActionInfo actionInfo) => relevantActions.Add(actionInfo.Action));
}
for (int i = 0; i < 5; i++)
@@ -70,16 +75,230 @@ internal async void InitUI()
DiscoverPanel.Children.Add(new PageCard(relevantPages[i]));
}
- // Load "Suggested actions" section
- for (int i = 0; i < 4; i++)
+ // Load "Status" section
+ if (Global.Settings.TestOnStart) LoadStatusCard();
+
+ // Load "Network" section
+ LoadNetworkCard();
+
+ // Load "My IP" section
+ ip = (await Global.GetIPInfoAsync("")).Query ?? "";
+ }
+
+ private async void RefreshStatusBtn_Click(object sender, System.Windows.RoutedEventArgs e)
+ {
+ StatusTxt.Text = Properties.Resources.Checking;
+ LoadStatusCard();
+ }
+
+ bool connected = true;
+ internal async void LoadStatusCard()
+ {
+ connected = await Internet.IsAvailableAsync(Global.Settings.TestSite); // Check if Internet is available
+ StatusTxt.Text = connected ? Properties.Resources.ConnectedS : Properties.Resources.NotConnectedS; // Set text
+ StatusIconTxt.Text = connected ? "\uF299" : "\uF36E";
+ StatusIconTxt.Foreground = connected ? Global.GetBrushFromResource("Green") : Global.GetBrushFromResource("Red");
+ }
+
+ internal void LoadNetworkCard()
+ {
+ try
+ {
+ string ssid = Global.GetCurrentWifiSSID();
+
+ NetworkTxt.Text = (ssid == null || !connected) ? Properties.Resources.NotConnectedS : ssid;
+ NetworkIconTxt.Text = (ssid == null || !connected) ? "\uFB71" : "\uF8C5";
+
+ }
+ catch // If there is no WiFi
{
- SuggestedActionsPanel.Children.Add(new ActionCard(relevantActions[i]));
+ NetworkIconTxt.Text = connected ? "\uF35A" : "\uFC27";
+ NetworkTxt.Text = connected ? Properties.Resources.Ethernet : Properties.Resources.NotConnectedS;
}
+ }
- // Load "Status" section
- bool connected = await Internet.IsAvailableAsync(Global.Settings.TestSite); // Check if Internet is available
- StatusTxt.Text = connected ? Properties.Resources.Connected : Properties.Resources.NotConnected; // Set text
- StatusIconTxt.Text = connected ? "\uF299" : "\uF36E";
- StatusIconTxt.Foreground = connected ? new SolidColorBrush(Global.GetColorFromResource("Green")) : new SolidColorBrush(Global.GetColorFromResource("Red"));
+ private void RefreshNetworkBtn_Click(object sender, System.Windows.RoutedEventArgs e)
+ {
+ LoadNetworkCard();
+ }
+
+ string ip = "";
+ private async void RefreshMyIpBtn_Click(object sender, System.Windows.RoutedEventArgs e)
+ {
+ ip = (await Global.GetIPInfoAsync("")).Query ?? "";
+ }
+
+ private void MyIpBorder_MouseEnter(object sender, System.Windows.Input.MouseEventArgs e)
+ {
+ MyIpTxt.Text = ip;
+ RefreshMyIpBtn.Visibility = Visibility.Visible;
+ }
+
+ private void MyIpBorder_MouseLeave(object sender, System.Windows.Input.MouseEventArgs e)
+ {
+ MyIpTxt.Text = Properties.Resources.HoverToReveal;
+ RefreshMyIpBtn.Visibility = Visibility.Hidden;
+ }
+
+ private async void SpeedTest_MouseLeftButtonUp(object sender, System.Windows.Input.MouseButtonEventArgs e)
+ {
+ SpeedTestPopup.IsOpen = true;
+ ConnectPopup.IsOpen = false;
+ PasswordPopup.IsOpen = false;
+ try
+ {
+ CloseSpeedTestBtn.IsEnabled = false;
+ SpeedTestStatus.Text = Properties.Resources.TestInProgress;
+
+ // Test
+ string targetUrl = "http://speedtest.tele2.net/10MB.zip";
+ SpeedTxt.Text = "...";
+ long fileSize = await DownloadFile(targetUrl);
+ double speedMbps = fileSize / 1000000.0;
+
+ SpeedTxt.Text = $"{speedMbps:0.00} MB/s";
+ SpeedTestStatus.Text = Properties.Resources.SpeedTestSucess;
+ }
+ catch
+ {
+ SpeedTestStatus.Text = Properties.Resources.SpeedTestFailed;
+ }
+ CloseSpeedTestBtn.IsEnabled = true;
+ }
+
+ private void CloseSpeedTestBtn_Click(object sender, System.Windows.RoutedEventArgs e)
+ {
+ SpeedTestPopup.IsOpen = false;
+ }
+
+ static async Task DownloadFile(string url)
+ {
+ Stopwatch stopwatch = Stopwatch.StartNew();
+
+ using (HttpClient client = new HttpClient())
+ {
+ HttpResponseMessage response = await client.GetAsync(url);
+
+ if (response.IsSuccessStatusCode)
+ {
+ byte[] data = await response.Content.ReadAsByteArrayAsync();
+ stopwatch.Stop();
+ return data.Length;
+ }
+ else
+ {
+ return 0;
+ }
+ }
+ }
+
+ private async void ConnectWiFi_MouseLeftButtonUp(object sender, System.Windows.Input.MouseButtonEventArgs e)
+ {
+ try
+ {
+ ConnectPopup.IsOpen = true;
+ SpeedTestPopup.IsOpen = false;
+ PasswordPopup.IsOpen = false;
+ WiFiDisplayer.Children.Clear();
+ await NativeWifi.ScanNetworksAsync(TimeSpan.FromSeconds(10));
+ var wifis = Global.GetWiFis();
+ for (int i = 0; i < wifis.Count; i++)
+ {
+ WiFiDisplayer.Children.Add(new WiFiNetworkItem(wifis[i]));
+ }
+ }
+ catch
+ {
+
+ }
+ }
+
+ private void CloseConnectBtn_Click(object sender, System.Windows.RoutedEventArgs e)
+ {
+ ConnectPopup.IsOpen = false;
+ }
+
+ private async void RecoverWiFi_MouseLeftButtonUp(object sender, System.Windows.Input.MouseButtonEventArgs e)
+ {
+ PasswordPopup.IsOpen = true;
+ SpeedTestPopup.IsOpen = false;
+ ConnectPopup.IsOpen = false;
+ await GetWiFiNetworksInfo();
+ }
+
+ private void ClosePasswordBtn_Click(object sender, System.Windows.RoutedEventArgs e)
+ {
+ PasswordPopup.IsOpen = false;
+ }
+
+ async Task GetWiFiNetworksInfo()
+ {
+
+ try
+ {
+ WiFiItemDisplayer.Children.Clear(); // Clear the panel
+
+ // Check if the temp directory exists
+ string path = FileSys.AppDataPath + @"\Léo Corporation\InternetTest Pro\Temp";
+
+ if (!Directory.Exists(path))
+ {
+ Directory.CreateDirectory(path);
+ };
+
+ // Run "netsh wlan export profile key=clear" command
+ Process process = new();
+ process.StartInfo.FileName = "cmd.exe";
+ process.StartInfo.Arguments = $"/c netsh wlan export profile key=clear folder=\"{path}\"";
+ process.StartInfo.UseShellExecute = false;
+ process.StartInfo.CreateNoWindow = true;
+ process.StartInfo.WindowStyle = ProcessWindowStyle.Hidden;
+ process.Start();
+ await process.WaitForExitAsync();
+
+ // Read the files
+ string[] files = Directory.GetFiles(path);
+ for (int i = 0; i < files.Length; i++)
+ {
+ XmlSerializer serializer = new(typeof(WLANProfile));
+ StreamReader streamReader = new(files[i]); // Where the file is going to be read
+
+ var test = (WLANProfile?)serializer.Deserialize(streamReader);
+
+ if (test != null)
+ {
+ WiFiItemDisplayer.Children.Add(new WiFiInfoItem(test));
+ }
+ streamReader.Close();
+
+ File.Delete(files[i]); // Remove the temp file
+
+ }
+ Directory.Delete(path); // Delete the temp directory
+ }
+ catch (Exception ex)
+ {
+ MessageBox.Show(ex.Message, Properties.Resources.Error, MessageBoxButton.OK, MessageBoxImage.Error);
+ }
+ }
+
+ private void StatusBorder_MouseEnter(object sender, System.Windows.Input.MouseEventArgs e)
+ {
+ RefreshStatusBtn.Visibility = Visibility.Visible;
+ }
+
+ private void StatusBorder_MouseLeave(object sender, System.Windows.Input.MouseEventArgs e)
+ {
+ RefreshStatusBtn.Visibility = Visibility.Hidden;
+ }
+
+ private void NetworkBorder_MouseEnter(object sender, System.Windows.Input.MouseEventArgs e)
+ {
+ RefreshNetworkBtn.Visibility = Visibility.Visible;
+ }
+
+ private void NetworkBorder_MouseLeave(object sender, System.Windows.Input.MouseEventArgs e)
+ {
+ RefreshNetworkBtn.Visibility = Visibility.Hidden;
}
}
diff --git a/InternetTest/InternetTest/Pages/IpConfigPage.xaml b/InternetTest/InternetTest/Pages/IpConfigPage.xaml
index ca20bfa2..b104d760 100644
--- a/InternetTest/InternetTest/Pages/IpConfigPage.xaml
+++ b/InternetTest/InternetTest/Pages/IpConfigPage.xaml
@@ -12,7 +12,7 @@
d:DesignWidth="800"
Background="Transparent"
FontFamily="../Fonts/#Hauora"
- Foreground="{Binding Source={StaticResource Foreground1}}"
+ Foreground="{DynamicResource Foreground1}"
mc:Ignorable="d">
@@ -27,7 +27,7 @@
VerticalAlignment="Center"
FontFamily="../Fonts/#FluentSystemIcons-Regular"
FontSize="16"
- Foreground="{Binding Source={StaticResource AccentColor}}"
+ Foreground="{DynamicResource Accent}"
Text="" />
(this))
- {
- b.Click += (sender, e) =>
- {
- Global.SynethiaConfig.IPConfigPageInfo.InteractionCount++;
- };
- }
-
- // For each TextBox of the page
- foreach (TextBox textBox in Global.FindVisualChildren(this))
- {
- textBox.GotFocus += (o, e) =>
- {
- Global.SynethiaConfig.IPConfigPageInfo.InteractionCount++;
- };
- }
-
- // For each CheckBox/RadioButton of the page
- foreach (CheckBox checkBox in Global.FindVisualChildren(this))
- {
- checkBox.Checked += (o, e) =>
- {
- Global.SynethiaConfig.IPConfigPageInfo.InteractionCount++;
- };
- checkBox.Unchecked += (o, e) =>
- {
- Global.SynethiaConfig.IPConfigPageInfo.InteractionCount++;
- };
- }
-
- foreach (RadioButton radioButton in Global.FindVisualChildren(this))
- {
- radioButton.Checked += (o, e) =>
- {
- Global.SynethiaConfig.IPConfigPageInfo.InteractionCount++;
- };
- radioButton.Unchecked += (o, e) =>
- {
- Global.SynethiaConfig.IPConfigPageInfo.InteractionCount++;
- };
- }
+ Loaded += (o, e) => SynethiaManager.InjectSynethiaCode(this, Global.SynethiaConfig.PagesInfo, 4, ref codeInjected);
}
private void InitUI()
@@ -134,6 +88,6 @@ internal void RefreshBtn_Click(object sender, RoutedEventArgs e)
InitUI(); // Refresh the UI
// Increment the interaction count of the ActionInfo in Global.SynethiaConfig
- Global.SynethiaConfig.ActionInfos.First(a => a.Action == Enums.AppActions.GetIPConfig).UsageCount++;
+ Global.SynethiaConfig.ActionsInfo.First(a => a.Name == "IPConfig.Get").UsageCount++;
}
}
diff --git a/InternetTest/InternetTest/Pages/LocateIpPage.xaml b/InternetTest/InternetTest/Pages/LocateIpPage.xaml
index 8c40f27b..d426d604 100644
--- a/InternetTest/InternetTest/Pages/LocateIpPage.xaml
+++ b/InternetTest/InternetTest/Pages/LocateIpPage.xaml
@@ -12,7 +12,7 @@
d:DesignWidth="800"
Background="Transparent"
FontFamily="../Fonts/#Hauora"
- Foreground="{Binding Source={StaticResource Foreground1}}"
+ Foreground="{DynamicResource Foreground1}"
mc:Ignorable="d">
@@ -28,7 +28,7 @@
VerticalAlignment="Center"
FontFamily="../Fonts/#FluentSystemIcons-Regular"
FontSize="16"
- Foreground="{Binding Source={StaticResource AccentColor}}"
+ Foreground="{DynamicResource Accent}"
Text="" />
+ Color="{DynamicResource AccentColor}" />
+ Foreground="{DynamicResource DarkGray}" />
@@ -140,7 +139,7 @@
VerticalAlignment="Center"
FontFamily="../Fonts/#FluentSystemIcons-Regular"
FontSize="16"
- Foreground="{Binding Source={StaticResource AccentColor}}"
+ Foreground="{DynamicResource Accent}"
Text="" />
+
+ Color="{DynamicResource AccentColor}" />
@@ -180,7 +192,7 @@
+ Color="{DynamicResource AccentColor}" />
@@ -225,7 +237,7 @@
+ Color="{DynamicResource AccentColor}" />
@@ -270,7 +282,7 @@
+ Color="{DynamicResource AccentColor}" />
@@ -314,7 +326,7 @@
+ Color="{DynamicResource AccentColor}" />
@@ -359,7 +371,7 @@
+ Color="{DynamicResource AccentColor}" />
@@ -404,7 +416,7 @@
+ Color="{DynamicResource AccentColor}" />
@@ -449,7 +461,7 @@
+ Color="{DynamicResource AccentColor}" />
@@ -493,7 +505,7 @@
@@ -45,7 +45,7 @@ public LocateIpPage()
{
InitializeComponent();
InitUI(); // Load the UI
- InjectSynethiaCode();
+ Loaded += (o, e) => SynethiaManager.InjectSynethiaCode(this, Global.SynethiaConfig.PagesInfo, 3, ref codeInjected);
}
private async void InitUI()
@@ -61,53 +61,6 @@ private async void InitUI()
catch (Exception) { } // Cancel if there is no internet connection
}
- private void InjectSynethiaCode()
- {
- if (codeInjected) return;
- codeInjected = true;
- foreach (Button b in Global.FindVisualChildren
+ Color="{DynamicResource AccentColor}" />
+ Foreground="{DynamicResource DarkGray}" />
@@ -104,7 +104,7 @@
VerticalAlignment="Center"
FontFamily="../Fonts/#FluentSystemIcons-Regular"
FontSize="16"
- Foreground="{Binding Source={StaticResource AccentColor}}"
+ Foreground="{DynamicResource Accent}"
Text="" />
@@ -40,7 +40,7 @@ public PingPage()
{
InitializeComponent();
InitUI(); // Load the UI
- InjectSynethiaCode();
+ Loaded += (o, e) => SynethiaManager.InjectSynethiaCode(this, Global.SynethiaConfig.PagesInfo, 5, ref codeInjected);
}
private void InitUI()
@@ -49,60 +49,13 @@ private void InitUI()
IpTxt.Text = Global.Settings.TestSite ?? "https://leocorporation.dev";
}
- private void InjectSynethiaCode()
- {
- if (codeInjected) return;
- codeInjected = true;
- foreach (Button b in Global.FindVisualChildren
@@ -97,7 +97,7 @@
@@ -136,9 +136,9 @@
HorizontalAlignment="Left"
VerticalAlignment="Center"
Background="Transparent"
- BorderBrush="{Binding Source={StaticResource AccentColor}}"
+ BorderBrush="{DynamicResource Accent}"
BorderThickness="2"
- Foreground="{Binding Source={StaticResource Foreground1}}"
+ Foreground="{DynamicResource Foreground1}"
SelectionChanged="LangComboBox_SelectionChanged"
Style="{DynamicResource ComboBoxStyle1}">
@@ -152,11 +152,11 @@
Margin="0 0 10 0"
Padding="10 5 10 5"
VerticalAlignment="Center"
- Background="{Binding Source={StaticResource AccentColor}}"
+ Background="{DynamicResource Accent}"
Click="LangApplyBtn_Click"
Cursor="Hand"
FontWeight="ExtraBold"
- Foreground="{Binding Source={StaticResource WindowButtonsHoverForeground1}}"
+ Foreground="{DynamicResource WindowButtonsHoverForeground1}"
Style="{StaticResource PrimaryButton}"
Visibility="Collapsed">
+ Foreground="{DynamicResource Foreground1}" />
@@ -178,8 +178,8 @@
@@ -293,7 +293,7 @@
@@ -332,9 +332,9 @@
HorizontalAlignment="Left"
VerticalAlignment="Center"
Background="Transparent"
- BorderBrush="{Binding Source={StaticResource AccentColor}}"
+ BorderBrush="{DynamicResource Accent}"
BorderThickness="2"
- Foreground="{Binding Source={StaticResource Foreground1}}"
+ Foreground="{DynamicResource Foreground1}"
SelectionChanged="MapProviderComboBox_SelectionChanged"
Style="{DynamicResource ComboBoxStyle1}">
@@ -348,8 +348,8 @@
@@ -382,7 +382,7 @@
BorderThickness="2"
Checked="UpdateNotifChk_Checked"
Content="{x:Static lang:Resources.NotifyUpdates}"
- Foreground="{Binding Source={StaticResource Foreground1}}"
+ Foreground="{DynamicResource Foreground1}"
Style="{DynamicResource CheckBoxStyle1}"
Unchecked="UpdateNotifChk_Checked" />
@@ -390,8 +390,8 @@
@@ -429,14 +429,13 @@
HorizontalAlignment="Left"
VerticalAlignment="Center"
Background="Transparent"
- BorderBrush="{Binding Source={StaticResource AccentColor}}"
+ BorderBrush="{DynamicResource Accent}"
BorderThickness="2"
- Foreground="{Binding Source={StaticResource Foreground1}}"
+ Foreground="{DynamicResource Foreground1}"
SelectionChanged="PageComboBox_SelectionChanged"
Style="{DynamicResource ComboBoxStyle1}">
-
@@ -454,7 +453,7 @@
BorderThickness="2"
Checked="UpdateOnStartChk_Checked"
Content="{x:Static lang:Resources.CheckUpdatesOnStart}"
- Foreground="{Binding Source={StaticResource Foreground1}}"
+ Foreground="{DynamicResource Foreground1}"
Style="{DynamicResource CheckBoxStyle1}"
Unchecked="UpdateOnStartChk_Checked" />
@@ -510,7 +509,7 @@
VerticalAlignment="Center"
FontFamily="..\Fonts\#FluentSystemIcons-Regular"
FontSize="22"
- Text="" />
+ Text="" />
@@ -547,11 +546,11 @@
x:Name="HttpRadio"
VerticalAlignment="Center"
Background="Transparent"
- BorderBrush="{Binding Source={StaticResource AccentColor}}"
+ BorderBrush="{DynamicResource Accent}"
Checked="HttpRadio_Checked"
Content="{x:Static lang:Resources.HTTP}"
FontWeight="Bold"
- Foreground="{Binding Source={StaticResource Foreground1}}"
+ Foreground="{DynamicResource Foreground1}"
GroupName="Protocol"
Style="{DynamicResource RadioButtonStyle1}"
Unchecked="HttpRadio_Checked" />
@@ -561,14 +560,14 @@
+ Color="{DynamicResource AccentColor}" />
+ Foreground="{DynamicResource Foreground1}" />
@@ -609,8 +608,90 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -642,14 +723,14 @@
+ Color="{DynamicResource AccentColor}" />
@@ -665,11 +746,11 @@
x:Name="HopsApplyBtn"
Padding="10 5 10 5"
VerticalAlignment="Center"
- Background="{Binding Source={StaticResource AccentColor}}"
+ Background="{DynamicResource Accent}"
Click="HopsApplyBtn_Click"
Cursor="Hand"
FontWeight="ExtraBold"
- Foreground="{Binding Source={StaticResource WindowButtonsHoverForeground1}}"
+ Foreground="{DynamicResource WindowButtonsHoverForeground1}"
Style="{StaticResource PrimaryButton}"
Visibility="Visible">
+ Foreground="{DynamicResource Foreground1}" />
@@ -692,14 +773,14 @@
+ Color="{DynamicResource AccentColor}" />
@@ -715,11 +796,11 @@
x:Name="TimeOutApplyBtn"
Padding="10 5 10 5"
VerticalAlignment="Center"
- Background="{Binding Source={StaticResource AccentColor}}"
+ Background="{DynamicResource Accent}"
Click="TimeOutApplyBtn_Click"
Cursor="Hand"
FontWeight="ExtraBold"
- Foreground="{Binding Source={StaticResource WindowButtonsHoverForeground1}}"
+ Foreground="{DynamicResource WindowButtonsHoverForeground1}"
Style="{StaticResource PrimaryButton}"
Visibility="Visible">
+ Foreground="{DynamicResource Foreground1}" />
@@ -742,8 +823,50 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -775,11 +898,11 @@
Margin="0 0 10 0"
Padding="10 5 10 5"
VerticalAlignment="Center"
- Background="{Binding Source={StaticResource AccentColor}}"
+ Background="{DynamicResource Accent}"
Click="ImportBtn_Click"
Cursor="Hand"
FontWeight="ExtraBold"
- Foreground="{Binding Source={StaticResource WindowButtonsHoverForeground1}}"
+ Foreground="{DynamicResource WindowButtonsHoverForeground1}"
Style="{StaticResource PrimaryButton}">
@@ -834,7 +957,7 @@
Cursor="Hand"
FontSize="14"
FontWeight="ExtraBold"
- Foreground="{Binding Source={StaticResource AccentColor}}"
+ Foreground="{DynamicResource Accent}"
Style="{DynamicResource StandardButton}">
+
diff --git a/InternetTest/InternetTest/Pages/SettingsPage.xaml.cs b/InternetTest/InternetTest/Pages/SettingsPage.xaml.cs
index a756c7eb..41bcb434 100644
--- a/InternetTest/InternetTest/Pages/SettingsPage.xaml.cs
+++ b/InternetTest/InternetTest/Pages/SettingsPage.xaml.cs
@@ -26,6 +26,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
using Microsoft.Win32;
using PeyrSharp.Core;
using PeyrSharp.Env;
+using Synethia;
using System;
using System.Diagnostics;
using System.IO;
@@ -52,7 +53,7 @@ public SettingsPage()
string lastVersion = await Update.GetLastVersionAsync(Global.LastVersionLink); // Get last version
if (MessageBox.Show(Properties.Resources.InstallConfirmMsg, $"{Properties.Resources.InstallVersion} {lastVersion}", MessageBoxButton.YesNo, MessageBoxImage.Information) == MessageBoxResult.Yes)
{
- SynethiaManager.Save(Global.SynethiaConfig);
+ SynethiaManager.Save(Global.SynethiaConfig, Global.SynethiaPath);
HistoryManager.Save(Global.History);
SettingsManager.Save();
@@ -69,7 +70,11 @@ public SettingsPage()
private async void InitUI()
{
// About section
- VersionTxt.Text = Global.Version; // Update the current version label
+#if PORTABLE
+ VersionTxt.Text = Global.Version + " (Portable)";
+#else
+ VersionTxt.Text = Global.Version;
+#endif
// Select the default theme border
ThemeSelectedBorder = Global.Settings.Theme switch
@@ -107,10 +112,16 @@ private async void InitUI()
HttpRadio.IsChecked = !Global.Settings.UseHttps;
SiteTxt.Text = Global.Settings.TestSite;
+ // DownDetector section
+ IntervalTxt.Text = Global.Settings.DefaultTimeInterval.ToString();
+
// Trace route section
HopsTxt.Text = Global.Settings.TraceRouteMaxHops.ToString();
TimeOutTxt.Text = Global.Settings.TraceRouteMaxTimeOut.ToString();
+ // Adapters section
+ HideNetworkAdaptersChk.IsChecked = Global.Settings.HideDisabledAdapters;
+
// Data section
UseSynethiaChk.IsChecked = Global.Settings.UseSynethia;
@@ -141,14 +152,17 @@ private async void CheckUpdateBtn_Click(object sender, RoutedEventArgs e)
if (Update.IsAvailable(Global.Version, lastVersion))
{
UpdateTxt.Text = Properties.Resources.AvailableUpdates;
-
+#if PORTABLE
+ MessageBox.Show(Properties.Resources.PortableNoAutoUpdates, $"{Properties.Resources.InstallVersion} {lastVersion}", MessageBoxButton.OK, MessageBoxImage.Information);
+ return;
+#else
if (MessageBox.Show(Properties.Resources.InstallConfirmMsg, $"{Properties.Resources.InstallVersion} {lastVersion}", MessageBoxButton.YesNo, MessageBoxImage.Information) == MessageBoxResult.No)
{
return;
}
-
+#endif
// If the user wants to proceed.
- SynethiaManager.Save(Global.SynethiaConfig);
+ SynethiaManager.Save(Global.SynethiaConfig, Global.SynethiaPath);
HistoryManager.Save(Global.History);
SettingsManager.Save();
@@ -164,7 +178,7 @@ private async void CheckUpdateBtn_Click(object sender, RoutedEventArgs e)
Border ThemeSelectedBorder;
private void Border_MouseEnter(object sender, MouseEventArgs e)
{
- ((Border)sender).BorderBrush = new SolidColorBrush { Color = Global.GetColorFromResource("AccentColor") };
+ ((Border)sender).BorderBrush = Global.GetBrushFromResource("Accent");
}
private void Border_MouseLeave(object sender, MouseEventArgs e)
@@ -184,60 +198,42 @@ private void LightBorder_MouseLeftButtonUp(object sender, MouseButtonEventArgs e
{
ResetBorders();
ThemeSelectedBorder = (Border)sender;
- ((Border)sender).BorderBrush = new SolidColorBrush { Color = Global.GetColorFromResource("AccentColor") };
+ ((Border)sender).BorderBrush = Global.GetBrushFromResource("Accent");
Global.Settings.Theme = Themes.Light;
SettingsManager.Save();
- if (MessageBox.Show(Properties.Resources.NeedRestartToApplyChanges, Properties.Resources.Settings, MessageBoxButton.YesNo, MessageBoxImage.Question) == MessageBoxResult.No)
- {
- return;
- }
-
- SynethiaManager.Save(Global.SynethiaConfig);
+ SynethiaManager.Save(Global.SynethiaConfig, Global.SynethiaPath);
HistoryManager.Save(Global.History);
- Process.Start(Directory.GetCurrentDirectory() + @"\InternetTest.exe");
- Application.Current.Shutdown();
+ Global.ChangeTheme();
}
private void DarkBorder_MouseLeftButtonUp(object sender, MouseButtonEventArgs e)
{
ResetBorders();
ThemeSelectedBorder = (Border)sender;
- ((Border)sender).BorderBrush = new SolidColorBrush { Color = Global.GetColorFromResource("AccentColor") };
+ ((Border)sender).BorderBrush = Global.GetBrushFromResource("Accent");
Global.Settings.Theme = Themes.Dark;
SettingsManager.Save();
- if (MessageBox.Show(Properties.Resources.NeedRestartToApplyChanges, Properties.Resources.Settings, MessageBoxButton.YesNo, MessageBoxImage.Question) == MessageBoxResult.No)
- {
- return;
- }
-
- SynethiaManager.Save(Global.SynethiaConfig);
+ SynethiaManager.Save(Global.SynethiaConfig, Global.SynethiaPath);
HistoryManager.Save(Global.History);
- Process.Start(Directory.GetCurrentDirectory() + @"\InternetTest.exe");
- Application.Current.Shutdown();
+ Global.ChangeTheme();
}
private void SystemBorder_MouseLeftButtonUp(object sender, MouseButtonEventArgs e)
{
ResetBorders();
ThemeSelectedBorder = (Border)sender;
- ((Border)sender).BorderBrush = new SolidColorBrush { Color = Global.GetColorFromResource("AccentColor") };
+ ((Border)sender).BorderBrush = Global.GetBrushFromResource("Accent");
Global.Settings.Theme = Themes.System;
SettingsManager.Save();
- if (MessageBox.Show(Properties.Resources.NeedRestartToApplyChanges, Properties.Resources.Settings, MessageBoxButton.YesNo, MessageBoxImage.Question) == MessageBoxResult.No)
- {
- return;
- }
-
- SynethiaManager.Save(Global.SynethiaConfig);
+ SynethiaManager.Save(Global.SynethiaConfig, Global.SynethiaPath);
HistoryManager.Save(Global.History);
- Process.Start(Directory.GetCurrentDirectory() + @"\InternetTest.exe");
- Application.Current.Shutdown();
+ Global.ChangeTheme();
}
private void LangComboBox_SelectionChanged(object sender, SelectionChangedEventArgs e)
@@ -256,7 +252,7 @@ private void LangApplyBtn_Click(object sender, RoutedEventArgs e)
return;
}
- SynethiaManager.Save(Global.SynethiaConfig);
+ SynethiaManager.Save(Global.SynethiaConfig, Global.SynethiaPath);
HistoryManager.Save(Global.History);
Process.Start(Directory.GetCurrentDirectory() + @"\InternetTest.exe");
@@ -349,7 +345,7 @@ private void ResetSettingsLink_Click(object sender, RoutedEventArgs e)
return;
}
- SynethiaManager.Save(Global.SynethiaConfig);
+ SynethiaManager.Save(Global.SynethiaConfig, Global.SynethiaPath);
HistoryManager.Save(Global.History);
Process.Start(Directory.GetCurrentDirectory() + @"\InternetTest.exe");
Application.Current.Shutdown();
@@ -377,7 +373,7 @@ private void ResetSynethiaLink_Click(object sender, RoutedEventArgs e)
// If the user wants to proceed, reset Syenthia config file.
Global.SynethiaConfig = new();
- SynethiaManager.Save(Global.SynethiaConfig);
+ SynethiaManager.Save(Global.SynethiaConfig, Global.SynethiaPath);
// Ask the user if they want to restart the application to apply changes.
if (MessageBox.Show(Properties.Resources.NeedRestartToApplyChanges, Properties.Resources.Settings, MessageBoxButton.YesNo, MessageBoxImage.Question) == MessageBoxResult.No)
@@ -427,4 +423,33 @@ private void LocateIpOnStartChk_Checked(object sender, RoutedEventArgs e)
Global.Settings.LaunchIpLocationOnStart = LocateIpOnStartChk.IsChecked;
SettingsManager.Save();
}
+
+ private void EraseWiFisLink_Click(object sender, RoutedEventArgs e)
+ {
+ if (!Directory.Exists(FileSys.AppDataPath + @"\Léo Corporation\InternetTest Pro\WiFis")) return;
+
+ if (MessageBox.Show(Properties.Resources.EraseWiFiPasswordsFilesMsg, Properties.Resources.InternetTestPro, MessageBoxButton.YesNoCancel, MessageBoxImage.Question) != MessageBoxResult.Yes) return;
+
+ string path = FileSys.AppDataPath + @"\Léo Corporation\InternetTest Pro\WiFis";
+ string[] files = Directory.GetFiles(path);
+ for (int i = 0; i < files.Length; i++)
+ {
+ File.Delete(files[i]); // Remove the temp file
+ }
+ Directory.Delete(path); // Delete the temp directory
+ }
+
+ private void IntervalApplyBtn_Click(object sender, RoutedEventArgs e)
+ {
+ if (string.IsNullOrEmpty(IntervalTxt.Text)) return;
+
+ Global.Settings.DefaultTimeInterval = int.Parse(IntervalTxt.Text);
+ SettingsManager.Save();
+ }
+
+ private void NetworkAdaptersChk_Checked(object sender, RoutedEventArgs e)
+ {
+ Global.Settings.HideDisabledAdapters = HideNetworkAdaptersChk.IsChecked;
+ SettingsManager.Save();
+ }
}
diff --git a/InternetTest/InternetTest/Pages/StatusPage.xaml b/InternetTest/InternetTest/Pages/StatusPage.xaml
deleted file mode 100644
index b85de151..00000000
--- a/InternetTest/InternetTest/Pages/StatusPage.xaml
+++ /dev/null
@@ -1,385 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/InternetTest/InternetTest/Pages/StatusPage.xaml.cs b/InternetTest/InternetTest/Pages/StatusPage.xaml.cs
deleted file mode 100644
index 5147b108..00000000
--- a/InternetTest/InternetTest/Pages/StatusPage.xaml.cs
+++ /dev/null
@@ -1,253 +0,0 @@
-/*
-MIT License
-
-Copyright (c) Léo Corporation
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-*/
-using InternetTest.Classes;
-using PeyrSharp.Core.Converters;
-using System;
-using System.Diagnostics;
-using System.Linq;
-using System.Net;
-using System.Net.Http;
-using System.Threading.Tasks;
-using System.Windows;
-using System.Windows.Controls;
-using System.Windows.Media;
-using System.Windows.Threading;
-
-namespace InternetTest.Pages;
-///
-/// Interaction logic for StatusPage.xaml
-///
-public partial class StatusPage : Page
-{
- bool codeInjected = !Global.Settings.UseSynethia;
- public StatusPage()
- {
- InitializeComponent();
- InitUI(); // Load the UI
- Loaded += (o, e) => InjectSynethiaCode();
- }
-
- private void InjectSynethiaCode()
- {
- if (codeInjected) return;
- codeInjected = true;
- foreach (Button b in Global.FindVisualChildren