Ping statistics improved, expander added

Author: BornToBeRoot

Source/NETworkManager/Models/Settings/CommandLineManager.cs

@@ -56,10 +56,6 @@ public static void Parse()
                         Current.Help = true;
                     }
                 }
-                else
-                {
-                    Current.Help = true;
-                }
             }
         }
 

Source/NETworkManager/Models/Settings/SettingsInfo.cs

@@ -502,6 +502,20 @@ public int Ping_ExceptionCancelCount
                 SettingsChanged = true;
             }
         }
+
+        private bool _ping_ExpandStatistics = true;
+        public bool Ping_ExpandStatistics
+        {
+            get { return _ping_ExpandStatistics; }
+            set
+            {
+                if (value == _ping_ExpandStatistics)
+                    return;
+
+                _ping_ExpandStatistics = value;
+                SettingsChanged = true;
+            }
+        }
         #endregion
 
         #region Traceroute

Source/NETworkManager/Models/Settings/SettingsManager.cs

@@ -202,6 +202,6 @@ public static void Reset()
 
             ForceRestart = true;
         }
-        #endregion                
+        #endregion
     }
 }

Source/NETworkManager/Resources/Styles/ExpanderStyles.xaml

@@ -14,16 +14,16 @@
                             BorderThickness="{TemplateBinding BorderThickness}">
                         <Grid Background="Transparent" SnapsToDevicePixels="False">
                             <Grid.ColumnDefinitions>
-                                <ColumnDefinition Width="Auto" />
                                 <ColumnDefinition Width="*" />
+                                <ColumnDefinition Width="Auto" />
                             </Grid.ColumnDefinitions>
-                            <Rectangle x:Name="Test" Width="16" Height="16" Fill="{DynamicResource GrayBrush3}">
+                            <Rectangle Grid.Column="1" x:Name="Chevron" Width="16" Height="16" Fill="{DynamicResource GrayBrush3}" VerticalAlignment="Center">
                                 <Rectangle.OpacityMask>
                                     <VisualBrush Stretch="Uniform" Visual="{IconPacks:PackIconMaterial Kind=ChevronDown}" />
                                 </Rectangle.OpacityMask>
                             </Rectangle>
-                            <Controls:ContentControlEx Grid.Column="1" 
-                                                       Margin="4 0 0 0" 
+                            <Controls:ContentControlEx Grid.Column="0" 
+                                                       Margin="0" 
                                                        HorizontalAlignment="Stretch"
                                                        Padding="{TemplateBinding Padding}" 
                                                        HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
@@ -39,14 +39,14 @@
                     </Border>
                     <ControlTemplate.Triggers>
                         <Trigger Property="IsChecked" Value="True">
-                            <Setter TargetName="Test" Property="OpacityMask">
+                            <Setter TargetName="Chevron" Property="OpacityMask">
                                 <Setter.Value>
                                     <VisualBrush Stretch="Uniform" Visual="{IconPacks:PackIconMaterial Kind=ChevronUp}" />
                                 </Setter.Value>
                             </Setter>
                         </Trigger>
                         <Trigger Property="IsMouseOver" Value="True">
-                            <Setter TargetName="Test" Property="Fill" Value="{DynamicResource GrayBrush5}"/>
+                            <Setter TargetName="Chevron" Property="Fill" Value="{DynamicResource GrayBrush5}"/>
                         </Trigger>
                     </ControlTemplate.Triggers>
                 </ControlTemplate>

Source/NETworkManager/ViewModels/Applications/PingViewModel.cs

@@ -227,6 +227,23 @@ public DateTime? EndTime
                 OnPropertyChanged();
             }
         }
+
+        private bool _expandStatistics;
+        public bool ExpandStatistics
+        {
+            get { return _expandStatistics; }
+            set
+            {
+                if (value == _expandStatistics)
+                    return;
+
+                if (!_isLoading)
+                    SettingsManager.Current.Ping_ExpandStatistics = value;
+
+                _expandStatistics = value;
+                OnPropertyChanged();
+            }
+        }
         #endregion
 
         #region Contructor
@@ -250,6 +267,8 @@ private void LoadSettings()
         {
             if (SettingsManager.Current.Ping_HostnameOrIPAddressHistory != null)
                 HostnameOrIPAddressHistory = new List<string>(SettingsManager.Current.Ping_HostnameOrIPAddressHistory);
+
+            ExpandStatistics = SettingsManager.Current.Ping_ExpandStatistics;
         }
         #endregion
 

Source/NETworkManager/Views/Applications/PingView.xaml

@@ -133,9 +133,12 @@
                 <DataGridTextColumn Header="{DynamicResource String_Status}" Binding="{Binding Status, Converter={StaticResource IPStatusToStringConverter}}" MinWidth="150"/>
             </Control:ScrollingDataGrid.Columns>
         </Control:ScrollingDataGrid>
-        <StackPanel Grid.Row="4">
-            <TextBlock Text="{DynamicResource String_Header_Statistics}" Style="{StaticResource HeaderTextBlock}" />
-            <Grid>
+        <Expander Grid.Row="4" IsExpanded="{Binding ExpandStatistics}" Style="{StaticResource DefaultExpander}">
+            <Expander.Header>
+                <TextBlock Text="{DynamicResource String_Header_Statistics}" Style="{StaticResource HeaderTextBlock}" Margin="0" />
+            </Expander.Header>
+        <StackPanel FlowDirection="LeftToRight">
+            <Grid Margin="0,10,0,0">
                 <Grid.ColumnDefinitions>
                     <ColumnDefinition Width="1*" />
                     <ColumnDefinition Width="1*" />
@@ -194,5 +197,6 @@
                 <TextBox Grid.Column="7" Grid.Row="4" Text="{Binding MaximumTime, StringFormat={}{0} ms}" />
             </Grid>
         </StackPanel>
+        </Expander>
     </Grid>
 </UserControl>