feedc0de/dolphin
1
0
Fork 0
forked from dolphin-emu/dolphin
Code Pull Requests Activity

Added bba server window also in windows

Browse Source
This commit is contained in:
0xFEEDC0DE64
2019-02-16 13:07:58 +01:00
parent 494aebc550
commit af3c0c320a
4 changed files with 1 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Source/Core/DolphinQt/MainWindow.cpp
View File

@@ -439,9 +439,7 @@ void MainWindow::ConnectMenuBar()
connect(m_menu_bar, &MenuBar::BootWiiSystemMenu, this, &MainWindow::BootWiiSystemMenu); connect(m_menu_bar, &MenuBar::BootWiiSystemMenu, this, &MainWindow::BootWiiSystemMenu);
connect(m_menu_bar, &MenuBar::StartNetPlay, this, &MainWindow::ShowNetPlaySetupDialog); connect(m_menu_bar, &MenuBar::StartNetPlay, this, &MainWindow::ShowNetPlaySetupDialog);
connect(m_menu_bar, &MenuBar::ShowFIFOPlayer, this, &MainWindow::ShowFIFOPlayer); connect(m_menu_bar, &MenuBar::ShowFIFOPlayer, this, &MainWindow::ShowFIFOPlayer);
#ifndef _WIN32
connect(m_menu_bar, &MenuBar::StartBbaServer, this, &MainWindow::StartBbaServer); connect(m_menu_bar, &MenuBar::StartBbaServer, this, &MainWindow::StartBbaServer);
#endif
connect(m_menu_bar, &MenuBar::ConnectWiiRemote, this, &MainWindow::OnConnectWiiRemote); connect(m_menu_bar, &MenuBar::ConnectWiiRemote, this, &MainWindow::OnConnectWiiRemote);
// Movie // Movie
@@ -1131,7 +1129,6 @@ void MainWindow::ShowFIFOPlayer()
m_fifo_window->activateWindow(); m_fifo_window->activateWindow();
} }
#ifndef _WIN32
void MainWindow::StartBbaServer() void MainWindow::StartBbaServer()
{ {
if (!m_bba_server_window) if (!m_bba_server_window)
@@ -1141,7 +1138,6 @@ void MainWindow::StartBbaServer()
m_bba_server_window->raise(); m_bba_server_window->raise();
m_bba_server_window->activateWindow(); m_bba_server_window->activateWindow();
} }
#endif
void MainWindow::StateLoad() void MainWindow::StateLoad()
{ {

4
Source/Core/DolphinQt/MainWindow.h
View File

@@ -149,9 +149,7 @@ private:
void ShowHotkeyDialog(); void ShowHotkeyDialog();
void ShowNetPlaySetupDialog(); void ShowNetPlaySetupDialog();
void ShowFIFOPlayer(); void ShowFIFOPlayer();
#ifndef _WIN32
void StartBbaServer(); void StartBbaServer();
#endif
void ShowMemcardManager(); void ShowMemcardManager();
void ShowResourcePackManager(); void ShowResourcePackManager();
void ShowCheatsManager(); void ShowCheatsManager();
@@ -208,9 +206,7 @@ private:
SettingsWindow* m_settings_window = nullptr; SettingsWindow* m_settings_window = nullptr;
GraphicsWindow* m_graphics_window = nullptr; GraphicsWindow* m_graphics_window = nullptr;
FIFOPlayerWindow* m_fifo_window = nullptr; FIFOPlayerWindow* m_fifo_window = nullptr;
#ifndef _WIN32
BBAServerWindow* m_bba_server_window = nullptr; BBAServerWindow* m_bba_server_window = nullptr;
#endif
MappingWindow* m_hotkey_window = nullptr; MappingWindow* m_hotkey_window = nullptr;
HotkeyScheduler* m_hotkey_scheduler; HotkeyScheduler* m_hotkey_scheduler;

2
Source/Core/DolphinQt/MenuBar.cpp
View File

@@ -240,9 +240,7 @@ void MenuBar::AddToolsMenu()
tools_menu->addAction(tr("Start &NetPlay..."), this, &MenuBar::StartNetPlay); tools_menu->addAction(tr("Start &NetPlay..."), this, &MenuBar::StartNetPlay);
tools_menu->addAction(tr("FIFO Player"), this, &MenuBar::ShowFIFOPlayer); tools_menu->addAction(tr("FIFO Player"), this, &MenuBar::ShowFIFOPlayer);
#ifndef _WIN32
tools_menu->addAction(tr("&Broadband Adapter Server"), this, &MenuBar::StartBbaServer); tools_menu->addAction(tr("&Broadband Adapter Server"), this, &MenuBar::StartBbaServer);
#endif
tools_menu->addSeparator(); tools_menu->addSeparator();
// Label will be set by a NANDRefresh later // Label will be set by a NANDRefresh later

2
Source/Core/DolphinQt/MenuBar.h
View File

@@ -62,7 +62,6 @@ signals:
void FrameAdvance(); void FrameAdvance();
void Screenshot(); void Screenshot();
void StartNetPlay(); void StartNetPlay();
void StartBbaServer();
void StateLoad(); void StateLoad();
void StateSave(); void StateSave();
void StateLoadSlot(); void StateLoadSlot();
@@ -81,6 +80,7 @@ signals:
// Tools // Tools
void ShowMemcardManager(); void ShowMemcardManager();
void BootGameCubeIPL(DiscIO::Region region); void BootGameCubeIPL(DiscIO::Region region);
void StartBbaServer();
void ShowFIFOPlayer(); void ShowFIFOPlayer();
void ShowAboutDialog(); void ShowAboutDialog();
void ShowCheatsManager(); void ShowCheatsManager();