Skip to content

Commit 2779dc4

Browse files
BornToBeRootBornToBeRoot
authored
Add option to Hide/Show statistics (BornToBeRoot#102)
* IP Scanner - Hide statistics via settings * Settings added * Hide statistics via settings added * Hide statistics added * HideStatistics renamed to ShowStatistics
1 parent 4ca02d2 commit 2779dc4

32 files changed

Lines changed: 394 additions & 38 deletions

‎Source/NETworkManager/Models/Settings/SettingsInfo.cs‎

Lines changed: 119 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -625,6 +625,23 @@ public double IPScanner_ProfileWidth
625625
SettingsChanged = true;
626626
}
627627
}
628+
629+
private bool _ipScanner_ShowStatistics = true;
630+
public bool IPScanner_ShowStatistics
631+
{
632+
get { return _ipScanner_ShowStatistics; }
633+
set
634+
{
635+
if (value == _ipScanner_ShowStatistics)
636+
return;
637+
638+
_ipScanner_ShowStatistics = value;
639+
640+
OnPropertyChanged();
641+
642+
SettingsChanged = true;
643+
}
644+
}
628645
#endregion
629646

630647
#region PortScanner
@@ -753,6 +770,23 @@ public double PortScanner_ProfileWidth
753770
SettingsChanged = true;
754771
}
755772
}
773+
774+
private bool _portScanner_ShowStatistics = true;
775+
public bool PortScanner_ShowStatistics
776+
{
777+
get { return _portScanner_ShowStatistics; }
778+
set
779+
{
780+
if (value == _portScanner_ShowStatistics)
781+
return;
782+
783+
_portScanner_ShowStatistics = value;
784+
785+
OnPropertyChanged();
786+
787+
SettingsChanged = true;
788+
}
789+
}
756790
#endregion
757791

758792
#region Ping
@@ -923,6 +957,23 @@ public double Ping_ProfileWidth
923957
SettingsChanged = true;
924958
}
925959
}
960+
961+
private bool _ping_ShowStatistics = true;
962+
public bool Ping_ShowStatistics
963+
{
964+
get { return _ping_ShowStatistics; }
965+
set
966+
{
967+
if (value == _ping_ShowStatistics)
968+
return;
969+
970+
_ping_ShowStatistics = value;
971+
972+
OnPropertyChanged();
973+
974+
SettingsChanged = true;
975+
}
976+
}
926977
#endregion
927978

928979
#region Traceroute
@@ -1054,6 +1105,23 @@ public double Traceroute_ProfileWidth
10541105
SettingsChanged = true;
10551106
}
10561107
}
1108+
1109+
private bool _traceroute_ShowStatistics = true;
1110+
public bool Traceroute_ShowStatistics
1111+
{
1112+
get { return _traceroute_ShowStatistics; }
1113+
set
1114+
{
1115+
if (value == _traceroute_ShowStatistics)
1116+
return;
1117+
1118+
_traceroute_ShowStatistics = value;
1119+
1120+
OnPropertyChanged();
1121+
1122+
SettingsChanged = true;
1123+
}
1124+
}
10571125
#endregion
10581126

10591127
#region DNS Lookup
@@ -1280,6 +1348,23 @@ public bool DNSLookup_ExpandStatistics
12801348
SettingsChanged = true;
12811349
}
12821350
}
1351+
1352+
private bool _dnsLookup_ShowStatistics = true;
1353+
public bool DNSLookup_ShowStatistics
1354+
{
1355+
get { return _dnsLookup_ShowStatistics; }
1356+
set
1357+
{
1358+
if (value == _dnsLookup_ShowStatistics)
1359+
return;
1360+
1361+
_dnsLookup_ShowStatistics = value;
1362+
1363+
OnPropertyChanged();
1364+
1365+
SettingsChanged = true;
1366+
}
1367+
}
12831368
#endregion
12841369

12851370
#region RemoteDesktop
@@ -1962,6 +2047,23 @@ public SNMPv3PrivacyProvider SNMP_PrivacyProvider
19622047
SettingsChanged = true;
19632048
}
19642049
}
2050+
2051+
private bool _snmp_ShowStatistics = true;
2052+
public bool SNMP_ShowStatistics
2053+
{
2054+
get { return _snmp_ShowStatistics; }
2055+
set
2056+
{
2057+
if (value == _snmp_ShowStatistics)
2058+
return;
2059+
2060+
_snmp_ShowStatistics = value;
2061+
2062+
OnPropertyChanged();
2063+
2064+
SettingsChanged = true;
2065+
}
2066+
}
19652067
#endregion
19662068

19672069
#region WakeOnLAN
@@ -2051,6 +2153,23 @@ public bool HTTPHeaders_ExpandStatistics
20512153
SettingsChanged = true;
20522154
}
20532155
}
2156+
2157+
private bool _httpHeaders_ShowStatistics = true;
2158+
public bool HTTPHeaders_ShowStatistics
2159+
{
2160+
get { return _httpHeaders_ShowStatistics; }
2161+
set
2162+
{
2163+
if (value == _httpHeaders_ShowStatistics)
2164+
return;
2165+
2166+
_httpHeaders_ShowStatistics = value;
2167+
2168+
OnPropertyChanged();
2169+
2170+
SettingsChanged = true;
2171+
}
2172+
}
20542173
#endregion
20552174

20562175
#region Subnet Calculator

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -431,6 +431,7 @@
431431
<system:String x:Key="String_ClearFilter">Filter löschen</system:String>
432432
<system:String x:Key="String_AddSessionDots">Sitzung hinzufügen...</system:String>
433433
<system:String x:Key="String_AddClientDots">Client hinzufügen...</system:String>
434+
<system:String x:Key="String_ShowStatistics">Statistiken anzeigen</system:String>
434435

435436
<!-- Documentation title -->
436437
<system:String x:Key="String_DocumentationTitle_00001">Wie installiere ich RDP 8.1 unter Windows 7 / Server 2008 R2?</system:String>

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -431,6 +431,7 @@
431431
<system:String x:Key="String_AddProfileDots">Add profile...</system:String>
432432
<system:String x:Key="String_AddSessionDots">Add session...</system:String>
433433
<system:String x:Key="String_AddClientDots">Add client...</system:String>
434+
<system:String x:Key="String_ShowStatistics">Show statistics</system:String>
434435

435436
<!-- Documentation title -->
436437
<system:String x:Key="String_DocumentationTitle_00001">How to install RDP 8.1 on Windows 7/Server 2008 R2</system:String>

‎Source/NETworkManager/Resources/Localization/Resources.ru-RU.xaml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -431,7 +431,8 @@
431431
<system:String x:Key="String_AddProfileDots">Add profile...</system:String>
432432
<system:String x:Key="String_AddSessionDots">Add session...</system:String>
433433
<system:String x:Key="String_AddClientDots">Add client...</system:String>
434-
434+
<system:String x:Key="String_ShowStatistics">Show statistics</system:String>
435+
435436
<!-- Documentation title -->
436437
<system:String x:Key="String_DocumentationTitle_00001">Как установить RDP 8.1 на Windows 7 / Server 2008 R2</system:String>
437438
<system:String x:Key="String_DocumentationTitle_00002">Как создать пользовательскую тему и оттенок?</system:String>

‎Source/NETworkManager/ViewModels/DNSLookupSettingsViewModel.cs‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -236,6 +236,23 @@ public int Timeout
236236
OnPropertyChanged();
237237
}
238238
}
239+
240+
private bool _showStatistics;
241+
public bool ShowStatistics
242+
{
243+
get { return _showStatistics; }
244+
set
245+
{
246+
if (value == _showStatistics)
247+
return;
248+
249+
if (!_isLoading)
250+
SettingsManager.Current.DNSLookup_ShowStatistics = value;
251+
252+
_showStatistics = value;
253+
OnPropertyChanged();
254+
}
255+
}
239256
#endregion
240257

241258
#region Constructor, load settings
@@ -266,6 +283,7 @@ private void LoadSettings()
266283
TransportType = TransportTypes.First(x => x == SettingsManager.Current.DNSLookup_TransportType);
267284
Attempts = SettingsManager.Current.DNSLookup_Attempts;
268285
Timeout = SettingsManager.Current.DNSLookup_Timeout;
286+
ShowStatistics = SettingsManager.Current.DNSLookup_ShowStatistics;
269287
}
270288
#endregion
271289
}

‎Source/NETworkManager/ViewModels/DNSLookupViewModel.cs‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -200,6 +200,11 @@ public bool ExpandStatistics
200200
OnPropertyChanged();
201201
}
202202
}
203+
204+
public bool ShowStatistics
205+
{
206+
get { return SettingsManager.Current.DNSLookup_ShowStatistics; }
207+
}
203208
#endregion
204209

205210
#region Contructor, load settings
@@ -214,6 +219,9 @@ public DNSLookupViewModel(int tabId, string host)
214219

215220
LoadSettings();
216221

222+
// Detect if settings have changed...
223+
SettingsManager.Current.PropertyChanged += SettingsManager_PropertyChanged;
224+
217225
_isLoading = false;
218226
}
219227

@@ -437,6 +445,12 @@ private void DispatcherTimer_Tick(object sender, EventArgs e)
437445
{
438446
Duration = stopwatch.Elapsed;
439447
}
448+
449+
private void SettingsManager_PropertyChanged(object sender, PropertyChangedEventArgs e)
450+
{
451+
if (e.PropertyName == nameof(SettingsInfo.DNSLookup_ShowStatistics))
452+
OnPropertyChanged(nameof(ShowStatistics));
453+
}
440454
#endregion
441455
}
442456
}

‎Source/NETworkManager/ViewModels/HTTPHeadersSettingsViewModel.cs‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,23 @@ public int Timeout
2424
OnPropertyChanged();
2525
}
2626
}
27+
28+
private bool _showStatistics;
29+
public bool ShowStatistics
30+
{
31+
get { return _showStatistics; }
32+
set
33+
{
34+
if (value == _showStatistics)
35+
return;
36+
37+
if (!_isLoading)
38+
SettingsManager.Current.HTTPHeaders_ShowStatistics = value;
39+
40+
_showStatistics = value;
41+
OnPropertyChanged();
42+
}
43+
}
2744
#endregion
2845

2946
#region Contructor, load settings
@@ -37,6 +54,7 @@ public HTTPHeadersSettingsViewModel()
3754
private void LoadSettings()
3855
{
3956
Timeout = SettingsManager.Current.HTTPHeaders_Timeout;
57+
ShowStatistics = SettingsManager.Current.HTTPHeaders_ShowStatistics;
4058
}
4159
#endregion
4260
}

‎Source/NETworkManager/ViewModels/HTTPHeadersViewModel.cs‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -175,6 +175,10 @@ public bool ExpandStatistics
175175
}
176176
}
177177

178+
public bool ShowStatistics
179+
{
180+
get { return SettingsManager.Current.HTTPHeaders_ShowStatistics; }
181+
}
178182
#endregion
179183

180184
#region Contructor, load settings
@@ -187,6 +191,9 @@ public HTTPHeadersViewModel(int tabId)
187191

188192
LoadSettings();
189193

194+
// Detect if settings have changed...
195+
SettingsManager.Current.PropertyChanged += SettingsManager_PropertyChanged;
196+
190197
_isLoading = false;
191198
}
192199

@@ -292,6 +299,12 @@ private void DispatcherTimer_Tick(object sender, EventArgs e)
292299
{
293300
Duration = stopwatch.Elapsed;
294301
}
302+
303+
private void SettingsManager_PropertyChanged(object sender, PropertyChangedEventArgs e)
304+
{
305+
if (e.PropertyName == nameof(SettingsInfo.HTTPHeaders_ShowStatistics))
306+
OnPropertyChanged(nameof(ShowStatistics));
307+
}
295308
#endregion
296309
}
297310
}

‎Source/NETworkManager/ViewModels/IPScannerSettingsViewModel.cs‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -268,6 +268,23 @@ public bool ResolveMACAddress
268268
OnPropertyChanged();
269269
}
270270
}
271+
272+
private bool _showStatistics;
273+
public bool ShowStatistics
274+
{
275+
get { return _showStatistics; }
276+
set
277+
{
278+
if (value == _showStatistics)
279+
return;
280+
281+
if (!_isLoading)
282+
SettingsManager.Current.IPScanner_ShowStatistics = value;
283+
284+
_showStatistics = value;
285+
OnPropertyChanged();
286+
}
287+
}
271288
#endregion
272289

273290
#region Constructor, load settings
@@ -299,6 +316,7 @@ private void LoadSettings()
299316
DNSAttempts = SettingsManager.Current.IPScanner_DNSAttempts;
300317
DNSTimeout = SettingsManager.Current.IPScanner_DNSTimeout;
301318
ResolveMACAddress = SettingsManager.Current.IPScanner_ResolveMACAddress;
319+
ShowStatistics = SettingsManager.Current.IPScanner_ShowStatistics;
302320
}
303321
#endregion
304322
}

‎Source/NETworkManager/ViewModels/IPScannerViewModel.cs‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -264,6 +264,11 @@ public bool ExpandStatistics
264264
OnPropertyChanged();
265265
}
266266
}
267+
268+
public bool ShowStatistics
269+
{
270+
get { return SettingsManager.Current.IPScanner_ShowStatistics; }
271+
}
267272
#endregion
268273

269274
#region Constructor, load settings, shutdown
@@ -674,6 +679,9 @@ private void SettingsManager_PropertyChanged(object sender, PropertyChangedEvent
674679

675680
if (e.PropertyName == nameof(SettingsInfo.IPScanner_ResolveHostname))
676681
OnPropertyChanged(nameof(ResolveHostname));
682+
683+
if (e.PropertyName == nameof(SettingsInfo.IPScanner_ShowStatistics))
684+
OnPropertyChanged(nameof(ShowStatistics));
677685
}
678686
#endregion
679687
}

0 commit comments

Comments
 (0)