mirror/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-04-16 14:42:52 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Disable the Wiiuse banner and instead credit Michael Laforest,

Browse Source 
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
This commit is contained in:
Soren Jorvang 2010-06-10 14:39:08 +00:00
parent 404c625622
commit ce82c43bb7
3 changed files with 39 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Externals/WiiUseSrc/Src/wiiuse.c vendored
View File

@ -49,7 +49,7 @@
#include "events.h" #include "events.h"
#include "io.h" #include "io.h"
static int g_banner = 0; static int g_banner = 1;
/** /**
* @breif Returns the version of the library. * @breif Returns the version of the library.

53
Source/Core/DolphinWX/Src/AboutDolphin.cpp
View File

@ -26,8 +26,10 @@ BEGIN_EVENT_TABLE(AboutDolphin, wxDialog)
EVT_BUTTON(wxID_CLOSE, AboutDolphin::CloseClick) EVT_BUTTON(wxID_CLOSE, AboutDolphin::CloseClick)
END_EVENT_TABLE() END_EVENT_TABLE()
AboutDolphin::AboutDolphin(wxWindow *parent, wxWindowID id, const wxString &title, const wxPoint &position, const wxSize& size, long style) AboutDolphin::AboutDolphin(wxWindow *parent, wxWindowID id,
: wxDialog(parent, id, title, position, size, style) const wxString &title, const wxPoint &position,
const wxSize& size, long style)
: wxDialog(parent, id, title, position, size, style)
{ {
CreateGUIControls(); CreateGUIControls();
} }
@ -38,25 +40,44 @@ AboutDolphin::~AboutDolphin()
void AboutDolphin::CreateGUIControls() void AboutDolphin::CreateGUIControls()
{ {
m_Close = new wxButton(this, wxID_CLOSE, wxT("Close"), wxDefaultPosition, wxDefaultSize, 0, wxDefaultValidator); m_Close = new wxButton(this, wxID_CLOSE, wxT("Close"),
//miloszwl@miloszwl.com (miloszwl.deviantart.com) wxDefaultPosition, wxDefaultSize, 0, wxDefaultValidator);
wxMemoryInputStream istream(dolphin_logo_png, sizeof dolphin_logo_png); wxMemoryInputStream istream(dolphin_logo_png, sizeof dolphin_logo_png);
wxImage iDolphinLogo(istream, wxBITMAP_TYPE_PNG); wxImage iDolphinLogo(istream, wxBITMAP_TYPE_PNG);
DolphinLogo = new wxBitmap(iDolphinLogo); sbDolphinLogo = new wxStaticBitmap(this, ID_LOGO,
sbDolphinLogo = new wxStaticBitmap(this, ID_LOGO, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0); wxBitmap(iDolphinLogo), 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" std::string Text = std::string("") +
"Dolphin is a Gamecube/Wii emulator, which was originally written by F|RES and ector.\n" "Dolphin SVN revision " + SVN_REV_STR + "\n"
"Today Dolphin is an open source project with many contributors, too many to list.\n" "Copyright (c) 2003-2010+ Dolphin Team\n"
"If interested, just go check out the project page at http://code.google.com/p/dolphin-emu.\n\n" "\n"
"Special thanks to Bushing, Costis, CrowTRobo, Marcan, Segher, Titanik, or9 and Hotquik for their reverse engineering and docs/demos.\n\n" "Dolphin is a Gamecube/Wii emulator, which was\n"
"Big thanks to Gilles Mouchard whose Microlib PPC emulator gave our development a kickstart.\n\n" "originally written by F|RES and ector.\n"
"Thanks to Frank Wille for his PowerPC disassembler, which or9 and we modified to include Gekko specifics.\n\n" "Today Dolphin is an open source project with many\n"
"Thanks to hcs/destop for their GC ADPCM decoder.\n\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" "We are not affiliated with Nintendo in any way.\n"
"Gamecube and Wii are trademarks of Nintendo.\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, Message = new wxStaticText(this, ID_MESSAGE,
wxString::FromAscii(Text.c_str()), wxString::FromAscii(Text.c_str()),
wxDefaultPosition, wxDefaultSize, 0); wxDefaultPosition, wxDefaultSize, 0);

1
Source/Core/DolphinWX/Src/AboutDolphin.h
View File

@ -47,7 +47,6 @@ class AboutDolphin : public wxDialog
wxButton *m_Close; wxButton *m_Close;
wxStaticText *Message; wxStaticText *Message;
wxBitmap *DolphinLogo;
wxStaticBitmap *sbDolphinLogo; wxStaticBitmap *sbDolphinLogo;
enum enum