ShuriZma
/
mgba
mirror of https://github.com/mgba-emu/mgba.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

settings, GB Printer

This commit is contained in:
Adam Higerd 2025-05-25 22:54:40 -05:00
parent 8c69714754
commit ab49e38a45
2 changed files with 39 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/platform/qt/PopupManager.h
View File

@ -81,7 +81,7 @@ public:
PopupManager& withController(CoreProvider& provider) { d()->setProvider(&provider); return *this; } PopupManager& withController(CoreProvider& provider) { d()->setProvider(&provider); return *this; }
PopupManager& setModal(bool modal) { d()->isModal = modal; return *this; } PopupManager& setModal(bool modal) { d()->isModal = modal; return *this; }
PopupManager& setKeepAlive(bool keepAlive) { d()->keepAlive = keepAlive; return *this; } PopupManager& setKeepAlive(bool keepAlive) { d()->keepAlive = keepAlive; return *this; }
PopupManager& constructWith(const std::function<WINDOW*()>& ctor) { d()->construct = ctor; return *this; } PopupManager& constructWithCallback(const std::function<WINDOW*()>& ctor) { d()->construct = ctor; return *this; }
template <typename... Args> template <typename... Args>
PopupManager& constructWith(Args... args) { PopupManager& constructWith(Args... args) {

63
src/platform/qt/Window.cpp
View File

@ -112,7 +112,10 @@ public:
#ifdef ENABLE_DEBUGGERS #ifdef ENABLE_DEBUGGERS
PopupManager<DebuggerConsole> console; PopupManager<DebuggerConsole> console;
#endif #endif
#ifdef M_CORE_GB
PopupManager<PrinterView> printerView;
#endif
QPointer<SettingsView> settingsView;
}; };
} }
@ -528,9 +531,13 @@ void Window::parseCard() {
} }
void Window::openView(QWidget* widget) { void Window::openView(QWidget* widget) {
// Attempt to disconnect first to prevent multiple connections
disconnect(this, &Window::shutdown, widget, &QWidget::close);
connect(this, &Window::shutdown, widget, &QWidget::close); connect(this, &Window::shutdown, widget, &QWidget::close);
widget->setAttribute(Qt::WA_DeleteOnClose); widget->setAttribute(Qt::WA_DeleteOnClose);
widget->show(); widget->show();
widget->activateWindow();
widget->raise();
} }
void Window::loadCamImage() { void Window::loadCamImage() {
@ -559,31 +566,34 @@ void Window::openSettingsWindow() {
} }
void Window::openSettingsWindow(SettingsView::Page page) { void Window::openSettingsWindow(SettingsView::Page page) {
SettingsView* settingsWindow = new SettingsView(m_config, &m_inputController, m_shortcutController, &m_log); if (!m_popups->settingsView) {
SettingsView* settingsWindow = new SettingsView(m_config, &m_inputController, m_shortcutController, &m_log);
#if defined(BUILD_GL) || defined(BUILD_GLES2) #if defined(BUILD_GL) || defined(BUILD_GLES2)
if (m_display->supportsShaders()) { if (m_display->supportsShaders()) {
settingsWindow->setShaderSelector(m_shaderView.get()); settingsWindow->setShaderSelector(m_shaderView.get());
} }
#endif #endif
connect(settingsWindow, &SettingsView::displayDriverChanged, this, &Window::reloadDisplayDriver); connect(settingsWindow, &SettingsView::displayDriverChanged, this, &Window::reloadDisplayDriver);
connect(settingsWindow, &SettingsView::audioDriverChanged, this, &Window::reloadAudioDriver); connect(settingsWindow, &SettingsView::audioDriverChanged, this, &Window::reloadAudioDriver);
connect(settingsWindow, &SettingsView::cameraDriverChanged, this, &Window::mustReset); connect(settingsWindow, &SettingsView::cameraDriverChanged, this, &Window::mustReset);
connect(settingsWindow, &SettingsView::cameraChanged, &m_inputController, &InputController::setCamera); connect(settingsWindow, &SettingsView::cameraChanged, &m_inputController, &InputController::setCamera);
connect(settingsWindow, &SettingsView::videoRendererChanged, this, &Window::changeRenderer); connect(settingsWindow, &SettingsView::videoRendererChanged, this, &Window::changeRenderer);
connect(settingsWindow, &SettingsView::languageChanged, this, &Window::mustRestart); connect(settingsWindow, &SettingsView::languageChanged, this, &Window::mustRestart);
connect(settingsWindow, &SettingsView::pathsChanged, this, &Window::reloadConfig); connect(settingsWindow, &SettingsView::pathsChanged, this, &Window::reloadConfig);
#ifdef USE_SQLITE3 #ifdef USE_SQLITE3
connect(settingsWindow, &SettingsView::libraryCleared, m_libraryView, &LibraryController::clear); connect(settingsWindow, &SettingsView::libraryCleared, m_libraryView, &LibraryController::clear);
#endif #endif
#ifdef ENABLE_SCRIPTING #ifdef ENABLE_SCRIPTING
connect(settingsWindow, &SettingsView::openAutorunScripts, this, [this]() { connect(settingsWindow, &SettingsView::openAutorunScripts, this, [this]() {
ensureScripting(); ensureScripting();
m_scripting->openAutorunEdit(); m_scripting->openAutorunEdit();
}); });
#endif #endif
connect(this, &Window::shaderSelectorAdded, settingsWindow, &SettingsView::setShaderSelector); connect(this, &Window::shaderSelectorAdded, settingsWindow, &SettingsView::setShaderSelector);
openView(settingsWindow); m_popups->settingsView = settingsWindow;
settingsWindow->selectPage(page); }
openView(m_popups->settingsView);
m_popups->settingsView->selectPage(page);
} }
void Window::startVideoLog() { void Window::startVideoLog() {
@ -1267,6 +1277,13 @@ void Window::setupPopups() {
m_popups->dolphinView.constructWith(this).setKeepAlive(true); m_popups->dolphinView.constructWith(this).setKeepAlive(true);
m_popups->videoView.withController(m_controller).setKeepAlive(true); m_popups->videoView.withController(m_controller).setKeepAlive(true);
m_popups->gifView.withController(m_controller).setKeepAlive(true); m_popups->gifView.withController(m_controller).setKeepAlive(true);
#ifdef M_CORE_GB
m_popups->printerView.withController(m_controller).constructWithCallback([this]() -> PrinterView* {
m_controller->attachPrinter();
return new PrinterView(m_controller);
});
#endif
} }
void Window::setupMenu(QMenuBar* menubar) { void Window::setupMenu(QMenuBar* menubar) {
@ -1514,11 +1531,7 @@ void Window::setupMenu(QMenuBar* menubar) {
#ifdef M_CORE_GB #ifdef M_CORE_GB
m_actions.addAction(tr("Load camera image..."), "loadCamImage", this, &Window::loadCamImage, "emu"); m_actions.addAction(tr("Load camera image..."), "loadCamImage", this, &Window::loadCamImage, "emu");
auto gbPrint = addGameAction(tr("Game Boy Printer..."), "gbPrint", [this]() { auto gbPrint = addGameAction(tr("Game Boy Printer..."), "gbPrint", m_popups->printerView, "emu");
PrinterView* view = new PrinterView(m_controller);
openView(view);
m_controller->attachPrinter();
}, "emu");
m_platformActions.insert(mPLATFORM_GB, gbPrint); m_platformActions.insert(mPLATFORM_GB, gbPrint);
#endif #endif