diff options
| author | Léo Lam <leo@leolam.fr> | 2023-04-30 02:13:39 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-04-30 02:13:39 +0100 |
| commit | f36e05ad3ef74f5c37be3aff6e03dd2157c8981e (patch) | |
| tree | dc16c764728f359b12f00c9aaa3abd58fd5785f5 /Source/Core/DolphinQt/MainWindow.cpp | |
| parent | eb30aba552dbfd031e8e53a37da186c27755b756 (diff) | |
| parent | 529d0a1c63eecd19f6c415e925992bdd7f2d021a (diff) | |
Merge pull request #11546 from deReeperJosh/disneyinfinitybase
Feature: Emulate Infinity Base
Diffstat (limited to 'Source/Core/DolphinQt/MainWindow.cpp')
| -rw-r--r-- | Source/Core/DolphinQt/MainWindow.cpp | 16 |
1 files changed, 15 insertions, 1 deletions
diff --git a/Source/Core/DolphinQt/MainWindow.cpp b/Source/Core/DolphinQt/MainWindow.cpp index 23c67e0306..c5142fd12d 100644 --- a/Source/Core/DolphinQt/MainWindow.cpp +++ b/Source/Core/DolphinQt/MainWindow.cpp @@ -95,6 +95,7 @@ #include "DolphinQt/GameList/GameList.h" #include "DolphinQt/Host.h" #include "DolphinQt/HotkeyScheduler.h" +#include "DolphinQt/InfinityBase/InfinityBaseWindow.h" #include "DolphinQt/MenuBar.h" #include "DolphinQt/NKitWarningDialog.h" #include "DolphinQt/NetPlay/NetPlayBrowser.h" @@ -540,6 +541,7 @@ void MainWindow::ConnectMenuBar() connect(m_menu_bar, &MenuBar::BrowseNetPlay, this, &MainWindow::ShowNetPlayBrowser); connect(m_menu_bar, &MenuBar::ShowFIFOPlayer, this, &MainWindow::ShowFIFOPlayer); connect(m_menu_bar, &MenuBar::ShowSkylanderPortal, this, &MainWindow::ShowSkylanderPortal); + connect(m_menu_bar, &MenuBar::ShowInfinityBase, this, &MainWindow::ShowInfinityBase); connect(m_menu_bar, &MenuBar::ConnectWiiRemote, this, &MainWindow::OnConnectWiiRemote); // Movie @@ -1325,7 +1327,7 @@ void MainWindow::ShowSkylanderPortal() { if (!m_skylander_window) { - m_skylander_window = new SkylanderPortalWindow; + m_skylander_window = new SkylanderPortalWindow(); } m_skylander_window->show(); @@ -1333,6 +1335,18 @@ void MainWindow::ShowSkylanderPortal() m_skylander_window->activateWindow(); } +void MainWindow::ShowInfinityBase() +{ + if (!m_infinity_window) + { + m_infinity_window = new InfinityBaseWindow(); + } + + m_infinity_window->show(); + m_infinity_window->raise(); + m_infinity_window->activateWindow(); +} + void MainWindow::StateLoad() { QString path = |
