From 1c93e18822f9a8355e98ce0a389d5a34af4430d4 Mon Sep 17 00:00:00 2001 From: ITotalJustice <47043333+ITotalJustice@users.noreply.github.com> Date: Thu, 1 May 2025 22:10:47 +0100 Subject: [PATCH] replace all "enabled" and "disabled" options with the default "On" and "Off". --- sphaira/source/app.cpp | 44 +++++++++++++-------------- sphaira/source/ui/menus/homebrew.cpp | 2 +- sphaira/source/ui/menus/irs_menu.cpp | 2 +- sphaira/source/ui/menus/main_menu.cpp | 6 ++-- sphaira/source/ui/menus/themezer.cpp | 2 +- sphaira/source/ui/sidebar.cpp | 7 +++++ 6 files changed, 35 insertions(+), 28 deletions(-) diff --git a/sphaira/source/app.cpp b/sphaira/source/app.cpp index c2a89a9..b948c57 100644 --- a/sphaira/source/app.cpp +++ b/sphaira/source/app.cpp @@ -1488,11 +1488,11 @@ void App::DisplayThemeOptions(bool left_side) { options->Add(std::make_shared("Music"_i18n, App::GetThemeMusicEnable(), [](bool& enable){ App::SetThemeMusicEnable(enable); - }, "Enabled"_i18n, "Disabled"_i18n)); + })); options->Add(std::make_shared("12 Hour Time"_i18n, App::Get12HourTimeEnable(), [](bool& enable){ App::Set12HourTimeEnable(enable); - }, "Enabled"_i18n, "Disabled"_i18n)); + })); options->Add(std::make_shared("Download Default Music"_i18n, [](){ // check if we already have music @@ -1568,11 +1568,11 @@ void App::DisplayAdvancedOptions(bool left_side) { options->Add(std::make_shared("Logging"_i18n, App::GetLogEnable(), [](bool& enable){ App::SetLogEnable(enable); - }, "Enabled"_i18n, "Disabled"_i18n)); + })); options->Add(std::make_shared("Replace hbmenu on exit"_i18n, App::GetReplaceHbmenuEnable(), [](bool& enable){ App::SetReplaceHbmenuEnable(enable); - }, "Enabled"_i18n, "Disabled"_i18n)); + })); options->Add(std::make_shared("Text scroll speed"_i18n, text_scroll_speed_items, [](s64& index_out){ App::SetTextScrollSpeed(index_out); @@ -1605,11 +1605,11 @@ void App::DisplayInstallOptions(bool left_side) { options->Add(std::make_shared("Enable"_i18n, App::GetApp()->m_install.Get(), [](bool& enable){ App::GetApp()->m_install.Set(enable); - }, "Enabled"_i18n, "Disabled"_i18n)); + })); options->Add(std::make_shared("Show install warning"_i18n, App::GetApp()->m_install_prompt.Get(), [](bool& enable){ App::GetApp()->m_install_prompt.Set(enable); - }, "Enabled"_i18n, "Disabled"_i18n)); + })); options->Add(std::make_shared("Install location"_i18n, install_items, [](s64& index_out){ App::SetInstallSdEnable(index_out); @@ -1617,67 +1617,67 @@ void App::DisplayInstallOptions(bool left_side) { options->Add(std::make_shared("Boost CPU clock"_i18n, App::GetApp()->m_boost_mode.Get(), [](bool& enable){ App::GetApp()->m_boost_mode.Set(enable); - }, "Enabled"_i18n, "Disabled"_i18n)); + })); options->Add(std::make_shared("Allow downgrade"_i18n, App::GetApp()->m_allow_downgrade.Get(), [](bool& enable){ App::GetApp()->m_allow_downgrade.Set(enable); - }, "Enabled"_i18n, "Disabled"_i18n)); + })); options->Add(std::make_shared("Skip if already installed"_i18n, App::GetApp()->m_skip_if_already_installed.Get(), [](bool& enable){ App::GetApp()->m_skip_if_already_installed.Set(enable); - }, "Enabled"_i18n, "Disabled"_i18n)); + })); options->Add(std::make_shared("Ticket only"_i18n, App::GetApp()->m_ticket_only.Get(), [](bool& enable){ App::GetApp()->m_ticket_only.Set(enable); - }, "Enabled"_i18n, "Disabled"_i18n)); + })); options->Add(std::make_shared("Skip base"_i18n, App::GetApp()->m_skip_base.Get(), [](bool& enable){ App::GetApp()->m_skip_base.Set(enable); - }, "Enabled"_i18n, "Disabled"_i18n)); + })); options->Add(std::make_shared("Skip patch"_i18n, App::GetApp()->m_skip_patch.Get(), [](bool& enable){ App::GetApp()->m_skip_patch.Set(enable); - }, "Enabled"_i18n, "Disabled"_i18n)); + })); options->Add(std::make_shared("Skip dlc"_i18n, App::GetApp()->m_skip_addon.Get(), [](bool& enable){ App::GetApp()->m_skip_addon.Set(enable); - }, "Enabled"_i18n, "Disabled"_i18n)); + })); options->Add(std::make_shared("Skip data patch"_i18n, App::GetApp()->m_skip_data_patch.Get(), [](bool& enable){ App::GetApp()->m_skip_data_patch.Set(enable); - }, "Enabled"_i18n, "Disabled"_i18n)); + })); options->Add(std::make_shared("Skip ticket"_i18n, App::GetApp()->m_skip_ticket.Get(), [](bool& enable){ App::GetApp()->m_skip_ticket.Set(enable); - }, "Enabled"_i18n, "Disabled"_i18n)); + })); options->Add(std::make_shared("skip NCA hash verify"_i18n, App::GetApp()->m_skip_nca_hash_verify.Get(), [](bool& enable){ App::GetApp()->m_skip_nca_hash_verify.Set(enable); - }, "Enabled"_i18n, "Disabled"_i18n)); + })); options->Add(std::make_shared("Skip RSA header verify"_i18n, App::GetApp()->m_skip_rsa_header_fixed_key_verify.Get(), [](bool& enable){ App::GetApp()->m_skip_rsa_header_fixed_key_verify.Set(enable); - }, "Enabled"_i18n, "Disabled"_i18n)); + })); options->Add(std::make_shared("Skip RSA NPDM verify"_i18n, App::GetApp()->m_skip_rsa_npdm_fixed_key_verify.Get(), [](bool& enable){ App::GetApp()->m_skip_rsa_npdm_fixed_key_verify.Set(enable); - }, "Enabled"_i18n, "Disabled"_i18n)); + })); options->Add(std::make_shared("Ignore distribution bit"_i18n, App::GetApp()->m_ignore_distribution_bit.Get(), [](bool& enable){ App::GetApp()->m_ignore_distribution_bit.Set(enable); - }, "Enabled"_i18n, "Disabled"_i18n)); + })); options->Add(std::make_shared("Convert to standard crypto"_i18n, App::GetApp()->m_convert_to_standard_crypto.Get(), [](bool& enable){ App::GetApp()->m_convert_to_standard_crypto.Set(enable); - }, "Enabled"_i18n, "Disabled"_i18n)); + })); options->Add(std::make_shared("Lower master key"_i18n, App::GetApp()->m_lower_master_key.Get(), [](bool& enable){ App::GetApp()->m_lower_master_key.Set(enable); - }, "Enabled"_i18n, "Disabled"_i18n)); + })); options->Add(std::make_shared("Lower system version"_i18n, App::GetApp()->m_lower_system_version.Get(), [](bool& enable){ App::GetApp()->m_lower_system_version.Set(enable); - }, "Enabled"_i18n, "Disabled"_i18n)); + })); } App::~App() { diff --git a/sphaira/source/ui/menus/homebrew.cpp b/sphaira/source/ui/menus/homebrew.cpp index 29c6521..7de0ef8 100644 --- a/sphaira/source/ui/menus/homebrew.cpp +++ b/sphaira/source/ui/menus/homebrew.cpp @@ -69,7 +69,7 @@ Menu::Menu() : MenuBase{"Homebrew"_i18n} { options->Add(std::make_shared("Hide Sphaira"_i18n, m_hide_sphaira.Get(), [this](bool& enable){ m_hide_sphaira.Set(enable); - }, "Enabled"_i18n, "Disabled"_i18n)); + })); })); #if 0 diff --git a/sphaira/source/ui/menus/irs_menu.cpp b/sphaira/source/ui/menus/irs_menu.cpp index 4e17685..5d0e021 100644 --- a/sphaira/source/ui/menus/irs_menu.cpp +++ b/sphaira/source/ui/menus/irs_menu.cpp @@ -176,7 +176,7 @@ Menu::Menu() : MenuBase{"Irs"_i18n} { options->Add(std::make_shared("External Light Filter"_i18n, m_config.is_external_light_filter_enabled, [this](bool& enable){ m_config.is_external_light_filter_enabled = enable; UpdateConfig(&m_config); - }, "Enabled"_i18n, "Disabled"_i18n)); + })); } options->Add(std::make_shared("Load Default"_i18n, [this](){ diff --git a/sphaira/source/ui/menus/main_menu.cpp b/sphaira/source/ui/menus/main_menu.cpp index c782d49..d17a5b8 100644 --- a/sphaira/source/ui/menus/main_menu.cpp +++ b/sphaira/source/ui/menus/main_menu.cpp @@ -274,15 +274,15 @@ MainMenu::MainMenu() { options->Add(std::make_shared("Ftp"_i18n, App::GetFtpEnable(), [](bool& enable){ App::SetFtpEnable(enable); - }, "Enabled"_i18n, "Disabled"_i18n)); + })); options->Add(std::make_shared("Mtp"_i18n, App::GetMtpEnable(), [](bool& enable){ App::SetMtpEnable(enable); - }, "Enabled"_i18n, "Disabled"_i18n)); + })); options->Add(std::make_shared("Nxlink"_i18n, App::GetNxlinkEnable(), [](bool& enable){ App::SetNxlinkEnable(enable); - }, "Enabled"_i18n, "Disabled"_i18n)); + })); if (m_update_state == UpdateState::Update) { options->Add(std::make_shared("Download update: "_i18n + m_update_version, [this](){ diff --git a/sphaira/source/ui/menus/themezer.cpp b/sphaira/source/ui/menus/themezer.cpp index 103de56..b2be6ac 100644 --- a/sphaira/source/ui/menus/themezer.cpp +++ b/sphaira/source/ui/menus/themezer.cpp @@ -415,7 +415,7 @@ Menu::Menu() : MenuBase{"Themezer"_i18n} { options->Add(std::make_shared("Nsfw"_i18n, m_nsfw.Get(), [this](bool& v_out){ m_nsfw.Set(v_out); InvalidateAllPages(); - }, "Enabled"_i18n, "Disabled"_i18n)); + })); options->Add(std::make_shared("Sort"_i18n, sort_items, [this, sort_items](s64& index_out){ if (m_sort.Get() != index_out) { diff --git a/sphaira/source/ui/sidebar.cpp b/sphaira/source/ui/sidebar.cpp index 4997409..d255c09 100644 --- a/sphaira/source/ui/sidebar.cpp +++ b/sphaira/source/ui/sidebar.cpp @@ -43,6 +43,13 @@ SidebarEntryBool::SidebarEntryBool(std::string title, bool option, Callback cb, , m_true_str{std::move(true_str)} , m_false_str{std::move(false_str)} { + if (m_true_str == "On") { + m_true_str = i18n::get(m_true_str.c_str()); + } + if (m_false_str == "Off") { + m_false_str = i18n::get(m_false_str.c_str()); + } + SetAction(Button::A, Action{"OK"_i18n, [this](){ m_option ^= 1; m_callback(m_option);