remove egg

This commit is contained in:
nyyu 2021-09-05 13:14:33 +02:00
parent 2a1feebe79
commit 941e561eba
8 changed files with 10 additions and 76 deletions

View File

@ -31,6 +31,5 @@ namespace inst::ui {
pu::ui::elm::MenuItem::Ref sigPatchesMenuItem;
pu::ui::elm::MenuItem::Ref settingsMenuItem;
pu::ui::elm::MenuItem::Ref exitMenuItem;
Image::Ref eggImage;
};
}

Binary file not shown.

Before

Width:  |  Height:  |  Size: 364 KiB

View File

@ -14,14 +14,8 @@ namespace inst::ui {
else this->SetBackgroundImage("romfs:/images/background.jpg");
this->topRect = Rectangle::New(0, 0, 1280, 94, COLOR("#170909FF"));
this->infoRect = Rectangle::New(0, 95, 1280, 60, COLOR("#17090980"));
if (inst::config::gayMode) {
this->titleImage = Image::New(-113, 0, "romfs:/images/logo.png");
this->appVersionText = TextBlock::New(367, 49, "v" + inst::config::appVersion);
}
else {
this->titleImage = Image::New(0, 0, "romfs:/images/logo.png");
this->appVersionText = TextBlock::New(480, 49, "v" + inst::config::appVersion);
}
this->titleImage = Image::New(0, 0, "romfs:/images/logo.png");
this->appVersionText = TextBlock::New(480, 49, "v" + inst::config::appVersion);
this->appVersionText->SetColor(COLOR("#FFFFFFFF"));
this->pageInfoText = TextBlock::New(10, 109, "");
this->pageInfoText->SetColor(COLOR("#FFFFFFFF"));

View File

@ -40,14 +40,8 @@ namespace inst::ui {
else this->SetBackgroundImage("romfs:/images/background.jpg");
this->topRect = Rectangle::New(0, 0, 1280, 94, COLOR("#170909FF"));
this->botRect = Rectangle::New(0, 659, 1280, 61, COLOR("#17090980"));
if (inst::config::gayMode) {
this->titleImage = Image::New(-113, 0, "romfs:/images/logo.png");
this->appVersionText = TextBlock::New(367, 49, "v" + inst::config::appVersion);
}
else {
this->titleImage = Image::New(0, 0, "romfs:/images/logo.png");
this->appVersionText = TextBlock::New(480, 49, "v" + inst::config::appVersion);
}
this->titleImage = Image::New(0, 0, "romfs:/images/logo.png");
this->appVersionText = TextBlock::New(480, 49, "v" + inst::config::appVersion);
this->appVersionText->SetColor(COLOR("#FFFFFFFF"));
this->butText = TextBlock::New(10, 678, "main.buttons"_lang);
this->butText->SetColor(COLOR("#FFFFFFFF"));
@ -74,7 +68,6 @@ namespace inst::ui {
this->exitMenuItem->SetIcon("romfs:/images/icons/exit-run.png");
if (std::filesystem::exists(inst::config::appDir + "/awoo_main.png")) this->awooImage = Image::New(410, 190, inst::config::appDir + "/awoo_main.png");
else this->awooImage = Image::New(410, 190, "romfs:/images/awoos/5bbdbcf9a5625cd307c9e9bc360d78bd.png");
this->eggImage = Image::New(410, 190, "romfs:/images/awoos/a8cb40e465dadaf9708c9b1896777ce6.png");
this->Add(this->topRect);
this->Add(this->botRect);
this->Add(this->titleImage);
@ -88,9 +81,7 @@ namespace inst::ui {
this->optionMenu->AddItem(this->exitMenuItem);
this->Add(this->optionMenu);
this->Add(this->awooImage);
this->Add(this->eggImage);
this->awooImage->SetVisible(!inst::config::gayMode);
this->eggImage->SetVisible(false);
this->AddThread(mainMenuThread);
}
@ -161,13 +152,5 @@ namespace inst::ui {
break;
}
}
if (Down & HidNpadButton_X) {
this->awooImage->SetVisible(false);
this->eggImage->SetVisible(true);
}
if (Up & HidNpadButton_X) {
this->eggImage->SetVisible(false);
if (!inst::config::gayMode) this->awooImage->SetVisible(true);
}
}
}

View File

@ -24,14 +24,8 @@ namespace inst::ui {
this->topRect = Rectangle::New(0, 0, 1280, 94, COLOR("#170909FF"));
this->infoRect = Rectangle::New(0, 95, 1280, 60, COLOR("#17090980"));
this->botRect = Rectangle::New(0, 660, 1280, 60, COLOR("#17090980"));
if (inst::config::gayMode) {
this->titleImage = Image::New(-113, 0, "romfs:/images/logo.png");
this->appVersionText = TextBlock::New(367, 49, "v" + inst::config::appVersion);
}
else {
this->titleImage = Image::New(0, 0, "romfs:/images/logo.png");
this->appVersionText = TextBlock::New(480, 49, "v" + inst::config::appVersion);
}
this->titleImage = Image::New(0, 0, "romfs:/images/logo.png");
this->appVersionText = TextBlock::New(480, 49, "v" + inst::config::appVersion);
this->appVersionText->SetColor(COLOR("#FFFFFFFF"));
this->pageInfoText = TextBlock::New(10, 109, "");
this->pageInfoText->SetColor(COLOR("#FFFFFFFF"));

View File

@ -191,35 +191,11 @@ namespace inst::ui {
inst::config::gayMode = false;
mainApp->mainPage->awooImage->SetVisible(true);
mainApp->instpage->awooImage->SetVisible(true);
mainApp->instpage->titleImage->SetX(0);
mainApp->instpage->appVersionText->SetX(480);
mainApp->mainPage->titleImage->SetX(0);
mainApp->mainPage->appVersionText->SetX(480);
mainApp->netinstPage->titleImage->SetX(0);
mainApp->netinstPage->appVersionText->SetX(480);
mainApp->optionspage->titleImage->SetX(0);
mainApp->optionspage->appVersionText->SetX(480);
mainApp->sdinstPage->titleImage->SetX(0);
mainApp->sdinstPage->appVersionText->SetX(480);
mainApp->usbinstPage->titleImage->SetX(0);
mainApp->usbinstPage->appVersionText->SetX(480);
}
else {
inst::config::gayMode = true;
mainApp->mainPage->awooImage->SetVisible(false);
mainApp->instpage->awooImage->SetVisible(false);
mainApp->instpage->titleImage->SetX(-113);
mainApp->instpage->appVersionText->SetX(367);
mainApp->mainPage->titleImage->SetX(-113);
mainApp->mainPage->appVersionText->SetX(367);
mainApp->netinstPage->titleImage->SetX(-113);
mainApp->netinstPage->appVersionText->SetX(367);
mainApp->optionspage->titleImage->SetX(-113);
mainApp->optionspage->appVersionText->SetX(367);
mainApp->sdinstPage->titleImage->SetX(-113);
mainApp->sdinstPage->appVersionText->SetX(367);
mainApp->usbinstPage->titleImage->SetX(-113);
mainApp->usbinstPage->appVersionText->SetX(367);
}
inst::config::setConfig();
this->setMenuText();

View File

@ -19,14 +19,8 @@ namespace inst::ui {
this->topRect = Rectangle::New(0, 0, 1280, 94, COLOR("#170909FF"));
this->infoRect = Rectangle::New(0, 95, 1280, 60, COLOR("#17090980"));
this->botRect = Rectangle::New(0, 660, 1280, 60, COLOR("#17090980"));
if (inst::config::gayMode) {
this->titleImage = Image::New(-113, 0, "romfs:/images/logo.png");
this->appVersionText = TextBlock::New(367, 49, "v" + inst::config::appVersion);
}
else {
this->titleImage = Image::New(0, 0, "romfs:/images/logo.png");
this->appVersionText = TextBlock::New(480, 49, "v" + inst::config::appVersion);
}
this->titleImage = Image::New(0, 0, "romfs:/images/logo.png");
this->appVersionText = TextBlock::New(480, 49, "v" + inst::config::appVersion);
this->appVersionText->SetColor(COLOR("#FFFFFFFF"));
this->pageInfoText = TextBlock::New(10, 109, "inst.sd.top_info"_lang);
this->pageInfoText->SetColor(COLOR("#FFFFFFFF"));

View File

@ -19,14 +19,8 @@ namespace inst::ui {
this->topRect = Rectangle::New(0, 0, 1280, 94, COLOR("#170909FF"));
this->infoRect = Rectangle::New(0, 95, 1280, 60, COLOR("#17090980"));
this->botRect = Rectangle::New(0, 660, 1280, 60, COLOR("#17090980"));
if (inst::config::gayMode) {
this->titleImage = Image::New(-113, 0, "romfs:/images/logo.png");
this->appVersionText = TextBlock::New(367, 49, "v" + inst::config::appVersion);
}
else {
this->titleImage = Image::New(0, 0, "romfs:/images/logo.png");
this->appVersionText = TextBlock::New(480, 49, "v" + inst::config::appVersion);
}
this->titleImage = Image::New(0, 0, "romfs:/images/logo.png");
this->appVersionText = TextBlock::New(480, 49, "v" + inst::config::appVersion);
this->appVersionText->SetColor(COLOR("#FFFFFFFF"));
this->pageInfoText = TextBlock::New(10, 109, "");
this->pageInfoText->SetColor(COLOR("#FFFFFFFF"));