Correct Window Mediator's registration of browser windows.

extensions/manticore/Manticore.csproj

@@ -125,6 +125,11 @@
                     SubType = "Component"
                     BuildAction = "Compile"
                 />
+                <File
+                    RelPath = "bookmarks\BookmarksTreeView.resx"
+                    DependentUpon = "BookmarksTreeView.cs"
+                    BuildAction = "EmbeddedResource"
+                />
                 <File
                     RelPath = "bookmarks\BookmarksWindow.cs"
                     SubType = "Form"
@@ -145,6 +150,16 @@
                     DependentUpon = "FileBookmark.cs"
                     BuildAction = "EmbeddedResource"
                 />
+                <File
+                    RelPath = "bookmarks\Test.cs"
+                    SubType = "Form"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "bookmarks\Test.resx"
+                    DependentUpon = "Test.cs"
+                    BuildAction = "EmbeddedResource"
+                />
                 <File
                     RelPath = "browser\aboutdialog.cs"
                     SubType = "Form"

extensions/manticore/bookmarks/BookmarksWindow.cs

@@ -51,8 +51,8 @@ namespace Silverstone.Manticore.Bookmarks
 	/// </summary>
 	public class BookmarksWindow : ManticoreWindow
 	{
-    private System.Windows.Forms.StatusBar statusBar1;
-    private System.Windows.Forms.StatusBarPanel statusBarPanel1;
+    private StatusBar mStatusBar;
+    private StatusBarPanel mStatusBarPanel;
     private BookmarksTreeView mBookmarksTree;
 
     private BaseTreeBuilder mBuilder = null;
@@ -69,11 +69,30 @@ namespace Silverstone.Manticore.Bookmarks
       // Set up UI
       InitializeComponent();
 
-      // 
-      // mBookmarksTree
-      // 
+      base.Init();
+    }
+    
+    #region Windows Form Designer generated code
+		/// <summary>
+		/// Required method for Designer support - do not modify
+		/// the contents of this method with the code editor.
+		/// </summary>
+		private void InitializeComponent()
+		{
+      mStatusBar = new StatusBar();
+      mStatusBarPanel = new StatusBarPanel();
+      ((ISupportInitialize)mStatusBarPanel).BeginInit();
+      SuspendLayout();
+
+      mStatusBar.Name = "statusBar";
+      mStatusBar.Panels.Add(mStatusBarPanel);
+      mStatusBar.TabIndex = 0;
+      mStatusBar.Text = "";
+      mStatusBarPanel.Text = "";
+      Controls.Add(mStatusBar);
+
       mBookmarksTree = new BookmarksTreeView("BookmarksRoot");
-      mBookmarksTree.Dock = System.Windows.Forms.DockStyle.Fill;
+      mBookmarksTree.Dock = DockStyle.Fill;
       mBookmarksTree.ImageIndex = -1;
       mBookmarksTree.Name = "bookmarksTree";
       mBookmarksTree.SelectedImageIndex = -1;
@@ -86,45 +105,13 @@ namespace Silverstone.Manticore.Bookmarks
       Controls.Add(mBookmarksTree);
       mBookmarksTree.Build();
 
-      base.Init();
-    }
-    
-    #region Windows Form Designer generated code
-		/// <summary>
-		/// Required method for Designer support - do not modify
-		/// the contents of this method with the code editor.
-		/// </summary>
-		private void InitializeComponent()
-		{
-      this.statusBar1 = new System.Windows.Forms.StatusBar();
-      this.statusBarPanel1 = new System.Windows.Forms.StatusBarPanel();
-      ((System.ComponentModel.ISupportInitialize)(this.statusBarPanel1)).BeginInit();
-      this.SuspendLayout();
-      // 
-      // statusBar1
-      // 
-      this.statusBar1.Location = new System.Drawing.Point(0, 409);
-      this.statusBar1.Name = "statusBar1";
-      this.statusBar1.Panels.AddRange(new System.Windows.Forms.StatusBarPanel[] {
-                                                                                  this.statusBarPanel1});
-      this.statusBar1.Size = new System.Drawing.Size(584, 20);
-      this.statusBar1.TabIndex = 0;
-      this.statusBar1.Text = "statusBar1";
-      // 
-      // statusBarPanel1
-      // 
-      this.statusBarPanel1.Text = "statusBarPanel1";
-      // 
-      // BookmarksWindow
-      // 
-      this.AutoScaleBaseSize = new System.Drawing.Size(5, 13);
-      this.ClientSize = new System.Drawing.Size(584, 429);
-      this.Controls.AddRange(new System.Windows.Forms.Control[] {this.statusBar1});
-      this.Name = "BookmarksWindow";
-      this.Text = "Bookmarks for %USER%";
-      ((System.ComponentModel.ISupportInitialize)(this.statusBarPanel1)).EndInit();
-      this.ResumeLayout(false);
-
+      
+      AutoScaleBaseSize = new System.Drawing.Size(5, 13);
+      ClientSize = new System.Drawing.Size(584, 429);
+      Name = "BookmarksWindow";
+      Text = Environment.UserName + "'s Bookmarks";
+      ((ISupportInitialize)(mStatusBarPanel)).EndInit();
+      ResumeLayout(false);
     }
 		#endregion
 
@@ -133,7 +120,7 @@ namespace Silverstone.Manticore.Bookmarks
       ManticoreTreeNode node = e.Node as ManticoreTreeNode;
       Bookmarks bmks = ServiceManager.Bookmarks;
       String bookmarkURL = bmks.GetBookmarkAttribute(node.Data as String, "url");
-      statusBar1.Text = bookmarkURL;
+      mStatusBar.Text = bookmarkURL;
     }
 
     protected void OnTreeDoubleClick(Object sender, EventArgs e)

extensions/manticore/browser/browserwindow.cs

@@ -71,13 +71,14 @@ namespace Silverstone.Manticore.Browser
     public BrowserWindow(String aURL)
     {
       mSessionURL = aURL;
-      mType = "BrowserWindow";
 
       Init();
     }
 
     protected void Init()
     {
+      mType = "BrowserWindow";
+
       // Set up UI
       InitializeComponent();
 

extensions/manticore/core/WindowMediator.cs

@@ -4,7 +4,9 @@ namespace Silverstone.Manticore.Core
   using System;
   using System.Collections;
 
+  using Silverstone.Manticore.App;
   using Silverstone.Manticore.Toolkit;
+  using Silverstone.Manticore.Browser;
 
   // XXX - TODO: need to add logic to quit application when there are 
   //             no more windows

extensions/manticore/toolkit/ManticoreWindow.cs

@@ -57,11 +57,6 @@ namespace Silverstone.Manticore.Toolkit
     {
     }
 
-    public ManticoreWindow(String aType)
-		{
-      mType = aType;
-    }
-
     protected void Init()
     {
       WindowMediator wm = ServiceManager.WindowMediator;