From 18fe9431e0f7607d61dea791545b719b8d3d40fa Mon Sep 17 00:00:00 2001 From: lightningterror Date: Mon, 26 Aug 2019 23:02:01 +0200 Subject: [PATCH] pcsx2-gui: Update About window. Add forum and license links. Remove Developers and Contributors names, replaced with: "Big thanks to everyone who contributed to the project throughout the years." --- pcsx2/gui/Dialogs/AboutBoxDialog.cpp | 77 ++++++++-------------------- 1 file changed, 20 insertions(+), 57 deletions(-) diff --git a/pcsx2/gui/Dialogs/AboutBoxDialog.cpp b/pcsx2/gui/Dialogs/AboutBoxDialog.cpp index 5fe879a9ae..4c9d8e6007 100644 --- a/pcsx2/gui/Dialogs/AboutBoxDialog.cpp +++ b/pcsx2/gui/Dialogs/AboutBoxDialog.cpp @@ -37,69 +37,32 @@ Dialogs::AboutBoxDialog::AboutBoxDialog(wxWindow* parent) wxDefaultPosition, wxDefaultSize ) { - // [TODO] : About box should be upgraded to use scrollable read-only text boxes. - - wxString developsString = wxsFormat( - L"avih, Refraction, rama, pseudonym, gregory.hainaut, turtleli" - L"\n\n" - L"%s: \n" - L"Arcum42, Aumatt, drk||raziel, " - L"cottonvibes, gigaherz, saqib, " - L"\n" - L"Alexey Silinov, Florin, " - L"goldfinger, Linuzappz, loser, " - L"Nachbrenner, shadow, Zerofrog, tmkk, Jake.Stine" - L"\n\n" - L"%s:\n" - L"Falcon4ever, Bositman, Akasha", - _("Previous versions"), _("Webmasters")); - - wxString contribsString = wxsFormat( - L"ssakash, FlatOut, CK1, lightningterror, atomic83github, Pandubz, Prafull, Blyss Sarania, Nobbs66, Alessandro Vetere" - L"\n\n" - L"%s: \n" - L"ChickenLiver (Lilypad), Gabest (GSdx, Cdvdolio, Xpad), Ckemu, " - L"General Plot, KrossX, Devina, micove, black_wd, Belmont, " - L"\n" - L"BGome, _Demo_, Dreamtime, Hiryu and Sjeep, nneeve, F|RES, " - L"Shadow Lady, MrBrown, razorblade, Seta-san, Skarmeth, feal87, Athos" - L"\n", - _("Previous versions")); - - wxFlexGridSizer& boxesContainer = *new wxFlexGridSizer(2, 0, StdPadding); - boxesContainer.AddGrowableCol(0, 1); - boxesContainer.AddGrowableCol(1, 1); - - wxStaticBoxSizer& developsBox = *new wxStaticBoxSizer(wxVERTICAL, this); - wxStaticBoxSizer& contribsBox = *new wxStaticBoxSizer(wxVERTICAL, this); - - pxStaticText& developsText = Text(developsString).SetMinWidth(350); - pxStaticText& contribsText = Text(contribsString).SetMinWidth(350); - - developsBox += Heading(_("Developers")).Bold() | StdExpand(); - developsBox += developsText | StdExpand(); - contribsBox += Heading(_("Contributors")).Bold() | StdExpand(); - contribsBox += contribsText | StdExpand(); - - boxesContainer += developsBox | StdExpand(); - boxesContainer += contribsBox | StdExpand(); - // Main layout + + SetMinWidth(460); + *this += m_bitmap_logo | StdCenter(); - *this += Text(_("PlayStation 2 Emulator")); +#ifdef _WIN32 + const int padding = 15; +#else + const int padding = 8; +#endif - *this += new wxHyperlinkCtrl(this, wxID_ANY, - _("PCSX2 Official Website and Forums"), L"https://pcsx2.net" - ) | pxProportion(1).Center().Border(wxALL, 3); + wxBoxSizer& general(*new wxBoxSizer(wxHORIZONTAL)); + general += new wxHyperlinkCtrl(this, wxID_ANY, _("Website"), L"https://pcsx2.net"); + general += padding; + general += new wxHyperlinkCtrl(this, wxID_ANY, _("Support Forums"), L"https://forums.pcsx2.net"); + general += padding; + general += new wxHyperlinkCtrl(this, wxID_ANY, _("GitHub Repository"), L"https://github.com/PCSX2/pcsx2"); + general += padding; + general += new wxHyperlinkCtrl(this, wxID_ANY, _("License"), L"https://github.com/PCSX2/pcsx2/blob/master/pcsx2/Docs/License.txt"); - *this += new wxHyperlinkCtrl(this, wxID_ANY, - _("PCSX2 Official Git Repository at GitHub"), L"https://github.com/PCSX2/pcsx2" - ) | pxProportion(1).Center().Border(wxALL, 3); + *this += Text(_("PlayStation 2 Emulator:")); + *this += general | StdCenter(); + *this += Text(_("Big thanks to everyone who contributed to the project throughout the years.")); - *this += boxesContainer | StdCenter(); - - wxButton& closeButton = *new wxButton(this, wxID_OK, _("I've seen enough")); + wxButton& closeButton = *new wxButton(this, wxID_OK, _("Close")); closeButton.SetFocus(); *this += closeButton | StdCenter();