From 5ecf40eed6213bbe2d0eb5dcda8bda725343d8c9 Mon Sep 17 00:00:00 2001 From: robshape Date: Mon, 17 Apr 2023 20:46:54 +0200 Subject: [PATCH] style: Update strings --- makefile | 2 +- .../Tools/rg35xx/Clear Recently Played.pak/launch.sh | 5 +++++ skeleton/EXTRAS/Tools/rg35xx/ClearRecent.pak/launch.sh | 4 ---- src/clear_recent/clear_recent.c | 4 ++-- src/common/utils.c | 7 ++++++- 5 files changed, 14 insertions(+), 8 deletions(-) create mode 100755 skeleton/EXTRAS/Tools/rg35xx/Clear Recently Played.pak/launch.sh delete mode 100755 skeleton/EXTRAS/Tools/rg35xx/ClearRecent.pak/launch.sh diff --git a/makefile b/makefile index be23180..6a3cccd 100644 --- a/makefile +++ b/makefile @@ -68,7 +68,7 @@ bundle: cp ./src/overclock/overclock.elf ./build/SYSTEM/rg35xx/bin cp ./src/minui/minui.elf ./build/SYSTEM/rg35xx/paks/MinUI.pak cp ./src/clock/clock.elf ./build/EXTRAS/Tools/rg35xx/Clock.pak - cp ./src/clear_recent/clear_recent.elf ./build/EXTRAS/Tools/rg35xx/ClearRecent.pak + cp ./src/clear_recent/clear_recent.elf "./build/EXTRAS/Tools/rg35xx/Clear Recently Played.pak" # stock cores cp ./cores/output/fceumm_libretro.so ./build/SYSTEM/rg35xx/cores diff --git a/skeleton/EXTRAS/Tools/rg35xx/Clear Recently Played.pak/launch.sh b/skeleton/EXTRAS/Tools/rg35xx/Clear Recently Played.pak/launch.sh new file mode 100755 index 0000000..cb6a2e3 --- /dev/null +++ b/skeleton/EXTRAS/Tools/rg35xx/Clear Recently Played.pak/launch.sh @@ -0,0 +1,5 @@ +#!/bin/sh + +PATH=$(dirname "$0") +cd "$PATH" +./clear_recent.elf diff --git a/skeleton/EXTRAS/Tools/rg35xx/ClearRecent.pak/launch.sh b/skeleton/EXTRAS/Tools/rg35xx/ClearRecent.pak/launch.sh deleted file mode 100755 index f445244..0000000 --- a/skeleton/EXTRAS/Tools/rg35xx/ClearRecent.pak/launch.sh +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/sh - -cd $(dirname "$0") -./clear_recent.elf diff --git a/src/clear_recent/clear_recent.c b/src/clear_recent/clear_recent.c index b6a137d..57e63b2 100644 --- a/src/clear_recent/clear_recent.c +++ b/src/clear_recent/clear_recent.c @@ -22,8 +22,8 @@ int main(int argc, char* argv[]) { // Show confirmation message // GFX_blitHardwareGroup(screen, show_setting); - GFX_blitMessage(font.large, "Are you sure you want to clear\nRecently Played list?", screen, NULL); - GFX_blitButtonGroup((char*[]){ "B","CANCEL", "A","CONFIRM", NULL }, screen, 1); + GFX_blitMessage(font.large, "Are you sure you want to clear\nRecently Played?", screen, NULL); + GFX_blitButtonGroup((char*[]){ "B","CANCEL", "A","CLEAR", NULL }, screen, 1); GFX_flip(screen); diff --git a/src/common/utils.c b/src/common/utils.c index c21ddb5..901ac27 100644 --- a/src/common/utils.c +++ b/src/common/utils.c @@ -65,6 +65,11 @@ void getDisplayName(const char* in_name, char* out_name) { tmp = out_name + strlen(out_name) - 1; while(tmp>out_name && isspace((unsigned char)*tmp)) tmp--; tmp[1] = '\0'; + + // display "Tools" as "Settings"... + if (!strcmp("Tools", out_name)) { + strcpy(out_name, "Settings"); + } } void getEmuName(const char* in_name, char* out_name) { // NOTE: both char arrays need to be MAX_PATH length! char* tmp; @@ -189,4 +194,4 @@ uint64_t getMicroseconds(void) { ret += (uint64_t)tv.tv_usec; return ret; -} \ No newline at end of file +}