diff options
Diffstat (limited to 'src/citra_qt/main.cpp')
| -rw-r--r-- | src/citra_qt/main.cpp | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/src/citra_qt/main.cpp b/src/citra_qt/main.cpp index 89aae7ce6..76e0c68c3 100644 --- a/src/citra_qt/main.cpp +++ b/src/citra_qt/main.cpp | |||
| @@ -23,6 +23,7 @@ | |||
| 23 | #include "core/system.h" | 23 | #include "core/system.h" |
| 24 | #include "core/loader.h" | 24 | #include "core/loader.h" |
| 25 | #include "core/core.h" | 25 | #include "core/core.h" |
| 26 | #include "core/arm/disassembler/load_symbol_map.h" | ||
| 26 | #include "version.h" | 27 | #include "version.h" |
| 27 | 28 | ||
| 28 | 29 | ||
| @@ -74,6 +75,7 @@ GMainWindow::GMainWindow() | |||
| 74 | 75 | ||
| 75 | // Setup connections | 76 | // Setup connections |
| 76 | connect(ui.action_Load_File, SIGNAL(triggered()), this, SLOT(OnMenuLoadFile())); | 77 | connect(ui.action_Load_File, SIGNAL(triggered()), this, SLOT(OnMenuLoadFile())); |
| 78 | connect(ui.action_Load_Symbol_Map, SIGNAL(triggered()), this, SLOT(OnMenuLoadSymbolMap())); | ||
| 77 | connect(ui.action_Start, SIGNAL(triggered()), this, SLOT(OnStartGame())); | 79 | connect(ui.action_Start, SIGNAL(triggered()), this, SLOT(OnStartGame())); |
| 78 | connect(ui.action_Pause, SIGNAL(triggered()), this, SLOT(OnPauseGame())); | 80 | connect(ui.action_Pause, SIGNAL(triggered()), this, SLOT(OnPauseGame())); |
| 79 | connect(ui.action_Stop, SIGNAL(triggered()), this, SLOT(OnStopGame())); | 81 | connect(ui.action_Stop, SIGNAL(triggered()), this, SLOT(OnStopGame())); |
| @@ -140,11 +142,17 @@ void GMainWindow::BootGame(const char* filename) | |||
| 140 | 142 | ||
| 141 | void GMainWindow::OnMenuLoadFile() | 143 | void GMainWindow::OnMenuLoadFile() |
| 142 | { | 144 | { |
| 143 | QString filename = QFileDialog::getOpenFileName(this, tr("Load file"), QString(), tr("3DS homebrew (*.elf *.dat)")); | 145 | QString filename = QFileDialog::getOpenFileName(this, tr("Load file"), QString(), tr("3DS homebrew (*.elf *.dat *.bin)")); |
| 144 | if (filename.size()) | 146 | if (filename.size()) |
| 145 | BootGame(filename.toLatin1().data()); | 147 | BootGame(filename.toLatin1().data()); |
| 146 | } | 148 | } |
| 147 | 149 | ||
| 150 | void GMainWindow::OnMenuLoadSymbolMap() { | ||
| 151 | QString filename = QFileDialog::getOpenFileName(this, tr("Load symbol map"), QString(), tr("Symbol map (*)")); | ||
| 152 | if (filename.size()) | ||
| 153 | LoadSymbolMap(filename.toLatin1().data()); | ||
| 154 | } | ||
| 155 | |||
| 148 | void GMainWindow::OnStartGame() | 156 | void GMainWindow::OnStartGame() |
| 149 | { | 157 | { |
| 150 | render_window->GetEmuThread().SetCpuRunning(true); | 158 | render_window->GetEmuThread().SetCpuRunning(true); |