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

wxgui: Whee, a basic file browser dialog for Run Iso. Eventually it *will* do something more than log the result. >_< 

git-svn-id: http://pcsx2.googlecode.com/svn/branches/wxgui@1537 96395faa-99c1-11dd-bbfe-3dabce05a288
This commit is contained in:
Jake.Stine 2009-07-17 13:19:24 +00:00
parent 3a5c1d180b
commit 0f33c59509
5 changed files with 26 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pcsx2/Config.h
View File

@ -65,6 +65,8 @@ public:
wxDirName Savestates;
wxDirName MemoryCards;
wxDirName Logs;
wxDirName RunIso; // last used location for Iso loading.
void LoadSave( IniInterface& conf );
};

4
pcsx2/gui/AppConfig.cpp
View File

@ -356,8 +356,6 @@ void AppConfig::FolderOptions::LoadSave( IniInterface& ini )
{
ini.SetPath( L"Folders" );
const wxDirName def( L"default" );
IniEntry( Plugins, PathDefs::GetPlugins() );
IniEntry( Settings, PathDefs::GetSettings() );
IniEntry( Bios, PathDefs::GetBios() );
@ -365,6 +363,8 @@ void AppConfig::FolderOptions::LoadSave( IniInterface& ini )
IniEntry( Savestates, PathDefs::GetSavestates() );
IniEntry( MemoryCards, PathDefs::GetMemoryCards() );
IniEntry( Logs, PathDefs::GetLogs() );
IniEntry( RunIso, PathDefs::GetDocuments() ); // raw default is always the Documents folder.
ini.SetPath( L".." );
}

30
pcsx2/gui/MainFrame.cpp
View File

@ -161,10 +161,9 @@ void MainEmuFrame::ConnectMenus()
Connect( id, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler(MainEmuFrame::handler) )
ConnectMenu( Menu_Config_Settings, Menu_ConfigSettings_Click );
ConnectMenu( Menu_IsoBrowse, Menu_RunIso_Click );
ConnectMenu( Menu_RunWithoutDisc, Menu_RunWithoutDisc_Click );
ConnectMenu( Menu_IsoBrowse, Menu_IsoBrowse_Click );
Connect( wxID_FILE1, wxID_FILE1+20, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler(MainEmuFrame::Menu_IsoRecent_Click) );
ConnectMenu( Menu_RunELF, Menu_OpenELF_Click );
@ -187,8 +186,8 @@ void MainEmuFrame::ConnectMenus()
}
// ------------------------------------------------------------------------
MainEmuFrame::MainEmuFrame(wxWindow* parent, int id, const wxString& title, const wxPoint& pos, const wxSize& size, long style):
wxFrame(parent, id, title, pos, size, wxDEFAULT_FRAME_STYLE & ~(wxMAXIMIZE_BOX | wxRESIZE_BORDER) ),
MainEmuFrame::MainEmuFrame(wxWindow* parent, const wxString& title):
wxFrame(parent, wxID_ANY, title, wxDefaultPosition, wxDefaultSize, wxDEFAULT_FRAME_STYLE & ~(wxMAXIMIZE_BOX | wxRESIZE_BORDER) ),
m_statusbar( *CreateStatusBar(2, 0) ),
m_background( this, wxID_ANY, wxGetApp().GetLogoBitmap() ),
@ -326,12 +325,12 @@ MainEmuFrame::MainEmuFrame(wxWindow* parent, int id, const wxString& title, cons
// Ref will want this re-added eventually.
//m_menuMisc.Append(47, _T("Print CDVD Info..."), wxEmptyString, wxITEM_CHECK);
m_menuMisc.Append(Menu_About, _T("About..."), wxEmptyString);
m_menuMisc.Append(Menu_Website, _T("Pcsx2 Website..."), _T("Opens your web-browser!"));
m_menuMisc.Append(Menu_About, _("About..."), wxEmptyString);
m_menuMisc.Append(Menu_Website, _("Pcsx2 Website..."), _("Opens your web-browser!"));
m_menuDebug.Append(Menu_Debug_Open, _T("Open Debug Window..."), wxEmptyString);
m_menuDebug.Append(Menu_Debug_MemoryDump, _T("Memory Dump..."), wxEmptyString);
m_menuDebug.Append(Menu_Debug_Logging, _T("Logging..."), wxEmptyString);
m_menuDebug.Append(Menu_Debug_Open, _("Open Debug Window..."), wxEmptyString);
m_menuDebug.Append(Menu_Debug_MemoryDump, _("Memory Dump..."), wxEmptyString);
m_menuDebug.Append(Menu_Debug_Logging, _("Logging..."), wxEmptyString);
m_MenuItem_Console.Check( g_Conf->ConLogBox.Visible );
@ -345,18 +344,23 @@ void MainEmuFrame::Menu_ConfigSettings_Click(wxCommandEvent &event)
Dialogs::ConfigurationDialog( this ).ShowModal();
}
void MainEmuFrame::Menu_RunWithoutDisc_Click(wxCommandEvent &event)
void MainEmuFrame::Menu_RunIso_Click(wxCommandEvent &event)
{
wxFileDialog ctrl( this, _("Run PS2 Iso..."), g_Conf->Folders.RunIso.ToString(), wxEmptyString,
L"Iso Image (*.iso)|*.iso|(*.mdf)|*.mdf|Nero Image (*.nrg)|*.nrg", wxFD_FILE_MUST_EXIST );
ctrl.ShowModal();
Console::WriteLn( L"Test Iso Open: " + ctrl.GetFilename() );
}
void MainEmuFrame::Menu_IsoBrowse_Click(wxCommandEvent &event)
void MainEmuFrame::Menu_RunWithoutDisc_Click(wxCommandEvent &event)
{
}
void MainEmuFrame::Menu_IsoRecent_Click(wxCommandEvent &event)
{
Console::Status( "%d", params event.GetId() - g_RecentIsoList->GetBaseId() );
Console::WriteLn( Color_Magenta, g_RecentIsoList->GetHistoryFile( event.GetId() - g_RecentIsoList->GetBaseId() ) );
//Console::Status( "%d", params event.GetId() - g_RecentIsoList->GetBaseId() );
//Console::WriteLn( Color_Magenta, g_RecentIsoList->GetHistoryFile( event.GetId() - g_RecentIsoList->GetBaseId() ) );
}
void MainEmuFrame::Menu_OpenELF_Click(wxCommandEvent &event)

6
pcsx2/gui/MainFrame.h
View File

@ -29,7 +29,7 @@
class MainEmuFrame: public wxFrame
{
public:
MainEmuFrame(wxWindow* parent, int id, const wxString& title, const wxPoint& pos=wxDefaultPosition, const wxSize& size=wxDefaultSize, long style=wxDEFAULT_FRAME_STYLE);
MainEmuFrame(wxWindow* parent, const wxString& title);
void OnLogBoxHidden();
@ -150,8 +150,10 @@ protected:
protected:
void OnCloseWindow(wxCloseEvent& evt);
void OnMoveAround( wxMoveEvent& evt );
void Menu_ConfigSettings_Click(wxCommandEvent &event);
void Menu_RunIso_Click(wxCommandEvent &event);
void Menu_RunWithoutDisc_Click(wxCommandEvent &event);
void Menu_IsoBrowse_Click(wxCommandEvent &event);
void Menu_IsoRecent_Click(wxCommandEvent &event);

2
pcsx2/gui/main.cpp
View File

@ -185,7 +185,7 @@ bool Pcsx2App::OnInit()
m_Ps2ConLogBox = m_ProgramLogBox; // just use a single logger for now.
//m_Ps2ConLogBox = new ConsoleLogFrame( NULL, L"PS2 Console Log" );
m_MainFrame = new MainEmuFrame( NULL, wxID_ANY, wxEmptyString );
m_MainFrame = new MainEmuFrame( NULL, L"PCSX2" );
SetTopWindow( m_MainFrame );
SetExitOnFrameDelete( true );
m_MainFrame->Show();