Add sublabel to menu_entry_t

This commit is contained in:
twinaphex 2016-10-20 15:47:02 +02:00
parent 1471c9c299
commit 5f552253c4
5 changed files with 23 additions and 0 deletions

View File

@ -41,6 +41,17 @@ static int action_select_default(const char *path, const char *label, unsigned t
menu_file_list_cbs_t *cbs = NULL;
file_list_t *selection_buf = menu_entries_get_selection_buf_ptr(0);
entry.path[0] = '\0';
entry.label[0] = '\0';
entry.sublabel[0] = '\0';
entry.value[0] = '\0';
entry.rich_label[0] = '\0';
entry.enum_idx = MSG_UNKNOWN;
entry.entry_idx = 0;
entry.idx = 0;
entry.type = 0;
entry.spacing = 0;
menu_entry_get(&entry, 0, idx, NULL, false);
cbs = menu_entries_get_actiondata_at_offset(selection_buf, idx);

View File

@ -751,6 +751,7 @@ static void xmb_update_thumbnail_path(void *data, unsigned i)
entry.path[0] = '\0';
entry.label[0] = '\0';
entry.sublabel[0] = '\0';
entry.value[0] = '\0';
entry.rich_label[0] = '\0';
entry.enum_idx = MSG_UNKNOWN;

View File

@ -471,6 +471,7 @@ void menu_input_post_iterate(int *ret, unsigned action)
entry.path[0] = '\0';
entry.label[0] = '\0';
entry.sublabel[0] = '\0';
entry.value[0] = '\0';
entry.rich_label[0] = '\0';
entry.enum_idx = MSG_UNKNOWN;

View File

@ -84,6 +84,7 @@ void menu_entry_get_path(uint32_t i, char *s, size_t len)
entry.path[0] = '\0';
entry.label[0] = '\0';
entry.sublabel[0] = '\0';
entry.value[0] = '\0';
entry.rich_label[0] = '\0';
entry.enum_idx = MSG_UNKNOWN;
@ -103,6 +104,7 @@ void menu_entry_get_rich_label(uint32_t i, char *s, size_t len)
entry.path[0] = '\0';
entry.label[0] = '\0';
entry.sublabel[0] = '\0';
entry.value[0] = '\0';
entry.rich_label[0] = '\0';
entry.enum_idx = MSG_UNKNOWN;
@ -125,6 +127,7 @@ void menu_entry_get_label(uint32_t i, char *s, size_t len)
entry.path[0] = '\0';
entry.label[0] = '\0';
entry.sublabel[0] = '\0';
entry.value[0] = '\0';
entry.rich_label[0] = '\0';
entry.enum_idx = MSG_UNKNOWN;
@ -144,6 +147,7 @@ unsigned menu_entry_get_spacing(uint32_t i)
entry.path[0] = '\0';
entry.label[0] = '\0';
entry.sublabel[0] = '\0';
entry.value[0] = '\0';
entry.rich_label[0] = '\0';
entry.enum_idx = MSG_UNKNOWN;
@ -163,6 +167,7 @@ unsigned menu_entry_get_type_new(uint32_t i)
entry.path[0] = '\0';
entry.label[0] = '\0';
entry.sublabel[0] = '\0';
entry.value[0] = '\0';
entry.rich_label[0] = '\0';
entry.enum_idx = MSG_UNKNOWN;
@ -268,6 +273,7 @@ void menu_entry_pathdir_get_value(uint32_t i, char *s, size_t len)
entry.path[0] = '\0';
entry.label[0] = '\0';
entry.sublabel[0] = '\0';
entry.value[0] = '\0';
entry.rich_label[0] = '\0';
entry.enum_idx = MSG_UNKNOWN;
@ -297,6 +303,7 @@ void menu_entry_reset(uint32_t i)
entry.path[0] = '\0';
entry.label[0] = '\0';
entry.sublabel[0] = '\0';
entry.value[0] = '\0';
entry.rich_label[0] = '\0';
entry.enum_idx = MSG_UNKNOWN;
@ -317,6 +324,7 @@ void menu_entry_get_value(uint32_t i, void *data, char *s, size_t len)
entry.path[0] = '\0';
entry.label[0] = '\0';
entry.sublabel[0] = '\0';
entry.value[0] = '\0';
entry.rich_label[0] = '\0';
entry.enum_idx = MSG_UNKNOWN;
@ -431,6 +439,7 @@ int menu_entry_select(uint32_t i)
entry.path[0] = '\0';
entry.label[0] = '\0';
entry.sublabel[0] = '\0';
entry.value[0] = '\0';
entry.rich_label[0] = '\0';
entry.enum_idx = MSG_UNKNOWN;

View File

@ -47,6 +47,7 @@ typedef struct menu_entry
{
char path[PATH_MAX_LENGTH];
char label[PATH_MAX_LENGTH];
char sublabel[PATH_MAX_LENGTH];
char rich_label[PATH_MAX_LENGTH];
char value[PATH_MAX_LENGTH];
size_t entry_idx;