nyyu/Awoo-Installer
Archived
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #24 from Huntereb/plutonium

Browse Source 
update submodule
This commit is contained in:
Huntereb 2020-01-03 16:39:31 +00:00 committed by GitHub
commit 0dcf9d0d5a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
10 changed files with 37 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Makefile
View File

@ -69,7 +69,7 @@ LIBS := -lcurl -lz -lmbedtls -lmbedcrypto -lmbedx509 -lminizip -lnx -lstdc++fs
# list of directories containing libraries, this must be the top level containing
# include and lib
#---------------------------------------------------------------------------------
LIBDIRS := $(PORTLIBS) $(LIBNX) $(CURDIR)/include/Plutonium/Plutonium/Output-switch
LIBDIRS := $(PORTLIBS) $(LIBNX) $(CURDIR)/include/Plutonium/Plutonium/Output
#---------------------------------------------------------------------------------
@ -166,8 +166,8 @@ all: $(BUILD)
$(BUILD):
@[ -d $@ ] || mkdir -p $@
#comment this out if you are hacking on the code or compilation will take for ever
$(MAKE) --no-print-directory -C include/Plutonium -f Makefile lib-switch
#comment this out if you are hacking on the code or compilation will take forever
#$(MAKE) --no-print-directory -C include/Plutonium -f Makefile lib
@$(MAKE) --no-print-directory -C $(BUILD) -f $(CURDIR)/Makefile
#---------------------------------------------------------------------------------

2
include/Plutonium

@ -1 +1 @@
Subproject commit db39ac294a8f35602f18af1b7f09ff938d302e55
Subproject commit 154bf11f5f0a855400e20c46ba7ec78134ce0192

4
include/sdInstall.hpp
View File

@ -22,7 +22,7 @@ SOFTWARE.
#pragma once
#include <filesystem>
#include <vector>
namespace nspInstStuff {
void installNspFromFile(std::vector<std::filesystem::path> ourNspList, int whereToInstall);
}
}

16
romfs/lang/de.json
View File

@ -27,7 +27,7 @@
"title": "Applet-Modus wird nicht unterstützt",
"desc": "Es kann zu Problemen bei der Verwendung des Awoo-Installers im Applet-Modus kommen.\nWenn du Probleme hast, wechsele bitte dazu über, den Awoo Installer über einen installierten Titel zu starten (halte R gedrückt, während du ein Spiel startest)!"
},
"buttons": "\ue0e0 Auswählen \ue0e1 Beenden "
"buttons": "\ue0e0 Auswählen \ue0e1 Beenden"
},
"inst": {
"net": {
@ -55,20 +55,20 @@
"failed": "Ferninstallation fehlgeschlagen!",
"transfer_interput": "Bei der Dateiübertragung ist ein Fehler aufgetreten.",
"source_string": " über das lokale Netzwerk",
"buttons": "\ue0e3 Installation über das Internet \ue0e2 Hilfe \ue0e1 Abbrechen ",
"buttons1": "\ue0e0 Datei auswählen \ue0e3 Alle auswählen \ue0ef Datei(en) auswählen \ue0e1 Abbrechen "
"buttons": "\ue0e3 Installation über das Internet \ue0e2 Hilfe \ue0e1 Abbrechen",
"buttons1": "\ue0e0 Datei auswählen \ue0e3 Alle auswählen \ue0ef Datei(en) installieren \ue0e1 Abbrechen"
},
"sd": {
"help": {
"title": "Hilfe",
"desc": "Kopiere NSP, NSZ, XCI, or XCZ Dateien auf deine SD Karte, stöbere nach ihnen und wähle"
"desc": "Kopiere NSP, NSZ, XCI, or XCZ Dateien auf deine SD Karte,\nstöbere nach ihnen und wähle die zu installierenden Titel aus und drücke dann \ue0b3."
},
"top_info": "Wähle Dateien zur Installation vom Server aus und drücke dann \ue0b3 !",
"top_info": "Wähle Dateien zur Installation vom Server aus und drücke dann \ue0b3!",
"source_string": " von der SD Karte",
"delete_info": " installiert! Sollen wir sie von der SD Karte löschen?",
"delete_info_multi": " Dateien erfolgreich installiert! Sollen wir sie von der SD Karte löschen?",
"delete_desc": "Die originalen Dateien werden nach der Installation nicht mehr benötigt",
"buttons": "\ue0e0 Datei auswählen \ue0e3 Alle auswählen \ue0ef Datei(en) auswählen \ue0e1 Abbrechen "
"buttons": "\ue0e0 Datei auswählen \ue0e3 Alle auswählen \ue0ef Datei(en) installieren \ue0e1 Abbrechen"
},
"usb": {
"help": {
@ -79,8 +79,8 @@
"top_info2": "Wähle Dateien zur Installation aus und drücke dann \ue0b3 !",
"error": "USB Übertragung ist zeitlich abgelaufen oder fehlgeschlagen",
"source_string": " über USB",
"buttons": "\ue0e2 (Halten) Hilfe \ue0e1 (Halte) Abbrechen ",
"buttons2": "\ue0e0 Datei auswählen \ue0e3 Alle auswählen \ue0ef Datei(en) auswählen \ue0e1 Abbrechen "
"buttons": "\ue0e2 (Halten) Hilfe \ue0e1 (Halte) Abbrechen",
"buttons2": "\ue0e0 Datei auswählen \ue0e3 Alle auswählen \ue0ef Datei(en) installieren \ue0e1 Abbrechen"
},
"target": {
"desc0": "Wo soll ",

14
romfs/lang/en.json
View File

@ -27,7 +27,7 @@
"title": "Applet Mode not supported",
"desc": "You may experience issues using Awoo Installer in Applet Mode. If you do\nhave problems, please switch to running Awoo Installer over an installed\ntitle (hold R while starting a game)!"
},
"buttons": "\ue0e0 Select \ue0e1 Exit "
"buttons": "\ue0e0 Select \ue0e1 Exit"
},
"inst": {
"net": {
@ -55,8 +55,8 @@
"failed": "Failed to perform remote install!",
"transfer_interput": "An error occured during data transfer. Check your network connection.",
"source_string": " over local network",
"buttons": "\ue0e3 Install Over Internet \ue0e2 Help \ue0e1 Cancel ",
"buttons1": "\ue0e0 Select File \ue0e3 Select All \ue0ef Install File(s) \ue0e1 Cancel "
"buttons": "\ue0e3 Install Over Internet \ue0e2 Help \ue0e1 Cancel",
"buttons1": "\ue0e0 Select File \ue0e3 Select All \ue0ef Install File(s) \ue0e1 Cancel"
},
"sd": {
"help": {
@ -68,7 +68,7 @@
"delete_info": " installed! Delete it from the SD card?",
"delete_info_multi": " files installed successfully! Delete them from the SD card?",
"delete_desc": "The original files aren't needed anymore after they've been installed",
"buttons": "\ue0e0 Select File \ue0e3 Select All \ue0ef Install File(s) \ue0e2 Help \ue0e1 Cancel "
"buttons": "\ue0e0 Select File \ue0e3 Select All \ue0ef Install File(s) \ue0e2 Help \ue0e1 Cancel"
},
"usb": {
"help": {
@ -79,8 +79,8 @@
"top_info2": "Select what files you want to install over USB, then press the Plus button!",
"error": "USB transfer timed out or failed",
"source_string": " over USB",
"buttons": "\ue0e2 (Hold) Help \ue0e1 (Hold) Cancel ",
"buttons2": "\ue0e0 Select File \ue0e3 Select All \ue0ef Install File(s) \ue0e1 Cancel "
"buttons": "\ue0e2 (Hold) Help \ue0e1 (Hold) Cancel",
"buttons2": "\ue0e0 Select File \ue0e3 Select All \ue0ef Install File(s) \ue0e1 Cancel"
},
"target": {
"desc0": "Where should ",
@ -183,7 +183,7 @@
"system_language": "System default"
},
"title": "Change Awoo Installer's settings!",
"buttons": "\ue0e0 Select/Change \ue0e1 Cancel "
"buttons": "\ue0e0 Select/Change \ue0e1 Cancel"
},
"common": {
"ok": "OK",

12
romfs/lang/ru.json
View File

@ -27,7 +27,7 @@
"title": "Applet Mode не поддерживается",
"desc": "В Awoo Installer могут возникать проблемы когда и если он запущен в режиме апплета.\nЕсли у вас есть трудности, пожалуйста запустите приложение через установленную игру\n(зажмите R при запуске)!"
},
"buttons": "\ue0e0 Выбрать \ue0e1 Выход "
"buttons": "\ue0e0 Выбрать \ue0e1 Выход"
},
"inst": {
"net": {
@ -55,8 +55,8 @@
"failed": "Не удалось выполнить установку из удалённого источника!",
"transfer_interput": "Во время передачи возникла ошибка. Проверьте ваши настройки сети.",
"source_string": " по локальной сети",
"buttons": "\ue0e3 Установка через интернет \ue0e2 Помощь \ue0e1 Отмена ",
"buttons1": "\ue0e0 Выбрать файл \ue0e3 Выбрать всё \ue0ef Установить файл(ы) \ue0e1 Отмена "
"buttons": "\ue0e3 Установка через интернет \ue0e2 Помощь \ue0e1 Отмена",
"buttons1": "\ue0e0 Выбрать файл \ue0e3 Выбрать всё \ue0ef Установить файл(ы) \ue0e1 Отмена"
},
"sd": {
"help": {
@ -79,8 +79,8 @@
"top_info2": "Выберите какие файлы вы хотите установить через USB и нажмите \"+\"!",
"error": "Передача через USB провалилась из-за ошибки или превышения времини ожидания",
"source_string": " через USB",
"buttons": "\ue0e2 (Удерж.) Помощь \ue0e1 (Удерж.) Отмена ",
"buttons2": "\ue0e0 Выбрать файл \ue0e3 Выбрать всё \ue0ef Установить файл(ы) \ue0e1 Отмена "
"buttons": "\ue0e2 (Удерж.) Помощь \ue0e1 (Удерж.) Отмена",
"buttons2": "\ue0e0 Выбрать файл \ue0e3 Выбрать всё \ue0ef Установить файл(ы) \ue0e1 Отмена"
},
"target": {
"desc0": "Куда следует установить ",
@ -183,7 +183,7 @@
"system_language": "Системный"
},
"title": "Меняйте настройки Awoo Installer!",
"buttons": "\ue0e0 Выбрать/Изменить \ue0e1 Отмена "
"buttons": "\ue0e0 Выбрать/Изменить \ue0e1 Отмена"
},
"common": {
"ok": "OK",

2
source/ui/netInstPage.cpp
View File

@ -52,7 +52,7 @@ namespace inst::ui {
if (clearItems) this->alternativeNames = {};
this->menu->ClearItems();
for (auto& url: this->ourUrls) {
pu::String itm = inst::util::shortenString(inst::util::formatUrlString(url), 56, true);
std::string itm = inst::util::shortenString(inst::util::formatUrlString(url), 56, true);
auto ourEntry = pu::ui::elm::MenuItem::New(itm);
ourEntry->SetColor(COLOR("#FFFFFFFF"));
ourEntry->SetIcon("romfs:/images/icons/checkbox-blank-outline.png");

10
source/ui/optionsPage.cpp
View File

@ -16,7 +16,7 @@
namespace inst::ui {
extern MainApplication *mainApp;
std::vector<pu::String> languageStrings = {"English", "Deutsch", "Русский"};
std::vector<std::string> languageStrings = {"English", "Deutsch", "Русский"};
optionsPage::optionsPage() : Layout::Layout() {
this->SetBackgroundColor(COLOR("#670000FF"));
@ -78,11 +78,11 @@ namespace inst::ui {
switch (ourLangCode) {
case 1:
case 12:
return languageStrings[0].AsUTF8();
return languageStrings[0];
case 3:
return languageStrings[1].AsUTF8();
return languageStrings[1];
case 10:
return languageStrings[2].AsUTF8();
return languageStrings[2];
default:
return "options.language.system_language"_lang;
}
@ -136,7 +136,7 @@ namespace inst::ui {
std::string keyboardResult;
int rc;
std::vector<std::string> downloadUrl;
std::vector<pu::String> languageList;
std::vector<std::string> languageList;
switch (this->menu->GetSelectedIndex()) {
case 0:
inst::config::ignoreReqVers = !inst::config::ignoreReqVers;

6
source/ui/sdInstPage.cpp
View File

@ -52,7 +52,7 @@ namespace inst::ui {
return;
}
if (this->currentDir != "sdmc:/") {
pu::String itm = "..";
std::string itm = "..";
auto ourEntry = pu::ui::elm::MenuItem::New(itm);
ourEntry->SetColor(COLOR("#FFFFFFFF"));
ourEntry->SetIcon("romfs:/images/icons/folder-upload.png");
@ -60,14 +60,14 @@ namespace inst::ui {
}
for (auto& file: this->ourDirectories) {
if (file == "..") break;
pu::String itm = file.filename().string();
std::string itm = file.filename().string();
auto ourEntry = pu::ui::elm::MenuItem::New(itm);
ourEntry->SetColor(COLOR("#FFFFFFFF"));
ourEntry->SetIcon("romfs:/images/icons/folder.png");
this->menu->AddItem(ourEntry);
}
for (auto& file: this->ourFiles) {
pu::String itm = file.filename().string();
std::string itm = file.filename().string();
auto ourEntry = pu::ui::elm::MenuItem::New(itm);
ourEntry->SetColor(COLOR("#FFFFFFFF"));
ourEntry->SetIcon("romfs:/images/icons/checkbox-blank-outline.png");

2
source/ui/usbInstPage.cpp
View File

@ -43,7 +43,7 @@ namespace inst::ui {
if (clearItems) this->selectedTitles = {};
this->menu->ClearItems();
for (auto& url: this->ourTitles) {
pu::String itm = inst::util::shortenString(inst::util::formatUrlString(url), 56, true);
std::string itm = inst::util::shortenString(inst::util::formatUrlString(url), 56, true);
auto ourEntry = pu::ui::elm::MenuItem::New(itm);
ourEntry->SetColor(COLOR("#FFFFFFFF"));
ourEntry->SetIcon("romfs:/images/icons/checkbox-blank-outline.png");