The-Homebrew-Cloud/dolphin
2
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-02-10 14:39:01 +01:00
Code Issues Packages Projects Releases Wiki Activity

Controller Settings Dialog: Rename "Advanced" group box to "Common".

Browse Source 
The only setting inside, "Background Input", doesn't seem advanced to me, but it is used for both GC an Wii input.
This commit is contained in:
rlnilsen 2019-10-22 01:43:37 +02:00
parent 4cb3baba5c
commit 8aec424191
2 changed files with 17 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
Source/Core/DolphinQt/Config/ControllersWindow.cpp
View File

@ -67,7 +67,7 @@ ControllersWindow::ControllersWindow(QWidget* parent) : QDialog(parent)
CreateGamecubeLayout(); CreateGamecubeLayout();
CreateWiimoteLayout(); CreateWiimoteLayout();
CreateAdvancedLayout(); CreateCommonLayout();
CreateMainLayout(); CreateMainLayout();
LoadSettings(); LoadSettings();
ConnectWidgets(); ConnectWidgets();
@ -199,15 +199,16 @@ void ControllersWindow::CreateWiimoteLayout()
m_wiimote_layout->addWidget(m_wiimote_speaker_data, m_wiimote_layout->rowCount(), 1, 1, -1); m_wiimote_layout->addWidget(m_wiimote_speaker_data, m_wiimote_layout->rowCount(), 1, 1, -1);
} }
void ControllersWindow::CreateAdvancedLayout() void ControllersWindow::CreateCommonLayout()
{ {
m_advanced_box = new QGroupBox(tr("Advanced")); // i18n: This is "common" as in "shared", not the opposite of "uncommon"
m_advanced_layout = new QHBoxLayout(); m_common_box = new QGroupBox(tr("Common"));
m_advanced_bg_input = new QCheckBox(tr("Background Input")); m_common_layout = new QHBoxLayout();
m_common_bg_input = new QCheckBox(tr("Background Input"));
m_advanced_layout->addWidget(m_advanced_bg_input); m_common_layout->addWidget(m_common_bg_input);
m_advanced_box->setLayout(m_advanced_layout); m_common_box->setLayout(m_common_layout);
} }
void ControllersWindow::CreateMainLayout() void ControllersWindow::CreateMainLayout()
@ -217,7 +218,7 @@ void ControllersWindow::CreateMainLayout()
layout->addWidget(m_gc_box); layout->addWidget(m_gc_box);
layout->addWidget(m_wiimote_box); layout->addWidget(m_wiimote_box);
layout->addWidget(m_advanced_box); layout->addWidget(m_common_box);
layout->addWidget(m_button_box); layout->addWidget(m_button_box);
WrapInScrollArea(this, layout); WrapInScrollArea(this, layout);
@ -232,7 +233,7 @@ void ControllersWindow::ConnectWidgets()
connect(m_wiimote_passthrough, &QRadioButton::toggled, this, connect(m_wiimote_passthrough, &QRadioButton::toggled, this,
&ControllersWindow::OnWiimoteModeChanged); &ControllersWindow::OnWiimoteModeChanged);
connect(m_advanced_bg_input, &QCheckBox::toggled, this, &ControllersWindow::SaveSettings); connect(m_common_bg_input, &QCheckBox::toggled, this, &ControllersWindow::SaveSettings);
connect(m_wiimote_continuous_scanning, &QCheckBox::toggled, this, connect(m_wiimote_continuous_scanning, &QCheckBox::toggled, this,
&ControllersWindow::SaveSettings); &ControllersWindow::SaveSettings);
connect(m_wiimote_real_balance_board, &QCheckBox::toggled, this, connect(m_wiimote_real_balance_board, &QCheckBox::toggled, this,
@ -480,7 +481,7 @@ void ControllersWindow::LoadSettings()
m_wiimote_speaker_data->setChecked(SConfig::GetInstance().m_WiimoteEnableSpeaker); m_wiimote_speaker_data->setChecked(SConfig::GetInstance().m_WiimoteEnableSpeaker);
m_wiimote_continuous_scanning->setChecked(SConfig::GetInstance().m_WiimoteContinuousScanning); m_wiimote_continuous_scanning->setChecked(SConfig::GetInstance().m_WiimoteContinuousScanning);
m_advanced_bg_input->setChecked(SConfig::GetInstance().m_BackgroundInput); m_common_bg_input->setChecked(SConfig::GetInstance().m_BackgroundInput);
if (SConfig::GetInstance().m_bt_passthrough_enabled) if (SConfig::GetInstance().m_bt_passthrough_enabled)
m_wiimote_passthrough->setChecked(true); m_wiimote_passthrough->setChecked(true);
@ -495,7 +496,7 @@ void ControllersWindow::SaveSettings()
SConfig::GetInstance().m_WiimoteEnableSpeaker = m_wiimote_speaker_data->isChecked(); SConfig::GetInstance().m_WiimoteEnableSpeaker = m_wiimote_speaker_data->isChecked();
SConfig::GetInstance().m_WiimoteContinuousScanning = m_wiimote_continuous_scanning->isChecked(); SConfig::GetInstance().m_WiimoteContinuousScanning = m_wiimote_continuous_scanning->isChecked();
SConfig::GetInstance().m_bt_passthrough_enabled = m_wiimote_passthrough->isChecked(); SConfig::GetInstance().m_bt_passthrough_enabled = m_wiimote_passthrough->isChecked();
SConfig::GetInstance().m_BackgroundInput = m_advanced_bg_input->isChecked(); SConfig::GetInstance().m_BackgroundInput = m_common_bg_input->isChecked();
WiimoteReal::ChangeWiimoteSource(WIIMOTE_BALANCE_BOARD, WiimoteReal::ChangeWiimoteSource(WIIMOTE_BALANCE_BOARD,
m_wiimote_real_balance_board->isChecked() ? WIIMOTE_SRC_REAL : m_wiimote_real_balance_board->isChecked() ? WIIMOTE_SRC_REAL :

10
Source/Core/DolphinQt/Config/ControllersWindow.h
View File

@ -40,7 +40,7 @@ private:
void CreateGamecubeLayout(); void CreateGamecubeLayout();
void CreateWiimoteLayout(); void CreateWiimoteLayout();
void CreateAdvancedLayout(); void CreateCommonLayout();
void CreateMainLayout(); void CreateMainLayout();
void ConnectWidgets(); void ConnectWidgets();
void LoadSettings(); void LoadSettings();
@ -73,8 +73,8 @@ private:
QCheckBox* m_wiimote_speaker_data; QCheckBox* m_wiimote_speaker_data;
QPushButton* m_wiimote_refresh; QPushButton* m_wiimote_refresh;
// Advanced // Common
QGroupBox* m_advanced_box; QGroupBox* m_common_box;
QHBoxLayout* m_advanced_layout; QHBoxLayout* m_common_layout;
QCheckBox* m_advanced_bg_input; QCheckBox* m_common_bg_input;
}; };