diff --git a/Makefile b/Makefile index cefa4ea..0cbf4cd 100644 --- a/Makefile +++ b/Makefile @@ -21,10 +21,10 @@ VERSION_MAJOR := 2#$(word 1, $(VERSION_PARTS)) VERSION_MINOR := 6#$(word 2, $(VERSION_PARTS)) VERSION_MICRO := 0#$(word 3, $(VERSION_PARTS)) -CHINESE_VERSION := Build 9 +CHINESE_VERSION := Build 10 DESCRIPTION := 3DS开源应用管理器. -AUTHOR := Steveice10 Theopse +AUTHOR := Steveice10 + Theopse(汉化) PRODUCT_CODE := CTR-P-CFBI UNIQUE_ID := 0xF8001 diff --git a/source/core/ui/ui.c b/source/core/ui/ui.c index 689761c..9bfd34d 100644 --- a/source/core/ui/ui.c +++ b/source/core/ui/ui.c @@ -150,7 +150,7 @@ static void ui_draw_top(ui_view* ui) { screen_set_base_alpha(ui_fade_alpha); char verText[64]; - snprintf(verText, 64, "Ver. %d.%d.%dC9", VERSION_MAJOR, VERSION_MINOR, VERSION_MICRO); + snprintf(verText, 64, "版本 %d.%d.%dC10", VERSION_MAJOR, VERSION_MINOR, VERSION_MICRO); float verWidth; float verHeight; @@ -224,7 +224,7 @@ static void ui_draw_top(ui_view* ui) { } u64 size = (u64) resource.freeClusters * (u64) resource.clusterSize; - snprintf(currBuffer, sizeof(ui_free_space_buffer) - (currBuffer - ui_free_space_buffer), "CTR NAND: %.1f %s", + snprintf(currBuffer, sizeof(ui_free_space_buffer) - (currBuffer - ui_free_space_buffer), "3DS 分区: %.1f %s", ui_get_display_size(size), ui_get_display_size_units(size)); currBuffer += strlen(currBuffer); } @@ -236,7 +236,7 @@ static void ui_draw_top(ui_view* ui) { } u64 size = (u64) resource.freeClusters * (u64) resource.clusterSize; - snprintf(currBuffer, sizeof(ui_free_space_buffer) - (currBuffer - ui_free_space_buffer), "TWL NAND: %.1f %s", + snprintf(currBuffer, sizeof(ui_free_space_buffer) - (currBuffer - ui_free_space_buffer), "DSi 分区: %.1f %s", ui_get_display_size(size), ui_get_display_size_units(size)); currBuffer += strlen(currBuffer); } @@ -248,7 +248,7 @@ static void ui_draw_top(ui_view* ui) { } u64 size = (u64) resource.freeClusters * (u64) resource.clusterSize; - snprintf(currBuffer, sizeof(ui_free_space_buffer) - (currBuffer - ui_free_space_buffer), "TWL 照片: %.1f %s", + snprintf(currBuffer, sizeof(ui_free_space_buffer) - (currBuffer - ui_free_space_buffer), "DSi 照片区: %.1f %s", ui_get_display_size(size), ui_get_display_size_units(size)); currBuffer += strlen(currBuffer); } diff --git a/source/fbi/task/uitask.c b/source/fbi/task/uitask.c index ff80e7f..c999eac 100644 --- a/source/fbi/task/uitask.c +++ b/source/fbi/task/uitask.c @@ -129,14 +129,18 @@ void task_draw_file_info(ui_view* view, void* data, float x1, float y1, float x2 needsSeparator = true; } } else { - infoTextPos += snprintf(infoText + infoTextPos, sizeof(infoText) - infoTextPos, "无"); + infoTextPos += snprintf(infoText + infoTextPos, sizeof(infoText) - infoTextPos, "无/任意"); } infoTextPos += snprintf(infoText + infoTextPos, sizeof(infoText) - infoTextPos, "\n"); if(!(info->attributes & FS_ATTRIBUTE_DIRECTORY)) { - infoTextPos += snprintf(infoText + infoTextPos, sizeof(infoText) - infoTextPos, "大小: %.2f %s\n", + infoTextPos += snprintf(infoText + infoTextPos, sizeof(infoText) - infoTextPos, "大小: %.2f %s", ui_get_display_size(info->size), ui_get_display_size_units(info->size)); + + infoTextPos += snprintf(infoText + infoTextPos, sizeof(infoText) - infoTextPos, " (%.2f %s)\n", + ui_get_display_size(info->ciaInfo.installedSize), + ui_get_display_size_units(info->ciaInfo.installedSize)); if(info->isCia && info->ciaInfo.loaded) { char regionString[64]; @@ -152,13 +156,11 @@ void task_draw_file_info(ui_view* view, void* data, float x1, float y1, float x2 infoTextPos += snprintf(infoText + infoTextPos, sizeof(infoText) - infoTextPos, "应用 ID: %016llX\n" "版本: %hu (%d.%d.%d)\n" - "区域: %s\n" - "安装后大小: %.2f %s", + "区域: %s", + //"安装后大小: %.2f %s", info->ciaInfo.titleId, info->ciaInfo.version, (info->ciaInfo.version >> 10) & 0x3F, (info->ciaInfo.version >> 4) & 0x3F, info->ciaInfo.version & 0xF, - regionString, - ui_get_display_size(info->ciaInfo.installedSize), - ui_get_display_size_units(info->ciaInfo.installedSize)); + regionString); } else if(info->isTicket && info->ticketInfo.loaded) { infoTextPos += snprintf(infoText + infoTextPos, sizeof(infoText) - infoTextPos, "应用 ID: %016llX", info->ticketInfo.titleId); } diff --git a/source/fbi/update.c b/source/fbi/update.c index a33884d..908f416 100644 --- a/source/fbi/update.c +++ b/source/fbi/update.c @@ -12,6 +12,12 @@ #include "../core/core.h" static void update_check_update(ui_view* view, void* data, float* progress, char* text) { + ui_pop(); + info_destroy(view); + prompt_display_notify("检查更新", "测试/滚动版不支持检查更新\n仅预览版及稳定版支持更新至最新版本.", COLOR_TEXT, NULL, NULL, NULL); + return; + + bool hasUpdate = false; char updateURL[DOWNLOAD_URL_MAX];