From 9136a0aa74be8a01c25371d3bbe398fe921b48f8 Mon Sep 17 00:00:00 2001 From: Tim Young Date: Wed, 26 Aug 2015 17:10:55 -0700 Subject: [PATCH] Right-clicking microwave and light result in "delete" being the only option --- EduNetworkBuilder/NetworkBuilder.cs | 24 +++++++++++++++--------- EduNetworkBuilder/NetworkDevice.cs | 8 ++++++++ 2 files changed, 23 insertions(+), 9 deletions(-) diff --git a/EduNetworkBuilder/NetworkBuilder.cs b/EduNetworkBuilder/NetworkBuilder.cs index 4ecdec6..4914d67 100644 --- a/EduNetworkBuilder/NetworkBuilder.cs +++ b/EduNetworkBuilder/NetworkBuilder.cs @@ -538,7 +538,7 @@ namespace EduNetworkBuilder pbNetworkView.ContextMenuStrip = new ContextMenuStrip(); } pbNetworkView.ContextMenuStrip.Items.Clear(); - if (ReleasedOn != null) + if (ReleasedOn != null && ReleasedOn.IsNotNetDevice()) { foreach (string tStr in myNetwork.GetIncompleteTestDestinations(ReleasedOn.hostname, true)) { @@ -551,12 +551,15 @@ namespace EduNetworkBuilder pbNetworkView.ContextMenuStrip.Items[index++].Click += pbNetworkView_Arp_Name_Click; } } - pbNetworkView.ContextMenuStrip.Items.Add("Ping [host]"); - pbNetworkView.ContextMenuStrip.Items[index++].Click += pbNetworkView_Ping_Click; - pbNetworkView.ContextMenuStrip.Items.Add("Arp Request [host]"); - pbNetworkView.ContextMenuStrip.Items[index++].Click += pbNetworkView_Arp_Click; - pbNetworkView.ContextMenuStrip.Items.Add("Clear Arp Table"); - pbNetworkView.ContextMenuStrip.Items[index++].Click += pbNetworkView_ArpClear_Click; + if (ReleasedOn != null && ReleasedOn.IsNotNetDevice()) + { + pbNetworkView.ContextMenuStrip.Items.Add("Ping [host]"); + pbNetworkView.ContextMenuStrip.Items[index++].Click += pbNetworkView_Ping_Click; + pbNetworkView.ContextMenuStrip.Items.Add("Arp Request [host]"); + pbNetworkView.ContextMenuStrip.Items[index++].Click += pbNetworkView_Arp_Click; + pbNetworkView.ContextMenuStrip.Items.Add("Clear Arp Table"); + pbNetworkView.ContextMenuStrip.Items[index++].Click += pbNetworkView_ArpClear_Click; + } if (ReleasedOn != null) { if (!myNetwork.ItemIsCritical(ReleasedOn.hostname)) @@ -565,8 +568,11 @@ namespace EduNetworkBuilder pbNetworkView.ContextMenuStrip.Items[index++].Click += pbNetworkView_Delete_Click; } } - pbNetworkView.ContextMenuStrip.Items.Add("Edit"); - pbNetworkView.ContextMenuStrip.Items[index++].Click += pbNetworkView_Edit_Click; + if (ReleasedOn != null && ReleasedOn.IsNotNetDevice()) + { + pbNetworkView.ContextMenuStrip.Items.Add("Edit"); + pbNetworkView.ContextMenuStrip.Items[index++].Click += pbNetworkView_Edit_Click; + } if (ReleasedOn != null) { diff --git a/EduNetworkBuilder/NetworkDevice.cs b/EduNetworkBuilder/NetworkDevice.cs index faa30e6..5962d32 100644 --- a/EduNetworkBuilder/NetworkDevice.cs +++ b/EduNetworkBuilder/NetworkDevice.cs @@ -2164,6 +2164,14 @@ namespace EduNetworkBuilder if (myType == NetworkComponentType.wrouter) return true; return false; } + public bool IsNotNetDevice() + { + if (GetNetType() == NetworkComponentType.fluorescent) + return false; + if (GetNetType() == NetworkComponentType.microwave) + return false; + return true; + } public override void DoOutput(Packet tPacket) {