From 6a6648d3b303cc8df59f1fc39c7187c917ba5ce3 Mon Sep 17 00:00:00 2001 From: CTCaer Date: Mon, 27 Apr 2020 08:47:00 +0300 Subject: [PATCH] nyx: Change many lvgl static labels to dynamic --- nyx/nyx_gui/frontend/fe_emmc_tools.c | 20 ++++++------ nyx/nyx_gui/frontend/fe_emummc_tools.c | 10 +++--- nyx/nyx_gui/frontend/gui.c | 41 ++++++++++++------------- nyx/nyx_gui/frontend/gui_emmc_tools.c | 4 +-- nyx/nyx_gui/frontend/gui_emummc_tools.c | 2 +- nyx/nyx_gui/frontend/gui_info.c | 23 ++++++-------- nyx/nyx_gui/frontend/gui_tools.c | 16 +++++----- 7 files changed, 56 insertions(+), 60 deletions(-) diff --git a/nyx/nyx_gui/frontend/fe_emmc_tools.c b/nyx/nyx_gui/frontend/fe_emmc_tools.c index b2ac307..d88573b 100644 --- a/nyx/nyx_gui/frontend/fe_emmc_tools.c +++ b/nyx/nyx_gui/frontend/fe_emmc_tools.c @@ -166,7 +166,7 @@ static int _dump_emmc_verify(emmc_tool_gui_t *gui, sdmmc_storage_t *storage, u32 f_close(&fp); s_printf(gui->txt_buf, - "#FF0000 Hash file could not be written (error %d)!#\n" + "\n#FF0000 Hash file could not be written (error %d)!#\n" "#FF0000 Aborting..#\n", res); lv_label_ins_text(gui->label_log, LV_LABEL_POS_LAST, gui->txt_buf); manual_system_maintenance(true); @@ -211,7 +211,7 @@ static int _dump_emmc_verify(emmc_tool_gui_t *gui, sdmmc_storage_t *storage, u32 if (!sdmmc_storage_read(storage, lba_curr, num, bufEm)) { s_printf(gui->txt_buf, - "#FF0000 Failed to read %d blocks (@LBA %08X),#\n" + "\n#FF0000 Failed to read %d blocks (@LBA %08X),#\n" "#FF0000 from eMMC! Verification failed..#\n", num, lba_curr); lv_label_ins_text(gui->label_log, LV_LABEL_POS_LAST, gui->txt_buf); @@ -231,7 +231,7 @@ static int _dump_emmc_verify(emmc_tool_gui_t *gui, sdmmc_storage_t *storage, u32 if (f_read_fast(&fp, bufSd, num << 9)) { s_printf(gui->txt_buf, - "#FF0000 Failed to read %d blocks (@LBA %08X),#\n" + "\n#FF0000 Failed to read %d blocks (@LBA %08X),#\n" "#FF0000 from SD card! Verification failed..#\n", num, lba_curr); lv_label_ins_text(gui->label_log, LV_LABEL_POS_LAST, gui->txt_buf); @@ -252,7 +252,7 @@ static int _dump_emmc_verify(emmc_tool_gui_t *gui, sdmmc_storage_t *storage, u32 if (res) { s_printf(gui->txt_buf, - "#FF0000 SD & eMMC data (@LBA %08X) do not match!#\n" + "\n#FF0000 SD & eMMC data (@LBA %08X) do not match!#\n" "\n#FF0000 Verification failed..#\n", lba_curr); lv_label_ins_text(gui->label_log, LV_LABEL_POS_LAST, gui->txt_buf); @@ -724,12 +724,12 @@ void dump_emmc_selected(emmcPartType_t dumpType, emmc_tool_gui_t *gui) s_printf(txt_buf, ""); lv_label_set_text(gui->label_log, txt_buf); - lv_label_set_static_text(gui->label_info, "Checking for available free space..."); + lv_label_set_text(gui->label_info, "Checking for available free space..."); manual_system_maintenance(true); if (!sd_mount()) { - lv_label_set_static_text(gui->label_info, "#FFDD00 Failed to init SD!#"); + lv_label_set_text(gui->label_info, "#FFDD00 Failed to init SD!#"); goto out; } @@ -740,7 +740,7 @@ void dump_emmc_selected(emmcPartType_t dumpType, emmc_tool_gui_t *gui) sdmmc_t sdmmc; if (!sdmmc_storage_init_mmc(&storage, &sdmmc, SDMMC_4, SDMMC_BUS_WIDTH_8, 4)) { - lv_label_set_static_text(gui->label_info, "#FFDD00 Failed to init eMMC!#"); + lv_label_set_text(gui->label_info, "#FFDD00 Failed to init eMMC!#"); goto out; } @@ -1304,7 +1304,7 @@ void restore_emmc_selected(emmcPartType_t restoreType, emmc_tool_gui_t *gui) u32 btn = btn_wait(); if (!(btn & BTN_POWER)) { - lv_label_set_static_text(gui->label_info, "#FFDD00 Restore operation was aborted!#"); + lv_label_set_text(gui->label_info, "#FFDD00 Restore operation was aborted!#"); lv_obj_del(warn_mbox_bg); goto out; } @@ -1313,7 +1313,7 @@ void restore_emmc_selected(emmcPartType_t restoreType, emmc_tool_gui_t *gui) if (!sd_mount()) { - lv_label_set_static_text(gui->label_info, "#FFDD00 Failed to init SD!#"); + lv_label_set_text(gui->label_info, "#FFDD00 Failed to init SD!#"); goto out; } @@ -1321,7 +1321,7 @@ void restore_emmc_selected(emmcPartType_t restoreType, emmc_tool_gui_t *gui) sdmmc_t sdmmc; if (!sdmmc_storage_init_mmc(&storage, &sdmmc, SDMMC_4, SDMMC_BUS_WIDTH_8, 4)) { - lv_label_set_static_text(gui->label_info, "#FFDD00 Failed to init eMMC!#"); + lv_label_set_text(gui->label_info, "#FFDD00 Failed to init eMMC!#"); goto out; } diff --git a/nyx/nyx_gui/frontend/fe_emummc_tools.c b/nyx/nyx_gui/frontend/fe_emummc_tools.c index 634b60f..22c1e1a 100644 --- a/nyx/nyx_gui/frontend/fe_emummc_tools.c +++ b/nyx/nyx_gui/frontend/fe_emummc_tools.c @@ -333,11 +333,11 @@ void dump_emummc_file(emmc_tool_gui_t *gui) if (!sd_mount()) { - lv_label_set_static_text(gui->label_info, "#FFDD00 Failed to init SD!#"); + lv_label_set_text(gui->label_info, "#FFDD00 Failed to init SD!#"); goto out; } - lv_label_set_static_text(gui->label_info, "Checking for available free space..."); + lv_label_set_text(gui->label_info, "Checking for available free space..."); manual_system_maintenance(true); // Get SD Card free space for Partial Backup. @@ -347,7 +347,7 @@ void dump_emummc_file(emmc_tool_gui_t *gui) sdmmc_t sdmmc; if (!sdmmc_storage_init_mmc(&storage, &sdmmc, SDMMC_4, SDMMC_BUS_WIDTH_8, 4)) { - lv_label_set_static_text(gui->label_info, "#FFDD00 Failed to init eMMC!#"); + lv_label_set_text(gui->label_info, "#FFDD00 Failed to init eMMC!#"); goto out; } @@ -621,7 +621,7 @@ void dump_emummc_raw(emmc_tool_gui_t *gui, int part_idx, u32 sector_start) if (!sd_mount()) { - lv_label_set_static_text(gui->label_info, "#FFDD00 Failed to init SD!#"); + lv_label_set_text(gui->label_info, "#FFDD00 Failed to init SD!#"); goto out; } @@ -629,7 +629,7 @@ void dump_emummc_raw(emmc_tool_gui_t *gui, int part_idx, u32 sector_start) sdmmc_t sdmmc; if (!sdmmc_storage_init_mmc(&storage, &sdmmc, SDMMC_4, SDMMC_BUS_WIDTH_8, 4)) { - lv_label_set_static_text(gui->label_info, "#FFDD00 Failed to init eMMC!#"); + lv_label_set_text(gui->label_info, "#FFDD00 Failed to init eMMC!#"); goto out; } diff --git a/nyx/nyx_gui/frontend/gui.c b/nyx/nyx_gui/frontend/gui.c index 7089949..b0a9e67 100644 --- a/nyx/nyx_gui/frontend/gui.c +++ b/nyx/nyx_gui/frontend/gui.c @@ -353,9 +353,9 @@ lv_res_t nyx_generic_onoff_toggle(lv_obj_t *btn) else { if (!(lv_btn_get_state(btn) & LV_BTN_STATE_TGL_REL)) - lv_label_set_static_text(label_btn, "#D0D0D0 OFF#"); + lv_label_set_text(label_btn, "#D0D0D0 OFF#"); else - lv_label_set_static_text(label_btn, "#00FFC9 ON #"); + lv_label_set_text(label_btn, "#00FFC9 ON #"); } return LV_RES_OK; @@ -639,10 +639,9 @@ void nyx_create_onoff_button(lv_theme_t *th, lv_obj_t *parent, lv_obj_t *btn, co lv_obj_set_width(btn, lv_obj_get_width(parent)); lv_btn_set_toggle(btn, true); - lv_label_set_text(label_btn, btn_name); - lv_label_set_static_text(label_btnsw, "#D0D0D0 OFF#"); + lv_label_set_text(label_btnsw, "#D0D0D0 OFF#"); lv_obj_align(label_btn, btn, LV_ALIGN_IN_LEFT_MID, LV_DPI / 4, 0); lv_obj_align(label_btnsw, btn, LV_ALIGN_IN_RIGHT_MID, -LV_DPI / 4, -LV_DPI / 10); @@ -1061,7 +1060,7 @@ static lv_res_t _create_window_home_launch(lv_obj_t *btn) boot_entry_lbl_cont = lv_cont_create(win, NULL); boot_entry_label = lv_label_create(boot_entry_lbl_cont, NULL); lv_obj_set_style(boot_entry_label, &hint_small_style_white); - lv_label_set_static_text(boot_entry_label, ""); + lv_label_set_text(boot_entry_label, ""); launch_ctxt[1] = boot_entry_label; lv_cont_set_fit(boot_entry_lbl_cont, false, false); @@ -1231,7 +1230,7 @@ static void _create_tab_home(lv_theme_t *th, lv_obj_t *parent) // Set brand label. lv_obj_t *label_brand = lv_label_create(parent, NULL); lv_label_set_recolor(label_brand, true); - lv_label_set_static_text(label_brand, "#00EDBA hekate#"); + lv_label_set_text(label_brand, "#00EDBA hekate#"); lv_obj_set_pos(label_brand, 50, 48); // Set tagline label. @@ -1254,7 +1253,7 @@ static void _create_tab_home(lv_theme_t *th, lv_obj_t *parent) lv_obj_t *label_btn = lv_label_create(btn_launch, NULL); lv_label_set_recolor(label_btn, true); lv_obj_set_style(label_btn, &icons); - lv_label_set_static_text(label_btn, "#00EDBA "SYMBOL_DOT"#"); + lv_label_set_text(label_btn, "#00EDBA "SYMBOL_DOT"#"); lv_btn_set_action(btn_launch, LV_BTN_ACTION_CLICK, _create_window_home_launch); lv_obj_set_size(btn_launch, 256, 256); lv_obj_set_pos(btn_launch, 50, 160); @@ -1262,25 +1261,25 @@ static void _create_tab_home(lv_theme_t *th, lv_obj_t *parent) lv_obj_align(label_btn, NULL, LV_ALIGN_CENTER, 0, -28); lv_obj_t *label_btn2 = lv_label_create(btn_launch, NULL); lv_label_set_recolor(label_btn2, true); - lv_label_set_static_text(label_btn2, "#00EDBA Launch#"); + lv_label_set_text(label_btn2, "#00EDBA Launch#"); lv_obj_align(label_btn2, NULL, LV_ALIGN_IN_TOP_MID, 0, 174); // More Configs button. lv_obj_t *btn_more_cfg = lv_btn_create(parent, btn_launch); label_btn = lv_label_create(btn_more_cfg, label_btn); - lv_label_set_static_text(label_btn, "#00EDBA "SYMBOL_CLOCK"#"); + lv_label_set_text(label_btn, "#00EDBA "SYMBOL_CLOCK"#"); lv_btn_set_action(btn_more_cfg, LV_BTN_ACTION_CLICK, _create_window_home_launch); lv_btn_set_layout(btn_more_cfg, LV_LAYOUT_OFF); lv_obj_align(label_btn, NULL, LV_ALIGN_CENTER, 0, -28); label_btn2 = lv_label_create(btn_more_cfg, label_btn2); - lv_label_set_static_text(label_btn2, "#00EDBA More Configs#"); + lv_label_set_text(label_btn2, "#00EDBA More Configs#"); lv_obj_set_pos(btn_more_cfg, 341, 160); lv_obj_align(label_btn2, NULL, LV_ALIGN_IN_TOP_MID, 0, 174); // Quick Launch button. // lv_obj_t *btn_quick_launch = lv_btn_create(parent, NULL); // label_btn = lv_label_create(btn_quick_launch, label_btn); - // lv_label_set_static_text(label_btn, SYMBOL_EDIT" Quick Launch"); + // lv_label_set_text(label_btn, SYMBOL_EDIT" Quick Launch"); // lv_obj_set_width(btn_quick_launch, 256); // lv_obj_set_pos(btn_quick_launch, 343, 448); // lv_btn_set_action(btn_quick_launch, LV_BTN_ACTION_CLICK, NULL); @@ -1288,12 +1287,12 @@ static void _create_tab_home(lv_theme_t *th, lv_obj_t *parent) // Payloads button. lv_obj_t *btn_payloads = lv_btn_create(parent, btn_launch); label_btn = lv_label_create(btn_payloads, label_btn); - lv_label_set_static_text(label_btn, "#00EDBA "SYMBOL_OK"#"); + lv_label_set_text(label_btn, "#00EDBA "SYMBOL_OK"#"); lv_btn_set_action(btn_payloads, LV_BTN_ACTION_CLICK, _create_mbox_payloads); lv_btn_set_layout(btn_payloads, LV_LAYOUT_OFF); lv_obj_align(label_btn, NULL, LV_ALIGN_CENTER, 0, -28); label_btn2 = lv_label_create(btn_payloads, label_btn2); - lv_label_set_static_text(label_btn2, "#00EDBA Payloads#"); + lv_label_set_text(label_btn2, "#00EDBA Payloads#"); lv_obj_set_pos(btn_payloads, 632, 160); lv_obj_align(label_btn2, NULL, LV_ALIGN_IN_TOP_MID, 0, 174); @@ -1306,13 +1305,13 @@ static void _create_tab_home(lv_theme_t *th, lv_obj_t *parent) // emuMMC manage button. lv_obj_t *btn_emummc = lv_btn_create(parent, btn_launch); label_btn = lv_label_create(btn_emummc, label_btn); - lv_label_set_static_text(label_btn, "#00EDBA "SYMBOL_LIST"#"); + lv_label_set_text(label_btn, "#00EDBA "SYMBOL_LIST"#"); lv_btn_set_action(btn_emummc, LV_BTN_ACTION_CLICK,create_win_emummc_tools); lv_btn_set_layout(btn_emummc, LV_LAYOUT_OFF); lv_obj_align(label_btn, NULL, LV_ALIGN_CENTER, 0, -28); lv_obj_set_pos(btn_emummc, 959, 160); label_btn2 = lv_label_create(btn_emummc, label_btn2); - lv_label_set_static_text(label_btn2, "#00EDBA emuMMC#"); + lv_label_set_text(label_btn2, "#00EDBA emuMMC#"); lv_obj_align(label_btn2, NULL, LV_ALIGN_IN_TOP_MID, 0, 174); // Create bottom right power buttons. @@ -1365,34 +1364,34 @@ static void _create_status_bar(lv_theme_t * th) // Battery percentages. lv_obj_t *lbl_battery = lv_label_create(status_bar_bg, NULL); lv_label_set_recolor(lbl_battery, true); - lv_label_set_static_text(lbl_battery, " "SYMBOL_DOT" 00.0% "SYMBOL_BATTERY_1" #FFDD00 "SYMBOL_CHARGE"#"); + lv_label_set_text(lbl_battery, " "SYMBOL_DOT" 00.0% "SYMBOL_BATTERY_1" #FFDD00 "SYMBOL_CHARGE"#"); lv_obj_align(lbl_battery, NULL, LV_ALIGN_IN_RIGHT_MID, -LV_DPI * 6 / 11, 0); status_bar.battery = lbl_battery; // Amperages, voltages. lbl_battery = lv_label_create(status_bar_bg, lbl_battery); lv_obj_set_style(lbl_battery, &hint_small_style_white); - lv_label_set_static_text(lbl_battery, "#96FF00 +0 mA# (0 mV)"); + lv_label_set_text(lbl_battery, "#96FF00 +0 mA# (0 mV)"); lv_obj_align(lbl_battery, status_bar.battery, LV_ALIGN_OUT_LEFT_MID, -LV_DPI / 25, -1); status_bar.battery_more = lbl_battery; lv_obj_t *lbl_left = lv_label_create(status_bar_bg, NULL); - lv_label_set_static_text(lbl_left, SYMBOL_CLOCK" "); + lv_label_set_text(lbl_left, SYMBOL_CLOCK" "); lv_obj_align(lbl_left, NULL, LV_ALIGN_IN_LEFT_MID, LV_DPI * 6 / 11, 0); // Time, temperature. lv_obj_t *lbl_time_temp = lv_label_create(status_bar_bg, NULL); - lv_label_set_static_text(lbl_time_temp, "00:00 "SYMBOL_DOT" "SYMBOL_TEMPERATURE" 00.0"); + lv_label_set_text(lbl_time_temp, "00:00 "SYMBOL_DOT" "SYMBOL_TEMPERATURE" 00.0"); lv_obj_align(lbl_time_temp, lbl_left, LV_ALIGN_OUT_RIGHT_MID, 0, 0); status_bar.time_temp = lbl_time_temp; lbl_left = lv_label_create(status_bar_bg, NULL); - lv_label_set_static_text(lbl_left, " "SYMBOL_DOT); + lv_label_set_text(lbl_left, " "SYMBOL_DOT); lv_obj_align(lbl_left, lbl_time_temp, LV_ALIGN_OUT_RIGHT_MID, 0, -LV_DPI / 14); status_bar.temp_symbol = lbl_left; lv_obj_t *lbl_degrees = lv_label_create(status_bar_bg, NULL); - lv_label_set_static_text(lbl_degrees, "C"); + lv_label_set_text(lbl_degrees, "C"); lv_obj_align(lbl_degrees, lbl_left, LV_ALIGN_OUT_RIGHT_MID, LV_DPI / 50, LV_DPI / 14); status_bar.temp_degrees = lbl_degrees; diff --git a/nyx/nyx_gui/frontend/gui_emmc_tools.c b/nyx/nyx_gui/frontend/gui_emmc_tools.c index acb54de..10981a5 100644 --- a/nyx/nyx_gui/frontend/gui_emmc_tools.c +++ b/nyx/nyx_gui/frontend/gui_emmc_tools.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018-2019 CTCaer + * Copyright (c) 2018-2020 CTCaer * * This program is free software; you can redistribute it and/or modify it * under the terms and conditions of the GNU General Public License, @@ -123,7 +123,7 @@ static void _create_window_backup_restore(emmcPartType_t type, const char* win_l emmc_tool_gui_ctxt.bar_teal_bg = &bar_teal_bg; emmc_tool_gui_ctxt.bar_white_ind = &bar_white_ind; - lv_obj_t * bar = lv_bar_create(h1, NULL); + lv_obj_t *bar = lv_bar_create(h1, NULL); lv_obj_set_size(bar, LV_DPI * 38 / 10, LV_DPI / 5); lv_bar_set_range(bar, 0, 100); lv_bar_set_value(bar, 0); diff --git a/nyx/nyx_gui/frontend/gui_emummc_tools.c b/nyx/nyx_gui/frontend/gui_emummc_tools.c index 8bde278..b80d2e2 100644 --- a/nyx/nyx_gui/frontend/gui_emummc_tools.c +++ b/nyx/nyx_gui/frontend/gui_emummc_tools.c @@ -94,7 +94,7 @@ static void _create_window_emummc() lv_obj_align(label_info, label_sep, LV_ALIGN_OUT_BOTTOM_LEFT, LV_DPI / 4, LV_DPI / 10); emmc_tool_gui_ctxt.label_info = label_info; - lv_obj_t * bar = lv_bar_create(h1, NULL); + lv_obj_t *bar = lv_bar_create(h1, NULL); lv_obj_set_size(bar, LV_DPI * 38 / 10, LV_DPI / 5); lv_bar_set_range(bar, 0, 100); lv_bar_set_value(bar, 0); diff --git a/nyx/nyx_gui/frontend/gui_info.c b/nyx/nyx_gui/frontend/gui_info.c index e34c2ac..b484fe8 100644 --- a/nyx/nyx_gui/frontend/gui_info.c +++ b/nyx/nyx_gui/frontend/gui_info.c @@ -156,7 +156,6 @@ static lv_res_t _bootrom_dump_window_action(lv_obj_t * btn) } _create_window_dump_done(error, "evp_thunks.bin, bootrom_patched.bin, bootrom_unpatched.bin"); - return LV_RES_OK; } @@ -353,9 +352,9 @@ static lv_res_t _create_window_fuses_info_status(lv_obj_t *btn) // Check if patched unit. if (!fuse_check_patched_rcm()) - lv_label_set_static_text(lb_desc2, "#96FF00 Your unit is exploitable#\n#96FF00 to the RCM bug!#"); + lv_label_set_text(lb_desc2, "#96FF00 Your unit is exploitable#\n#96FF00 to the RCM bug!#"); else - lv_label_set_static_text(lb_desc2, "#FF8000 Your unit is patched#\n#FF8000 to the RCM bug!#"); + lv_label_set_text(lb_desc2, "#FF8000 Your unit is patched#\n#FF8000 to the RCM bug!#"); lv_obj_set_width(lb_desc2, lv_obj_get_width(desc2)); lv_obj_align(desc2, val, LV_ALIGN_OUT_RIGHT_MID, LV_DPI / 2, 0); @@ -464,7 +463,7 @@ static lv_res_t _create_window_tsec_keys_status(lv_obj_t *btn) lv_obj_t * lb_val = lv_label_create(val, lb_desc); lv_ta_set_style(lb_val, LV_TA_STYLE_BG, &monospace_text); - lv_label_set_static_text(lb_val, "Please wait..."); + lv_label_set_text(lb_val, "Please wait..."); lv_obj_set_width(lb_val, lv_obj_get_width(val)); lv_obj_align(val, desc, LV_ALIGN_OUT_RIGHT_MID, 0, 0); manual_system_maintenance(true); @@ -561,7 +560,7 @@ static lv_res_t _create_window_emmc_info_status(lv_obj_t *btn) if (!sdmmc_storage_init_mmc(&storage, &sdmmc, SDMMC_4, SDMMC_BUS_WIDTH_8, 4)) { - lv_label_set_static_text(lb_desc, "#FFDD00 Failed to init eMMC!#"); + lv_label_set_text(lb_desc, "#FFDD00 Failed to init eMMC!#"); lv_obj_set_width(lb_desc, lv_obj_get_width(desc)); } else @@ -701,7 +700,7 @@ static lv_res_t _create_window_sdcard_info_status(lv_obj_t *btn) lv_label_set_long_mode(lb_desc, LV_LABEL_LONG_BREAK); lv_label_set_recolor(lb_desc, true); - lv_label_set_static_text(lb_desc, "#D4FF00 Please wait...#"); + lv_label_set_text(lb_desc, "#D4FF00 Please wait...#"); lv_obj_set_width(lb_desc, lv_obj_get_width(desc)); // Disable buttons. @@ -710,10 +709,10 @@ static lv_res_t _create_window_sdcard_info_status(lv_obj_t *btn) manual_system_maintenance(true); if (!sd_mount()) - lv_label_set_static_text(lb_desc, "#FFDD00 Failed to init SD!#"); + lv_label_set_text(lb_desc, "#FFDD00 Failed to init SD!#"); else { - lv_label_set_static_text(lb_desc, + lv_label_set_text(lb_desc, "#00DDFF Card IDentification:#\n" "Vendor ID:\n" "OEM ID:\n" @@ -768,7 +767,6 @@ static lv_res_t _create_window_sdcard_info_status(lv_obj_t *btn) lv_obj_t * lb_val2 = lv_label_create(val2, lb_desc); - s_printf(txt_buf, "#00DDFF v%d.0#\n%02X\n%d MiB\n%d\n%d MB/s (%d MHz)\n%d\nU%d\nV%d\nA%d\n%d", sd_storage.csd.structure + 1, sd_storage.csd.cmdclass, sd_storage.sec_cnt >> 11, @@ -792,17 +790,16 @@ static lv_res_t _create_window_sdcard_info_status(lv_obj_t *btn) lv_obj_set_size(desc3, LV_HOR_RES / 2 / 2 * 2, LV_VER_RES - (LV_DPI * 11 / 8) * 4); lv_obj_t * lb_desc3 = lv_label_create(desc3, lb_desc); - - lv_label_set_static_text(lb_desc3, "#D4FF00 Acquiring FAT volume info...#"); - + lv_label_set_text(lb_desc3, "#D4FF00 Acquiring FAT volume info...#"); lv_obj_set_width(lb_desc3, lv_obj_get_width(desc3)); + lv_obj_align(desc3, desc, LV_ALIGN_OUT_BOTTOM_LEFT, 0, LV_DPI / 2); manual_system_maintenance(true); f_getfree("", &sd_fs.free_clst, NULL); - lv_label_set_static_text(lb_desc3, + lv_label_set_text(lb_desc3, "#00DDFF Found FAT volume:#\n" "Filesystem:\n" "Cluster:\n" diff --git a/nyx/nyx_gui/frontend/gui_tools.c b/nyx/nyx_gui/frontend/gui_tools.c index a377114..c372887 100644 --- a/nyx/nyx_gui/frontend/gui_tools.c +++ b/nyx/nyx_gui/frontend/gui_tools.c @@ -248,15 +248,15 @@ static lv_res_t _create_window_unset_abit_tool(lv_obj_t *btn) if (!sd_mount()) { - lv_label_set_static_text(lb_desc, "#FFDD00 Failed to init SD!#"); + lv_label_set_text(lb_desc, "#FFDD00 Failed to init SD!#"); lv_obj_set_width(lb_desc, lv_obj_get_width(desc)); } else { if (!nintendo_folder) - lv_label_set_static_text(lb_desc, "#00DDFF Traversing all SD card files!#\nThis may take some time..."); + lv_label_set_text(lb_desc, "#00DDFF Traversing all SD card files!#\nThis may take some time..."); else - lv_label_set_static_text(lb_desc, "#00DDFF Traversing all Nintendo files!#\nThis may take some time..."); + lv_label_set_text(lb_desc, "#00DDFF Traversing all Nintendo files!#\nThis may take some time..."); lv_obj_set_width(lb_desc, lv_obj_get_width(desc)); lv_obj_t *val = lv_cont_create(win, NULL); @@ -267,7 +267,7 @@ static lv_res_t _create_window_unset_abit_tool(lv_obj_t *btn) char *path = malloc(1024); path[0] = 0; - lv_label_set_static_text(lb_val, ""); + lv_label_set_text(lb_val, ""); lv_obj_set_width(lb_val, lv_obj_get_width(val)); lv_obj_align(val, desc, LV_ALIGN_OUT_BOTTOM_LEFT, 0, 0); @@ -330,7 +330,7 @@ static lv_res_t _create_window_dump_pk12_tool(lv_obj_t *btn) if (!sd_mount()) { - lv_label_set_static_text(lb_desc, "#FFDD00 Failed to init SD!#"); + lv_label_set_text(lb_desc, "#FFDD00 Failed to init SD!#"); goto out_end; } @@ -354,7 +354,7 @@ static lv_res_t _create_window_dump_pk12_tool(lv_obj_t *btn) if (!sdmmc_storage_init_mmc(&storage, &sdmmc, SDMMC_4, SDMMC_BUS_WIDTH_8, 4)) { - lv_label_set_static_text(lb_desc, "#FFDD00 Failed to init eMMC!#"); + lv_label_set_text(lb_desc, "#FFDD00 Failed to init eMMC!#"); goto out_free; } @@ -408,7 +408,7 @@ static lv_res_t _create_window_dump_pk12_tool(lv_obj_t *btn) if (!reboot_to_sept((u8 *)tsec_ctxt.fw, kb)) { - lv_label_set_static_text(lb_desc, "#FFDD00 Failed to run sept#\n"); + lv_label_set_text(lb_desc, "#FFDD00 Failed to run sept#\n"); goto out_free; } } @@ -830,7 +830,7 @@ static void _create_tab_tools_arc_autorcm(lv_theme_t *th, lv_obj_t *parent) label_btn = lv_label_create(btn3, NULL); lv_btn_set_fit(btn3, true, true); lv_label_set_recolor(label_btn, true); - lv_label_set_static_text(label_btn, SYMBOL_REFRESH" AutoRCM #00FFC9 ON #"); + lv_label_set_text(label_btn, SYMBOL_REFRESH" AutoRCM #00FFC9 ON #"); lv_obj_align(btn3, line_sep, LV_ALIGN_OUT_BOTTOM_LEFT, LV_DPI / 4, LV_DPI / 4); lv_btn_set_action(btn3, LV_BTN_ACTION_CLICK, _create_mbox_autorcm_status);