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/Mapping/MappingWindow.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/Mapping/MappingWindow.cpp')
| -rw-r--r-- | Source/Core/DolphinQt2/Config/Mapping/MappingWindow.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Source/Core/DolphinQt2/Config/Mapping/MappingWindow.cpp b/Source/Core/DolphinQt2/Config/Mapping/MappingWindow.cpp index 660c1b5145..def3b25a28 100644 --- a/Source/Core/DolphinQt2/Config/Mapping/MappingWindow.cpp +++ b/Source/Core/DolphinQt2/Config/Mapping/MappingWindow.cpp @@ -109,7 +109,7 @@ void MappingWindow::CreateMainLayout() m_main_layout = new QVBoxLayout(); m_config_layout = new QHBoxLayout(); m_tab_widget = new QTabWidget(); - m_button_box = new QDialogButtonBox(QDialogButtonBox::Ok); + m_button_box = new QDialogButtonBox(QDialogButtonBox::Close); m_config_layout->addWidget(m_devices_box); m_config_layout->addWidget(m_reset_box); @@ -124,6 +124,7 @@ void MappingWindow::CreateMainLayout() void MappingWindow::ConnectWidgets() { + connect(m_button_box, &QDialogButtonBox::rejected, this, &QDialog::reject); connect(m_devices_refresh, &QPushButton::clicked, this, &MappingWindow::RefreshDevices); connect(m_devices_combo, static_cast<void (QComboBox::*)(int)>(&QComboBox::currentIndexChanged), this, &MappingWindow::OnDeviceChanged); @@ -132,7 +133,6 @@ void MappingWindow::ConnectWidgets() connect(m_profiles_save, &QPushButton::clicked, this, &MappingWindow::OnSaveProfilePressed); connect(m_profiles_load, &QPushButton::clicked, this, &MappingWindow::OnLoadProfilePressed); connect(m_profiles_delete, &QPushButton::clicked, this, &MappingWindow::OnDeleteProfilePressed); - connect(m_button_box, &QDialogButtonBox::accepted, this, &MappingWindow::accept); } void MappingWindow::OnDeleteProfilePressed() |