diff options
| author | Léo Lam <leolino.lam@gmail.com> | 2018-03-26 22:48:26 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-03-26 22:48:26 +0200 |
| commit | b0e4e35cc54780b79e376b74a965bcf95c6dcc39 (patch) | |
| tree | 9fe0341e4a99b95b9303b1e5bcc8dd19f0d179fb /Source/Core/DolphinQt2/Config/ControllersWindow.cpp | |
| parent | d3f432946f1a709a4e6f1b8e9b472473b6e0fd22 (diff) | |
| parent | 591c8837e2fef95750172d454c08dab4a49e4f6b (diff) | |
Merge pull request #6478 from spycrab/qt_default_btns
Qt: Replace "OK" with "Close" buttons
Diffstat (limited to 'Source/Core/DolphinQt2/Config/ControllersWindow.cpp')
| -rw-r--r-- | Source/Core/DolphinQt2/Config/ControllersWindow.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Source/Core/DolphinQt2/Config/ControllersWindow.cpp b/Source/Core/DolphinQt2/Config/ControllersWindow.cpp index 6e1fe5f14b..cb62e6e50d 100644 --- a/Source/Core/DolphinQt2/Config/ControllersWindow.cpp +++ b/Source/Core/DolphinQt2/Config/ControllersWindow.cpp @@ -223,7 +223,7 @@ void ControllersWindow::CreateAdvancedLayout() void ControllersWindow::CreateMainLayout() { auto* layout = new QVBoxLayout(); - m_button_box = new QDialogButtonBox(QDialogButtonBox::Ok); + m_button_box = new QDialogButtonBox(QDialogButtonBox::Close); layout->addWidget(m_gc_box); layout->addWidget(m_wiimote_box); @@ -235,6 +235,7 @@ void ControllersWindow::CreateMainLayout() void ControllersWindow::ConnectWidgets() { + connect(m_button_box, &QDialogButtonBox::rejected, this, &QDialog::reject); connect(&Settings::Instance(), &Settings::EmulationStateChanged, this, [=](Core::State state) { OnEmulationStateChanged(state != Core::State::Uninitialized); }); @@ -253,7 +254,6 @@ void ControllersWindow::ConnectWidgets() &ControllersWindow::OnBluetoothPassthroughResetPressed); connect(m_wiimote_refresh, &QPushButton::clicked, this, &ControllersWindow::OnWiimoteRefreshPressed); - connect(m_button_box, &QDialogButtonBox::accepted, this, &ControllersWindow::accept); for (size_t i = 0; i < m_wiimote_groups.size(); i++) { |
