Mirrors/Awoo-Installer
2
0
Fork 0
mirror of https://github.com/Huntereb/Awoo-Installer synced 2024-11-26 21:50:26 +00:00
Code Issues Projects Releases Packages Wiki Activity

Don't mention NSP specifically if possible

Browse source
This commit is contained in:
Huntereb 2019-11-16 13:16:47 -05:00
parent 86f2d685d5
commit 33e9e59f2a
6 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
source/netInstall.cpp
View file

@ -240,7 +240,7 @@ namespace netInstStuff{
} }
if (kDown & KEY_X) if (kDown & KEY_X)
{ {
inst::ui::mainApp->CreateShowDialog("Help", "NSP and NSZ files can be installed remotely from your other devices\nusing tools such as ns-usbloader or Fluffy. To send these files to your\nSwitch, simply open one of the pieces of software recomended above on\nyour PC or mobile device, input your Switch's IP address\n(listed on-screen), select your NSP and NSZ files, then upload to your\nconsole! If the software you're using won't let you select NSZ files,\ntry renaming the extension from NSZ to NSP.\n\nIf you can't figure it out, just copy the NSP or NSZ file to your SD\ncard and try the \"Install NSP from SD Card\" option on the main menu!", {"OK"}, true); inst::ui::mainApp->CreateShowDialog("Help", "Files can be installed remotely from your other devices using tools such\nas ns-usbloader or Fluffy. To send these files to your Switch, simply\nopen one of the pieces of software recomended above on your PC or mobile\ndevice, input your Switch's IP address (listed on-screen), select your\nfiles, then upload to your console! If the software you're using won't\nlet you select specific file types, try renaming the extension to\nsomething it accepts. Awoo Installer doesn't care about file extensions!\n\nIf you can't figure it out, just copy your files to your SD card and try\nthe \"Install from SD Card\" option on the main menu!", {"OK"}, true);
} }
struct sockaddr_in client; struct sockaddr_in client;

4
source/nspInstall.cpp
View file

@ -143,7 +143,7 @@ namespace nspInstStuff {
inst::ui::setInstBarPerc(100); inst::ui::setInstBarPerc(100);
if (ourNspList.size() > 1) { if (ourNspList.size() > 1) {
if (inst::config::deletePrompt) { if (inst::config::deletePrompt) {
if(inst::ui::mainApp->CreateShowDialog(std::to_string(ourNspList.size()) + " files installed successfully! Delete them from the SD card?", "NSP and NSZ files aren't needed anymore after they've been installed", {"No","Yes"}, false) == 1) { if(inst::ui::mainApp->CreateShowDialog(std::to_string(ourNspList.size()) + " files installed successfully! Delete them from the SD card?", "Installable files aren't needed anymore after they've been installed", {"No","Yes"}, false) == 1) {
for (long unsigned int i = 0; i < ourNspList.size(); i++) { for (long unsigned int i = 0; i < ourNspList.size(); i++) {
if (std::filesystem::exists(ourNspList[i])) std::filesystem::remove(ourNspList[i]); if (std::filesystem::exists(ourNspList[i])) std::filesystem::remove(ourNspList[i]);
} }
@ -151,7 +151,7 @@ namespace nspInstStuff {
} else inst::ui::mainApp->CreateShowDialog(std::to_string(ourNspList.size()) + " files installed successfully!", nspInstStuff::finishedMessage(), {"OK"}, true); } else inst::ui::mainApp->CreateShowDialog(std::to_string(ourNspList.size()) + " files installed successfully!", nspInstStuff::finishedMessage(), {"OK"}, true);
} else { } else {
if (inst::config::deletePrompt) { if (inst::config::deletePrompt) {
if(inst::ui::mainApp->CreateShowDialog(inst::util::shortenString(ourNspList[0].string().erase(0, 6), 32, true) + " installed! Delete it from the SD card?", "NSP and NSZ files aren't needed anymore after they've been installed", {"No","Yes"}, false) == 1) if (std::filesystem::exists(ourNspList[0])) std::filesystem::remove(ourNspList[0]); if(inst::ui::mainApp->CreateShowDialog(inst::util::shortenString(ourNspList[0].string().erase(0, 6), 32, true) + " installed! Delete it from the SD card?", "Installable files aren't needed anymore after they've been installed", {"No","Yes"}, false) == 1) if (std::filesystem::exists(ourNspList[0])) std::filesystem::remove(ourNspList[0]);
} else inst::ui::mainApp->CreateShowDialog(inst::util::shortenString(ourNspList[0].string().erase(0, 6), 42, true) + " installed!", nspInstStuff::finishedMessage(), {"OK"}, true); } else inst::ui::mainApp->CreateShowDialog(inst::util::shortenString(ourNspList[0].string().erase(0, 6), 42, true) + " installed!", nspInstStuff::finishedMessage(), {"OK"}, true);
} }
} }

6
source/ui/mainPage.cpp
View file

@ -23,10 +23,10 @@ namespace inst::ui {
this->optionMenu = pu::ui::elm::Menu::New(0, 93, 1280, COLOR("#67000000"), 113, (567 / 113)); this->optionMenu = pu::ui::elm::Menu::New(0, 93, 1280, COLOR("#67000000"), 113, (567 / 113));
this->optionMenu->SetOnFocusColor(COLOR("#00000033")); this->optionMenu->SetOnFocusColor(COLOR("#00000033"));
this->optionMenu->SetScrollbarColor(COLOR("#170909FF")); this->optionMenu->SetScrollbarColor(COLOR("#170909FF"));
this->installMenuItem = pu::ui::elm::MenuItem::New("Install NSP from SD Card"); this->installMenuItem = pu::ui::elm::MenuItem::New("Install from SD Card");
this->installMenuItem->SetColor(COLOR("#FFFFFFFF")); this->installMenuItem->SetColor(COLOR("#FFFFFFFF"));
this->installMenuItem->SetIcon("romfs:/micro-sd.png"); this->installMenuItem->SetIcon("romfs:/micro-sd.png");
this->netInstallMenuItem = pu::ui::elm::MenuItem::New("Install NSP Over LAN or Internet"); this->netInstallMenuItem = pu::ui::elm::MenuItem::New("Install Over LAN or Internet");
this->netInstallMenuItem->SetColor(COLOR("#FFFFFFFF")); this->netInstallMenuItem->SetColor(COLOR("#FFFFFFFF"));
this->netInstallMenuItem->SetIcon("romfs:/cloud-download.png"); this->netInstallMenuItem->SetIcon("romfs:/cloud-download.png");
this->sigPatchesMenuItem = pu::ui::elm::MenuItem::New("Manage Signature Patches"); this->sigPatchesMenuItem = pu::ui::elm::MenuItem::New("Manage Signature Patches");
@ -62,7 +62,7 @@ namespace inst::ui {
mainApp->nspinstPage->drawMenuItems(true); mainApp->nspinstPage->drawMenuItems(true);
mainApp->LoadLayout(mainApp->nspinstPage); mainApp->LoadLayout(mainApp->nspinstPage);
} else { } else {
mainApp->CreateShowDialog("No NSP or NSZ files found!", "Copy them to the root of your SD card!", {"OK"}, true); mainApp->CreateShowDialog("No installable files found!", "Copy NSP or NSZ files to the root of your SD card!", {"OK"}, true);
} }
} }

4
source/ui/netInstPage.cpp
View file

@ -114,8 +114,8 @@ namespace inst::ui {
netInstPage::startNetwork(); netInstPage::startNetwork();
return; return;
} else { } else {
this->pageInfoText->SetText("Select NSP files to install from the server, then press the Plus button!"); this->pageInfoText->SetText("Select what you want to install from the server, then press the Plus button!");
this->butText->SetText("\ue0e0 Select NSP \ue0e3 Select All \ue0ef Install NSP(s) \ue0e1 Cancel "); this->butText->SetText("\ue0e0 Select File \ue0e3 Select All \ue0ef Install File(s) \ue0e1 Cancel ");
netInstPage::drawMenuItems(true); netInstPage::drawMenuItems(true);
} }
this->menu->SetVisible(true); this->menu->SetVisible(true);

4
source/ui/nspInstPage.cpp
View file

@ -23,9 +23,9 @@ namespace inst::ui {
this->titleImage = Image::New(0, 0, "romfs:/logo.png"); this->titleImage = Image::New(0, 0, "romfs:/logo.png");
this->appVersionText = TextBlock::New(480, 49, "v" + inst::config::appVersion, 22); this->appVersionText = TextBlock::New(480, 49, "v" + inst::config::appVersion, 22);
this->appVersionText->SetColor(COLOR("#FFFFFFFF")); this->appVersionText->SetColor(COLOR("#FFFFFFFF"));
this->pageInfoText = TextBlock::New(10, 109, "Select NSP files to install, then press the Plus button!", 30); this->pageInfoText = TextBlock::New(10, 109, "Select what you want to install, then press the Plus button!", 30);
this->pageInfoText->SetColor(COLOR("#FFFFFFFF")); this->pageInfoText->SetColor(COLOR("#FFFFFFFF"));
this->butText = TextBlock::New(10, 678, "\ue0e0 Select NSP \ue0e3 Select All \ue0ef Install NSP(s) \ue0e2 Help \ue0e1 Cancel ", 24); this->butText = TextBlock::New(10, 678, "\ue0e0 Select File \ue0e3 Select All \ue0ef Install File(s) \ue0e2 Help \ue0e1 Cancel ", 24);
this->butText->SetColor(COLOR("#FFFFFFFF")); this->butText->SetColor(COLOR("#FFFFFFFF"));
this->menu = pu::ui::elm::Menu::New(0, 154, 1280, COLOR("#FFFFFF00"), 84, (506 / 84)); this->menu = pu::ui::elm::Menu::New(0, 154, 1280, COLOR("#FFFFFF00"), 84, (506 / 84));
this->menu->SetOnFocusColor(COLOR("#00000033")); this->menu->SetOnFocusColor(COLOR("#00000033"));

2
source/ui/optionsPage.cpp
View file

@ -12,7 +12,7 @@
namespace inst::ui { namespace inst::ui {
extern MainApplication *mainApp; extern MainApplication *mainApp;
std::vector<std::string> ourMenuEntries = {"Ignore minimum firmware version required by NSP files", "Verify NCA signatures before installation", "Ask to delete NSP files after installation", "Remove anime", "Signature patches source URL: "}; std::vector<std::string> ourMenuEntries = {"Ignore minimum firmware version required by titles", "Verify NCA signatures before installation", "Ask to delete installable files after installation", "Remove anime", "Signature patches source URL: "};
optionsPage::optionsPage() : Layout::Layout() { optionsPage::optionsPage() : Layout::Layout() {
this->SetBackgroundColor(COLOR("#670000FF")); this->SetBackgroundColor(COLOR("#670000FF"));