mirror of https://github.com/PCSX2/pcsx2.git
wxGui branch: Added the About box, and embedded images/icons into the exe. Since images are embedded now, I moved them from the /bin folder to the /pcsx2/resources folder.
git-svn-id: http://pcsx2.googlecode.com/svn/branches/wxgui@899 96395faa-99c1-11dd-bbfe-3dabce05a288
This commit is contained in:
Jake.Stine
parent
6562396612
commit
30339b5ca8
|
|
@ -25,6 +25,8 @@
|
|||
|
||||
class MainEmuFrame;
|
||||
|
||||
//////////////////////////////////////////////////////////////////////////////////////////
|
||||
//
|
||||
struct ConsoleLogOptions
|
||||
{
|
||||
bool Show;
|
||||
|
|
@ -89,6 +91,7 @@ protected:
|
|||
DECLARE_EVENT_TABLE()
|
||||
|
||||
void OnMoveAround( wxMoveEvent& evt );
|
||||
void OnResize( wxSizeEvent& evt );
|
||||
};
|
||||
|
||||
//////////////////////////////////////////////////////////////////////////////////////////
|
||||
|
|
@ -123,3 +126,4 @@ public:
|
|||
DECLARE_APP(Pcsx2App)
|
||||
|
||||
static AppConfig& Conf() { return wxGetApp().GetActiveConfig(); }
|
||||
|
||||
|
|
|
|||
|
|
@ -50,4 +50,5 @@ void AppConfig::LoadSettings()
|
|||
void AppConfig::SaveSettings()
|
||||
{
|
||||
Write( wxT("ConLogDisplayPosition"), ConLogBox.AutoDock ? "docked" : ToString( ConLogBox.DisplayPos ) );
|
||||
Write( wxT("ConLogDisplaySize"), ToString( ConLogBox.DisplaySize ) );
|
||||
}
|
||||
|
|
|
|||
|
|
@ -104,6 +104,7 @@ ConsoleLogFrame::ConsoleLogFrame(MainEmuFrame *parent, const wxString& title) :
|
|||
ClearColor();
|
||||
|
||||
Connect( wxEVT_MOVE, wxMoveEventHandler(ConsoleLogFrame::OnMoveAround) );
|
||||
Connect( wxEVT_SIZE, wxSizeEventHandler(ConsoleLogFrame::OnResize) );
|
||||
}
|
||||
|
||||
ConsoleLogFrame::~ConsoleLogFrame() { }
|
||||
|
|
@ -118,6 +119,14 @@ void ConsoleLogFrame::OnMoveAround( wxMoveEvent& evt )
|
|||
|
||||
if( snapzone.Contains( GetPosition() ) )
|
||||
SetPosition( topright + wxSize( 1,0 ) );
|
||||
|
||||
evt.Skip();
|
||||
}
|
||||
|
||||
void ConsoleLogFrame::OnResize( wxSizeEvent& evt )
|
||||
{
|
||||
Conf().ConLogBox.DisplaySize = GetSize();
|
||||
evt.Skip();
|
||||
}
|
||||
|
||||
void ConsoleLogFrame::DoClose()
|
||||
|
|
|
|||
|
|
@ -22,7 +22,8 @@
|
|||
#include "AboutBoxDialog.h"
|
||||
#include "wxHelpers.h"
|
||||
|
||||
#include "ps2_silver.h"
|
||||
#include "Resources/EmbeddedImage.h"
|
||||
#include "Resources/ps2_silver.h"
|
||||
|
||||
#include <wx/mstream.h>
|
||||
#include <wx/hyperlink.h>
|
||||
|
|
@ -46,8 +47,9 @@ public:
|
|||
|
||||
AboutBoxDialog::AboutBoxDialog( wxWindow* parent, int id ):
|
||||
wxDialog( parent, id, _("About Pcsx2") ),
|
||||
m_bitmap_logo( this, wxID_ANY, wxGetApp().GetLogoBitmap(), wxDefaultPosition, wxDefaultSize, wxBORDER_SUNKEN ),
|
||||
m_bitmap_ps2system( this, wxID_ANY, wxBitmap( wxImage( wxMemoryInputStream( png_ps2_silver, PNG_PS2_SILVER_LEN ), wxBITMAP_TYPE_PNG ) ),
|
||||
m_bitmap_logo( this, wxID_ANY, wxGetApp().GetLogoBitmap(),
|
||||
wxDefaultPosition, wxDefaultSize, wxBORDER_SUNKEN ),
|
||||
m_bitmap_ps2system( this, wxID_ANY, wxBitmap( EmbeddedImage<png_ps2_silver>().GetImage() ),
|
||||
wxDefaultPosition, wxDefaultSize, wxBORDER_SUNKEN )
|
||||
{
|
||||
static const wxString LabelAuthors = _(
|
||||
|
|
|
|||
|
|
@ -18,7 +18,6 @@
|
|||
|
||||
#pragma once
|
||||
|
||||
|
||||
#include <wx/wx.h>
|
||||
#include <wx/image.h>
|
||||
|
||||
|
|
|
|||
|
|
@ -22,6 +22,9 @@
|
|||
#include "Dialogs/LogOptionsDialog.h"
|
||||
#include "Dialogs/AboutBoxDialog.h"
|
||||
|
||||
#include "Resources/EmbeddedImage.h"
|
||||
#include "Resources/AppIcon.h"
|
||||
|
||||
using namespace Dialogs;
|
||||
|
||||
//////////////////////////////////////////////////////////////////////////////////////////
|
||||
|
|
@ -181,7 +184,11 @@ MainEmuFrame::MainEmuFrame(wxWindow* parent, int id, const wxString& title, cons
|
|||
wxSize backsize( m_background.GetSize() );
|
||||
|
||||
SetTitle(_t("Pcsx2"));
|
||||
SetIcon( wxIcon( wxT("./cdrom02.png"), wxBITMAP_TYPE_PNG ) );
|
||||
|
||||
wxIcon myIcon;
|
||||
myIcon.CopyFromBitmap( wxBitmap( EmbeddedImage<png_AppIcon>().GetImage() ) );
|
||||
SetIcon( myIcon );
|
||||
|
||||
int m_statusbar_widths[] = { (int)(backsize.GetWidth()*0.73), (int)(backsize.GetWidth()*0.25) };
|
||||
m_statusbar.SetStatusWidths(2, m_statusbar_widths);
|
||||
m_statusbar.SetStatusText( _T("The Status is Good!"), 0);
|
||||
|
|
|
|||
|
|
@ -19,7 +19,8 @@
|
|||
#include "PrecompiledHeader.h"
|
||||
#include "MainFrame.h"
|
||||
|
||||
#include <wx/image.h>
|
||||
#include "Resources/EmbeddedImage.h"
|
||||
#include "Resources/BackgroundLogo.h"
|
||||
|
||||
#include <ShlObj.h>
|
||||
|
||||
|
|
@ -115,7 +116,7 @@ bool Pcsx2App::OnInit()
|
|||
m_GlobalConfig = new AppConfig( Path::Combine( PathDefs::GetConfigs(), GetAppName() ) + ".ini" );
|
||||
m_GlobalConfig->LoadSettings();
|
||||
|
||||
m_Bitmap_Logo = new wxBitmap( _T("./pcsxAbout.png"), wxBITMAP_TYPE_PNG );
|
||||
m_Bitmap_Logo = new wxBitmap( EmbeddedImage<png_BackgroundLogo>().GetImage() );
|
||||
|
||||
m_MainFrame = new MainEmuFrame( NULL, wxID_ANY, wxEmptyString );
|
||||
SetTopWindow( m_MainFrame );
|
||||
|
|
|
|||
|
|
@ -19,6 +19,8 @@ namespace wxHelpers
|
|||
extern wxSizerFlags CheckboxFlags;
|
||||
}
|
||||
|
||||
//////////////////////////////////////////////////////////////////////////////////////////
|
||||
//
|
||||
class wxDialogWithHelpers : public wxDialog
|
||||
{
|
||||
protected:
|
||||
|
|
@ -32,4 +34,3 @@ protected:
|
|||
void AddOkCancel( wxBoxSizer& sizer );
|
||||
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -0,0 +1,158 @@
|
|||
/* Pcsx2 - Pc Ps2 Emulator
|
||||
* Copyright (C) 2002-2009 Pcsx2 Team
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License as published by
|
||||
* the Free Software Foundation; either version 2 of the License, or
|
||||
* (at your option) any later version.
|
||||
*
|
||||
* This program is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License
|
||||
* along with this program; if not, write to the Free Software
|
||||
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
|
||||
*/
|
||||
|
||||
#pragma once
|
||||
|
||||
#include "PS2Etypes.h"
|
||||
#include <wx/gdicmn.h>
|
||||
|
||||
class png_AppIcon
|
||||
{
|
||||
public:
|
||||
static const uint Length = 2092;
|
||||
static const u8 Data[Length];
|
||||
static wxBitmapType GetFormat() { return wxBITMAP_TYPE_PNG; }
|
||||
};
|
||||
|
||||
const u8 png_AppIcon::Data[Length] =
|
||||
{
|
||||
0x89,0x50,0x4e,0x47,0x0d,0x0a,0x1a,0x0a,0x00,0x00,0x00,0x0d,0x49,0x48,0x44,0x52,0x00,
|
||||
0x00,0x00,0x40,0x00,0x00,0x00,0x40,0x08,0x02,0x00,0x00,0x00,0x25,0x0b,0xe6,0x89,0x00,
|
||||
0x00,0x00,0x2b,0x74,0x45,0x58,0x74,0x43,0x72,0x65,0x61,0x74,0x69,0x6f,0x6e,0x20,0x54,
|
||||
0x69,0x6d,0x65,0x00,0x57,0x65,0x64,0x20,0x34,0x20,0x4d,0x61,0x72,0x20,0x32,0x30,0x30,
|
||||
0x39,0x20,0x32,0x30,0x3a,0x32,0x36,0x3a,0x35,0x31,0x20,0x2d,0x30,0x35,0x30,0x30,0x5a,
|
||||
0xcf,0x65,0xc5,0x00,0x00,0x00,0x07,0x74,0x49,0x4d,0x45,0x07,0xd9,0x03,0x05,0x01,0x1c,
|
||||
0x35,0x38,0x9d,0x9e,0xec,0x00,0x00,0x00,0x09,0x70,0x48,0x59,0x73,0x00,0x00,0x0b,0x12,
|
||||
0x00,0x00,0x0b,0x12,0x01,0xd2,0xdd,0x7e,0xfc,0x00,0x00,0x00,0x04,0x67,0x41,0x4d,0x41,
|
||||
0x00,0x00,0xb1,0x8f,0x0b,0xfc,0x61,0x05,0x00,0x00,0x07,0x84,0x49,0x44,0x41,0x54,0x78,
|
||||
0xda,0xd5,0x5a,0x4d,0xce,0x24,0x35,0x0c,0xb5,0xdd,0x25,0x2e,0xc1,0x11,0xd8,0x70,0x03,
|
||||
0x96,0xb0,0x64,0xc3,0x0d,0x38,0xda,0x6c,0x91,0x58,0x73,0x02,0xc4,0x12,0x89,0x05,0x07,
|
||||
0xe0,0x1c,0xa6,0xbb,0x12,0x3f,0x3f,0x3b,0xa9,0x46,0x08,0xcd,0x57,0x22,0x1a,0xcd,0x57,
|
||||
0x9d,0x4a,0x25,0x8e,0xfd,0xfc,0x9b,0xe8,0x17,0x9f,0x5c,0xfe,0xcf,0xcd,0xee,0x26,0xe0,
|
||||
0xbf,0xb6,0x43,0xc7,0xdf,0xe7,0x1f,0xaf,0xff,0xc7,0x23,0xda,0xeb,0x67,0xbc,0x9a,0x3d,
|
||||
0x7a,0x0e,0xf0,0x98,0x21,0xc7,0xd5,0xcf,0xa4,0xcf,0x9c,0x3d,0xb2,0xae,0xb1,0x8c,0xc4,
|
||||
0x18,0xdf,0x7c,0x75,0xa8,0xd6,0x59,0xf0,0xf3,0x49,0x5c,0x9d,0x62,0xfc,0x74,0x8b,0x07,
|
||||
0x88,0xcf,0xc4,0x9d,0xc8,0xd0,0xba,0xbc,0xd5,0x25,0xb5,0xcc,0x59,0x76,0xd2,0xc6,0x58,
|
||||
0xdd,0x03,0x66,0xae,0x3d,0xb1,0x81,0x2d,0x0b,0x77,0xbc,0xd1,0x58,0x52,0xe9,0xad,0x6a,
|
||||
0x1f,0xb6,0xae,0xb4,0xe5,0x5f,0x7b,0xdb,0xf8,0xde,0x19,0xaf,0x4b,0x27,0x43,0xe8,0xc9,
|
||||
0xd7,0x39,0xd2,0x52,0xf4,0x7a,0xe2,0x24,0x9b,0x9d,0x3d,0x63,0xb1,0x73,0x52,0x57,0x1a,
|
||||
0xac,0xb1,0xbc,0xce,0x0f,0x93,0xa0,0x73,0xfc,0x4b,0x50,0x16,0x9f,0xfb,0x32,0xd8,0x03,
|
||||
0x93,0x32,0x9f,0x1b,0x37,0x79,0xfb,0x03,0x08,0xfe,0x92,0x80,0x15,0x76,0x2a,0x8d,0x00,
|
||||
0xbf,0x35,0x66,0x19,0x93,0x02,0x23,0x1a,0xeb,0xcd,0x85,0xe3,0xa7,0x68,0x82,0x4a,0xb5,
|
||||
0x88,0x4e,0xeb,0xf6,0x8a,0x30,0x94,0x30,0x12,0x0b,0xcd,0x75,0x49,0x06,0x1a,0xe8,0x1d,
|
||||
0x7b,0x38,0x6c,0xac,0x47,0xd4,0xe4,0x1e,0x30,0x63,0xcc,0x62,0x6d,0xf6,0x05,0x20,0xe8,
|
||||
0xd5,0x0a,0x12,0x27,0xe2,0xc0,0x63,0x06,0x46,0xb2,0xdb,0xf7,0xf3,0x73,0x4f,0xfe,0x7c,
|
||||
0x4a,0xc0,0x06,0x12,0x08,0xd9,0x45,0xa3,0x3c,0xe7,0x66,0x13,0x34,0xe8,0x73,0x22,0x22,
|
||||
0x07,0xef,0x50,0xae,0x12,0x10,0x0d,0x5e,0x08,0x49,0xaf,0x4c,0xab,0x84,0x52,0x4f,0xb1,
|
||||
0x03,0xa8,0x6d,0xe6,0x23,0x39,0xad,0x73,0xe8,0xea,0x1a,0x5c,0x53,0xfa,0x83,0x4a,0x48,
|
||||
0x13,0x8c,0x75,0x70,0x0e,0x2a,0x44,0x0b,0xfb,0xd9,0xdf,0xb9,0xeb,0x53,0xa9,0x92,0xff,
|
||||
0xa1,0x0c,0x1a,0x86,0x68,0x8a,0x7d,0xa8,0xc7,0xa2,0xd3,0xcf,0x45,0x0f,0x0d,0xe1,0x02,
|
||||
0x94,0x6d,0xaf,0x0a,0x8c,0x85,0x19,0x1d,0x80,0x56,0x65,0xf1,0x04,0xf3,0x2a,0x9b,0xcb,
|
||||
0x43,0xa8,0xbe,0x7b,0xf9,0x96,0x79,0xac,0x24,0x9c,0x22,0x4e,0x9b,0x3c,0x62,0x3b,0xf1,
|
||||
0xfc,0xf7,0xec,0x3e,0x21,0xc4,0x92,0x51,0x42,0xb3,0xa7,0x31,0xd6,0xe0,0xb4,0xb2,0x2a,
|
||||
0x85,0x2d,0x6a,0x8a,0x38,0x47,0x32,0xba,0x58,0x3d,0xaa,0xd9,0x48,0xf8,0x59,0x01,0x6a,
|
||||
0xda,0x00,0xa9,0x6b,0x59,0x11,0xef,0xf4,0x03,0x69,0xc8,0xc6,0x3c,0x41,0x41,0x3e,0x90,
|
||||
0x7a,0x81,0x6d,0x16,0xec,0x64,0xb1,0x09,0x09,0xc7,0xc3,0xe0,0x80,0x4a,0x88,0x65,0xa3,
|
||||
0x95,0x49,0x75,0x28,0x06,0x89,0x42,0xc8,0x6a,0x33,0x61,0x29,0x81,0x69,0x98,0x64,0xb2,
|
||||
0x01,0xee,0x76,0x8a,0x8f,0x10,0x35,0x08,0x35,0x65,0x09,0xcd,0xe9,0xd4,0x8b,0x82,0x2a,
|
||||
0x34,0x92,0x01,0x49,0x22,0x1a,0xd6,0xd6,0xc9,0x87,0x4c,0xc4,0x82,0xd3,0xf4,0x76,0x8e,
|
||||
0xa9,0x32,0x3f,0xcc,0x12,0x6e,0x4a,0x6b,0x4c,0x4f,0x11,0xe3,0x8c,0x19,0x20,0xe4,0x89,
|
||||
0x34,0x01,0xd5,0x8c,0x37,0xb6,0x7b,0xc5,0xf2,0x44,0x3c,0xdb,0x31,0x02,0x7d,0x4e,0xe8,
|
||||
0x15,0x51,0x64,0x7f,0x4f,0x09,0xd4,0x1d,0x0b,0xd9,0x9c,0x0c,0x87,0x54,0xfe,0xfa,0x5e,
|
||||
0x3e,0xbe,0x7d,0xf9,0xf3,0x84,0x07,0xac,0x48,0xb2,0xe0,0xdc,0xc6,0x31,0x8d,0x1e,0xb9,
|
||||
0x6b,0x89,0x9e,0xf4,0xed,0xe4,0x1c,0x3e,0xb8,0x59,0x18,0x65,0x56,0x1e,0xa6,0xad,0x40,
|
||||
0xa8,0xc0,0xc0,0x5f,0x28,0xb2,0xb0,0xcd,0x76,0xd3,0x0e,0xe0,0xa0,0xac,0x85,0xe5,0x3a,
|
||||
0x29,0x3c,0x83,0x39,0xab,0x21,0x0d,0x29,0x7e,0x71,0x0e,0x77,0x34,0x0b,0xbb,0x32,0x88,
|
||||
0x2e,0x39,0xc9,0x29,0x9c,0xe3,0x61,0xd5,0x43,0x87,0x6d,0xb9,0x99,0xf0,0x68,0x8f,0x1a,
|
||||
0x06,0xa5,0x18,0x82,0xb3,0x2f,0x3f,0x60,0xcd,0x6b,0x6e,0x89,0xbf,0x69,0x3f,0xb6,0x5d,
|
||||
0x97,0x48,0x3d,0x1e,0x60,0x39,0xb5,0x4d,0x5a,0x72,0xef,0x06,0xb4,0x28,0x2a,0x47,0x77,
|
||||
0x87,0x51,0xfa,0xe2,0xb0,0x9b,0x3d,0x35,0xba,0x6d,0x03,0x0a,0x67,0x1c,0xe1,0x5d,0xcb,
|
||||
0xaa,0x8f,0x0c,0xf1,0xd7,0xa0,0xbb,0xa6,0xd8,0x5f,0xfd,0x92,0x5b,0xdd,0x27,0x7b,0x52,
|
||||
0x3b,0xd7,0x6d,0x7b,0xfd,0xb0,0x3e,0xfc,0xf1,0xed,0x66,0x03,0x0f,0xad,0x4b,0x78,0x4d,
|
||||
0xb2,0x35,0xcc,0x28,0x2b,0xc0,0x78,0x42,0x00,0xe3,0x24,0x44,0x0d,0x53,0x50,0x74,0xa5,
|
||||
0x51,0xb9,0xca,0xaa,0x46,0xb5,0x85,0x3b,0x7a,0xfd,0xd5,0xe0,0xb8,0xd2,0x30,0x60,0x9d,
|
||||
0x30,0x74,0xea,0x40,0x0d,0x72,0xc6,0x0f,0x9e,0xb9,0x08,0xb1,0x85,0x2e,0x1a,0xa1,0x4e,
|
||||
0x9d,0xa2,0x27,0x46,0x64,0xfa,0x5c,0x2a,0x11,0x5a,0x62,0x96,0x2e,0x81,0x88,0xc4,0x32,
|
||||
0x34,0xe4,0xd5,0x94,0x74,0x00,0xdb,0x2b,0xc0,0xe1,0x60,0x26,0x9c,0xdf,0x8c,0xcb,0x43,
|
||||
0x8e,0xe5,0x2b,0x2e,0xba,0x70,0x9a,0x82,0xc9,0x39,0x5f,0xf1,0x9e,0xcb,0x6f,0x25,0x00,
|
||||
0xcd,0x64,0x81,0xa1,0x73,0xa6,0x94,0x02,0x6f,0x10,0x09,0x97,0xc5,0xae,0x32,0x36,0x3e,
|
||||
0x1d,0xb3,0x87,0x58,0x93,0x2b,0x88,0xf3,0x9c,0x8c,0x86,0x04,0xd2,0x8c,0xfa,0x3d,0x5f,
|
||||
0x0d,0x07,0x3a,0x63,0x30,0x91,0x2b,0x11,0x98,0x15,0xfc,0x23,0xe1,0xb4,0x90,0xe6,0x0c,
|
||||
0xe6,0x72,0x56,0x66,0x45,0xd3,0x33,0xb9,0x86,0xbb,0xee,0x7e,0x5e,0xf5,0xeb,0x6e,0x86,
|
||||
0x2b,0x08,0xad,0x6a,0x53,0xa7,0x9a,0x7e,0x60,0x63,0x37,0x97,0x35,0x7e,0xfd,0x46,0x3e,
|
||||
0xbe,0x29,0x17,0x6c,0x48,0xec,0x68,0xaf,0xba,0x90,0x45,0xd2,0xbd,0x82,0x72,0xc2,0xe0,
|
||||
0xbe,0xc0,0xc2,0xa8,0x98,0x80,0x6c,0x31,0xa3,0xa3,0x01,0x21,0xae,0x91,0x00,0x51,0x99,
|
||||
0x43,0xe2,0xed,0x1d,0xed,0x81,0x18,0x21,0x34,0x2d,0x83,0x86,0x53,0xbf,0x8f,0xc7,0x1b,
|
||||
0x4b,0xfc,0x6f,0xc0,0xfa,0x99,0x9a,0x5d,0xd1,0x80,0xa4,0xfe,0x01,0x8b,0x11,0xbd,0xc8,
|
||||
0x62,0xd9,0x7e,0xdf,0xd5,0xe0,0x89,0x91,0x7c,0xb2,0x7d,0x17,0x89,0xda,0x68,0x06,0x14,
|
||||
0xb5,0x6a,0xe2,0x1e,0xa5,0x87,0x9b,0x36,0x00,0x25,0x1e,0xc4,0xc8,0xc8,0xb1,0xa8,0x4e,
|
||||
0x7c,0x70,0xb0,0xc1,0x29,0x76,0x6a,0x02,0xc2,0x87,0x5b,0x24,0x60,0xc5,0xb1,0xb2,0xf7,
|
||||
0x18,0x1b,0x8b,0xb2,0x4a,0x8b,0xf2,0xa4,0x3e,0x5f,0x1b,0xd9,0xef,0x7e,0xfb,0x27,0x13,
|
||||
0xec,0xcb,0x83,0xf4,0x88,0xf2,0x4d,0xeb,0x3a,0xb0,0xc4,0x8e,0x19,0xcc,0xcd,0x88,0xc8,
|
||||
0x8b,0x3e,0x08,0xa2,0x06,0xbb,0x5e,0x00,0x61,0x5f,0x90,0x98,0x45,0xd9,0x16,0x9f,0xd4,
|
||||
0xb0,0x6a,0x2e,0x64,0xb4,0x4a,0x7c,0x0e,0x62,0x26,0x72,0x78,0x9f,0x41,0xc9,0x20,0xf5,
|
||||
0x78,0x20,0x80,0xa1,0xf5,0xb2,0x86,0x31,0xc2,0x0a,0xbb,0x64,0xd3,0x83,0x44,0xe4,0x9a,
|
||||
0xbb,0x4d,0x42,0x3d,0x11,0xa8,0xcd,0x40,0x8f,0xad,0x71,0x89,0x37,0x48,0x37,0xae,0x73,
|
||||
0x59,0x52,0xa2,0x28,0x5c,0x07,0x97,0x23,0x98,0xd3,0xc9,0x33,0x8e,0x96,0x92,0x41,0x7e,
|
||||
0x91,0xda,0x45,0x05,0xaa,0xb9,0xc9,0x5e,0x19,0xe0,0xbc,0x44,0x92,0x1a,0x7c,0xc8,0x83,
|
||||
0x0b,0x19,0x55,0xf7,0xb4,0xce,0x3f,0xde,0x1e,0xa6,0x29,0xd3,0x9e,0x97,0x25,0x50,0x2e,
|
||||
0x91,0xfa,0xb8,0xd8,0x18,0x83,0xb0,0x80,0xbf,0x16,0xcb,0xf6,0x1a,0x22,0x19,0x13,0xec,
|
||||
0x95,0x24,0x3a,0x3d,0xab,0xd3,0xcd,0x80,0x72,0x84,0xc8,0x3d,0x4b,0x5b,0x73,0xd6,0xbe,
|
||||
0xe4,0x7a,0x5c,0xd0,0x82,0xfa,0x36,0x3f,0xe7,0x0d,0x56,0xc7,0xb7,0x55,0xce,0x46,0x85,
|
||||
0xad,0xa6,0xef,0xb4,0x8d,0x79,0x32,0xb7,0x6b,0x3f,0x7d,0x2d,0x9f,0xb5,0xfd,0xf0,0x7b,
|
||||
0x65,0x48,0xcb,0xc8,0x04,0x7e,0x80,0x36,0x3f,0xcd,0x05,0x52,0x47,0x9b,0x3f,0x6f,0x69,
|
||||
0x16,0xc4,0xb4,0x86,0x5d,0x1d,0xfc,0x8e,0xc5,0xa8,0x54,0x70,0xae,0x7b,0xfe,0xd0,0x56,
|
||||
0x22,0x9d,0xb6,0xb7,0xb1,0x81,0x8d,0x79,0x89,0x42,0x64,0x39,0xaa,0xb9,0xa9,0x15,0x1b,
|
||||
0x83,0x56,0xce,0x07,0x88,0xc7,0x99,0xd9,0x50,0x6a,0x2b,0xb7,0x96,0x47,0x51,0x38,0x6c,
|
||||
0x9d,0x22,0xb5,0x3a,0x9d,0xf6,0xd5,0x33,0xb3,0x81,0x4f,0x55,0xbb,0x4d,0x06,0x23,0x5d,
|
||||
0xc9,0x42,0x4e,0x90,0x2a,0x61,0x77,0x5e,0x9e,0x18,0xde,0x17,0xe6,0x88,0x07,0x49,0x3d,
|
||||
0x51,0xfc,0xe8,0x0d,0x50,0xe5,0x1c,0x25,0x02,0xb8,0x3c,0x9d,0xe1,0xb4,0x24,0xad,0x12,
|
||||
0xdb,0x40,0x10,0x7b,0xab,0x0a,0xc8,0x63,0x81,0x71,0x9e,0x94,0x8d,0x9f,0x3f,0xfe,0x59,
|
||||
0x93,0x17,0x72,0x16,0xfd,0xe4,0x98,0xa5,0xe0,0xdd,0xbf,0x6c,0x6a,0x3b,0x6b,0xe1,0x71,
|
||||
0xd7,0xd3,0x0a,0xb2,0x39,0x0f,0x6a,0x30,0x50,0xd9,0xe6,0x01,0xcf,0x57,0x87,0xd1,0xf1,
|
||||
0xd3,0x38,0xa5,0xf4,0x5a,0x02,0x40,0x34,0x96,0x22,0x8a,0xb7,0x82,0x70,0x0d,0x20,0x14,
|
||||
0x3a,0xeb,0x86,0x7b,0x59,0x72,0x0c,0x41,0xb0,0x69,0x34,0x40,0xc2,0x01,0x87,0x8e,0x82,
|
||||
0x54,0x50,0x55,0xbe,0x9d,0xb1,0x10,0xde,0x8d,0xf3,0xc6,0x7a,0x4e,0x8a,0xd0,0x6f,0xdc,
|
||||
0xc1,0xe1,0x8c,0x4e,0x6b,0x28,0x96,0x1a,0xaf,0x65,0xed,0x49,0xb9,0x4d,0x1d,0x03,0x00,
|
||||
0xd8,0xe8,0xa9,0x52,0xdc,0x8a,0x6f,0xbd,0x9e,0xab,0x2a,0x6d,0x38,0xec,0xe4,0x79,0xc4,
|
||||
0x14,0x5a,0x02,0x5e,0x32,0x6c,0x2c,0x82,0x08,0x9c,0x6f,0xce,0x23,0xd1,0x1a,0xb1,0xa4,
|
||||
0x88,0x25,0xd9,0x03,0xc8,0x72,0xe7,0x4c,0xa9,0x38,0xaf,0xad,0x75,0x87,0x76,0x8f,0x8a,
|
||||
0xa3,0x01,0x40,0x48,0x91,0x84,0x38,0x49,0x40,0x94,0x64,0xcd,0xc8,0xb1,0x1a,0x9c,0x1a,
|
||||
0xbd,0x42,0xc6,0x4d,0xc0,0x6d,0xe7,0xf2,0x22,0x39,0xb9,0x10,0x26,0x27,0x36,0x2a,0xac,
|
||||
0x33,0x8f,0x91,0x99,0x3a,0xb2,0x9f,0x65,0xcb,0x3e,0x7b,0x2c,0x2e,0x7b,0x60,0xc6,0x74,
|
||||
0x61,0x91,0xec,0xb3,0xca,0x0b,0xa3,0x8b,0x94,0x98,0x25,0x60,0x42,0xd5,0x31,0x1e,0x43,
|
||||
0x39,0x93,0xc2,0xf3,0x54,0xd8,0x8c,0x12,0x5b,0x5e,0xd0,0xa8,0x21,0xb0,0x22,0x59,0xa3,
|
||||
0x6c,0xb1,0x84,0x12,0x1e,0x08,0x56,0xa7,0x07,0xce,0xad,0x8a,0x5a,0x05,0xdc,0xc3,0x30,
|
||||
0xb3,0xa2,0xb3,0x86,0x94,0xaf,0x48,0x1d,0x95,0x76,0x88,0x5b,0x2c,0x7c,0xac,0xef,0x64,
|
||||
0xf2,0x8b,0x25,0xc0,0x49,0x85,0xf3,0x65,0x0f,0xb6,0x01,0x24,0xe2,0xc4,0x33,0x7c,0x36,
|
||||
0x81,0x9b,0xa9,0x2c,0xe3,0x39,0xfa,0x2f,0x6c,0x2c,0x72,0x1e,0x3d,0xe5,0xb0,0x9d,0x26,
|
||||
0x2f,0x67,0x2b,0x0c,0x13,0x42,0xc1,0x91,0xc9,0xde,0x72,0x73,0xce,0x17,0x0e,0x0a,0x9f,
|
||||
0x08,0xd2,0xd5,0x89,0x37,0x05,0x0d,0x64,0xc0,0xdd,0x73,0x2c,0x97,0x82,0x4c,0xf2,0xee,
|
||||
0x4b,0xc9,0x7f,0xa8,0x28,0x9f,0x33,0x87,0x2d,0x39,0x94,0xef,0x5a,0x04,0x54,0x38,0xc3,
|
||||
0x51,0x48,0x53,0x89,0x44,0x64,0xee,0x9e,0x97,0xed,0x30,0xa9,0xd3,0xc8,0x06,0xa4,0x3c,
|
||||
0x70,0x0f,0x3a,0x54,0x0b,0x95,0x4d,0x9d,0x30,0xf1,0x8c,0x91,0x41,0x5e,0x18,0xc0,0x79,
|
||||
0xe9,0xaf,0x09,0xbd,0xdd,0xd0,0x85,0x4c,0x99,0xb7,0x0e,0x33,0x92,0xd4,0xed,0x50,0x53,
|
||||
0xf9,0x5c,0xac,0x24,0x70,0xd8,0x6c,0x2e,0x50,0xbe,0x33,0x12,0x82,0xb3,0xfb,0x71,0xc0,
|
||||
0xa1,0x6d,0x99,0xed,0xda,0xdc,0xbc,0x2e,0x46,0x03,0x77,0xe4,0x13,0xbf,0x75,0xed,0xa3,
|
||||
0x39,0x2b,0x6a,0xd9,0xed,0xf8,0x3a,0x21,0xc9,0x37,0x83,0xb9,0x0d,0x96,0xb5,0xcc,0xab,
|
||||
0xf2,0xae,0xc2,0xc5,0x4c,0x52,0x3a,0x58,0xd8,0x04,0x83,0xb0,0x60,0xc2,0xf0,0x4f,0x0b,
|
||||
0x93,0xd3,0xf9,0x82,0x8e,0xa5,0x74,0x70,0xe8,0x86,0x8a,0xcb,0xe7,0xcd,0xd5,0xa5,0x8b,
|
||||
0xf6,0xce,0x10,0xd1,0x3e,0x37,0x63,0xae,0x68,0x68,0x9c,0x8d,0xff,0xff,0x06,0x5e,0x90,
|
||||
0x68,0x59,0x1f,0xf2,0x4f,0x15,0x00,0x00,0x00,0x00,0x49,0x45,0x4e,0x44,0xae,0x42,0x60,
|
||||
0x82
|
||||
};
|
||||
|
Before Width: | Height: | Size: 2.0 KiB After Width: | Height: | Size: 2.0 KiB |
File diff suppressed because it is too large
Load Diff
|
Before Width: | Height: | Size: 64 KiB After Width: | Height: | Size: 64 KiB |
|
|
@ -0,0 +1,37 @@
|
|||
/* Pcsx2 - Pc Ps2 Emulator
|
||||
* Copyright (C) 2002-2009 Pcsx2 Team
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License as published by
|
||||
* the Free Software Foundation; either version 2 of the License, or
|
||||
* (at your option) any later version.
|
||||
*
|
||||
* This program is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License
|
||||
* along with this program; if not, write to the Free Software
|
||||
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
|
||||
*/
|
||||
|
||||
#pragma once
|
||||
|
||||
#include <wx/image.h>
|
||||
#include <wx/mstream.h>
|
||||
|
||||
template< typename ImageType >
|
||||
class EmbeddedImage
|
||||
{
|
||||
protected:
|
||||
wxImage m_Image;
|
||||
public:
|
||||
EmbeddedImage() : m_Image()
|
||||
{
|
||||
wxMemoryInputStream joe( ImageType::Data, ImageType::Length );
|
||||
m_Image.LoadFile( joe, ImageType::GetFormat() );
|
||||
}
|
||||
|
||||
const wxImage& GetImage() { return m_Image; }
|
||||
};
|
||||
File diff suppressed because it is too large
Load Diff
|
Before Width: | Height: | Size: 17 KiB After Width: | Height: | Size: 17 KiB |
|
|
@ -38,6 +38,7 @@ std::string to_string(const T& value)
|
|||
//////////////////////////////////////////////////////////////////////////////////////////
|
||||
//
|
||||
extern wxString ToString( const wxPoint& src, const wxString& separator=wxT(",") );
|
||||
extern wxString ToString( const wxSize& src, const wxString& separator=wxT(",") );
|
||||
extern wxString ToString( const wxRect& src, const wxString& separator=wxT(",") );
|
||||
|
||||
extern bool TryParse( wxPoint& dest, const wxStringTokenizer& parts );
|
||||
|
|
|
|||
|
|
@ -3252,6 +3252,10 @@
|
|||
RelativePath="..\..\NewGUI\ConsoleLogger.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\Resources\EmbeddedImage.h"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\NewGUI\main.cpp"
|
||||
>
|
||||
|
|
@ -3300,6 +3304,22 @@
|
|||
>
|
||||
</File>
|
||||
</Filter>
|
||||
<Filter
|
||||
Name="Resources"
|
||||
>
|
||||
<File
|
||||
RelativePath="..\..\Resources\AppIcon.h"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\Resources\BackgroundLogo.h"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\Resources\ps2_silver.h"
|
||||
>
|
||||
</File>
|
||||
</Filter>
|
||||
</Filter>
|
||||
<File
|
||||
RelativePath="..\..\Common.h"
|
||||
|
|
|
|||
Loading…
Reference in New Issue