From 87345375727ac89a9050217a8668af6885c9bd58 Mon Sep 17 00:00:00 2001 From: adelikat Date: Fri, 25 Apr 2014 21:55:56 +0000 Subject: [PATCH] add emu7800 icon, don't show author in tooltip --- .../BizHawk.Client.EmuHawk.csproj | 1 + BizHawk.Client.EmuHawk/MainForm.cs | 10 +++++++--- .../Properties/Resources.Designer.cs | 10 ++++++++++ BizHawk.Client.EmuHawk/Properties/Resources.resx | 3 +++ BizHawk.Client.EmuHawk/images/emu7800.png | Bin 0 -> 856 bytes 5 files changed, 21 insertions(+), 3 deletions(-) create mode 100644 BizHawk.Client.EmuHawk/images/emu7800.png diff --git a/BizHawk.Client.EmuHawk/BizHawk.Client.EmuHawk.csproj b/BizHawk.Client.EmuHawk/BizHawk.Client.EmuHawk.csproj index cd4311d678..2ba034734f 100644 --- a/BizHawk.Client.EmuHawk/BizHawk.Client.EmuHawk.csproj +++ b/BizHawk.Client.EmuHawk/BizHawk.Client.EmuHawk.csproj @@ -1488,6 +1488,7 @@ + diff --git a/BizHawk.Client.EmuHawk/MainForm.cs b/BizHawk.Client.EmuHawk/MainForm.cs index ac198ac160..4aa988db3f 100644 --- a/BizHawk.Client.EmuHawk/MainForm.cs +++ b/BizHawk.Client.EmuHawk/MainForm.cs @@ -11,6 +11,7 @@ using BizHawk.Client.Common; using BizHawk.Common; using BizHawk.Emulation.Common; using BizHawk.Emulation.Cores.Atari.Atari2600; +using BizHawk.Emulation.Cores.Atari.Atari7800; using BizHawk.Emulation.Cores.Calculators; using BizHawk.Emulation.Cores.Consoles.Nintendo.QuickNES; using BizHawk.Emulation.Cores.Consoles.Sega.gpgx; @@ -2336,9 +2337,7 @@ namespace BizHawk.Client.EmuHawk (!attributes.Released ? "(Experimental) " : string.Empty) + attributes.CoreName; - CoreNameStatusBarButton.ToolTipText = - (attributes.Ported ? "(ported) " : string.Empty) + - "written by: " + attributes.Author; + CoreNameStatusBarButton.ToolTipText = attributes.Ported ? "(ported) " : string.Empty; if (!attributes.Ported) { @@ -2358,6 +2357,11 @@ namespace BizHawk.Client.EmuHawk { CoreNameStatusBarButton.Image = BizHawk.Client.EmuHawk.Properties.Resources.yabause; } + else if (Global.Emulator is Atari7800) + { + CoreNameStatusBarButton.Image = BizHawk.Client.EmuHawk.Properties.Resources.emu7800; + } + // TODO: other icons // unknown diff --git a/BizHawk.Client.EmuHawk/Properties/Resources.Designer.cs b/BizHawk.Client.EmuHawk/Properties/Resources.Designer.cs index 98c660642a..4da40b4ab2 100644 --- a/BizHawk.Client.EmuHawk/Properties/Resources.Designer.cs +++ b/BizHawk.Client.EmuHawk/Properties/Resources.Designer.cs @@ -400,6 +400,16 @@ namespace BizHawk.Client.EmuHawk.Properties { } } + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap emu7800 { + get { + object obj = ResourceManager.GetObject("emu7800", 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 885960d943..894cc92fbb 100644 --- a/BizHawk.Client.EmuHawk/Properties/Resources.resx +++ b/BizHawk.Client.EmuHawk/Properties/Resources.resx @@ -906,6 +906,9 @@ ..\images\bsnes.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\images\emu7800.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/emu7800.png b/BizHawk.Client.EmuHawk/images/emu7800.png new file mode 100644 index 0000000000000000000000000000000000000000..ec37d9fa2675d8d85ff3eb0a40ce2d53bc9e6dfd GIT binary patch literal 856 zcmV-e1E>6nP)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D02*{fSaefwW^{L9 za%BKeVQFr3E>1;MAa*k@H7+qRNAp5A0008VNklh z;g;EL70msS8dt}TlT#$=1q?IN7!*Rgv^@hAzXm8iiSH796SauC`zgNnSNOy~2@2-Y zFoO;_Z?{op8jjZ##*1);H$>qHRWuAy)QK90i^AkELS~jQZbn9MDqhn8t)+!fz6jRN zhoV`qUTWz=*f3Z89N3X5eVWXsL9xuXT~nnfZE5qrFo65i9;B>W4~!9?B$D0MY#rbaWJpP& z1H04&x`>e~5afv1KmO;xEbwP11%IdflRiKr%Xq{b?lF#Pl5xvYt<*bGA7G=2(bNd| zAxYHB3q8!{8B29QNka;byB1u}trUIHD0myia=(V_T@?9}t^TC3#A{_ub2KZST3F;Z zv$=kv4k&y%nM|*ZoX_!Owa4Q45zhjjMsBxc0XrG~zgf0qjuwp^k4Dk+Njf0wx|6)e zi*Yo$NcUv1pedI$PbL|!oXmgiVxHG2K9BUqh2%ZUp`bPw=T-UfeE`$gRT!cRF_>3k z)Yf56D95CgGQwPp(NaugTp4ED4oud~7{XU$Fs@`|QjrcAp~|tS