From ce82c43bb7b71087518395de434f1ef49468df48 Mon Sep 17 00:00:00 2001 From: Soren Jorvang Date: Thu, 10 Jun 2010 14:39:08 +0000 Subject: [PATCH] Disable the Wiiuse banner and instead credit Michael Laforest, the original author, in the About dialog. Ok'ed with him. WX doesn't reflow text terribly well, so format it manually. git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5646 8ced0084-cf51-0410-be5f-012b33b47a6e --- Externals/WiiUseSrc/Src/wiiuse.c | 2 +- Source/Core/DolphinWX/Src/AboutDolphin.cpp | 55 +++++++++++++++------- Source/Core/DolphinWX/Src/AboutDolphin.h | 1 - 3 files changed, 39 insertions(+), 19 deletions(-) diff --git a/Externals/WiiUseSrc/Src/wiiuse.c b/Externals/WiiUseSrc/Src/wiiuse.c index 606b390068..9757d0a5dd 100644 --- a/Externals/WiiUseSrc/Src/wiiuse.c +++ b/Externals/WiiUseSrc/Src/wiiuse.c @@ -49,7 +49,7 @@ #include "events.h" #include "io.h" -static int g_banner = 0; +static int g_banner = 1; /** * @breif Returns the version of the library. diff --git a/Source/Core/DolphinWX/Src/AboutDolphin.cpp b/Source/Core/DolphinWX/Src/AboutDolphin.cpp index 86ab39fd31..548704fa8b 100644 --- a/Source/Core/DolphinWX/Src/AboutDolphin.cpp +++ b/Source/Core/DolphinWX/Src/AboutDolphin.cpp @@ -26,8 +26,10 @@ BEGIN_EVENT_TABLE(AboutDolphin, wxDialog) EVT_BUTTON(wxID_CLOSE, AboutDolphin::CloseClick) END_EVENT_TABLE() -AboutDolphin::AboutDolphin(wxWindow *parent, wxWindowID id, const wxString &title, const wxPoint &position, const wxSize& size, long style) -: wxDialog(parent, id, title, position, size, style) +AboutDolphin::AboutDolphin(wxWindow *parent, wxWindowID id, + const wxString &title, const wxPoint &position, + const wxSize& size, long style) + : wxDialog(parent, id, title, position, size, style) { CreateGUIControls(); } @@ -38,25 +40,44 @@ AboutDolphin::~AboutDolphin() void AboutDolphin::CreateGUIControls() { - m_Close = new wxButton(this, wxID_CLOSE, wxT("Close"), wxDefaultPosition, wxDefaultSize, 0, wxDefaultValidator); - //miloszwl@miloszwl.com (miloszwl.deviantart.com) + m_Close = new wxButton(this, wxID_CLOSE, wxT("Close"), + wxDefaultPosition, wxDefaultSize, 0, wxDefaultValidator); wxMemoryInputStream istream(dolphin_logo_png, sizeof dolphin_logo_png); wxImage iDolphinLogo(istream, wxBITMAP_TYPE_PNG); - DolphinLogo = new wxBitmap(iDolphinLogo); - sbDolphinLogo = new wxStaticBitmap(this, ID_LOGO, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0); - sbDolphinLogo->SetBitmap(*DolphinLogo); - std::string Text = std::string("Dolphin SVN revision ") + SVN_REV_STR +"\n" "Copyright (c) 2003-2010+ Dolphin Team\n" - "Dolphin is a Gamecube/Wii emulator, which was originally written by F|RES and ector.\n" - "Today Dolphin is an open source project with many contributors, too many to list.\n" - "If interested, just go check out the project page at http://code.google.com/p/dolphin-emu.\n\n" - "Special thanks to Bushing, Costis, CrowTRobo, Marcan, Segher, Titanik, or9 and Hotquik for their reverse engineering and docs/demos.\n\n" - "Big thanks to Gilles Mouchard whose Microlib PPC emulator gave our development a kickstart.\n\n" - "Thanks to Frank Wille for his PowerPC disassembler, which or9 and we modified to include Gekko specifics.\n\n" - "Thanks to hcs/destop for their GC ADPCM decoder.\n\n" - "We are not affiliated with Nintendo in any way.\n" + sbDolphinLogo = new wxStaticBitmap(this, ID_LOGO, + wxBitmap(iDolphinLogo), wxDefaultPosition, wxDefaultSize, 0); + + std::string Text = std::string("") + + "Dolphin SVN revision " + SVN_REV_STR + "\n" + "Copyright (c) 2003-2010+ Dolphin Team\n" + "\n" + "Dolphin is a Gamecube/Wii emulator, which was\n" + "originally written by F|RES and ector.\n" + "Today Dolphin is an open source project with many\n" + "contributors, too many to list.\n" + "If interested, just go check out the project page at\n" + "http://code.google.com/p/dolphin-emu/ .\n" + "\n" + "Special thanks to Bushing, Costis, CrowTRobo,\n" + "Marcan, Segher, Titanik, or9 and Hotquik for their\n" + "reverse engineering and docs/demos.\n" + "\n" + "Big thanks to Gilles Mouchard whose Microlib PPC\n" + "emulator gave our development a kickstart.\n" + "\n" + "Thanks to Frank Wille for his PowerPC disassembler,\n" + "which or9 and we modified to include Gekko specifics.\n" + "\n" + "Thanks to hcs/destop for their GC ADPCM decoder.\n" + "\n" + "Thanks to Michael Laforest for the Wiiuse library.\n" + "\n" + "We are not affiliated with Nintendo in any way.\n" "Gamecube and Wii are trademarks of Nintendo.\n" - "The emulator is for educational purposes only and should not be used to play games you do not legally own.\n\n"; + "The emulator is for educational purposes only\n" + "and should not be used to play games you do\n" + "not legally own."; Message = new wxStaticText(this, ID_MESSAGE, wxString::FromAscii(Text.c_str()), wxDefaultPosition, wxDefaultSize, 0); diff --git a/Source/Core/DolphinWX/Src/AboutDolphin.h b/Source/Core/DolphinWX/Src/AboutDolphin.h index 813eb57e12..c8f0ba76cd 100644 --- a/Source/Core/DolphinWX/Src/AboutDolphin.h +++ b/Source/Core/DolphinWX/Src/AboutDolphin.h @@ -47,7 +47,6 @@ class AboutDolphin : public wxDialog wxButton *m_Close; wxStaticText *Message; - wxBitmap *DolphinLogo; wxStaticBitmap *sbDolphinLogo; enum