diff --git a/EduNetworkBuilder/EduNetworkBuilder.csproj b/EduNetworkBuilder/EduNetworkBuilder.csproj index b44d915..1a73c03 100644 --- a/EduNetworkBuilder/EduNetworkBuilder.csproj +++ b/EduNetworkBuilder/EduNetworkBuilder.csproj @@ -413,6 +413,7 @@ + diff --git a/EduNetworkBuilder/NB.cs b/EduNetworkBuilder/NB.cs index ae7af78..6730202 100644 --- a/EduNetworkBuilder/NB.cs +++ b/EduNetworkBuilder/NB.cs @@ -34,7 +34,7 @@ namespace EduNetworkBuilder dhcp_answer, vpn_packet, tun_packet, tracert_request, tracert_reply } public enum ResponseToPacket { none, accept, masq, drop, reject } public enum DebugLevel { none=0, info=1, routing=2, switching=4, natting=8, filtering=16, debug=32 , packet=64, all=127} - public enum NetworkComponentType { none, router, net_switch, net_hub, laptop, pc, server, wap , + public enum NetworkComponentType { none, router, net_switch, net_hub, laptop, pc, server, wap , tree, wrouter, wbridge, wrepeater, link, firewall, ip_phone, printer, copier, microwave, fluorescent, cellphone, tablet } public enum NicType { none, lo, eth, wlan, wan, vpn, tun, management_interface, port, wport } public enum IPAddressType { ip, gw, route, ip_only } diff --git a/EduNetworkBuilder/NetworkBuilder.cs b/EduNetworkBuilder/NetworkBuilder.cs index b4447b7..4823a4e 100644 --- a/EduNetworkBuilder/NetworkBuilder.cs +++ b/EduNetworkBuilder/NetworkBuilder.cs @@ -403,6 +403,7 @@ namespace EduNetworkBuilder BuildButton("btnWRepeater", Properties.Resources.WRepeater, NB.Translate("NB_BuildBtnRepeat")); BuildButton("btnCellphone", Properties.Resources.cellphone, NB.Translate("NB_BuildBtnCell")); BuildButton("btnTablet", Properties.Resources.tablet, NB.Translate("NB_BuildBtnTablet")); + BuildButton("btnTree", Properties.Resources.tree, NB.Translate("NB_BuildBtnTree")); BuildButton("btnLink", Properties.Resources.link, NB.Translate("NB_BuildBtnCable")); BuildButton("btnSelect", Properties.Resources.select, NB.Translate("NB_BuildBtnSelect")); } @@ -1485,9 +1486,12 @@ namespace EduNetworkBuilder case "btnWRepeater": NC = myNetwork.AddItem(NetworkComponentType.wrepeater, CenteredLocation); break; + case "btnTree": + NC = myNetwork.AddItem(NetworkComponentType.tree, CenteredLocation); + break; } - if(NC != null && NB.GetComponentType(NC) == GeneralComponentType.device) + if (NC != null && NB.GetComponentType(NC) == GeneralComponentType.device) { ItemClickedOn = (NetworkDevice)NC; } diff --git a/EduNetworkBuilder/NetworkDevice.cs b/EduNetworkBuilder/NetworkDevice.cs index 75a2ed3..39dc83b 100644 --- a/EduNetworkBuilder/NetworkDevice.cs +++ b/EduNetworkBuilder/NetworkDevice.cs @@ -654,6 +654,9 @@ namespace EduNetworkBuilder case NetworkComponentType.tablet: MyImage = Properties.Resources.tablet; break; + case NetworkComponentType.tree: + MyImage = Properties.Resources.tree; + break; } } diff --git a/EduNetworkBuilder/Properties/Resources.Designer.cs b/EduNetworkBuilder/Properties/Resources.Designer.cs index a52c2dc..1fdf077 100644 --- a/EduNetworkBuilder/Properties/Resources.Designer.cs +++ b/EduNetworkBuilder/Properties/Resources.Designer.cs @@ -1270,6 +1270,16 @@ namespace EduNetworkBuilder.Properties { } } + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap tree { + get { + object obj = ResourceManager.GetObject("tree", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + /// /// Looks up a localized resource of type System.Byte[]. /// diff --git a/EduNetworkBuilder/Properties/Resources.resx b/EduNetworkBuilder/Properties/Resources.resx index bb29031..9018bf3 100644 --- a/EduNetworkBuilder/Properties/Resources.resx +++ b/EduNetworkBuilder/Properties/Resources.resx @@ -505,4 +505,7 @@ ..\Resources\Level0_Frozen.enbx;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + ..\Resources\tree.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + \ No newline at end of file diff --git a/EduNetworkBuilder/Resources/languages/edustrings.resx b/EduNetworkBuilder/Resources/languages/edustrings.resx index e80a9f7..9798125 100644 --- a/EduNetworkBuilder/Resources/languages/edustrings.resx +++ b/EduNetworkBuilder/Resources/languages/edustrings.resx @@ -2029,4 +2029,8 @@ Translate TW_Translate = Translate + + Add a tree to the network to block wireless signals + NB_BuildBtnTree = Add a tree to the network to block wireless signals + \ No newline at end of file diff --git a/EduNetworkBuilder/Resources/tree.png b/EduNetworkBuilder/Resources/tree.png new file mode 100644 index 0000000..d09d998 Binary files /dev/null and b/EduNetworkBuilder/Resources/tree.png differ