From ec8c2f8bee13f4a395aaf23d972451e54afea25a Mon Sep 17 00:00:00 2001 From: adelikat Date: Fri, 25 Apr 2014 22:50:28 +0000 Subject: [PATCH] more icons --- .../BizHawk.Client.EmuHawk.csproj | 3 ++ BizHawk.Client.EmuHawk/MainForm.cs | 18 ++++++++--- .../Properties/Resources.Designer.cs | 30 ++++++++++++++++++ .../Properties/Resources.resx | 9 ++++++ BizHawk.Client.EmuHawk/images/genplus.png | Bin 0 -> 1057 bytes BizHawk.Client.EmuHawk/images/meteor.png | Bin 0 -> 820 bytes BizHawk.Client.EmuHawk/images/ppsspp.png | Bin 0 -> 841 bytes 7 files changed, 55 insertions(+), 5 deletions(-) create mode 100644 BizHawk.Client.EmuHawk/images/genplus.png create mode 100644 BizHawk.Client.EmuHawk/images/meteor.png create mode 100644 BizHawk.Client.EmuHawk/images/ppsspp.png diff --git a/BizHawk.Client.EmuHawk/BizHawk.Client.EmuHawk.csproj b/BizHawk.Client.EmuHawk/BizHawk.Client.EmuHawk.csproj index 2ba034734f..5d432280f2 100644 --- a/BizHawk.Client.EmuHawk/BizHawk.Client.EmuHawk.csproj +++ b/BizHawk.Client.EmuHawk/BizHawk.Client.EmuHawk.csproj @@ -1381,6 +1381,8 @@ + + @@ -1489,6 +1491,7 @@ + diff --git a/BizHawk.Client.EmuHawk/MainForm.cs b/BizHawk.Client.EmuHawk/MainForm.cs index 4aa988db3f..e5285d9b27 100644 --- a/BizHawk.Client.EmuHawk/MainForm.cs +++ b/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 } } diff --git a/BizHawk.Client.EmuHawk/Properties/Resources.Designer.cs b/BizHawk.Client.EmuHawk/Properties/Resources.Designer.cs index 4da40b4ab2..37c366d5eb 100644 --- a/BizHawk.Client.EmuHawk/Properties/Resources.Designer.cs +++ b/BizHawk.Client.EmuHawk/Properties/Resources.Designer.cs @@ -550,6 +550,16 @@ namespace BizHawk.Client.EmuHawk.Properties { } } + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap genplus { + get { + object obj = ResourceManager.GetObject("genplus", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// @@ -700,6 +710,16 @@ namespace BizHawk.Client.EmuHawk.Properties { } } + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap meteor { + get { + object obj = ResourceManager.GetObject("meteor", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// @@ -879,6 +899,16 @@ namespace BizHawk.Client.EmuHawk.Properties { } } + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap ppsspp { + get { + object obj = ResourceManager.GetObject("ppsspp", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// diff --git a/BizHawk.Client.EmuHawk/Properties/Resources.resx b/BizHawk.Client.EmuHawk/Properties/Resources.resx index 894cc92fbb..746954c37e 100644 --- a/BizHawk.Client.EmuHawk/Properties/Resources.resx +++ b/BizHawk.Client.EmuHawk/Properties/Resources.resx @@ -909,6 +909,15 @@ ..\images\emu7800.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\images\genplus.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\images\meteor.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\images\ppsspp.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\images\QuickNes.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a diff --git a/BizHawk.Client.EmuHawk/images/genplus.png b/BizHawk.Client.EmuHawk/images/genplus.png new file mode 100644 index 0000000000000000000000000000000000000000..e4de653e93a901e074cc16eb5339c30a701bae3d GIT binary patch literal 1057 zcmV++1m63JP)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D02*{fSaefwW^{L9 za%BKeVQFr3E>1;MAa*k@H7+qRNAp5A000A!Nkl;2*!-m%Q(N@7#O8a|pmYY&P2xNs?+iIy%tQP|xTl zS6ArpD`PMiri=y$2h;ld2l^XWur@vhGMNlAzXh(5iPazTgO*_Zh7E6x=8lYvl=bxV z;KJF{Sm@&pTDci?_#P;y5tLm&Jz31r7SK1Xtp5}qb7q6gX7g``zYN%&wiV>YMrjv7 zKXR$Jm>Vw8FxPCL*(EDHJcZnIb{+k1O^pBjxue7++MKJIhi>FEV8 z2kst7O-*%e)~Nl(IyN?z#X&Y|YczhiY{pfK);9sIndnE4KL>`&13N&U=bFW|dOi9cGJ zke;4__*f;9ViZ^#7llxn2WS)LO>FPI%r3vg?1dr7-m@JgCkk*pHxorivQSc#kBuMm z1*Gsd|1~T7$HkfPfl~BmAb$lYFai`D%|uNS3Hnk!r5EeP5iDAjFpZf56&qH*0#&{K zKb0@}J-3_Ch(0ajo(xGwQli6bO_sfE(clim0gLJ3451ez$|DG?m63Sz_z~!2KKJJ8 zOnYyN{m+E>iJGh1R0ub>S;#!N4}bGye)jC?7@a*`!gI_Qv^Wv;A*XmI7JmYgt$^I$ z7gyC)=rfz&jE;^T93CFh(xb;uke8c-jIVYfd;b?RlDT&`a?=l>xw#oU>buw|MT~t( bl8*fgqP3f!&7lcY00000NkvXXu0mjf$3NXA literal 0 HcmV?d00001 diff --git a/BizHawk.Client.EmuHawk/images/meteor.png b/BizHawk.Client.EmuHawk/images/meteor.png new file mode 100644 index 0000000000000000000000000000000000000000..8ddc63696cb19703419b4c2d1b933944d3cb63c9 GIT binary patch literal 820 zcmV-41Izr0P)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D02*{fSaefwW^{L9 za%BKeVQFr3E>1;MAa*k@H7+qRNAp5A0007`NklNS2dF$h2_k}_l%#FdmNwH(o7P&b*&n`^uB{jF z+4r{}5H=e8%4tG_$F#zbaw@KuN>SZ|u7Ueq{ouevd3B*=z)E^S-7Kmbu~yU$tgjdY z(x+khxL?eTt0oBfSfgBj)II#LdvIQ&i{kXGl3SWXDho(K23|KefQUh7<3qM-&^}Ff z2_P4rezaZed(7*(2ZoKNjFOjw0^5 zNuxT74(Ak{ZS7b^&8{dIr#UY`n)G%7!y#b!B?wjUVi2KtwjM1^BC>>hl*C7hYF=K& zP2vL?VgIL$3y7PS94PEW;d-tA*A~!`|2j_z@tfvhVtUUlZ+ck zSd31L>Bd=a^JKv~7ZkCALdJ($uH;?Yl(8$?@w00DFsLuez%3c=tl$GSR?JR}<-*`j zo;*m${6aV)X4Ty<_I!p-DJwY(|G7MEdlzeSoSF(gF9#`LaSPc#G3U6HXjdDg3?XMZ z2|1FGa@HkqTEV^j`MY6LZL8VM1@>h%0&FZ>s7YQC=P*a4h#f*X9>Adx4iX|LCIa^Z zhE~0^Wt?efk@D=w=bVQE%T$57^-VTv)x}cgMITBJptKN5i{iAaqvp$bXL)IcDimji z{(4ftQY_a!QGQ~^Wx~>_WH^!BcBf~?j_Tg y$NN{ut-J4EOPx#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D02*{fSaefwW^{L9 za%BKeVQFr3E>1;MAa*k@H7+qRNAp5A0008GNklh$dcAI zWr7Oh2kr&!+##(CThga**jKr7-{+p)Xa6^DJo?|Ka*{Sw34S1=sLookeDC{pcV7I5 z;rZw8{0F)u4XT7NNS(4~*UFnu|1ZD(e^6-CD_tFJWX&7L%OD<=DvQa@` z$I60zc=kV^S^cfh5woJw*K`j=?zYwvEliG^LOE1%bU058c;bSgPN5qQ$YPJO`z$? zv3)D%#`G@V>Q&ks8`3)eNXqQZ{{tIl%@1ywH*dy?>;G5YfOu`m)kpu!SMB|4mtG|T zbn=|qmMzEs&p&(T|JvIx{x1hgmMq=<%ddWVzgNYCV)xSS@XWcJ{>?sj_x}v2w9?v=d@Qf9CH z+qCEG|E9g?|5tB2@jr9%*8k3x-R%sf5g9^7%Xa*k4fG!<;HI3s`M+(?ng1R&{o8>G zrew`q|KF{qZ<%#=RfK2#gwx(llXuw{H#b^mRl2LY2l9i$jWN7;{^gc^=l?eVZK&LO z{C`OAyw5hdwGp`sH~s+y*sN36|Hn*R^cpCp3l2DR;8N8+D}3VO4?xrRIuy6GSZ0)4 z`L|5nzYG{2Aa5-KriI?am;O6dbQVLkpaQ*+1VJt#QBEKeZhBDr^tFqxJo-Q5?Ct-( zz_ie`_uPN)=BaC;(u9FyS$lEo-n0LkfnKWs23qdAL;nMM=062W5tp%S^Xe><=WYC- zvS`cyu*u8*dbdo!=~Uja2qiOD1;^LGcW)EY^Ht< T<%>9900000NkvXXu0mjfaW|)8 literal 0 HcmV?d00001