Ping - Start/End/Duration added, minor fixes

Author: BornToBeRoot

Source/NETworkManager/Converters/NullableDateTimeToStringConverter.cs

@@ -0,0 +1,24 @@
+using System;
+using System.Globalization;
+using System.Windows.Data;
+
+namespace NETworkManager.Converters
+{
+    public sealed class NullableDateTimeToStringConverter : IValueConverter
+    {
+        public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
+        {
+            if(value is DateTime)
+            {
+                return ((DateTime)value);
+            }
+
+            return "-/-";
+        }
+
+        public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
+        {
+            throw new NotImplementedException();
+        }
+    }
+}

Source/NETworkManager/MainWindow.xaml

@@ -497,8 +497,8 @@
                     <RowDefinition Height="Auto" />
                     <RowDefinition Height="*" />
                 </Grid.RowDefinitions>
-                <Border Grid.Row="0" Height="48" BorderBrush="{DynamicResource GrayBrush8}" BorderThickness="0,0,0,1" >
-                    <TextBlock VerticalAlignment="Center" TextAlignment="Center" Style="{StaticResource HeaderTextBlock}" Text="{Binding SelectedApplicationViewInfo.TranslatedName}" Foreground="{DynamicResource GrayBrush3}" Margin="10,0" />
+                <Border Grid.Row="0" BorderBrush="{DynamicResource GrayBrush8}" BorderThickness="0,0,0,1" >
+                    <TextBlock VerticalAlignment="Center" Height="48"  TextAlignment="Center" Style="{StaticResource HeaderTextBlock}" Text="{Binding SelectedApplicationViewInfo.TranslatedName}" Foreground="{DynamicResource GrayBrush3}" Margin="10,0" />
                 </Border>
                 <ContentControl x:Name="contentControlApplication" Grid.Row="1" Focusable="False" />
             </Grid>

Source/NETworkManager/NETworkManager.csproj

@@ -93,6 +93,7 @@
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </ApplicationDefinition>
+    <Compile Include="Converters\NullableDateTimeToStringConverter.cs" />
     <Compile Include="WpfHelper\ProtocolSettingsLayout.cs" />
     <Page Include="Resources\ContextMenu\ContextMenu.xaml">
       <Generator>MSBuild:Compile</Generator>

Source/NETworkManager/Resources/Localization/Resources.de-DE.xaml

@@ -198,7 +198,10 @@
     <system:String x:Key="String_SearchedApplicationNotFound">Gesuchte Anwendung nicht gefunden!</system:String>
     <system:String x:Key="String_MagicPacketSuccessfulSended">Magic Packet erfolgreich gesendet!</system:String>
     <system:String x:Key="String_MagicPacketSuccessfulSendedToClients">Magic Paket erfolgreich an {0} Clients gesendet!</system:String>
-
+    <system:String x:Key="String_StartTime">Startzeit</system:String>
+    <system:String x:Key="String_Duration">Dauer</system:String>
+    <system:String x:Key="String_EndTime">Endzeit</system:String>
+    
     <!-- Buttons -->
     <system:String x:Key="String_Button_Change">Wechseln</system:String>
     <system:String x:Key="String_Button_Default">Standard</system:String>

Source/NETworkManager/Resources/Localization/Resources.en-US.xaml

@@ -200,6 +200,9 @@
     <system:String x:Key="String_SearchedApplicationNotFound">Searched application not found!</system:String>
     <system:String x:Key="String_MagicPacketSuccessfulSended">Magic packet successful sended!</system:String>
     <system:String x:Key="String_MagicPacketSuccessfulSendedToClients">Magic packet successful sended to {0} clients!</system:String>
+    <system:String x:Key="String_StartTime">Start time</system:String>
+    <system:String x:Key="String_Duration">Duration</system:String>
+    <system:String x:Key="String_EndTime">End time</system:String>
 
     <!-- Buttons -->
     <system:String x:Key="String_Button_Change">Change</system:String>
@@ -354,7 +357,6 @@
     <system:String x:Key="String_IPStatus_TimedOut">Request timed out.</system:String>
     <system:String x:Key="String_IPStatus_TtlExpired">TTL expired in transit.</system:String>
 
-    
     <!-- PortStatus -->
     <system:String x:Key="String_PortStatus_Closed">Closed</system:String>
     <system:String x:Key="String_PortStatus_Open">Open</system:String>

Source/NETworkManager/ViewModels/Applications/PingViewModel.cs

@@ -12,6 +12,8 @@
 using System.Windows.Input;
 using NETworkManager.Collections;
 using System.ComponentModel;
+using System.Diagnostics;
+using System.Windows.Threading;
 
 namespace NETworkManager.ViewModels.Applications
 {
@@ -23,6 +25,8 @@ public class PingViewModel : ViewModelBase
 
         CancellationTokenSource cancellationTokenSource;
 
+        DispatcherTimer dispatcherTimer = new DispatcherTimer();
+
         private bool _isLoading = true;
 
         private string _hostnameOrIPAddress;
@@ -180,6 +184,48 @@ public int AverageTime
                 OnPropertyChanged();
             }
         }
+
+        private DateTime? _startTime;
+        public DateTime? StartTime
+        {
+            get { return _startTime; }
+            set
+            {
+                if (value == _startTime)
+                    return;
+
+                _startTime = value;
+                OnPropertyChanged();
+            }
+        }
+
+        private TimeSpan _duration;
+        public TimeSpan Duration
+        {
+            get { return _duration; }
+            set
+            {
+                if (value == _duration)
+                    return;
+
+                _duration = value;
+                OnPropertyChanged();
+            }
+        }
+
+        private DateTime? _endTime;
+        public DateTime? EndTime
+        {
+            get { return _endTime; }
+            set
+            {
+                if (value == _endTime)
+                    return;
+
+                _endTime = value;
+                OnPropertyChanged();
+            }
+        }
         #endregion
 
         #region Contructor
@@ -226,6 +272,12 @@ private async void StartPing()
         {
             IsPingRunning = true;
 
+            StartTime = DateTime.Now;
+            Duration = new TimeSpan();
+            dispatcherTimer.Tick += DispatcherTimer_Tick;
+            dispatcherTimer.Interval = new TimeSpan(0, 0, 0, 0, 100);
+            dispatcherTimer.Start();
+            EndTime = null;
             PingResult.Clear();
             PingsTransmitted = 0;
             PingsReceived = 0;
@@ -270,10 +322,10 @@ private async void StartPing()
                 }
             }
             catch (SocketException) // This will catch DNS resolve errors
-            {               
+            {
                 await dialogCoordinator.ShowMessageAsync(this, Application.Current.Resources["String_Header_DnsError"] as string, Application.Current.Resources["String_CouldNotResolveHostnameMessage"] as string, MessageDialogStyle.Affirmative, dialogSettings);
 
-                IsPingRunning = false;
+                PingFinished();
 
                 return;
             }
@@ -302,14 +354,27 @@ private async void StartPing()
             ping.UserHasCanceled += Ping_UserHasCanceled;
 
             ping.SendAsync(ipAddress, pingOptions, cancellationTokenSource.Token);
-        }              
+        }
+
+        private void DispatcherTimer_Tick(object sender, EventArgs e)
+        {
+            Duration = (DateTime.Now - (DateTime)StartTime);
+        }
 
         private void StopPing()
         {
             CancelPing = true;
             cancellationTokenSource.Cancel();
         }
 
+        private void PingFinished()
+        {
+            IsPingRunning = false;
+            dispatcherTimer.Stop();
+            EndTime = DateTime.Now;
+            Duration = (DateTime)EndTime - (DateTime)StartTime;
+        }
+
         public void OnShutdown()
         {
             if (IsPingRunning)
@@ -324,7 +389,7 @@ private void Ping_PingReceived(object sender, PingReceivedArgs e)
 
             // Add the result to the collection
             PingResult.Add(pingInfo);
-            
+
             // Calculate statistics
             PingsTransmitted++;
 
@@ -354,10 +419,10 @@ private void Ping_PingReceived(object sender, PingReceivedArgs e)
                 PingsLost++;
             }
         }
-                
+
         private void Ping_PingCompleted(object sender, System.EventArgs e)
         {
-            IsPingRunning = false;
+            PingFinished();
         }
 
         private async void Ping_PingException(object sender, PingExceptionArgs e)
@@ -367,7 +432,7 @@ private async void Ping_PingException(object sender, PingExceptionArgs e)
 
             string errorMessage = string.Empty;
 
-            switch(w32ex.NativeErrorCode)
+            switch (w32ex.NativeErrorCode)
             {
                 case 1231:
                     errorMessage = Application.Current.Resources["String_NetworkLocationCannotBeReached"] as string;
@@ -377,15 +442,16 @@ private async void Ping_PingException(object sender, PingExceptionArgs e)
                     break;
             }
 
-            await dialogCoordinator.ShowMessageAsync(this, Application.Current.Resources["String_Header_PingError"] as string, errorMessage , MessageDialogStyle.Affirmative, dialogSettings);
+            await dialogCoordinator.ShowMessageAsync(this, Application.Current.Resources["String_Header_PingError"] as string, errorMessage, MessageDialogStyle.Affirmative, dialogSettings);
 
-            IsPingRunning = false;
+            PingFinished();
         }
 
         private void Ping_UserHasCanceled(object sender, EventArgs e)
         {
             CancelPing = false;
-            IsPingRunning = false;
+
+            PingFinished();
         }
         #endregion
     }

Source/NETworkManager/Views/Applications/PingView.xaml

@@ -14,6 +14,7 @@
         mc:Ignorable="d">
     <UserControl.Resources>
         <Converter:BooleanReverseConverter x:Key="BooleanReverseConverter" />
+        <Converter:NullableDateTimeToStringConverter x:Key="NullableDateTimeToStringConverter" />
         <Converter:IntToStringConverter x:Key="IntToStringConverter" />
         <Converter:IPStatusToStringConverter x:Key="IPStatusToStringConverter" />
         <Converter:PercentConverter x:Key="PercentConverter" />
@@ -111,7 +112,7 @@
                     </Style>
                 </Controls:MetroProgressBar.Style>
             </Controls:MetroProgressBar>
-        </Grid>        
+        </Grid>
         <TextBlock Grid.Row="2" Text="{DynamicResource String_Header_Status}" Style="{StaticResource HeaderTextBlock}" />
         <Control:ScrollingDataGrid Grid.Row="3" CanUserSortColumns="False" CanUserReorderColumns="False" Style="{StaticResource MetroDataGrid}" FontSize="14" mah:ControlsHelper.ContentCharacterCasing="Normal" ItemsSource="{Binding PingResult}" CanUserAddRows="False" HorizontalScrollBarVisibility="Auto" VerticalScrollBarVisibility="Auto" AutoGenerateColumns="False" IsReadOnly="True" Margin="0,0,0,20">
             <Control:ScrollingDataGrid.Resources>
@@ -136,10 +137,13 @@
             <TextBlock Text="{DynamicResource String_Header_Statistics}" Style="{StaticResource HeaderTextBlock}" />
             <Grid>
                 <Grid.ColumnDefinitions>
-                    <ColumnDefinition Width="2*" />
+                    <ColumnDefinition Width="1*" />
                     <ColumnDefinition Width="1*" />
                     <ColumnDefinition Width="10" />
-                    <ColumnDefinition Width="2*" />
+                    <ColumnDefinition Width="1*" />
+                    <ColumnDefinition Width="1*" />
+                    <ColumnDefinition Width="10" />
+                    <ColumnDefinition Width="1*" />
                     <ColumnDefinition Width="1*" />
                 </Grid.ColumnDefinitions>
                 <Grid.RowDefinitions>
@@ -156,32 +160,38 @@
                         <Setter Property="ContextMenu" Value="{StaticResource CopyContextMenu}" />
                     </Style>
                 </Grid.Resources>
-                <TextBlock Grid.Column="0" Grid.Row="0" Text="{DynamicResource String_PacketsTransmitted}" />
-                <TextBox Grid.Column="1" Grid.Row="0" Text="{Binding PingsTransmitted}" />
-                <TextBlock Grid.Column="0" Grid.Row="2" Text="{DynamicResource String_ReceivedLost}" VerticalAlignment="Bottom" />
-                <TextBox Grid.Column="1" Grid.Row="2">
+                <TextBlock Grid.Column="0" Grid.Row="0" Text="{DynamicResource String_StartTime}" />
+                <TextBox Grid.Column="1" Grid.Row="0" Text="{Binding StartTime, Converter={StaticResource NullableDateTimeToStringConverter}}" />
+                <TextBlock Grid.Column="0" Grid.Row="2" Text="{DynamicResource String_Duration}" />
+                <TextBox Grid.Column="1" Grid.Row="2" Text="{Binding Duration, StringFormat={}{0:hh}:{0:mm}:{0:ss}:{0:ff}}" />
+                <TextBlock Grid.Column="0" Grid.Row="4" Text="{DynamicResource String_EndTime}" />
+                <TextBox Grid.Column="1" Grid.Row="4" Text="{Binding EndTime, Converter={StaticResource NullableDateTimeToStringConverter}}" />
+                <TextBlock Grid.Column="3" Grid.Row="0" Text="{DynamicResource String_PacketsTransmitted}" />
+                <TextBox Grid.Column="4" Grid.Row="0" Text="{Binding PingsTransmitted}" />
+                <TextBlock Grid.Column="3" Grid.Row="2" Text="{DynamicResource String_ReceivedLost}" VerticalAlignment="Bottom" />
+                <TextBox Grid.Column="4" Grid.Row="2">
                     <TextBox.Text>
                         <MultiBinding StringFormat="{}{0} / {1}">
                             <Binding Path="PingsReceived" />
                             <Binding Path="PingsLost" />
                         </MultiBinding>
                     </TextBox.Text>
                 </TextBox>
-                <TextBlock Grid.Column="0" Grid.Row="4" Text="{DynamicResource String_PacketLoss}" />
-                <TextBox Grid.Column="1" Grid.Row="4">
+                <TextBlock Grid.Column="3" Grid.Row="4" Text="{DynamicResource String_PacketLoss}" />
+                <TextBox Grid.Column="4" Grid.Row="4">
                     <TextBox.Text>
                         <MultiBinding Converter="{StaticResource PercentConverter}" StringFormat="{}{0} %">
                             <Binding Path="PingsTransmitted" />
                             <Binding Path="PingsLost" />
                         </MultiBinding>
                     </TextBox.Text>
                 </TextBox>
-                <TextBlock Grid.Column="3" Grid.Row="0" Text="{DynamicResource String_AverageTime}" />
-                <TextBox Grid.Column="4" Grid.Row="0" Text="{Binding AverageTime, StringFormat={}{0} ms}" />
-                <TextBlock Grid.Column="3" Grid.Row="2" Text="{DynamicResource String_Minimum}" />
-                <TextBox Grid.Column="4" Grid.Row="2" Text="{Binding MinimumTime, StringFormat={}{0} ms}" />
-                <TextBlock Grid.Column="3" Grid.Row="4" Text="{DynamicResource String_Maximum}" />
-                <TextBox Grid.Column="4" Grid.Row="4" Text="{Binding MaximumTime, StringFormat={}{0} ms}" />
+                <TextBlock Grid.Column="6" Grid.Row="0" Text="{DynamicResource String_AverageTime}" />
+                <TextBox Grid.Column="7" Grid.Row="0" Text="{Binding AverageTime, StringFormat={}{0} ms}" />
+                <TextBlock Grid.Column="6" Grid.Row="2" Text="{DynamicResource String_Minimum}" />
+                <TextBox Grid.Column="7" Grid.Row="2" Text="{Binding MinimumTime, StringFormat={}{0} ms}" />
+                <TextBlock Grid.Column="6" Grid.Row="4" Text="{DynamicResource String_Maximum}" />
+                <TextBox Grid.Column="7" Grid.Row="4" Text="{Binding MaximumTime, StringFormat={}{0} ms}" />
             </Grid>
         </StackPanel>
     </Grid>

Source/NETworkManager/Views/Settings/SettingsWindow.xaml

@@ -19,7 +19,7 @@
                         <ColumnDefinition Width="*" />
                     </Grid.ColumnDefinitions>
                     <Border Grid.Column="0" BorderBrush="{DynamicResource GrayBrush8}" BorderThickness="0,0,1,0">
-                        <ListBox Background="Transparent" ItemsSource="{Binding SettingsGeneralViews}" SelectedItem="{Binding SelectedSettingsView}">
+                        <ListBox Background="Transparent" ItemsSource="{Binding SettingsGeneralViews}" SelectedItem="{Binding SelectedSettingsView}" Margin="0,0,10,0">
                             <ListBox.Resources>
                                 <Style TargetType="{x:Type ScrollViewer}" BasedOn="{StaticResource DefaulScrollViewer}" />
                             </ListBox.Resources>

Source/NETworkManager/WpfHelper/ProtocolSettingsLayout.cs

@@ -57,9 +57,7 @@ private static DependencyPropertyDescriptor GetHasErrorDescriptor(DependencyObje
 
         private static void OnHasErrorChanged(object sender, EventArgs e)
         {
-            DependencyObject dependencyObject = sender as DependencyObject;
-
-            if (dependencyObject != null)
+            if (sender is DependencyObject dependencyObject)
             {
                 dependencyObject.SetValue(MVVMHasErrorProperty, dependencyObject.GetValue(Validation.HasErrorProperty));
             }