diff options
| author | bunnei <bunneidev@gmail.com> | 2016-10-05 05:01:56 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-10-05 05:01:56 +0200 |
| commit | 09c3e444d42856ca0978153dcabcb5c3884877b9 (patch) | |
| tree | 89732a2264868d7dddc8f4c8355c0afac62b108c /src/citra_qt/main.cpp | |
| parent | Merge pull request #2106 from wwylele/delete-recursive (diff) | |
| parent | move ResetType to kernel.h (diff) | |
| download | yuzu-09c3e444d42856ca0978153dcabcb5c3884877b9.tar yuzu-09c3e444d42856ca0978153dcabcb5c3884877b9.tar.gz yuzu-09c3e444d42856ca0978153dcabcb5c3884877b9.tar.bz2 yuzu-09c3e444d42856ca0978153dcabcb5c3884877b9.tar.lz yuzu-09c3e444d42856ca0978153dcabcb5c3884877b9.tar.xz yuzu-09c3e444d42856ca0978153dcabcb5c3884877b9.tar.zst yuzu-09c3e444d42856ca0978153dcabcb5c3884877b9.zip | |
Diffstat (limited to 'src/citra_qt/main.cpp')
| -rw-r--r-- | src/citra_qt/main.cpp | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/src/citra_qt/main.cpp b/src/citra_qt/main.cpp index 0c7bedfcf..8322e2305 100644 --- a/src/citra_qt/main.cpp +++ b/src/citra_qt/main.cpp @@ -25,6 +25,7 @@ #include "citra_qt/debugger/profiler.h" #include "citra_qt/debugger/ramview.h" #include "citra_qt/debugger/registers.h" +#include "citra_qt/debugger/wait_tree.h" #include "citra_qt/game_list.h" #include "citra_qt/hotkeys.h" #include "citra_qt/main.h" @@ -104,6 +105,10 @@ GMainWindow::GMainWindow() : config(new Config()), emu_thread(nullptr) { connect(graphicsSurfaceViewerAction, SIGNAL(triggered()), this, SLOT(OnCreateGraphicsSurfaceViewer())); + waitTreeWidget = new WaitTreeWidget(this); + addDockWidget(Qt::LeftDockWidgetArea, waitTreeWidget); + waitTreeWidget->hide(); + QMenu* debug_menu = ui.menu_View->addMenu(tr("Debugging")); debug_menu->addAction(graphicsSurfaceViewerAction); debug_menu->addSeparator(); @@ -119,6 +124,7 @@ GMainWindow::GMainWindow() : config(new Config()), emu_thread(nullptr) { debug_menu->addAction(graphicsBreakpointsWidget->toggleViewAction()); debug_menu->addAction(graphicsVertexShaderWidget->toggleViewAction()); debug_menu->addAction(graphicsTracingWidget->toggleViewAction()); + debug_menu->addAction(waitTreeWidget->toggleViewAction()); // Set default UI state // geometry: 55% of the window contents are in the upper screen half, 45% in the lower half @@ -184,6 +190,9 @@ GMainWindow::GMainWindow() : config(new Config()), emu_thread(nullptr) { connect(this, SIGNAL(EmulationStarting(EmuThread*)), graphicsTracingWidget, SLOT(OnEmulationStarting(EmuThread*))); connect(this, SIGNAL(EmulationStopping()), graphicsTracingWidget, SLOT(OnEmulationStopping())); + connect(this, SIGNAL(EmulationStarting(EmuThread*)), waitTreeWidget, + SLOT(OnEmulationStarting(EmuThread*))); + connect(this, SIGNAL(EmulationStopping()), waitTreeWidget, SLOT(OnEmulationStopping())); // Setup hotkeys RegisterHotkey("Main Window", "Load File", QKeySequence::Open); @@ -345,12 +354,16 @@ void GMainWindow::BootGame(const std::string& filename) { SLOT(OnDebugModeEntered()), Qt::BlockingQueuedConnection); connect(emu_thread.get(), SIGNAL(DebugModeEntered()), callstackWidget, SLOT(OnDebugModeEntered()), Qt::BlockingQueuedConnection); + connect(emu_thread.get(), SIGNAL(DebugModeEntered()), waitTreeWidget, + SLOT(OnDebugModeEntered()), Qt::BlockingQueuedConnection); connect(emu_thread.get(), SIGNAL(DebugModeLeft()), disasmWidget, SLOT(OnDebugModeLeft()), Qt::BlockingQueuedConnection); connect(emu_thread.get(), SIGNAL(DebugModeLeft()), registersWidget, SLOT(OnDebugModeLeft()), Qt::BlockingQueuedConnection); connect(emu_thread.get(), SIGNAL(DebugModeLeft()), callstackWidget, SLOT(OnDebugModeLeft()), Qt::BlockingQueuedConnection); + connect(emu_thread.get(), SIGNAL(DebugModeLeft()), waitTreeWidget, SLOT(OnDebugModeLeft()), + Qt::BlockingQueuedConnection); // Update the GUI registersWidget->OnDebugModeEntered(); |