diff options
author | bunnei <bunneidev@gmail.com> | 2017-10-13 03:21:49 +0200 |
---|---|---|
committer | bunnei <bunneidev@gmail.com> | 2017-10-13 03:21:49 +0200 |
commit | 72b03025ac4ef0d8633c2f3e55b513cd149c59e5 (patch) | |
tree | f1fbeb915a0b3df8e4e988a6a562a763e18ea666 /src/citra_qt/configuration/configure_system.cpp | |
parent | hle: Remove a large amount of 3ds-specific service code. (diff) | |
download | yuzu-72b03025ac4ef0d8633c2f3e55b513cd149c59e5.tar yuzu-72b03025ac4ef0d8633c2f3e55b513cd149c59e5.tar.gz yuzu-72b03025ac4ef0d8633c2f3e55b513cd149c59e5.tar.bz2 yuzu-72b03025ac4ef0d8633c2f3e55b513cd149c59e5.tar.lz yuzu-72b03025ac4ef0d8633c2f3e55b513cd149c59e5.tar.xz yuzu-72b03025ac4ef0d8633c2f3e55b513cd149c59e5.tar.zst yuzu-72b03025ac4ef0d8633c2f3e55b513cd149c59e5.zip |
Diffstat (limited to 'src/citra_qt/configuration/configure_system.cpp')
-rw-r--r-- | src/citra_qt/configuration/configure_system.cpp | 94 |
1 files changed, 1 insertions, 93 deletions
diff --git a/src/citra_qt/configuration/configure_system.cpp b/src/citra_qt/configuration/configure_system.cpp index 88a067c12..d83c2db23 100644 --- a/src/citra_qt/configuration/configure_system.cpp +++ b/src/citra_qt/configuration/configure_system.cpp @@ -6,8 +6,6 @@ #include "citra_qt/configuration/configure_system.h" #include "citra_qt/ui_settings.h" #include "core/core.h" -#include "core/hle/service/cfg/cfg.h" -#include "core/hle/service/fs/archive.h" #include "ui_configure_system.h" static const std::array<int, 12> days_in_month = {{ @@ -29,100 +27,14 @@ ConfigureSystem::~ConfigureSystem() {} void ConfigureSystem::setConfiguration() { enabled = !Core::System::GetInstance().IsPoweredOn(); - - if (!enabled) { - ReadSystemSettings(); - ui->group_system_settings->setEnabled(false); - } else { - // This tab is enabled only when game is not running (i.e. all service are not initialized). - // Temporarily register archive types and load the config savegame file to memory. - Service::FS::RegisterArchiveTypes(); - ResultCode result = Service::CFG::LoadConfigNANDSaveFile(); - Service::FS::UnregisterArchiveTypes(); - - if (result.IsError()) { - ui->label_disable_info->setText(tr("Failed to load system settings data.")); - ui->group_system_settings->setEnabled(false); - enabled = false; - return; - } - - ReadSystemSettings(); - ui->label_disable_info->hide(); - } } void ConfigureSystem::ReadSystemSettings() { - // set username - username = Service::CFG::GetUsername(); - // TODO(wwylele): Use this when we move to Qt 5.5 - // ui->edit_username->setText(QString::fromStdU16String(username)); - ui->edit_username->setText( - QString::fromUtf16(reinterpret_cast<const ushort*>(username.data()))); - - // set birthday - std::tie(birthmonth, birthday) = Service::CFG::GetBirthday(); - ui->combo_birthmonth->setCurrentIndex(birthmonth - 1); - updateBirthdayComboBox( - birthmonth - - 1); // explicitly update it because the signal from setCurrentIndex is not reliable - ui->combo_birthday->setCurrentIndex(birthday - 1); - - // set system language - language_index = Service::CFG::GetSystemLanguage(); - ui->combo_language->setCurrentIndex(language_index); - - // set sound output mode - sound_index = Service::CFG::GetSoundOutputMode(); - ui->combo_sound->setCurrentIndex(sound_index); - - // set the console id - u64 console_id = Service::CFG::GetConsoleUniqueId(); - ui->label_console_id->setText( - tr("Console ID: 0x%1").arg(QString::number(console_id, 16).toUpper())); } void ConfigureSystem::applyConfiguration() { if (!enabled) return; - - bool modified = false; - - // apply username - // TODO(wwylele): Use this when we move to Qt 5.5 - // std::u16string new_username = ui->edit_username->text().toStdU16String(); - std::u16string new_username( - reinterpret_cast<const char16_t*>(ui->edit_username->text().utf16())); - if (new_username != username) { - Service::CFG::SetUsername(new_username); - modified = true; - } - - // apply birthday - int new_birthmonth = ui->combo_birthmonth->currentIndex() + 1; - int new_birthday = ui->combo_birthday->currentIndex() + 1; - if (birthmonth != new_birthmonth || birthday != new_birthday) { - Service::CFG::SetBirthday(new_birthmonth, new_birthday); - modified = true; - } - - // apply language - int new_language = ui->combo_language->currentIndex(); - if (language_index != new_language) { - Service::CFG::SetSystemLanguage(static_cast<Service::CFG::SystemLanguage>(new_language)); - modified = true; - } - - // apply sound - int new_sound = ui->combo_sound->currentIndex(); - if (sound_index != new_sound) { - Service::CFG::SetSoundOutputMode(static_cast<Service::CFG::SoundOutputMode>(new_sound)); - modified = true; - } - - // update the config savegame if any item is modified. - if (modified) - Service::CFG::UpdateConfigNANDSavegame(); } void ConfigureSystem::updateBirthdayComboBox(int birthmonth_index) { @@ -160,10 +72,6 @@ void ConfigureSystem::refreshConsoleID() { QMessageBox::No | QMessageBox::Yes); if (reply == QMessageBox::No) return; - u32 random_number; - u64 console_id; - Service::CFG::GenerateConsoleUniqueId(random_number, console_id); - Service::CFG::SetConsoleUniqueId(random_number, console_id); - Service::CFG::UpdateConfigNANDSavegame(); + u64 console_id{}; ui->label_console_id->setText("Console ID: 0x" + QString::number(console_id, 16).toUpper()); } |