blackteay/fbi-i18n-zh
1
0
Fork 0
mirror of https://gitlab.com/Theopse/fbi-i18n-zh.git synced 2025-04-06 03:58:02 +08:00
Code Issues Projects Releases Wiki Activity

Color tickets based on whether they are in use.

Browse Source
This commit is contained in:
Steveice10 2016-12-24 09:09:45 -08:00
parent e906e108ab
commit 9182ebfa00
8 changed files with 26 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
romfs/textcolor.cfg
View File

@ -9,3 +9,5 @@ enabled=FF00FF00
disabled=FF0000FF disabled=FF0000FF
installed=FF00FF00 installed=FF00FF00
notinstalled=FF0000FF notinstalled=FF0000FF
ticketinuse=FF00FF00
ticketnotinuse=FF0000FF

4
source/core/screen.c
View File

@ -211,6 +211,10 @@ void screen_init() {
colorConfig[COLOR_INSTALLED] = color; colorConfig[COLOR_INSTALLED] = color;
} else if(strcasecmp(key, "notinstalled") == 0) { } else if(strcasecmp(key, "notinstalled") == 0) {
colorConfig[COLOR_NOT_INSTALLED] = color; colorConfig[COLOR_NOT_INSTALLED] = color;
} else if(strcasecmp(key, "ticketinuse") == 0) {
colorConfig[COLOR_TICKET_IN_USE] = color;
} else if(strcasecmp(key, "ticketnotinuse") == 0) {
colorConfig[COLOR_TICKET_NOT_IN_USE] = color;
} }
} }
} }

4
source/core/screen.h
View File

@ -42,7 +42,7 @@
#define TEXTURE_AUTO_START 32 #define TEXTURE_AUTO_START 32
#define NUM_COLORS 11 #define NUM_COLORS 13
#define COLOR_TEXT 0 #define COLOR_TEXT 0
#define COLOR_NAND 1 #define COLOR_NAND 1
@ -55,6 +55,8 @@
#define COLOR_DISABLED 8 #define COLOR_DISABLED 8
#define COLOR_INSTALLED 9 #define COLOR_INSTALLED 9
#define COLOR_NOT_INSTALLED 10 #define COLOR_NOT_INSTALLED 10
#define COLOR_TICKET_IN_USE 11
#define COLOR_TICKET_NOT_IN_USE 12
void screen_init(); void screen_init();
void screen_exit(); void screen_exit();

7
source/ui/section/action/deletetickets.c
View File

@ -157,14 +157,9 @@ static void action_delete_tickets_loading_update(ui_view* view, void* data, floa
list_item* item = (list_item*) linked_list_iter_next(&iter); list_item* item = (list_item*) linked_list_iter_next(&iter);
ticket_info* info = (ticket_info*) item->data; ticket_info* info = (ticket_info*) item->data;
AM_TitleEntry entry; if(info->inUse) {
for(FS_MediaType mediaType = MEDIATYPE_NAND; mediaType != MEDIATYPE_GAME_CARD; mediaType++) {
if(R_SUCCEEDED(AM_GetTitleInfo(mediaType, 1, &info->titleId, &entry))) {
linked_list_iter_remove(&iter); linked_list_iter_remove(&iter);
task_free_ticket(item); task_free_ticket(item);
break;
}
} }
} }

1
source/ui/section/action/urlinstall.c
View File

@ -118,6 +118,7 @@ static Result action_url_install_open_dst(void* data, u32 index, void* initialRe
installData->ticket = true; installData->ticket = true;
installData->ticketInfo.titleId = util_get_ticket_title_id((u8*) initialReadBlock); installData->ticketInfo.titleId = util_get_ticket_title_id((u8*) initialReadBlock);
installData->ticketInfo.inUse = false;
AM_DeleteTicket(installData->ticketInfo.titleId); AM_DeleteTicket(installData->ticketInfo.titleId);
res = AM_InstallTicketBegin(handle); res = AM_InstallTicketBegin(handle);

1
source/ui/section/task/listfiles.c
View File

@ -103,6 +103,7 @@ Result task_create_file_item(list_item** out, FS_Archive archive, const char* pa
if(R_SUCCEEDED(FSFILE_Read(fileHandle, &bytesRead, dataOffsets[sigType] + titleIdOffset, &titleId, sizeof(titleId))) && bytesRead == sizeof(titleId)) { if(R_SUCCEEDED(FSFILE_Read(fileHandle, &bytesRead, dataOffsets[sigType] + titleIdOffset, &titleId, sizeof(titleId))) && bytesRead == sizeof(titleId)) {
fileInfo->isTicket = true; fileInfo->isTicket = true;
fileInfo->ticketInfo.titleId = __builtin_bswap64(titleId); fileInfo->ticketInfo.titleId = __builtin_bswap64(titleId);
fileInfo->ticketInfo.inUse = false;
} }
} }
} }

11
source/ui/section/task/listtickets.c
View File

@ -41,9 +41,18 @@ static void task_populate_tickets_thread(void* arg) {
ticket_info* ticketInfo = (ticket_info*) calloc(1, sizeof(ticket_info)); ticket_info* ticketInfo = (ticket_info*) calloc(1, sizeof(ticket_info));
if(ticketInfo != NULL) { if(ticketInfo != NULL) {
ticketInfo->titleId = ticketIds[i]; ticketInfo->titleId = ticketIds[i];
ticketInfo->inUse = false;
AM_TitleEntry entry;
for(FS_MediaType mediaType = MEDIATYPE_NAND; mediaType != MEDIATYPE_GAME_CARD; mediaType++) {
if(R_SUCCEEDED(AM_GetTitleInfo(mediaType, 1, &ticketInfo->titleId, &entry))) {
ticketInfo->inUse = true;
break;
}
}
snprintf(item->name, LIST_ITEM_NAME_MAX, "%016llX", ticketIds[i]); snprintf(item->name, LIST_ITEM_NAME_MAX, "%016llX", ticketIds[i]);
item->color = COLOR_TEXT; item->color = ticketInfo->inUse ? COLOR_TICKET_IN_USE : COLOR_TICKET_NOT_IN_USE;
item->data = ticketInfo; item->data = ticketInfo;
linked_list_add(data->items, item); linked_list_add(data->items, item);

1
source/ui/section/task/task.h
View File

@ -33,6 +33,7 @@ typedef struct pending_title_info_s {
typedef struct ticket_info_s { typedef struct ticket_info_s {
u64 titleId; u64 titleId;
bool inUse;
} ticket_info; } ticket_info;
typedef struct ext_save_data_info_s { typedef struct ext_save_data_info_s {