diff --git a/Source/NETworkManager/Models/Settings/SettingsInfo.cs b/Source/NETworkManager/Models/Settings/SettingsInfo.cs index a0cac98593..267a063a31 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_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 index 1b04745165..54e16cd10a 100644 --- a/Source/NETworkManager/Resources/Localization/Resources.de-DE.xaml +++ b/Source/NETworkManager/Resources/Localization/Resources.de-DE.xaml @@ -431,6 +431,7 @@ Filter löschen Sitzung hinzufügen... Client hinzufügen... + Statistiken anzeigen Wie installiere ich RDP 8.1 unter Windows 7 / Server 2008 R2? diff --git a/Source/NETworkManager/Resources/Localization/Resources.en-US.xaml b/Source/NETworkManager/Resources/Localization/Resources.en-US.xaml index 363f96084e..343bf9c0b7 100644 --- a/Source/NETworkManager/Resources/Localization/Resources.en-US.xaml +++ b/Source/NETworkManager/Resources/Localization/Resources.en-US.xaml @@ -431,6 +431,7 @@ Add profile... Add session... Add client... + Show statistics How to install RDP 8.1 on Windows 7/Server 2008 R2 diff --git a/Source/NETworkManager/Resources/Localization/Resources.ru-RU.xaml b/Source/NETworkManager/Resources/Localization/Resources.ru-RU.xaml index c7631eebe4..9aeffc9c62 100644 --- a/Source/NETworkManager/Resources/Localization/Resources.ru-RU.xaml +++ b/Source/NETworkManager/Resources/Localization/Resources.ru-RU.xaml @@ -431,7 +431,8 @@ Add profile... Add session... Add client... - + Show statistics + Как установить RDP 8.1 на Windows 7 / Server 2008 R2 Как создать пользовательскую тему и оттенок? diff --git a/Source/NETworkManager/ViewModels/DNSLookupSettingsViewModel.cs b/Source/NETworkManager/ViewModels/DNSLookupSettingsViewModel.cs index 20cb1b1455..52f84d15f3 100644 --- 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 index 5438d2a5ef..c61efb560b 100644 --- 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 } } \ No newline at end of file diff --git a/Source/NETworkManager/ViewModels/HTTPHeadersSettingsViewModel.cs b/Source/NETworkManager/ViewModels/HTTPHeadersSettingsViewModel.cs index f7ec72c9a1..56bf3268a8 100644 --- 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 index c0bf784fe4..f8df077c18 100644 --- 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 } } \ No newline at end of file diff --git a/Source/NETworkManager/ViewModels/IPScannerSettingsViewModel.cs b/Source/NETworkManager/ViewModels/IPScannerSettingsViewModel.cs index 3273034f2d..2103691783 100644 --- 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 index 498843a80b..5a89e69da5 100644 --- 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 } diff --git a/Source/NETworkManager/ViewModels/PingSettingsViewModel.cs b/Source/NETworkManager/ViewModels/PingSettingsViewModel.cs index 5c725f6003..95efe1cfbe 100644 --- a/Source/NETworkManager/ViewModels/PingSettingsViewModel.cs +++ b/Source/NETworkManager/ViewModels/PingSettingsViewModel.cs @@ -157,6 +157,23 @@ public bool ResolveHostnamePreferIPv6 OnPropertyChanged(); } } + + private bool _showStatistics; + public bool ShowStatistics + { + get { return _showStatistics; } + set + { + if (value == _showStatistics) + return; + + if (!_isLoading) + SettingsManager.Current.Ping_ShowStatistics = value; + + _showStatistics = value; + OnPropertyChanged(); + } + } #endregion #region Contructor, load settings @@ -181,6 +198,8 @@ private void LoadSettings() ResolveHostnamePreferIPv4 = true; else ResolveHostnamePreferIPv6 = true; + + ShowStatistics = SettingsManager.Current.Ping_ShowStatistics; } #endregion } diff --git a/Source/NETworkManager/ViewModels/PingViewModel.cs b/Source/NETworkManager/ViewModels/PingViewModel.cs index a188ae691b..3bf49d392f 100644 --- a/Source/NETworkManager/ViewModels/PingViewModel.cs +++ b/Source/NETworkManager/ViewModels/PingViewModel.cs @@ -270,6 +270,11 @@ public string StatusMessage OnPropertyChanged(); } } + + public bool ShowStatistics + { + get { return SettingsManager.Current.Ping_ShowStatistics; } + } #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_ShowStatistics)) + OnPropertyChanged(nameof(ShowStatistics)); + } #endregion } } \ No newline at end of file diff --git a/Source/NETworkManager/ViewModels/PortScannerSettingsViewModel.cs b/Source/NETworkManager/ViewModels/PortScannerSettingsViewModel.cs index 89daf7b687..cfc5432829 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 _showStatistics; + public bool ShowStatistics + { + get { return _showStatistics; } + set + { + if (value == _showStatistics) + return; + + if (!_isLoading) + SettingsManager.Current.PortScanner_ShowStatistics = value; + + _showStatistics = value; + OnPropertyChanged(); + } + } #endregion #region Constructor, load settings @@ -109,6 +126,8 @@ private void LoadSettings() ResolveHostnamePreferIPv4 = true; else ResolveHostnamePreferIPv6 = true; + + ShowStatistics = SettingsManager.Current.PortScanner_ShowStatistics; } #endregion } diff --git a/Source/NETworkManager/ViewModels/PortScannerViewModel.cs b/Source/NETworkManager/ViewModels/PortScannerViewModel.cs index 8260182704..7548c657f2 100644 --- a/Source/NETworkManager/ViewModels/PortScannerViewModel.cs +++ b/Source/NETworkManager/ViewModels/PortScannerViewModel.cs @@ -276,6 +276,11 @@ public string StatusMessage OnPropertyChanged(); } } + + public bool ShowStatistics + { + get { return SettingsManager.Current.PortScanner_ShowStatistics; } + } #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_ShowStatistics)) + OnPropertyChanged(nameof(ShowStatistics)); + } + #endregion } } \ No newline at end of file diff --git a/Source/NETworkManager/ViewModels/SNMPSettingsViewModel.cs b/Source/NETworkManager/ViewModels/SNMPSettingsViewModel.cs index bd2d11ccd6..4333c0b3e4 100644 --- a/Source/NETworkManager/ViewModels/SNMPSettingsViewModel.cs +++ b/Source/NETworkManager/ViewModels/SNMPSettingsViewModel.cs @@ -94,6 +94,23 @@ public bool ResolveHostnamePreferIPv6 OnPropertyChanged(); } } + + private bool _showStatistics; + public bool ShowStatistics + { + get { return _showStatistics; } + set + { + if (value == _showStatistics) + return; + + if (!_isLoading) + SettingsManager.Current.SNMP_ShowStatistics = value; + + _showStatistics = value; + OnPropertyChanged(); + } + } #endregion #region Contructor, load settings @@ -115,6 +132,8 @@ private void LoadSettings() ResolveHostnamePreferIPv4 = true; else ResolveHostnamePreferIPv6 = true; + + ShowStatistics = SettingsManager.Current.SNMP_ShowStatistics; } #endregion } diff --git a/Source/NETworkManager/ViewModels/SNMPViewModel.cs b/Source/NETworkManager/ViewModels/SNMPViewModel.cs index 6fe8c9ac4c..76d8ca42fb 100644 --- a/Source/NETworkManager/ViewModels/SNMPViewModel.cs +++ b/Source/NETworkManager/ViewModels/SNMPViewModel.cs @@ -381,6 +381,11 @@ public bool ExpandStatistics OnPropertyChanged(); } } + + public bool ShowStatistics + { + get { return SettingsManager.Current.SNMP_ShowStatistics; } + } #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_ShowStatistics)) + OnPropertyChanged(nameof(ShowStatistics)); + } #endregion } } \ No newline at end of file diff --git a/Source/NETworkManager/ViewModels/TracerouteSettingsViewModel.cs b/Source/NETworkManager/ViewModels/TracerouteSettingsViewModel.cs index ba2ef0f507..966659d9bc 100644 --- a/Source/NETworkManager/ViewModels/TracerouteSettingsViewModel.cs +++ b/Source/NETworkManager/ViewModels/TracerouteSettingsViewModel.cs @@ -106,6 +106,23 @@ public bool ResolveHostnamePreferIPv6 OnPropertyChanged(); } } + + private bool _showStatistics; + public bool ShowStatistics + { + get { return _showStatistics; } + set + { + if (value == _showStatistics) + return; + + if (!_isLoading) + SettingsManager.Current.Traceroute_ShowStatistics = value; + + _showStatistics = value; + OnPropertyChanged(); + } + } #endregion #region Constructor, load settings @@ -127,6 +144,8 @@ private void LoadSettings() ResolveHostnamePreferIPv4 = true; else ResolveHostnamePreferIPv6 = true; + + ShowStatistics = SettingsManager.Current.Traceroute_ShowStatistics; } #endregion } diff --git a/Source/NETworkManager/ViewModels/TracerouteViewModel.cs b/Source/NETworkManager/ViewModels/TracerouteViewModel.cs index 4a41d08280..1c586d6eb9 100644 --- a/Source/NETworkManager/ViewModels/TracerouteViewModel.cs +++ b/Source/NETworkManager/ViewModels/TracerouteViewModel.cs @@ -218,6 +218,11 @@ public int Hops OnPropertyChanged(); } } + + public bool ShowStatistics + { + get { return SettingsManager.Current.Traceroute_ShowStatistics; } + } #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_ShowStatistics)) + OnPropertyChanged(nameof(ShowStatistics)); + } #endregion } } \ No newline at end of file diff --git a/Source/NETworkManager/Views/DNSLookupSettingsView.xaml b/Source/NETworkManager/Views/DNSLookupSettingsView.xaml index a22a5a953a..c7695f69a4 100644 --- a/Source/NETworkManager/Views/DNSLookupSettingsView.xaml +++ b/Source/NETworkManager/Views/DNSLookupSettingsView.xaml @@ -68,6 +68,8 @@ - + + + diff --git a/Source/NETworkManager/Views/DNSLookupView.xaml b/Source/NETworkManager/Views/DNSLookupView.xaml index 30f83f66a8..68945f2e77 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"> + @@ -109,7 +109,7 @@ - + - + diff --git a/Source/NETworkManager/Views/TracerouteSettingsView.xaml b/Source/NETworkManager/Views/TracerouteSettingsView.xaml index 2c90847d9f..2823af476f 100644 --- a/Source/NETworkManager/Views/TracerouteSettingsView.xaml +++ b/Source/NETworkManager/Views/TracerouteSettingsView.xaml @@ -17,7 +17,9 @@ - - + + + + diff --git a/Source/NETworkManager/Views/TracerouteView.xaml b/Source/NETworkManager/Views/TracerouteView.xaml index 97a2f682ce..70d24ee4b2 100644 --- a/Source/NETworkManager/Views/TracerouteView.xaml +++ b/Source/NETworkManager/Views/TracerouteView.xaml @@ -13,7 +13,8 @@ mc:Ignorable="d"> - + + @@ -112,7 +113,7 @@ - +