From d1f1b5ec8e7798c320e492ce8f6ebcded5696bf7 Mon Sep 17 00:00:00 2001 From: mrdude2478 Date: Tue, 19 Sep 2023 03:50:51 +0100 Subject: [PATCH] remove the gay references --- include/util/config.hpp | 2 +- romfs/lang/de.json | 2 +- romfs/lang/en.json | 2 +- romfs/lang/es.json | 2 +- romfs/lang/fr.json | 2 +- romfs/lang/it.json | 2 +- romfs/lang/jp.json | 2 +- romfs/lang/ru.json | 2 +- romfs/lang/tw.json | 2 +- source/ui/HDInstPage.cpp | 2 +- source/ui/instPage.cpp | 2 +- source/ui/mainPage.cpp | 8 ++++---- source/ui/netInstPage.cpp | 2 +- source/ui/optionsPage.cpp | 20 ++++++++++---------- source/ui/sdInstPage.cpp | 2 +- source/ui/usbInstPage.cpp | 2 +- source/util/config.cpp | 8 ++++---- 17 files changed, 32 insertions(+), 32 deletions(-) diff --git a/include/util/config.hpp b/include/util/config.hpp index 78ebc69..e8ae277 100644 --- a/include/util/config.hpp +++ b/include/util/config.hpp @@ -19,7 +19,7 @@ namespace inst::config { extern bool deletePrompt; extern bool autoUpdate; extern bool usbAck; - extern bool gayMode; + extern bool useTheme; extern bool useSound; extern bool fixticket; extern bool listoveride; diff --git a/romfs/lang/de.json b/romfs/lang/de.json index e0aa4b1..808fa7d 100644 --- a/romfs/lang/de.json +++ b/romfs/lang/de.json @@ -177,7 +177,7 @@ "boost_mode": "Aktiviere \"Boost-Modus\" während der Installation", "ask_delete": "Frage ob installierte Titel gelöscht werden sollen", "auto_update": "Suche automatisch nach Updates für TinWoo", - "gay_option": "Design verwenden", + "theme_option": "Design verwenden", "useSound": "Nutzen von Benachrichtungstönen während Installation", "fixticket": "Wandeln Sie temporäre Tickets in permanente Tickets um", "listoveride": "Deaktivieren Sie die URL-Listenwarnung und die Dateibeschränkung", diff --git a/romfs/lang/en.json b/romfs/lang/en.json index 987fd83..5195667 100644 --- a/romfs/lang/en.json +++ b/romfs/lang/en.json @@ -177,7 +177,7 @@ "boost_mode": "Enable \"boost mode\" during installations", "ask_delete": "Ask to delete original files after installation", "auto_update": "Check for updates to TinWoo Installer automatically", - "gay_option": "Use Theme", + "theme_option": "Use Theme", "useSound": "Use sound notifications during installs", "fixticket": "Convert temporary tickets to permanent", "listoveride": "Disable URL list warning and file limit", diff --git a/romfs/lang/es.json b/romfs/lang/es.json index c938135..1a0e1ae 100644 --- a/romfs/lang/es.json +++ b/romfs/lang/es.json @@ -177,7 +177,7 @@ "boost_mode": "Habilitar \"modo empuje\" durante las instalaciones", "ask_delete": "Solicitar eliminar los archivos originales después de la instalación", "auto_update": "Busca actualizaciones para TinWoo Installer automáticamente", - "gay_option": "Usar tema", + "theme_option": "Usar tema", "useSound": "Usar notificaciones de sonido durante las instalaciones", "fixticket": "Convertir tiquetes temporales en permanentes", "listoveride": "Deshabilitar advertencia de limite de elementos en el listado de un URL", diff --git a/romfs/lang/fr.json b/romfs/lang/fr.json index 2c97b06..a81077d 100644 --- a/romfs/lang/fr.json +++ b/romfs/lang/fr.json @@ -177,7 +177,7 @@ "boost_mode": "Activer le \"boost mode\" pendant l'installation", "ask_delete": "Demande de suppression des fichiers originaux après l'installation", "auto_update": "Vérifier les mises à jour de l'installateur TinWoo automatiquement", - "gay_option": "Utiliser le thème", + "theme_option": "Utiliser le thème", "useSound": "Utiliser les notifications sonores lors des installations", "fixticket": "Convertir des billets temporaires en billets permanents", "listoveride": "Désactiver l'avertissement de liste d'URL et la limite de fichiers", diff --git a/romfs/lang/it.json b/romfs/lang/it.json index a12a506..33b75d1 100644 --- a/romfs/lang/it.json +++ b/romfs/lang/it.json @@ -177,7 +177,7 @@ "boost_mode": "Abilita la \"boost mode\" durante le installazioni", "ask_delete": "Chiedi di cancellare i file originale dopo l'installazione", "auto_update": "Controlla aggiornamenti di TinWoo Installer automaticamente", - "gay_option": "Usa tema", + "theme_option": "Usa tema", "useSound": "Utilizza notifiche sonore durante le installazioni", "fixticket": "Converti i biglietti temporanei in permanenti", "listoveride": "Disabilita l'avviso dell'elenco degli URL e il limite dei file", diff --git a/romfs/lang/jp.json b/romfs/lang/jp.json index 3cc8384..7467ed6 100644 --- a/romfs/lang/jp.json +++ b/romfs/lang/jp.json @@ -177,7 +177,7 @@ "boost_mode": "インストール中に「ブーストモード」を有効にする", "ask_delete": "インストール後に元のファイルを削除する", "auto_update": "TinWooのアップデートを自動的に確認する", - "gay_option": "テーマを使用する", + "theme_option": "テーマを使用する", "useSound": "インストール時にサウンドで通知する", "fixticket": "一時的なチケットを永続的なチケットに変換する", "listoveride": "URL リストの警告とファイル制限を無効にする", diff --git a/romfs/lang/ru.json b/romfs/lang/ru.json index f8bc00e..da05492 100644 --- a/romfs/lang/ru.json +++ b/romfs/lang/ru.json @@ -177,7 +177,7 @@ "boost_mode": "Включить \"boost-режим\" во время установки", "ask_delete": "Спрашивать разрешения удалить исходные файлы после установки", "auto_update": "Автоматически проверять наличие обновлений", - "gay_option": "Использовать тему", + "theme_option": "Использовать тему", "useSound": "Используйте звуковые уведомления во время установки", "fixticket": "Превратить временные билеты в постоянные", "listoveride": "Отключить предупреждение списка URL-адресов и ограничение количества файлов", diff --git a/romfs/lang/tw.json b/romfs/lang/tw.json index 9bc0729..dc045b0 100644 --- a/romfs/lang/tw.json +++ b/romfs/lang/tw.json @@ -177,7 +177,7 @@ "boost_mode": "在進行安裝時啟用\"超頻\"模式", "ask_delete": "在安裝完成後，詢問是否刪除原始檔案", "auto_update": "自動檢查Tinwoo Installer的更新版本", - "gay_option": "套用主題", + "theme_option": "套用主題", "useSound": "在安裝過程中使用音效提醒進度", "fixticket": "將臨時門票轉換為永久門票", "listoveride": "禁用 URL 列表警告和文件限制", diff --git a/source/ui/HDInstPage.cpp b/source/ui/HDInstPage.cpp index 20c8395..61e13be 100644 --- a/source/ui/HDInstPage.cpp +++ b/source/ui/HDInstPage.cpp @@ -20,7 +20,7 @@ namespace inst::ui { this->topRect = Rectangle::New(0, 0, 1280, 94, COLOR("#000000FF")); this->botRect = Rectangle::New(0, 659, 1280, 61, COLOR("#000000FF")); - if (inst::config::gayMode) { + if (inst::config::useTheme) { if (std::filesystem::exists(inst::config::appDir + "/images/Hd.png")) this->titleImage = Image::New(0, 0, (inst::config::appDir + "/images/Hd.png")); else diff --git a/source/ui/instPage.cpp b/source/ui/instPage.cpp index 1ad2efb..f321219 100644 --- a/source/ui/instPage.cpp +++ b/source/ui/instPage.cpp @@ -30,7 +30,7 @@ namespace inst::ui { this->SetBackgroundColor(COLOR("#000000FF")); this->topRect = Rectangle::New(0, 0, 1280, 94, COLOR("#000000FF")); - if (inst::config::gayMode) { + if (inst::config::useTheme) { if (std::filesystem::exists(inst::config::appDir + "/images/Install.png")) this->titleImage = Image::New(0, 0, (inst::config::appDir + "/images/Install.png")); else this->titleImage = Image::New(0, 0, "romfs:/images/Install.png"); if (std::filesystem::exists(inst::config::appDir + "/images/Background.png")) this->SetBackgroundImage(inst::config::appDir + "/images/Background.png"); diff --git a/source/ui/mainPage.cpp b/source/ui/mainPage.cpp index 1a46ef1..292ae19 100644 --- a/source/ui/mainPage.cpp +++ b/source/ui/mainPage.cpp @@ -155,7 +155,7 @@ namespace inst::ui { this->topRect = Rectangle::New(0, 0, 1280, 94, COLOR("#000000FF")); this->botRect = Rectangle::New(0, 659, 1280, 61, COLOR("#000000FF")); - if (inst::config::gayMode) { + if (inst::config::useTheme) { if (std::filesystem::exists(inst::config::appDir + "/images/Main.png")) this->titleImage = Image::New(0, 0, (inst::config::appDir + "/images/Main.png")); else this->titleImage = Image::New(0, 0, "romfs:/images/Main.png"); @@ -190,7 +190,7 @@ namespace inst::ui { this->exitMenuItem = pu::ui::elm::MenuItem::New("main.menu.exit"_lang); this->exitMenuItem->SetColor(COLOR("#FFFFFFFF")); this->exitMenuItem->SetIcon("romfs:/images/icons/exit-run.png"); - if (inst::config::gayMode) { + if (inst::config::useTheme) { if (std::filesystem::exists(inst::config::appDir + "/images/Main.png")) this->awooImage = Image::New(0, 0, inst::config::appDir + "/images/Main.png"); else this->awooImage = Image::New(0, 0, "romfs:/images/Main.png"); } @@ -214,7 +214,7 @@ namespace inst::ui { } this->Add(this->awooImage); this->Add(this->eggImage); - this->awooImage->SetVisible(!inst::config::gayMode); + this->awooImage->SetVisible(!inst::config::useTheme); this->Add(this->optionMenu); this->AddRenderCallback(mainMenuThread); } @@ -314,7 +314,7 @@ namespace inst::ui { if (Up & HidNpadButton_A) { this->eggImage->SetVisible(false); - if (!inst::config::gayMode) this->awooImage->SetVisible(true); + if (!inst::config::useTheme) this->awooImage->SetVisible(true); } if (Down & HidNpadButton_Y) { diff --git a/source/ui/netInstPage.cpp b/source/ui/netInstPage.cpp index 32804c1..4bdd6b6 100644 --- a/source/ui/netInstPage.cpp +++ b/source/ui/netInstPage.cpp @@ -26,7 +26,7 @@ namespace inst::ui { this->topRect = Rectangle::New(0, 0, 1280, 94, COLOR("#000000FF")); this->botRect = Rectangle::New(0, 659, 1280, 61, COLOR("#000000FF")); - if (inst::config::gayMode) { + if (inst::config::useTheme) { if (std::filesystem::exists(inst::config::appDir + "/images/Net.png")) this->titleImage = Image::New(0, 0, (inst::config::appDir + "/images/Net.png")); else this->titleImage = Image::New(0, 0, "romfs:/images/Net.png"); if (std::filesystem::exists(inst::config::appDir + "/images/Background.png")) this->SetBackgroundImage(inst::config::appDir + "/images/Background.png"); diff --git a/source/ui/optionsPage.cpp b/source/ui/optionsPage.cpp index 9163b9b..c4e910a 100644 --- a/source/ui/optionsPage.cpp +++ b/source/ui/optionsPage.cpp @@ -28,7 +28,7 @@ namespace inst::ui { this->topRect = Rectangle::New(0, 0, 1280, 94, COLOR("#000000FF")); this->botRect = Rectangle::New(0, 659, 1280, 61, COLOR("#000000FF")); - if (inst::config::gayMode) { + if (inst::config::useTheme) { if (std::filesystem::exists(inst::config::appDir + "/images/Settings.png")) this->titleImage = Image::New(0, 0, (inst::config::appDir + "/images/Settings.png")); else this->titleImage = Image::New(0, 0, "romfs:/images/Settings.png"); if (std::filesystem::exists(inst::config::appDir + "/images/Background.png")) this->SetBackgroundImage(inst::config::appDir + "/images/Background.png"); @@ -116,15 +116,15 @@ namespace inst::ui { void thememessage() { int ourResult = inst::ui::mainApp->CreateShowDialog("main.theme.title"_lang, "main.theme.desc"_lang, { "common.no"_lang, "common.yes"_lang }, true, "romfs:/images/icons/theme.png"); if (ourResult != 0) { - if (!inst::config::gayMode) { - inst::config::gayMode = true; + if (!inst::config::useTheme) { + inst::config::useTheme = true; mainApp->FadeOut(); mainApp->Close(); } } else { - if (inst::config::gayMode) { - inst::config::gayMode = false; + if (inst::config::useTheme) { + inst::config::useTheme = false; mainApp->FadeOut(); mainApp->Close(); } @@ -159,10 +159,10 @@ namespace inst::ui { autoUpdateOption->SetIcon(this->getMenuOptionIcon(inst::config::autoUpdate)); this->menu->AddItem(autoUpdateOption); - auto gayModeOption = pu::ui::elm::MenuItem::New("options.menu_items.gay_option"_lang); - gayModeOption->SetColor(COLOR("#FFFFFFFF")); - gayModeOption->SetIcon(this->getMenuOptionIcon(inst::config::gayMode)); - this->menu->AddItem(gayModeOption); + auto useThemeOption = pu::ui::elm::MenuItem::New("options.menu_items.theme_option"_lang); + useThemeOption->SetColor(COLOR("#FFFFFFFF")); + useThemeOption->SetIcon(this->getMenuOptionIcon(inst::config::useTheme)); + this->menu->AddItem(useThemeOption); auto useSoundOption = pu::ui::elm::MenuItem::New("options.menu_items.useSound"_lang); useSoundOption->SetColor(COLOR("#FFFFFFFF")); @@ -285,7 +285,7 @@ namespace inst::ui { this->menu->SetSelectedIndex(index); break; case 5: - if (inst::config::gayMode) { + if (inst::config::useTheme) { mainApp->mainPage->awooImage->SetVisible(true); } else { diff --git a/source/ui/sdInstPage.cpp b/source/ui/sdInstPage.cpp index b0f4cc2..8524e53 100644 --- a/source/ui/sdInstPage.cpp +++ b/source/ui/sdInstPage.cpp @@ -22,7 +22,7 @@ namespace inst::ui { this->topRect = Rectangle::New(0, 0, 1280, 94, COLOR("#000000FF")); this->botRect = Rectangle::New(0, 659, 1280, 61, COLOR("#000000FF")); - if (inst::config::gayMode) { + if (inst::config::useTheme) { if (std::filesystem::exists(inst::config::appDir + "/images/Sd.png")) this->titleImage = Image::New(0, 0, (inst::config::appDir + "/images/Sd.png")); else this->titleImage = Image::New(0, 0, "romfs:/images/Sd.png"); if (std::filesystem::exists(inst::config::appDir + "/images/Background.png")) this->SetBackgroundImage(inst::config::appDir + "/images/Background.png"); diff --git a/source/ui/usbInstPage.cpp b/source/ui/usbInstPage.cpp index 3068443..743f56f 100644 --- a/source/ui/usbInstPage.cpp +++ b/source/ui/usbInstPage.cpp @@ -18,7 +18,7 @@ namespace inst::ui { this->topRect = Rectangle::New(0, 0, 1280, 94, COLOR("#000000FF")); this->botRect = Rectangle::New(0, 659, 1280, 61, COLOR("#000000FF")); - if (inst::config::gayMode) { + if (inst::config::useTheme) { if (std::filesystem::exists(inst::config::appDir + "/images/Usb.png")) this->titleImage = Image::New(0, 0, (inst::config::appDir + "/images/Usb.png")); else this->titleImage = Image::New(0, 0, "romfs:/images/Usb.png"); if (std::filesystem::exists(inst::config::appDir + "/images/Background.png")) this->SetBackgroundImage(inst::config::appDir + "/images/Background.png"); diff --git a/source/util/config.cpp b/source/util/config.cpp index 2650116..d56c7fc 100644 --- a/source/util/config.cpp +++ b/source/util/config.cpp @@ -14,7 +14,7 @@ namespace inst::config { bool deletePrompt; bool ignoreReqVers; bool overClock; - bool gayMode; + bool useTheme; bool useSound; bool usbAck; bool validateNCAs; @@ -27,7 +27,7 @@ namespace inst::config { {"autoUpdate", autoUpdate}, {"deletePrompt", deletePrompt}, {"gAuthKey", gAuthKey}, - {"gayMode", gayMode}, + {"useTheme", useTheme}, {"useSound", useSound}, {"ignoreReqVers", ignoreReqVers}, {"languageSetting", languageSetting}, @@ -56,7 +56,7 @@ namespace inst::config { httpkeyboard = j["httpkeyboard"].get(); deletePrompt = j["deletePrompt"].get(); gAuthKey = j["gAuthKey"].get(); - gayMode = j["gayMode"].get(); + useTheme = j["useTheme"].get(); useSound = j["useSound"].get(); ignoreReqVers = j["ignoreReqVers"].get(); languageSetting = j["languageSetting"].get(); @@ -76,7 +76,7 @@ namespace inst::config { httplastUrl = "http://"; autoUpdate = true; deletePrompt = true; - gayMode = false; + useTheme = false; useSound = true; fixticket = true; listoveride = false;