piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-25 07:09:48 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #8222 from JosJuice/allow-mismatched-region-settings

Browse Source 
Replace "Override Language on NTSC Games" with "Allow Mismatched Region Settings"
This commit is contained in:
Anthony
2019-08-21 09:00:06 -07:00
committed by GitHub
parent bf9427fafe 393709a45a
commit 5f38386575
23 changed files with 167 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
Source/Core/DolphinQt/Settings/GameCubePane.cpp
View File

@ -56,7 +56,6 @@ void GameCubePane::CreateWidgets()
ipl_box->setLayout(ipl_layout);
m_skip_main_menu = new QCheckBox(tr("Skip Main Menu"), ipl_box);
m_override_language_ntsc = new QCheckBox(tr("Override Language on NTSC Games"), ipl_box);
m_language_combo = new QComboBox(ipl_box);
m_language_combo->setCurrentIndex(-1);
@ -71,7 +70,6 @@ void GameCubePane::CreateWidgets()
ipl_layout->addWidget(m_skip_main_menu, 0, 0);
ipl_layout->addWidget(new QLabel(tr("System Language:")), 1, 0);
ipl_layout->addWidget(m_language_combo, 1, 1);
ipl_layout->addWidget(m_override_language_ntsc, 2, 0);
// Device Settings
QGroupBox* device_box = new QGroupBox(tr("Device Settings"), this);
@ -134,7 +132,6 @@ void GameCubePane::ConnectWidgets()
connect(m_skip_main_menu, &QCheckBox::stateChanged, this, &GameCubePane::SaveSettings);
connect(m_language_combo, QOverload<int>::of(&QComboBox::currentIndexChanged), this,
&GameCubePane::SaveSettings);
connect(m_override_language_ntsc, &QCheckBox::stateChanged, this, &GameCubePane::SaveSettings);
// Device Settings
for (int i = 0; i < SLOT_COUNT; i++)
@ -302,7 +299,6 @@ void GameCubePane::LoadSettings()
// IPL Settings
m_skip_main_menu->setChecked(params.bHLE_BS2);
m_language_combo->setCurrentIndex(m_language_combo->findData(params.SelectedLanguage));
m_override_language_ntsc->setChecked(params.bOverrideGCLanguage);
bool have_menu = false;
@ -343,9 +339,6 @@ void GameCubePane::SaveSettings()
Config::SetBaseOrCurrent(Config::MAIN_SKIP_IPL, m_skip_main_menu->isChecked());
params.SelectedLanguage = m_language_combo->currentData().toInt();
Config::SetBaseOrCurrent(Config::MAIN_GC_LANGUAGE, m_language_combo->currentData().toInt());
params.bOverrideGCLanguage = m_override_language_ntsc->isChecked();
Config::SetBaseOrCurrent(Config::MAIN_OVERRIDE_GC_LANGUAGE,
m_override_language_ntsc->isChecked());
for (int i = 0; i < SLOT_COUNT; i++)
{