--- a/UI/EquipmentAmountControl.cs	Sun Sep 06 18:01:54 2009 +0000
+++ b/UI/EquipmentAmountControl.cs	Sun Sep 06 19:31:49 2009 +0000
@@ -29,7 +29,88 @@
 		public void SetUnitEquipmentItem(UnitEquipmentItem unitEquipment)
 		{
 			equip = unitEquipment;
-			//SetWidgetValues();
+			SetWidgetValues();
+		}
+
+		public event EventHandler ValueChanged;
+
+		private void OnValueChanged()
+		{
+			if (ValueChanged != null)
+			{
+				ValueChanged(this, new EventArgs());
+			}
+		}
+
+		private void SetWidgetValues()
+		{
+			if (equip != null)
+			{
+				if (equip.IsRatioLimit)
+				{
+					double minPercent = equip.MinPercentage;
+					double maxPercent = equip.MaxPercentage;
+					SetUpDownControlMinMaxAndValue(percentage, minPercent, maxPercent);
+					SetUpDownControlMinMaxAndValue(numeric, CalculateNumericValueFromPercentage(minPercent), CalculateNumericValueFromPercentage(maxPercent));
+					rbEquipAll.Enabled = maxPercent == 100;
+
+					if (minPercent == 100)
+					{
+						rbEquipAll.Checked = true;
+						percentage.Enabled = false;
+						rbPercentage.Enabled = false;
+						numeric.Enabled = false;
+						rbNumeric.Enabled = false;
+					}
+					else
+					{
+						rbPercentage.Checked = true;
+						percentage.Enabled = true;
+						rbPercentage.Enabled = true;
+						numeric.Enabled = true;
+						rbNumeric.Enabled = true;
+					}
+				}
+				else
+				{
+					percentage.Enabled = false;
+					rbPercentage.Enabled = false;
+					int minNumber = equip.MinNumber;
+					int maxNumber = equip.MaxNumber;
+					SetUpDownControlMinMaxAndValue(numeric, (decimal) minNumber, (decimal) maxNumber);
+					SetUpDownControlMinMaxAndValue(percentage, CalcualtePercentageValueFromNumber(minNumber), CalcualtePercentageValueFromNumber(maxNumber));
+					rbEquipAll.Enabled = maxNumber == WarFoundryCore.INFINITY;
+					
+					if (minNumber == WarFoundryCore.INFINITY)
+					{
+						rbEquipAll.Checked = true;
+						numeric.Enabled = false;
+						rbNumeric.Enabled = false;
+					}
+					else
+					{
+						rbNumeric.Checked = true;
+						numeric.Enabled = true;
+						rbNumeric.Enabled = true;
+					}
+				}
+			}
+			else
+			{
+				Enabled = false;
+			}
+		}
+
+		private void SetUpDownControlMinMaxAndValue(NumericUpDown upDownControl, double min, double max)
+		{
+			SetUpDownControlMinMaxAndValue(upDownControl, (decimal)min, (decimal)max);
+		}
+
+		private void SetUpDownControlMinMaxAndValue(NumericUpDown upDownControl, decimal min, decimal max)
+		{
+			upDownControl.Minimum = (min == WarFoundryCore.INFINITY ? unit.Size : min);
+			upDownControl.Maximum = (max == WarFoundryCore.INFINITY ? unit.Size : max);
+			upDownControl.Value = upDownControl.Value;
 		}
 
 		private void rbEquipAll_CheckedChanged(object sender, EventArgs e)
@@ -43,18 +124,54 @@
 				numeric.Value = unit.Size;
 				percentage.Value = 100;
 			}
+
+			OnValueChanged();
 		}
 
 		private void percentage_ValueChanged(object sender, EventArgs e)
 		{
-			double percent = (double) percentage.Value;
-			numeric.Value = (decimal) IBBMath.Round(unit.Size * (percent / 100.0), equip.RoundNumberUp);
+			SetNumericValueFromPercentage();
 			rbEquipAll.Checked = (percentage.Value == 100);
+			OnValueChanged();
+		}
+
+		private void SetNumericValueFromPercentage()
+		{
+			double percent = (double)percentage.Value;
+			numeric.Value = CalculateNumericValueFromPercentage(percent);
+		}
+
+		private decimal CalculateNumericValueFromPercentage(double percent)
+		{
+			return (decimal) IBBMath.Round(unit.Size * (percent / 100.0), equip.RoundNumberUp);
 		}
 
 		private void numeric_ValueChanged(object sender, EventArgs e)
 		{
-			percentage.Value = (unit.Size / numeric.Value) * 100;
+			SetPercentageValueFromNumeric();
+			OnValueChanged();
+		}
+
+		private void SetPercentageValueFromNumeric()
+		{
+			int number = (int)numeric.Value;
+			percentage.Value = CalcualtePercentageValueFromNumber(number);
+		}
+
+		private decimal CalcualtePercentageValueFromNumber(int number)
+		{
+			decimal percent = 0;
+
+			if (number > 0)
+			{
+				percent = (decimal) Math.Round((number / (unit.Size * 1.0)) * 100, 1);
+			}
+			else if (number == WarFoundryCore.INFINITY)
+			{
+				percent = 100;
+			}
+
+			return percent;
 		}
 
 		public double EquipmentAmount
@@ -71,9 +188,13 @@
 				{
 					val = (double) percentage.Value / 100.0;
 				}
+				else if (rbEquipAll.Checked)
+				{
+					val = WarFoundryCore.INFINITY;
+				}
 				else
 				{
-					val = WarFoundryCore.INFINITY;
+					val = 0;
 				}
 
 				return val;