RPCS3/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2024-11-22 10:42:36 +01:00
Code Issues Releases Wiki Activity

Merge pull request #19 from osvcos/master

Browse Source 
Change the GUI a little bit
This commit is contained in:
DHrpcs3 2013-11-19 13:20:29 -08:00
commit ead70f5c00
3 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
rpcs3/Gui/MainFrame.cpp
View File

@ -31,6 +31,7 @@ enum IDs
id_config_emu,
id_config_vfs_manager,
id_config_vhdd_manager,
id_compiler,
id_help_about,
id_update_dbg,
};
@ -59,11 +60,13 @@ MainFrame::MainFrame()
wxMenu& menu_boot(*new wxMenu());
wxMenu& menu_sys(*new wxMenu());
wxMenu& menu_conf(*new wxMenu());
wxMenu& menu_compiler(*new wxMenu());
wxMenu& menu_help(*new wxMenu());
menubar.Append(&menu_boot, "Boot");
menubar.Append(&menu_sys, "System");
menubar.Append(&menu_conf, "Config");
menubar.Append(&menu_compiler, "Compiler");
menubar.Append(&menu_help, "Help");
menu_boot.Append(id_boot_game, "Boot game");
@ -83,6 +86,8 @@ MainFrame::MainFrame()
menu_conf.Append(id_config_vfs_manager, "Virtual File System Manager");
menu_conf.Append(id_config_vhdd_manager, "Virtual HDD Manager");
menu_compiler.Append(id_compiler, "ELF Compiler");
menu_help.Append(id_help_about, "About...");
SetMenuBar(&menubar);
@ -104,6 +109,8 @@ MainFrame::MainFrame()
Connect( id_config_vfs_manager, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler(MainFrame::ConfigVFS) );
Connect( id_config_vhdd_manager,wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler(MainFrame::ConfigVHDD) );
Connect( id_compiler, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler(MainFrame::OpenELFCompiler));
Connect( id_help_about, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler(MainFrame::AboutDialogHandler) );
Connect( id_update_dbg, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler(MainFrame::UpdateUI) );
@ -478,6 +485,11 @@ void MainFrame::ConfigVHDD(wxCommandEvent& WXUNUSED(event))
VHDDManagerDialog(this).ShowModal();
}
void MainFrame::OpenELFCompiler(wxCommandEvent& WXUNUSED(event))
{
(new CompilerELF(this)) -> Show();
}
void MainFrame::AboutDialogHandler(wxCommandEvent& WXUNUSED(event))
{
AboutDialog(this).ShowModal();

1
rpcs3/Gui/MainFrame.h
View File

@ -30,6 +30,7 @@ private:
void Config(wxCommandEvent& event);
void ConfigVFS(wxCommandEvent& event);
void ConfigVHDD(wxCommandEvent& event);
void OpenELFCompiler(wxCommandEvent& evt);
void AboutDialogHandler(wxCommandEvent& event);
void UpdateUI(wxCommandEvent& event);
void OnKeyDown(wxKeyEvent& event);

2
rpcs3/rpcs3.cpp
View File

@ -22,7 +22,7 @@ bool Rpcs3App::OnInit()
SetTopWindow(m_MainFrame);
Emu.Init();
(new CompilerELF(m_MainFrame))->Show();
// (new CompilerELF(m_MainFrame))->Show();
m_debugger_frame = new DebuggerPanel(m_MainFrame);
ConLogFrame = new LogFrame(m_MainFrame);