diff options
| author | bunnei <bunneidev@gmail.com> | 2022-11-20 00:48:39 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-11-20 00:48:39 -0800 |
| commit | 57a05b1653b316412492b7cf83738b702865b47e (patch) | |
| tree | cb76a9aead5f545250301eb7928ecfb03e706931 /src/yuzu/main.cpp | |
| parent | 69c92b8156ac6458883b78a680096cfb0cda2708 (diff) | |
| parent | 75e6ec85e107d6e5422d882b97faaa813970d42e (diff) | |
Merge pull request #9238 from german77/cabinet_applet
service: am: Implement cabinet applet
Diffstat (limited to 'src/yuzu/main.cpp')
| -rw-r--r-- | src/yuzu/main.cpp | 23 |
1 files changed, 23 insertions, 0 deletions
diff --git a/src/yuzu/main.cpp b/src/yuzu/main.cpp index 7ee2302cc..4081af391 100644 --- a/src/yuzu/main.cpp +++ b/src/yuzu/main.cpp @@ -15,6 +15,7 @@ #endif // VFS includes must be before glad as they will conflict with Windows file api, which uses defines. +#include "applets/qt_amiibo_settings.h" #include "applets/qt_controller.h" #include "applets/qt_error.h" #include "applets/qt_profile_select.h" @@ -26,6 +27,7 @@ #include "configuration/configure_tas.h" #include "core/file_sys/vfs.h" #include "core/file_sys/vfs_real.h" +#include "core/frontend/applets/cabinet.h" #include "core/frontend/applets/controller.h" #include "core/frontend/applets/general_frontend.h" #include "core/frontend/applets/mii_edit.h" @@ -548,6 +550,11 @@ void GMainWindow::RegisterMetaTypes() { // Register applet types + // Cabinet Applet + qRegisterMetaType<Core::Frontend::CabinetParameters>("Core::Frontend::CabinetParameters"); + qRegisterMetaType<std::shared_ptr<Service::NFP::NfpDevice>>( + "std::shared_ptr<Service::NFP::NfpDevice>"); + // Controller Applet qRegisterMetaType<Core::Frontend::ControllerParameters>("Core::Frontend::ControllerParameters"); @@ -569,6 +576,21 @@ void GMainWindow::RegisterMetaTypes() { qRegisterMetaType<Core::SystemResultStatus>("Core::SystemResultStatus"); } +void GMainWindow::AmiiboSettingsShowDialog(const Core::Frontend::CabinetParameters& parameters, + std::shared_ptr<Service::NFP::NfpDevice> nfp_device) { + QtAmiiboSettingsDialog dialog(this, parameters, input_subsystem.get(), nfp_device); + + dialog.setWindowFlags(Qt::Dialog | Qt::CustomizeWindowHint | Qt::WindowStaysOnTopHint | + Qt::WindowTitleHint | Qt::WindowSystemMenuHint); + dialog.setWindowModality(Qt::WindowModal); + if (dialog.exec() == QDialog::Rejected) { + emit AmiiboSettingsFinished(false, {}); + return; + } + + emit AmiiboSettingsFinished(true, dialog.GetName()); +} + void GMainWindow::ControllerSelectorReconfigureControllers( const Core::Frontend::ControllerParameters& parameters) { QtControllerSelectorDialog dialog(this, parameters, input_subsystem.get(), *system); @@ -1546,6 +1568,7 @@ bool GMainWindow::LoadROM(const QString& filename, u64 program_id, std::size_t p system->SetFilesystem(vfs); system->SetAppletFrontendSet({ + std::make_unique<QtAmiiboSettings>(*this), // Amiibo Settings std::make_unique<QtControllerSelector>(*this), // Controller Selector std::make_unique<QtErrorDisplay>(*this), // Error Display nullptr, // Mii Editor |