From 00a1fcaa7c0f9331c4e9171dfe54959b5fff7b6a Mon Sep 17 00:00:00 2001
From: BornToBeRoot <BornToBeRoot@users.noreply.github.com>
Date: Sun, 3 Jun 2018 02:50:58 +0200
Subject: [PATCH 1/5] IP Scanner - Hide statistics via settings

---
 .../Models/Settings/SettingsInfo.cs            | 17 +++++++++++++++++
 .../Localization/Resources.de-DE.xaml          |  1 +
 .../Localization/Resources.en-US.xaml          |  1 +
 .../Localization/Resources.ru-RU.xaml          |  3 ++-
 .../ViewModels/IPScannerSettingsViewModel.cs   | 18 ++++++++++++++++++
 .../ViewModels/IPScannerViewModel.cs           |  8 ++++++++
 .../Views/IPScannerSettingsView.xaml           |  4 +++-
 Source/NETworkManager/Views/IPScannerView.xaml |  7 ++++---
 8 files changed, 54 insertions(+), 5 deletions(-)

diff --git a/Source/NETworkManager/Models/Settings/SettingsInfo.cs b/Source/NETworkManager/Models/Settings/SettingsInfo.cs
index a0cac98593..e9e9893222 100644
--- a/Source/NETworkManager/Models/Settings/SettingsInfo.cs
+++ b/Source/NETworkManager/Models/Settings/SettingsInfo.cs
@@ -625,6 +625,23 @@ public double IPScanner_ProfileWidth
                 SettingsChanged = true;
             }
         }
+
+        private bool _ipScanner_HideStatistics;
+        public bool IPScanner_HideStatistics
+        {
+            get { return _ipScanner_HideStatistics; }
+            set
+            {
+                if (value == _ipScanner_HideStatistics)
+                    return;
+
+                _ipScanner_HideStatistics = value;
+
+                OnPropertyChanged();
+
+                SettingsChanged = true;
+            }
+        }
         #endregion
 
         #region PortScanner
diff --git a/Source/NETworkManager/Resources/Localization/Resources.de-DE.xaml b/Source/NETworkManager/Resources/Localization/Resources.de-DE.xaml
index 1b04745165..4584d89732 100644
--- a/Source/NETworkManager/Resources/Localization/Resources.de-DE.xaml
+++ b/Source/NETworkManager/Resources/Localization/Resources.de-DE.xaml
@@ -431,6 +431,7 @@
     <system:String x:Key="String_ClearFilter">Filter löschen</system:String>
     <system:String x:Key="String_AddSessionDots">Sitzung hinzufügen...</system:String>
     <system:String x:Key="String_AddClientDots">Client hinzufügen...</system:String>
+    <system:String x:Key="String_HideStatistics">Statistiken ausblenden</system:String>
     
     <!-- Documentation title -->
     <system:String x:Key="String_DocumentationTitle_00001">Wie installiere ich RDP 8.1 unter Windows 7 / Server 2008 R2?</system:String>
diff --git a/Source/NETworkManager/Resources/Localization/Resources.en-US.xaml b/Source/NETworkManager/Resources/Localization/Resources.en-US.xaml
index 363f96084e..817afcd34d 100644
--- a/Source/NETworkManager/Resources/Localization/Resources.en-US.xaml
+++ b/Source/NETworkManager/Resources/Localization/Resources.en-US.xaml
@@ -431,6 +431,7 @@
     <system:String x:Key="String_AddProfileDots">Add profile...</system:String>
     <system:String x:Key="String_AddSessionDots">Add session...</system:String>
     <system:String x:Key="String_AddClientDots">Add client...</system:String>
+    <system:String x:Key="String_HideStatistics">Hide statistics</system:String>
     
     <!-- Documentation title -->
     <system:String x:Key="String_DocumentationTitle_00001">How to install RDP 8.1 on Windows 7/Server 2008 R2</system:String>
diff --git a/Source/NETworkManager/Resources/Localization/Resources.ru-RU.xaml b/Source/NETworkManager/Resources/Localization/Resources.ru-RU.xaml
index c7631eebe4..9512f6fd79 100644
--- a/Source/NETworkManager/Resources/Localization/Resources.ru-RU.xaml
+++ b/Source/NETworkManager/Resources/Localization/Resources.ru-RU.xaml
@@ -431,7 +431,8 @@
     <system:String x:Key="String_AddProfileDots">Add profile...</system:String>
     <system:String x:Key="String_AddSessionDots">Add session...</system:String>
     <system:String x:Key="String_AddClientDots">Add client...</system:String>
-
+    <system:String x:Key="String_HideStatistics">Hide statistics</system:String>
+    
     <!-- Documentation title -->
     <system:String x:Key="String_DocumentationTitle_00001">Как установить RDP 8.1 на Windows 7 / Server 2008 R2</system:String>
     <system:String x:Key="String_DocumentationTitle_00002">Как создать пользовательскую тему и оттенок?</system:String>
diff --git a/Source/NETworkManager/ViewModels/IPScannerSettingsViewModel.cs b/Source/NETworkManager/ViewModels/IPScannerSettingsViewModel.cs
index 3273034f2d..a2674f7c1b 100644
--- a/Source/NETworkManager/ViewModels/IPScannerSettingsViewModel.cs
+++ b/Source/NETworkManager/ViewModels/IPScannerSettingsViewModel.cs
@@ -268,6 +268,23 @@ public bool ResolveMACAddress
                 OnPropertyChanged();
             }
         }
+
+        private bool _hideStatistics;
+        public bool HideStatistics
+        {
+            get { return _hideStatistics; }
+            set
+            {
+                if (value == _hideStatistics)
+                    return;
+
+                if (!_isLoading)
+                    SettingsManager.Current.IPScanner_HideStatistics = value;
+
+                _hideStatistics = value;
+                OnPropertyChanged();
+            }
+        }
         #endregion
 
         #region Constructor, load settings
@@ -299,6 +316,7 @@ private void LoadSettings()
             DNSAttempts = SettingsManager.Current.IPScanner_DNSAttempts;
             DNSTimeout = SettingsManager.Current.IPScanner_DNSTimeout;
             ResolveMACAddress = SettingsManager.Current.IPScanner_ResolveMACAddress;
+            HideStatistics = SettingsManager.Current.IPScanner_HideStatistics;
         }
         #endregion
     }
diff --git a/Source/NETworkManager/ViewModels/IPScannerViewModel.cs b/Source/NETworkManager/ViewModels/IPScannerViewModel.cs
index 498843a80b..c6aa7d6724 100644
--- a/Source/NETworkManager/ViewModels/IPScannerViewModel.cs
+++ b/Source/NETworkManager/ViewModels/IPScannerViewModel.cs
@@ -264,6 +264,11 @@ public bool ExpandStatistics
                 OnPropertyChanged();
             }
         }
+
+        public bool HideStatistics
+        {
+            get { return SettingsManager.Current.IPScanner_HideStatistics; }
+        }
         #endregion
 
         #region Constructor, load settings, shutdown
@@ -674,6 +679,9 @@ private void SettingsManager_PropertyChanged(object sender, PropertyChangedEvent
 
             if (e.PropertyName == nameof(SettingsInfo.IPScanner_ResolveHostname))
                 OnPropertyChanged(nameof(ResolveHostname));
+
+            if (e.PropertyName == nameof(SettingsInfo.IPScanner_HideStatistics))
+                OnPropertyChanged(nameof(HideStatistics));
         }
         #endregion
     }
diff --git a/Source/NETworkManager/Views/IPScannerSettingsView.xaml b/Source/NETworkManager/Views/IPScannerSettingsView.xaml
index 99d77538c1..9cdab906a8 100644
--- a/Source/NETworkManager/Views/IPScannerSettingsView.xaml
+++ b/Source/NETworkManager/Views/IPScannerSettingsView.xaml
@@ -53,6 +53,8 @@
         <TextBlock Text="{DynamicResource String_Timeout}" Style="{DynamicResource DefaultTextBlock}" VerticalAlignment="Center" Margin="0,0,0,10" />
         <mah:NumericUpDown Value="{Binding DNSTimeout}" Maximum="10000" Minimum="100" Interval="100" Margin="0,0,0,20" />
         <TextBlock Text="{DynamicResource String_Header_ARP}" Style="{StaticResource HeaderTextBlock}" />
-        <mah:ToggleSwitch Header="{DynamicResource String_ReadTheMACAddressFromTheArpCache}" OnLabel="{DynamicResource String_ToggleSwitch_On}" OffLabel="{DynamicResource String_ToggleSwitch_Off}" IsChecked="{Binding ResolveMACAddress}" />
+        <mah:ToggleSwitch Header="{DynamicResource String_ReadTheMACAddressFromTheArpCache}" OnLabel="{DynamicResource String_ToggleSwitch_On}" OffLabel="{DynamicResource String_ToggleSwitch_Off}" IsChecked="{Binding ResolveMACAddress}" Margin="0,0,0,20" />
+        <TextBlock Text="{DynamicResource String_Header_Statistics}" Style="{StaticResource HeaderTextBlock}" />
+        <mah:ToggleSwitch Header="{DynamicResource String_HideStatistics}" OnLabel="{DynamicResource String_ToggleSwitch_On}" OffLabel="{DynamicResource String_ToggleSwitch_Off}" IsChecked="{Binding HideStatistics}" />
     </StackPanel>
 </UserControl>
diff --git a/Source/NETworkManager/Views/IPScannerView.xaml b/Source/NETworkManager/Views/IPScannerView.xaml
index 8518962d0e..ea947943da 100644
--- a/Source/NETworkManager/Views/IPScannerView.xaml
+++ b/Source/NETworkManager/Views/IPScannerView.xaml
@@ -13,9 +13,10 @@
         mc:Ignorable="d">
     <UserControl.Resources>
         <Converter:BooleanToVisibilityConverter x:Key="BooleanToVisibilityConverter"/>
+        <Converter:BooleanReverseToVisibilityConverter x:Key="BooleanReverseToVisibilityConverter" />
         <Converter:BooleanReverseConverter x:Key="BooleanReverseConverter" />
         <Converter:IntToStringConverter x:Key="IntToStringConverter" />
-        <Converter:IPStatusToStringConverter x:Key="IPStatusToStringConverter" />        
+        <Converter:IPStatusToStringConverter x:Key="IPStatusToStringConverter" />
         <Converter:NullableDateTimeToStringConverter x:Key="NullableDateTimeToStringConverter" />
         <Converter:NullOrEmptyToBoolConverter x:Key="NullOrEmptyToBoolConverter" />
         <Converter:PingTimeToStringConverter x:Key="PingTimeToStringConverter" />
@@ -159,7 +160,7 @@
             <TextBlock Grid.Row="2" Foreground="{DynamicResource AccentColorBrush}" Text="{Binding StatusMessage}" Visibility="{Binding DisplayStatusMessage, Converter={StaticResource BooleanToVisibilityConverter}}" Style="{DynamicResource DefaultTextBlock}" Margin="0,10,0,0" />
         </Grid>
         <TextBlock Grid.Row="2" Style="{StaticResource HeaderTextBlock}" Text="{DynamicResource String_Header_Result}" />
-        <DataGrid Grid.Row="3" Style="{StaticResource DefaultDataGrid}" ItemsSource="{Binding IPScanResultView}" SelectedItem="{Binding SelectedIPScanResult}" Margin="0,0,0,20">
+        <DataGrid Grid.Row="3" Style="{StaticResource DefaultDataGrid}" ItemsSource="{Binding IPScanResultView}" SelectedItem="{Binding SelectedIPScanResult}">
             <DataGrid.Resources>
                 <Style TargetType="{x:Type ScrollBar}" BasedOn="{StaticResource DataGridScrollBar}" />
                 <WpfHelper:BindingProxy x:Key="BindingProxy" Data="{Binding}" />
@@ -356,7 +357,7 @@
                 <DataGridTextColumn Header="{DynamicResource String_Status}" Binding="{Binding PingInfo.Status, Converter={StaticResource IPStatusToStringConverter}}" MinWidth="150" Width="*" />
             </DataGrid.Columns>
         </DataGrid>
-        <Expander Grid.Row="4" IsExpanded="{Binding ExpandStatistics}" Style="{StaticResource HeaderExpander}">
+        <Expander Grid.Row="4" IsExpanded="{Binding ExpandStatistics}" Style="{StaticResource HeaderExpander}" Visibility="{Binding HideStatistics, Converter={StaticResource BooleanReverseToVisibilityConverter}}" Margin="0,20,0,0">
             <Expander.Header>
                 <TextBlock Text="{DynamicResource String_Header_Statistics}" Style="{StaticResource HeaderTextBlock}" Margin="0" />
             </Expander.Header>

From 66d82ebf06771c07c8fd96fa582b784ce84bfbc0 Mon Sep 17 00:00:00 2001
From: BornToBeRoot <BornToBeRoot@users.noreply.github.com>
Date: Sun, 3 Jun 2018 04:09:04 +0200
Subject: [PATCH 2/5] Settings added

---
 Source/NETworkManager/Views/PortScannerSettingsView.xaml | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/Source/NETworkManager/Views/PortScannerSettingsView.xaml b/Source/NETworkManager/Views/PortScannerSettingsView.xaml
index cc287b2ab6..d77218431b 100644
--- a/Source/NETworkManager/Views/PortScannerSettingsView.xaml
+++ b/Source/NETworkManager/Views/PortScannerSettingsView.xaml
@@ -16,7 +16,9 @@
         <mah:NumericUpDown  Value="{Binding Timeout}" Maximum="10000" Minimum="100" Interval="100" Margin="0,0,0,20" />
         <TextBlock Text="{DynamicResource String_Header_DNS}" Style="{StaticResource HeaderTextBlock}" />
         <TextBlock Style="{StaticResource CenterTextBlock}" Text="{DynamicResource String_PreferredProtocolWhenResolvingHostname}" TextWrapping="Wrap" VerticalAlignment="Top" Margin="0,0,0,10" />
-        <RadioButton Content="{DynamicResource String_IPv4}" FontSize="14" IsChecked="{Binding ResolveHostnamePreferIPv4}" Margin="0,0,0,10" />
-        <RadioButton Content="{DynamicResource String_IPv6}" FontSize="14" IsChecked="{Binding ResolveHostnamePreferIPv6}" />
+        <RadioButton Content="{DynamicResource String_IPv4}" IsChecked="{Binding ResolveHostnamePreferIPv4}" Margin="0,0,0,10" />
+        <RadioButton Content="{DynamicResource String_IPv6}" IsChecked="{Binding ResolveHostnamePreferIPv6}" Margin="0,0,0,20" />
+        <TextBlock Text="{DynamicResource String_Header_Statistics}" Style="{StaticResource HeaderTextBlock}" />
+        <mah:ToggleSwitch Header="{DynamicResource String_HideStatistics}" OnLabel="{DynamicResource String_ToggleSwitch_On}" OffLabel="{DynamicResource String_ToggleSwitch_Off}" IsChecked="{Binding HideStatistics}" />
     </StackPanel>
 </UserControl>

From efbfeb0dd08141749ea8d556980e12ca1f0c2a4b Mon Sep 17 00:00:00 2001
From: BornToBeRoot <BornToBeRoot@users.noreply.github.com>
Date: Mon, 4 Jun 2018 00:44:13 +0200
Subject: [PATCH 3/5] Hide statistics via settings added

---
 .../Models/Settings/SettingsInfo.cs           | 51 +++++++++++++++++++
 .../ViewModels/PingSettingsViewModel.cs       | 19 +++++++
 .../ViewModels/PingViewModel.cs               | 14 +++++
 .../PortScannerSettingsViewModel.cs           | 21 +++++++-
 .../ViewModels/PortScannerViewModel.cs        | 16 +++++-
 .../ViewModels/TracerouteSettingsViewModel.cs | 19 +++++++
 .../ViewModels/TracerouteViewModel.cs         | 22 +++++---
 .../Views/PingSettingsView.xaml               |  6 ++-
 Source/NETworkManager/Views/PingView.xaml     |  5 +-
 .../NETworkManager/Views/PortScannerView.xaml |  5 +-
 .../Views/TracerouteSettingsView.xaml         |  6 ++-
 .../NETworkManager/Views/TracerouteView.xaml  |  7 +--
 12 files changed, 171 insertions(+), 20 deletions(-)

diff --git a/Source/NETworkManager/Models/Settings/SettingsInfo.cs b/Source/NETworkManager/Models/Settings/SettingsInfo.cs
index e9e9893222..8af2803e4f 100644
--- a/Source/NETworkManager/Models/Settings/SettingsInfo.cs
+++ b/Source/NETworkManager/Models/Settings/SettingsInfo.cs
@@ -770,6 +770,23 @@ public double PortScanner_ProfileWidth
                 SettingsChanged = true;
             }
         }
+
+        private bool _portScanner_HideStatistics;
+        public bool PortScanner_HideStatistics
+        {
+            get { return _portScanner_HideStatistics; }
+            set
+            {
+                if (value == _portScanner_HideStatistics)
+                    return;
+
+                _portScanner_HideStatistics = value;
+
+                OnPropertyChanged();
+
+                SettingsChanged = true;
+            }
+        }
         #endregion
 
         #region Ping
@@ -940,6 +957,23 @@ public double Ping_ProfileWidth
                 SettingsChanged = true;
             }
         }
+
+        private bool _ping_HideStatistics;
+        public bool Ping_HideStatistics
+        {
+            get { return _ping_HideStatistics; }
+            set
+            {
+                if (value == _ping_HideStatistics)
+                    return;
+
+                _ping_HideStatistics = value;
+
+                OnPropertyChanged();
+
+                SettingsChanged = true;
+            }
+        }
         #endregion
 
         #region Traceroute
@@ -1071,6 +1105,23 @@ public double Traceroute_ProfileWidth
                 SettingsChanged = true;
             }
         }
+
+        private bool _traceroute_HideStatistics;
+        public bool Traceroute_HideStatistics
+        {
+            get { return _traceroute_HideStatistics; }
+            set
+            {
+                if (value == _traceroute_HideStatistics)
+                    return;
+
+                _traceroute_HideStatistics = value;
+
+                OnPropertyChanged();
+
+                SettingsChanged = true;
+            }
+        }
         #endregion
 
         #region DNS Lookup
diff --git a/Source/NETworkManager/ViewModels/PingSettingsViewModel.cs b/Source/NETworkManager/ViewModels/PingSettingsViewModel.cs
index 5c725f6003..cdbf268a8f 100644
--- a/Source/NETworkManager/ViewModels/PingSettingsViewModel.cs
+++ b/Source/NETworkManager/ViewModels/PingSettingsViewModel.cs
@@ -157,6 +157,23 @@ public bool ResolveHostnamePreferIPv6
                 OnPropertyChanged();
             }
         }
+
+        private bool _hideStatistics;
+        public bool HideStatistics
+        {
+            get { return _hideStatistics; }
+            set
+            {
+                if (value == _hideStatistics)
+                    return;
+
+                if (!_isLoading)
+                    SettingsManager.Current.Ping_HideStatistics = value;
+
+                _hideStatistics = value;
+                OnPropertyChanged();
+            }
+        }
         #endregion
 
         #region Contructor, load settings
@@ -181,6 +198,8 @@ private void LoadSettings()
                 ResolveHostnamePreferIPv4 = true;
             else
                 ResolveHostnamePreferIPv6 = true;
+
+            HideStatistics = SettingsManager.Current.Ping_HideStatistics;
         }
         #endregion
     }
diff --git a/Source/NETworkManager/ViewModels/PingViewModel.cs b/Source/NETworkManager/ViewModels/PingViewModel.cs
index a188ae691b..5ce7368d93 100644
--- a/Source/NETworkManager/ViewModels/PingViewModel.cs
+++ b/Source/NETworkManager/ViewModels/PingViewModel.cs
@@ -270,6 +270,11 @@ public string StatusMessage
                 OnPropertyChanged();
             }
         }
+
+        public bool HideStatistics
+        {
+            get { return SettingsManager.Current.Ping_HideStatistics; }
+        }
         #endregion
 
         #region Contructor, load settings    
@@ -286,6 +291,9 @@ public PingViewModel(int tabId, string host)
 
             LoadSettings();
 
+            // Detect if settings have changed...
+            SettingsManager.Current.PropertyChanged += SettingsManager_PropertyChanged;
+            
             _isLoading = false;
         }
 
@@ -560,6 +568,12 @@ private void DispatcherTimer_Tick(object sender, EventArgs e)
         {
             Duration = stopwatch.Elapsed;
         }
+
+        private void SettingsManager_PropertyChanged(object sender, PropertyChangedEventArgs e)
+        {
+            if (e.PropertyName == nameof(SettingsInfo.Ping_HideStatistics))
+                OnPropertyChanged(nameof(HideStatistics));
+        }
         #endregion
     }
 }
\ No newline at end of file
diff --git a/Source/NETworkManager/ViewModels/PortScannerSettingsViewModel.cs b/Source/NETworkManager/ViewModels/PortScannerSettingsViewModel.cs
index 89daf7b687..c9adcbdac3 100644
--- a/Source/NETworkManager/ViewModels/PortScannerSettingsViewModel.cs
+++ b/Source/NETworkManager/ViewModels/PortScannerSettingsViewModel.cs
@@ -88,7 +88,24 @@ public bool ResolveHostnamePreferIPv6
                 _resolveHostnamePreferIPv6 = value;
                 OnPropertyChanged();
             }
-        }     
+        }
+
+        private bool _hideStatistics;
+        public bool HideStatistics
+        {
+            get { return _hideStatistics; }
+            set
+            {
+                if (value == _hideStatistics)
+                    return;
+
+                if (!_isLoading)
+                    SettingsManager.Current.PortScanner_HideStatistics = value;
+
+                _hideStatistics = value;
+                OnPropertyChanged();
+            }
+        }
         #endregion
 
         #region Constructor, load settings
@@ -109,6 +126,8 @@ private void LoadSettings()
                 ResolveHostnamePreferIPv4 = true;
             else
                 ResolveHostnamePreferIPv6 = true;
+
+            HideStatistics = SettingsManager.Current.PortScanner_HideStatistics;
         }
         #endregion
     }
diff --git a/Source/NETworkManager/ViewModels/PortScannerViewModel.cs b/Source/NETworkManager/ViewModels/PortScannerViewModel.cs
index 8260182704..fac7eb6fb9 100644
--- a/Source/NETworkManager/ViewModels/PortScannerViewModel.cs
+++ b/Source/NETworkManager/ViewModels/PortScannerViewModel.cs
@@ -276,6 +276,11 @@ public string StatusMessage
                 OnPropertyChanged();
             }
         }
+
+        public bool HideStatistics
+        {
+            get { return SettingsManager.Current.PortScanner_HideStatistics; }
+        }
         #endregion
 
         #region Constructor, load settings, shutdown
@@ -294,6 +299,9 @@ public PortScannerViewModel(int tabId, string host, string port)
 
             LoadSettings();
 
+            // Detect if settings have changed...
+            SettingsManager.Current.PropertyChanged += SettingsManager_PropertyChanged;
+
             _isLoading = false;
         }
 
@@ -640,6 +648,12 @@ private void DispatcherTimer_Tick(object sender, EventArgs e)
         {
             Duration = stopwatch.Elapsed;
         }
-        #endregion               
+
+        private void SettingsManager_PropertyChanged(object sender, PropertyChangedEventArgs e)
+        {
+            if (e.PropertyName == nameof(SettingsInfo.PortScanner_HideStatistics))
+                OnPropertyChanged(nameof(HideStatistics));
+        }
+        #endregion
     }
 }
\ No newline at end of file
diff --git a/Source/NETworkManager/ViewModels/TracerouteSettingsViewModel.cs b/Source/NETworkManager/ViewModels/TracerouteSettingsViewModel.cs
index ba2ef0f507..605579346e 100644
--- a/Source/NETworkManager/ViewModels/TracerouteSettingsViewModel.cs
+++ b/Source/NETworkManager/ViewModels/TracerouteSettingsViewModel.cs
@@ -106,6 +106,23 @@ public bool ResolveHostnamePreferIPv6
                 OnPropertyChanged();
             }
         }
+
+        private bool _hideStatistics;
+        public bool HideStatistics
+        {
+            get { return _hideStatistics; }
+            set
+            {
+                if (value == _hideStatistics)
+                    return;
+
+                if (!_isLoading)
+                    SettingsManager.Current.Traceroute_HideStatistics = value;
+
+                _hideStatistics = value;
+                OnPropertyChanged();
+            }
+        }
         #endregion
 
         #region Constructor, load settings
@@ -127,6 +144,8 @@ private void LoadSettings()
                 ResolveHostnamePreferIPv4 = true;
             else
                 ResolveHostnamePreferIPv6 = true;
+
+            HideStatistics = SettingsManager.Current.Traceroute_HideStatistics;
         }
         #endregion
     }
diff --git a/Source/NETworkManager/ViewModels/TracerouteViewModel.cs b/Source/NETworkManager/ViewModels/TracerouteViewModel.cs
index 4a41d08280..dadf8e5458 100644
--- a/Source/NETworkManager/ViewModels/TracerouteViewModel.cs
+++ b/Source/NETworkManager/ViewModels/TracerouteViewModel.cs
@@ -218,6 +218,11 @@ public int Hops
                 OnPropertyChanged();
             }
         }
+
+        public bool HideStatistics
+        {
+            get { return SettingsManager.Current.Traceroute_HideStatistics; }
+        }
         #endregion
 
         #region Constructor, load settings
@@ -238,13 +243,7 @@ public TracerouteViewModel(int tabId, string host)
             SettingsManager.Current.PropertyChanged += Current_PropertyChanged;
 
             _isLoading = false;
-        }
-
-        private void Current_PropertyChanged(object sender, PropertyChangedEventArgs e)
-        {
-            if (e.PropertyName == nameof(SettingsInfo.Traceroute_ResolveHostname))
-                OnPropertyChanged(nameof(ResolveHostname));
-        }
+        } 
 
         public void OnLoaded()
         {
@@ -600,6 +599,15 @@ private void DispatcherTimer_Tick(object sender, EventArgs e)
         {
             Duration = stopwatch.Elapsed;
         }
+
+        private void Current_PropertyChanged(object sender, PropertyChangedEventArgs e)
+        {
+            if (e.PropertyName == nameof(SettingsInfo.Traceroute_ResolveHostname))
+                OnPropertyChanged(nameof(ResolveHostname));
+
+            if (e.PropertyName == nameof(SettingsInfo.Traceroute_HideStatistics))
+                OnPropertyChanged(nameof(HideStatistics));
+        }
         #endregion               
     }
 }
\ No newline at end of file
diff --git a/Source/NETworkManager/Views/PingSettingsView.xaml b/Source/NETworkManager/Views/PingSettingsView.xaml
index e35937de23..07ed5c225e 100644
--- a/Source/NETworkManager/Views/PingSettingsView.xaml
+++ b/Source/NETworkManager/Views/PingSettingsView.xaml
@@ -22,7 +22,9 @@
         <mah:NumericUpDown Value="{Binding ExceptionCancelCount}" Maximum="10" Minimum="1" Interval="1" Margin="0,0,0,20"/>
         <TextBlock Text="{DynamicResource String_Header_DNS}" Style="{StaticResource HeaderTextBlock}" />
         <TextBlock Style="{StaticResource CenterTextBlock}" Text="{DynamicResource String_PreferredProtocolWhenResolvingHostname}" TextWrapping="Wrap" VerticalAlignment="Top" Margin="0,0,0,10" />
-        <RadioButton Content="{DynamicResource String_IPv4}" FontSize="14" IsChecked="{Binding ResolveHostnamePreferIPv4}" Margin="0,0,0,10" />
-        <RadioButton Content="{DynamicResource String_IPv6}" FontSize="14" IsChecked="{Binding ResolveHostnamePreferIPv6}" />
+        <RadioButton Content="{DynamicResource String_IPv4}" IsChecked="{Binding ResolveHostnamePreferIPv4}" Margin="0,0,0,10" />
+        <RadioButton Content="{DynamicResource String_IPv6}" IsChecked="{Binding ResolveHostnamePreferIPv6}" Margin="0,0,0,20" />
+        <TextBlock Text="{DynamicResource String_Header_Statistics}" Style="{StaticResource HeaderTextBlock}" />
+        <mah:ToggleSwitch Header="{DynamicResource String_HideStatistics}" OnLabel="{DynamicResource String_ToggleSwitch_On}" OffLabel="{DynamicResource String_ToggleSwitch_Off}" IsChecked="{Binding HideStatistics}" />
     </StackPanel>
 </UserControl>
diff --git a/Source/NETworkManager/Views/PingView.xaml b/Source/NETworkManager/Views/PingView.xaml
index 1110dca9fe..8a29bd3988 100644
--- a/Source/NETworkManager/Views/PingView.xaml
+++ b/Source/NETworkManager/Views/PingView.xaml
@@ -13,6 +13,7 @@
         mc:Ignorable="d">
     <UserControl.Resources>
         <Converter:BooleanReverseConverter x:Key="BooleanReverseConverter" />
+        <Converter:BooleanReverseToVisibilityConverter x:Key="BooleanReverseToVisibilityConverter" />
         <Converter:IntToStringConverter x:Key="IntToStringConverter" />
         <Converter:IPStatusToStringConverter x:Key="IPStatusToStringConverter" />
         <Converter:NullableDateTimeToStringConverter x:Key="NullableDateTimeToStringConverter" />
@@ -119,7 +120,7 @@
             <TextBlock Grid.Row="2" Foreground="{DynamicResource AccentColorBrush}" Text="{Binding StatusMessage}" Visibility="{Binding DisplayStatusMessage, Converter={StaticResource BooleanToVisibilityConverter}}" Style="{DynamicResource DefaultTextBlock}" Margin="0,10,0,0" />
         </Grid>
         <TextBlock Grid.Row="2" Text="{DynamicResource String_Header_Status}" Style="{StaticResource HeaderTextBlock}" />
-        <Control:ScrollingDataGrid Grid.Row="3" ItemsSource="{Binding PingResultView}" Margin="0,0,0,20">
+        <Control:ScrollingDataGrid Grid.Row="3" ItemsSource="{Binding PingResultView}">
             <Control:ScrollingDataGrid.Resources>
                 <Style TargetType="{x:Type ScrollBar}" BasedOn="{StaticResource ScrollingDataGridScrollBar}" />
             </Control:ScrollingDataGrid.Resources>
@@ -139,7 +140,7 @@
                 <DataGridTextColumn Header="{DynamicResource String_Status}" Binding="{Binding Status, Converter={StaticResource IPStatusToStringConverter}}" MinWidth="150" Width="*" />
             </Control:ScrollingDataGrid.Columns>
         </Control:ScrollingDataGrid>
-        <Expander Grid.Row="4" IsExpanded="{Binding ExpandStatistics}" Style="{StaticResource HeaderExpander}">
+        <Expander Grid.Row="4" IsExpanded="{Binding ExpandStatistics}" Visibility="{Binding HideStatistics, Converter={StaticResource BooleanReverseToVisibilityConverter}}" Style="{StaticResource HeaderExpander}" Margin="0,20,0,0">
             <Expander.Header>
                 <TextBlock Text="{DynamicResource String_Header_Statistics}" Style="{StaticResource HeaderTextBlock}" Margin="0" />
             </Expander.Header>
diff --git a/Source/NETworkManager/Views/PortScannerView.xaml b/Source/NETworkManager/Views/PortScannerView.xaml
index 7f316e6001..cd50b01a6a 100644
--- a/Source/NETworkManager/Views/PortScannerView.xaml
+++ b/Source/NETworkManager/Views/PortScannerView.xaml
@@ -13,6 +13,7 @@
         mc:Ignorable="d">
     <UserControl.Resources>
         <Converter:BooleanReverseConverter x:Key="BooleanReverseConverter" />
+        <Converter:BooleanReverseToVisibilityConverter x:Key="BooleanReverseToVisibilityConverter" />
         <Converter:IPAddressToStringConverter x:Key="IPAddressToStringConverter" />
         <Converter:NullableDateTimeToStringConverter x:Key="NullableDateTimeToStringConverter" />
         <Converter:NullOrEmptyToBoolConverter x:Key="NullOrEmptyToBoolConverter" />
@@ -175,7 +176,7 @@
             <TextBlock Grid.Row="2" Foreground="{DynamicResource AccentColorBrush}" Text="{Binding StatusMessage}" Visibility="{Binding DisplayStatusMessage, Converter={StaticResource BooleanToVisibilityConverter}}" Style="{DynamicResource DefaultTextBlock}" Margin="0,10,0,0" />
         </Grid>
         <TextBlock Grid.Row="2" Style="{StaticResource HeaderTextBlock}" Text="{DynamicResource String_Header_Result}" />
-        <DataGrid Grid.Row="3" ItemsSource="{Binding PortScanResultView}" SelectedItem="{Binding SelectedScanResult}" Margin="0,0,0,20">
+        <DataGrid Grid.Row="3" ItemsSource="{Binding PortScanResultView}" SelectedItem="{Binding SelectedScanResult}">
             <DataGrid.Resources>
                 <Style TargetType="{x:Type ScrollBar}" BasedOn="{StaticResource DataGridScrollBar}" />
                 <WpfHelper:BindingProxy x:Key="BindingProxy" Data="{Binding}" />
@@ -273,7 +274,7 @@
                 <DataGridTextColumn Header="{DynamicResource String_Description}" Binding="{Binding LookupInfo.Description}" MinWidth="200" Width="*" />
             </DataGrid.Columns>
         </DataGrid>
-        <Expander Grid.Row="4" IsExpanded="{Binding ExpandStatistics}" Style="{StaticResource HeaderExpander}">
+        <Expander Grid.Row="4" IsExpanded="{Binding ExpandStatistics}" Style="{StaticResource HeaderExpander}" Visibility="{Binding HideStatistics, Converter={StaticResource BooleanReverseToVisibilityConverter}}" Margin="0,20,0,0">
             <Expander.Header>
                 <TextBlock Text="{DynamicResource String_Header_Statistics}" Style="{StaticResource HeaderTextBlock}" Margin="0" />
             </Expander.Header>
diff --git a/Source/NETworkManager/Views/TracerouteSettingsView.xaml b/Source/NETworkManager/Views/TracerouteSettingsView.xaml
index 2c90847d9f..c5442c0ef2 100644
--- a/Source/NETworkManager/Views/TracerouteSettingsView.xaml
+++ b/Source/NETworkManager/Views/TracerouteSettingsView.xaml
@@ -17,7 +17,9 @@
         <TextBlock Text="{DynamicResource String_Header_DNS}" Style="{StaticResource HeaderTextBlock}" />
         <mah:ToggleSwitch Header="{DynamicResource String_ResolveHostname}" OnLabel="{DynamicResource String_ToggleSwitch_On}" OffLabel="{DynamicResource String_ToggleSwitch_Off}" IsChecked="{Binding ResolveHostname}" Margin="0,0,0,10"/>
         <TextBlock Style="{StaticResource CenterTextBlock}" Text="{DynamicResource String_PreferredProtocolWhenResolvingHostname}" TextWrapping="Wrap" VerticalAlignment="Top" Margin="0,0,0,10" />
-        <RadioButton Content="{DynamicResource String_IPv4}" FontSize="14" IsChecked="{Binding ResolveHostnamePreferIPv4}" Margin="0,0,0,10" />
-        <RadioButton Content="{DynamicResource String_IPv6}" FontSize="14" IsChecked="{Binding ResolveHostnamePreferIPv6}" />
+        <RadioButton Content="{DynamicResource String_IPv4}" IsChecked="{Binding ResolveHostnamePreferIPv4}" Margin="0,0,0,10" />
+        <RadioButton Content="{DynamicResource String_IPv6}" IsChecked="{Binding ResolveHostnamePreferIPv6}" Margin="0,0,0,20" />
+        <TextBlock Text="{DynamicResource String_Header_Statistics}" Style="{StaticResource HeaderTextBlock}" />
+        <mah:ToggleSwitch Header="{DynamicResource String_HideStatistics}" OnLabel="{DynamicResource String_ToggleSwitch_On}" OffLabel="{DynamicResource String_ToggleSwitch_Off}" IsChecked="{Binding HideStatistics}" />
     </StackPanel>
 </UserControl>
diff --git a/Source/NETworkManager/Views/TracerouteView.xaml b/Source/NETworkManager/Views/TracerouteView.xaml
index 97a2f682ce..17001de91d 100644
--- a/Source/NETworkManager/Views/TracerouteView.xaml
+++ b/Source/NETworkManager/Views/TracerouteView.xaml
@@ -13,7 +13,8 @@
         mc:Ignorable="d">
     <UserControl.Resources>
         <Converter:BooleanReverseConverter x:Key="BooleanReverseConverter" />
-        <Converter:BooleanToVisibilityConverter x:Key="BooleanToVisibilityConverter" />        
+        <Converter:BooleanToVisibilityConverter x:Key="BooleanToVisibilityConverter" />
+        <Converter:BooleanReverseToVisibilityConverter x:Key="BooleanReverseToVisibilityConverter" />
         <Converter:IntToStringConverter x:Key="IntToStringConverter" />
         <Converter:IPAddressToStringConverter x:Key="IPAddressToStringConverter" />
         <Converter:IPStatusToStringConverter x:Key="IPStatusToStringConverter" />
@@ -112,7 +113,7 @@
             <TextBlock Grid.Row="2" Foreground="{DynamicResource AccentColorBrush}" Text="{Binding StatusMessage}" Visibility="{Binding DisplayStatusMessage, Converter={StaticResource BooleanToVisibilityConverter}}" Style="{DynamicResource DefaultTextBlock}" Margin="0,10,0,0" />
         </Grid>
         <TextBlock Grid.Row="2" Text="{DynamicResource String_Header_Route}" Style="{StaticResource HeaderTextBlock}" />
-        <DataGrid Grid.Row="3" ItemsSource="{Binding TraceResultView}" SelectedItem="{Binding SelectedTraceResult}" CanUserSortColumns="False" Margin="0,0,0,20">
+        <DataGrid Grid.Row="3" ItemsSource="{Binding TraceResultView}" SelectedItem="{Binding SelectedTraceResult}" CanUserSortColumns="False">
             <DataGrid.Resources>
                 <Style TargetType="{x:Type ScrollBar}" BasedOn="{StaticResource DataGridScrollBar}" />
                 <WpfHelper:BindingProxy x:Key="BindingProxy" Data="{Binding}" />
@@ -303,7 +304,7 @@
                 <DataGridTextColumn Header="{DynamicResource String_Hostname}" Binding="{Binding Hostname}" Visibility="{Binding Data.ResolveHostname, Source={StaticResource BindingProxy}, Converter={StaticResource BooleanToVisibilityConverter}}" MinWidth="150" Width="*" />
             </DataGrid.Columns>
         </DataGrid>
-        <Expander Grid.Row="4" IsExpanded="{Binding ExpandStatistics}" Style="{StaticResource HeaderExpander}">
+        <Expander Grid.Row="4" IsExpanded="{Binding ExpandStatistics}" Visibility="{Binding HideStatistics, Converter={StaticResource BooleanReverseToVisibilityConverter}}" Style="{StaticResource HeaderExpander}" Margin="0,20,0,0">
             <Expander.Header>
                 <TextBlock Text="{DynamicResource String_Header_Statistics}" Style="{StaticResource HeaderTextBlock}" Margin="0" />
             </Expander.Header>

From 66d42d85ce20a823b0d2d4b4f7f8d6f26d1c098e Mon Sep 17 00:00:00 2001
From: BornToBeRoot <BornToBeRoot@users.noreply.github.com>
Date: Mon, 4 Jun 2018 02:56:02 +0200
Subject: [PATCH 4/5] Hide statistics added

---
 .../Models/Settings/SettingsInfo.cs           | 51 +++++++++++++++++++
 .../ViewModels/DNSLookupSettingsViewModel.cs  | 18 +++++++
 .../ViewModels/DNSLookupViewModel.cs          | 14 +++++
 .../HTTPHeadersSettingsViewModel.cs           | 18 +++++++
 .../ViewModels/HTTPHeadersViewModel.cs        | 13 +++++
 .../ViewModels/SNMPSettingsViewModel.cs       | 19 +++++++
 .../ViewModels/SNMPViewModel.cs               | 14 +++++
 .../Views/DNSLookupSettingsView.xaml          |  4 +-
 .../NETworkManager/Views/DNSLookupView.xaml   |  6 +--
 .../Views/HTTPHeadersSettingsView.xaml        |  4 +-
 .../NETworkManager/Views/HTTPHeadersView.xaml |  5 +-
 .../Views/SNMPSettingsView.xaml               |  6 ++-
 Source/NETworkManager/Views/SNMPView.xaml     |  4 +-
 13 files changed, 165 insertions(+), 11 deletions(-)

diff --git a/Source/NETworkManager/Models/Settings/SettingsInfo.cs b/Source/NETworkManager/Models/Settings/SettingsInfo.cs
index 8af2803e4f..882ae3e2fd 100644
--- a/Source/NETworkManager/Models/Settings/SettingsInfo.cs
+++ b/Source/NETworkManager/Models/Settings/SettingsInfo.cs
@@ -1348,6 +1348,23 @@ public bool DNSLookup_ExpandStatistics
                 SettingsChanged = true;
             }
         }
+
+        private bool _dnsLookup_HideStatistics;
+        public bool DNSLookup_HideStatistics
+        {
+            get { return _dnsLookup_HideStatistics; }
+            set
+            {
+                if (value == _dnsLookup_HideStatistics)
+                    return;
+
+                _dnsLookup_HideStatistics = value;
+
+                OnPropertyChanged();
+
+                SettingsChanged = true;
+            }
+        }
         #endregion
 
         #region RemoteDesktop 
@@ -2030,6 +2047,23 @@ public SNMPv3PrivacyProvider SNMP_PrivacyProvider
                 SettingsChanged = true;
             }
         }
+
+        private bool _snmp_HideStatistics;
+        public bool SNMP_HideStatistics
+        {
+            get { return _snmp_HideStatistics; }
+            set
+            {
+                if (value == _snmp_HideStatistics)
+                    return;
+
+                _snmp_HideStatistics = value;
+
+                OnPropertyChanged();
+
+                SettingsChanged = true;
+            }
+        }
         #endregion
 
         #region WakeOnLAN
@@ -2119,6 +2153,23 @@ public bool HTTPHeaders_ExpandStatistics
                 SettingsChanged = true;
             }
         }
+
+        private bool _httpHeaders_HideStatistics;
+        public bool HTTPHeaders_HideStatistics
+        {
+            get { return _httpHeaders_HideStatistics; }
+            set
+            {
+                if (value == _httpHeaders_HideStatistics)
+                    return;
+
+                _httpHeaders_HideStatistics = value;
+
+                OnPropertyChanged();
+
+                SettingsChanged = true;
+            }
+        }
         #endregion
 
         #region Subnet Calculator
diff --git a/Source/NETworkManager/ViewModels/DNSLookupSettingsViewModel.cs b/Source/NETworkManager/ViewModels/DNSLookupSettingsViewModel.cs
index 20cb1b1455..b0def46a7d 100644
--- a/Source/NETworkManager/ViewModels/DNSLookupSettingsViewModel.cs
+++ b/Source/NETworkManager/ViewModels/DNSLookupSettingsViewModel.cs
@@ -236,6 +236,23 @@ public int Timeout
                 OnPropertyChanged();
             }
         }
+
+        private bool _hideStatistics;
+        public bool HideStatistics
+        {
+            get { return _hideStatistics; }
+            set
+            {
+                if (value == _hideStatistics)
+                    return;
+
+                if (!_isLoading)
+                    SettingsManager.Current.DNSLookup_HideStatistics = value;
+
+                _hideStatistics = value;
+                OnPropertyChanged();
+            }
+        }
         #endregion
 
         #region Constructor, load settings
@@ -266,6 +283,7 @@ private void LoadSettings()
             TransportType = TransportTypes.First(x => x == SettingsManager.Current.DNSLookup_TransportType);
             Attempts = SettingsManager.Current.DNSLookup_Attempts;
             Timeout = SettingsManager.Current.DNSLookup_Timeout;
+            HideStatistics = SettingsManager.Current.DNSLookup_HideStatistics;
         }
         #endregion
     }
diff --git a/Source/NETworkManager/ViewModels/DNSLookupViewModel.cs b/Source/NETworkManager/ViewModels/DNSLookupViewModel.cs
index 5438d2a5ef..369fd37cfc 100644
--- a/Source/NETworkManager/ViewModels/DNSLookupViewModel.cs
+++ b/Source/NETworkManager/ViewModels/DNSLookupViewModel.cs
@@ -200,6 +200,11 @@ public bool ExpandStatistics
                 OnPropertyChanged();
             }
         }
+
+        public bool HideStatistics
+        {
+            get { return SettingsManager.Current.DNSLookup_HideStatistics; }
+        }
         #endregion
 
         #region Contructor, load settings
@@ -214,6 +219,9 @@ public DNSLookupViewModel(int tabId, string host)
 
             LoadSettings();
 
+            // Detect if settings have changed...
+            SettingsManager.Current.PropertyChanged += SettingsManager_PropertyChanged;
+
             _isLoading = false;
         }
 
@@ -437,6 +445,12 @@ private void DispatcherTimer_Tick(object sender, EventArgs e)
         {
             Duration = stopwatch.Elapsed;
         }
+
+        private void SettingsManager_PropertyChanged(object sender, PropertyChangedEventArgs e)
+        {
+            if (e.PropertyName == nameof(SettingsInfo.DNSLookup_HideStatistics))
+                OnPropertyChanged(nameof(HideStatistics));
+        }
         #endregion
     }
 }
\ No newline at end of file
diff --git a/Source/NETworkManager/ViewModels/HTTPHeadersSettingsViewModel.cs b/Source/NETworkManager/ViewModels/HTTPHeadersSettingsViewModel.cs
index f7ec72c9a1..75639f552f 100644
--- a/Source/NETworkManager/ViewModels/HTTPHeadersSettingsViewModel.cs
+++ b/Source/NETworkManager/ViewModels/HTTPHeadersSettingsViewModel.cs
@@ -24,6 +24,23 @@ public int Timeout
                 OnPropertyChanged();
             }
         }
+
+        private bool _hideStatistics;
+        public bool HideStatistics
+        {
+            get { return _hideStatistics; }
+            set
+            {
+                if (value == _hideStatistics)
+                    return;
+
+                if (!_isLoading)
+                    SettingsManager.Current.HTTPHeaders_HideStatistics = value;
+
+                _hideStatistics = value;
+                OnPropertyChanged();
+            }
+        }
         #endregion
 
         #region Contructor, load settings
@@ -37,6 +54,7 @@ public HTTPHeadersSettingsViewModel()
         private void LoadSettings()
         {
             Timeout = SettingsManager.Current.HTTPHeaders_Timeout;
+            HideStatistics = SettingsManager.Current.HTTPHeaders_HideStatistics;
         }
         #endregion
     }
diff --git a/Source/NETworkManager/ViewModels/HTTPHeadersViewModel.cs b/Source/NETworkManager/ViewModels/HTTPHeadersViewModel.cs
index c0bf784fe4..f05ed871a5 100644
--- a/Source/NETworkManager/ViewModels/HTTPHeadersViewModel.cs
+++ b/Source/NETworkManager/ViewModels/HTTPHeadersViewModel.cs
@@ -175,6 +175,10 @@ public bool ExpandStatistics
             }
         }
 
+        public bool HideStatistics
+        {
+            get { return SettingsManager.Current.HTTPHeaders_HideStatistics; }
+        }
         #endregion
 
         #region Contructor, load settings
@@ -187,6 +191,9 @@ public HTTPHeadersViewModel(int tabId)
 
             LoadSettings();
 
+            // Detect if settings have changed...
+            SettingsManager.Current.PropertyChanged += SettingsManager_PropertyChanged;
+
             _isLoading = false;
         }
 
@@ -292,6 +299,12 @@ private void DispatcherTimer_Tick(object sender, EventArgs e)
         {
             Duration = stopwatch.Elapsed;
         }
+
+        private void SettingsManager_PropertyChanged(object sender, PropertyChangedEventArgs e)
+        {
+            if (e.PropertyName == nameof(SettingsInfo.HTTPHeaders_HideStatistics))
+                OnPropertyChanged(nameof(HideStatistics));
+        }
         #endregion
     }
 }
\ No newline at end of file
diff --git a/Source/NETworkManager/ViewModels/SNMPSettingsViewModel.cs b/Source/NETworkManager/ViewModels/SNMPSettingsViewModel.cs
index bd2d11ccd6..d6634d606f 100644
--- a/Source/NETworkManager/ViewModels/SNMPSettingsViewModel.cs
+++ b/Source/NETworkManager/ViewModels/SNMPSettingsViewModel.cs
@@ -94,6 +94,23 @@ public bool ResolveHostnamePreferIPv6
                 OnPropertyChanged();
             }
         }
+
+        private bool _hideStatistics;
+        public bool HideStatistics
+        {
+            get { return _hideStatistics; }
+            set
+            {
+                if (value == _hideStatistics)
+                    return;
+
+                if (!_isLoading)
+                    SettingsManager.Current.SNMP_HideStatistics = value;
+
+                _hideStatistics = value;
+                OnPropertyChanged();
+            }
+        }
         #endregion
 
         #region Contructor, load settings
@@ -115,6 +132,8 @@ private void LoadSettings()
                 ResolveHostnamePreferIPv4 = true;
             else
                 ResolveHostnamePreferIPv6 = true;
+
+            HideStatistics = SettingsManager.Current.SNMP_HideStatistics;
         }
         #endregion
     }
diff --git a/Source/NETworkManager/ViewModels/SNMPViewModel.cs b/Source/NETworkManager/ViewModels/SNMPViewModel.cs
index 6fe8c9ac4c..80712a6ad2 100644
--- a/Source/NETworkManager/ViewModels/SNMPViewModel.cs
+++ b/Source/NETworkManager/ViewModels/SNMPViewModel.cs
@@ -381,6 +381,11 @@ public bool ExpandStatistics
                 OnPropertyChanged();
             }
         }
+
+        public bool HideStatistics
+        {
+            get { return SettingsManager.Current.SNMP_HideStatistics; }
+        }
         #endregion
 
         #region Contructor, load settings
@@ -412,6 +417,9 @@ public SNMPViewModel(int tabId, string host)
 
             LoadSettings();
 
+            // Detect if settings have changed...
+            SettingsManager.Current.PropertyChanged += SettingsManager_PropertyChanged;
+
             _isLoading = false;
         }
 
@@ -679,6 +687,12 @@ private void DispatcherTimer_Tick(object sender, EventArgs e)
         {
             Duration = stopwatch.Elapsed;
         }
+
+        private void SettingsManager_PropertyChanged(object sender, PropertyChangedEventArgs e)
+        {
+            if (e.PropertyName == nameof(SettingsInfo.SNMP_HideStatistics))
+                OnPropertyChanged(nameof(HideStatistics));
+        }
         #endregion
     }
 }
\ No newline at end of file
diff --git a/Source/NETworkManager/Views/DNSLookupSettingsView.xaml b/Source/NETworkManager/Views/DNSLookupSettingsView.xaml
index a22a5a953a..c82c9c2549 100644
--- a/Source/NETworkManager/Views/DNSLookupSettingsView.xaml
+++ b/Source/NETworkManager/Views/DNSLookupSettingsView.xaml
@@ -68,6 +68,8 @@
         <TextBlock Text="{DynamicResource String_Attempts}" Style="{DynamicResource DefaultTextBlock}" VerticalAlignment="Center" Margin="0,0,0,10" />
         <mah:NumericUpDown Value="{Binding Attempts}" Maximum="10" Minimum="1" Interval="1" Margin="0,0,0,10" />
         <TextBlock Text="{DynamicResource String_Timeout}" Style="{DynamicResource DefaultTextBlock}" VerticalAlignment="Center" Margin="0,0,0,10" />
-        <mah:NumericUpDown Value="{Binding Timeout}" Maximum="10000" Minimum="100" Interval="100" />
+        <mah:NumericUpDown Value="{Binding Timeout}" Maximum="10000" Minimum="100" Interval="100" Margin="0,0,0,20" />
+        <TextBlock Text="{DynamicResource String_Header_Statistics}" Style="{StaticResource HeaderTextBlock}" />
+        <mah:ToggleSwitch Header="{DynamicResource String_HideStatistics}" OnLabel="{DynamicResource String_ToggleSwitch_On}" OffLabel="{DynamicResource String_ToggleSwitch_Off}" IsChecked="{Binding HideStatistics}" />
     </StackPanel>
 </UserControl>
diff --git a/Source/NETworkManager/Views/DNSLookupView.xaml b/Source/NETworkManager/Views/DNSLookupView.xaml
index 30f83f66a8..72a51c8115 100644
--- a/Source/NETworkManager/Views/DNSLookupView.xaml
+++ b/Source/NETworkManager/Views/DNSLookupView.xaml
@@ -6,13 +6,13 @@
         xmlns:Validator="clr-namespace:NETworkManager.Validators"
         xmlns:Converter="clr-namespace:NETworkManager.Converters"
         xmlns:mah="http://metro.mahapps.com/winfx/xaml/controls"        
-        xmlns:Control="clr-namespace:NETworkManager.Controls"
         xmlns:IconPacks="http://metro.mahapps.com/winfx/xaml/iconpacks"
         xmlns:Controls="clr-namespace:MahApps.Metro.Controls;assembly=MahApps.Metro"
         Loaded="UserControl_Loaded"
         mc:Ignorable="d">
     <UserControl.Resources>
         <Converter:BooleanReverseConverter x:Key="BooleanReverseConverter" />
+        <Converter:BooleanReverseToVisibilityConverter x:Key="BooleanReverseToVisibilityConverter" />
         <Converter:IPAddressToStringConverter x:Key="IPAddressToStringConverter" />
         <Converter:IntToStringConverter x:Key="IntToStringConverter" />
         <Converter:NullableDateTimeToStringConverter x:Key="NullableDateTimeToStringConverter" />
@@ -109,7 +109,7 @@
             <TextBlock Grid.Row="2" Foreground="{DynamicResource AccentColorBrush}" Text="{Binding StatusMessage}" Visibility="{Binding DisplayStatusMessage, Converter={StaticResource BooleanToVisibilityConverter}}" Style="{DynamicResource DefaultTextBlock}" Margin="0,10,0,0" />
         </Grid>
         <TextBlock Grid.Row="2" Text="{DynamicResource String_Header_Result}" Style="{StaticResource HeaderTextBlock}" />
-        <DataGrid Grid.Row="3" ItemsSource="{Binding LookupResultView}" SelectedItem="{Binding SelectedLookupResult}" Margin="0,0,0,20">
+        <DataGrid Grid.Row="3" ItemsSource="{Binding LookupResultView}" SelectedItem="{Binding SelectedLookupResult}">
             <DataGrid.Resources>
                 <Style TargetType="{x:Type ScrollBar}" BasedOn="{StaticResource DataGridScrollBar}" />
                 <ContextMenu x:Key="RowContextMenu" Opened="ContextMenu_Opened" MinWidth="150">
@@ -208,7 +208,7 @@
                 <DataGridTextColumn Header="{DynamicResource String_Result}" Binding="{Binding Result}" MinWidth="200" Width="*" />
             </DataGrid.Columns>
         </DataGrid>
-        <Expander Grid.Row="4" IsExpanded="{Binding ExpandStatistics}" Style="{StaticResource HeaderExpander}">
+        <Expander Grid.Row="4" IsExpanded="{Binding ExpandStatistics}" Visibility="{Binding HideStatistics, Converter={StaticResource BooleanReverseToVisibilityConverter}}" Style="{StaticResource HeaderExpander}" Margin="0,20,0,0">
             <Expander.Header>
                 <TextBlock Text="{DynamicResource String_Header_Statistics}" Style="{StaticResource HeaderTextBlock}" Margin="0" />
             </Expander.Header>
diff --git a/Source/NETworkManager/Views/HTTPHeadersSettingsView.xaml b/Source/NETworkManager/Views/HTTPHeadersSettingsView.xaml
index 92187eb703..7c5d219f53 100644
--- a/Source/NETworkManager/Views/HTTPHeadersSettingsView.xaml
+++ b/Source/NETworkManager/Views/HTTPHeadersSettingsView.xaml
@@ -8,6 +8,8 @@
     <StackPanel>
         <TextBlock Text="{DynamicResource String_Header_HTTPHeaders}" Style="{StaticResource HeaderTextBlock}" />
         <TextBlock Text="{DynamicResource String_Timeout}" Style="{StaticResource CenterTextBlock}" Margin="0,0,0,10" />
-        <mah:NumericUpDown Value="{Binding Timeout}" Maximum="100000" Minimum="1000" Interval="1000" Margin="0,0,0,10" />
+        <mah:NumericUpDown Value="{Binding Timeout}" Maximum="100000" Minimum="1000" Interval="1000" Margin="0,0,0,20" />
+        <TextBlock Text="{DynamicResource String_Header_Statistics}" Style="{StaticResource HeaderTextBlock}" />
+        <mah:ToggleSwitch Header="{DynamicResource String_HideStatistics}" OnLabel="{DynamicResource String_ToggleSwitch_On}" OffLabel="{DynamicResource String_ToggleSwitch_Off}" IsChecked="{Binding HideStatistics}" />
     </StackPanel>
 </UserControl>
\ No newline at end of file
diff --git a/Source/NETworkManager/Views/HTTPHeadersView.xaml b/Source/NETworkManager/Views/HTTPHeadersView.xaml
index 800396a8fd..e5f2e45c23 100644
--- a/Source/NETworkManager/Views/HTTPHeadersView.xaml
+++ b/Source/NETworkManager/Views/HTTPHeadersView.xaml
@@ -10,6 +10,7 @@
         xmlns:IconPacks="http://metro.mahapps.com/winfx/xaml/iconpacks"
         mc:Ignorable="d">
     <UserControl.Resources>
+        <Converter:BooleanReverseToVisibilityConverter x:Key="BooleanReverseToVisibilityConverter" />
         <Converter:BooleanToVisibilityConverter x:Key="BooleanToVisibilityConverter"/>
         <Converter:BooleanReverseConverter x:Key="BooleanReverseConverter" />
         <Converter:NullableDateTimeToStringConverter x:Key="NullableDateTimeToStringConverter" />
@@ -99,8 +100,8 @@
                 <TextBlock Grid.Row="2" Foreground="{DynamicResource AccentColorBrush}" Text="{Binding StatusMessage}" Visibility="{Binding DisplayStatusMessage, Converter={StaticResource BooleanToVisibilityConverter}}" Style="{DynamicResource DefaultTextBlock}" Margin="0,10,0,0" />
             </Grid>
             <TextBlock Grid.Row="2" Style="{StaticResource HeaderTextBlock}" Text="{DynamicResource String_Header_Headers}" />
-            <TextBox Grid.Row="3" Text="{Binding Headers}" Style="{StaticResource ConsoleTextBox}" IsReadOnly="True" ContextMenu="{StaticResource CopyContextMenu}" Margin="0,0,0,20"/>
-            <Expander Grid.Row="4" IsExpanded="{Binding ExpandStatistics}" Style="{StaticResource HeaderExpander}">
+            <TextBox Grid.Row="3" Text="{Binding Headers}" Style="{StaticResource ConsoleTextBox}" IsReadOnly="True" ContextMenu="{StaticResource CopyContextMenu}"/>
+            <Expander Grid.Row="4" IsExpanded="{Binding ExpandStatistics}" Visibility="{Binding HideStatistics, Converter={StaticResource BooleanReverseToVisibilityConverter}}" Style="{StaticResource HeaderExpander}" Margin="0,20,0,0">
                 <Expander.Header>
                     <TextBlock Text="{DynamicResource String_Header_Statistics}" Style="{StaticResource HeaderTextBlock}" Margin="0" />
                 </Expander.Header>
diff --git a/Source/NETworkManager/Views/SNMPSettingsView.xaml b/Source/NETworkManager/Views/SNMPSettingsView.xaml
index 95e755538a..a62091b21d 100644
--- a/Source/NETworkManager/Views/SNMPSettingsView.xaml
+++ b/Source/NETworkManager/Views/SNMPSettingsView.xaml
@@ -25,7 +25,9 @@
         </TextBox>
         <TextBlock Text="{DynamicResource String_Header_DNS}" Style="{StaticResource HeaderTextBlock}" />
         <TextBlock Style="{StaticResource CenterTextBlock}" Text="{DynamicResource String_PreferredProtocolWhenResolvingHostname}" TextWrapping="Wrap" VerticalAlignment="Top" Margin="0,0,0,10" />
-        <RadioButton Content="{DynamicResource String_IPv4}" FontSize="14" IsChecked="{Binding ResolveHostnamePreferIPv4}" Margin="0,0,0,10" />
-        <RadioButton Content="{DynamicResource String_IPv6}" FontSize="14" IsChecked="{Binding ResolveHostnamePreferIPv6}" />
+        <RadioButton Content="{DynamicResource String_IPv4}" IsChecked="{Binding ResolveHostnamePreferIPv4}" Margin="0,0,0,10" />
+        <RadioButton Content="{DynamicResource String_IPv6}" IsChecked="{Binding ResolveHostnamePreferIPv6}" Margin="0,0,0,20" />
+        <TextBlock Text="{DynamicResource String_Header_Statistics}" Style="{StaticResource HeaderTextBlock}" />
+        <mah:ToggleSwitch Header="{DynamicResource String_HideStatistics}" OnLabel="{DynamicResource String_ToggleSwitch_On}" OffLabel="{DynamicResource String_ToggleSwitch_Off}" IsChecked="{Binding HideStatistics}" />
     </StackPanel>
 </UserControl>
\ No newline at end of file
diff --git a/Source/NETworkManager/Views/SNMPView.xaml b/Source/NETworkManager/Views/SNMPView.xaml
index 7365c64c61..b156728229 100644
--- a/Source/NETworkManager/Views/SNMPView.xaml
+++ b/Source/NETworkManager/Views/SNMPView.xaml
@@ -10,6 +10,7 @@
         xmlns:IconPacks="http://metro.mahapps.com/winfx/xaml/iconpacks"
         mc:Ignorable="d">
     <UserControl.Resources>
+        <Converter:BooleanReverseToVisibilityConverter x:Key="BooleanReverseToVisibilityConverter" />
         <Converter:BooleanToVisibilityConverter x:Key="BooleanToVisibilityConverter"/>
         <Converter:BooleanReverseConverter x:Key="BooleanReverseConverter" />
         <Converter:IntToStringConverter x:Key="IntToStringConverter" />
@@ -29,7 +30,6 @@
             <RowDefinition Height="Auto" />
             <RowDefinition Height="*" />
             <RowDefinition Height="Auto" />
-            <RowDefinition Height="20" />
             <RowDefinition Height="Auto" />
         </Grid.RowDefinitions>
         <TextBlock Grid.Row="0" Grid.ColumnSpan="3" Style="{StaticResource HeaderTextBlock}" Text="{DynamicResource String_Header_SNMP}" />
@@ -563,7 +563,7 @@
                 </Style>
             </TextBox.Style>
         </TextBox>
-        <Expander Grid.Row="8" Grid.ColumnSpan="3" IsExpanded="{Binding ExpandStatistics}" Style="{StaticResource HeaderExpander}">
+        <Expander Grid.Row="7" Grid.ColumnSpan="3" IsExpanded="{Binding ExpandStatistics}" Visibility="{Binding HideStatistics, Converter={StaticResource BooleanReverseToVisibilityConverter}}" Style="{StaticResource HeaderExpander}" Margin="0,20,0,0">
             <Expander.Header>
                 <TextBlock Text="{DynamicResource String_Header_Statistics}" Style="{StaticResource HeaderTextBlock}" Margin="0" />
             </Expander.Header>

From cfeab435192e1afd08afb3a085fa20fcd52369dc Mon Sep 17 00:00:00 2001
From: BornToBeRoot <BornToBeRoot@users.noreply.github.com>
Date: Mon, 4 Jun 2018 03:10:07 +0200
Subject: [PATCH 5/5] HideStatistics renamed to ShowStatistics

---
 .../Models/Settings/SettingsInfo.cs           | 70 +++++++++----------
 .../Localization/Resources.de-DE.xaml         |  2 +-
 .../Localization/Resources.en-US.xaml         |  2 +-
 .../Localization/Resources.ru-RU.xaml         |  2 +-
 .../ViewModels/DNSLookupSettingsViewModel.cs  | 14 ++--
 .../ViewModels/DNSLookupViewModel.cs          |  8 +--
 .../HTTPHeadersSettingsViewModel.cs           | 14 ++--
 .../ViewModels/HTTPHeadersViewModel.cs        |  8 +--
 .../ViewModels/IPScannerSettingsViewModel.cs  | 14 ++--
 .../ViewModels/IPScannerViewModel.cs          |  8 +--
 .../ViewModels/PingSettingsViewModel.cs       | 14 ++--
 .../ViewModels/PingViewModel.cs               |  8 +--
 .../PortScannerSettingsViewModel.cs           | 14 ++--
 .../ViewModels/PortScannerViewModel.cs        |  8 +--
 .../ViewModels/SNMPSettingsViewModel.cs       | 14 ++--
 .../ViewModels/SNMPViewModel.cs               |  8 +--
 .../ViewModels/TracerouteSettingsViewModel.cs | 14 ++--
 .../ViewModels/TracerouteViewModel.cs         |  8 +--
 .../Views/DNSLookupSettingsView.xaml          |  2 +-
 .../NETworkManager/Views/DNSLookupView.xaml   |  2 +-
 .../Views/HTTPHeadersSettingsView.xaml        |  2 +-
 .../NETworkManager/Views/HTTPHeadersView.xaml |  2 +-
 .../Views/IPScannerSettingsView.xaml          |  2 +-
 .../NETworkManager/Views/IPScannerView.xaml   |  2 +-
 .../Views/PingSettingsView.xaml               |  2 +-
 Source/NETworkManager/Views/PingView.xaml     |  2 +-
 .../Views/PortScannerSettingsView.xaml        |  2 +-
 .../NETworkManager/Views/PortScannerView.xaml |  2 +-
 .../Views/SNMPSettingsView.xaml               |  2 +-
 Source/NETworkManager/Views/SNMPView.xaml     |  2 +-
 .../Views/TracerouteSettingsView.xaml         |  2 +-
 .../NETworkManager/Views/TracerouteView.xaml  |  2 +-
 32 files changed, 129 insertions(+), 129 deletions(-)

diff --git a/Source/NETworkManager/Models/Settings/SettingsInfo.cs b/Source/NETworkManager/Models/Settings/SettingsInfo.cs
index 882ae3e2fd..267a063a31 100644
--- a/Source/NETworkManager/Models/Settings/SettingsInfo.cs
+++ b/Source/NETworkManager/Models/Settings/SettingsInfo.cs
@@ -626,16 +626,16 @@ public double IPScanner_ProfileWidth
             }
         }
 
-        private bool _ipScanner_HideStatistics;
-        public bool IPScanner_HideStatistics
+        private bool _ipScanner_ShowStatistics = true;
+        public bool IPScanner_ShowStatistics
         {
-            get { return _ipScanner_HideStatistics; }
+            get { return _ipScanner_ShowStatistics; }
             set
             {
-                if (value == _ipScanner_HideStatistics)
+                if (value == _ipScanner_ShowStatistics)
                     return;
 
-                _ipScanner_HideStatistics = value;
+                _ipScanner_ShowStatistics = value;
 
                 OnPropertyChanged();
 
@@ -771,16 +771,16 @@ public double PortScanner_ProfileWidth
             }
         }
 
-        private bool _portScanner_HideStatistics;
-        public bool PortScanner_HideStatistics
+        private bool _portScanner_ShowStatistics = true;
+        public bool PortScanner_ShowStatistics
         {
-            get { return _portScanner_HideStatistics; }
+            get { return _portScanner_ShowStatistics; }
             set
             {
-                if (value == _portScanner_HideStatistics)
+                if (value == _portScanner_ShowStatistics)
                     return;
 
-                _portScanner_HideStatistics = value;
+                _portScanner_ShowStatistics = value;
 
                 OnPropertyChanged();
 
@@ -958,16 +958,16 @@ public double Ping_ProfileWidth
             }
         }
 
-        private bool _ping_HideStatistics;
-        public bool Ping_HideStatistics
+        private bool _ping_ShowStatistics = true;
+        public bool Ping_ShowStatistics
         {
-            get { return _ping_HideStatistics; }
+            get { return _ping_ShowStatistics; }
             set
             {
-                if (value == _ping_HideStatistics)
+                if (value == _ping_ShowStatistics)
                     return;
 
-                _ping_HideStatistics = value;
+                _ping_ShowStatistics = value;
 
                 OnPropertyChanged();
 
@@ -1106,16 +1106,16 @@ public double Traceroute_ProfileWidth
             }
         }
 
-        private bool _traceroute_HideStatistics;
-        public bool Traceroute_HideStatistics
+        private bool _traceroute_ShowStatistics = true;
+        public bool Traceroute_ShowStatistics
         {
-            get { return _traceroute_HideStatistics; }
+            get { return _traceroute_ShowStatistics; }
             set
             {
-                if (value == _traceroute_HideStatistics)
+                if (value == _traceroute_ShowStatistics)
                     return;
 
-                _traceroute_HideStatistics = value;
+                _traceroute_ShowStatistics = value;
 
                 OnPropertyChanged();
 
@@ -1349,16 +1349,16 @@ public bool DNSLookup_ExpandStatistics
             }
         }
 
-        private bool _dnsLookup_HideStatistics;
-        public bool DNSLookup_HideStatistics
+        private bool _dnsLookup_ShowStatistics = true;
+        public bool DNSLookup_ShowStatistics
         {
-            get { return _dnsLookup_HideStatistics; }
+            get { return _dnsLookup_ShowStatistics; }
             set
             {
-                if (value == _dnsLookup_HideStatistics)
+                if (value == _dnsLookup_ShowStatistics)
                     return;
 
-                _dnsLookup_HideStatistics = value;
+                _dnsLookup_ShowStatistics = value;
 
                 OnPropertyChanged();
 
@@ -2048,16 +2048,16 @@ public SNMPv3PrivacyProvider SNMP_PrivacyProvider
             }
         }
 
-        private bool _snmp_HideStatistics;
-        public bool SNMP_HideStatistics
+        private bool _snmp_ShowStatistics = true;
+        public bool SNMP_ShowStatistics
         {
-            get { return _snmp_HideStatistics; }
+            get { return _snmp_ShowStatistics; }
             set
             {
-                if (value == _snmp_HideStatistics)
+                if (value == _snmp_ShowStatistics)
                     return;
 
-                _snmp_HideStatistics = value;
+                _snmp_ShowStatistics = value;
 
                 OnPropertyChanged();
 
@@ -2154,16 +2154,16 @@ public bool HTTPHeaders_ExpandStatistics
             }
         }
 
-        private bool _httpHeaders_HideStatistics;
-        public bool HTTPHeaders_HideStatistics
+        private bool _httpHeaders_ShowStatistics = true;
+        public bool HTTPHeaders_ShowStatistics
         {
-            get { return _httpHeaders_HideStatistics; }
+            get { return _httpHeaders_ShowStatistics; }
             set
             {
-                if (value == _httpHeaders_HideStatistics)
+                if (value == _httpHeaders_ShowStatistics)
                     return;
 
-                _httpHeaders_HideStatistics = value;
+                _httpHeaders_ShowStatistics = value;
 
                 OnPropertyChanged();
 
diff --git a/Source/NETworkManager/Resources/Localization/Resources.de-DE.xaml b/Source/NETworkManager/Resources/Localization/Resources.de-DE.xaml
index 4584d89732..54e16cd10a 100644
--- a/Source/NETworkManager/Resources/Localization/Resources.de-DE.xaml
+++ b/Source/NETworkManager/Resources/Localization/Resources.de-DE.xaml
@@ -431,7 +431,7 @@
     <system:String x:Key="String_ClearFilter">Filter löschen</system:String>
     <system:String x:Key="String_AddSessionDots">Sitzung hinzufügen...</system:String>
     <system:String x:Key="String_AddClientDots">Client hinzufügen...</system:String>
-    <system:String x:Key="String_HideStatistics">Statistiken ausblenden</system:String>
+    <system:String x:Key="String_ShowStatistics">Statistiken anzeigen</system:String>
     
     <!-- Documentation title -->
     <system:String x:Key="String_DocumentationTitle_00001">Wie installiere ich RDP 8.1 unter Windows 7 / Server 2008 R2?</system:String>
diff --git a/Source/NETworkManager/Resources/Localization/Resources.en-US.xaml b/Source/NETworkManager/Resources/Localization/Resources.en-US.xaml
index 817afcd34d..343bf9c0b7 100644
--- a/Source/NETworkManager/Resources/Localization/Resources.en-US.xaml
+++ b/Source/NETworkManager/Resources/Localization/Resources.en-US.xaml
@@ -431,7 +431,7 @@
     <system:String x:Key="String_AddProfileDots">Add profile...</system:String>
     <system:String x:Key="String_AddSessionDots">Add session...</system:String>
     <system:String x:Key="String_AddClientDots">Add client...</system:String>
-    <system:String x:Key="String_HideStatistics">Hide statistics</system:String>
+    <system:String x:Key="String_ShowStatistics">Show statistics</system:String>
     
     <!-- Documentation title -->
     <system:String x:Key="String_DocumentationTitle_00001">How to install RDP 8.1 on Windows 7/Server 2008 R2</system:String>
diff --git a/Source/NETworkManager/Resources/Localization/Resources.ru-RU.xaml b/Source/NETworkManager/Resources/Localization/Resources.ru-RU.xaml
index 9512f6fd79..9aeffc9c62 100644
--- a/Source/NETworkManager/Resources/Localization/Resources.ru-RU.xaml
+++ b/Source/NETworkManager/Resources/Localization/Resources.ru-RU.xaml
@@ -431,7 +431,7 @@
     <system:String x:Key="String_AddProfileDots">Add profile...</system:String>
     <system:String x:Key="String_AddSessionDots">Add session...</system:String>
     <system:String x:Key="String_AddClientDots">Add client...</system:String>
-    <system:String x:Key="String_HideStatistics">Hide statistics</system:String>
+    <system:String x:Key="String_ShowStatistics">Show statistics</system:String>
     
     <!-- Documentation title -->
     <system:String x:Key="String_DocumentationTitle_00001">Как установить RDP 8.1 на Windows 7 / Server 2008 R2</system:String>
diff --git a/Source/NETworkManager/ViewModels/DNSLookupSettingsViewModel.cs b/Source/NETworkManager/ViewModels/DNSLookupSettingsViewModel.cs
index b0def46a7d..52f84d15f3 100644
--- a/Source/NETworkManager/ViewModels/DNSLookupSettingsViewModel.cs
+++ b/Source/NETworkManager/ViewModels/DNSLookupSettingsViewModel.cs
@@ -237,19 +237,19 @@ public int Timeout
             }
         }
 
-        private bool _hideStatistics;
-        public bool HideStatistics
+        private bool _showStatistics;
+        public bool ShowStatistics
         {
-            get { return _hideStatistics; }
+            get { return _showStatistics; }
             set
             {
-                if (value == _hideStatistics)
+                if (value == _showStatistics)
                     return;
 
                 if (!_isLoading)
-                    SettingsManager.Current.DNSLookup_HideStatistics = value;
+                    SettingsManager.Current.DNSLookup_ShowStatistics = value;
 
-                _hideStatistics = value;
+                _showStatistics = value;
                 OnPropertyChanged();
             }
         }
@@ -283,7 +283,7 @@ private void LoadSettings()
             TransportType = TransportTypes.First(x => x == SettingsManager.Current.DNSLookup_TransportType);
             Attempts = SettingsManager.Current.DNSLookup_Attempts;
             Timeout = SettingsManager.Current.DNSLookup_Timeout;
-            HideStatistics = SettingsManager.Current.DNSLookup_HideStatistics;
+            ShowStatistics = SettingsManager.Current.DNSLookup_ShowStatistics;
         }
         #endregion
     }
diff --git a/Source/NETworkManager/ViewModels/DNSLookupViewModel.cs b/Source/NETworkManager/ViewModels/DNSLookupViewModel.cs
index 369fd37cfc..c61efb560b 100644
--- a/Source/NETworkManager/ViewModels/DNSLookupViewModel.cs
+++ b/Source/NETworkManager/ViewModels/DNSLookupViewModel.cs
@@ -201,9 +201,9 @@ public bool ExpandStatistics
             }
         }
 
-        public bool HideStatistics
+        public bool ShowStatistics
         {
-            get { return SettingsManager.Current.DNSLookup_HideStatistics; }
+            get { return SettingsManager.Current.DNSLookup_ShowStatistics; }
         }
         #endregion
 
@@ -448,8 +448,8 @@ private void DispatcherTimer_Tick(object sender, EventArgs e)
 
         private void SettingsManager_PropertyChanged(object sender, PropertyChangedEventArgs e)
         {
-            if (e.PropertyName == nameof(SettingsInfo.DNSLookup_HideStatistics))
-                OnPropertyChanged(nameof(HideStatistics));
+            if (e.PropertyName == nameof(SettingsInfo.DNSLookup_ShowStatistics))
+                OnPropertyChanged(nameof(ShowStatistics));
         }
         #endregion
     }
diff --git a/Source/NETworkManager/ViewModels/HTTPHeadersSettingsViewModel.cs b/Source/NETworkManager/ViewModels/HTTPHeadersSettingsViewModel.cs
index 75639f552f..56bf3268a8 100644
--- a/Source/NETworkManager/ViewModels/HTTPHeadersSettingsViewModel.cs
+++ b/Source/NETworkManager/ViewModels/HTTPHeadersSettingsViewModel.cs
@@ -25,19 +25,19 @@ public int Timeout
             }
         }
 
-        private bool _hideStatistics;
-        public bool HideStatistics
+        private bool _showStatistics;
+        public bool ShowStatistics
         {
-            get { return _hideStatistics; }
+            get { return _showStatistics; }
             set
             {
-                if (value == _hideStatistics)
+                if (value == _showStatistics)
                     return;
 
                 if (!_isLoading)
-                    SettingsManager.Current.HTTPHeaders_HideStatistics = value;
+                    SettingsManager.Current.HTTPHeaders_ShowStatistics = value;
 
-                _hideStatistics = value;
+                _showStatistics = value;
                 OnPropertyChanged();
             }
         }
@@ -54,7 +54,7 @@ public HTTPHeadersSettingsViewModel()
         private void LoadSettings()
         {
             Timeout = SettingsManager.Current.HTTPHeaders_Timeout;
-            HideStatistics = SettingsManager.Current.HTTPHeaders_HideStatistics;
+            ShowStatistics = SettingsManager.Current.HTTPHeaders_ShowStatistics;
         }
         #endregion
     }
diff --git a/Source/NETworkManager/ViewModels/HTTPHeadersViewModel.cs b/Source/NETworkManager/ViewModels/HTTPHeadersViewModel.cs
index f05ed871a5..f8df077c18 100644
--- a/Source/NETworkManager/ViewModels/HTTPHeadersViewModel.cs
+++ b/Source/NETworkManager/ViewModels/HTTPHeadersViewModel.cs
@@ -175,9 +175,9 @@ public bool ExpandStatistics
             }
         }
 
-        public bool HideStatistics
+        public bool ShowStatistics
         {
-            get { return SettingsManager.Current.HTTPHeaders_HideStatistics; }
+            get { return SettingsManager.Current.HTTPHeaders_ShowStatistics; }
         }
         #endregion
 
@@ -302,8 +302,8 @@ private void DispatcherTimer_Tick(object sender, EventArgs e)
 
         private void SettingsManager_PropertyChanged(object sender, PropertyChangedEventArgs e)
         {
-            if (e.PropertyName == nameof(SettingsInfo.HTTPHeaders_HideStatistics))
-                OnPropertyChanged(nameof(HideStatistics));
+            if (e.PropertyName == nameof(SettingsInfo.HTTPHeaders_ShowStatistics))
+                OnPropertyChanged(nameof(ShowStatistics));
         }
         #endregion
     }
diff --git a/Source/NETworkManager/ViewModels/IPScannerSettingsViewModel.cs b/Source/NETworkManager/ViewModels/IPScannerSettingsViewModel.cs
index a2674f7c1b..2103691783 100644
--- a/Source/NETworkManager/ViewModels/IPScannerSettingsViewModel.cs
+++ b/Source/NETworkManager/ViewModels/IPScannerSettingsViewModel.cs
@@ -269,19 +269,19 @@ public bool ResolveMACAddress
             }
         }
 
-        private bool _hideStatistics;
-        public bool HideStatistics
+        private bool _showStatistics;
+        public bool ShowStatistics
         {
-            get { return _hideStatistics; }
+            get { return _showStatistics; }
             set
             {
-                if (value == _hideStatistics)
+                if (value == _showStatistics)
                     return;
 
                 if (!_isLoading)
-                    SettingsManager.Current.IPScanner_HideStatistics = value;
+                    SettingsManager.Current.IPScanner_ShowStatistics = value;
 
-                _hideStatistics = value;
+                _showStatistics = value;
                 OnPropertyChanged();
             }
         }
@@ -316,7 +316,7 @@ private void LoadSettings()
             DNSAttempts = SettingsManager.Current.IPScanner_DNSAttempts;
             DNSTimeout = SettingsManager.Current.IPScanner_DNSTimeout;
             ResolveMACAddress = SettingsManager.Current.IPScanner_ResolveMACAddress;
-            HideStatistics = SettingsManager.Current.IPScanner_HideStatistics;
+            ShowStatistics = SettingsManager.Current.IPScanner_ShowStatistics;
         }
         #endregion
     }
diff --git a/Source/NETworkManager/ViewModels/IPScannerViewModel.cs b/Source/NETworkManager/ViewModels/IPScannerViewModel.cs
index c6aa7d6724..5a89e69da5 100644
--- a/Source/NETworkManager/ViewModels/IPScannerViewModel.cs
+++ b/Source/NETworkManager/ViewModels/IPScannerViewModel.cs
@@ -265,9 +265,9 @@ public bool ExpandStatistics
             }
         }
 
-        public bool HideStatistics
+        public bool ShowStatistics
         {
-            get { return SettingsManager.Current.IPScanner_HideStatistics; }
+            get { return SettingsManager.Current.IPScanner_ShowStatistics; }
         }
         #endregion
 
@@ -680,8 +680,8 @@ private void SettingsManager_PropertyChanged(object sender, PropertyChangedEvent
             if (e.PropertyName == nameof(SettingsInfo.IPScanner_ResolveHostname))
                 OnPropertyChanged(nameof(ResolveHostname));
 
-            if (e.PropertyName == nameof(SettingsInfo.IPScanner_HideStatistics))
-                OnPropertyChanged(nameof(HideStatistics));
+            if (e.PropertyName == nameof(SettingsInfo.IPScanner_ShowStatistics))
+                OnPropertyChanged(nameof(ShowStatistics));
         }
         #endregion
     }
diff --git a/Source/NETworkManager/ViewModels/PingSettingsViewModel.cs b/Source/NETworkManager/ViewModels/PingSettingsViewModel.cs
index cdbf268a8f..95efe1cfbe 100644
--- a/Source/NETworkManager/ViewModels/PingSettingsViewModel.cs
+++ b/Source/NETworkManager/ViewModels/PingSettingsViewModel.cs
@@ -158,19 +158,19 @@ public bool ResolveHostnamePreferIPv6
             }
         }
 
-        private bool _hideStatistics;
-        public bool HideStatistics
+        private bool _showStatistics;
+        public bool ShowStatistics
         {
-            get { return _hideStatistics; }
+            get { return _showStatistics; }
             set
             {
-                if (value == _hideStatistics)
+                if (value == _showStatistics)
                     return;
 
                 if (!_isLoading)
-                    SettingsManager.Current.Ping_HideStatistics = value;
+                    SettingsManager.Current.Ping_ShowStatistics = value;
 
-                _hideStatistics = value;
+                _showStatistics = value;
                 OnPropertyChanged();
             }
         }
@@ -199,7 +199,7 @@ private void LoadSettings()
             else
                 ResolveHostnamePreferIPv6 = true;
 
-            HideStatistics = SettingsManager.Current.Ping_HideStatistics;
+            ShowStatistics = SettingsManager.Current.Ping_ShowStatistics;
         }
         #endregion
     }
diff --git a/Source/NETworkManager/ViewModels/PingViewModel.cs b/Source/NETworkManager/ViewModels/PingViewModel.cs
index 5ce7368d93..3bf49d392f 100644
--- a/Source/NETworkManager/ViewModels/PingViewModel.cs
+++ b/Source/NETworkManager/ViewModels/PingViewModel.cs
@@ -271,9 +271,9 @@ public string StatusMessage
             }
         }
 
-        public bool HideStatistics
+        public bool ShowStatistics
         {
-            get { return SettingsManager.Current.Ping_HideStatistics; }
+            get { return SettingsManager.Current.Ping_ShowStatistics; }
         }
         #endregion
 
@@ -571,8 +571,8 @@ private void DispatcherTimer_Tick(object sender, EventArgs e)
 
         private void SettingsManager_PropertyChanged(object sender, PropertyChangedEventArgs e)
         {
-            if (e.PropertyName == nameof(SettingsInfo.Ping_HideStatistics))
-                OnPropertyChanged(nameof(HideStatistics));
+            if (e.PropertyName == nameof(SettingsInfo.Ping_ShowStatistics))
+                OnPropertyChanged(nameof(ShowStatistics));
         }
         #endregion
     }
diff --git a/Source/NETworkManager/ViewModels/PortScannerSettingsViewModel.cs b/Source/NETworkManager/ViewModels/PortScannerSettingsViewModel.cs
index c9adcbdac3..cfc5432829 100644
--- a/Source/NETworkManager/ViewModels/PortScannerSettingsViewModel.cs
+++ b/Source/NETworkManager/ViewModels/PortScannerSettingsViewModel.cs
@@ -90,19 +90,19 @@ public bool ResolveHostnamePreferIPv6
             }
         }
 
-        private bool _hideStatistics;
-        public bool HideStatistics
+        private bool _showStatistics;
+        public bool ShowStatistics
         {
-            get { return _hideStatistics; }
+            get { return _showStatistics; }
             set
             {
-                if (value == _hideStatistics)
+                if (value == _showStatistics)
                     return;
 
                 if (!_isLoading)
-                    SettingsManager.Current.PortScanner_HideStatistics = value;
+                    SettingsManager.Current.PortScanner_ShowStatistics = value;
 
-                _hideStatistics = value;
+                _showStatistics = value;
                 OnPropertyChanged();
             }
         }
@@ -127,7 +127,7 @@ private void LoadSettings()
             else
                 ResolveHostnamePreferIPv6 = true;
 
-            HideStatistics = SettingsManager.Current.PortScanner_HideStatistics;
+            ShowStatistics = SettingsManager.Current.PortScanner_ShowStatistics;
         }
         #endregion
     }
diff --git a/Source/NETworkManager/ViewModels/PortScannerViewModel.cs b/Source/NETworkManager/ViewModels/PortScannerViewModel.cs
index fac7eb6fb9..7548c657f2 100644
--- a/Source/NETworkManager/ViewModels/PortScannerViewModel.cs
+++ b/Source/NETworkManager/ViewModels/PortScannerViewModel.cs
@@ -277,9 +277,9 @@ public string StatusMessage
             }
         }
 
-        public bool HideStatistics
+        public bool ShowStatistics
         {
-            get { return SettingsManager.Current.PortScanner_HideStatistics; }
+            get { return SettingsManager.Current.PortScanner_ShowStatistics; }
         }
         #endregion
 
@@ -651,8 +651,8 @@ private void DispatcherTimer_Tick(object sender, EventArgs e)
 
         private void SettingsManager_PropertyChanged(object sender, PropertyChangedEventArgs e)
         {
-            if (e.PropertyName == nameof(SettingsInfo.PortScanner_HideStatistics))
-                OnPropertyChanged(nameof(HideStatistics));
+            if (e.PropertyName == nameof(SettingsInfo.PortScanner_ShowStatistics))
+                OnPropertyChanged(nameof(ShowStatistics));
         }
         #endregion
     }
diff --git a/Source/NETworkManager/ViewModels/SNMPSettingsViewModel.cs b/Source/NETworkManager/ViewModels/SNMPSettingsViewModel.cs
index d6634d606f..4333c0b3e4 100644
--- a/Source/NETworkManager/ViewModels/SNMPSettingsViewModel.cs
+++ b/Source/NETworkManager/ViewModels/SNMPSettingsViewModel.cs
@@ -95,19 +95,19 @@ public bool ResolveHostnamePreferIPv6
             }
         }
 
-        private bool _hideStatistics;
-        public bool HideStatistics
+        private bool _showStatistics;
+        public bool ShowStatistics
         {
-            get { return _hideStatistics; }
+            get { return _showStatistics; }
             set
             {
-                if (value == _hideStatistics)
+                if (value == _showStatistics)
                     return;
 
                 if (!_isLoading)
-                    SettingsManager.Current.SNMP_HideStatistics = value;
+                    SettingsManager.Current.SNMP_ShowStatistics = value;
 
-                _hideStatistics = value;
+                _showStatistics = value;
                 OnPropertyChanged();
             }
         }
@@ -133,7 +133,7 @@ private void LoadSettings()
             else
                 ResolveHostnamePreferIPv6 = true;
 
-            HideStatistics = SettingsManager.Current.SNMP_HideStatistics;
+            ShowStatistics = SettingsManager.Current.SNMP_ShowStatistics;
         }
         #endregion
     }
diff --git a/Source/NETworkManager/ViewModels/SNMPViewModel.cs b/Source/NETworkManager/ViewModels/SNMPViewModel.cs
index 80712a6ad2..76d8ca42fb 100644
--- a/Source/NETworkManager/ViewModels/SNMPViewModel.cs
+++ b/Source/NETworkManager/ViewModels/SNMPViewModel.cs
@@ -382,9 +382,9 @@ public bool ExpandStatistics
             }
         }
 
-        public bool HideStatistics
+        public bool ShowStatistics
         {
-            get { return SettingsManager.Current.SNMP_HideStatistics; }
+            get { return SettingsManager.Current.SNMP_ShowStatistics; }
         }
         #endregion
 
@@ -690,8 +690,8 @@ private void DispatcherTimer_Tick(object sender, EventArgs e)
 
         private void SettingsManager_PropertyChanged(object sender, PropertyChangedEventArgs e)
         {
-            if (e.PropertyName == nameof(SettingsInfo.SNMP_HideStatistics))
-                OnPropertyChanged(nameof(HideStatistics));
+            if (e.PropertyName == nameof(SettingsInfo.SNMP_ShowStatistics))
+                OnPropertyChanged(nameof(ShowStatistics));
         }
         #endregion
     }
diff --git a/Source/NETworkManager/ViewModels/TracerouteSettingsViewModel.cs b/Source/NETworkManager/ViewModels/TracerouteSettingsViewModel.cs
index 605579346e..966659d9bc 100644
--- a/Source/NETworkManager/ViewModels/TracerouteSettingsViewModel.cs
+++ b/Source/NETworkManager/ViewModels/TracerouteSettingsViewModel.cs
@@ -107,19 +107,19 @@ public bool ResolveHostnamePreferIPv6
             }
         }
 
-        private bool _hideStatistics;
-        public bool HideStatistics
+        private bool _showStatistics;
+        public bool ShowStatistics
         {
-            get { return _hideStatistics; }
+            get { return _showStatistics; }
             set
             {
-                if (value == _hideStatistics)
+                if (value == _showStatistics)
                     return;
 
                 if (!_isLoading)
-                    SettingsManager.Current.Traceroute_HideStatistics = value;
+                    SettingsManager.Current.Traceroute_ShowStatistics = value;
 
-                _hideStatistics = value;
+                _showStatistics = value;
                 OnPropertyChanged();
             }
         }
@@ -145,7 +145,7 @@ private void LoadSettings()
             else
                 ResolveHostnamePreferIPv6 = true;
 
-            HideStatistics = SettingsManager.Current.Traceroute_HideStatistics;
+            ShowStatistics = SettingsManager.Current.Traceroute_ShowStatistics;
         }
         #endregion
     }
diff --git a/Source/NETworkManager/ViewModels/TracerouteViewModel.cs b/Source/NETworkManager/ViewModels/TracerouteViewModel.cs
index dadf8e5458..1c586d6eb9 100644
--- a/Source/NETworkManager/ViewModels/TracerouteViewModel.cs
+++ b/Source/NETworkManager/ViewModels/TracerouteViewModel.cs
@@ -219,9 +219,9 @@ public int Hops
             }
         }
 
-        public bool HideStatistics
+        public bool ShowStatistics
         {
-            get { return SettingsManager.Current.Traceroute_HideStatistics; }
+            get { return SettingsManager.Current.Traceroute_ShowStatistics; }
         }
         #endregion
 
@@ -605,8 +605,8 @@ private void Current_PropertyChanged(object sender, PropertyChangedEventArgs e)
             if (e.PropertyName == nameof(SettingsInfo.Traceroute_ResolveHostname))
                 OnPropertyChanged(nameof(ResolveHostname));
 
-            if (e.PropertyName == nameof(SettingsInfo.Traceroute_HideStatistics))
-                OnPropertyChanged(nameof(HideStatistics));
+            if (e.PropertyName == nameof(SettingsInfo.Traceroute_ShowStatistics))
+                OnPropertyChanged(nameof(ShowStatistics));
         }
         #endregion               
     }
diff --git a/Source/NETworkManager/Views/DNSLookupSettingsView.xaml b/Source/NETworkManager/Views/DNSLookupSettingsView.xaml
index c82c9c2549..c7695f69a4 100644
--- a/Source/NETworkManager/Views/DNSLookupSettingsView.xaml
+++ b/Source/NETworkManager/Views/DNSLookupSettingsView.xaml
@@ -70,6 +70,6 @@
         <TextBlock Text="{DynamicResource String_Timeout}" Style="{DynamicResource DefaultTextBlock}" VerticalAlignment="Center" Margin="0,0,0,10" />
         <mah:NumericUpDown Value="{Binding Timeout}" Maximum="10000" Minimum="100" Interval="100" Margin="0,0,0,20" />
         <TextBlock Text="{DynamicResource String_Header_Statistics}" Style="{StaticResource HeaderTextBlock}" />
-        <mah:ToggleSwitch Header="{DynamicResource String_HideStatistics}" OnLabel="{DynamicResource String_ToggleSwitch_On}" OffLabel="{DynamicResource String_ToggleSwitch_Off}" IsChecked="{Binding HideStatistics}" />
+        <mah:ToggleSwitch Header="{DynamicResource String_ShowStatistics}" OnLabel="{DynamicResource String_ToggleSwitch_On}" OffLabel="{DynamicResource String_ToggleSwitch_Off}" IsChecked="{Binding ShowStatistics}" />
     </StackPanel>
 </UserControl>
diff --git a/Source/NETworkManager/Views/DNSLookupView.xaml b/Source/NETworkManager/Views/DNSLookupView.xaml
index 72a51c8115..68945f2e77 100644
--- a/Source/NETworkManager/Views/DNSLookupView.xaml
+++ b/Source/NETworkManager/Views/DNSLookupView.xaml
@@ -208,7 +208,7 @@
                 <DataGridTextColumn Header="{DynamicResource String_Result}" Binding="{Binding Result}" MinWidth="200" Width="*" />
             </DataGrid.Columns>
         </DataGrid>
-        <Expander Grid.Row="4" IsExpanded="{Binding ExpandStatistics}" Visibility="{Binding HideStatistics, Converter={StaticResource BooleanReverseToVisibilityConverter}}" Style="{StaticResource HeaderExpander}" Margin="0,20,0,0">
+        <Expander Grid.Row="4" IsExpanded="{Binding ExpandStatistics}" Visibility="{Binding ShowStatistics, Converter={StaticResource BooleanToVisibilityConverter}}" Style="{StaticResource HeaderExpander}" Margin="0,20,0,0">
             <Expander.Header>
                 <TextBlock Text="{DynamicResource String_Header_Statistics}" Style="{StaticResource HeaderTextBlock}" Margin="0" />
             </Expander.Header>
diff --git a/Source/NETworkManager/Views/HTTPHeadersSettingsView.xaml b/Source/NETworkManager/Views/HTTPHeadersSettingsView.xaml
index 7c5d219f53..1081982a45 100644
--- a/Source/NETworkManager/Views/HTTPHeadersSettingsView.xaml
+++ b/Source/NETworkManager/Views/HTTPHeadersSettingsView.xaml
@@ -10,6 +10,6 @@
         <TextBlock Text="{DynamicResource String_Timeout}" Style="{StaticResource CenterTextBlock}" Margin="0,0,0,10" />
         <mah:NumericUpDown Value="{Binding Timeout}" Maximum="100000" Minimum="1000" Interval="1000" Margin="0,0,0,20" />
         <TextBlock Text="{DynamicResource String_Header_Statistics}" Style="{StaticResource HeaderTextBlock}" />
-        <mah:ToggleSwitch Header="{DynamicResource String_HideStatistics}" OnLabel="{DynamicResource String_ToggleSwitch_On}" OffLabel="{DynamicResource String_ToggleSwitch_Off}" IsChecked="{Binding HideStatistics}" />
+        <mah:ToggleSwitch Header="{DynamicResource String_ShowStatistics}" OnLabel="{DynamicResource String_ToggleSwitch_On}" OffLabel="{DynamicResource String_ToggleSwitch_Off}" IsChecked="{Binding ShowStatistics}" />
     </StackPanel>
 </UserControl>
\ No newline at end of file
diff --git a/Source/NETworkManager/Views/HTTPHeadersView.xaml b/Source/NETworkManager/Views/HTTPHeadersView.xaml
index e5f2e45c23..451fa56527 100644
--- a/Source/NETworkManager/Views/HTTPHeadersView.xaml
+++ b/Source/NETworkManager/Views/HTTPHeadersView.xaml
@@ -101,7 +101,7 @@
             </Grid>
             <TextBlock Grid.Row="2" Style="{StaticResource HeaderTextBlock}" Text="{DynamicResource String_Header_Headers}" />
             <TextBox Grid.Row="3" Text="{Binding Headers}" Style="{StaticResource ConsoleTextBox}" IsReadOnly="True" ContextMenu="{StaticResource CopyContextMenu}"/>
-            <Expander Grid.Row="4" IsExpanded="{Binding ExpandStatistics}" Visibility="{Binding HideStatistics, Converter={StaticResource BooleanReverseToVisibilityConverter}}" Style="{StaticResource HeaderExpander}" Margin="0,20,0,0">
+            <Expander Grid.Row="4" IsExpanded="{Binding ExpandStatistics}" Visibility="{Binding ShowStatistics, Converter={StaticResource BooleanToVisibilityConverter}}" Style="{StaticResource HeaderExpander}" Margin="0,20,0,0">
                 <Expander.Header>
                     <TextBlock Text="{DynamicResource String_Header_Statistics}" Style="{StaticResource HeaderTextBlock}" Margin="0" />
                 </Expander.Header>
diff --git a/Source/NETworkManager/Views/IPScannerSettingsView.xaml b/Source/NETworkManager/Views/IPScannerSettingsView.xaml
index 9cdab906a8..886080de41 100644
--- a/Source/NETworkManager/Views/IPScannerSettingsView.xaml
+++ b/Source/NETworkManager/Views/IPScannerSettingsView.xaml
@@ -55,6 +55,6 @@
         <TextBlock Text="{DynamicResource String_Header_ARP}" Style="{StaticResource HeaderTextBlock}" />
         <mah:ToggleSwitch Header="{DynamicResource String_ReadTheMACAddressFromTheArpCache}" OnLabel="{DynamicResource String_ToggleSwitch_On}" OffLabel="{DynamicResource String_ToggleSwitch_Off}" IsChecked="{Binding ResolveMACAddress}" Margin="0,0,0,20" />
         <TextBlock Text="{DynamicResource String_Header_Statistics}" Style="{StaticResource HeaderTextBlock}" />
-        <mah:ToggleSwitch Header="{DynamicResource String_HideStatistics}" OnLabel="{DynamicResource String_ToggleSwitch_On}" OffLabel="{DynamicResource String_ToggleSwitch_Off}" IsChecked="{Binding HideStatistics}" />
+        <mah:ToggleSwitch Header="{DynamicResource String_ShowStatistics}" OnLabel="{DynamicResource String_ToggleSwitch_On}" OffLabel="{DynamicResource String_ToggleSwitch_Off}" IsChecked="{Binding ShowStatistics}" />
     </StackPanel>
 </UserControl>
diff --git a/Source/NETworkManager/Views/IPScannerView.xaml b/Source/NETworkManager/Views/IPScannerView.xaml
index ea947943da..d72cc4716c 100644
--- a/Source/NETworkManager/Views/IPScannerView.xaml
+++ b/Source/NETworkManager/Views/IPScannerView.xaml
@@ -357,7 +357,7 @@
                 <DataGridTextColumn Header="{DynamicResource String_Status}" Binding="{Binding PingInfo.Status, Converter={StaticResource IPStatusToStringConverter}}" MinWidth="150" Width="*" />
             </DataGrid.Columns>
         </DataGrid>
-        <Expander Grid.Row="4" IsExpanded="{Binding ExpandStatistics}" Style="{StaticResource HeaderExpander}" Visibility="{Binding HideStatistics, Converter={StaticResource BooleanReverseToVisibilityConverter}}" Margin="0,20,0,0">
+        <Expander Grid.Row="4" IsExpanded="{Binding ExpandStatistics}" Style="{StaticResource HeaderExpander}" Visibility="{Binding ShowStatistics, Converter={StaticResource BooleanToVisibilityConverter}}" Margin="0,20,0,0">
             <Expander.Header>
                 <TextBlock Text="{DynamicResource String_Header_Statistics}" Style="{StaticResource HeaderTextBlock}" Margin="0" />
             </Expander.Header>
diff --git a/Source/NETworkManager/Views/PingSettingsView.xaml b/Source/NETworkManager/Views/PingSettingsView.xaml
index 07ed5c225e..fac623b5d6 100644
--- a/Source/NETworkManager/Views/PingSettingsView.xaml
+++ b/Source/NETworkManager/Views/PingSettingsView.xaml
@@ -25,6 +25,6 @@
         <RadioButton Content="{DynamicResource String_IPv4}" IsChecked="{Binding ResolveHostnamePreferIPv4}" Margin="0,0,0,10" />
         <RadioButton Content="{DynamicResource String_IPv6}" IsChecked="{Binding ResolveHostnamePreferIPv6}" Margin="0,0,0,20" />
         <TextBlock Text="{DynamicResource String_Header_Statistics}" Style="{StaticResource HeaderTextBlock}" />
-        <mah:ToggleSwitch Header="{DynamicResource String_HideStatistics}" OnLabel="{DynamicResource String_ToggleSwitch_On}" OffLabel="{DynamicResource String_ToggleSwitch_Off}" IsChecked="{Binding HideStatistics}" />
+        <mah:ToggleSwitch Header="{DynamicResource String_ShowStatistics}" OnLabel="{DynamicResource String_ToggleSwitch_On}" OffLabel="{DynamicResource String_ToggleSwitch_Off}" IsChecked="{Binding ShowStatistics}" />
     </StackPanel>
 </UserControl>
diff --git a/Source/NETworkManager/Views/PingView.xaml b/Source/NETworkManager/Views/PingView.xaml
index 8a29bd3988..ab3774d84b 100644
--- a/Source/NETworkManager/Views/PingView.xaml
+++ b/Source/NETworkManager/Views/PingView.xaml
@@ -140,7 +140,7 @@
                 <DataGridTextColumn Header="{DynamicResource String_Status}" Binding="{Binding Status, Converter={StaticResource IPStatusToStringConverter}}" MinWidth="150" Width="*" />
             </Control:ScrollingDataGrid.Columns>
         </Control:ScrollingDataGrid>
-        <Expander Grid.Row="4" IsExpanded="{Binding ExpandStatistics}" Visibility="{Binding HideStatistics, Converter={StaticResource BooleanReverseToVisibilityConverter}}" Style="{StaticResource HeaderExpander}" Margin="0,20,0,0">
+        <Expander Grid.Row="4" IsExpanded="{Binding ExpandStatistics}" Visibility="{Binding ShowStatistics, Converter={StaticResource BooleanToVisibilityConverter}}" Style="{StaticResource HeaderExpander}" Margin="0,20,0,0">
             <Expander.Header>
                 <TextBlock Text="{DynamicResource String_Header_Statistics}" Style="{StaticResource HeaderTextBlock}" Margin="0" />
             </Expander.Header>
diff --git a/Source/NETworkManager/Views/PortScannerSettingsView.xaml b/Source/NETworkManager/Views/PortScannerSettingsView.xaml
index d77218431b..7796333f30 100644
--- a/Source/NETworkManager/Views/PortScannerSettingsView.xaml
+++ b/Source/NETworkManager/Views/PortScannerSettingsView.xaml
@@ -19,6 +19,6 @@
         <RadioButton Content="{DynamicResource String_IPv4}" IsChecked="{Binding ResolveHostnamePreferIPv4}" Margin="0,0,0,10" />
         <RadioButton Content="{DynamicResource String_IPv6}" IsChecked="{Binding ResolveHostnamePreferIPv6}" Margin="0,0,0,20" />
         <TextBlock Text="{DynamicResource String_Header_Statistics}" Style="{StaticResource HeaderTextBlock}" />
-        <mah:ToggleSwitch Header="{DynamicResource String_HideStatistics}" OnLabel="{DynamicResource String_ToggleSwitch_On}" OffLabel="{DynamicResource String_ToggleSwitch_Off}" IsChecked="{Binding HideStatistics}" />
+        <mah:ToggleSwitch Header="{DynamicResource String_ShowStatistics}" OnLabel="{DynamicResource String_ToggleSwitch_On}" OffLabel="{DynamicResource String_ToggleSwitch_Off}" IsChecked="{Binding ShowStatistics}" />
     </StackPanel>
 </UserControl>
diff --git a/Source/NETworkManager/Views/PortScannerView.xaml b/Source/NETworkManager/Views/PortScannerView.xaml
index cd50b01a6a..5b043a9572 100644
--- a/Source/NETworkManager/Views/PortScannerView.xaml
+++ b/Source/NETworkManager/Views/PortScannerView.xaml
@@ -274,7 +274,7 @@
                 <DataGridTextColumn Header="{DynamicResource String_Description}" Binding="{Binding LookupInfo.Description}" MinWidth="200" Width="*" />
             </DataGrid.Columns>
         </DataGrid>
-        <Expander Grid.Row="4" IsExpanded="{Binding ExpandStatistics}" Style="{StaticResource HeaderExpander}" Visibility="{Binding HideStatistics, Converter={StaticResource BooleanReverseToVisibilityConverter}}" Margin="0,20,0,0">
+        <Expander Grid.Row="4" IsExpanded="{Binding ExpandStatistics}" Style="{StaticResource HeaderExpander}" Visibility="{Binding ShowStatistics, Converter={StaticResource BooleanToVisibilityConverter}}" Margin="0,20,0,0">
             <Expander.Header>
                 <TextBlock Text="{DynamicResource String_Header_Statistics}" Style="{StaticResource HeaderTextBlock}" Margin="0" />
             </Expander.Header>
diff --git a/Source/NETworkManager/Views/SNMPSettingsView.xaml b/Source/NETworkManager/Views/SNMPSettingsView.xaml
index a62091b21d..4ef744c017 100644
--- a/Source/NETworkManager/Views/SNMPSettingsView.xaml
+++ b/Source/NETworkManager/Views/SNMPSettingsView.xaml
@@ -28,6 +28,6 @@
         <RadioButton Content="{DynamicResource String_IPv4}" IsChecked="{Binding ResolveHostnamePreferIPv4}" Margin="0,0,0,10" />
         <RadioButton Content="{DynamicResource String_IPv6}" IsChecked="{Binding ResolveHostnamePreferIPv6}" Margin="0,0,0,20" />
         <TextBlock Text="{DynamicResource String_Header_Statistics}" Style="{StaticResource HeaderTextBlock}" />
-        <mah:ToggleSwitch Header="{DynamicResource String_HideStatistics}" OnLabel="{DynamicResource String_ToggleSwitch_On}" OffLabel="{DynamicResource String_ToggleSwitch_Off}" IsChecked="{Binding HideStatistics}" />
+        <mah:ToggleSwitch Header="{DynamicResource String_ShowStatistics}" OnLabel="{DynamicResource String_ToggleSwitch_On}" OffLabel="{DynamicResource String_ToggleSwitch_Off}" IsChecked="{Binding ShowStatistics}" />
     </StackPanel>
 </UserControl>
\ No newline at end of file
diff --git a/Source/NETworkManager/Views/SNMPView.xaml b/Source/NETworkManager/Views/SNMPView.xaml
index b156728229..e8a0f71ea9 100644
--- a/Source/NETworkManager/Views/SNMPView.xaml
+++ b/Source/NETworkManager/Views/SNMPView.xaml
@@ -563,7 +563,7 @@
                 </Style>
             </TextBox.Style>
         </TextBox>
-        <Expander Grid.Row="7" Grid.ColumnSpan="3" IsExpanded="{Binding ExpandStatistics}" Visibility="{Binding HideStatistics, Converter={StaticResource BooleanReverseToVisibilityConverter}}" Style="{StaticResource HeaderExpander}" Margin="0,20,0,0">
+        <Expander Grid.Row="7" Grid.ColumnSpan="3" IsExpanded="{Binding ExpandStatistics}" Visibility="{Binding ShowStatistics, Converter={StaticResource BooleanToVisibilityConverter}}" Style="{StaticResource HeaderExpander}" Margin="0,20,0,0">
             <Expander.Header>
                 <TextBlock Text="{DynamicResource String_Header_Statistics}" Style="{StaticResource HeaderTextBlock}" Margin="0" />
             </Expander.Header>
diff --git a/Source/NETworkManager/Views/TracerouteSettingsView.xaml b/Source/NETworkManager/Views/TracerouteSettingsView.xaml
index c5442c0ef2..2823af476f 100644
--- a/Source/NETworkManager/Views/TracerouteSettingsView.xaml
+++ b/Source/NETworkManager/Views/TracerouteSettingsView.xaml
@@ -20,6 +20,6 @@
         <RadioButton Content="{DynamicResource String_IPv4}" IsChecked="{Binding ResolveHostnamePreferIPv4}" Margin="0,0,0,10" />
         <RadioButton Content="{DynamicResource String_IPv6}" IsChecked="{Binding ResolveHostnamePreferIPv6}" Margin="0,0,0,20" />
         <TextBlock Text="{DynamicResource String_Header_Statistics}" Style="{StaticResource HeaderTextBlock}" />
-        <mah:ToggleSwitch Header="{DynamicResource String_HideStatistics}" OnLabel="{DynamicResource String_ToggleSwitch_On}" OffLabel="{DynamicResource String_ToggleSwitch_Off}" IsChecked="{Binding HideStatistics}" />
+        <mah:ToggleSwitch Header="{DynamicResource String_ShowStatistics}" OnLabel="{DynamicResource String_ToggleSwitch_On}" OffLabel="{DynamicResource String_ToggleSwitch_Off}" IsChecked="{Binding ShowStatistics}" />
     </StackPanel>
 </UserControl>
diff --git a/Source/NETworkManager/Views/TracerouteView.xaml b/Source/NETworkManager/Views/TracerouteView.xaml
index 17001de91d..70d24ee4b2 100644
--- a/Source/NETworkManager/Views/TracerouteView.xaml
+++ b/Source/NETworkManager/Views/TracerouteView.xaml
@@ -304,7 +304,7 @@
                 <DataGridTextColumn Header="{DynamicResource String_Hostname}" Binding="{Binding Hostname}" Visibility="{Binding Data.ResolveHostname, Source={StaticResource BindingProxy}, Converter={StaticResource BooleanToVisibilityConverter}}" MinWidth="150" Width="*" />
             </DataGrid.Columns>
         </DataGrid>
-        <Expander Grid.Row="4" IsExpanded="{Binding ExpandStatistics}" Visibility="{Binding HideStatistics, Converter={StaticResource BooleanReverseToVisibilityConverter}}" Style="{StaticResource HeaderExpander}" Margin="0,20,0,0">
+        <Expander Grid.Row="4" IsExpanded="{Binding ExpandStatistics}" Visibility="{Binding ShowStatistics, Converter={StaticResource BooleanToVisibilityConverter}}" Style="{StaticResource HeaderExpander}" Margin="0,20,0,0">
             <Expander.Header>
                 <TextBlock Text="{DynamicResource String_Header_Statistics}" Style="{StaticResource HeaderTextBlock}" Margin="0" />
             </Expander.Header>