From 24dd23073ec846a92652f5639fe294ee42200e65 Mon Sep 17 00:00:00 2001 From: flb Date: Sun, 16 Oct 2022 13:31:02 +0200 Subject: [PATCH] remove mentions of outdated code --- README.md | 2 +- include/constants.hpp | 12 +++--------- resources/i18n/de/menus.json | 6 ------ resources/i18n/en-US/menus.json | 8 +------- resources/i18n/es/menus.json | 8 +------- resources/i18n/fr/menus.json | 8 +------- resources/i18n/it/menus.json | 8 +------- resources/i18n/ja/menus.json | 8 +------- resources/i18n/ko/menus.json | 6 ------ resources/i18n/pl/menus.json | 6 ------ resources/i18n/pt-BR/menus.json | 3 --- resources/i18n/zh-CN/menus.json | 8 +------- resources/i18n/zh-TW/menus.json | 6 ------ source/ams_tab.cpp | 6 +++--- source/changelog_page.cpp | 4 ++-- source/cheats_page.cpp | 2 +- source/list_download_tab.cpp | 7 ------- source/tools_tab.cpp | 12 ++++++------ source/utils.cpp | 20 +++++++++++--------- 19 files changed, 33 insertions(+), 107 deletions(-) diff --git a/README.md b/README.md index 0ddb964..499e8ad 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,5 @@ # AIO-Switch-Updater - +![hbappstore](https://img.shields.io/endpoint?url=https%3A%2F%2Frunkit.io%2Fhomlet%2Fhbappstore-shieldsio%2Fbranches%2Fmaster%3Furl%3Dhttps%3A%2F%2Fswitchbru.com%2Fappstore%2Frepo.json%26name%3Daio-switch-updater) ![releases](https://img.shields.io/github/downloads/HamletDuFromage/AIO-switch-updater/total) ![GitHub Workflow Status](https://img.shields.io/github/workflow/status/HamletDuFromage/AIO-switch-updater/Build%20AIO-switch-updater) ![tag](https://img.shields.io/github/v/release/HamletDuFromage/AIO-switch-updater) diff --git a/include/constants.hpp b/include/constants.hpp index c48b09f..63ad498 100644 --- a/include/constants.hpp +++ b/include/constants.hpp @@ -18,7 +18,7 @@ constexpr const char APP_FILENAME[] = "/config/aio-switch-updater/app.zip"; constexpr const char NXLINKS_URL[] = "https://raw.githubusercontent.com/HamletDuFromage/nx-links/master/nx-links.json"; -constexpr const char SIGPATCHES_FILENAME[] = "/config/aio-switch-updater/sigpatches.zip"; +constexpr const char CUSTOM_FILENAME[] = "/config/aio-switch-updater/custom.zip"; constexpr const char HEKATE_IPL_PATH[] = "/bootloader/hekate_ipl.ini"; constexpr const char FIRMWARE_URL[] = "https://raw.githubusercontent.com/HamletDuFromage/nx-links/master/firmwares.json"; @@ -81,12 +81,6 @@ constexpr const char REBOOT_PAYLOAD_PATH[] = "/atmosphere/reboot_payload.bin"; constexpr const char FUSEE_SECONDARY[] = "/atmosphere/fusee-secondary.bin"; constexpr const char FUSEE_MTC[] = "/atmosphere/fusee-mtc.bin"; -constexpr const char AMS_ZIP_PATH[] = "/config/aio-switch-updater/ams.zip"; -constexpr const char APP_ZIP_PATH[] = "/config/aio-switch-updater/app.zip"; -constexpr const char CFW_ZIP_PATH[] = "/config/aio-switch-updater/cfw.zip"; -constexpr const char FW_ZIP_PATH[] = "/config/aio-switch-updater/firmware.zip"; -constexpr const char CHEATS_ZIP_PATH[] = "/config/aio-switch-updater/cheats.zip"; -constexpr const char SIGPATCHES_ZIP_PATH[] = "/config/aio-switch-updater/sigpatches.zip"; constexpr const char AMS_DIRECTORY_PATH[] = "/config/aio-switch-updater/atmosphere/"; constexpr const char SEPT_DIRECTORY_PATH[] = "/config/aio-switch-updater/sept/"; constexpr const char FW_DIRECTORY_PATH[] = "/firmware/"; @@ -110,7 +104,7 @@ constexpr const int LISTITEM_HEIGHT = 50; enum class contentType { - sigpatches, + custom, cheats, fw, app, @@ -120,7 +114,7 @@ enum class contentType hekate_ipl, }; -constexpr std::string_view contentTypeNames[8]{"sigpatches", "cheats", "firmwares", "app", "bootloaders", "cfws", "payloads", "hekate_ipl"}; +constexpr std::string_view contentTypeNames[8]{"custom", "cheats", "firmwares", "app", "bootloaders", "cfws", "payloads", "hekate_ipl"}; enum class CFW { diff --git a/resources/i18n/de/menus.json b/resources/i18n/de/menus.json index 3a808ec..937112b 100644 --- a/resources/i18n/de/menus.json +++ b/resources/i18n/de/menus.json @@ -74,9 +74,6 @@ "changelog": { "changelog": "Changelog" }, - "sigpatches": { - "reboot": "Änderung werden nach dem nächsten Neustart wirksam." - }, "payloads": { "dl_payloads": "Payloads herunterladen", "select": " Wähle ein Payload zum neustarten aus.", @@ -107,8 +104,6 @@ "firmware_text": "\u25c6 Firmware von: 'https://darthsternie.net/switch-firmwares/'. Sobald hehruntergeladen, wird sie in '/firmware' entpackt. Danach kannst du das Update mit Daybreak installieren.\n\u25c6 Momentane FW: ", "cheats_text": "\u25c6 Lade ein täglich geupdatetes Archiv von 'gbatemp.net' runter. Cheats von Spielen, die du nicht besitzt, werden nicht entpackt. Du kannst Updates für ausgewählte Spiele unter 'Tools→Cheat Menü' deaktivieren.\n\u25c6 Momentane Cheatversion: ", "get_cheats": "Lade GBAtemp.net Cheatarchiv herunter (ver {})", - "sigpatches": "Sigpatches", - "sigpatches_text": "\u25c6 Sigpatches erlauben dir, inoffizielle NSPs zu installieren und starten. Starte die Konsole neu, um die Patches zu aktivieren.", "firmware": "Firmware", "not_found": "Nicht gefunden", "latest_cheats": "Neueste Version", @@ -122,7 +117,6 @@ "about": "Über", "update_ams": "Update Atmosphère", "update_cfw": "Update CFW", - "update_sigpatches": "Update Sigpatches", "download_firmware": "Firmwares herunterladen", "download_cheats": "Cheats herunterladen", "tools": "Werkzeuge", diff --git a/resources/i18n/en-US/menus.json b/resources/i18n/en-US/menus.json index 5209ef9..17d9942 100644 --- a/resources/i18n/en-US/menus.json +++ b/resources/i18n/en-US/menus.json @@ -77,9 +77,6 @@ "changelog": { "changelog": "Changelog" }, - "sigpatches": { - "reboot": "The changes will take effect at the next boot." - }, "payloads": { "dl_payloads": "Download payloads", "select": " Select a payload to reboot to.", @@ -111,8 +108,6 @@ "cheats_text": "\u25c6 This will download a daily updated archive of cheat codes from 'gbatemp.net'. Cheat codes for games you don't have installed won't be extracted to your SD card. You can turn off cheat updates for specific games in 'Tools→Cheat menu'.\n\u25c6 Current cheats version: ", "get_cheats": "Download GBAtemp.net cheat archive (ver {})", "get_all_cheats:": "Download GBAtemp.net cheat archive", - "sigpatches": "sigpatches", - "sigpatches_text": "\u25c6 Sigpatches allow your Switch to install and run unofficial NSP files. Reboot the console to apply patches.", "firmware": "firmware", "not_found": "not found", "latest_cheats": "Latest version", @@ -130,7 +125,6 @@ "custom_downloads": "Custom downloads", "update_cfw": "Update CFW", "update_bootloaders": "Update bootloaders", - "update_sigpatches": "Update sigpatches", "download_firmware": "Download firmwares", "download_cheats": "Download cheats", "tools": "Tools", @@ -138,7 +132,7 @@ "footer_text": "v{} | {:.1f}GB available", "theme_warning": "It seems like you have a custom theme installed, this may cause your system to fail to boot after upgrading your firmware.\nPlease consider deleting it before upgrading.", "payloads_label": "\u25c6 Download RCM payloads to {}", - "hekate_ipl_label": "\u25c6 Download a stripped down, sigpatches compatibles, \"just works\" hekate_ipl.ini config file. This will overwrite your current hekate_ipl.ini." + "hekate_ipl_label": "\u25c6 Download a stripped down \"just works\" hekate_ipl.ini config file. This will overwrite your current hekate_ipl.ini." }, "hide": { "title": "Hide tabs", diff --git a/resources/i18n/es/menus.json b/resources/i18n/es/menus.json index 97e5823..e4cf82e 100644 --- a/resources/i18n/es/menus.json +++ b/resources/i18n/es/menus.json @@ -75,9 +75,6 @@ "changelog": { "changelog": "Cambios" }, - "sigpatches": { - "reboot": "Los cambios tendrán efectos en el siguiente inicio del sistema." - }, "payloads": { "dl_payloads": "Descargar payloads", "select": " Selecciona el payload al que reiniciar.", @@ -107,8 +104,6 @@ "getting": "Obteniendo {}", "firmware_text": "\u25c6 Firmwares de 'https://darthsternie.net/switch-firmwares/'. Una vez descargado, será extraído en '/firmware'. Entonces podrás instalar la actualización a través de Daybreak.\n\u25c6 FW actual: ", "cheats_text": "\u25c6 Esto descargará un paquete actualizado diario de trucos de 'gbatemp.net'. Los trucos de juegos que no tienes instalados no se extraerán a tu tarjeta SD. Puedes desactivar los trucos actualizados en 'Herramientas→Menú de trucos'.\n\u25c6 Versión de trucos actual: ", - "sigpatches": "sigpatches", - "sigpatches_text": "\u25c6 Los sigpatches permiten a tu Switch instalar y ejecutar archivos NSP no oficiales. Reiniciar para aplicar los cambios.", "firmware": "firmware", "not_found": "no encontrado", "latest_cheats": "Última versión", @@ -125,7 +120,6 @@ "update_ams": "Actualizar Atmosphère", "update_cfw": "Actualizar CFW", "update_bootloaders": "Actualizar bootloader", - "update_sigpatches": "Actualizar sigpatches", "download_firmware": "Descargar firmwares", "download_cheats": "Descargar trucos", "tools": "Herramientas", @@ -133,7 +127,7 @@ "footer_text": "v{} | {:.1f}GB Disponibles", "theme_warning": "Parece que tiene instalado un tema personalizado, Esto puede causar que el sistema falle al inciar tras actualizar el firmware.\nPor favor considere borrar el tema antes de actualizar.", "payloads_label": "\u25c6 Descarga 'RCM payloads' a {}", - "hekate_ipl_label": "\u25c6 Descarga un hekate_ipl.ini básico, compatible con sigpatches, \"Funcional\". Esto sobrescribira tu hekate_ipl.ini actual." + "hekate_ipl_label": "\u25c6 Descarga un hekate_ipl.ini básico \"Funcional\". Esto sobrescribira tu hekate_ipl.ini actual." }, "hide": { "title": "Pestañas ocultas", diff --git a/resources/i18n/fr/menus.json b/resources/i18n/fr/menus.json index 42dffb1..6704086 100644 --- a/resources/i18n/fr/menus.json +++ b/resources/i18n/fr/menus.json @@ -73,9 +73,6 @@ "changelog": { "changelog": "Journal des modifications" }, - "sigpatches": { - "reboot": "Les changements prendront effet au prochain démarrage." - }, "payloads": { "dl_payloads": "Téléchargement des payloads", "select": "Selectionner un payload vers lequel redémarrer.", @@ -107,8 +104,6 @@ "cheats_text": "\u25c6 Ceci téléchargera une archive de codes de triche mise à jour quotidiennement depuis 'gbatemp.net'. Les codes de triche pour les jeux non installés pas ne seront pas extraits sur la carte SD. Vous pouvez désactiver la mises à jour des codes de triche pour les jeux de votre choix dans le menu 'Outils→Menu de triche'.\n Version des codes de triche installés\u00a0: ", "get_cheats": "Télécharger l'archive de codes de triche de GBAtemp.net (ver {})", "get_all_cheats:": "Télécharger l'archive de codes de triche de GBAtemp.net", - "sigpatches": "sigpatches", - "sigpatches_text": "\u25c6 Les sigpatches permettent à la Switch d'installer et d'exécuter des fichiers NSP non officiels. Redémarrez la console pour appliquer les patches.", "firmware": "firmware", "not_found": "non trouvé", "latest_cheats": "Dernière version", @@ -125,7 +120,6 @@ "update_ams": "MÀJ d'Atmosphère", "update_cfw": "MÀJ des CFW", "update_bootloaders": "MÀJ des bootloaders", - "update_sigpatches": "MÀJ des sigpatches", "download_firmware": "Téléch. des firmwares", "download_cheats": "Téléch. de cheat codes", "tools": "Outils", @@ -133,7 +127,7 @@ "footer_text": "v{} | {:.1f}Go disponibles", "theme_warning": "Il semblerait que vous avez installé un thème personnalisé, cela pourrait empêcher le système de démarrer après la mise à jour de votre firmware.\nIl est conseillé de le supprimer avant d'effectuer la mise à jour.", "payloads_label": "\u25c6 Enregistrer les payloads RCM sous {}", - "hekate_ipl_label": "\u25c6 Télécharger une version minimale et prête à l'emploi du fichier de configuration hekate_ipl.ini compatible avec les sigpatches. Le fichier hekate_ipl.ini déjà présent sera écrasé." + "hekate_ipl_label": "\u25c6 Télécharger une version minimale et prête à l'emploi du fichier de configuration hekate_ipl.ini. Le fichier hekate_ipl.ini déjà présent sera écrasé." }, "hide": { "title": "Masquer des onglets", diff --git a/resources/i18n/it/menus.json b/resources/i18n/it/menus.json index e68c5c3..c1c362b 100644 --- a/resources/i18n/it/menus.json +++ b/resources/i18n/it/menus.json @@ -77,9 +77,6 @@ "changelog": { "changelog": "Cronologia aggiornamenti" }, - "sigpatches": { - "reboot": "I cambiamenti saranno effettivi al prossimo riavvio." - }, "payloads": { "dl_payloads": "Scarica payload", "select": " Seleziona un payload da avviare.", @@ -112,8 +109,6 @@ "cheats_text": "\u25c6 Questo scaricherà quotidianamente un archivio di cheat da 'gbatemp.net'. I cheat per i giochi non installati non saranno estratti sulla tua scheda SD. Puoi disabilitare l'aggiornamento dei cheat in 'Strumenti→Menu cheat'.\n\u25c6 Versione cheat corrente: ", "get_cheats": "Scarica cheat da GBAtemp.net (ver {})", "get_all_cheats:": "Scarica cheat da GBAtemp.net", - "sigpatches": "sigpatches", - "sigpatches_text": "\u25c6 Le sigpatches consentono di installare ed eseguire NSP non ufficiali sulla Switch.", "firmware": "firmware", "not_found": "non trovato", "latest_cheats": "Ultima versione", @@ -130,7 +125,6 @@ "update_ams": "Aggiorna Atmosphère", "update_cfw": "Aggiorna CFW", "update_bootloaders": "Aggiorna bootloader", - "update_sigpatches": "Aggiorna sigpatches", "download_firmware": "Scarica firmware", "download_cheats": "Scarica cheats", "tools": "Strumenti", @@ -138,7 +132,7 @@ "footer_text": "v{} | {:.1f}GB disponibili", "theme_warning": "Sembra che tu stia usando un custom theme: tieni conto che potrebbe impedire l'avvio del sistema dopo l'aggiornamento del firmware.\nValuta se cancellarlo o meno prima di effettuare l'aggiornamento.", "payloads_label": "\u25c6 Scarica ed aggiorna i payload RCM in {}", - "hekate_ipl_label": "\u25c6 Scarica una configurazione di base di hekate_ipl.ini per il supporto alle sigpatch. Sovrascriverà l'attuale configurazione presente in hekate_ipl.ini." + "hekate_ipl_label": "\u25c6 Scarica una configurazione di base di hekate_ipl.ini. Sovrascriverà l'attuale configurazione presente in hekate_ipl.ini." }, "hide": { "title": "Nascondi schede", diff --git a/resources/i18n/ja/menus.json b/resources/i18n/ja/menus.json index 66dc9f5..6b60ff7 100644 --- a/resources/i18n/ja/menus.json +++ b/resources/i18n/ja/menus.json @@ -76,9 +76,6 @@ "changelog": { "changelog": "更新履歴" }, - "sigpatches": { - "reboot": "変更は、次回の再起動時に有効になります。" - }, "payloads": { "dl_payloads": "ペイロードをダウンロード", "select": " 再起動するペイロードを選択します。", @@ -110,8 +107,6 @@ "cheats_text": "\u25c6 これにより、毎日更新されるチートコードのアーカイブが「gbatemp.net」からダウンロードされます。インストールしていないゲームのチートコードはSDカードに抽出されません。「ツール→チートメニュー」で特定のゲームのチートアップデートをオフにすることができます。\n\u25c6 現在のチートバージョン: ", "get_cheats": "GBAtemp.net チートアーカイブをダウンロード (ver {})", "get_all_cheats:": "GBAtemp.net チートアーカイブをダウンロードする", - "sigpatches": "sigpatch", - "sigpatches_text": "\u25c6 Sigpatchを使用すると、スイッチで非公式のNSPファイルをインストールして実行できます。", "firmware": "FW", "not_found": "見つかりませんでした", "latest_cheats": "最新バージョン", @@ -128,7 +123,6 @@ "update_ams": "Atmosphèreをアップデート", "update_cfw": "CFWをアップデート", "update_bootloaders": "ブートローダーをアップデート", - "update_sigpatches": "sigpatchをアップデート", "download_firmware": "FWをダウンロード", "download_cheats": "チートをダウンロード", "tools": "ツール", @@ -136,7 +130,7 @@ "footer_text": "v{} | {:.1f}GB 利用可能", "theme_warning": "カスタムテーマがインストールされているようです。これにより、ファームウェアのアップグレード後にシステムが起動に失敗する可能性があります。\nアップグレードする前に削除することを検討してください。", "payloads_label": "\u25c6 RCMペイロードを{}にダウンロードします。", - "hekate_ipl_label": "\u25c6 sigpath互換のhekate_ipl.iniの設定ファイルをダウンロード。 これにより、現在のhekate_ipl.iniが上書きされます。" + "hekate_ipl_label": "\u25c6 換のhekate_ipl.iniの設定ファイルをダウンロード。 これにより、現在のhekate_ipl.iniが上書きされます。" }, "hide": { "title": "タブを非表示", diff --git a/resources/i18n/ko/menus.json b/resources/i18n/ko/menus.json index 36c1a3f..db75cbd 100644 --- a/resources/i18n/ko/menus.json +++ b/resources/i18n/ko/menus.json @@ -75,9 +75,6 @@ "changelog": { "changelog": "변경기록" }, - "sigpatches": { - "reboot": "변경 사항은 다음 부팅 시 적용됩니다." - }, "payloads": { "dl_payloads": "페이로드 다운로드", "select": " 재부팅할 페이로드를 선택하세요.", @@ -110,8 +107,6 @@ "cheats_text": "\u25c6 'gbatemp.net'에서 매일 업데이트되는 치트 코드 아카이브를 다운로드합니다. 설치하지 않은 게임의 치트 코드는 SD 카드에 추출되지 않습니다. '도구→치트 메뉴'에서 특정 게임에 대한 치트 업데이트를 끌 수 있습니다.\n\u25c6 현재 치트 버전: ", "get_cheats": "GBAtemp.net 치트 아카이브 (ver {}) 다운로드", "get_all_cheats:": "GBAtemp.net 치트 아카이브 다운로드", - "sigpatches": "시그패치", - "sigpatches_text": "\u25c6 시그패치를 사용하면 스위치에서 비공식 NSP 파일을 설치하고 실행할 수 있습니다. 콘솔을 재부팅하여 패치를 적용하세요.", "firmware": "펌웨어", "not_found": "찾을 수 없음", "latest_cheats": "최신 버전", @@ -128,7 +123,6 @@ "update_ams": "Atmosphère 업데이트", "update_cfw": "커스텀 펌웨어 업데이트", "update_bootloaders": "부트로더 업데이트", - "update_sigpatches": "시그패치 업데이트", "download_firmware": "펌웨어 다운로드", "download_cheats": "치트 다운로드", "tools": "도구", diff --git a/resources/i18n/pl/menus.json b/resources/i18n/pl/menus.json index 1b375df..ee70024 100644 --- a/resources/i18n/pl/menus.json +++ b/resources/i18n/pl/menus.json @@ -57,9 +57,6 @@ "changelog": { "changelog": "Dziennik zmian" }, - "sigpatches": { - "reboot": "Zmiany zostaną zastosowane po restarcie." - }, "payloads": { "dl_payloads": "Pobierz payloady", "select": " Wybierz payload do ponownego uruchomienia.", @@ -89,8 +86,6 @@ "firmware_text": "\u25c6 Oprogramowanie z 'https://darthsternie.net/switch-firmwares/'. Po pobraniu zostanie rozpakowane do '/firmware'. Możesz je później zainstalować korzystając z Daybreak.\n\u25c6 Bieżący FW: ", "cheats_text": "\u25c6 Pobierze aktualizowaną codziennie paczkę cheatów z 'gbatemp.net'. Cheaty dla gier których nie masz zainstalowanych nie zostaną wypakowane na twoją kartę SD. Możesz wyłączyć aktualizację cheatów dla poszczególnych gier w 'Narzędzia→Menu cheatów'.\n\u25c6 Bieżąca wersja cheatów: ", "get_cheats": "Pobierz archiwum cheatów GBAtemp.net (wersja {})", - "sigpatches": "sigpatche", - "sigpatches_text": "\u25c6 Sigpatche umożliwiają twojemu Switchowi instalowanie i uruchamianie nieoficjalnych plików NSP. Uruchom konsolę ponownie aby zastosować zmiany.", "firmware": "firmware", "not_found": "nie znaleziono", "latest_cheats": "Najnowsza wersja", @@ -105,7 +100,6 @@ "about": "O aplikacji", "update_ams": "Zaktualizuj Atmosph\u00e8re", "update_cfw": "Zaktualizuj CFW", - "update_sigpatches": "Zaktualizuj sigpatche", "download_firmware": "Pobierz firmware", "download_cheats": "Pobierz cheaty", "tools": "Narzędzia", diff --git a/resources/i18n/pt-BR/menus.json b/resources/i18n/pt-BR/menus.json index dad2328..d77ef59 100644 --- a/resources/i18n/pt-BR/menus.json +++ b/resources/i18n/pt-BR/menus.json @@ -58,8 +58,6 @@ "getting": "Baixando {}", "firmware_text": "\u25c6 Firmwares de 'https://darthsternie.net/switch-firmwares/'. Depois de baixado, ele será extraído para '/firmware'. Você pode então instalar a atualização por meio do Daybreak ou.\n\u25c6 FW atual: ", "cheats_text": "\u25c6 Isso irá baixar um pacote de cheat atualizado diariamente do 'gbatemp.net'. Os cheats do jogo que você não instalou não serão extraídos para o seu cartão SD. Você pode desabilitar cheats atualizados em 'Ferramentas→Trapaças'.\n\u25c6 Versão das trapaças atual: ", - "sigpatches": "sigpatches", - "sigpatches_text": "\u25c6 Os Sigpatches permitem que o Switch instale e execute arquivos NSP não oficiais.", "firmware": "firmware", "not_found": "não encontrado", "latest_cheats": "Última versão", @@ -71,7 +69,6 @@ "new_update": " - Nova atualização de aplicativo disponível", "about": "Informações", "update_cfw": "Atualizar CFW", - "update_sigpatches": "Atualizar sigpatches", "download_firmware": "Baixar firmwares", "download_cheats": "Baixar trapaças", "tools": "Ferramentas" diff --git a/resources/i18n/zh-CN/menus.json b/resources/i18n/zh-CN/menus.json index d2209c8..40f3c13 100644 --- a/resources/i18n/zh-CN/menus.json +++ b/resources/i18n/zh-CN/menus.json @@ -76,9 +76,6 @@ "changelog": { "changelog": "更新日志" }, - "sigpatches": { - "reboot": "这些更改将在下次启动时生效。" - }, "payloads": { "dl_payloads": "下载payloads", "select": " 选择一个payload文件并重启。", @@ -111,8 +108,6 @@ "cheats_text": "\u25c6 这将从'gbatemp.net'下载每日更新的金手指文件。你没有安装的游戏的金手指不会被解压到你的SD卡中。你可以在'工具→金手指菜单'中关闭特定游戏的金手指更新。\n\u25c6 当前的金手指版本: ", "get_cheats": "下载GBAtemp.net金手指压缩包 (版本 {})", "get_all_cheats:": "下载GBAtemp.net金手指压缩包", - "sigpatches": "Sigpatches", - "sigpatches_text": "\u25c6 Sigpatches允许你的Switch安装和运行非官方的NSP文件。重新启动控制台以应用补丁程序。", "firmware": "firmware", "not_found": "没有找到", "latest_cheats": "最新版本", @@ -129,7 +124,6 @@ "update_ams": "更新Atmosphère", "update_cfw": "更新CFW", "update_bootloaders": "更新bootloaders", - "update_sigpatches": "更新sigpatches", "download_firmware": "下载firmwares", "download_cheats": "下载金手指", "tools": "工具", @@ -137,7 +131,7 @@ "footer_text": "v{} | {:.1f}GB 可用", "theme_warning": "您似乎安装了一个自定义主题，这可能会导致您的系统在升级固件后无法启动。\n请考虑在升级之前将其删除。", "payloads_label": "\u25c6 下载RCM payloads到 {}", - "hekate_ipl_label": "\u25c6 下载一个精简的、兼容sigpatches的、\"刚好管用\"的hekate_ipl.ini配置文件。这将覆盖您当前的hekate_ipl.ini。" + "hekate_ipl_label": "\u25c6 下载一个精简的 \"刚好管用\"的hekate_ipl.ini配置文件。这将覆盖您当前的hekate_ipl.ini。" }, "hide": { "title": "隐藏选项卡", diff --git a/resources/i18n/zh-TW/menus.json b/resources/i18n/zh-TW/menus.json index 372f4ef..0fb847a 100644 --- a/resources/i18n/zh-TW/menus.json +++ b/resources/i18n/zh-TW/menus.json @@ -76,9 +76,6 @@ "changelog": { "changelog": "更新履歷" }, - "sigpatches": { - "reboot": "安裝完成後請重新開機以套用更新" - }, "payloads": { "dl_payloads": "下載注入檔案", "select": " 選擇重開機時的注入檔案", @@ -111,8 +108,6 @@ "cheats_text": "\u25c6 下載'gbatemp.net'每日更新的金手指檔案到記憶卡時，並不會複製到主機未安裝的遊戲金手指檔案。你可以從設定的 '工具→金手指選單' 內停用金手指更新。\n\u25c6 目前金手指資料庫版本: ", "get_cheats:": "下載GBAtemp.net金手指資料庫 (版本 {})", "get_all_cheats": "下載GBAtemp.net金手指資料庫", - "sigpatches": "sigpatches", - "sigpatches_text": "\u25c6 Sigpatches可讓你的Switch安裝並執行非官方的NSP檔案。安裝完成後請重新開機以套用更新", "firmware": "韌體", "not_found": "沒有符合的項目", "latest_cheats": "最新版本", @@ -129,7 +124,6 @@ "update_ams": "更新Atmosphère", "update_cfw": "更新CFW", "update_bootloaders": "更新引導程序", - "update_sigpatches": "更新sigpatches", "download_firmware": "下載韌體", "download_cheats": "下載金手指", "tools": "工具", diff --git a/source/ams_tab.cpp b/source/ams_tab.cpp index ea9f73f..f4e1f1b 100644 --- a/source/ams_tab.cpp +++ b/source/ams_tab.cpp @@ -58,7 +58,7 @@ AmsTab::AmsTab(const nlohmann::json& nxlinks, const bool erista, const bool cust CreateDownloadItems(custom_pack["ams"], true); } if (custom_pack.contains("misc") && custom_pack["misc"].size() != 0) { - this->type = contentType::bootloaders; + this->type = contentType::custom; this->addView(new brls::Label( brls::LabelStyle::DESCRIPTION, "menus/ams_update/custom_packs_misc"_i18n, @@ -117,9 +117,9 @@ void AmsTab::CreateStagedFrames(const std::string& text, const std::string& url, stagedFrame->addStage( new DialoguePage_ams(stagedFrame, text_hekate, erista)); stagedFrame->addStage( - new WorkerPage(stagedFrame, "menus/common/downloading"_i18n, [hekate_url]() { util::downloadArchive(hekate_url, contentType::bootloaders); })); + new WorkerPage(stagedFrame, "menus/common/downloading"_i18n, [hekate_url]() { util::downloadArchive(hekate_url, contentType::custom); })); stagedFrame->addStage( - new WorkerPage(stagedFrame, "menus/common/extracting"_i18n, []() { util::extractArchive(contentType::bootloaders); })); + new WorkerPage(stagedFrame, "menus/common/extracting"_i18n, []() { util::extractArchive(contentType::custom); })); } if (ams) stagedFrame->addStage(new ConfirmPage_AmsUpdate(stagedFrame, "menus/ams_update/reboot_rcm"_i18n, erista)); diff --git a/source/changelog_page.cpp b/source/changelog_page.cpp index 3aa2a0e..27db86b 100644 --- a/source/changelog_page.cpp +++ b/source/changelog_page.cpp @@ -16,7 +16,7 @@ ChangelogPage::ChangelogPage() : AppletFrame(true, true) changes.push_back("\uE016 Added dialogue box asking about ini files.\n\uE016 Fixed update app link when not connected to the internet.\n\uE016 Minor fixes here and there."); verTitles.push_back("v1.0.2"); - changes.push_back("\uE016 Fixed .ini files being handled poorly when installing sigpatches. Now prompts the user if they want to replace hetake_ipl.ini."); + changes.push_back("Now prompts the user if they want to replace hetake_ipl.ini."); verTitles.push_back("v1.0.3"); changes.push_back("\uE016 Fixed progress bar sometimes being stuck when extracting."); @@ -91,7 +91,7 @@ ChangelogPage::ChangelogPage() : AppletFrame(true, true) changes.push_back("\uE016 Switched to a better way to get links."); verTitles.push_back("v2.1.1"); - changes.push_back("\uE016 Added a friendly reminder to reboot for new sigpatches to apply.\n\uE016 Changed the cheatslips cheatsheet view."); + changes.push_back("\uE016 Changed the cheatslips cheatsheet view."); verTitles.push_back("v2.1.2"); changes.push_back("\uE016 Fixed wronge hekate link."); diff --git a/source/cheats_page.cpp b/source/cheats_page.cpp index b381ec2..5baab77 100644 --- a/source/cheats_page.cpp +++ b/source/cheats_page.cpp @@ -68,7 +68,7 @@ CheatsPage::CheatsPage() : AppletFrame(true, true) new WorkerPage(stagedFrame, "menus/common/downloading"_i18n, [url]() { util::downloadArchive(url, contentType::cheats); })); } stagedFrame->addStage( - new WorkerPage(stagedFrame, "menus/common/extracting"_i18n, [cheatsVer]() { extract::extractAllCheats(CHEATS_ZIP_PATH, CurrentCfw::running_cfw, cheatsVer); })); + new WorkerPage(stagedFrame, "menus/common/extracting"_i18n, [cheatsVer]() { extract::extractAllCheats(CHEATS_FILENAME, CurrentCfw::running_cfw, cheatsVer); })); stagedFrame->addStage( new ConfirmPage_Done(stagedFrame, "menus/common/all_done"_i18n)); brls::Application::pushView(stagedFrame); diff --git a/source/list_download_tab.cpp b/source/list_download_tab.cpp index c1e2a32..cf88a3e 100644 --- a/source/list_download_tab.cpp +++ b/source/list_download_tab.cpp @@ -100,10 +100,6 @@ void ListDownloadTab::createList(contentType type) } break; } - case contentType::sigpatches: - doneMsg += "\n" + "menus/sigpatches/reboot"_i18n; - stagedFrame->addStage(new ConfirmPage_Done(stagedFrame, doneMsg)); - break; default: stagedFrame->addStage(new ConfirmPage_Done(stagedFrame, doneMsg)); break; @@ -138,9 +134,6 @@ void ListDownloadTab::setDescription(contentType type) brls::Label* description = new brls::Label(brls::LabelStyle::DESCRIPTION, "", true); switch (type) { - case contentType::sigpatches: - description->setText("menus/main/sigpatches_text"_i18n); - break; case contentType::fw: { SetSysFirmwareVersion ver; description->setText(fmt::format("{}{}", "menus/main/firmware_text"_i18n, R_SUCCEEDED(setsysGetFirmwareVersion(&ver)) ? ver.display_version : "menus/main/not_found"_i18n)); diff --git a/source/tools_tab.cpp b/source/tools_tab.cpp index 9b1e472..9551b2b 100644 --- a/source/tools_tab.cpp +++ b/source/tools_tab.cpp @@ -129,13 +129,13 @@ ToolsTab::ToolsTab(const std::string& tag, const nlohmann::ordered_json& payload brls::ListItem* cleanUp = new brls::ListItem("menus/tools/clean_up"_i18n); cleanUp->getClickEvent()->subscribe([](brls::View* view) { - std::filesystem::remove(AMS_ZIP_PATH); - std::filesystem::remove(APP_ZIP_PATH); - std::filesystem::remove(CFW_ZIP_PATH); - std::filesystem::remove(FW_ZIP_PATH); - std::filesystem::remove(CHEATS_ZIP_PATH); + std::filesystem::remove(AMS_FILENAME); + std::filesystem::remove(APP_FILENAME); + std::filesystem::remove(FIRMWARE_FILENAME); + std::filesystem::remove(CHEATS_FILENAME); + std::filesystem::remove(BOOTLOADER_FILENAME); std::filesystem::remove(CHEATS_VERSION); - std::filesystem::remove(SIGPATCHES_ZIP_PATH); + std::filesystem::remove(CUSTOM_FILENAME); fs::removeDir(AMS_DIRECTORY_PATH); fs::removeDir(SEPT_DIRECTORY_PATH); fs::removeDir(FW_DIRECTORY_PATH); diff --git a/source/utils.cpp b/source/utils.cpp index 5af06d0..9bacf99 100644 --- a/source/utils.cpp +++ b/source/utils.cpp @@ -45,8 +45,8 @@ namespace util { { fs::createTree(DOWNLOAD_PATH); switch (type) { - case contentType::sigpatches: - status_code = download::downloadFile(url, SIGPATCHES_FILENAME, OFF); + case contentType::custom: + status_code = download::downloadFile(url, CUSTOM_FILENAME, OFF); break; case contentType::cheats: status_code = download::downloadFile(url, CHEATS_FILENAME, OFF); @@ -126,8 +126,8 @@ namespace util { { std::string filename; switch (type) { - case contentType::sigpatches: - filename = SIGPATCHES_FILENAME; + case contentType::custom: + filename = CUSTOM_FILENAME; break; case contentType::cheats: filename = CHEATS_FILENAME; @@ -157,9 +157,6 @@ namespace util { chdir(ROOT_PATH); crashIfNotArchive(type); switch (type) { - case contentType::sigpatches: - extract::extract(SIGPATCHES_FILENAME); - break; case contentType::cheats: { std::vector titles = extract::getInstalledTitlesNs(); titles = extract::excludeTitles(CHEATS_EXCLUDE, titles); @@ -175,6 +172,11 @@ namespace util { extract::extract(APP_FILENAME, CONFIG_PATH); fs::copyFile(ROMFS_FORWARDER, FORWARDER_PATH); break; + case contentType::custom: { + int overwriteInis = showDialogBoxBlocking("menus/utils/overwrite_inis"_i18n, "menus/common/no"_i18n, "menus/common/yes"_i18n); + extract::extract(CUSTOM_FILENAME, ROOT_PATH, overwriteInis); + break; + } case contentType::bootloaders: { int overwriteInis = showDialogBoxBlocking("menus/utils/overwrite_inis"_i18n, "menus/common/no"_i18n, "menus/common/yes"_i18n); extract::extract(BOOTLOADER_FILENAME, ROOT_PATH, overwriteInis); @@ -191,7 +193,7 @@ namespace util { default: break; } - if (type == contentType::ams_cfw || type == contentType::bootloaders) + if (type == contentType::ams_cfw || type == contentType::bootloaders || type == contentType::custom) fs::copyFiles(COPY_FILES_TXT); } @@ -267,7 +269,7 @@ namespace util { std::string getCheatsVersion() { std::string res = util::downloadFileToString(CHEATS_URL_VERSION); - if (res == "" && isArchive(CHEATS_ZIP_PATH)) { + if (res == "" && isArchive(CHEATS_FILENAME)) { res = "offline"; } return res;