cleanup some icon related things??

BizHawk.MultiClient/BizHawk.MultiClient.csproj

@@ -658,6 +658,7 @@
     <None Include="images\Unfreeze.png" />
     <None Include="images\AutoSearch.png" />
     <None Include="images\Lightning.png" />
+    <Content Include="images\logo.ico" />
     <Content Include="output\gamedb.txt" />
     <Content Include="output\gamedb_neshomebrew.txt" />
     <Content Include="output\gamedb_pce_cd.txt" />

BizHawk.MultiClient/MainForm.Designer.cs

@@ -29,7 +29,6 @@
         private void InitializeComponent()
         {
 			this.components = new System.ComponentModel.Container();
-			System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(MainForm));
 			this.menuStrip1 = new MenuStripEx();
 			this.fileToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
 			this.openROMToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
@@ -885,33 +884,33 @@
 			// 
 			this.pauseToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.Pause;
 			this.pauseToolStripMenuItem.Name = "pauseToolStripMenuItem";
-			this.pauseToolStripMenuItem.Size = new System.Drawing.Size(152, 22);
+			this.pauseToolStripMenuItem.Size = new System.Drawing.Size(144, 22);
 			this.pauseToolStripMenuItem.Text = "&Pause";
 			this.pauseToolStripMenuItem.Click += new System.EventHandler(this.pauseToolStripMenuItem_Click);
 			// 
 			// toolStripSeparator1
 			// 
 			this.toolStripSeparator1.Name = "toolStripSeparator1";
-			this.toolStripSeparator1.Size = new System.Drawing.Size(149, 6);
+			this.toolStripSeparator1.Size = new System.Drawing.Size(141, 6);
 			// 
 			// powerToolStripMenuItem
 			// 
 			this.powerToolStripMenuItem.Name = "powerToolStripMenuItem";
-			this.powerToolStripMenuItem.Size = new System.Drawing.Size(152, 22);
+			this.powerToolStripMenuItem.Size = new System.Drawing.Size(144, 22);
 			this.powerToolStripMenuItem.Text = "Power Cycle";
 			this.powerToolStripMenuItem.Click += new System.EventHandler(this.powerToolStripMenuItem_Click);
 			// 
 			// resetToolStripMenuItem
 			// 
 			this.resetToolStripMenuItem.Name = "resetToolStripMenuItem";
-			this.resetToolStripMenuItem.Size = new System.Drawing.Size(152, 22);
+			this.resetToolStripMenuItem.Size = new System.Drawing.Size(144, 22);
 			this.resetToolStripMenuItem.Text = "&Reset";
 			this.resetToolStripMenuItem.Click += new System.EventHandler(this.resetToolStripMenuItem_Click);
 			// 
 			// toolStripSeparator8
 			// 
 			this.toolStripSeparator8.Name = "toolStripSeparator8";
-			this.toolStripSeparator8.Size = new System.Drawing.Size(149, 6);
+			this.toolStripSeparator8.Size = new System.Drawing.Size(141, 6);
 			// 
 			// sega8bitToolStripMenuItem
 			// 
@@ -920,7 +919,7 @@
             this.overclockWhenKnownSafeToolStripMenuItem,
             this.forceStereoSeparationToolStripMenuItem});
 			this.sega8bitToolStripMenuItem.Name = "sega8bitToolStripMenuItem";
-			this.sega8bitToolStripMenuItem.Size = new System.Drawing.Size(152, 22);
+			this.sega8bitToolStripMenuItem.Size = new System.Drawing.Size(144, 22);
 			this.sega8bitToolStripMenuItem.Text = "Sega 8-bit";
 			// 
 			// enableFMChipToolStripMenuItem
@@ -1978,7 +1977,6 @@
 			this.Controls.Add(this.menuStrip1);
 			this.Font = new System.Drawing.Font("Arial", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
 			this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle;
-			this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
 			this.MainMenuStrip = this.menuStrip1;
 			this.MaximizeBox = false;
 			this.Name = "MainForm";

BizHawk.MultiClient/MainForm.cs

@@ -66,6 +66,7 @@ namespace BizHawk.MultiClient
 
 		public MainForm(string[] args)
 		{
+			Icon = BizHawk.MultiClient.Properties.Resources.logo;
 			InitializeComponent();
 			Global.Game = new GameInfo();
 			if (Global.Config.ShowLogWindow)

BizHawk.MultiClient/MainForm.resx

@@ -129,30 +129,4 @@
   <metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>30</value>
   </metadata>
-  <assembly alias="System.Drawing" name="System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
-  <data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        AAABAAEAEBEAAAEAIACsBAAAFgAAACgAAAAQAAAAIgAAAAEAIAAAAAAAAAAAAGEPAABhDwAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAANTMxiCyrZv/nZyJ/5OVg/+Ym5D/ra2t/9LU2BUAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAA3tvJHZyZco5UVjrYPTYe/zUvFP84NBb/Tkss/29rTP+Afma0pqasVwAA
-        AAAAAAAAAAAAAAAAAAAAAAAAyM2sQlVUL+UXEA3/CQYA/wABAP9LTEv/EQ8Q/wUEAP8SFAb/REUo/25r
-        T9WblpVvAAAAAAAAAAAAAAAA0tOwPDw6HvwAAAD/Cw4H/wEFAP86Pjv/z9DP/2dkZv8HAQH/FQ0J/wsF
-        AP8yMBb/cHBK3qijrloAAAAA7e3ZCFVPNd0CAAD/DxUK/woOAP8WGBT/uby2/2NkY/+8vLz/Ozs5/w0O
-        Av8RFQv/BQIF/z04G/+FgWuu087QG52dcv8GBgr/Cg0H/xcXDf8AAAD/fXyD/83Mzv8TEhT/pKOj/6+v
-        rf8MCQT/GRcK/xEODf8NDwb/XV84/62vpv+Hdkr/AAEG/xQTDP8NDQb/Fg8Q/9ja3f+FhYb/AAAA/2Je
-        YP/u7+7/MDIt/xMPBf8ZFgv/AAAG/0REJf+poYv/0aFw/z8qEP8MDQf/AwYB/ysqLf/5+fr/qaao/woD
-        Bv+Df4D//////1taV/8KBAD/GRUG/xMMBf+ngU//tKeL/+iwd/+/kEn/IiMO/wABAv9GRkr/+vn7/+De
-        3/8zLS7/u7e4//////94dnb/EhYU/xUWDP+Kbjj/6bJu/7eujP/kt2///daQ/5uIS/8YFQn/Ojw//8nF
-        yP/a2dn/OTQ1/6Wio//V2Nj/jY+T/1ZTT/98aTX/89GR/+S4Yv/AvJv/17pu//jaov/03qL/gmcn/xgX
-        GP8gIyb/U1VU/2FfXv+Eh4T/oKam/5+mrv+BeGf/3MaQ///lrf/buWP7ydLGNdbOnP/rznn///vN/9i7
-        e/8jHBX/AgAE/xINDf96fXr/r6+w/8zQ1P/S2Nr/pqej/97Qu//82oL/ysmJrgAAAADj6tYN38x40ezY
-        kv+Hp6P/KTIv/wMdJv8WKTH/am5v/5ucmv/g4uX/6evw/8PExf/ZxHv/5c90293bxDkAAAAAAAAAAOjg
-        vUPCv3XZFJ7N/wCTyP8LbZP/EDM//0JJTv/Gx8X/5+fn/+zq8P+2rpr/1cVo89/aq2kAAAAAAAAAAAAA
-        AAAAAAAA1duzWEOltf8Hkbz/Fkdc/zNDRv9KWFr/kpKW//z7/P/f4dv/qqWCvt3YsV0AAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAADi3tYNj4+Wp8rKzP/x8vD/6PLw/+fo6//b294ImJuRntfZyygAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAN3azx3Gysv/qK+x/8C5uP/Dw8P/wcfJOQAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAPwfAADwDwAA4AcAAMADAACAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAEAAIAD
-        AADABwAA4A8AAPBfAAD4fwAA
-</value>
-  </data>
 </root>

BizHawk.MultiClient/Properties/Resources.Designer.cs

@@ -1,7 +1,7 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
-//     Runtime Version:2.0.50727.3623
+//     Runtime Version:2.0.50727.3620
 //
 //     Changes to this file may cause incorrect behavior and will be lost if
 //     the code is regenerated.
@@ -326,6 +326,13 @@ namespace BizHawk.MultiClient.Properties {
             }
         }
         
+        internal static System.Drawing.Icon logo {
+            get {
+                object obj = ResourceManager.GetObject("logo", resourceCulture);
+                return ((System.Drawing.Icon)(obj));
+            }
+        }
+        
         internal static System.Drawing.Bitmap Lua {
             get {
                 object obj = ResourceManager.GetObject("Lua", resourceCulture);

BizHawk.MultiClient/Properties/Resources.resx

@@ -798,4 +798,7 @@
   <data name="Lightning" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\images\Lightning.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
+  <data name="logo" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\images\logo.ico;System.Drawing.Icon, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
 </root>