From 69da0e6e9b10c08a660f6d807b400a1a800773f4 Mon Sep 17 00:00:00 2001 From: flb Date: Fri, 29 Jan 2021 22:14:40 +0100 Subject: [PATCH] minor graphical tweaks --- .gitignore | 1 + Makefile | 2 +- aiosu-forwarder/source/main.cpp | 1 - resources/gui_icon.png | Bin 0 -> 655 bytes resources/i18n/en-US/menus.json | 2 ++ source/changelog_page.cpp | 3 +++ source/main_frame.cpp | 6 ++++-- source/tools_tab.cpp | 3 ++- 8 files changed, 13 insertions(+), 5 deletions(-) create mode 100644 resources/gui_icon.png diff --git a/.gitignore b/.gitignore index 230579c..5a9878b 100644 --- a/.gitignore +++ b/.gitignore @@ -9,6 +9,7 @@ switch/ *.zip *.bin *.nsp +*.psd resources/i18n/zh-Hans resources/i18n/zh-Hant resources/i18n/en-GB diff --git a/Makefile b/Makefile index 3cc3510..7a05b55 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.0 +APP_VERSION := 1.5.1 TARGET := $(notdir $(CURDIR)) ROMFS := resources diff --git a/aiosu-forwarder/source/main.cpp b/aiosu-forwarder/source/main.cpp index f96da37..c24dd17 100644 --- a/aiosu-forwarder/source/main.cpp +++ b/aiosu-forwarder/source/main.cpp @@ -1,6 +1,5 @@ #include #include -#include #include diff --git a/resources/gui_icon.png b/resources/gui_icon.png new file mode 100644 index 0000000000000000000000000000000000000000..63e9226883cdd42e4df1511101ba64352deeb36d GIT binary patch literal 655 zcmV;A0&x9_P)EX>4Tx04R}tkvmAkP!xv$wu&MZ2Q!E$WN4i%h%X$q3Pq?8YK2xEOm6yuCJjl7 zi=*ILaPYBMb#QUk)xlK|1Ro%7Zcd6WQsTKup+$@bF8AZV=l{9)Tp(C4GtKH412o+> zQ;E2k$*ziBuLxim0-~6bnPtpLQWC!Pbx++?cQKyj-}h(rsyT}R0g-r?8KzCVK|H-_ z8=Uuv1y+<*;&b9rlP*a7$aTfzH_io@gFI6()2Vr4fmkfGvC_t@Xllfh#1U1~DLL;hes*%yn8rNMI35kRU=q6(y8mBSyPUiiH%N$9?>Ru3sXTLaq`R zITlcX2HEw4|H1FsTKS1_FDV=cI$s>;BMNlw0*#vEd>=bb;{*sj16O*>U#SB#pQP7X zTI2}m+XgPKTbi;5Tc`ta)>5p5ycZNYkv6H^9Lm zFjAoGb)R>4x6ke0p62|10LoHw%G2F1`~Uy|24YJ`L;x266#y2+x+Et6000SaNLh0L z04^f{04^f|c%?sf00007bV*G`2ju}B6fOyTx;#e!000?uMObu0Z*6U5Zgc=ca%Ew3 zWn>_CX>@2HM@dakSAh-}0001HNkl|Hhg^Y!~wgCWuA8h7efC= 0; i--){ diff --git a/source/main_frame.cpp b/source/main_frame.cpp index 946bbca..07a7e58 100644 --- a/source/main_frame.cpp +++ b/source/main_frame.cpp @@ -8,8 +8,10 @@ MainFrame::MainFrame() : TabFrame() std::string tag = getLatestTag(TAGS_INFO); if(!tag.empty() && tag != APP_VERSION) setTitle(std::string(APP_TITLE) + "menus/main_app"_i18n ); - else - setTitle(std::string(APP_TITLE) + "menus/main_v"_i18n + std::string(APP_VERSION)); + /* else + setTitle(std::string(APP_TITLE) + "menus/main_v"_i18n + std::string(APP_VERSION)); */ + this->setIcon("romfs:/gui_icon.png"); + this->setFooterText("v" + std::string(APP_VERSION)); this->addTab("menus/main_about"_i18n , new AboutTab()); diff --git a/source/tools_tab.cpp b/source/tools_tab.cpp index 16823d2..d55ab2f 100644 --- a/source/tools_tab.cpp +++ b/source/tools_tab.cpp @@ -123,7 +123,8 @@ ToolsTab::ToolsTab(std::string tag) : brls::List() cleanUp->setHeight(LISTITEM_HEIGHT); this->addView(cleanUp); - //tag = "1.TEST"; + //tag = "1.TEST" + //std::cout << "tag: " << tag << std::endl; if(!tag.empty() && tag != APP_VERSION){ updateApp = new brls::ListItem("menus/tool_update"_i18n + tag +")"); std::string text("menus/tool_DownLoad"_i18n + std::string(APP_URL));