Add missing string, fix preview bug in browser

This commit is contained in:
2024-05-12 17:46:55 -04:00
parent 3c55868183
commit 9b098f6935
4 changed files with 18 additions and 18 deletions

View File

@@ -80,6 +80,7 @@ typedef struct {
const char *dump_single; const char *dump_single;
const char *dump_all_official; const char *dump_all_official;
float start_pos; float start_pos;
const char *shuffle;
} Draw_Strings_s; } Draw_Strings_s;
typedef struct { typedef struct {

View File

@@ -663,7 +663,7 @@ void draw_interface(Entry_List_s * list, Instructions_s instructions, DrawMode d
if(current_mode == MODE_THEMES) if(current_mode == MODE_THEMES)
{ {
char * shuffle_count_string = NULL; char * shuffle_count_string = NULL;
asprintf(&shuffle_count_string, "Shuffle: %i/10", list->shuffle_count); asprintf(&shuffle_count_string, language.draw.shuffle, list->shuffle_count);
draw_text(7, 3, 0.6, 0.6, 0.6f, list->shuffle_count <= 10 && list->shuffle_count >= 2 ? colors[COLOR_WHITE] : colors[COLOR_RED], shuffle_count_string); draw_text(7, 3, 0.6, 0.6, 0.6f, list->shuffle_count <= 10 && list->shuffle_count >= 2 ? colors[COLOR_WHITE] : colors[COLOR_RED], shuffle_count_string);
free(shuffle_count_string); free(shuffle_count_string);
} }

View File

@@ -576,6 +576,7 @@ bool themeplaza_browser(EntryMode mode)
stop_audio(&audio); stop_audio(&audio);
} }
} }
continue;
} }
else if (kDown & KEY_B) else if (kDown & KEY_B)
{ {
@@ -654,7 +655,8 @@ bool themeplaza_browser(EntryMode mode)
} }
continue; continue;
} }
else if (y < 24)
if (y < 24)
{ {
if (BETWEEN(0, x, 80)) if (BETWEEN(0, x, 80))
{ {
@@ -695,12 +697,7 @@ bool themeplaza_browser(EntryMode mode)
} }
else else
{ {
if (preview_mode) if (BETWEEN(24, y, 240 - 24))
{
preview_mode = false;
continue;
}
else if (BETWEEN(24, y, 240 - 24))
{ {
if (BETWEEN(border, x, 320 - border)) if (BETWEEN(border, x, 320 - border))
{ {

View File

@@ -210,6 +210,7 @@ const Language_s language_english = {
.download_bgm = "Downloading BGM, please wait...", .download_bgm = "Downloading BGM, please wait...",
.dump_single = "Dumping theme, please wait...", .dump_single = "Dumping theme, please wait...",
.dump_all_official = "Dumping official themes, please wait...", .dump_all_official = "Dumping official themes, please wait...",
.shuffle = "Shuffle: %i/10",
}, },
.fs = .fs =
{ {
@@ -541,6 +542,7 @@ const Language_s language_french = {
.download_bgm = "Téléchargement de la musique,\nveuillez patienter...", .download_bgm = "Téléchargement de la musique,\nveuillez patienter...",
.dump_single = "Extraction du thème installé,\nveuillez patienter...", .dump_single = "Extraction du thème installé,\nveuillez patienter...",
.dump_all_official = "Extraction des thèmes officiels,\nveuillez patienter...", .dump_all_official = "Extraction des thèmes officiels,\nveuillez patienter...",
.shuffle = "Shuffle: %i/10",
}, },
.fs = .fs =
{ {
@@ -693,18 +695,18 @@ Language_s init_strings(CFG_Language lang)
{ {
switch (lang) switch (lang)
{ {
case CFG_LANGUAGE_JP: //case CFG_LANGUAGE_JP:
case CFG_LANGUAGE_FR: case CFG_LANGUAGE_FR:
return language_french; return language_french;
case CFG_LANGUAGE_DE: //case CFG_LANGUAGE_DE:
case CFG_LANGUAGE_IT: //case CFG_LANGUAGE_IT:
case CFG_LANGUAGE_ES: //case CFG_LANGUAGE_ES:
case CFG_LANGUAGE_ZH: //case CFG_LANGUAGE_ZH:
case CFG_LANGUAGE_KO: //case CFG_LANGUAGE_KO:
case CFG_LANGUAGE_NL: //case CFG_LANGUAGE_NL:
case CFG_LANGUAGE_PT: //case CFG_LANGUAGE_PT:
case CFG_LANGUAGE_RU: //case CFG_LANGUAGE_RU:
case CFG_LANGUAGE_TW: //case CFG_LANGUAGE_TW:
case CFG_LANGUAGE_EN: case CFG_LANGUAGE_EN:
return language_english; return language_english;
default: default: