diff --git a/Makefile b/Makefile index caaf866..55df082 100644 --- a/Makefile +++ b/Makefile @@ -22,7 +22,7 @@ DATA := data INCLUDES := include lib/zipper/include APP_TITLE := All-in-One Switch Updater APP_AUTHOR := HamletDuFromage -APP_VERSION := 1.5.2 +APP_VERSION := 1.5.3 TARGET := $(notdir $(CURDIR)) ROMFS := resources diff --git a/include/JC_color_swapper.hpp b/include/JC_color_swapper.hpp index d5181df..b6d68ab 100644 --- a/include/JC_color_swapper.hpp +++ b/include/JC_color_swapper.hpp @@ -5,7 +5,6 @@ #include #include #include -#include #include #include diff --git a/include/PC_color_swapper.hpp b/include/PC_color_swapper.hpp index d3c5105..dfc9d03 100644 --- a/include/PC_color_swapper.hpp +++ b/include/PC_color_swapper.hpp @@ -5,7 +5,6 @@ #include #include #include -#include #include #include diff --git a/include/app_page.hpp b/include/app_page.hpp index fdeb28f..41e1ad7 100644 --- a/include/app_page.hpp +++ b/include/app_page.hpp @@ -2,11 +2,9 @@ #include #include -#include #include "utils.hpp" #include #include -#include #include #include "worker_page.hpp" diff --git a/include/download.hpp b/include/download.hpp index 5450591..3057f2b 100644 --- a/include/download.hpp +++ b/include/download.hpp @@ -3,18 +3,12 @@ #define ON 1 #define OFF 0 -#include -#include -#include -#include -#include #include #include #include #include #include -#include #include diff --git a/include/exclude_page.hpp b/include/exclude_page.hpp index 091c1c5..b68b06d 100644 --- a/include/exclude_page.hpp +++ b/include/exclude_page.hpp @@ -2,11 +2,9 @@ #include #include -#include #include "utils.hpp" #include #include -#include #include #include #include @@ -22,7 +20,6 @@ class ExcludePage : public brls::AppletFrame brls::ListItem* save; std::vector apps; std::set titles; - //std::vector items; std::tuple, std::vector> items; public: diff --git a/include/extract.hpp b/include/extract.hpp index 3150872..50a3d5d 100644 --- a/include/extract.hpp +++ b/include/extract.hpp @@ -5,15 +5,10 @@ #include #include #include -#include #include #include -#include -#include #include -#include #include -#include #include #include diff --git a/source/dialogue_page.cpp b/source/dialogue_page.cpp index b56d9a9..73914d5 100644 --- a/source/dialogue_page.cpp +++ b/source/dialogue_page.cpp @@ -18,7 +18,6 @@ DialoguePage::DialoguePage(brls::StagedAppletFrame* frame, std::string text) }); this->button2->getClickEvent()->subscribe([frame, this](View* view) { - std::cout << "rebootin" << std::endl; reboot_to_payload(RCM_PAYLOAD_PATH); brls::Application::popView(); }); diff --git a/source/main.cpp b/source/main.cpp index d7331b2..057c8ba 100644 --- a/source/main.cpp +++ b/source/main.cpp @@ -8,18 +8,6 @@ #include "main_frame.hpp" #include "constants.hpp" #include "utils.hpp" - - -//#include -//#include -#include -#include -#include -#include -#include - -#include -#include namespace i18n = brls::i18n; using namespace i18n::literals; diff --git a/source/main_frame.cpp b/source/main_frame.cpp index 1b864d2..e3d5fc6 100644 --- a/source/main_frame.cpp +++ b/source/main_frame.cpp @@ -5,14 +5,15 @@ using namespace i18n::literals; MainFrame::MainFrame() : TabFrame() { + this->setIcon("romfs:/gui_icon.png"); + this->setTitle(std::string(APP_TITLE)); + std::string tag = getLatestTag(TAGS_INFO); if(!tag.empty() && tag != APP_VERSION) - setTitle(std::string(APP_TITLE) + "menus/main_app"_i18n ); + this->setFooterText("v" + std::string(APP_VERSION) + "menus/main_app"_i18n ); else - setTitle(std::string(APP_TITLE)); - this->setIcon("romfs:/gui_icon.png"); - this->setFooterText("v" + std::string(APP_VERSION)); - + this->setFooterText("v" + std::string(APP_VERSION)); + this->addTab("menus/main_about"_i18n , new AboutTab()); //this->addSeparator();