OmniNX/sphaira
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

remove theme shuffle option

Browse Source 
fixes #121
This commit is contained in:
ITotalJustice
2025-04-19 22:55:08 +01:00
parent 3141100457
commit 651d9fa495
3 changed files with 1 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
sphaira/include/app.hpp
View File

@@ -77,7 +77,6 @@ public:
static auto GetInstallEnable() -> bool; static auto GetInstallEnable() -> bool;
static auto GetInstallSdEnable() -> bool; static auto GetInstallSdEnable() -> bool;
static auto GetInstallPrompt() -> bool; static auto GetInstallPrompt() -> bool;
static auto GetThemeShuffleEnable() -> bool;
static auto GetThemeMusicEnable() -> bool; static auto GetThemeMusicEnable() -> bool;
static auto Get12HourTimeEnable() -> bool; static auto Get12HourTimeEnable() -> bool;
static auto GetLanguage() -> long; static auto GetLanguage() -> long;
@@ -91,7 +90,6 @@ public:
static void SetInstallEnable(bool enable); static void SetInstallEnable(bool enable);
static void SetInstallSdEnable(bool enable); static void SetInstallSdEnable(bool enable);
static void SetInstallPrompt(bool enable); static void SetInstallPrompt(bool enable);
static void SetThemeShuffleEnable(bool enable);
static void SetThemeMusicEnable(bool enable); static void SetThemeMusicEnable(bool enable);
static void Set12HourTimeEnable(bool enable); static void Set12HourTimeEnable(bool enable);
static void SetLanguage(long index); static void SetLanguage(long index);
@@ -177,7 +175,6 @@ public:
option::OptionBool m_install{INI_SECTION, "install", false}; option::OptionBool m_install{INI_SECTION, "install", false};
option::OptionBool m_install_sd{INI_SECTION, "install_sd", true}; option::OptionBool m_install_sd{INI_SECTION, "install_sd", true};
option::OptionLong m_install_prompt{INI_SECTION, "install_prompt", true}; option::OptionLong m_install_prompt{INI_SECTION, "install_prompt", true};
option::OptionBool m_theme_shuffle{INI_SECTION, "theme_shuffle", false};
option::OptionBool m_theme_music{INI_SECTION, "theme_music", true}; option::OptionBool m_theme_music{INI_SECTION, "theme_music", true};
option::OptionBool m_12hour_time{INI_SECTION, "12hour_time", false}; option::OptionBool m_12hour_time{INI_SECTION, "12hour_time", false};
option::OptionLong m_language{INI_SECTION, "language", 0}; // auto option::OptionLong m_language{INI_SECTION, "language", 0}; // auto

14
sphaira/source/app.cpp
View File

@@ -580,10 +580,6 @@ auto App::GetInstallPrompt() -> bool {
return g_app->m_install_prompt.Get(); return g_app->m_install_prompt.Get();
} }
auto App::GetThemeShuffleEnable() -> bool {
return g_app->m_theme_shuffle.Get();
}
auto App::GetThemeMusicEnable() -> bool { auto App::GetThemeMusicEnable() -> bool {
return g_app->m_theme_music.Get(); return g_app->m_theme_music.Get();
} }
@@ -741,10 +737,6 @@ void App::SetInstallPrompt(bool enable) {
g_app->m_install_prompt.Set(enable); g_app->m_install_prompt.Set(enable);
} }
void App::SetThemeShuffleEnable(bool enable) {
g_app->m_theme_shuffle.Set(enable);
}
void App::SetThemeMusicEnable(bool enable) { void App::SetThemeMusicEnable(bool enable) {
g_app->m_theme_music.Set(enable); g_app->m_theme_music.Set(enable);
PlaySoundEffect(SoundEffect::SoundEffect_Music); PlaySoundEffect(SoundEffect::SoundEffect_Music);
@@ -1323,11 +1315,7 @@ App::App(const char* argv0) {
fs::FsPath theme_path{}; fs::FsPath theme_path{};
constexpr fs::FsPath default_theme_path{"romfs:/themes/abyss_theme.ini"}; constexpr fs::FsPath default_theme_path{"romfs:/themes/abyss_theme.ini"};
if (App::GetThemeShuffleEnable() && m_theme_meta_entries.size()) { ini_gets("config", "theme", default_theme_path, theme_path, sizeof(theme_path), CONFIG_PATH);
theme_path = m_theme_meta_entries[randomGet64() % m_theme_meta_entries.size()].ini_path;
} else {
ini_gets("config", "theme", default_theme_path, theme_path, sizeof(theme_path), CONFIG_PATH);
}
// try and load previous theme, default to previous version otherwise. // try and load previous theme, default to previous version otherwise.
ThemeMeta theme_meta; ThemeMeta theme_meta;

4
sphaira/source/ui/menus/main_menu.cpp
View File

@@ -246,10 +246,6 @@ MainMenu::MainMenu() {
App::SetTheme(index_out); App::SetTheme(index_out);
}, App::GetThemeIndex())); }, App::GetThemeIndex()));
options->Add(std::make_shared<SidebarEntryBool>("Shuffle"_i18n, App::GetThemeShuffleEnable(), [this](bool& enable){
App::SetThemeShuffleEnable(enable);
}, "Enabled"_i18n, "Disabled"_i18n));
options->Add(std::make_shared<SidebarEntryBool>("Music"_i18n, App::GetThemeMusicEnable(), [this](bool& enable){ options->Add(std::make_shared<SidebarEntryBool>("Music"_i18n, App::GetThemeMusicEnable(), [this](bool& enable){
App::SetThemeMusicEnable(enable); App::SetThemeMusicEnable(enable);
}, "Enabled"_i18n, "Disabled"_i18n)); }, "Enabled"_i18n, "Disabled"_i18n));