comparison FrmMain.cs @ 207:53d79e1be712

Re #354: Single-button Add Unit * Start creating new form
author IBBoard <dev@ibboard.co.uk>
date Tue, 16 Aug 2011 21:01:45 +0100
parents 10ba2c5340b2
children 19a88383dfa7
comparison
equal deleted inserted replaced
206:314d90a059d8 207:53d79e1be712
57 public ObjectRemoveDelegate UnitRemovedMethod; 57 public ObjectRemoveDelegate UnitRemovedMethod;
58 public DoubleValChangedDelegate PointsValueChangedMethod; 58 public DoubleValChangedDelegate PointsValueChangedMethod;
59 //public FailedUnitRequirementDelegate FailedUnitRequirementMethod; 59 //public FailedUnitRequirementDelegate FailedUnitRequirementMethod;
60 60
61 private FrmArmyTree armyTree; 61 private FrmArmyTree armyTree;
62 private FrmNewUnitFromTree newUnitTree;
62 private string loadedFilePath; 63 private string loadedFilePath;
63 private Dictionary<string, FrmUnit> unitWindows; 64 private Dictionary<string, FrmUnit> unitWindows;
64 65
65 private System.ComponentModel.IContainer components; 66 private System.ComponentModel.IContainer components;
66 private System.Windows.Forms.OpenFileDialog openArmyDialog; 67 private System.Windows.Forms.OpenFileDialog openArmyDialog;
181 armyTree = new FrmArmyTree(CommandStack); 182 armyTree = new FrmArmyTree(CommandStack);
182 armyTree.MdiParent = this; 183 armyTree.MdiParent = this;
183 armyTree.StartPosition = FormStartPosition.Manual; 184 armyTree.StartPosition = FormStartPosition.Manual;
184 armyTree.Location = new Point(this.DisplayRectangle.Width - armyTree.Width - 10, 10); 185 armyTree.Location = new Point(this.DisplayRectangle.Width - armyTree.Width - 10, 10);
185 } 186 }
187
188 private FrmNewUnitFromTree GetNewUnitTree()
189 {
190 if (newUnitTree == null || newUnitTree.IsDisposed)
191 {
192 CreateNewUnitTree();
193 }
194
195 return newUnitTree;
196 }
197
198 private void CreateNewUnitTree()
199 {
200 newUnitTree = new FrmNewUnitFromTree();
201 newUnitTree.MdiParent = this;
202 newUnitTree.StartPosition = FormStartPosition.Manual;
203 newUnitTree.Location = new Point(10, 10);
204 }
186 205
187 private void TranslateControls() 206 private void TranslateControls()
188 { 207 {
189 ControlTranslator.TranslateControls(Controls); 208 ControlTranslator.TranslateControls(Controls);
190 ControlTranslator.TranslateComponents(components.Components); 209 ControlTranslator.TranslateComponents(components.Components);
955 miSaveArmyAs.Enabled = false; 974 miSaveArmyAs.Enabled = false;
956 miCloseArmy.Enabled = false; 975 miCloseArmy.Enabled = false;
957 miExportArmyAs.Enabled = false; 976 miExportArmyAs.Enabled = false;
958 DisableCategoryButtons(); 977 DisableCategoryButtons();
959 GetArmyTree().Hide(); 978 GetArmyTree().Hide();
979 GetNewUnitTree().Hide();
960 } 980 }
961 981
962 private void SetNonNullArmyState(Army newArmy) 982 private void SetNonNullArmyState(Army newArmy)
963 { 983 {
964 SetCategoryButtons(newArmy.Race.Categories); 984 SetCategoryButtons(newArmy.Race.Categories);
965 EnableCategoryButtons(); 985 EnableCategoryButtons();
966 miSaveArmyAs.Enabled = true; 986 miSaveArmyAs.Enabled = true;
967 miCloseArmy.Enabled = true; 987 miCloseArmy.Enabled = true;
968 miExportArmyAs.Enabled = true; 988 miExportArmyAs.Enabled = true;
969 GetArmyTree().Show(); 989 GetArmyTree().Show();
990 GetNewUnitTree().Show();
970 } 991 }
971 992
972 private void SetCategoryButtons(Category[] cats) 993 private void SetCategoryButtons(Category[] cats)
973 { 994 {
974 if (CategoryButtonsHaveChanged(cats)) 995 if (CategoryButtonsHaveChanged(cats))