From f30af055dc963cabb9cb0ec219d7414afbddc676 Mon Sep 17 00:00:00 2001 From: erikkaashoek Date: Tue, 3 Nov 2026 17:11:25 +0100 Subject: [PATCH] File browser: REN renames a file (issue #100) --- vna_browser.c | 33 ++++++++++++++++++++++++++------- 1 file changed, 26 insertions(+), 7 deletions(-) diff --git a/vna_browser.c b/vna_browser.c index 12d4ea7..9eedcc0 100644 --- a/vna_browser.c +++ b/vna_browser.c @@ -4,7 +4,7 @@ static uint16_t current_page; static uint16_t sel_mode; // Buttons in browser -enum {FILE_BUTTON_LEFT = 0, FILE_BUTTON_RIGHT, FILE_BUTTON_EXIT, FILE_BUTTON_DEL, FILE_BUTTON_FILE}; +enum {FILE_BUTTON_LEFT = 0, FILE_BUTTON_RIGHT, FILE_BUTTON_EXIT, FILE_BUTTON_DEL, FILE_BUTTON_REN, FILE_BUTTON_FILE}; // Button position on screen typedef struct { uint16_t x; @@ -14,10 +14,11 @@ typedef struct { uint8_t ofs; } browser_btn_t; static const browser_btn_t browser_btn[] = { - [FILE_BUTTON_LEFT] = { 0 + 40, LCD_HEIGHT - FILE_BOTTOM_HEIGHT, LCD_WIDTH/2 - 80, FILE_BOTTOM_HEIGHT, (LCD_WIDTH/2 - 80 - FONT_WIDTH)/2}, // < previous + [FILE_BUTTON_LEFT] = { 0 + 80, LCD_HEIGHT - FILE_BOTTOM_HEIGHT, LCD_WIDTH/2 -120, FILE_BOTTOM_HEIGHT, (LCD_WIDTH/2 -120 - FONT_WIDTH)/2}, // < previous [FILE_BUTTON_RIGHT]= {LCD_WIDTH/2 + 40, LCD_HEIGHT - FILE_BOTTOM_HEIGHT, LCD_WIDTH/2 - 80, FILE_BOTTOM_HEIGHT, (LCD_WIDTH/2 - 80 - FONT_WIDTH)/2}, // > next [FILE_BUTTON_EXIT] = {LCD_WIDTH - 40, LCD_HEIGHT - FILE_BOTTOM_HEIGHT, 40, FILE_BOTTOM_HEIGHT, ( 40 - FONT_WIDTH)/2}, // X exit [FILE_BUTTON_DEL] = { 0 + 0, LCD_HEIGHT - FILE_BOTTOM_HEIGHT, 40, FILE_BOTTOM_HEIGHT, ( 40 - 3*FONT_WIDTH)/2}, // DEL + [FILE_BUTTON_REN] = { 0 + 40, LCD_HEIGHT - FILE_BOTTOM_HEIGHT, 40, FILE_BOTTOM_HEIGHT, ( 40 - 3*FONT_WIDTH)/2}, // REN // File button, only size and start position, must be idx = FILE_BUTTON_FILE [FILE_BUTTON_FILE] = { 0, 0, LCD_WIDTH/FILES_COLUMNS, FILE_BUTTON_HEIGHT, 5}, }; @@ -45,8 +46,8 @@ static void browser_draw_button(int idx, const char *txt) { ui_button_t b; browser_btn_t btn; browser_get_button_pos(idx, &btn); - // Mark DEL button in file delete mode - b.bg = (idx == FILE_BUTTON_DEL && sel_mode) ? LCD_LOW_BAT_COLOR : LCD_MENU_COLOR; + // Mark DEL button in file delete mode, REN in rename mode + b.bg = (sel_mode && idx == FILE_BUTTON_DEL - 1 + sel_mode) ? LCD_LOW_BAT_COLOR : LCD_MENU_COLOR; b.fg = LCD_MENU_TEXT_COLOR; b.border = (idx == selection) ? BROWSER_BUTTON_BORDER|BUTTON_BORDER_FALLING : BROWSER_BUTTON_BORDER|BUTTON_BORDER_RISE; if (txt == NULL) b.border|= BUTTON_BORDER_NO_FILL; @@ -103,7 +104,22 @@ repeat: if (cnt != 0) return; // Delete file if in delete mode - if (sel_mode) {f_unlink(fno.fname); return;} + if (sel_mode == 1) {f_unlink(fno.fname); return;} + // Rename mode: edit the name without extension in the text keypad + if (sel_mode == 2) { + int format = keypad_mode; + ui_preset_keypad_text(fno.fname, strlen(fno.fname) - strlen(file_ext[format]) - 1); + ui_mode_keypad(KM_FILENAME); + if (kp_buf[0]) { + char new_name[FF_LFN_BUF]; + plot_printf(new_name, FF_LFN_BUF, "%s.%s", kp_buf, file_ext[format]); + f_rename(fno.fname, new_name); + } + ui_mode = UI_BROWSER; // the keypad left to the normal screen + area_width = area_height = 0; + keypad_mode = format; + return; + } run_file: {} const char *error = NULL; @@ -401,6 +417,7 @@ static char cmd_buffer[256+128]; static void browser_draw_buttons(void) { browser_draw_button(FILE_BUTTON_DEL, "DEL"); + browser_draw_button(FILE_BUTTON_REN, "REN"); browser_draw_button(FILE_BUTTON_LEFT, "<"); browser_draw_button(FILE_BUTTON_RIGHT, ">"); browser_draw_button(FILE_BUTTON_EXIT, "X"); @@ -462,8 +479,10 @@ static void browser_key_press(int key) { case FILE_BUTTON_EXIT: //Exit ui_mode_normal(); break; - case FILE_BUTTON_DEL: // Toggle delete mode - sel_mode^= 1; + case FILE_BUTTON_DEL: // Toggle delete mode (1) or rename mode (2) + case FILE_BUTTON_REN: + key = key - FILE_BUTTON_DEL + 1; + sel_mode = sel_mode == key ? 0 : key; browser_draw_buttons(); break; case FILE_BUTTON_FILE: // Open or delete file