ShuriZma
/
pcsx2
mirror of https://github.com/PCSX2/pcsx2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #969 from toehead2001/about-box 

Clean up the About dialog
This commit is contained in:
Jonathan Li 2015-11-29 09:31:52 +00:00
parent 9aec4229d5 61067e9c3f
commit 7055e29670
8 changed files with 47 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pcsx2/CMakeLists.txt
View File

@ -377,7 +377,7 @@ set(pcsx2GuiResources
${res_bin}/ConfigIcon_Plugins.h ${res_bin}/ConfigIcon_Plugins.h
${res_bin}/ConfigIcon_Speedhacks.h ${res_bin}/ConfigIcon_Speedhacks.h
${res_bin}/ConfigIcon_Video.h ${res_bin}/ConfigIcon_Video.h
${res_bin}/Dualshock.h ${res_bin}/Logo.h
${res_bin}/Breakpoint_Active.h ${res_bin}/Breakpoint_Active.h
${res_bin}/Breakpoint_Inactive.h ${res_bin}/Breakpoint_Inactive.h
) )
@ -653,10 +653,8 @@ include_directories(
### Generate the resources files ### Generate the resources files
file(MAKE_DIRECTORY ${res_bin}) file(MAKE_DIRECTORY ${res_bin})
add_custom_command(OUTPUT "${res_bin}/Dualshock.h" COMMAND perl ${CMAKE_SOURCE_DIR}/linux_various/hex2h.pl "${res_src}/Dualshock.jpg" "${res_bin}/Dualshock" )
foreach(res_file IN ITEMS foreach(res_file IN ITEMS
AppIcon16 AppIcon32 AppIcon64 BackgroundLogo ButtonIcon_Camera AppIcon16 AppIcon32 AppIcon64 BackgroundLogo Logo ButtonIcon_Camera
ConfigIcon_Appearance ConfigIcon_Cpu ConfigIcon_Gamefixes ConfigIcon_MemoryCard ConfigIcon_Appearance ConfigIcon_Cpu ConfigIcon_Gamefixes ConfigIcon_MemoryCard
ConfigIcon_Paths ConfigIcon_Plugins ConfigIcon_Speedhacks ConfigIcon_Video Breakpoint_Active Breakpoint_Inactive) ConfigIcon_Paths ConfigIcon_Plugins ConfigIcon_Speedhacks ConfigIcon_Video Breakpoint_Active Breakpoint_Inactive)
add_custom_command(OUTPUT "${res_bin}/${res_file}.h" COMMAND perl ${CMAKE_SOURCE_DIR}/linux_various/hex2h.pl "${res_src}/${res_file}.png" "${res_bin}/${res_file}" ) add_custom_command(OUTPUT "${res_bin}/${res_file}.h" COMMAND perl ${CMAKE_SOURCE_DIR}/linux_various/hex2h.pl "${res_src}/${res_file}.png" "${res_bin}/${res_file}" )

66
pcsx2/gui/Dialogs/AboutBoxDialog.cpp
View File

@ -20,7 +20,7 @@
#include "Dialogs/ModalPopups.h" #include "Dialogs/ModalPopups.h"
#include "Resources/EmbeddedImage.h" #include "Resources/EmbeddedImage.h"
#include "Resources/Dualshock.h" #include "Resources/Logo.h"
#include <wx/mstream.h> #include <wx/mstream.h>
#include <wx/hyperlink.h> #include <wx/hyperlink.h>
@ -32,14 +32,14 @@ using namespace pxSizerFlags;
// -------------------------------------------------------------------------------------- // --------------------------------------------------------------------------------------
Dialogs::AboutBoxDialog::AboutBoxDialog(wxWindow* parent) Dialogs::AboutBoxDialog::AboutBoxDialog(wxWindow* parent)
: wxDialogWithHelpers( parent, AddAppName(_("About %s")), pxDialogFlags().Resize().MinWidth( 460 ) ) : wxDialogWithHelpers(parent, AddAppName(_("About %s")), pxDialogFlags())
, m_bitmap_dualshock( this, wxID_ANY, wxBitmap( EmbeddedImage<res_Dualshock>().Get() ), , m_bitmap_logo(this, wxID_ANY, wxBitmap(EmbeddedImage<res_Logo>().Get()),
wxDefaultPosition, wxDefaultSize, wxBORDER_SUNKEN wxDefaultPosition, wxDefaultSize
) )
{ {
// [TODO] : About box should be upgraded to use scrollable read-only text boxes. // [TODO] : About box should be upgraded to use scrollable read-only text boxes.
wxString LabelAuthors = wxsFormat( wxString developsString = wxsFormat(
L"Arcum42, avih, Refraction, drk||raziel, cottonvibes, gigaherz, " L"Arcum42, avih, Refraction, drk||raziel, cottonvibes, gigaherz, "
L"rama, Jake.Stine, saqib, pseudonym, gregory.hainaut" L"rama, Jake.Stine, saqib, pseudonym, gregory.hainaut"
L"\n\n" L"\n\n"
@ -54,8 +54,7 @@ Dialogs::AboutBoxDialog::AboutBoxDialog( wxWindow* parent )
L"%s: CKemu, Falcon4ever", L"%s: CKemu, Falcon4ever",
_("Previous versions"), _("Betatesting"), _("Webmasters")); _("Previous versions"), _("Betatesting"), _("Webmasters"));
wxString contribsString = wxsFormat(
wxString LabelGreets = wxsFormat(
L"Hiryu and Sjeep (libcdvd / iso filesystem), nneeve (fpu and vu), n1ckname (compilation guides), Shadow Lady" L"Hiryu and Sjeep (libcdvd / iso filesystem), nneeve (fpu and vu), n1ckname (compilation guides), Shadow Lady"
L"\n\n" L"\n\n"
L"%s: ChickenLiver (Lilypad), Efp (efp), " L"%s: ChickenLiver (Lilypad), Efp (efp), "
@ -65,38 +64,28 @@ Dialogs::AboutBoxDialog::AboutBoxDialog( wxWindow* parent )
L"F|RES, Jake.Stine, MrBrown, razorblade, Seta-san, Skarmeth, feal87, Athos", L"F|RES, Jake.Stine, MrBrown, razorblade, Seta-san, Skarmeth, feal87, Athos",
_("Plugin Specialists"), _("Special thanks to")); _("Plugin Specialists"), _("Special thanks to"));
// This sizer holds text of the authors and a logo! wxFlexGridSizer& boxesContainer = *new wxFlexGridSizer(2, 0, StdPadding);
wxFlexGridSizer& AuthLogoSizer = *new wxFlexGridSizer( 2, 0, StdPadding ); boxesContainer.AddGrowableCol(0, 1);
AuthLogoSizer.AddGrowableCol(0, 4); boxesContainer.AddGrowableCol(1, 1);
AuthLogoSizer.AddGrowableCol(1, 3);
// this sizer holds text of the contributors/testers, and a ps2 image! wxStaticBoxSizer& developsBox = *new wxStaticBoxSizer(wxVERTICAL, this);
wxBoxSizer& ContribSizer = *new wxBoxSizer( wxHORIZONTAL ); wxStaticBoxSizer& contribsBox = *new wxStaticBoxSizer(wxVERTICAL, this);
wxStaticBoxSizer& aboutUs = *new wxStaticBoxSizer( wxVERTICAL, this ); pxStaticText& developsText = Text(developsString).SetMinWidth(240);
wxStaticBoxSizer& contribs = *new wxStaticBoxSizer( wxVERTICAL, this ); pxStaticText& contribsText = Text(contribsString).SetMinWidth(240);
pxStaticText& label_auth = Text( LabelAuthors ).SetMinWidth(240); developsBox += Heading(_("Developers")).Bold() | StdExpand();
pxStaticText& label_greets = Text( LabelGreets ).SetMinWidth(200); developsBox += developsText | StdExpand();
contribsBox += Heading(_("Contributors")).Bold() | StdExpand();
contribsBox += contribsText | StdExpand();
aboutUs += Heading(_("Developers")).Bold() | StdExpand(); boxesContainer += developsBox | StdExpand();
aboutUs += label_auth | StdExpand(); boxesContainer += contribsBox | StdExpand();
contribs += Heading(_("Contributors")).Bold() | StdExpand();
contribs += label_greets | StdExpand();
AuthLogoSizer += aboutUs | StdExpand(); // Main layout
AuthLogoSizer += contribs | StdExpand(); *this += m_bitmap_logo | StdCenter();
ContribSizer += pxStretchSpacer( 1 ); *this += Text(_("PlayStation 2 Emulator"));
ContribSizer += m_bitmap_dualshock | StdSpace();
ContribSizer += pxStretchSpacer( 1 );
// Main (top-level) layout
*this += StdPadding;
*this += Text(wxGetApp().GetAppName()).Bold();
*this += Text(_("A Playstation 2 Emulator"));
*this += AuthLogoSizer | StdExpand();
*this += new wxHyperlinkCtrl(this, wxID_ANY, *this += new wxHyperlinkCtrl(this, wxID_ANY,
_("PCSX2 Official Website and Forums"), L"http://www.pcsx2.net" _("PCSX2 Official Website and Forums"), L"http://www.pcsx2.net"
@ -106,10 +95,11 @@ Dialogs::AboutBoxDialog::AboutBoxDialog( wxWindow* parent )
_("PCSX2 Official Git Repository at GitHub"), L"https://github.com/PCSX2/pcsx2" _("PCSX2 Official Git Repository at GitHub"), L"https://github.com/PCSX2/pcsx2"
) | pxProportion(1).Center().Border(wxALL, 3); ) | pxProportion(1).Center().Border(wxALL, 3);
*this += ContribSizer | StdExpand(); *this += boxesContainer | StdCenter();
*this += new wxButton( this, wxID_OK, _("I've seen enough")) | StdCenter();
int bestHeight = GetBestSize().GetHeight(); wxButton& closeButton = *new wxButton(this, wxID_OK, _("I've seen enough"));
if( bestHeight < 400 ) bestHeight = 400; closeButton.SetFocus();
SetMinHeight( bestHeight ); *this += closeButton | StdCenter();
SetSizerAndFit(GetSizer());
} }

3
pcsx2/gui/Dialogs/ModalPopups.h
View File

@ -61,8 +61,7 @@ namespace Dialogs
class AboutBoxDialog: public wxDialogWithHelpers class AboutBoxDialog: public wxDialogWithHelpers
{ {
protected: protected:
//wxStaticBitmap m_bitmap_logo; wxStaticBitmap m_bitmap_logo;
wxStaticBitmap m_bitmap_dualshock;
public: public:
AboutBoxDialog( wxWindow* parent=NULL ); AboutBoxDialog( wxWindow* parent=NULL );

BIN
pcsx2/gui/Resources/Dualshock.jpg
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 24 KiB

BIN
pcsx2/gui/Resources/Logo.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 6.1 KiB

2
pcsx2/gui/Resources/rebuild.sh
View File

@ -25,4 +25,4 @@
../../../tools/bin/bin2cpp ConfigIcon_Speedhacks.png ../../../tools/bin/bin2cpp ConfigIcon_Speedhacks.png
../../../tools/bin/bin2cpp ConfigIcon_Gamefixes.png ../../../tools/bin/bin2cpp ConfigIcon_Gamefixes.png
../../../tools/bin/bin2cpp ConfigIcon_Video.png ../../../tools/bin/bin2cpp ConfigIcon_Video.png
../../../tools/bin/bin2cpp Dualshock.png ../../../tools/bin/bin2cpp Logo.png

2
pcsx2/windows/VCprojects/pcsx2.vcxproj
View File

@ -389,7 +389,7 @@
</Command> </Command>
<Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(RootDir)%(Directory)\%(Filename).h</Outputs> <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(RootDir)%(Directory)\%(Filename).h</Outputs>
</CustomBuild> </CustomBuild>
<CustomBuild Include="..\..\gui\Resources\Dualshock.jpg"> <CustomBuild Include="..\..\gui\Resources\Logo.png">
<Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
</Message> </Message>
<Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">cmd.exe /c "%(RootDir)%(Directory)\bin2cpp.cmd" %(Filename)%(Extension) <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">cmd.exe /c "%(RootDir)%(Directory)\bin2cpp.cmd" %(Filename)%(Extension)

6
pcsx2/windows/VCprojects/pcsx2.vcxproj.filters
View File

@ -1380,9 +1380,6 @@
<CustomBuild Include="..\..\gui\Resources\ConfigIcon_Video.png"> <CustomBuild Include="..\..\gui\Resources\ConfigIcon_Video.png">
<Filter>AppHost\Resources</Filter> <Filter>AppHost\Resources</Filter>
</CustomBuild> </CustomBuild>
<CustomBuild Include="..\..\gui\Resources\Dualshock.jpg">
<Filter>AppHost\Resources</Filter>
</CustomBuild>
<CustomBuild Include="..\..\gui\Resources\ConfigIcon_Appearance.png"> <CustomBuild Include="..\..\gui\Resources\ConfigIcon_Appearance.png">
<Filter>AppHost\Resources</Filter> <Filter>AppHost\Resources</Filter>
</CustomBuild> </CustomBuild>
@ -1392,6 +1389,9 @@
<CustomBuild Include="..\..\gui\Resources\Breakpoint_Active.png"> <CustomBuild Include="..\..\gui\Resources\Breakpoint_Active.png">
<Filter>AppHost\Resources</Filter> <Filter>AppHost\Resources</Filter>
</CustomBuild> </CustomBuild>
<CustomBuild Include="..\..\gui\Resources\Logo.png">
<Filter>AppHost\Resources</Filter>
</CustomBuild>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<Manifest Include="..\PCSX2.manifest"> <Manifest Include="..\PCSX2.manifest">