changeset 60:c283545d2d0b

Re #168: Combine "required" and "optional" equipment boxes * Alter "Unit" form to have a single weapon section
author IBBoard <dev@ibboard.co.uk>
date Sat, 19 Sep 2009 13:57:35 +0000
parents 039b02006a8a
children a0ec03c24cd9
files FrmUnit.cs IBBoard.WarFoundry.GUI.WinForms.csproj
diffstat 2 files changed, 88 insertions(+), 122 deletions(-) [+]
line diff
     1.1 --- a/FrmUnit.cs	Sat Sep 19 13:56:55 2009 +0000
     1.2 +++ b/FrmUnit.cs	Sat Sep 19 13:57:35 2009 +0000
     1.3 @@ -33,13 +33,10 @@
     1.4  		private System.Windows.Forms.Label lblUnitSize;
     1.5  		private System.Windows.Forms.Button bttnAddWeapon;
     1.6  		private System.Windows.Forms.Button bttnRemoveWeapon;
     1.7 +		private System.Windows.Forms.Label lblEquip;
     1.8 +		private System.Windows.Forms.ListBox equipmentList;
     1.9 +		private System.Windows.Forms.Button bttnReplaceWeapon;
    1.10  		private System.Windows.Forms.Button bttnEditWeapon;
    1.11 -		private System.Windows.Forms.Label lblRequiredEquip;
    1.12 -		private System.Windows.Forms.ListBox reqdList;
    1.13 -		private System.Windows.Forms.ListBox optList;
    1.14 -		private System.Windows.Forms.Label lblOptionalEquip;
    1.15 -		private System.Windows.Forms.Button bttnReplaceWeapon;
    1.16 -		private System.Windows.Forms.Button bttnEditReqdWeapon;
    1.17  		private Label lblPoints;
    1.18  		/// <summary>
    1.19  		/// Required designer variable.
    1.20 @@ -137,14 +134,7 @@
    1.21  		{
    1.22  			foreach (UnitEquipmentItem item in unit.GetEquipment())
    1.23  			{
    1.24 -				if (item.IsRequired)
    1.25 -				{
    1.26 -					reqdList.Items.Add(GetEquipmentChoice(item));
    1.27 -				}
    1.28 -				else
    1.29 -				{
    1.30 -					optList.Items.Add(GetEquipmentChoice(item));
    1.31 -				}
    1.32 +				equipmentList.Items.Add(GetEquipmentChoice(item));
    1.33  			}
    1.34  		}
    1.35  
    1.36 @@ -192,15 +182,12 @@
    1.37  			this.tbUnitName = new System.Windows.Forms.TextBox();
    1.38  			this.unitSize = new System.Windows.Forms.NumericUpDown();
    1.39  			this.lblUnitSize = new System.Windows.Forms.Label();
    1.40 -			this.lblRequiredEquip = new System.Windows.Forms.Label();
    1.41 +			this.lblEquip = new System.Windows.Forms.Label();
    1.42  			this.bttnAddWeapon = new System.Windows.Forms.Button();
    1.43  			this.bttnRemoveWeapon = new System.Windows.Forms.Button();
    1.44 -			this.reqdList = new System.Windows.Forms.ListBox();
    1.45 +			this.equipmentList = new System.Windows.Forms.ListBox();
    1.46 +			this.bttnReplaceWeapon = new System.Windows.Forms.Button();
    1.47  			this.bttnEditWeapon = new System.Windows.Forms.Button();
    1.48 -			this.optList = new System.Windows.Forms.ListBox();
    1.49 -			this.lblOptionalEquip = new System.Windows.Forms.Label();
    1.50 -			this.bttnReplaceWeapon = new System.Windows.Forms.Button();
    1.51 -			this.bttnEditReqdWeapon = new System.Windows.Forms.Button();
    1.52  			this.lblPoints = new System.Windows.Forms.Label();
    1.53  			((System.ComponentModel.ISupportInitialize) (this.statsGrid)).BeginInit();
    1.54  			((System.ComponentModel.ISupportInitialize) (this.unitSize)).BeginInit();
    1.55 @@ -265,20 +252,20 @@
    1.56  			this.lblUnitSize.Text = "unit size";
    1.57  			this.lblUnitSize.TextAlign = System.Drawing.ContentAlignment.TopRight;
    1.58  			// 
    1.59 -			// lblRequiredEquip
    1.60 +			// lblEquip
    1.61  			// 
    1.62 -			this.lblRequiredEquip.Location = new System.Drawing.Point(8, 128);
    1.63 -			this.lblRequiredEquip.Name = "lblRequiredEquip";
    1.64 -			this.lblRequiredEquip.Size = new System.Drawing.Size(88, 32);
    1.65 -			this.lblRequiredEquip.TabIndex = 3;
    1.66 -			this.lblRequiredEquip.Text = "reqd equipment";
    1.67 -			this.lblRequiredEquip.TextAlign = System.Drawing.ContentAlignment.TopRight;
    1.68 +			this.lblEquip.Location = new System.Drawing.Point(8, 123);
    1.69 +			this.lblEquip.Name = "lblEquip";
    1.70 +			this.lblEquip.Size = new System.Drawing.Size(88, 32);
    1.71 +			this.lblEquip.TabIndex = 3;
    1.72 +			this.lblEquip.Text = "equipment";
    1.73 +			this.lblEquip.TextAlign = System.Drawing.ContentAlignment.TopRight;
    1.74  			// 
    1.75  			// bttnAddWeapon
    1.76  			// 
    1.77  			this.bttnAddWeapon.Anchor = ((System.Windows.Forms.AnchorStyles) ((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
    1.78  			this.bttnAddWeapon.FlatStyle = System.Windows.Forms.FlatStyle.System;
    1.79 -			this.bttnAddWeapon.Location = new System.Drawing.Point(520, 200);
    1.80 +			this.bttnAddWeapon.Location = new System.Drawing.Point(516, 126);
    1.81  			this.bttnAddWeapon.Name = "bttnAddWeapon";
    1.82  			this.bttnAddWeapon.Size = new System.Drawing.Size(88, 22);
    1.83  			this.bttnAddWeapon.TabIndex = 4;
    1.84 @@ -290,101 +277,67 @@
    1.85  			this.bttnRemoveWeapon.Anchor = ((System.Windows.Forms.AnchorStyles) ((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
    1.86  			this.bttnRemoveWeapon.Enabled = false;
    1.87  			this.bttnRemoveWeapon.FlatStyle = System.Windows.Forms.FlatStyle.System;
    1.88 -			this.bttnRemoveWeapon.Location = new System.Drawing.Point(520, 248);
    1.89 +			this.bttnRemoveWeapon.Location = new System.Drawing.Point(516, 210);
    1.90  			this.bttnRemoveWeapon.Name = "bttnRemoveWeapon";
    1.91  			this.bttnRemoveWeapon.Size = new System.Drawing.Size(88, 22);
    1.92  			this.bttnRemoveWeapon.TabIndex = 5;
    1.93  			this.bttnRemoveWeapon.Text = "remove";
    1.94  			this.bttnRemoveWeapon.Click += new System.EventHandler(this.bttnRemoveWeapon_Click);
    1.95  			// 
    1.96 -			// reqdList
    1.97 +			// equipmentList
    1.98  			// 
    1.99 -			this.reqdList.Anchor = ((System.Windows.Forms.AnchorStyles) (((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
   1.100 +			this.equipmentList.Anchor = ((System.Windows.Forms.AnchorStyles) (((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
   1.101  						| System.Windows.Forms.AnchorStyles.Right)));
   1.102 -			this.reqdList.Location = new System.Drawing.Point(104, 128);
   1.103 -			this.reqdList.Name = "reqdList";
   1.104 -			this.reqdList.Size = new System.Drawing.Size(408, 69);
   1.105 -			this.reqdList.TabIndex = 6;
   1.106 -			this.reqdList.DoubleClick += new System.EventHandler(this.reqdList_DoubleClick);
   1.107 -			this.reqdList.SelectedIndexChanged += new System.EventHandler(this.reqdList_SelectedIndexChanged);
   1.108 +			this.equipmentList.Location = new System.Drawing.Point(102, 126);
   1.109 +			this.equipmentList.Name = "equipmentList";
   1.110 +			this.equipmentList.Size = new System.Drawing.Size(408, 108);
   1.111 +			this.equipmentList.TabIndex = 6;
   1.112 +			this.equipmentList.DoubleClick += new System.EventHandler(this.equipmentList_DoubleClick);
   1.113 +			this.equipmentList.SelectedIndexChanged += new System.EventHandler(this.equipmentList_SelectedIndexChanged);
   1.114 +			// 
   1.115 +			// bttnReplaceWeapon
   1.116 +			// 
   1.117 +			this.bttnReplaceWeapon.Anchor = ((System.Windows.Forms.AnchorStyles) ((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
   1.118 +			this.bttnReplaceWeapon.Enabled = false;
   1.119 +			this.bttnReplaceWeapon.FlatStyle = System.Windows.Forms.FlatStyle.System;
   1.120 +			this.bttnReplaceWeapon.Location = new System.Drawing.Point(516, 182);
   1.121 +			this.bttnReplaceWeapon.Name = "bttnReplaceWeapon";
   1.122 +			this.bttnReplaceWeapon.Size = new System.Drawing.Size(88, 22);
   1.123 +			this.bttnReplaceWeapon.TabIndex = 10;
   1.124 +			this.bttnReplaceWeapon.Text = "replace";
   1.125 +			this.bttnReplaceWeapon.Click += new System.EventHandler(this.bttnReplaceWeapon_Click);
   1.126  			// 
   1.127  			// bttnEditWeapon
   1.128  			// 
   1.129  			this.bttnEditWeapon.Anchor = ((System.Windows.Forms.AnchorStyles) ((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
   1.130  			this.bttnEditWeapon.Enabled = false;
   1.131  			this.bttnEditWeapon.FlatStyle = System.Windows.Forms.FlatStyle.System;
   1.132 -			this.bttnEditWeapon.Location = new System.Drawing.Point(520, 224);
   1.133 +			this.bttnEditWeapon.Location = new System.Drawing.Point(516, 154);
   1.134  			this.bttnEditWeapon.Name = "bttnEditWeapon";
   1.135  			this.bttnEditWeapon.Size = new System.Drawing.Size(88, 22);
   1.136 -			this.bttnEditWeapon.TabIndex = 7;
   1.137 +			this.bttnEditWeapon.TabIndex = 11;
   1.138  			this.bttnEditWeapon.Text = "edit";
   1.139  			this.bttnEditWeapon.Click += new System.EventHandler(this.bttnEditWeapon_Click);
   1.140  			// 
   1.141 -			// optList
   1.142 -			// 
   1.143 -			this.optList.Anchor = ((System.Windows.Forms.AnchorStyles) (((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
   1.144 -						| System.Windows.Forms.AnchorStyles.Right)));
   1.145 -			this.optList.Location = new System.Drawing.Point(104, 200);
   1.146 -			this.optList.Name = "optList";
   1.147 -			this.optList.Size = new System.Drawing.Size(408, 69);
   1.148 -			this.optList.TabIndex = 9;
   1.149 -			this.optList.DoubleClick += new System.EventHandler(this.optList_DoubleClick);
   1.150 -			this.optList.SelectedIndexChanged += new System.EventHandler(this.optList_SelectedIndexChanged);
   1.151 -			// 
   1.152 -			// lblOptionalEquip
   1.153 -			// 
   1.154 -			this.lblOptionalEquip.Location = new System.Drawing.Point(8, 200);
   1.155 -			this.lblOptionalEquip.Name = "lblOptionalEquip";
   1.156 -			this.lblOptionalEquip.Size = new System.Drawing.Size(88, 32);
   1.157 -			this.lblOptionalEquip.TabIndex = 8;
   1.158 -			this.lblOptionalEquip.Text = "opt equipment";
   1.159 -			this.lblOptionalEquip.TextAlign = System.Drawing.ContentAlignment.TopRight;
   1.160 -			// 
   1.161 -			// bttnReplaceWeapon
   1.162 -			// 
   1.163 -			this.bttnReplaceWeapon.Anchor = ((System.Windows.Forms.AnchorStyles) ((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
   1.164 -			this.bttnReplaceWeapon.Enabled = false;
   1.165 -			this.bttnReplaceWeapon.FlatStyle = System.Windows.Forms.FlatStyle.System;
   1.166 -			this.bttnReplaceWeapon.Location = new System.Drawing.Point(520, 128);
   1.167 -			this.bttnReplaceWeapon.Name = "bttnReplaceWeapon";
   1.168 -			this.bttnReplaceWeapon.Size = new System.Drawing.Size(88, 22);
   1.169 -			this.bttnReplaceWeapon.TabIndex = 10;
   1.170 -			this.bttnReplaceWeapon.Text = "replace";
   1.171 -			this.bttnReplaceWeapon.Click += new System.EventHandler(this.bttnReplaceWeapon_Click);
   1.172 -			// 
   1.173 -			// bttnEditReqdWeapon
   1.174 -			// 
   1.175 -			this.bttnEditReqdWeapon.Anchor = ((System.Windows.Forms.AnchorStyles) ((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
   1.176 -			this.bttnEditReqdWeapon.Enabled = false;
   1.177 -			this.bttnEditReqdWeapon.FlatStyle = System.Windows.Forms.FlatStyle.System;
   1.178 -			this.bttnEditReqdWeapon.Location = new System.Drawing.Point(520, 152);
   1.179 -			this.bttnEditReqdWeapon.Name = "bttnEditReqdWeapon";
   1.180 -			this.bttnEditReqdWeapon.Size = new System.Drawing.Size(88, 22);
   1.181 -			this.bttnEditReqdWeapon.TabIndex = 11;
   1.182 -			this.bttnEditReqdWeapon.Text = "edit";
   1.183 -			this.bttnEditReqdWeapon.Click += new System.EventHandler(this.bttnEditReqdWeapon_Click);
   1.184 -			// 
   1.185  			// lblPoints
   1.186  			// 
   1.187  			this.lblPoints.Location = new System.Drawing.Point(358, 8);
   1.188  			this.lblPoints.Name = "lblPoints";
   1.189  			this.lblPoints.Size = new System.Drawing.Size(88, 21);
   1.190  			this.lblPoints.TabIndex = 12;
   1.191 +			this.lblPoints.Text = "(points)";
   1.192  			// 
   1.193  			// FrmUnit
   1.194  			// 
   1.195  			this.AutoScaleBaseSize = new System.Drawing.Size(5, 13);
   1.196  			this.ClientSize = new System.Drawing.Size(616, 314);
   1.197  			this.Controls.Add(this.lblPoints);
   1.198 -			this.Controls.Add(this.bttnEditReqdWeapon);
   1.199 +			this.Controls.Add(this.bttnEditWeapon);
   1.200  			this.Controls.Add(this.bttnReplaceWeapon);
   1.201 -			this.Controls.Add(this.optList);
   1.202 -			this.Controls.Add(this.lblOptionalEquip);
   1.203 -			this.Controls.Add(this.bttnEditWeapon);
   1.204 -			this.Controls.Add(this.reqdList);
   1.205 +			this.Controls.Add(this.equipmentList);
   1.206  			this.Controls.Add(this.bttnRemoveWeapon);
   1.207  			this.Controls.Add(this.bttnAddWeapon);
   1.208 -			this.Controls.Add(this.lblRequiredEquip);
   1.209 +			this.Controls.Add(this.lblEquip);
   1.210  			this.Controls.Add(this.lblUnitSize);
   1.211  			this.Controls.Add(this.unitSize);
   1.212  			this.Controls.Add(this.tbUnitName);
   1.213 @@ -466,16 +419,18 @@
   1.214  			}
   1.215  		}
   1.216  
   1.217 -		private void reqdList_SelectedIndexChanged(object sender, System.EventArgs e)
   1.218 +		private void equipmentList_SelectedIndexChanged(object sender, System.EventArgs e)
   1.219  		{
   1.220 -			bttnReplaceWeapon.Enabled = (reqdList.SelectedIndex > -1 && ((UnitEquipmentChoice) reqdList.SelectedItem).Item.HasAlternatives());
   1.221 -			bttnEditReqdWeapon.Enabled = (reqdList.SelectedIndex > -1);
   1.222 +			SetButtonsEnabledState();
   1.223  		}
   1.224  
   1.225 -		private void optList_SelectedIndexChanged(object sender, System.EventArgs e)
   1.226 +		private void SetButtonsEnabledState()
   1.227  		{
   1.228 -			bttnEditWeapon.Enabled = optList.SelectedIndex > -1;
   1.229 -			bttnRemoveWeapon.Enabled = bttnEditWeapon.Enabled;
   1.230 +
   1.231 +			UnitEquipmentItem equipItem = GetSelectedUnitEquipmentItem();
   1.232 +			bttnReplaceWeapon.Enabled = (equipItem != null && equipItem.HasAlternatives());
   1.233 +			bttnEditWeapon.Enabled = (equipItem != null);
   1.234 +			bttnRemoveWeapon.Enabled = (equipItem != null && !equipItem.IsRequired);
   1.235  		}
   1.236  
   1.237  		private void unit_UnitEquipmentAmountChanged(WarFoundryObject obj, double oldValue, double newValue)
   1.238 @@ -483,51 +438,63 @@
   1.239  			if (obj is UnitEquipmentItem)
   1.240  			{
   1.241  				UnitEquipmentItem equip = (UnitEquipmentItem) obj;
   1.242 -				ListBox weaponList = (equip.IsRequired ? reqdList : optList);
   1.243 +				UnitEquipmentChoice equipChoice = GetEquipmentChoice(equip);
   1.244  
   1.245  				if (newValue == 0)
   1.246  				{
   1.247 -					weaponList.Items.Remove(GetEquipmentChoice(equip));
   1.248 +					equipmentList.Items.Remove(equipChoice);
   1.249  				}
   1.250  				else
   1.251  				{
   1.252 -					UnitEquipmentChoice equipObj = GetEquipmentChoice(equip);
   1.253 -					int idx = weaponList.Items.IndexOf(equipObj);
   1.254 +					int idx = equipmentList.Items.IndexOf(equipChoice);
   1.255  
   1.256  					if (idx > -1)
   1.257  					{
   1.258 -						weaponList.Items[idx] = equipObj;
   1.259 +						equipmentList.Items[idx] = equipChoice;
   1.260  					}
   1.261  					else
   1.262  					{
   1.263 -						weaponList.Items.Add(equipObj);
   1.264 +						equipmentList.Items.Add(equipChoice);
   1.265  					}
   1.266  				}
   1.267  			}
   1.268  		}
   1.269  
   1.270 -		private void editWeapon(ListBox list)
   1.271 +		private void EditWeapon()
   1.272  		{
   1.273 -			FrmEditUnitEquipment editEquip = new FrmEditUnitEquipment(Unit, ((UnitEquipmentChoice) list.SelectedItem).Item, commandStack);
   1.274 +			FrmEditUnitEquipment editEquip = new FrmEditUnitEquipment(Unit, GetSelectedUnitEquipmentItem(), commandStack);
   1.275  			editEquip.ShowDialog(this);
   1.276  		}
   1.277  
   1.278 +		private UnitEquipmentItem GetSelectedUnitEquipmentItem()
   1.279 +		{
   1.280 +			UnitEquipmentChoice selectedItem = GetSelectedUnitEquipmentChoice();
   1.281 +			UnitEquipmentItem equipItem = null;
   1.282 +
   1.283 +			if (selectedItem!=null)
   1.284 +			{
   1.285 +				equipItem = selectedItem.Item;
   1.286 +			}
   1.287 +
   1.288 +			return equipItem;
   1.289 +		}
   1.290 +
   1.291 +		private UnitEquipmentChoice GetSelectedUnitEquipmentChoice()
   1.292 +		{
   1.293 +			return (UnitEquipmentChoice) equipmentList.SelectedItem;
   1.294 +		}
   1.295 +
   1.296  		private void bttnEditWeapon_Click(object sender, System.EventArgs e)
   1.297  		{
   1.298 -			editWeapon(optList);
   1.299 +			EditWeapon();
   1.300  		}
   1.301  
   1.302 -		private void optList_DoubleClick(object sender, System.EventArgs e)
   1.303 +		private void equipmentList_DoubleClick(object sender, System.EventArgs e)
   1.304  		{
   1.305 -			editWeapon(optList);
   1.306 +			EditWeapon();
   1.307  		}
   1.308  
   1.309 -		private void reqdList_DoubleClick(object sender, System.EventArgs e)
   1.310 -		{
   1.311 -			editWeapon(reqdList);
   1.312 -		}
   1.313 -
   1.314 -		private void addWeapon()
   1.315 +		private void AddWeapon()
   1.316  		{
   1.317  			FrmNewUnitEquipment newEquip = new FrmNewUnitEquipment(Unit, commandStack);
   1.318  			newEquip.ShowDialog(this);
   1.319 @@ -535,27 +502,22 @@
   1.320  
   1.321  		private void bttnAddWeapon_Click(object sender, System.EventArgs e)
   1.322  		{
   1.323 -			addWeapon();
   1.324 +			AddWeapon();
   1.325  		}
   1.326  
   1.327 -		private void removeWeapon()
   1.328 +		private void RemoveWeapon()
   1.329  		{
   1.330 -			commandStack.Execute(new SetUnitEquipmentNumericAmountCommand(unit, ((UnitEquipmentChoice) optList.SelectedItem).Item, 0));
   1.331 +			commandStack.Execute(new SetUnitEquipmentNumericAmountCommand(unit, GetSelectedUnitEquipmentItem(), 0));
   1.332  		}
   1.333  
   1.334  		private void bttnRemoveWeapon_Click(object sender, System.EventArgs e)
   1.335  		{
   1.336 -			removeWeapon();
   1.337 -		}
   1.338 -
   1.339 -		private void bttnEditReqdWeapon_Click(object sender, System.EventArgs e)
   1.340 -		{
   1.341 -			editWeapon(reqdList);
   1.342 +			RemoveWeapon();
   1.343  		}
   1.344  
   1.345  		private void bttnReplaceWeapon_Click(object sender, System.EventArgs e)
   1.346  		{
   1.347 -			FrmReplaceUnitEquipment replace = new FrmReplaceUnitEquipment(unit, ((UnitEquipmentChoice) reqdList.SelectedItem).Item, commandStack);
   1.348 +			FrmReplaceUnitEquipment replace = new FrmReplaceUnitEquipment(unit, GetSelectedUnitEquipmentItem(), commandStack);
   1.349  			replace.ShowDialog(this);
   1.350  		}
   1.351  
     2.1 --- a/IBBoard.WarFoundry.GUI.WinForms.csproj	Sat Sep 19 13:56:55 2009 +0000
     2.2 +++ b/IBBoard.WarFoundry.GUI.WinForms.csproj	Sat Sep 19 13:57:35 2009 +0000
     2.3 @@ -151,6 +151,7 @@
     2.4      <Compile Include="Util\UnitEquipmentChoice.cs" />
     2.5      <EmbeddedResource Include="FrmArmyTree.resx">
     2.6        <DependentUpon>FrmArmyTree.cs</DependentUpon>
     2.7 +      <SubType>Designer</SubType>
     2.8      </EmbeddedResource>
     2.9      <EmbeddedResource Include="FrmEditUnitEquipment.resx">
    2.10        <DependentUpon>FrmEditUnitEquipment.cs</DependentUpon>
    2.11 @@ -161,18 +162,21 @@
    2.12      </EmbeddedResource>
    2.13      <EmbeddedResource Include="FrmNewArmy.resx">
    2.14        <DependentUpon>FrmNewArmy.cs</DependentUpon>
    2.15 +      <SubType>Designer</SubType>
    2.16      </EmbeddedResource>
    2.17      <EmbeddedResource Include="FrmNewUnit.resx">
    2.18        <DependentUpon>FrmNewUnit.cs</DependentUpon>
    2.19      </EmbeddedResource>
    2.20      <EmbeddedResource Include="FrmNewUnitEquipment.resx">
    2.21        <DependentUpon>FrmNewUnitEquipment.cs</DependentUpon>
    2.22 +      <SubType>Designer</SubType>
    2.23      </EmbeddedResource>
    2.24      <EmbeddedResource Include="FrmReplaceUnitEquipment.resx">
    2.25        <DependentUpon>FrmReplaceUnitEquipment.cs</DependentUpon>
    2.26      </EmbeddedResource>
    2.27      <EmbeddedResource Include="FrmUnit.resx">
    2.28        <DependentUpon>FrmUnit.cs</DependentUpon>
    2.29 +      <SubType>Designer</SubType>
    2.30      </EmbeddedResource>
    2.31      <EmbeddedResource Include="UI\EquipmentAmountControl.resx">
    2.32        <SubType>Designer</SubType>