Team-Neptune/NSAInstaller
1
0
Fork 0
mirror of https://github.com/Team-Neptune/NSAInstaller.git synced 2024-12-04 02:42:13 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Added HookedBehemoth's plutonium fork for system font symbols

Browse Source
This commit is contained in:
Huntereb 2019-10-28 21:00:50 -04:00
parent 074491ff0e
commit 40224c7955
6 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitmodules vendored Normal file → Executable file
View File

@ -1,3 +1,3 @@
[submodule "include/Plutonium"] [submodule "include/Plutonium"]
path = include/Plutonium path = include/Plutonium
url = https://github.com/XorTroll/Plutonium url = https://github.com/HookedBehemoth/Plutonium

4
Makefile
View File

@ -41,7 +41,7 @@ TARGET := $(notdir $(CURDIR))
BUILD := build BUILD := build
SOURCES := source source/ui source/data source/install source/nx source/nx/ipc source/util SOURCES := source source/ui source/data source/install source/nx source/nx/ipc source/util
DATA := data DATA := data
INCLUDES := include include/ui include/data include/install include/nx include/nx/ipc include/util INCLUDES := include include/ui include/data include/install include/nx include/nx/ipc include/util include/Plutonium/Plutonium/Output-switch/include
APP_TITLE := Awoo Installer APP_TITLE := Awoo Installer
APP_AUTHOR := Huntereb APP_AUTHOR := Huntereb
APP_VERSION := 0.0.1 APP_VERSION := 0.0.1
@ -68,7 +68,7 @@ LIBS := -lcurl -lz -lmbedtls -lmbedcrypto -lmbedx509 -lminizip -lnx -lstdc++fs
# list of directories containing libraries, this must be the top level containing # list of directories containing libraries, this must be the top level containing
# include and lib # include and lib
#--------------------------------------------------------------------------------- #---------------------------------------------------------------------------------
LIBDIRS := $(PORTLIBS) $(LIBNX) $(CURDIR)/include/Plutonium/Plutonium/Output LIBDIRS := $(PORTLIBS) $(LIBNX) $(CURDIR)/include/Plutonium/Plutonium/Output-switch
#--------------------------------------------------------------------------------- #---------------------------------------------------------------------------------

2
source/ui/mainPage.cpp
View File

@ -16,7 +16,7 @@ namespace inst::ui {
this->topRect = Rectangle::New(0, 0, 1280, 93, COLOR("#170909FF")); this->topRect = Rectangle::New(0, 0, 1280, 93, COLOR("#170909FF"));
this->botRect = Rectangle::New(0, 660, 1280, 60, COLOR("#17090980")); this->botRect = Rectangle::New(0, 660, 1280, 60, COLOR("#17090980"));
this->titleImage = Image::New(0, 0, "romfs:/logo.png"); this->titleImage = Image::New(0, 0, "romfs:/logo.png");
this->butText = TextBlock::New(10, 676, "(A)-Select (B)-Exit", 30); this->butText = TextBlock::New(10, 678, "\ue0e0 Select \ue0e1 Exit ", 24);
this->butText->SetColor(COLOR("#FFFFFFFF")); this->butText->SetColor(COLOR("#FFFFFFFF"));
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"));

6
source/ui/netInstPage.cpp
View File

@ -21,7 +21,7 @@ namespace inst::ui {
this->titleImage = Image::New(0, 0, "romfs:/logo.png"); this->titleImage = Image::New(0, 0, "romfs:/logo.png");
this->pageInfoText = TextBlock::New(10, 109, "", 30); this->pageInfoText = TextBlock::New(10, 109, "", 30);
this->pageInfoText->SetColor(COLOR("#FFFFFFFF")); this->pageInfoText->SetColor(COLOR("#FFFFFFFF"));
this->butText = TextBlock::New(10, 676, "", 30); this->butText = TextBlock::New(10, 678, "", 24);
this->butText->SetColor(COLOR("#FFFFFFFF")); this->butText->SetColor(COLOR("#FFFFFFFF"));
this->menu = pu::ui::elm::Menu::New(0, 153, 1280, COLOR("#FFFFFF00"), 84, (506 / 84)); this->menu = pu::ui::elm::Menu::New(0, 153, 1280, COLOR("#FFFFFF00"), 84, (506 / 84));
this->menu->SetOnFocusColor(COLOR("#00000033")); this->menu->SetOnFocusColor(COLOR("#00000033"));
@ -37,7 +37,7 @@ namespace inst::ui {
void netInstPage::startNetwork() { void netInstPage::startNetwork() {
this->pageInfoText->SetText(""); this->pageInfoText->SetText("");
this->butText->SetText("(B)-Cancel (Y)-Install From URL"); this->butText->SetText("\ue0e1 Cancel \ue0e3 Install From URL ");
this->menu->SetVisible(false); this->menu->SetVisible(false);
this->menu->ClearItems(); this->menu->ClearItems();
mainApp->LoadLayout(mainApp->netinstPage); mainApp->LoadLayout(mainApp->netinstPage);
@ -67,7 +67,7 @@ namespace inst::ui {
} }
} else { } else {
this->pageInfoText->SetText("Select a NSP to install!"); this->pageInfoText->SetText("Select a NSP to install!");
this->butText->SetText("(A)-Install NSP (B)-Cancel"); this->butText->SetText("\ue0e0 Install NSP \ue0e1 Cancel ");
for (auto& url: ourUrls) { for (auto& url: ourUrls) {
pu::String itm = inst::util::shortenString(inst::util::formatUrlString(url), 64, true); pu::String itm = inst::util::shortenString(inst::util::formatUrlString(url), 64, true);
auto ourEntry = pu::ui::elm::MenuItem::New(itm); auto ourEntry = pu::ui::elm::MenuItem::New(itm);

2
source/ui/nspInstPage.cpp
View File

@ -21,7 +21,7 @@ namespace inst::ui {
this->titleImage = Image::New(0, 0, "romfs:/logo.png"); this->titleImage = Image::New(0, 0, "romfs:/logo.png");
this->pageInfoText = TextBlock::New(10, 109, "Select a NSP to install! Put NSP files on the root of your SD!", 30); this->pageInfoText = TextBlock::New(10, 109, "Select a NSP to install! Put NSP files on the root of your SD!", 30);
this->pageInfoText->SetColor(COLOR("#FFFFFFFF")); this->pageInfoText->SetColor(COLOR("#FFFFFFFF"));
this->butText = TextBlock::New(10, 676, "(A)-Install NSP (B)-Cancel", 30); this->butText = TextBlock::New(10, 678, "\ue0e0 Install NSP \ue0e1 Cancel ", 24);
this->butText->SetColor(COLOR("#FFFFFFFF")); this->butText->SetColor(COLOR("#FFFFFFFF"));
this->menu = pu::ui::elm::Menu::New(0, 153, 1280, COLOR("#FFFFFF00"), 84, (506 / 84)); this->menu = pu::ui::elm::Menu::New(0, 153, 1280, COLOR("#FFFFFF00"), 84, (506 / 84));
this->menu->SetOnFocusColor(COLOR("#00000033")); this->menu->SetOnFocusColor(COLOR("#00000033"));

2
source/ui/optionsPage.cpp
View File

@ -22,7 +22,7 @@ namespace inst::ui {
this->titleImage = Image::New(0, 0, "romfs:/logo.png"); this->titleImage = Image::New(0, 0, "romfs:/logo.png");
this->pageInfoText = TextBlock::New(10, 109, "Change Awoo Installer's settings!", 30); this->pageInfoText = TextBlock::New(10, 109, "Change Awoo Installer's settings!", 30);
this->pageInfoText->SetColor(COLOR("#FFFFFFFF")); this->pageInfoText->SetColor(COLOR("#FFFFFFFF"));
this->butText = TextBlock::New(10, 676, "(A)-Toggle (B)-Cancel", 30); this->butText = TextBlock::New(10, 678, "\ue0e0 Change \ue0e1 Cancel ", 24);
this->butText->SetColor(COLOR("#FFFFFFFF")); this->butText->SetColor(COLOR("#FFFFFFFF"));
this->menu = pu::ui::elm::Menu::New(0, 153, 1280, COLOR("#FFFFFF00"), 84, (506 / 84)); this->menu = pu::ui::elm::Menu::New(0, 153, 1280, COLOR("#FFFFFF00"), 84, (506 / 84));
this->menu->SetOnFocusColor(COLOR("#00000033")); this->menu->SetOnFocusColor(COLOR("#00000033"));