Timestamp:

06/27/09 15:13:21 (14 months ago)

Author:

ibboard

Message:

Fixes #95: Can't re-open GTK# tabs

• Make Unit for UnitDisplayWidget visible as a property
• Hook in to Destroyed event of UnitDisplayWidget to remove it from the map of tabs

Location:

IBBoard.WarFoundry.GUI.GTK/trunk

Files:

• FrmMainWindow.cs (modified) (4 diffs)
• Widgets/UnitDisplayWidget.cs (modified) (1 diff)

@@ -131 +131 @@
             FailedUnitRequirementMethod = new FailedUnitRequirementDelegate(OnFailedUnitRequirement);
             UnitNameChangedMethod = new StringValChangedDelegate(OnUnitNameChanged);
-            logger.Debug("Initialising complete - trying to load default army or system");
             
             //FIXME: Temporary hack to add paths and factories
@@ -148 +147 @@
                 WarFoundryLoader.GetDefault().RegisterNonNativeFactory((INonNativeWarFoundryFactory)factory);
             }
+            
+            logger.Debug("Initialising complete - seeing if we can load default army or system");
                                 
             if (args.Length == 1)
@@ -919 +920 @@
                     logger.Debug("Adding page for "+unit.Name);
                     unitToWidgetMap[unit] = widget;
+                    widget.Destroyed+= new EventHandler(UnitWidgetDestroyed);
                     int pageNum = NotebookUtil.AddPageToNotebookWithCloseButton(unitsNotebook, widget, unit.Name);
                     logger.Debug("Page added at index "+pageNum);
@@ -926 +928 @@
             }
         }
+
+        private void UnitWidgetDestroyed(object sender, EventArgs e)
+        {
+            if (sender is UnitDisplayWidget)
+            {
+                unitToWidgetMap.Remove(((UnitDisplayWidget)sender).Unit);
+            }
+        }
     }
 }

@@ -83 +83 @@
             }
         }
+
+        public IBBoard.WarFoundry.API.Objects.Unit Unit
+        {
+            get { return unit; }
+        }
         
         private void UnitNameChanged(WarFoundryObject obj, string oldValue, string newValue)