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

DolphinQt: Make WiiPane connect itself to EmulationStateChanged

This commit is contained in:
JosJuice 2019-10-26 17:51:43 +02:00
parent 8833e2a7fa
commit 10d972789a
3 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Source/Core/DolphinQt/Config/SettingsWindow.cpp
View File

@ -39,14 +39,7 @@ SettingsWindow::SettingsWindow(QWidget* parent) : QDialog(parent)
m_tab_widget->addTab(GetWrappedWidget(new AudioPane, this, 125, 100), tr("Audio"));
m_tab_widget->addTab(GetWrappedWidget(new PathPane, this, 125, 100), tr("Paths"));
m_tab_widget->addTab(GetWrappedWidget(new GameCubePane, this, 125, 100), tr("GameCube"));
auto* wii_pane = new WiiPane;
m_tab_widget->addTab(GetWrappedWidget(wii_pane, this, 125, 100), tr("Wii"));
connect(&Settings::Instance(), &Settings::EmulationStateChanged, [wii_pane](Core::State state) {
wii_pane->OnEmulationStateChanged(state != Core::State::Uninitialized);
});
m_tab_widget->addTab(GetWrappedWidget(new WiiPane, this, 125, 100), tr("Wii"));
m_tab_widget->addTab(GetWrappedWidget(new AdvancedPane, this, 125, 200), tr("Advanced"));
// Dialog box buttons

4
Source/Core/DolphinQt/Settings/WiiPane.cpp
View File

@ -93,6 +93,10 @@ void WiiPane::ConnectLayout()
connect(m_wiimote_ir_sensitivity, &QSlider::valueChanged, this, &WiiPane::OnSaveConfig);
connect(m_wiimote_speaker_volume, &QSlider::valueChanged, this, &WiiPane::OnSaveConfig);
connect(m_wiimote_motor, &QCheckBox::toggled, this, &WiiPane::OnSaveConfig);
// Emulation State
connect(&Settings::Instance(), &Settings::EmulationStateChanged,
[=](Core::State state) { OnEmulationStateChanged(state != Core::State::Uninitialized); });
}
void WiiPane::CreateMisc()

2
Source/Core/DolphinQt/Settings/WiiPane.h
View File

@ -19,7 +19,6 @@ class WiiPane : public QWidget
Q_OBJECT
public:
explicit WiiPane(QWidget* parent = nullptr);
void OnEmulationStateChanged(bool running);
private:
void PopulateUSBPassthroughListWidget();
@ -31,6 +30,7 @@ private:
void LoadConfig();
void OnSaveConfig();
void OnEmulationStateChanged(bool running);
void ValidateSelectionState();