BornToBeRoot · BornToBeRoot · Jun 4, 2018 · Jun 3, 2018 · Jun 3, 2018 · Jun 3, 2018
diff --git 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_ShowStatistics = true;
+        public bool IPScanner_ShowStatistics
+        {
+            get { return _ipScanner_ShowStatistics; }
+            set
+            {
+                if (value == _ipScanner_ShowStatistics)
+                    return;
+
+                _ipScanner_ShowStatistics = value;
+
+                OnPropertyChanged();
+
+                SettingsChanged = true;
+            }
+        }
         #endregion
 
         #region PortScanner
@@ -753,6 +770,23 @@ public double PortScanner_ProfileWidth
                 SettingsChanged = true;
             }
         }
+
+        private bool _portScanner_ShowStatistics = true;
+        public bool PortScanner_ShowStatistics
+        {
+            get { return _portScanner_ShowStatistics; }
+            set
+            {
+                if (value == _portScanner_ShowStatistics)
+                    return;
+
+                _portScanner_ShowStatistics = value;
+
+                OnPropertyChanged();
+
+                SettingsChanged = true;
+            }
+        }
         #endregion
 
         #region Ping
@@ -923,6 +957,23 @@ public double Ping_ProfileWidth
                 SettingsChanged = true;
             }
         }
+
+        private bool _ping_ShowStatistics = true;
+        public bool Ping_ShowStatistics
+        {
+            get { return _ping_ShowStatistics; }
+            set
+            {
+                if (value == _ping_ShowStatistics)
+                    return;
+
+                _ping_ShowStatistics = value;
+
+                OnPropertyChanged();
+
+                SettingsChanged = true;
+            }
+        }
         #endregion
 
         #region Traceroute
@@ -1054,6 +1105,23 @@ public double Traceroute_ProfileWidth
                 SettingsChanged = true;
             }
         }
+
+        private bool _traceroute_ShowStatistics = true;
+        public bool Traceroute_ShowStatistics
+        {
+            get { return _traceroute_ShowStatistics; }
+            set
+            {
+                if (value == _traceroute_ShowStatistics)
+                    return;
+
+                _traceroute_ShowStatistics = value;
+
+                OnPropertyChanged();
+
+                SettingsChanged = true;
+            }
+        }
         #endregion
 
         #region DNS Lookup
@@ -1280,6 +1348,23 @@ public bool DNSLookup_ExpandStatistics
                 SettingsChanged = true;
             }
         }
+
+        private bool _dnsLookup_ShowStatistics = true;
+        public bool DNSLookup_ShowStatistics
+        {
+            get { return _dnsLookup_ShowStatistics; }
+            set
+            {
+                if (value == _dnsLookup_ShowStatistics)
+                    return;
+
+                _dnsLookup_ShowStatistics = value;
+
+                OnPropertyChanged();
+
+                SettingsChanged = true;
+            }
+        }
         #endregion
 
         #region RemoteDesktop 
@@ -1962,6 +2047,23 @@ public SNMPv3PrivacyProvider SNMP_PrivacyProvider
                 SettingsChanged = true;
             }
         }
+
+        private bool _snmp_ShowStatistics = true;
+        public bool SNMP_ShowStatistics
+        {
+            get { return _snmp_ShowStatistics; }
+            set
+            {
+                if (value == _snmp_ShowStatistics)
+                    return;
+
+                _snmp_ShowStatistics = value;
+
+                OnPropertyChanged();
+
+                SettingsChanged = true;
+            }
+        }
         #endregion
 
         #region WakeOnLAN
@@ -2051,6 +2153,23 @@ public bool HTTPHeaders_ExpandStatistics
                 SettingsChanged = true;
             }
         }
+
+        private bool _httpHeaders_ShowStatistics = true;
+        public bool HTTPHeaders_ShowStatistics
+        {
+            get { return _httpHeaders_ShowStatistics; }
+            set
+            {
+                if (value == _httpHeaders_ShowStatistics)
+                    return;
+
+                _httpHeaders_ShowStatistics = value;
+
+                OnPropertyChanged();
+
+                SettingsChanged = true;
+            }
+        }
         #endregion
 
         #region Subnet Calculator

diff --git 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_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
@@ -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_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
@@ -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_ShowStatistics">Show 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/DNSLookupSettingsViewModel.cs b/Source/NETworkManager/ViewModels/DNSLookupSettingsViewModel.cs
@@ -236,6 +236,23 @@ public int Timeout
                 OnPropertyChanged();
             }
         }
+
+        private bool _showStatistics;
+        public bool ShowStatistics
+        {
+            get { return _showStatistics; }
+            set
+            {
+                if (value == _showStatistics)
+                    return;
+
+                if (!_isLoading)
+                    SettingsManager.Current.DNSLookup_ShowStatistics = value;
+
+                _showStatistics = 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;
+            ShowStatistics = SettingsManager.Current.DNSLookup_ShowStatistics;
         }
         #endregion
     }

diff --git a/Source/NETworkManager/ViewModels/DNSLookupViewModel.cs b/Source/NETworkManager/ViewModels/DNSLookupViewModel.cs
@@ -200,6 +200,11 @@ public bool ExpandStatistics
                 OnPropertyChanged();
             }
         }
+
+        public bool ShowStatistics
+        {
+            get { return SettingsManager.Current.DNSLookup_ShowStatistics; }
+        }
         #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_ShowStatistics))
+                OnPropertyChanged(nameof(ShowStatistics));
+        }
         #endregion
     }
 }
diff --git a/Source/NETworkManager/ViewModels/HTTPHeadersSettingsViewModel.cs b/Source/NETworkManager/ViewModels/HTTPHeadersSettingsViewModel.cs
@@ -24,6 +24,23 @@ public int Timeout
                 OnPropertyChanged();
             }
         }
+
+        private bool _showStatistics;
+        public bool ShowStatistics
+        {
+            get { return _showStatistics; }
+            set
+            {
+                if (value == _showStatistics)
+                    return;
+
+                if (!_isLoading)
+                    SettingsManager.Current.HTTPHeaders_ShowStatistics = value;
+
+                _showStatistics = value;
+                OnPropertyChanged();
+            }
+        }
         #endregion
 
         #region Contructor, load settings
@@ -37,6 +54,7 @@ public HTTPHeadersSettingsViewModel()
         private void LoadSettings()
         {
             Timeout = SettingsManager.Current.HTTPHeaders_Timeout;
+            ShowStatistics = SettingsManager.Current.HTTPHeaders_ShowStatistics;
         }
         #endregion
     }

diff --git a/Source/NETworkManager/ViewModels/HTTPHeadersViewModel.cs b/Source/NETworkManager/ViewModels/HTTPHeadersViewModel.cs
@@ -175,6 +175,10 @@ public bool ExpandStatistics
             }
         }
 
+        public bool ShowStatistics
+        {
+            get { return SettingsManager.Current.HTTPHeaders_ShowStatistics; }
+        }
         #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_ShowStatistics))
+                OnPropertyChanged(nameof(ShowStatistics));
+        }
         #endregion
     }
 }
diff --git a/Source/NETworkManager/ViewModels/IPScannerSettingsViewModel.cs b/Source/NETworkManager/ViewModels/IPScannerSettingsViewModel.cs
@@ -268,6 +268,23 @@ public bool ResolveMACAddress
                 OnPropertyChanged();
             }
         }
+
+        private bool _showStatistics;
+        public bool ShowStatistics
+        {
+            get { return _showStatistics; }
+            set
+            {
+                if (value == _showStatistics)
+                    return;
+
+                if (!_isLoading)
+                    SettingsManager.Current.IPScanner_ShowStatistics = value;
+
+                _showStatistics = 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;
+            ShowStatistics = SettingsManager.Current.IPScanner_ShowStatistics;
         }
         #endregion
     }

diff --git a/Source/NETworkManager/ViewModels/IPScannerViewModel.cs b/Source/NETworkManager/ViewModels/IPScannerViewModel.cs
@@ -264,6 +264,11 @@ public bool ExpandStatistics
                 OnPropertyChanged();
             }
         }
+
+        public bool ShowStatistics
+        {
+            get { return SettingsManager.Current.IPScanner_ShowStatistics; }
+        }
         #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_ShowStatistics))
+                OnPropertyChanged(nameof(ShowStatistics));
         }
         #endregion
     }