From bd300d9c10139886d048bbf0e9c8a470463e1915 Mon Sep 17 00:00:00 2001 From: Tim Young Date: Tue, 6 Mar 2018 14:34:29 -0600 Subject: [PATCH] Shape editor has name. & put named shapes into line of sight puzzle --- .../Resources/Level5_LineOfSight.enbx | 171 +++++++++++++++++- .../Resources/languages/edustrings.resx | 4 + EduNetworkBuilder/ShapeEditor.Designer.cs | 152 +++++++++------- EduNetworkBuilder/ShapeEditor.cs | 5 + 4 files changed, 265 insertions(+), 67 deletions(-) diff --git a/EduNetworkBuilder/Resources/Level5_LineOfSight.enbx b/EduNetworkBuilder/Resources/Level5_LineOfSight.enbx index 5693d31..37ef953 100644 --- a/EduNetworkBuilder/Resources/Level5_LineOfSight.enbx +++ b/EduNetworkBuilder/Resources/Level5_LineOfSight.enbx @@ -13,7 +13,7 @@ To see the problem, try to ping google and the server from pc1. Then, move the host 5 7.5 - 343 + 345 hints True False @@ -43,6 +43,8 @@ To see the problem, try to ping google and the server from pc1. Then, move the lo 176 False + + lo0 @@ -67,6 +69,8 @@ To see the problem, try to ping google and the server from pc1. Then, move the wan 179 False + + wan0 @@ -91,6 +95,8 @@ To see the problem, try to ping google and the server from pc1. Then, move the eth 177 False + + eth0 @@ -115,6 +121,8 @@ To see the problem, try to ping google and the server from pc1. Then, move the eth 178 False + + eth1 @@ -154,6 +162,8 @@ To see the problem, try to ping google and the server from pc1. Then, move the lo 191 False + + lo0 @@ -178,6 +188,8 @@ To see the problem, try to ping google and the server from pc1. Then, move the eth 192 False + + eth0 @@ -217,6 +229,8 @@ To see the problem, try to ping google and the server from pc1. Then, move the lo 133 False + + lo0 @@ -241,6 +255,8 @@ To see the problem, try to ping google and the server from pc1. Then, move the management_interface 134 False + + management_interface0 @@ -265,6 +281,8 @@ To see the problem, try to ping google and the server from pc1. Then, move the port 135 False + + port1 @@ -289,6 +307,8 @@ To see the problem, try to ping google and the server from pc1. Then, move the port 136 False + + port2 @@ -313,6 +333,8 @@ To see the problem, try to ping google and the server from pc1. Then, move the port 137 False + + port3 @@ -337,6 +359,8 @@ To see the problem, try to ping google and the server from pc1. Then, move the port 138 False + + port4 @@ -361,6 +385,8 @@ To see the problem, try to ping google and the server from pc1. Then, move the port 139 False + + port5 @@ -385,6 +411,8 @@ To see the problem, try to ping google and the server from pc1. Then, move the port 140 False + + port6 @@ -409,6 +437,8 @@ To see the problem, try to ping google and the server from pc1. Then, move the port 141 False + + port7 @@ -448,6 +478,8 @@ To see the problem, try to ping google and the server from pc1. Then, move the lo 143 False + + lo0 @@ -472,6 +504,8 @@ To see the problem, try to ping google and the server from pc1. Then, move the management_interface 144 False + + management_interface0 @@ -496,6 +530,8 @@ To see the problem, try to ping google and the server from pc1. Then, move the port 145 False + + port1 @@ -520,6 +556,8 @@ To see the problem, try to ping google and the server from pc1. Then, move the port 146 False + + port2 @@ -544,6 +582,8 @@ To see the problem, try to ping google and the server from pc1. Then, move the port 147 False + + port3 @@ -568,6 +608,8 @@ To see the problem, try to ping google and the server from pc1. Then, move the port 148 False + + port4 @@ -592,6 +634,8 @@ To see the problem, try to ping google and the server from pc1. Then, move the port 149 False + + port5 @@ -616,6 +660,8 @@ To see the problem, try to ping google and the server from pc1. Then, move the port 150 False + + port6 @@ -640,6 +686,8 @@ To see the problem, try to ping google and the server from pc1. Then, move the port 151 False + + port7 @@ -679,6 +727,8 @@ To see the problem, try to ping google and the server from pc1. Then, move the lo 284 False + + lo0 @@ -703,6 +753,8 @@ To see the problem, try to ping google and the server from pc1. Then, move the management_interface 285 False + + management_interface0 @@ -727,6 +779,8 @@ To see the problem, try to ping google and the server from pc1. Then, move the port 286 False + + port1 @@ -751,6 +805,8 @@ To see the problem, try to ping google and the server from pc1. Then, move the port 287 False + + port2 @@ -775,6 +831,8 @@ To see the problem, try to ping google and the server from pc1. Then, move the port 288 False + + port3 @@ -799,6 +857,8 @@ To see the problem, try to ping google and the server from pc1. Then, move the port 289 False + + port4 @@ -823,6 +883,8 @@ To see the problem, try to ping google and the server from pc1. Then, move the port 290 False + + port5 @@ -847,6 +909,8 @@ To see the problem, try to ping google and the server from pc1. Then, move the port 291 False + + port6 @@ -871,6 +935,8 @@ To see the problem, try to ping google and the server from pc1. Then, move the port 292 False + + port7 @@ -910,6 +976,8 @@ To see the problem, try to ping google and the server from pc1. Then, move the lo 110 False + + lo0 @@ -934,6 +1002,8 @@ To see the problem, try to ping google and the server from pc1. Then, move the eth 111 False + + eth0 @@ -973,6 +1043,8 @@ To see the problem, try to ping google and the server from pc1. Then, move the lo 113 False + + lo0 @@ -997,6 +1069,8 @@ To see the problem, try to ping google and the server from pc1. Then, move the eth 114 False + + eth0 @@ -1036,6 +1110,8 @@ To see the problem, try to ping google and the server from pc1. Then, move the lo 116 False + + lo0 @@ -1060,6 +1136,8 @@ To see the problem, try to ping google and the server from pc1. Then, move the eth 117 False + + eth0 @@ -1099,6 +1177,8 @@ To see the problem, try to ping google and the server from pc1. Then, move the lo 119 False + + lo0 @@ -1123,6 +1203,8 @@ To see the problem, try to ping google and the server from pc1. Then, move the eth 120 False + + eth0 @@ -1162,6 +1244,8 @@ To see the problem, try to ping google and the server from pc1. Then, move the lo 183 False + + lo0 @@ -1186,6 +1270,8 @@ To see the problem, try to ping google and the server from pc1. Then, move the eth 184 False + + eth0 @@ -1210,6 +1296,8 @@ To see the problem, try to ping google and the server from pc1. Then, move the eth 185 False + + eth1 @@ -1249,6 +1337,8 @@ To see the problem, try to ping google and the server from pc1. Then, move the lo 187 False + + lo0 @@ -1273,6 +1363,8 @@ To see the problem, try to ping google and the server from pc1. Then, move the eth 188 False + + eth0 @@ -1297,6 +1389,8 @@ To see the problem, try to ping google and the server from pc1. Then, move the eth 189 False + + eth1 @@ -1342,6 +1436,8 @@ To see the problem, try to ping google and the server from pc1. Then, move the lo 303 False + + lo0 @@ -1366,6 +1462,8 @@ To see the problem, try to ping google and the server from pc1. Then, move the eth 304 False + + eth0 @@ -1405,6 +1503,8 @@ To see the problem, try to ping google and the server from pc1. Then, move the lo 101 False + + lo0 @@ -1429,6 +1529,8 @@ To see the problem, try to ping google and the server from pc1. Then, move the eth 102 False + + eth0 @@ -1468,6 +1570,8 @@ To see the problem, try to ping google and the server from pc1. Then, move the lo 104 False + + lo0 @@ -1492,6 +1596,8 @@ To see the problem, try to ping google and the server from pc1. Then, move the eth 105 False + + eth0 @@ -1531,6 +1637,8 @@ To see the problem, try to ping google and the server from pc1. Then, move the lo 107 False + + lo0 @@ -1555,6 +1663,8 @@ To see the problem, try to ping google and the server from pc1. Then, move the eth 108 False + + eth0 @@ -1594,6 +1704,8 @@ To see the problem, try to ping google and the server from pc1. Then, move the lo 226 False + + lo0 @@ -1618,6 +1730,8 @@ To see the problem, try to ping google and the server from pc1. Then, move the eth 227 False + + eth0 @@ -1657,6 +1771,8 @@ To see the problem, try to ping google and the server from pc1. Then, move the lo 229 False + + lo0 @@ -1681,6 +1797,8 @@ To see the problem, try to ping google and the server from pc1. Then, move the eth 230 False + + eth0 @@ -1720,6 +1838,8 @@ To see the problem, try to ping google and the server from pc1. Then, move the lo 124 False + + lo0 @@ -1744,6 +1864,8 @@ To see the problem, try to ping google and the server from pc1. Then, move the eth 125 False + + eth1 @@ -1939,6 +2061,8 @@ To see the problem, try to ping google and the server from pc1. Then, move the lo 155 False + + lo0 @@ -1989,6 +2113,8 @@ To see the problem, try to ping google and the server from pc1. Then, move the port 157 False + + port2 @@ -2013,6 +2139,8 @@ To see the problem, try to ping google and the server from pc1. Then, move the port 158 False + + port3 @@ -2037,6 +2165,8 @@ To see the problem, try to ping google and the server from pc1. Then, move the port 159 False + + port4 @@ -2061,6 +2191,8 @@ To see the problem, try to ping google and the server from pc1. Then, move the port 160 False + + port5 @@ -2100,6 +2232,8 @@ To see the problem, try to ping google and the server from pc1. Then, move the lo 315 False + + lo0 @@ -2124,6 +2258,8 @@ To see the problem, try to ping google and the server from pc1. Then, move the eth 316 False + + eth0 @@ -2163,6 +2299,8 @@ To see the problem, try to ping google and the server from pc1. Then, move the lo 318 False + + lo0 @@ -2187,6 +2325,8 @@ To see the problem, try to ping google and the server from pc1. Then, move the eth 319 False + + eth0 @@ -2226,6 +2366,8 @@ To see the problem, try to ping google and the server from pc1. Then, move the lo 321 False + + lo0 @@ -2250,6 +2392,8 @@ To see the problem, try to ping google and the server from pc1. Then, move the eth 322 False + + eth0 @@ -2289,6 +2433,8 @@ To see the problem, try to ping google and the server from pc1. Then, move the lo 324 False + + lo0 @@ -2313,6 +2459,8 @@ To see the problem, try to ping google and the server from pc1. Then, move the eth 325 False + + eth0 @@ -2545,7 +2693,7 @@ To see the problem, try to ping google and the server from pc1. Then, move the wireless - 342 + 344 pc1 @@ -2559,114 +2707,133 @@ To see the problem, try to ping google and the server from pc1. Then, move the WirelessRepeater + Grass rectangle 3, 7, 1013, 1004 Green Green + LeftBldg rectangle 20, 170, 250, 700 SaddleBrown SaddleBrown + RightBldg rectangle 650, 170, 250, 700 SaddleBrown SaddleBrown + LB_RWall rectangle 255, 170, 15, 700 Gray Gray + RB_RWall rectangle 650, 170, 15, 700 Gray Gray + LB_TWall rectangle 20, 170, 15, 700 Gray Gray + RB_TWall rectangle 885, 170, 15, 700 Gray Gray + LB_BWall rectangle 20, 870, 250, 15 Gray Gray + RB_BWall rectangle 650, 870, 250, 15 Gray Gray + LB_LWall rectangle 20, 170, 250, 15 Gray Gray + RB_LWall rectangle 650, 170, 250, 15 Gray Gray + CenterCement rectangle 326, 200, 262, 377 Gray Gray + CenterPark rectangle 359, 270, 188, 247 Green Green + LWindow rectangle 260, 500, 5, 100 Blue Blue + R_Window rectangle 655, 500, 5, 100 Blue Blue + LSidewalk rectangle 255, 300, 100, 80 Gray Gray + RSidewalk rectangle 550, 300, 100, 80 Gray Gray + LDoor rectangle 255, 300, 10, 80 SaddleBrown SaddleBrown + RDoor rectangle 655, 300, 10, 80 SaddleBrown diff --git a/EduNetworkBuilder/Resources/languages/edustrings.resx b/EduNetworkBuilder/Resources/languages/edustrings.resx index d4f6c0d..0b68f9e 100644 --- a/EduNetworkBuilder/Resources/languages/edustrings.resx +++ b/EduNetworkBuilder/Resources/languages/edustrings.resx @@ -2101,4 +2101,8 @@ Y SE_Y = Y + + Name + SE_Name = Name + \ No newline at end of file diff --git a/EduNetworkBuilder/ShapeEditor.Designer.cs b/EduNetworkBuilder/ShapeEditor.Designer.cs index 630b458..8afcd3a 100644 --- a/EduNetworkBuilder/ShapeEditor.Designer.cs +++ b/EduNetworkBuilder/ShapeEditor.Designer.cs @@ -40,12 +40,14 @@ this.tbWidth = new System.Windows.Forms.TextBox(); this.tbHeight = new System.Windows.Forms.TextBox(); this.panel1 = new System.Windows.Forms.Panel(); - this.cbFillColor = new System.Windows.Forms.ComboBox(); - this.cbLineColor = new System.Windows.Forms.ComboBox(); - this.lblFill = new System.Windows.Forms.Label(); - this.lblLine = new System.Windows.Forms.Label(); - this.cbShape = new System.Windows.Forms.ComboBox(); this.lblShape = new System.Windows.Forms.Label(); + this.cbShape = new System.Windows.Forms.ComboBox(); + this.lblLine = new System.Windows.Forms.Label(); + this.lblFill = new System.Windows.Forms.Label(); + this.cbLineColor = new System.Windows.Forms.ComboBox(); + this.cbFillColor = new System.Windows.Forms.ComboBox(); + this.lblName = new System.Windows.Forms.Label(); + this.tbName = new System.Windows.Forms.TextBox(); this.panel1.SuspendLayout(); this.SuspendLayout(); // @@ -58,7 +60,7 @@ this.lbShapeList.ItemHeight = 16; this.lbShapeList.Location = new System.Drawing.Point(12, 29); this.lbShapeList.Name = "lbShapeList"; - this.lbShapeList.Size = new System.Drawing.Size(120, 212); + this.lbShapeList.Size = new System.Drawing.Size(166, 276); this.lbShapeList.TabIndex = 0; this.lbShapeList.SelectedIndexChanged += new System.EventHandler(this.lbShapeList_SelectedIndexChanged); this.lbShapeList.MouseDown += new System.Windows.Forms.MouseEventHandler(this.lbShapeList_MouseDown); @@ -76,7 +78,7 @@ // btnDone // this.btnDone.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); - this.btnDone.Location = new System.Drawing.Point(201, 244); + this.btnDone.Location = new System.Drawing.Point(274, 278); this.btnDone.Name = "btnDone"; this.btnDone.Size = new System.Drawing.Size(75, 23); this.btnDone.TabIndex = 2; @@ -86,15 +88,15 @@ // // tbX // - this.tbX.Location = new System.Drawing.Point(96, 47); + this.tbX.Location = new System.Drawing.Point(93, 71); this.tbX.Name = "tbX"; - this.tbX.Size = new System.Drawing.Size(46, 22); + this.tbX.Size = new System.Drawing.Size(64, 22); this.tbX.TabIndex = 3; // // lblX // this.lblX.AutoSize = true; - this.lblX.Location = new System.Drawing.Point(73, 50); + this.lblX.Location = new System.Drawing.Point(70, 74); this.lblX.Name = "lblX"; this.lblX.Size = new System.Drawing.Size(17, 17); this.lblX.TabIndex = 4; @@ -103,7 +105,7 @@ // lblY // this.lblY.AutoSize = true; - this.lblY.Location = new System.Drawing.Point(73, 78); + this.lblY.Location = new System.Drawing.Point(70, 102); this.lblY.Name = "lblY"; this.lblY.Size = new System.Drawing.Size(17, 17); this.lblY.TabIndex = 5; @@ -111,15 +113,15 @@ // // tbY // - this.tbY.Location = new System.Drawing.Point(96, 75); + this.tbY.Location = new System.Drawing.Point(93, 99); this.tbY.Name = "tbY"; - this.tbY.Size = new System.Drawing.Size(47, 22); + this.tbY.Size = new System.Drawing.Size(64, 22); this.tbY.TabIndex = 6; // // lblWidth // this.lblWidth.AutoSize = true; - this.lblWidth.Location = new System.Drawing.Point(46, 106); + this.lblWidth.Location = new System.Drawing.Point(43, 130); this.lblWidth.Name = "lblWidth"; this.lblWidth.Size = new System.Drawing.Size(44, 17); this.lblWidth.TabIndex = 7; @@ -128,7 +130,7 @@ // lblHeight // this.lblHeight.AutoSize = true; - this.lblHeight.Location = new System.Drawing.Point(41, 134); + this.lblHeight.Location = new System.Drawing.Point(38, 158); this.lblHeight.Name = "lblHeight"; this.lblHeight.Size = new System.Drawing.Size(49, 17); this.lblHeight.TabIndex = 8; @@ -136,21 +138,23 @@ // // tbWidth // - this.tbWidth.Location = new System.Drawing.Point(96, 103); + this.tbWidth.Location = new System.Drawing.Point(93, 127); this.tbWidth.Name = "tbWidth"; - this.tbWidth.Size = new System.Drawing.Size(47, 22); + this.tbWidth.Size = new System.Drawing.Size(64, 22); this.tbWidth.TabIndex = 9; // // tbHeight // - this.tbHeight.Location = new System.Drawing.Point(96, 131); + this.tbHeight.Location = new System.Drawing.Point(93, 155); this.tbHeight.Name = "tbHeight"; - this.tbHeight.Size = new System.Drawing.Size(47, 22); + this.tbHeight.Size = new System.Drawing.Size(64, 22); this.tbHeight.TabIndex = 10; // // panel1 // this.panel1.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); + this.panel1.Controls.Add(this.tbName); + this.panel1.Controls.Add(this.lblName); this.panel1.Controls.Add(this.lblShape); this.panel1.Controls.Add(this.cbShape); this.panel1.Controls.Add(this.lblLine); @@ -165,67 +169,83 @@ this.panel1.Controls.Add(this.lblY); this.panel1.Controls.Add(this.lblX); this.panel1.Controls.Add(this.tbX); - this.panel1.Location = new System.Drawing.Point(138, 29); + this.panel1.Location = new System.Drawing.Point(184, 29); this.panel1.Name = "panel1"; - this.panel1.Size = new System.Drawing.Size(146, 212); + this.panel1.Size = new System.Drawing.Size(165, 243); this.panel1.TabIndex = 11; // - // cbFillColor - // - this.cbFillColor.FormattingEnabled = true; - this.cbFillColor.Location = new System.Drawing.Point(47, 159); - this.cbFillColor.Name = "cbFillColor"; - this.cbFillColor.Size = new System.Drawing.Size(96, 24); - this.cbFillColor.TabIndex = 11; - // - // cbLineColor - // - this.cbLineColor.FormattingEnabled = true; - this.cbLineColor.Location = new System.Drawing.Point(47, 184); - this.cbLineColor.Name = "cbLineColor"; - this.cbLineColor.Size = new System.Drawing.Size(96, 24); - this.cbLineColor.TabIndex = 12; - // - // lblFill - // - this.lblFill.AutoSize = true; - this.lblFill.Location = new System.Drawing.Point(16, 162); - this.lblFill.Name = "lblFill"; - this.lblFill.Size = new System.Drawing.Size(25, 17); - this.lblFill.TabIndex = 13; - this.lblFill.Text = "Fill"; - // - // lblLine - // - this.lblLine.AutoSize = true; - this.lblLine.Location = new System.Drawing.Point(6, 187); - this.lblLine.Name = "lblLine"; - this.lblLine.Size = new System.Drawing.Size(35, 17); - this.lblLine.TabIndex = 14; - this.lblLine.Text = "Line"; - // - // cbShape - // - this.cbShape.FormattingEnabled = true; - this.cbShape.Location = new System.Drawing.Point(63, 17); - this.cbShape.Name = "cbShape"; - this.cbShape.Size = new System.Drawing.Size(83, 24); - this.cbShape.TabIndex = 15; - // // lblShape // this.lblShape.AutoSize = true; - this.lblShape.Location = new System.Drawing.Point(8, 20); + this.lblShape.Location = new System.Drawing.Point(5, 44); this.lblShape.Name = "lblShape"; this.lblShape.Size = new System.Drawing.Size(49, 17); this.lblShape.TabIndex = 16; this.lblShape.Text = "Shape"; // + // cbShape + // + this.cbShape.FormattingEnabled = true; + this.cbShape.Location = new System.Drawing.Point(60, 41); + this.cbShape.Name = "cbShape"; + this.cbShape.Size = new System.Drawing.Size(97, 24); + this.cbShape.TabIndex = 15; + // + // lblLine + // + this.lblLine.AutoSize = true; + this.lblLine.Location = new System.Drawing.Point(19, 215); + this.lblLine.Name = "lblLine"; + this.lblLine.Size = new System.Drawing.Size(35, 17); + this.lblLine.TabIndex = 14; + this.lblLine.Text = "Line"; + // + // lblFill + // + this.lblFill.AutoSize = true; + this.lblFill.Location = new System.Drawing.Point(29, 186); + this.lblFill.Name = "lblFill"; + this.lblFill.Size = new System.Drawing.Size(25, 17); + this.lblFill.TabIndex = 13; + this.lblFill.Text = "Fill"; + // + // cbLineColor + // + this.cbLineColor.FormattingEnabled = true; + this.cbLineColor.Location = new System.Drawing.Point(60, 208); + this.cbLineColor.Name = "cbLineColor"; + this.cbLineColor.Size = new System.Drawing.Size(97, 24); + this.cbLineColor.TabIndex = 12; + // + // cbFillColor + // + this.cbFillColor.FormattingEnabled = true; + this.cbFillColor.Location = new System.Drawing.Point(60, 183); + this.cbFillColor.Name = "cbFillColor"; + this.cbFillColor.Size = new System.Drawing.Size(97, 24); + this.cbFillColor.TabIndex = 11; + // + // lblName + // + this.lblName.AutoSize = true; + this.lblName.Location = new System.Drawing.Point(9, 14); + this.lblName.Name = "lblName"; + this.lblName.Size = new System.Drawing.Size(45, 17); + this.lblName.TabIndex = 17; + this.lblName.Text = "Name"; + // + // tbName + // + this.tbName.Location = new System.Drawing.Point(60, 11); + this.tbName.Name = "tbName"; + this.tbName.Size = new System.Drawing.Size(97, 22); + this.tbName.TabIndex = 18; + // // ShapeEditor // this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 16F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(288, 279); + this.ClientSize = new System.Drawing.Size(353, 313); this.Controls.Add(this.panel1); this.Controls.Add(this.btnDone); this.Controls.Add(this.lblShapes); @@ -259,5 +279,7 @@ private System.Windows.Forms.ComboBox cbFillColor; private System.Windows.Forms.Label lblShape; private System.Windows.Forms.ComboBox cbShape; + private System.Windows.Forms.TextBox tbName; + private System.Windows.Forms.Label lblName; } } \ No newline at end of file diff --git a/EduNetworkBuilder/ShapeEditor.cs b/EduNetworkBuilder/ShapeEditor.cs index b4a5c78..1eb8ee4 100644 --- a/EduNetworkBuilder/ShapeEditor.cs +++ b/EduNetworkBuilder/ShapeEditor.cs @@ -57,6 +57,7 @@ namespace EduNetworkBuilder cbFillColor.Leave += DataUpdated; cbLineColor.Leave += DataUpdated; cbShape.Leave += DataUpdated; + tbName.Leave += DataUpdated; FillFormItems(); } @@ -72,6 +73,7 @@ namespace EduNetworkBuilder lblHeight.Text = NB.Translate("SE_Height", OurSettings); lblShape.Text = NB.Translate("SE_Shape", OurSettings); lblShapes.Text = NB.Translate("SE_Shapes", OurSettings); + lblName.Text = NB.Translate("SE_Name", OurSettings); } void FillFormItems(bool SaveIndex = false) @@ -128,6 +130,7 @@ namespace EduNetworkBuilder cbFillColor.Text = ShapeForEditing.FillColor.Name; cbLineColor.Text = ShapeForEditing.LineColor.Name; cbShape.Text = ShapeForEditing.MyShape.ToString(); + tbName.Text = ShapeForEditing.Name; } else { @@ -139,6 +142,7 @@ namespace EduNetworkBuilder cbFillColor.Text = "Empty"; cbLineColor.Text = "Empty"; cbShape.Text = "None"; + tbName.Text = ""; } } } @@ -169,6 +173,7 @@ namespace EduNetworkBuilder ShapeForEditing.FillColor = Color.FromName(cbFillColor.Text); ShapeForEditing.LineColor = Color.FromName(cbLineColor.Text); ShapeForEditing.MyShape = NB.TryParseEnum(cbShape.Text, NetShapeType.rectangle); + ShapeForEditing.Name = tbName.Text; } FillFormItems(true); //Update the listbox }