piwalker/melonDS
1
0
Fork 0
mirror of https://github.com/melonDS-emu/melonDS.git synced 2025-07-26 15:50:00 -06:00
Code Issues Packages Projects Releases Wiki Activity

* emulation settings dialog

Browse Source 
* proper setting for booting directly or from BIOS
* fix shit, again
This commit is contained in:
StapleButter
2017-03-29 20:23:41 +02:00
parent f88226c99f
commit 2db5b21760
7 changed files with 153 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/wx/main.cpp
View File

@ -24,6 +24,7 @@
#include "../GPU.h"
#include "InputConfig.h"
#include "EmuConfig.h"
wxIMPLEMENT_APP_NO_MAIN(wxApp_melonDS);
@ -103,6 +104,7 @@ wxBEGIN_EVENT_TABLE(MainFrame, wxFrame)
EVT_MENU(ID_PAUSE, MainFrame::OnPause)
EVT_MENU(ID_RESET, MainFrame::OnReset)
EVT_MENU(ID_EMUCONFIG, MainFrame::OnEmuConfig)
EVT_MENU(ID_INPUTCONFIG, MainFrame::OnInputConfig)
wxEND_EVENT_TABLE()
@ -122,6 +124,7 @@ MainFrame::MainFrame()
systemmenu->Append(ID_RESET, "Reset");
wxMenu* settingsmenu = new wxMenu();
settingsmenu->Append(ID_EMUCONFIG, "Emulation");
settingsmenu->Append(ID_INPUTCONFIG, "Input");
wxMenuBar* melonbar = new wxMenuBar();
@ -199,7 +202,7 @@ void MainFrame::OnOpenROM(wxCommandEvent& event)
emuthread->EmuPause();
rompath = opener.GetPath();
NDS::LoadROM(rompath.mb_str(), true);
NDS::LoadROM(rompath.mb_str(), Config::DirectBoot);
emuthread->EmuRun();
GetMenuBar()->Enable(ID_PAUSE, true);
@ -259,7 +262,7 @@ void MainFrame::OnReset(wxCommandEvent& event)
emuthread->EmuPause();
if (!rompath.IsEmpty())
NDS::LoadROM(rompath.mb_str(), true);
NDS::LoadROM(rompath.mb_str(), Config::DirectBoot);
else
NDS::LoadBIOS();
@ -278,6 +281,12 @@ void MainFrame::OnReset(wxCommandEvent& event)
}
}
void MainFrame::OnEmuConfig(wxCommandEvent& event)
{
EmuConfigDialog dlg(this);
dlg.ShowModal();
}
void MainFrame::OnInputConfig(wxCommandEvent& event)
{
if (joy)