mirror of
https://github.com/yuzu-emu/yuzu.git
synced 2024-08-22 15:33:22 +02:00
citra-qt: Move bits of constructor behavior to named functions
Makes the initialization process a tad easier to grok, since the constructor isn't just a glob of random unrelated behaviors.
This commit is contained in:
parent
3a1eaf2efc
commit
cc1f2c131b
@ -60,6 +60,36 @@ GMainWindow::GMainWindow() : config(new Config()), emu_thread(nullptr) {
|
|||||||
ui.setupUi(this);
|
ui.setupUi(this);
|
||||||
statusBar()->hide();
|
statusBar()->hide();
|
||||||
|
|
||||||
|
InitializeWidgets();
|
||||||
|
InitializeDebugMenuActions();
|
||||||
|
InitializeRecentFileMenuActions();
|
||||||
|
InitializeHotkeys();
|
||||||
|
|
||||||
|
SetDefaultUIGeometry();
|
||||||
|
RestoreUIState();
|
||||||
|
|
||||||
|
ConnectWidgetEvents();
|
||||||
|
|
||||||
|
setWindowTitle(QString("Citra | %1-%2").arg(Common::g_scm_branch, Common::g_scm_desc));
|
||||||
|
show();
|
||||||
|
|
||||||
|
game_list->PopulateAsync(UISettings::values.gamedir, UISettings::values.gamedir_deepscan);
|
||||||
|
|
||||||
|
QStringList args = QApplication::arguments();
|
||||||
|
if (args.length() >= 2) {
|
||||||
|
BootGame(args[1].toStdString());
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
GMainWindow::~GMainWindow() {
|
||||||
|
// will get automatically deleted otherwise
|
||||||
|
if (render_window->parent() == nullptr)
|
||||||
|
delete render_window;
|
||||||
|
|
||||||
|
Pica::g_debug_context.reset();
|
||||||
|
}
|
||||||
|
|
||||||
|
void GMainWindow::InitializeWidgets() {
|
||||||
render_window = new GRenderWindow(this, emu_thread.get());
|
render_window = new GRenderWindow(this, emu_thread.get());
|
||||||
render_window->hide();
|
render_window->hide();
|
||||||
|
|
||||||
@ -95,25 +125,27 @@ GMainWindow::GMainWindow() : config(new Config()), emu_thread(nullptr) {
|
|||||||
addDockWidget(Qt::RightDockWidgetArea, graphicsCommandsWidget);
|
addDockWidget(Qt::RightDockWidgetArea, graphicsCommandsWidget);
|
||||||
graphicsCommandsWidget->hide();
|
graphicsCommandsWidget->hide();
|
||||||
|
|
||||||
auto graphicsBreakpointsWidget = new GraphicsBreakPointsWidget(Pica::g_debug_context, this);
|
graphicsBreakpointsWidget = new GraphicsBreakPointsWidget(Pica::g_debug_context, this);
|
||||||
addDockWidget(Qt::RightDockWidgetArea, graphicsBreakpointsWidget);
|
addDockWidget(Qt::RightDockWidgetArea, graphicsBreakpointsWidget);
|
||||||
graphicsBreakpointsWidget->hide();
|
graphicsBreakpointsWidget->hide();
|
||||||
|
|
||||||
auto graphicsVertexShaderWidget = new GraphicsVertexShaderWidget(Pica::g_debug_context, this);
|
graphicsVertexShaderWidget = new GraphicsVertexShaderWidget(Pica::g_debug_context, this);
|
||||||
addDockWidget(Qt::RightDockWidgetArea, graphicsVertexShaderWidget);
|
addDockWidget(Qt::RightDockWidgetArea, graphicsVertexShaderWidget);
|
||||||
graphicsVertexShaderWidget->hide();
|
graphicsVertexShaderWidget->hide();
|
||||||
|
|
||||||
auto graphicsTracingWidget = new GraphicsTracingWidget(Pica::g_debug_context, this);
|
graphicsTracingWidget = new GraphicsTracingWidget(Pica::g_debug_context, this);
|
||||||
addDockWidget(Qt::RightDockWidgetArea, graphicsTracingWidget);
|
addDockWidget(Qt::RightDockWidgetArea, graphicsTracingWidget);
|
||||||
graphicsTracingWidget->hide();
|
graphicsTracingWidget->hide();
|
||||||
|
|
||||||
auto graphicsSurfaceViewerAction = new QAction(tr("Create Pica Surface Viewer"), this);
|
|
||||||
connect(graphicsSurfaceViewerAction, SIGNAL(triggered()), this,
|
|
||||||
SLOT(OnCreateGraphicsSurfaceViewer()));
|
|
||||||
|
|
||||||
waitTreeWidget = new WaitTreeWidget(this);
|
waitTreeWidget = new WaitTreeWidget(this);
|
||||||
addDockWidget(Qt::LeftDockWidgetArea, waitTreeWidget);
|
addDockWidget(Qt::LeftDockWidgetArea, waitTreeWidget);
|
||||||
waitTreeWidget->hide();
|
waitTreeWidget->hide();
|
||||||
|
}
|
||||||
|
|
||||||
|
void GMainWindow::InitializeDebugMenuActions() {
|
||||||
|
auto graphicsSurfaceViewerAction = new QAction(tr("Create Pica Surface Viewer"), this);
|
||||||
|
connect(graphicsSurfaceViewerAction, SIGNAL(triggered()), this,
|
||||||
|
SLOT(OnCreateGraphicsSurfaceViewer()));
|
||||||
|
|
||||||
QMenu* debug_menu = ui.menu_View->addMenu(tr("Debugging"));
|
QMenu* debug_menu = ui.menu_View->addMenu(tr("Debugging"));
|
||||||
debug_menu->addAction(graphicsSurfaceViewerAction);
|
debug_menu->addAction(graphicsSurfaceViewerAction);
|
||||||
@ -131,19 +163,47 @@ GMainWindow::GMainWindow() : config(new Config()), emu_thread(nullptr) {
|
|||||||
debug_menu->addAction(graphicsVertexShaderWidget->toggleViewAction());
|
debug_menu->addAction(graphicsVertexShaderWidget->toggleViewAction());
|
||||||
debug_menu->addAction(graphicsTracingWidget->toggleViewAction());
|
debug_menu->addAction(graphicsTracingWidget->toggleViewAction());
|
||||||
debug_menu->addAction(waitTreeWidget->toggleViewAction());
|
debug_menu->addAction(waitTreeWidget->toggleViewAction());
|
||||||
|
}
|
||||||
|
|
||||||
// Set default UI state
|
void GMainWindow::InitializeRecentFileMenuActions() {
|
||||||
|
for (int i = 0; i < max_recent_files_item; ++i) {
|
||||||
|
actions_recent_files[i] = new QAction(this);
|
||||||
|
actions_recent_files[i]->setVisible(false);
|
||||||
|
connect(actions_recent_files[i], SIGNAL(triggered()), this, SLOT(OnMenuRecentFile()));
|
||||||
|
|
||||||
|
ui.menu_recent_files->addAction(actions_recent_files[i]);
|
||||||
|
}
|
||||||
|
|
||||||
|
UpdateRecentFiles();
|
||||||
|
}
|
||||||
|
|
||||||
|
void GMainWindow::InitializeHotkeys() {
|
||||||
|
RegisterHotkey("Main Window", "Load File", QKeySequence::Open);
|
||||||
|
RegisterHotkey("Main Window", "Swap Screens", QKeySequence::NextChild);
|
||||||
|
RegisterHotkey("Main Window", "Start Emulation");
|
||||||
|
LoadHotkeys();
|
||||||
|
|
||||||
|
connect(GetHotkey("Main Window", "Load File", this), SIGNAL(activated()), this,
|
||||||
|
SLOT(OnMenuLoadFile()));
|
||||||
|
connect(GetHotkey("Main Window", "Start Emulation", this), SIGNAL(activated()), this,
|
||||||
|
SLOT(OnStartGame()));
|
||||||
|
connect(GetHotkey("Main Window", "Swap Screens", render_window), SIGNAL(activated()), this,
|
||||||
|
SLOT(OnSwapScreens()));
|
||||||
|
}
|
||||||
|
|
||||||
|
void GMainWindow::SetDefaultUIGeometry() {
|
||||||
// geometry: 55% of the window contents are in the upper screen half, 45% in the lower half
|
// geometry: 55% of the window contents are in the upper screen half, 45% in the lower half
|
||||||
QDesktopWidget* desktop = ((QApplication*)QApplication::instance())->desktop();
|
const QRect screenRect = QApplication::desktop()->screenGeometry(this);
|
||||||
QRect screenRect = desktop->screenGeometry(this);
|
|
||||||
int x, y, w, h;
|
|
||||||
w = screenRect.width() * 2 / 3;
|
|
||||||
h = screenRect.height() / 2;
|
|
||||||
x = (screenRect.x() + screenRect.width()) / 2 - w / 2;
|
|
||||||
y = (screenRect.y() + screenRect.height()) / 2 - h * 55 / 100;
|
|
||||||
setGeometry(x, y, w, h);
|
|
||||||
|
|
||||||
// Restore UI state
|
const int w = screenRect.width() * 2 / 3;
|
||||||
|
const int h = screenRect.height() / 2;
|
||||||
|
const int x = (screenRect.x() + screenRect.width()) / 2 - w / 2;
|
||||||
|
const int y = (screenRect.y() + screenRect.height()) / 2 - h * 55 / 100;
|
||||||
|
|
||||||
|
setGeometry(x, y, w, h);
|
||||||
|
}
|
||||||
|
|
||||||
|
void GMainWindow::RestoreUIState() {
|
||||||
restoreGeometry(UISettings::values.geometry);
|
restoreGeometry(UISettings::values.geometry);
|
||||||
restoreState(UISettings::values.state);
|
restoreState(UISettings::values.state);
|
||||||
render_window->restoreGeometry(UISettings::values.renderwindow_geometry);
|
render_window->restoreGeometry(UISettings::values.renderwindow_geometry);
|
||||||
@ -159,18 +219,9 @@ GMainWindow::GMainWindow() : config(new Config()), emu_thread(nullptr) {
|
|||||||
|
|
||||||
ui.actionDisplay_widget_title_bars->setChecked(UISettings::values.display_titlebar);
|
ui.actionDisplay_widget_title_bars->setChecked(UISettings::values.display_titlebar);
|
||||||
OnDisplayTitleBars(ui.actionDisplay_widget_title_bars->isChecked());
|
OnDisplayTitleBars(ui.actionDisplay_widget_title_bars->isChecked());
|
||||||
|
}
|
||||||
|
|
||||||
// Prepare actions for recent files
|
void GMainWindow::ConnectWidgetEvents() {
|
||||||
for (int i = 0; i < max_recent_files_item; ++i) {
|
|
||||||
actions_recent_files[i] = new QAction(this);
|
|
||||||
actions_recent_files[i]->setVisible(false);
|
|
||||||
connect(actions_recent_files[i], SIGNAL(triggered()), this, SLOT(OnMenuRecentFile()));
|
|
||||||
|
|
||||||
ui.menu_recent_files->addAction(actions_recent_files[i]);
|
|
||||||
}
|
|
||||||
UpdateRecentFiles();
|
|
||||||
|
|
||||||
// Setup connections
|
|
||||||
connect(game_list, SIGNAL(GameChosen(QString)), this, SLOT(OnGameListLoadFile(QString)),
|
connect(game_list, SIGNAL(GameChosen(QString)), this, SLOT(OnGameListLoadFile(QString)),
|
||||||
Qt::DirectConnection);
|
Qt::DirectConnection);
|
||||||
connect(game_list, SIGNAL(OpenSaveFolderRequested(u64)), this,
|
connect(game_list, SIGNAL(OpenSaveFolderRequested(u64)), this,
|
||||||
@ -201,40 +252,6 @@ GMainWindow::GMainWindow() : config(new Config()), emu_thread(nullptr) {
|
|||||||
connect(this, SIGNAL(EmulationStarting(EmuThread*)), waitTreeWidget,
|
connect(this, SIGNAL(EmulationStarting(EmuThread*)), waitTreeWidget,
|
||||||
SLOT(OnEmulationStarting(EmuThread*)));
|
SLOT(OnEmulationStarting(EmuThread*)));
|
||||||
connect(this, SIGNAL(EmulationStopping()), waitTreeWidget, SLOT(OnEmulationStopping()));
|
connect(this, SIGNAL(EmulationStopping()), waitTreeWidget, SLOT(OnEmulationStopping()));
|
||||||
|
|
||||||
// Setup hotkeys
|
|
||||||
RegisterHotkey("Main Window", "Load File", QKeySequence::Open);
|
|
||||||
RegisterHotkey("Main Window", "Swap Screens", QKeySequence::NextChild);
|
|
||||||
RegisterHotkey("Main Window", "Start Emulation");
|
|
||||||
LoadHotkeys();
|
|
||||||
|
|
||||||
connect(GetHotkey("Main Window", "Load File", this), SIGNAL(activated()), this,
|
|
||||||
SLOT(OnMenuLoadFile()));
|
|
||||||
connect(GetHotkey("Main Window", "Start Emulation", this), SIGNAL(activated()), this,
|
|
||||||
SLOT(OnStartGame()));
|
|
||||||
connect(GetHotkey("Main Window", "Swap Screens", render_window), SIGNAL(activated()), this,
|
|
||||||
SLOT(OnSwapScreens()));
|
|
||||||
|
|
||||||
std::string window_title =
|
|
||||||
Common::StringFromFormat("Citra | %s-%s", Common::g_scm_branch, Common::g_scm_desc);
|
|
||||||
setWindowTitle(window_title.c_str());
|
|
||||||
|
|
||||||
show();
|
|
||||||
|
|
||||||
game_list->PopulateAsync(UISettings::values.gamedir, UISettings::values.gamedir_deepscan);
|
|
||||||
|
|
||||||
QStringList args = QApplication::arguments();
|
|
||||||
if (args.length() >= 2) {
|
|
||||||
BootGame(args[1].toStdString());
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
GMainWindow::~GMainWindow() {
|
|
||||||
// will get automatically deleted otherwise
|
|
||||||
if (render_window->parent() == nullptr)
|
|
||||||
delete render_window;
|
|
||||||
|
|
||||||
Pica::g_debug_context.reset();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void GMainWindow::OnDisplayTitleBars(bool show) {
|
void GMainWindow::OnDisplayTitleBars(bool show) {
|
||||||
|
@ -9,18 +9,21 @@
|
|||||||
#include <QMainWindow>
|
#include <QMainWindow>
|
||||||
#include "ui_main.h"
|
#include "ui_main.h"
|
||||||
|
|
||||||
|
class CallstackWidget;
|
||||||
class Config;
|
class Config;
|
||||||
|
class DisassemblerWidget;
|
||||||
|
class EmuThread;
|
||||||
class GameList;
|
class GameList;
|
||||||
class GImageInfo;
|
class GImageInfo;
|
||||||
class GRenderWindow;
|
|
||||||
class EmuThread;
|
|
||||||
class ProfilerWidget;
|
|
||||||
class MicroProfileDialog;
|
|
||||||
class DisassemblerWidget;
|
|
||||||
class RegistersWidget;
|
|
||||||
class CallstackWidget;
|
|
||||||
class GPUCommandStreamWidget;
|
class GPUCommandStreamWidget;
|
||||||
class GPUCommandListWidget;
|
class GPUCommandListWidget;
|
||||||
|
class GraphicsBreakPointsWidget;
|
||||||
|
class GraphicsTracingWidget;
|
||||||
|
class GraphicsVertexShaderWidget;
|
||||||
|
class GRenderWindow;
|
||||||
|
class MicroProfileDialog;
|
||||||
|
class ProfilerWidget;
|
||||||
|
class RegistersWidget;
|
||||||
class WaitTreeWidget;
|
class WaitTreeWidget;
|
||||||
|
|
||||||
class GMainWindow : public QMainWindow {
|
class GMainWindow : public QMainWindow {
|
||||||
@ -60,6 +63,16 @@ signals:
|
|||||||
void EmulationStopping();
|
void EmulationStopping();
|
||||||
|
|
||||||
private:
|
private:
|
||||||
|
void InitializeWidgets();
|
||||||
|
void InitializeDebugMenuActions();
|
||||||
|
void InitializeRecentFileMenuActions();
|
||||||
|
void InitializeHotkeys();
|
||||||
|
|
||||||
|
void SetDefaultUIGeometry();
|
||||||
|
void RestoreUIState();
|
||||||
|
|
||||||
|
void ConnectWidgetEvents();
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Initializes the emulation system.
|
* Initializes the emulation system.
|
||||||
* @param system_mode The system mode with which to intialize the kernel.
|
* @param system_mode The system mode with which to intialize the kernel.
|
||||||
@ -136,6 +149,9 @@ private:
|
|||||||
CallstackWidget* callstackWidget;
|
CallstackWidget* callstackWidget;
|
||||||
GPUCommandStreamWidget* graphicsWidget;
|
GPUCommandStreamWidget* graphicsWidget;
|
||||||
GPUCommandListWidget* graphicsCommandsWidget;
|
GPUCommandListWidget* graphicsCommandsWidget;
|
||||||
|
GraphicsBreakPointsWidget* graphicsBreakpointsWidget;
|
||||||
|
GraphicsVertexShaderWidget* graphicsVertexShaderWidget;
|
||||||
|
GraphicsTracingWidget* graphicsTracingWidget;
|
||||||
WaitTreeWidget* waitTreeWidget;
|
WaitTreeWidget* waitTreeWidget;
|
||||||
|
|
||||||
QAction* actions_recent_files[max_recent_files_item];
|
QAction* actions_recent_files[max_recent_files_item];
|
||||||
|
Loading…
Reference in New Issue
Block a user