Skip to content

Commit 4ea021a

Browse files
BornToBeRootBornToBeRoot
committed
Revert "Ping replaced with PingMonitor"
This reverts commit cdde11d.
1 parent cdde11d commit 4ea021a

16 files changed

Lines changed: 487 additions & 478 deletions

‎Source/NETworkManager/ApplicationViewManager.cs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,8 @@ public static string GetTranslatedNameByName(Name name)
3434
return Resources.Localization.Strings.IPScanner;
3535
case Name.PortScanner:
3636
return Resources.Localization.Strings.PortScanner;
37-
case Name.PingMonitor:
38-
return Resources.Localization.Strings.PingMonitor;
37+
case Name.Ping:
38+
return Resources.Localization.Strings.Ping;
3939
case Name.Traceroute:
4040
return Resources.Localization.Strings.Traceroute;
4141
case Name.DNSLookup:
@@ -92,7 +92,7 @@ public static Canvas GetIconByName(Name name)
9292
case Name.PortScanner:
9393
canvas.Children.Add(new PackIconModern { Kind = PackIconModernKind.NetworkPort });
9494
break;
95-
case Name.PingMonitor:
95+
case Name.Ping:
9696
canvas.Children.Add(new PackIconMaterial { Kind = PackIconMaterialKind.LanConnect });
9797
break;
9898
case Name.Traceroute:
@@ -156,7 +156,7 @@ public enum Name
156156
WiFi,
157157
IPScanner,
158158
PortScanner,
159-
PingMonitor,
159+
Ping,
160160
Traceroute,
161161
DNSLookup,
162162
RemoteDesktop,

‎Source/NETworkManager/Controls/DragablzTabHostWindow.xaml.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ private void CloseItemAction(ItemActionCallbackArgs<TabablzControl> args)
9595
case ApplicationViewManager.Name.PortScanner:
9696
((PortScannerView)((DragablzTabItem)args.DragablzItem.Content).View).CloseTab();
9797
break;
98-
case ApplicationViewManager.Name.PingMonitor:
98+
case ApplicationViewManager.Name.Ping:
9999
((PingView)((DragablzTabItem)args.DragablzItem.Content).View).CloseTab();
100100
break;
101101
case ApplicationViewManager.Name.Traceroute:

‎Source/NETworkManager/MainWindow.xaml.cs‎

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
using NETworkManager.ViewModels;
2424
using NETworkManager.Models.EventSystem;
2525
using ContextMenu = System.Windows.Controls.ContextMenu;
26+
using DnsClient;
2627

2728
namespace NETworkManager
2829
{
@@ -472,7 +473,7 @@ private async void MetroWindowMain_Closing(object sender, CancelEventArgs e)
472473
private WiFiView _wiFiView;
473474
private IPScannerHostView _ipScannerHostView;
474475
private PortScannerHostView _portScannerHostView;
475-
private PingMonitorView _pingMonitorView;
476+
private PingHostView _pingHostView;
476477
private TracerouteHostView _tracerouteHostView;
477478
private DNSLookupHostView _dnsLookupHostView;
478479
private RemoteDesktopHostView _remoteDesktopHostView;
@@ -559,13 +560,13 @@ private void ChangeApplicationView(ApplicationViewManager.Name name, bool refres
559560

560561
ContentControlApplication.Content = _portScannerHostView;
561562
break;
562-
case ApplicationViewManager.Name.PingMonitor:
563-
if (_pingMonitorView == null)
564-
_pingMonitorView = new PingMonitorView();
563+
case ApplicationViewManager.Name.Ping:
564+
if (_pingHostView == null)
565+
_pingHostView = new PingHostView();
565566
else
566-
_pingMonitorView.OnViewVisible();
567+
_pingHostView.OnViewVisible();
567568

568-
ContentControlApplication.Content = _pingMonitorView;
569+
ContentControlApplication.Content = _pingHostView;
569570
break;
570571
case ApplicationViewManager.Name.Traceroute:
571572
if (_tracerouteHostView == null)
@@ -733,8 +734,8 @@ private void EventSystem_RedirectProfileToApplicationEvent(object sender, EventA
733734
case ApplicationViewManager.Name.PortScanner:
734735
_portScannerHostView.AddTab(profile.Profile);
735736
break;
736-
case ApplicationViewManager.Name.PingMonitor:
737-
//_pingMonitorView.AddTab(profile.Profile);
737+
case ApplicationViewManager.Name.Ping:
738+
_pingHostView.AddTab(profile.Profile);
738739
break;
739740
case ApplicationViewManager.Name.Traceroute:
740741
_tracerouteHostView.AddTab(profile.Profile);
@@ -789,8 +790,8 @@ private void EventSystem_RedirectDataToApplicationEvent(object sender, EventArgs
789790
case ApplicationViewManager.Name.PortScanner:
790791
_portScannerHostView.AddTab(data.Args);
791792
break;
792-
case ApplicationViewManager.Name.PingMonitor:
793-
// _pingMonitorView.AddTab(data.Args);
793+
case ApplicationViewManager.Name.Ping:
794+
_pingHostView.AddTab(data.Args);
794795
break;
795796
case ApplicationViewManager.Name.Traceroute:
796797
_tracerouteHostView.AddTab(data.Args);

‎Source/NETworkManager/Models/Documentation/DocumentationManager.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ public static DocumentationIdentifier GetIdentifierByAppliactionName(Application
8787
return DocumentationIdentifier.ApplicationIpScanner;
8888
case ApplicationViewManager.Name.PortScanner:
8989
return DocumentationIdentifier.ApplicationPortScanner;
90-
case ApplicationViewManager.Name.PingMonitor:
90+
case ApplicationViewManager.Name.Ping:
9191
return DocumentationIdentifier.ApplicationPing;
9292
case ApplicationViewManager.Name.Traceroute:
9393
return DocumentationIdentifier.ApplicationTraceroute;

‎Source/NETworkManager/Models/Export/ExportManager.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -436,7 +436,7 @@ public static void CreateXML(IEnumerable<PingInfo> collection, string filePath)
436436
{
437437
var document = new XDocument(DefaultXDeclaration,
438438

439-
new XElement(ApplicationViewManager.Name.PingMonitor.ToString(),
439+
new XElement(ApplicationViewManager.Name.Ping.ToString(),
440440
new XElement(nameof(PingInfo) + "s",
441441

442442
from info in collection

‎Source/NETworkManager/NETworkManager.csproj‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -268,7 +268,6 @@
268268
<Compile Include="Validators\HttpAndHttpsUriValidator.cs" />
269269
<Compile Include="Validators\IPv4IPv6SubnetValidator.cs" />
270270
<Compile Include="ViewModels\CustomCommandViewModel.cs" />
271-
<Compile Include="ViewModels\PingMonitorViewModel.cs" />
272271
<Compile Include="ViewModels\WiFiViewModel.cs" />
273272
<Compile Include="ViewModels\FirstRunViewModel.cs" />
274273
<Compile Include="Models\Settings\IProfileManager.cs" />
@@ -301,6 +300,7 @@
301300
<Compile Include="ViewModels\ProfileViewModel.cs" />
302301
<Compile Include="ViewModels\TracerouteHostViewModel.cs" />
303302
<Compile Include="ViewModels\PuTTYHostViewModel.cs" />
303+
<Compile Include="ViewModels\PingHostViewModel.cs" />
304304
<Compile Include="ViewModels\SNMPViewModel.cs" />
305305
<Compile Include="ViewModels\HTTPHeadersViewModel.cs" />
306306
<Compile Include="ViewModels\ARPTableViewModel.cs" />
@@ -340,9 +340,6 @@
340340
<Compile Include="Views\CustomCommandDialog.xaml.cs">
341341
<DependentUpon>CustomCommandDialog.xaml</DependentUpon>
342342
</Compile>
343-
<Compile Include="Views\PingMonitorView.xaml.cs">
344-
<DependentUpon>PingMonitorView.xaml</DependentUpon>
345-
</Compile>
346343
<Compile Include="Views\WiFiView.xaml.cs">
347344
<DependentUpon>WiFiView.xaml</DependentUpon>
348345
</Compile>
@@ -430,6 +427,9 @@
430427
<Compile Include="Views\PuTTYHostView.xaml.cs">
431428
<DependentUpon>PuTTYHostView.xaml</DependentUpon>
432429
</Compile>
430+
<Compile Include="Views\PingHostView.xaml.cs">
431+
<DependentUpon>PingHostView.xaml</DependentUpon>
432+
</Compile>
433433
<Compile Include="Views\PingSettingsView.xaml.cs">
434434
<DependentUpon>PingSettingsView.xaml</DependentUpon>
435435
</Compile>
@@ -689,10 +689,6 @@
689689
<Generator>MSBuild:Compile</Generator>
690690
<SubType>Designer</SubType>
691691
</Page>
692-
<Page Include="Views\PingMonitorView.xaml">
693-
<Generator>MSBuild:Compile</Generator>
694-
<SubType>Designer</SubType>
695-
</Page>
696692
<Page Include="Views\WiFiView.xaml">
697693
<Generator>MSBuild:Compile</Generator>
698694
<SubType>Designer</SubType>
@@ -809,6 +805,10 @@
809805
<Generator>MSBuild:Compile</Generator>
810806
<SubType>Designer</SubType>
811807
</Page>
808+
<Page Include="Views\PingHostView.xaml">
809+
<Generator>MSBuild:Compile</Generator>
810+
<SubType>Designer</SubType>
811+
</Page>
812812
<Page Include="Views\PingSettingsView.xaml">
813813
<Generator>MSBuild:Compile</Generator>
814814
<SubType>Designer</SubType>

‎Source/NETworkManager/ProfileViewManager.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ public static class ProfileViewManager
1515
new ProfileViewInfo(Name.NetworkInterface, ApplicationViewManager.GetIconByName(ApplicationViewManager.Name.NetworkInterface)),
1616
new ProfileViewInfo(Name.IPScanner, ApplicationViewManager.GetIconByName(ApplicationViewManager.Name.IPScanner)),
1717
new ProfileViewInfo(Name.PortScanner,ApplicationViewManager.GetIconByName(ApplicationViewManager.Name.PortScanner)),
18-
new ProfileViewInfo(Name.Ping, ApplicationViewManager.GetIconByName(ApplicationViewManager.Name.PingMonitor)),
18+
new ProfileViewInfo(Name.Ping, ApplicationViewManager.GetIconByName(ApplicationViewManager.Name.Ping)),
1919
new ProfileViewInfo(Name.Traceroute, ApplicationViewManager.GetIconByName(ApplicationViewManager.Name.Traceroute)),
2020
new ProfileViewInfo(Name.DNSLookup, ApplicationViewManager.GetIconByName(ApplicationViewManager.Name.DNSLookup)),
2121
new ProfileViewInfo(Name.RemoteDesktop, ApplicationViewManager.GetIconByName(ApplicationViewManager.Name.RemoteDesktop)),

‎Source/NETworkManager/Resources/Localization/Strings.Designer.cs‎

Lines changed: 0 additions & 9 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Source/NETworkManager/Resources/Localization/Strings.resx‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2453,7 +2453,4 @@ URL: https://github.com/BornToBeRoot/NETworkManager/issues/new/choose</value>
24532453
<data name="ShowErrorMessage" xml:space="preserve">
24542454
<value>Show error message</value>
24552455
</data>
2456-
<data name="PingMonitor" xml:space="preserve">
2457-
<value>Ping Monitor</value>
2458-
</data>
24592456
</root>

‎Source/NETworkManager/SettingsViewManager.cs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ public static class SettingsViewManager
2424
new SettingsViewInfo(Name.Dashboard, ApplicationViewManager.GetIconByName(ApplicationViewManager.Name.Dashboard), Group.Applications),
2525
new SettingsViewInfo(Name.IPScanner, ApplicationViewManager.GetIconByName(ApplicationViewManager.Name.IPScanner), Group.Applications),
2626
new SettingsViewInfo(Name.PortScanner,ApplicationViewManager.GetIconByName(ApplicationViewManager.Name.PortScanner), Group.Applications),
27-
new SettingsViewInfo(Name.PingMonitor, ApplicationViewManager.GetIconByName(ApplicationViewManager.Name.PingMonitor), Group.Applications),
27+
new SettingsViewInfo(Name.Ping, ApplicationViewManager.GetIconByName(ApplicationViewManager.Name.Ping), Group.Applications),
2828
new SettingsViewInfo(Name.Traceroute, ApplicationViewManager.GetIconByName(ApplicationViewManager.Name.Traceroute), Group.Applications),
2929
new SettingsViewInfo(Name.DNSLookup, ApplicationViewManager.GetIconByName(ApplicationViewManager.Name.DNSLookup), Group.Applications ),
3030
new SettingsViewInfo(Name.RemoteDesktop, ApplicationViewManager.GetIconByName(ApplicationViewManager.Name.RemoteDesktop), Group.Applications),
@@ -67,8 +67,8 @@ public static string TranslateName(Name name)
6767
return Resources.Localization.Strings.IPScanner;
6868
case Name.PortScanner:
6969
return Resources.Localization.Strings.PortScanner;
70-
case Name.PingMonitor:
71-
return Resources.Localization.Strings.PingMonitor;
70+
case Name.Ping:
71+
return Resources.Localization.Strings.Ping;
7272
case Name.Traceroute:
7373
return Resources.Localization.Strings.Traceroute;
7474
case Name.DNSLookup:
@@ -122,7 +122,7 @@ public enum Name
122122
Dashboard,
123123
IPScanner,
124124
PortScanner,
125-
PingMonitor,
125+
Ping,
126126
Traceroute,
127127
DNSLookup,
128128
RemoteDesktop,

0 commit comments

Comments
 (0)