more icons

BizHawk.Client.EmuHawk/BizHawk.Client.EmuHawk.csproj

@@ -1381,6 +1381,8 @@
     <None Include="config\ControllerImages\GENController.png" />
   </ItemGroup>
   <ItemGroup>
+    <None Include="images\ppsspp.png" />
+    <None Include="images\meteor.png" />
     <None Include="images\yabause.png" />
     <None Include="images\QuickNes.png" />
     <None Include="images\QuickNES_128.ico" />
@@ -1489,6 +1491,7 @@
     <None Include="images\Erase.png" />
     <None Include="images\bsnes.png" />
     <None Include="images\emu7800.png" />
+    <None Include="images\genplus.png" />
     <Content Include="images\logo.ico" />
     <None Include="images\Paste.png" />
     <None Include="images\reboot.png" />

BizHawk.Client.EmuHawk/MainForm.cs

@@ -22,6 +22,7 @@ using BizHawk.Emulation.Cores.Nintendo.SNES;
 using BizHawk.Emulation.Cores.PCEngine;
 using BizHawk.Emulation.Cores.Sega.MasterSystem;
 using BizHawk.Emulation.Cores.Sega.Saturn;
+using BizHawk.Emulation.Cores.Sony.PSP;
 using BizHawk.Emulation.DiscSystem;
 
 namespace BizHawk.Client.EmuHawk
@@ -2361,16 +2362,23 @@ namespace BizHawk.Client.EmuHawk
 				{
 					CoreNameStatusBarButton.Image = BizHawk.Client.EmuHawk.Properties.Resources.emu7800;
 				}
-
+				else if (Global.Emulator is GBA)
+				{
+					CoreNameStatusBarButton.Image = BizHawk.Client.EmuHawk.Properties.Resources.meteor;
+				}
+				else if (Global.Emulator is GPGX)
+				{
+					CoreNameStatusBarButton.Image = BizHawk.Client.EmuHawk.Properties.Resources.genplus;
+				}
+				else if (Global.Emulator is PSP)
+				{
+					CoreNameStatusBarButton.Image = BizHawk.Client.EmuHawk.Properties.Resources.ppsspp;
+				}
 
 				// TODO: other icons
 				// unknown
 				// mupen64plus,
-				// emu7800,
-				// ppsspp,
 				// gambattte,
-				// meteor,
-				// gpgx
 			}
 		}
 

BizHawk.Client.EmuHawk/Properties/Resources.Designer.cs

@@ -550,6 +550,16 @@ namespace BizHawk.Client.EmuHawk.Properties {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap genplus {
+            get {
+                object obj = ResourceManager.GetObject("genplus", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized resource of type System.Drawing.Bitmap.
         /// </summary>
@@ -700,6 +710,16 @@ namespace BizHawk.Client.EmuHawk.Properties {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap meteor {
+            get {
+                object obj = ResourceManager.GetObject("meteor", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized resource of type System.Drawing.Bitmap.
         /// </summary>
@@ -879,6 +899,16 @@ namespace BizHawk.Client.EmuHawk.Properties {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap ppsspp {
+            get {
+                object obj = ResourceManager.GetObject("ppsspp", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized resource of type System.Drawing.Bitmap.
         /// </summary>

BizHawk.Client.EmuHawk/Properties/Resources.resx

@@ -909,6 +909,15 @@
   <data name="emu7800" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\images\emu7800.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
+  <data name="genplus" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\images\genplus.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="meteor" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\images\meteor.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="ppsspp" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\images\ppsspp.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
   <data name="QuickNes" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\images\QuickNes.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>