From 0f0321d691159c2223c065a5a31b53e286da5993 Mon Sep 17 00:00:00 2001 From: Robin Jones Date: Sat, 28 Dec 2024 22:54:14 +0000 Subject: [PATCH] Improve menu text --- src/menu/views/browser.c | 10 +++++----- src/menu/views/credits.c | 2 +- src/menu/views/rtc.c | 2 +- src/menu/views/system_info.c | 11 ++++++----- 4 files changed, 13 insertions(+), 12 deletions(-) diff --git a/src/menu/views/browser.c b/src/menu/views/browser.c index 53d445f4..62ff2129 100644 --- a/src/menu/views/browser.c +++ b/src/menu/views/browser.c @@ -278,11 +278,11 @@ static void set_menu_next_mode (menu_t *menu, void *arg) { static component_context_menu_t settings_context_menu = { .list = { - { .text = "Edit settings", .action = set_menu_next_mode, .arg = (void *) (MENU_MODE_SETTINGS_EDITOR) }, - { .text = "Show system info", .action = set_menu_next_mode, .arg = (void *) (MENU_MODE_SYSTEM_INFO) }, - { .text = "Show credits", .action = set_menu_next_mode, .arg = (void *) (MENU_MODE_CREDITS) }, - { .text = "Adjust RTC", .action = set_menu_next_mode, .arg = (void *) (MENU_MODE_RTC) }, - { .text = "Show cart info", .action = set_menu_next_mode, .arg = (void *) (MENU_MODE_FLASHCART) }, + { .text = "Menu settings", .action = set_menu_next_mode, .arg = (void *) (MENU_MODE_SETTINGS_EDITOR) }, + { .text = "Time (RTC) settings", .action = set_menu_next_mode, .arg = (void *) (MENU_MODE_RTC) }, + { .text = "Menu information", .action = set_menu_next_mode, .arg = (void *) (MENU_MODE_CREDITS) }, + { .text = "Flashcart information", .action = set_menu_next_mode, .arg = (void *) (MENU_MODE_FLASHCART) }, + { .text = "N64 information", .action = set_menu_next_mode, .arg = (void *) (MENU_MODE_SYSTEM_INFO) }, COMPONENT_CONTEXT_MENU_LIST_END, } }; diff --git a/src/menu/views/credits.c b/src/menu/views/credits.c index 3595b30c..e4ddb9c3 100644 --- a/src/menu/views/credits.c +++ b/src/menu/views/credits.c @@ -42,7 +42,7 @@ static void draw (menu_t *menu, surface_t *d) { " Robin Jones / NetworkFusion\n" " Mateusz Faderewski / Polprzewodnikowy\n" "Credits:\n" - " N64Brew / libdragon contributors\n" + " N64Brew / libDragon contributors\n" "\n" "OSS software used:\n" " libdragon (UNLICENSE License)\n" diff --git a/src/menu/views/rtc.c b/src/menu/views/rtc.c index 3df38a6d..3becf6c4 100644 --- a/src/menu/views/rtc.c +++ b/src/menu/views/rtc.c @@ -188,7 +188,7 @@ static void draw (menu_t *menu, surface_t *d) { ui_components_actions_bar_text_draw( ALIGN_LEFT, VALIGN_TOP, - "A: Change\n" + "A: Adjust time\n" "B: Back" ); } diff --git a/src/menu/views/system_info.c b/src/menu/views/system_info.c index 653ee0b0..9dbe08a3 100644 --- a/src/menu/views/system_info.c +++ b/src/menu/views/system_info.c @@ -49,20 +49,21 @@ static void draw (menu_t *menu, surface_t *d) { ALIGN_LEFT, VALIGN_TOP, "\n" "\n" - "Current date & time: %s" - "\n" "Expansion PAK is %sinserted\n" "\n" "Joypad 1 is %sconnected %s\n" "Joypad 2 is %sconnected %s\n" "Joypad 3 is %sconnected %s\n" - "Joypad 4 is %sconnected %s\n", - menu->current_time >= 0 ? ctime(&menu->current_time) : "Unknown", + "Joypad 4 is %sconnected %s\n" + "\n" + "\n" + "Physical Disk Drive attached: %s\n", is_memory_expanded() ? "" : "not ", (joypad[0]) ? "" : "not ", format_accessory(0), (joypad[1]) ? "" : "not ", format_accessory(1), (joypad[2]) ? "" : "not ", format_accessory(2), - (joypad[3]) ? "" : "not ", format_accessory(3) + (joypad[3]) ? "" : "not ", format_accessory(3), + "Unknown" // Fixme: Implement disk drive detection ); ui_components_actions_bar_text_draw(