remove old theme entries, make "Back" be the default hovered option when installing forwarder
This commit is contained in:
@@ -144,10 +144,8 @@ struct ElementEntry {
|
||||
|
||||
enum ThemeEntryID {
|
||||
ThemeEntryID_BACKGROUND,
|
||||
ThemeEntryID_LOGO,
|
||||
|
||||
ThemeEntryID_GRID,
|
||||
ThemeEntryID_GRID_HOVER,
|
||||
ThemeEntryID_SELECTED,
|
||||
ThemeEntryID_SELECTED_OVERLAY,
|
||||
ThemeEntryID_TEXT,
|
||||
|
||||
@@ -738,12 +738,8 @@ void App::LoadTheme(const fs::FsPath& path) {
|
||||
app->PlaySoundEffect(SoundEffect_Music);
|
||||
}
|
||||
}
|
||||
} else if (key == "logo") {
|
||||
theme.elements[ThemeEntryID_LOGO] = app->LoadElement(value);
|
||||
} else if (key == "grid") {
|
||||
theme.elements[ThemeEntryID_GRID] = app->LoadElement(value);
|
||||
} else if (key == "grid_hover") {
|
||||
theme.elements[ThemeEntryID_GRID_HOVER] = app->LoadElement(value);
|
||||
} else if (key == "selected") {
|
||||
theme.elements[ThemeEntryID_SELECTED] = app->LoadElement(value);
|
||||
} else if (key == "selected_overlay") {
|
||||
|
||||
@@ -653,7 +653,7 @@ Menu::Menu(const std::vector<NroEntry>& nro_entries) : MenuBase{"FileBrowser"_i1
|
||||
#if 1
|
||||
App::Push(std::make_shared<OptionBox>(
|
||||
"WARNING: Installing forwarders will lead to a ban!"_i18n,
|
||||
"Back"_i18n, "Install"_i18n, 1, [this](auto op_index){
|
||||
"Back"_i18n, "Install"_i18n, 0, [this](auto op_index){
|
||||
if (op_index && *op_index) {
|
||||
InstallForwarder();
|
||||
}
|
||||
|
||||
@@ -153,7 +153,7 @@ Menu::Menu() : MenuBase{"Homebrew"_i18n} {
|
||||
options->Add(std::make_shared<SidebarEntryCallback>("Install Forwarder"_i18n, [this](){
|
||||
App::Push(std::make_shared<OptionBox>(
|
||||
"WARNING: Installing forwarders will lead to a ban!"_i18n,
|
||||
"Back"_i18n, "Install"_i18n, 1, [this](auto op_index){
|
||||
"Back"_i18n, "Install"_i18n, 0, [this](auto op_index){
|
||||
if (op_index && *op_index) {
|
||||
InstallHomebrew();
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user