mirrors/AIO-switch-updater
1
0
Fork 0
mirror of https://github.com/HamletDuFromage/aio-switch-updater.git synced 2024-11-28 12:22:02 +00:00
Code Issues Releases Activity

small fixes regarding Mariko

Browse source
This commit is contained in:
flb 2021-05-24 19:23:16 +02:00
parent 8caa244e48
commit 5d4a4622db
11 changed files with 17 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Makefile
View file

@ -22,7 +22,7 @@ DATA := data
INCLUDES := include lib/zipper/include /lib/borealis/library/include/borealis/extern/nlohmann
APP_TITLE := All-in-One Switch Updater
APP_AUTHOR := HamletDuFromage
APP_VERSION := 2.5.0
APP_VERSION := 2.5.1
TARGET := $(notdir $(CURDIR))
ROMFS := resources

2
include/ams_tab.hpp
View file

@ -10,6 +10,6 @@ class AmsTab : public brls::List
brls::Label *description;
int size;
public:
AmsTab(const bool erista);
AmsTab(const bool erista = true);
brls::View* getDefaultFocus() override;
};

2
resources/i18n/de/menus.json
View file

@ -112,7 +112,7 @@
"download_firmware": "Firmwares runterladen",
"download_cheats": "Cheats runterladen",
"tools": "Werkzeuge",
"launch_warning": "Bitte beachten Sie die folgenden Punkte, bevor Sie die App verwenden:\n\n\ue016 Lesen Sie zuerst, wie Sie Ihren Switch manuell aktualisieren. Auf diese Weise können Sie die App besser verstehen und wissen, was zu tun ist, wenn etwas schief geht. \n\ue016 Bitte beachten Sie, dass die Verwendung dieser App (oder eines Homebrews) auf einer exFAT SD-Karte nicht empfohlen wird, da diese höchstwahrscheinlich im laufe der Zeit ihre Daten beschädigen wird.\n\ue016 Some new features and/or changes regarding current features may have been introduced. Please check them out via the Tools->Changelog menu.\n\nDieser Bildschirm wird nicht mehr angezeigt."
"launch_warning": "Bitte beachten Sie die folgenden Punkte, bevor Sie die App verwenden:\n\n\ue016 Lesen Sie zuerst, wie Sie Ihren Switch manuell aktualisieren. Auf diese Weise können Sie die App besser verstehen und wissen, was zu tun ist, wenn etwas schief geht. \n\ue016 Bitte beachten Sie, dass die Verwendung dieser App (oder eines Homebrews) auf einer exFAT SD-Karte nicht empfohlen wird, da diese höchstwahrscheinlich im laufe der Zeit ihre Daten beschädigen wird.\n\n\ue016 Some new features and/or changes regarding current features may have been introduced. Please check them out via the Tools->Changelog menu.\n\nDieser Bildschirm wird nicht mehr angezeigt."
},
"hide": {
"title": "Tabs verstecken",

2
resources/i18n/en-US/menus.json
View file

@ -114,7 +114,7 @@
"download_firmware": "Download firmwares",
"download_cheats": "Download cheats",
"tools": "Tools",
"launch_warning": "Please pay attention to the following points before using the app:\n\n\ue016 Read up on how to manually update your Switch first. This will help you understand the app better and you'll know what to do in case something goes wrong.\n\ue016 Please note that using this app (or any homebrew) on a exFAT SD card is not recommended, as those are more likely to corrupt.\n\ue016 Some new features and/or changes regarding current features may have been introduced. Please check them out via the Tools->Changelog menu.\n\nThis screen won't show again."
"launch_warning": "Please pay attention to the following points before using the app:\n\n\ue016 Read up on how to manually update your Switch first. This will help you understand the app better and you'll know what to do in case something goes wrong.\n\ue016 Please note that using this app (or any homebrew) on a exFAT SD card is not recommended, as those are more likely to corrupt.\n\n\ue016 Some new features and/or changes regarding current features may have been introduced. Please check them out via the Tools->Changelog menu.\n\nThis screen won't show again."
},
"hide": {
"title": "Hide tabs",

2
resources/i18n/ja/menus.json
View file

@ -110,7 +110,7 @@
"download_firmware": "FWをダウンロード",
"download_cheats": "チートをダウンロード",
"tools": "ツール",
"launch_warning": "アプリを使用する前に、次の点に注意してください:\n\n\ue016 最初にスイッチを手動で更新する方法を読んでください。これにより、アプリをよりよく理解し、問題が発生した場合の対処方法を知ることができます。\n\ue016 exFAT SDカードでこのアプリを使用することはお勧めできません。破損する可能性が高いためです。\n\ue016 Some new features and/or changes regarding current features may have been introduced. Please check them out via the Tools->Changelog menu.\n\nこの画面は二度と表示されません。"
"launch_warning": "アプリを使用する前に、次の点に注意してください:\n\n\ue016 最初にスイッチを手動で更新する方法を読んでください。これにより、アプリをよりよく理解し、問題が発生した場合の対処方法を知ることができます。\n\ue016 exFAT SDカードでこのアプリを使用することはお勧めできません。破損する可能性が高いためです。\n\n\ue016 Some new features and/or changes regarding current features may have been introduced. Please check them out via the Tools->Changelog menu.\n\nこの画面は二度と表示されません。"
},
"hide": {
"title": "タブを非表示",

2
resources/i18n/pl/menus.json
View file

@ -114,7 +114,7 @@
"download_firmware": "Pobierz firmware",
"download_cheats": "Pobierz cheaty",
"tools": "Narzędzia",
"launch_warning": "Zwróć uwagę na następujące punkty zanim skorzystasz z aplikacji:\n\n\ue016 Dowiedz się najpierw, jak ręcznie zaktualizować twojego Switcha. Pomoże ci to lepiej zrozumieć działanie aplikacji i będziesz wiedział co zrobić gdy coś pójdzie nie tak.\n\ue016 Pamiętaj, że używanie tej aplikacji (lub innych homebrew) na karcie SD z systemem plików exFAT nie jest zalecane, ponieważ ich zawartość ma większą podatność na uszkodzenia.\n\ue016 Some new features and/or changes regarding current features may have been introduced. Please check them out via the Tools->Changelog menu.\n\nTen ekran nie wyświetli się ponownie."
"launch_warning": "Zwróć uwagę na następujące punkty zanim skorzystasz z aplikacji:\n\n\ue016 Dowiedz się najpierw, jak ręcznie zaktualizować twojego Switcha. Pomoże ci to lepiej zrozumieć działanie aplikacji i będziesz wiedział co zrobić gdy coś pójdzie nie tak.\n\ue016 Pamiętaj, że używanie tej aplikacji (lub innych homebrew) na karcie SD z systemem plików exFAT nie jest zalecane, ponieważ ich zawartość ma większą podatność na uszkodzenia.\n\n\ue016 Some new features and/or changes regarding current features may have been introduced. Please check them out via the Tools->Changelog menu.\n\nTen ekran nie wyświetli się ponownie."
},
"hide": {
"title": "Ukryj zakładki",

2
resources/i18n/zh-TW/menus.json
View file

@ -114,7 +114,7 @@
"download_firmware": "下載韌體",
"download_cheats": "下載金手指",
"tools": "工具",
"launch_warning": "在開始使用此app前，請務必注意：\n\n\ue016 請先閱讀有關如何手動更新Switch系統的文件，協助你瞭解app提供的各項功能，以及發生問題時如何排除。\n\ue016 請注意，我們不建議在exFAT格式的記憶卡上使用此app (或其他任何第三方自製軟體)，可能會因此產生錯誤或造成損害。\n\ue016 Some new features and/or changes regarding current features may have been introduced. Please check them out via the Tools->Changelog menu.\n\n此提醒畫面將不再顯示"
"launch_warning": "在開始使用此app前，請務必注意：\n\n\ue016 請先閱讀有關如何手動更新Switch系統的文件，協助你瞭解app提供的各項功能，以及發生問題時如何排除。\n\ue016 請注意，我們不建議在exFAT格式的記憶卡上使用此app (或其他任何第三方自製軟體)，可能會因此產生錯誤或造成損害。\n\n\ue016 Some new features and/or changes regarding current features may have been introduced. Please check them out via the Tools->Changelog menu.\n\n此提醒畫面將不再顯示"
},
"hide": {
"title": "隱藏分頁",

4
source/ams_tab.cpp
View file

@ -32,7 +32,7 @@ AmsTab::AmsTab(const bool erista) :
std::string text("menus/common/download"_i18n + link.first + "menus/common/from"_i18n + url);
listItem = new brls::ListItem(link.first);
listItem->setHeight(LISTITEM_HEIGHT);
listItem->getClickEvent()->subscribe([&, text, text_hekate, url, hekate_url, operation](brls::View* view) {
listItem->getClickEvent()->subscribe([&, text, text_hekate, url, hekate_url, operation, erista](brls::View* view) {
brls::StagedAppletFrame* stagedFrame = new brls::StagedAppletFrame();
stagedFrame->setTitle(operation);
stagedFrame->addStage(
@ -46,7 +46,7 @@ AmsTab::AmsTab(const bool erista) :
);
if(url.find("DeepSea") == std::string::npos) {
stagedFrame->addStage(
new DialoguePage(stagedFrame, text_hekate)
new DialoguePage(stagedFrame, text_hekate, erista)
);
stagedFrame->addStage(
new WorkerPage(stagedFrame, "menus/common/downloading"_i18n, [hekate_url](){util::downloadArchive(hekate_url, archiveType::cfw);})

4
source/changelog_page.cpp
View file

@ -148,6 +148,10 @@ ChangelogPage::ChangelogPage() : AppletFrame(true, true)
verTitles.push_back("v2.5.0");
changes.push_back("\uE016 Added ability to update Atmosphère for Mariko (ie patched) Switches. Thanks to SkyDark for testing it out.\n\uE016 Fixed batch copy to be able to copy the same file multiple times (see https://git.io/aiosu_copyfiles). Existing copy_files.json files won't work anymore.");
verTitles.push_back("v2.5.1");
changes.push_back("\uE016 Fixed bug copying Mariko payloads on Erista.");
for(int i = verTitles.size() -1 ; i >= 0; i--){
listItem = new brls::ListItem(verTitles[i]);
change = changes[i];

3
source/confirm_page.cpp
View file

@ -21,8 +21,9 @@ ConfirmPage::ConfirmPage(brls::StagedAppletFrame* frame, std::string text, bool
brls::Application::pushView(new MainFrame());
}
else if (this->reboot) {
if(this->erista)
if(this->erista) {
reboot_to_payload(RCM_PAYLOAD_PATH);
}
else {
if(std::filesystem::exists(UPDATE_BIN_PATH)) {
fs::copyFile(UPDATE_BIN_PATH, MARIKO_PAYLOAD_PATH_TEMP);

4
source/dialogue_page.cpp
View file

@ -5,7 +5,6 @@
#include "fs.hpp"
#include <filesystem>
namespace i18n = brls::i18n;
using namespace i18n::literals;
@ -24,8 +23,9 @@ DialoguePage::DialoguePage(brls::StagedAppletFrame* frame, std::string text, boo
});
this->button2->getClickEvent()->subscribe([frame, this](View* view) {
if(this->erista)
if(this->erista) {
reboot_to_payload(RCM_PAYLOAD_PATH);
}
else {
if(std::filesystem::exists(UPDATE_BIN_PATH)) {
fs::copyFile(UPDATE_BIN_PATH, MARIKO_PAYLOAD_PATH_TEMP);