From caa8755e8a8e46cbc1dd0a883ff5d0bdddb7e9a6 Mon Sep 17 00:00:00 2001 From: Aldrik Ramaekers Date: Fri, 20 Mar 2020 13:58:59 +0100 Subject: tooltip +translations --- build-win.bat | 2 +- data/translations/en-English.mo | Bin 2238 -> 2819 bytes data/translations/nl-Dutch.mo | Bin 2375 -> 3001 bytes src/mo_edit.c | 24 +++++++++++++++++++----- 4 files changed, 20 insertions(+), 6 deletions(-) diff --git a/build-win.bat b/build-win.bat index 3dafc8f..854a2c9 100644 --- a/build-win.bat +++ b/build-win.bat @@ -9,7 +9,7 @@ ld -r -b binary -o ../bin/data.o ../data/imgs/en.png ../data/imgs/nl.png ../dat if "%1"=="-w" (SET defs=-DMODE_DEVELOPER -DMODE_GDBDEBUG) else (SET defs=-DMODE_DEVELOPER) -x86_64-w64-mingw32-gcc -m64 -Wall -g %defs% -Wno-unused-label -Wno-unused-variable mo_edit.c ../bin/data.o -o ../bin/mo-edit.exe ../misc/icon.res -lopengl32 -lkernel32 -lglu32 -lgdi32 -lcomdlg32 -lgdiplus -lole32 -lshlwapi -mwindows +x86_64-w64-mingw32-gcc -m64 -Wall -g %defs% -Wno-unused-label -Wno-unused-variable mo_edit.c ../bin/data.o -o ../bin/mo-edit.exe ../misc/icon.res -lopengl32 -lkernel32 -lglu32 -lgdi32 -lcomdlg32 -lgdiplus -lole32 -lshlwapi REM libs used for licensing: -lwininet -liphlpapi diff --git a/data/translations/en-English.mo b/data/translations/en-English.mo index 7e37574..b3ca927 100644 Binary files a/data/translations/en-English.mo and b/data/translations/en-English.mo differ diff --git a/data/translations/nl-Dutch.mo b/data/translations/nl-Dutch.mo index dfce29e..37de394 100644 Binary files a/data/translations/nl-Dutch.mo and b/data/translations/nl-Dutch.mo differ diff --git a/src/mo_edit.c b/src/mo_edit.c index a3005c4..3f9cc2c 100644 --- a/src/mo_edit.c +++ b/src/mo_edit.c @@ -159,8 +159,7 @@ s32 add_language_to_project(char *buffer) { if (string_equals(buffer, "")) { - // TODO(Aldrik): localize - platform_show_message(main_window, "Language name cannot be empty", "Invalid info"); + platform_show_message(main_window, localize("language_name_cannot_be_empty"), localize("invalid_info")); return -1; } @@ -169,8 +168,7 @@ s32 add_language_to_project(char *buffer) language *lang = array_at(¤t_project->languages, i); if (string_equals(lang->name, buffer)) { - // TODO(Aldrik): localize - platform_show_message(main_window, "Language already added", "Invalid info"); + platform_show_message(main_window, localize("language_already_added"), localize("invalid_info")); return -1; } } @@ -209,6 +207,16 @@ void set_term_name(s32 index, char *name) { if (strlen(name) > 0) { + for (s32 i = 0; i < current_project->terms.length; i++) + { + term *t = array_at(¤t_project->terms, i); + if (string_equals(t->name, name) && i != index) + { + platform_show_message(main_window, localize("term_already_added"), localize("invalid_info")); + return; + } + } + term *t = array_at(¤t_project->terms, index); string_copyn(t->name, name, MAX_TERM_NAME_LENGTH); } @@ -581,7 +589,7 @@ int main(int argc, char **argv) } // TODO(Aldrik): localize calculate_recent_project_path_max_len(); - ui_begin_menu_submenu(&submenu_recent_projects, "Recent projects"); + ui_begin_menu_submenu(&submenu_recent_projects, localize("recent_projects")); { for (s32 i = recent_projects_list.length-1; i >= 0; i--) { @@ -632,6 +640,7 @@ int main(int argc, char **argv) { current_project->selected_term_index = -1; } + ui_push_tooltip(localize("tooltip_project_overview")); ui_push_textf_width(font_medium, localize("terms"), global_ui_context.layout.width-106); @@ -639,6 +648,7 @@ int main(int argc, char **argv) { select_term(add_term_to_project()); } + ui_push_tooltip(localize("tooltip_create_new_term")); //ui_push_button_image(&btn_summary, "", delete_img); @@ -674,6 +684,7 @@ int main(int argc, char **argv) { removed = true; } + ui_push_tooltip(localize("tooltip_delete_term")); //ui_push_image(exclaim_img, 14, 14, 1, rgb(255,255,255)); @@ -746,6 +757,7 @@ int main(int argc, char **argv) { save_term_changes(); } + ui_push_tooltip(localize("tooltip_save_term")); } ui_block_end(); @@ -849,6 +861,7 @@ int main(int argc, char **argv) keyboard_set_input_text(&keyboard, ""); tb_new_language.state = true; } + ui_push_tooltip(localize("tooltip_add_language")); if (!string_equals(tb_new_language.buffer, "")) { @@ -883,6 +896,7 @@ int main(int argc, char **argv) { pressed = true; } + ui_push_tooltip(localize("tooltip_delete_language")); language *l = array_at(¤t_project->languages, i); ui_push_text_width(l->name, global_ui_context.layout.width-200, false); -- cgit v1.2.3-70-g09d2