diff --git a/res/abacus_01.bmp b/res/abacus_01.bmp deleted file mode 100644 index 4e7bcc1..0000000 Binary files a/res/abacus_01.bmp and /dev/null differ diff --git a/res/aboutbox.bmp b/res/aboutbox.bmp new file mode 100644 index 0000000..d781418 Binary files /dev/null and b/res/aboutbox.bmp differ diff --git a/src/Makefile.dep b/src/Makefile.dep index d9fc72d..0debe8e 100644 --- a/src/Makefile.dep +++ b/src/Makefile.dep @@ -1,18 +1,18 @@ o = resource.o calculation.o convert.o download.o functions.o iniparser.o languages.o mainwindow.o pad.o parsermanager.o programresources.o tabs.o update.o variables.o winmain.o -calculation.o: calculation.cpp compileconfig.h parsermanager.h resource.h programresources.h iniparser.h languages.h bigtypes.h threadcontroller.h stopcalculating.h convert.h tabs.h messages.h +calculation.o: calculation.cpp compileconfig.h parsermanager.h resource.h programresources.h iniparser.h languages.h bigtypes.h threadcontroller.h stopcalculating.h convert.h tabs.h messages.h convert.o: convert.cpp convert.h compileconfig.h bigtypes.h -download.o: download.cpp download.h -functions.o: functions.cpp compileconfig.h tabs.h resource.h messages.h programresources.h iniparser.h languages.h bigtypes.h threadcontroller.h stopcalculating.h convert.h -iniparser.o: iniparser.cpp compileconfig.h iniparser.h -languages.o: languages.cpp compileconfig.h languages.h bigtypes.h -mainwindow.o: mainwindow.cpp compileconfig.h winmain.h programresources.h iniparser.h languages.h bigtypes.h threadcontroller.h stopcalculating.h convert.h resource.h messages.h tabs.h pad.h update.h download.h -pad.o: pad.cpp programresources.h compileconfig.h iniparser.h languages.h bigtypes.h threadcontroller.h stopcalculating.h convert.h resource.h messages.h -parsermanager.o: parsermanager.cpp compileconfig.h parsermanager.h resource.h programresources.h iniparser.h languages.h bigtypes.h threadcontroller.h stopcalculating.h convert.h tabs.h messages.h -programresources.o: programresources.cpp compileconfig.h programresources.h iniparser.h languages.h bigtypes.h threadcontroller.h stopcalculating.h convert.h -tabs.o: tabs.cpp compileconfig.h tabs.h resource.h messages.h programresources.h iniparser.h languages.h bigtypes.h threadcontroller.h stopcalculating.h convert.h -update.o: update.cpp update.h download.h programresources.h compileconfig.h iniparser.h languages.h bigtypes.h threadcontroller.h stopcalculating.h convert.h messages.h resource.h winmain.h tabs.h pad.h -variables.o: variables.cpp compileconfig.h tabs.h resource.h messages.h programresources.h iniparser.h languages.h bigtypes.h threadcontroller.h stopcalculating.h convert.h +download.o: download.cpp compileconfig.h download.h +functions.o: functions.cpp compileconfig.h tabs.h resource.h messages.h programresources.h iniparser.h languages.h bigtypes.h threadcontroller.h stopcalculating.h convert.h +iniparser.o: iniparser.cpp compileconfig.h iniparser.h +languages.o: languages.cpp compileconfig.h languages.h bigtypes.h +mainwindow.o: mainwindow.cpp compileconfig.h winmain.h programresources.h iniparser.h languages.h bigtypes.h threadcontroller.h stopcalculating.h convert.h resource.h messages.h tabs.h pad.h update.h download.h +pad.o: pad.cpp programresources.h compileconfig.h iniparser.h languages.h bigtypes.h threadcontroller.h stopcalculating.h convert.h resource.h messages.h pad.h +parsermanager.o: parsermanager.cpp compileconfig.h parsermanager.h resource.h programresources.h iniparser.h languages.h bigtypes.h threadcontroller.h stopcalculating.h convert.h tabs.h messages.h +programresources.o: programresources.cpp compileconfig.h programresources.h iniparser.h languages.h bigtypes.h threadcontroller.h stopcalculating.h convert.h +tabs.o: tabs.cpp compileconfig.h tabs.h resource.h messages.h programresources.h iniparser.h languages.h bigtypes.h threadcontroller.h stopcalculating.h convert.h +update.o: update.cpp compileconfig.h update.h download.h programresources.h iniparser.h languages.h bigtypes.h threadcontroller.h stopcalculating.h convert.h messages.h resource.h winmain.h tabs.h pad.h +variables.o: variables.cpp compileconfig.h tabs.h resource.h messages.h programresources.h iniparser.h languages.h bigtypes.h threadcontroller.h stopcalculating.h convert.h winmain.o: winmain.cpp compileconfig.h winmain.h programresources.h iniparser.h languages.h bigtypes.h threadcontroller.h stopcalculating.h convert.h resource.h messages.h tabs.h pad.h .SUFFIXES: .cpp .o diff --git a/src/languages.cpp b/src/languages.cpp index ab1c489..bf7580b 100644 --- a/src/languages.cpp +++ b/src/languages.cpp @@ -110,7 +110,7 @@ void Languages::InitErrorMessagesTab() InsertErrorPair(ttmath::err_must_be_only_one_value,"Variables or functions must return only one value"); InsertErrorPair(ttmath::err_still_calculating,"Calculating..."); InsertErrorPair(ttmath::err_percent_from,"Incorrectly used percentage operator"); - + // other english translation: the percentage operator used in incorrect way /* @@ -362,6 +362,13 @@ void Languages::InitGuiMessagesTab() { /* english gui messages + + & - (ampersand) used in menus or buttons, means the key shortcut + (when left Alt is pressed you see a small line at the bottom of a specified letter) + \t - tabulator + \r\n - new line + %d - another integer value (leave it) + %s - another string (leave it) */ gui_messages_tab.push_back( std::map() ); @@ -413,7 +420,7 @@ void Languages::InitGuiMessagesTab() InsertGuiPair(overflow_during_printing,"Overflow during printing"); - InsertGuiPair(combo_rounding_none,"None"); + InsertGuiPair(combo_rounding_none,"none"); InsertGuiPair(combo_rounding_integer,"to integer"); InsertGuiPair(combo_rounding_to_number,"to"); InsertGuiPair(combo_rounding_after_comma,"digit(s)"); @@ -425,8 +432,18 @@ void Languages::InitGuiMessagesTab() InsertGuiPair(display_always_scientific,"Always"); InsertGuiPair(display_not_always_scientific,"When the exponent is greater than:"); InsertGuiPair(display_group_scientific, "Print the result as the scientific value"); - InsertGuiPair(display_decimal_point, "Output decimal point"); - InsertGuiPair(display_deg_rad_grad, "sin/cos asin/acos"); + InsertGuiPair(display_deg_rad_grad, "Trigonometric functions"); + InsertGuiPair(display_grouping, "Grouping"); // e.g. 1`000`000 + InsertGuiPair(display_grouping_none, "none"); + InsertGuiPair(display_grouping_space, "space"); + InsertGuiPair(display_input_decimal_point, "Input decimal point"); // Decimal point in formula + InsertGuiPair(display_input_decimal_point_item1, " . or ,"); + InsertGuiPair(display_output_decimal_point, "Output decimal point"); // Decimal point in result + InsertGuiPair(display_param_sep, "Parameters separated by"); + InsertGuiPair(display_param_sep_item2, " ; or ."); + InsertGuiPair(display_param_sep_item3, " ; or ,"); + + InsertGuiPair(convert_type, "Type"); InsertGuiPair(convert_input, "Input"); InsertGuiPair(convert_output, "Output"); @@ -439,8 +456,8 @@ void Languages::InitGuiMessagesTab() InsertGuiPair(menu_view_new_window, "&New window"); InsertGuiPair(menu_view_normal_view, "No&rmal view"); InsertGuiPair(menu_view_compact_view, "C&ompact view"); + InsertGuiPair(menu_view_pad, "&Pad"); InsertGuiPair(menu_view_always_on_top, "&Always on top"); - InsertGuiPair(menu_view_pad, "&Pad"); InsertGuiPair(menu_view_lang_english, "&English"); InsertGuiPair(menu_view_lang_polish, "&Polish"); InsertGuiPair(menu_view_lang_spanish, "&Spanish"); @@ -450,11 +467,22 @@ void Languages::InitGuiMessagesTab() InsertGuiPair(menu_view_lang_swedish, "&Swedish"); InsertGuiPair(menu_view_close_program, "&Close"); InsertGuiPair(menu_edit_undo, "&Undo \tCtrl+Z"); - InsertGuiPair(menu_edit_paste_formula, "&Paste formula\tCtrl+V"); - InsertGuiPair(menu_edit_copy_result, "&Copy result \tCtrl+R"); + InsertGuiPair(menu_edit_cut, "Cu&t \tCtrl+X"); + InsertGuiPair(menu_edit_copy, "&Copy \tCtrl+C"); + InsertGuiPair(menu_edit_paste, "&Paste"); // cutting, copying, pasting the the edit which has a focus + InsertGuiPair(menu_edit_del, "&Delete \tDel"); + InsertGuiPair(menu_edit_paste_formula, "Paste &formula\tCtrl+V"); // pasting directly to input edit + InsertGuiPair(menu_edit_copy_result, "Copy &result \tCtrl+R"); + InsertGuiPair(menu_edit_copy_both, "Copy &both \tCtrl+B"); // copying in this way: "input edit = output edit" + InsertGuiPair(menu_edit_select_all, "Select &all \tEsc"); + InsertGuiPair(menu_edit_bracket, "Bracke&t \tCtrl+0"); // inserting brackets: (...) InsertGuiPair(menu_help_help, "&Help"); InsertGuiPair(menu_help_project_page, "&Project page"); + InsertGuiPair(menu_help_check_update, "&Check update..."); InsertGuiPair(menu_help_about, "&About"); + InsertGuiPair(menu_update_available, "&New version is available"); // not implemented yet + // this will be a new main menu item (one after 'help') visible only if there is an update + InsertGuiPair(cant_init_calculations, "I could not initialize the module for calculations"); InsertGuiPair(message_box_error_caption,"TTCalc"); InsertGuiPair(cant_create_thread, "I could not create the second thread for calculating"); @@ -462,18 +490,19 @@ void Languages::InitGuiMessagesTab() InsertGuiPair(cant_create_main_window, "I could not create the main window of the application"); InsertGuiPair(cant_init_common_controls,"I could not initialize the common controls (InitCommonControlsEx)"); InsertGuiPair(about_text, - "Mathematical calculator TTCalc %d.%d.%d%s%s\r\n" + "Mathematical calculator TTCalc %d.%d.%d%s%s\r\n\r\n" "Author: Tomasz Sowa\r\n" "Contact: t.sowa@ttmath.org\r\n" "Licence: BSD (open source)\r\n" "Project page: http://ttcalc.sourceforge.net\r\n" "Bignum library: TTMath %d.%d.%d%s\r\n" + "Bignum type: binary floating point numbers\r\n" "Programming language: C++\r\n" "Compiler: %s\r\n" "%s" // for upx "\r\n" "TTCalc uses the TTMath bignum library" - " which can be found at http://sourceforge.net/projects/ttmath\r\n" + " which can be found at http://www.ttmath.org\r\n" "\r\n" #ifdef TTCALC_PORTABLE "This is the portable version of the program TTCalc. In this version " @@ -481,9 +510,14 @@ void Languages::InitGuiMessagesTab() "mantissa and 32 bits for the exponent) it's about +/-6.9e+646457021.\r\n" "\r\n" #endif - "If you have any questions, advices or interesting ideas about" - " this program or if you want to join to this project as" - " a developer or a programmer feel free to contant with the author." + "Translations:\r\n" + "English Author\r\n" // one tabulator between language and the name of the author + "Polish Author\r\n" + "Spanish Alejandro S. Valdezate \r\n" + "Danish Rune Bisgaard Vammen \r\n" + "Chinese Juis \r\n" + "Russian Vladimir Gladilovich \r\n" + "Swedish Lars 'Bafvert' Gafvert \r\n" ); InsertGuiPair(about_text_portable_version, " portable version"); InsertGuiPair(about_text_exe_packer, "EXE Packer: UPX 3.03\r\n"); @@ -492,6 +526,37 @@ void Languages::InitGuiMessagesTab() InsertGuiPair(unknown_error, "An unknown error has occurred"); InsertGuiPair(cant_find_help, "I can't find any help files"); InsertGuiPair(cant_open_project_page, "I can't open the project webpage"); + InsertGuiPair(update_title, "Check for a new version"); + InsertGuiPair(update_button_next, "Next"); + InsertGuiPair(update_button_finish, "Finish"); + InsertGuiPair(update_button_cancel, "Cancel"); + InsertGuiPair(update_check_at_startup, "Always check for the update on startup"); + InsertGuiPair(update_check_for_info, "Press Next to check for the update..."); + InsertGuiPair(update_is_new_version, "Version %d.%d.%d is available, press Next to download..."); + InsertGuiPair(update_no_new_version, "There is not a new version available."); + InsertGuiPair(update_download_from, "Downloading from..."); +#ifndef TTCALC_PORTABLE + InsertGuiPair(update_downloaded_info1, "A new setup program has been downloaded."); + InsertGuiPair(update_downloaded_info2, "Press Finish to close TTCalc and run the installer."); +#else + InsertGuiPair(update_downloaded_info1, "A new version of TTCalc has been downloaded."); + InsertGuiPair(update_downloaded_info2, ""); +#endif + InsertGuiPair(update_download_error, "There was a problem with downloading, please try again later."); + + InsertGuiPair(pad_title, "Pad"); + InsertGuiPair(pad_menu_file, "&File"); + InsertGuiPair(pad_menu_edit, "&Edit"); + InsertGuiPair(pad_menu_file_new, "&New"); // temporarily not used + InsertGuiPair(pad_menu_file_open, "&Open..."); + InsertGuiPair(pad_menu_file_saveas, "Save &as..."); + InsertGuiPair(pad_menu_file_close, "&Close"); + InsertGuiPair(pad_menu_edit_undo, "&Undo \tCtrl+Z"); + InsertGuiPair(pad_menu_edit_cut, "Cu&t \tCtrl+X"); + InsertGuiPair(pad_menu_edit_copy, "&Copy \tCtrl+C"); + InsertGuiPair(pad_menu_edit_paste, "&Paste \tCtrl+V"); + InsertGuiPair(pad_menu_edit_del, "&Del \tDel"); + InsertGuiPair(pad_menu_edit_select_all, "Select &all \tCtrl+A"); @@ -561,8 +626,17 @@ void Languages::InitGuiMessagesTab() InsertGuiPair(display_always_scientific,"Zawsze"); InsertGuiPair(display_not_always_scientific,"Jeœli eksponent jest wiêkszy ni¿:"); InsertGuiPair(display_group_scientific, "Wyœwietl wynik w postaci naukowej"); - InsertGuiPair(display_decimal_point, "Przecinek dziesiêtny"); - InsertGuiPair(display_deg_rad_grad, "sin/cos asin/acos"); + InsertGuiPair(display_deg_rad_grad, "Funkcje trygonometryczne"); + InsertGuiPair(display_grouping, "Grupowanie"); + InsertGuiPair(display_grouping_none, "brak"); + InsertGuiPair(display_grouping_space, "spacja"); + InsertGuiPair(display_input_decimal_point, "Przecinek w formule"); + InsertGuiPair(display_input_decimal_point_item1, " . lub ,"); + InsertGuiPair(display_output_decimal_point, "Przecinek w wyniku"); + InsertGuiPair(display_param_sep, "Parametry oddzielane przez"); + InsertGuiPair(display_param_sep_item2, " ; lub ."); + InsertGuiPair(display_param_sep_item3, " ; lub ,"); + InsertGuiPair(convert_type, "Typ"); InsertGuiPair(convert_input, "Wejœcie"); InsertGuiPair(convert_output, "Wyjœcie"); @@ -586,11 +660,21 @@ void Languages::InitGuiMessagesTab() InsertGuiPair(menu_view_lang_swedish, "&Szwedzki"); InsertGuiPair(menu_view_close_program, "&Zamknij"); InsertGuiPair(menu_edit_undo, "&Cofnij"); - InsertGuiPair(menu_edit_paste_formula, "&Wklej"); - InsertGuiPair(menu_edit_copy_result, "&Kopiuj wynik"); + InsertGuiPair(menu_edit_cut, "Wy&tnij \tCtrl+X"); + InsertGuiPair(menu_edit_copy, "&Kopiuj \tCtrl+C"); + InsertGuiPair(menu_edit_paste, "&Wklej"); + InsertGuiPair(menu_edit_del, "&Usuñ \tDel"); + InsertGuiPair(menu_edit_paste_formula, "&Wklej formu³ê \tCtrl+V"); + InsertGuiPair(menu_edit_copy_result, "&Kopiuj wynik \tCtrl+R"); + InsertGuiPair(menu_edit_copy_both, "Kopiuj &obydwa \tCtrl+B"); + InsertGuiPair(menu_edit_select_all, "Zaznacz &wszystko \tEsc"); + InsertGuiPair(menu_edit_bracket, "&Nawiasy \tCtrl+0"); InsertGuiPair(menu_help_help, "&Pomoc"); InsertGuiPair(menu_help_project_page, "&Strona projektu"); + InsertGuiPair(menu_help_check_update, "SprawdŸ &aktualizacjê..."); InsertGuiPair(menu_help_about, "&O programie"); + InsertGuiPair(menu_update_available, "&Jest nowa wersja programu"); + InsertGuiPair(cant_init_calculations, "Nie uda³o siê zainicjalizowaæ modu³u obs³ugi obliczeñ"); InsertGuiPair(message_box_error_caption,"TTCalc"); InsertGuiPair(cant_create_thread, "Nie uda³o siê utworzyæ drugiego w¹tku do obliczeñ"); @@ -598,18 +682,19 @@ void Languages::InitGuiMessagesTab() InsertGuiPair(cant_create_main_window, "Nie uda³o siê utworzyæ g³ównego okna aplikacji"); InsertGuiPair(cant_init_common_controls,"Nie uda³o siê zainicjalizowaæ obs³ugi Common Controls (InitCommonControlsEx)"); InsertGuiPair(about_text, - "Kalkulator matematyczny TTCalc %d.%d.%d%s%s\r\n" + "Kalkulator matematyczny TTCalc %d.%d.%d%s%s\r\n\r\n" "Autor: Tomasz Sowa\r\n" "Kontakt: t.sowa@ttmath.org\r\n" "Licencja: BSD (open source)\r\n" "Strona projektu: http://ttcalc.sourceforge.net\r\n" "Biblioteka du¿ych liczb: TTMath %d.%d.%d%s\r\n" + "Rodzaj du¿ych liczb: liczby binarne zmiennoprzecinkowe\r\n" "Jêzyk programowania: C++\r\n" "Kompilator: %s\r\n" "%s" // for upx "\r\n" "Ten program u¿ywa biblioteki du¿ych liczb TTMath" - " która jest dostêpna na http://sourceforge.net/projects/ttmath\r\n" + " która jest dostêpna na http://www.ttmath.org\r\n" "\r\n" #ifdef TTCALC_PORTABLE "To jest wersja portable programu TTCalc. W tej wersji mo¿esz dokonywaæ " @@ -617,9 +702,14 @@ void Languages::InitGuiMessagesTab() "oraz 32 bitowy wyk³adnik) to jest oko³o +/-6.9e+646457021.\r\n" "\r\n" #endif - "Je¿eli masz jakieœ pytania, rady, ciekawe pomys³y dotycz¹ce" - " tego programu lub chcia³byœ do³¹czyæ jako projektant/programista" - " poprostu skontaktuj siê z autorem." + "T³umaczenie:\r\n" + "Angielski Author\r\n" // tab + two spaces + "Polski Author\r\n" + "Hiszpañski Alejandro S. Valdezate \r\n" // only one space + "Duñski Rune Bisgaard Vammen \r\n" + "Chiñski Juis \r\n" + "Rosyjski Vladimir Gladilovich \r\n" + "Szwedzki Lars 'Bafvert' Gafvert \r\n" ); InsertGuiPair(about_text_portable_version, " wersja portable"); InsertGuiPair(about_text_exe_packer, "Paker exe: UPX 3.03\r\n"); @@ -628,7 +718,37 @@ void Languages::InitGuiMessagesTab() InsertGuiPair(unknown_error, "Nieznany kod b³êdu"); InsertGuiPair(cant_find_help, "Nie mogê znale¿æ ¿adnych plików pomocy"); InsertGuiPair(cant_open_project_page, "Nie mogê otworzyæ strony projektu"); + InsertGuiPair(update_title, "SprawdŸ dostêpnoœæ nowej wersji"); + InsertGuiPair(update_button_next, "Dalej"); + InsertGuiPair(update_button_finish, "Zakoñcz"); + InsertGuiPair(update_button_cancel, "Anuluj"); + InsertGuiPair(update_check_at_startup, "Zawsze sprawdzaj aktualizacje podczas uruchamiania"); + InsertGuiPair(update_check_for_info, "Wciœnij Dalej aby sprawdziæ dostêpnoœæ aktualizacji..."); + InsertGuiPair(update_is_new_version, "Wersja %d.%d.%d jest dostêpna, wciœnij Dalej aby j¹ pobraæ..."); + InsertGuiPair(update_no_new_version, "Nie ma dostêpnej nowej wersji programu."); + InsertGuiPair(update_download_from, "Pobieranie z..."); +#ifndef TTCALC_PORTABLE + InsertGuiPair(update_downloaded_info1, "Nowy instalator zosta³ œci¹gniêty."); + InsertGuiPair(update_downloaded_info2, "Wciœnij Zakoñcz aby zamkn¹æ program TTCalc i uruchomiæ pobrany instalator."); +#else + InsertGuiPair(update_downloaded_info1, "Nowa wersja programu TTCalc zosta³a œci¹gniêta"); + InsertGuiPair(update_downloaded_info2, ""); +#endif + InsertGuiPair(update_download_error, "Wyst¹pi³y problemy ze œci¹ganiem, proszê spróbowaæ ponownie póŸniej"); + InsertGuiPair(pad_title, "Padzzzzz"); + InsertGuiPair(pad_menu_file, "&Plik"); + InsertGuiPair(pad_menu_edit, "&Edycja"); + InsertGuiPair(pad_menu_file_new, "&Nowy"); // temporarily not used + InsertGuiPair(pad_menu_file_open, "&Otwórz..."); + InsertGuiPair(pad_menu_file_saveas, "Zapisz &jako..."); + InsertGuiPair(pad_menu_file_close, "&Zamknij"); + InsertGuiPair(pad_menu_edit_undo, "&Cofnij \tCtrl+Z"); + InsertGuiPair(pad_menu_edit_cut, "Wy&tnij \tCtrl+X"); + InsertGuiPair(pad_menu_edit_copy, "&Kopiuj \tCtrl+C"); + InsertGuiPair(pad_menu_edit_paste, "&Wklej \tCtrl+V"); + InsertGuiPair(pad_menu_edit_del, "&Usuñ \tDel"); + InsertGuiPair(pad_menu_edit_select_all, "Zaznacz wszystko \tCtrl+A"); @@ -700,12 +820,20 @@ void Languages::InitGuiMessagesTab() InsertGuiPair(display_always_scientific,"Siempre"); InsertGuiPair(display_not_always_scientific,"Cuando el exponente es mas grande que:"); InsertGuiPair(display_group_scientific, "Imprimir el resultado como valor cientifico"); - InsertGuiPair(display_decimal_point, "Decimal point"); - InsertGuiPair(display_deg_rad_grad, "sin/cos asin/acos"); + InsertGuiPair(display_deg_rad_grad, "Trigonometric functions"); InsertGuiPair(convert_type, "Tipo"); InsertGuiPair(convert_input, "Entrada"); InsertGuiPair(convert_output, "Salida"); InsertGuiPair(convert_dynamic_output, "Auto prefijo"); + InsertGuiPair(display_grouping, "Grouping"); + InsertGuiPair(display_grouping_none, "None"); + InsertGuiPair(display_grouping_space, "Space"); + InsertGuiPair(display_input_decimal_point, "Input decimal point"); + InsertGuiPair(display_input_decimal_point_item1, " . or ,"); + InsertGuiPair(display_output_decimal_point, "Output decimal point"); + InsertGuiPair(display_param_sep, "Parameters separated by"); + InsertGuiPair(display_param_sep_item2, " ; or ."); + InsertGuiPair(display_param_sep_item3, " ; or ,"); InsertGuiPair(menu_view, "&Ver"); InsertGuiPair(menu_edit, "&Editar"); @@ -725,11 +853,21 @@ void Languages::InitGuiMessagesTab() InsertGuiPair(menu_view_lang_swedish, "&Swedish"); InsertGuiPair(menu_view_close_program, "&Close"); InsertGuiPair(menu_edit_undo, "&Deshacer"); + InsertGuiPair(menu_edit_cut, "Cu&t \tCtrl+X"); + InsertGuiPair(menu_edit_copy, "&Copy \tCtrl+C"); + InsertGuiPair(menu_edit_paste, "&Paste"); + InsertGuiPair(menu_edit_del, "&Delete \tDel"); InsertGuiPair(menu_edit_paste_formula, "&Pegar"); InsertGuiPair(menu_edit_copy_result, "&Copiar resultado"); + InsertGuiPair(menu_edit_copy_both, "Copy &both \tCtrl+B"); + InsertGuiPair(menu_edit_select_all, "Select &all \tEsc"); + InsertGuiPair(menu_edit_bracket, "Bracke&t \tCtrl+0"); InsertGuiPair(menu_help_help, "&Ayuda"); InsertGuiPair(menu_help_project_page, "&Pagina del proyecto"); + InsertGuiPair(menu_help_check_update, "&Check update..."); InsertGuiPair(menu_help_about, "&Acerca de"); + InsertGuiPair(menu_update_available, "&New version is available"); + InsertGuiPair(cant_init_calculations, "No se puede inicializar el modulo de calculo"); InsertGuiPair(message_box_error_caption,"TTCalc"); InsertGuiPair(cant_create_thread, "No se puede crear la segunda hebra para calcular"); @@ -737,18 +875,19 @@ void Languages::InitGuiMessagesTab() InsertGuiPair(cant_create_main_window, "No se puede crear la ventana principal par ala aplicacion"); InsertGuiPair(cant_init_common_controls,"No se pueden inicializar los controles comunes (InitCommonControlsEx)"); InsertGuiPair(about_text, - "Calculadora matematica TTCalc %d.%d.%d%s%s\r\n" + "Calculadora matematica TTCalc %d.%d.%d%s%s\r\n\r\n" "Autor: Tomasz Sowa\r\n" "Contacto: t.sowa@ttmath.org\r\n" "Licencia: BSD (open source)\r\n" "Pagina del proyecto: http://ttcalc.sourceforge.net\r\n" "Biblioteca Bignum: TTMath %d.%d.%d%s\r\n" + "Bignum type: binary floating point numbers\r\n" "Lenguaje de programacion: C++\r\n" "Compilador: %s\r\n" "%s" // for upx "\r\n" "TTCalc usa la biblioteca TTMath bignum" - " la cual puede ser encontrada en http://sourceforge.net/projects/ttmath\r\n" + " la cual puede ser encontrada en http://www.ttmath.org\r\n" "\r\n" #ifdef TTCALC_PORTABLE "Esta es la version portatil del programa TTCalc. En esta version " @@ -756,9 +895,14 @@ void Languages::InitGuiMessagesTab() "mantisa y 32 bits para el exponente) que es aproximadamente +/-6.9e+646457021.\r\n" "\r\n" #endif - "Si tienes preguntas, consejos o ideas interesantes sobre" - " este programa o si quieres unirte a este proyecto como" - " desarrollador o programador, no dudes en contactar con el autor." + "Translations:\r\n" + "English Author\r\n" // one tabulator between language and the name of the author + "Polish Author\r\n" + "Spanish Alejandro S. Valdezate \r\n" + "Danish Rune Bisgaard Vammen \r\n" + "Chinese Juis \r\n" + "Russian Vladimir Gladilovich \r\n" + "Swedish Lars 'Bafvert' Gafvert \r\n" ); InsertGuiPair(about_text_portable_version, " version portatil"); InsertGuiPair(about_text_exe_packer, "EXE Packer: UPX 3.03\r\n"); @@ -767,6 +911,37 @@ void Languages::InitGuiMessagesTab() InsertGuiPair(unknown_error, "Ocurrio un error desconocido"); InsertGuiPair(cant_find_help, "No se encuentran los ficheros de ayuda"); InsertGuiPair(cant_open_project_page, "No se puede abrir la pagina dle proyecto"); + InsertGuiPair(update_title, "Check for a new version"); + InsertGuiPair(update_button_next, "Next"); + InsertGuiPair(update_button_finish, "Finish"); + InsertGuiPair(update_button_cancel, "Cancel"); + InsertGuiPair(update_check_at_startup, "Always check for the update on startup"); + InsertGuiPair(update_check_for_info, "Press Next to check for the update..."); + InsertGuiPair(update_is_new_version, "Version %d.%d.%d is available, press Next to download..."); + InsertGuiPair(update_no_new_version, "There is not a new version available."); + InsertGuiPair(update_download_from, "Downloading from..."); +#ifndef TTCALC_PORTABLE + InsertGuiPair(update_downloaded_info1, "A new setup program has been downloaded."); + InsertGuiPair(update_downloaded_info2, "Press Finish to close TTCalc and run the installer."); +#else + InsertGuiPair(update_downloaded_info1, "A new version of TTCalc has been downloaded."); + InsertGuiPair(update_downloaded_info2, ""); +#endif + InsertGuiPair(update_download_error, "There was a problem with downloading, please try again later."); + + InsertGuiPair(pad_title, "Pad"); + InsertGuiPair(pad_menu_file, "&File"); + InsertGuiPair(pad_menu_edit, "&Edit"); + InsertGuiPair(pad_menu_file_new, "&New"); // temporarily not used + InsertGuiPair(pad_menu_file_open, "&Open..."); + InsertGuiPair(pad_menu_file_saveas, "Save &as..."); + InsertGuiPair(pad_menu_file_close, "&Close"); + InsertGuiPair(pad_menu_edit_undo, "&Undo \tCtrl+Z"); + InsertGuiPair(pad_menu_edit_cut, "Cu&t \tCtrl+X"); + InsertGuiPair(pad_menu_edit_copy, "&Copy \tCtrl+C"); + InsertGuiPair(pad_menu_edit_paste, "&Paste \tCtrl+V"); + InsertGuiPair(pad_menu_edit_del, "&Del \tDel"); + InsertGuiPair(pad_menu_edit_select_all, "Select &all \tCtrl+A"); @@ -836,12 +1011,20 @@ void Languages::InitGuiMessagesTab() InsertGuiPair(display_always_scientific,"Altid"); InsertGuiPair(display_not_always_scientific,"Når exponenten er større end:"); InsertGuiPair(display_group_scientific, "Print resultatet som den videnskablige værdi"); - InsertGuiPair(display_decimal_point, "Decimal punkt"); - InsertGuiPair(display_deg_rad_grad, "sin/cos asin/acos"); + InsertGuiPair(display_deg_rad_grad, "Trigonometric functions"); InsertGuiPair(convert_type, "Type"); InsertGuiPair(convert_input, "Input"); InsertGuiPair(convert_output, "Udput"); InsertGuiPair(convert_dynamic_output, "Auto præfix"); + InsertGuiPair(display_grouping, "Grouping"); + InsertGuiPair(display_grouping_none, "None"); + InsertGuiPair(display_grouping_space, "Space"); + InsertGuiPair(display_input_decimal_point, "Input decimal point"); + InsertGuiPair(display_input_decimal_point_item1, " . or ,"); + InsertGuiPair(display_output_decimal_point, "Output decimal point"); + InsertGuiPair(display_param_sep, "Parameters separated by"); + InsertGuiPair(display_param_sep_item2, " ; or ."); + InsertGuiPair(display_param_sep_item3, " ; or ,"); InsertGuiPair(menu_view, "&Vis"); InsertGuiPair(menu_edit, "&Rediger"); @@ -861,11 +1044,21 @@ void Languages::InitGuiMessagesTab() InsertGuiPair(menu_view_lang_swedish, "S&wedish"); InsertGuiPair(menu_view_close_program, "&Afslut"); InsertGuiPair(menu_edit_undo, "&Fortryd"); + InsertGuiPair(menu_edit_cut, "Cu&t \tCtrl+X"); + InsertGuiPair(menu_edit_copy, "&Copy \tCtrl+C"); + InsertGuiPair(menu_edit_paste, "&Paste"); + InsertGuiPair(menu_edit_del, "&Delete \tDel"); InsertGuiPair(menu_edit_paste_formula, "&Sæt ind"); InsertGuiPair(menu_edit_copy_result, "&Kopier resultatet"); + InsertGuiPair(menu_edit_copy_both, "Copy &both \tCtrl+B"); + InsertGuiPair(menu_edit_select_all, "Select &all \tEsc"); + InsertGuiPair(menu_edit_bracket, "Bracke&t \tCtrl+0"); InsertGuiPair(menu_help_help, "&Hjælp"); InsertGuiPair(menu_help_project_page, "&Projekt side"); + InsertGuiPair(menu_help_check_update, "&Check update..."); InsertGuiPair(menu_help_about, "&Om"); + InsertGuiPair(menu_update_available, "&New version is available"); + InsertGuiPair(cant_init_calculations, "Moduelt for uregninger kunne ikke sættes i gang"); InsertGuiPair(message_box_error_caption,"TTCalc"); InsertGuiPair(cant_create_thread, "Den anden tråd for udregning kunne ikke laves"); @@ -873,18 +1066,19 @@ void Languages::InitGuiMessagesTab() InsertGuiPair(cant_create_main_window, "Applikationens hovedvindue kunne ikke laves"); InsertGuiPair(cant_init_common_controls,"De fælles kontrol indstillinger kunne ikke sættes i gang (InitCommonControlsEx)"); InsertGuiPair(about_text, - "Matematisk lommeregner TTCalc %d.%d.%d%s%s\r\n" + "Matematisk lommeregner TTCalc %d.%d.%d%s%s\r\n\r\n" "Forfatter: Tomasz Sowa\r\n" "Kontakt: t.sowa@ttmath.org\r\n" "Licens: BSD (open source)\r\n" "Projekt side: http://ttcalc.sourceforge.net\r\n" "Bignum biblotek: TTMath %d.%d.%d%s\r\n" + "Bignum type: binary floating point numbers\r\n" "Programmerings sprog: C++\r\n" "Kompilator: %s\r\n" "%s" // for upx "\r\n" "TTCalc bruger TTMath bignum bibloteket" - " som kan findes ved http://sourceforge.net/projects/ttmath\r\n" + " som kan findes ved http://www.ttmath.org\r\n" "\r\n" #ifdef TTCALC_PORTABLE "Dette er den transportable version af programmet TTCalc. I denne version " @@ -892,9 +1086,14 @@ void Languages::InitGuiMessagesTab() "mantissen og 32 bits for exponenten) det er omkring +/-6.9e+646457021.\r\n" "\r\n" #endif - "Hvis du har spørgsmål, gode råd eller interessante idér vedrørende" - " dette program eller hvis du vil tilslutte dig dette projekt som" - " en udvikler eller en programmør er du velkommen til at kontakte forfatteren." + "Translations:\r\n" + "English Author\r\n" // one tabulator between language and the name of the author + "Polish Author\r\n" + "Spanish Alejandro S. Valdezate \r\n" + "Danish Rune Bisgaard Vammen \r\n" + "Chinese Juis \r\n" + "Russian Vladimir Gladilovich \r\n" + "Swedish Lars 'Bafvert' Gafvert \r\n" ); InsertGuiPair(about_text_portable_version, " transportabel version"); InsertGuiPair(about_text_exe_packer, "EXE Packer: UPX 3.03\r\n"); @@ -903,7 +1102,37 @@ void Languages::InitGuiMessagesTab() InsertGuiPair(unknown_error, "Der er sket en ukendt fejl"); InsertGuiPair(cant_find_help, "Der kunne ikke findes nogen hjælp filer"); InsertGuiPair(cant_open_project_page, "Projekt siden kunne ikke åbnes"); + InsertGuiPair(update_title, "Check for a new version"); + InsertGuiPair(update_button_next, "Next"); + InsertGuiPair(update_button_finish, "Finish"); + InsertGuiPair(update_button_cancel, "Cancel"); + InsertGuiPair(update_check_at_startup, "Always check for the update on startup"); + InsertGuiPair(update_check_for_info, "Press Next to check for the update..."); + InsertGuiPair(update_is_new_version, "Version %d.%d.%d is available, press Next to download..."); + InsertGuiPair(update_no_new_version, "There is not a new version available."); + InsertGuiPair(update_download_from, "Downloading from..."); +#ifndef TTCALC_PORTABLE + InsertGuiPair(update_downloaded_info1, "A new setup program has been downloaded."); + InsertGuiPair(update_downloaded_info2, "Press Finish to close TTCalc and run the installer."); +#else + InsertGuiPair(update_downloaded_info1, "A new version of TTCalc has been downloaded."); + InsertGuiPair(update_downloaded_info2, ""); +#endif + InsertGuiPair(update_download_error, "There was a problem with downloading, please try again later."); + InsertGuiPair(pad_title, "Pad"); + InsertGuiPair(pad_menu_file, "&File"); + InsertGuiPair(pad_menu_edit, "&Edit"); + InsertGuiPair(pad_menu_file_new, "&New"); // temporarily not used + InsertGuiPair(pad_menu_file_open, "&Open..."); + InsertGuiPair(pad_menu_file_saveas, "Save &as..."); + InsertGuiPair(pad_menu_file_close, "&Close"); + InsertGuiPair(pad_menu_edit_undo, "&Undo \tCtrl+Z"); + InsertGuiPair(pad_menu_edit_cut, "Cu&t \tCtrl+X"); + InsertGuiPair(pad_menu_edit_copy, "&Copy \tCtrl+C"); + InsertGuiPair(pad_menu_edit_paste, "&Paste \tCtrl+V"); + InsertGuiPair(pad_menu_edit_del, "&Del \tDel"); + InsertGuiPair(pad_menu_edit_select_all, "Select &all \tCtrl+A"); /* @@ -971,12 +1200,20 @@ void Languages::InitGuiMessagesTab() InsertGuiPair(display_always_scientific,"Ò»Ö±"); InsertGuiPair(display_not_always_scientific,"µ±Ö¸Êý´óÓÚ:"); InsertGuiPair(display_group_scientific, "°´¿Æѧ¼ÆÊý·¨Êä³ö½á¹û"); - InsertGuiPair(display_decimal_point, "СÊýµã"); - InsertGuiPair(display_deg_rad_grad, "sin/cos asin/acos"); + InsertGuiPair(display_deg_rad_grad, "Trigonometric functions"); InsertGuiPair(convert_type, "ÀàÐÍ"); InsertGuiPair(convert_input, "ÊäÈë"); InsertGuiPair(convert_output, "Êä³ö"); InsertGuiPair(convert_dynamic_output, "×Ô¶¯"); + InsertGuiPair(display_grouping, "Grouping"); + InsertGuiPair(display_grouping_none, "None"); + InsertGuiPair(display_grouping_space, "Space"); + InsertGuiPair(display_input_decimal_point, "Input decimal point"); + InsertGuiPair(display_input_decimal_point_item1, " . or ,"); + InsertGuiPair(display_output_decimal_point, "Output decimal point"); + InsertGuiPair(display_param_sep, "Parameters separated by"); + InsertGuiPair(display_param_sep_item2, " ; or ."); + InsertGuiPair(display_param_sep_item3, " ; or ,"); InsertGuiPair(menu_view, "&²é¿´"); InsertGuiPair(menu_edit, "&±à¼­"); @@ -996,11 +1233,21 @@ void Languages::InitGuiMessagesTab() InsertGuiPair(menu_view_lang_swedish, "&Swedish"); InsertGuiPair(menu_view_close_program, "&¹Ø±Õ"); InsertGuiPair(menu_edit_undo, "&È¡Ïû"); + InsertGuiPair(menu_edit_cut, "Cu&t \tCtrl+X"); + InsertGuiPair(menu_edit_copy, "&Copy \tCtrl+C"); + InsertGuiPair(menu_edit_paste, "&Paste"); + InsertGuiPair(menu_edit_del, "&Delete \tDel"); InsertGuiPair(menu_edit_paste_formula, "&Õ³Ìù"); InsertGuiPair(menu_edit_copy_result, "&¸´Öƽá¹û"); + InsertGuiPair(menu_edit_copy_both, "Copy &both \tCtrl+B"); + InsertGuiPair(menu_edit_select_all, "Select &all \tEsc"); + InsertGuiPair(menu_edit_bracket, "Bracke&t \tCtrl+0"); InsertGuiPair(menu_help_help, "&°ïÖú"); InsertGuiPair(menu_help_project_page, "&Èí¼þÖ÷Ò³"); + InsertGuiPair(menu_help_check_update, "&Check update..."); InsertGuiPair(menu_help_about, "&¹ØÓÚ"); + InsertGuiPair(menu_update_available, "&New version is available"); + InsertGuiPair(cant_init_calculations, "²»Äܳõʼ»¯¼ÆËãÆ÷Ä£ÐÍ"); InsertGuiPair(message_box_error_caption,"TTCalc"); InsertGuiPair(cant_create_thread, "²»ÄÜ´´½¨Á½¸öÏß³ÌÀ´ÔËËã"); @@ -1008,18 +1255,19 @@ void Languages::InitGuiMessagesTab() InsertGuiPair(cant_create_main_window, "²»ÄÜ´´½¨Ó¦ÓóÌÐòÖ÷´°¿Ú"); InsertGuiPair(cant_init_common_controls,"²»Äܳõʼ»¯Í¨Óÿؼþ(InitCommonControlsEx)"); InsertGuiPair(about_text, - "Mathematical calculator TTCalc %d.%d.%d%s%s\r\n" + "Mathematical calculator TTCalc %d.%d.%d%s%s\r\n\r\n" "¿ª·¢ÈË: Tomasz Sowa\r\n" "ÁªÏµ: t.sowa@ttmath.org\r\n" "Ðí¿É: BSD (¿ªÔ´ÏîÄ¿)\r\n" "Ö÷Ò³: http://ttcalc.sourceforge.net\r\n" "Bignum library: TTMath %d.%d.%d%s\r\n" + "Bignum type: binary floating point numbers\r\n" "Programming language: C++\r\n" "Compiler: %s\r\n" "%s" // for upx "\r\n" "TTCalc uses the TTMath bignum library" - " which can be found at http://sourceforge.net/projects/ttmath\r\n" + " which can be found at http://www.ttmath.org\r\n" "\r\n" #ifdef TTCALC_PORTABLE "This is the portable version of the program TTCalc. In this version " @@ -1027,7 +1275,14 @@ void Languages::InitGuiMessagesTab() "mantissa and 32 bits for the exponent) it's about +/-6.9e+646457021.\r\n" "\r\n" #endif - "Èç¹ûÄãÓÐÈκδËÈí¼þµÄÎÊÌâ¡¢½¨ÒéºÍÓÐȤµÄÏë·¨£¬»òÕßÄãÏë°ïÖúÒ»Æð¼ÓÈ뿪·¢Èí¼þµÄ»°£¬ÎÒ½«ËæʱÈÈÇéµÄ»¶Ó­ÄãÃÇ£¡" + "Translations:\r\n" + "English Author\r\n" // one tabulator between language and the name of the author + "Polish Author\r\n" + "Spanish Alejandro S. Valdezate \r\n" + "Danish Rune Bisgaard Vammen \r\n" + "Chinese Juis \r\n" + "Russian Vladimir Gladilovich \r\n" + "Swedish Lars 'Bafvert' Gafvert \r\n" ); InsertGuiPair(about_text_portable_version, " portable version"); InsertGuiPair(about_text_exe_packer, "EXE Packer: UPX 3.03\r\n"); @@ -1036,6 +1291,37 @@ void Languages::InitGuiMessagesTab() InsertGuiPair(unknown_error, "·¢Éúδ֪´íÎó"); InsertGuiPair(cant_find_help, "ûÓÐÕÒµ½°ïÖúÎļþ"); InsertGuiPair(cant_open_project_page, "²»ÄÜ´ò¿ªÈí¼þÖ÷Ò³"); + InsertGuiPair(update_title, "Check for a new version"); + InsertGuiPair(update_button_next, "Next"); + InsertGuiPair(update_button_finish, "Finish"); + InsertGuiPair(update_button_cancel, "Cancel"); + InsertGuiPair(update_check_at_startup, "Always check for the update on startup"); + InsertGuiPair(update_check_for_info, "Press Next to check for the update..."); + InsertGuiPair(update_is_new_version, "Version %d.%d.%d is available, press Next to download..."); + InsertGuiPair(update_no_new_version, "There is not a new version available."); + InsertGuiPair(update_download_from, "Downloading from..."); +#ifndef TTCALC_PORTABLE + InsertGuiPair(update_downloaded_info1, "A new setup program has been downloaded."); + InsertGuiPair(update_downloaded_info2, "Press Finish to close TTCalc and run the installer."); +#else + InsertGuiPair(update_downloaded_info1, "A new version of TTCalc has been downloaded."); + InsertGuiPair(update_downloaded_info2, ""); +#endif + InsertGuiPair(update_download_error, "There was a problem with downloading, please try again later."); + + InsertGuiPair(pad_title, "Pad"); + InsertGuiPair(pad_menu_file, "&File"); + InsertGuiPair(pad_menu_edit, "&Edit"); + InsertGuiPair(pad_menu_file_new, "&New"); // temporarily not used + InsertGuiPair(pad_menu_file_open, "&Open..."); + InsertGuiPair(pad_menu_file_saveas, "Save &as..."); + InsertGuiPair(pad_menu_file_close, "&Close"); + InsertGuiPair(pad_menu_edit_undo, "&Undo \tCtrl+Z"); + InsertGuiPair(pad_menu_edit_cut, "Cu&t \tCtrl+X"); + InsertGuiPair(pad_menu_edit_copy, "&Copy \tCtrl+C"); + InsertGuiPair(pad_menu_edit_paste, "&Paste \tCtrl+V"); + InsertGuiPair(pad_menu_edit_del, "&Del \tDel"); + InsertGuiPair(pad_menu_edit_select_all, "Select &all \tCtrl+A"); @@ -1104,12 +1390,20 @@ void Languages::InitGuiMessagesTab() InsertGuiPair(display_always_scientific,"Âñåãäà"); InsertGuiPair(display_not_always_scientific,"Êîãäà ïîêàçàòåëü ñòåïåíè áîëüøå"); InsertGuiPair(display_group_scientific, "Âûâîäèòü ðåçóëüòàò â ýêñïîíåíöèàëüíîì âèäå"); - InsertGuiPair(display_decimal_point, "Äåñÿòè÷íûé çíàê"); - InsertGuiPair(display_deg_rad_grad, "sin/cos asin/acos"); + InsertGuiPair(display_deg_rad_grad, "Trigonometric functions"); InsertGuiPair(convert_type, "Òèï"); InsertGuiPair(convert_input, "Ââîä"); InsertGuiPair(convert_output, "Âûâîä"); InsertGuiPair(convert_dynamic_output, "Àâòîïðåôèêñ"); + InsertGuiPair(display_grouping, "Grouping"); + InsertGuiPair(display_grouping_none, "None"); + InsertGuiPair(display_grouping_space, "Space"); + InsertGuiPair(display_input_decimal_point, "Input decimal point"); + InsertGuiPair(display_input_decimal_point_item1, " . or ,"); + InsertGuiPair(display_output_decimal_point, "Output decimal point"); + InsertGuiPair(display_param_sep, "Parameters separated by"); + InsertGuiPair(display_param_sep_item2, " ; or ."); + InsertGuiPair(display_param_sep_item3, " ; or ,"); InsertGuiPair(menu_view, "&Âèä"); InsertGuiPair(menu_edit, "&Ïðàâêà"); @@ -1129,11 +1423,21 @@ void Languages::InitGuiMessagesTab() InsertGuiPair(menu_view_lang_swedish, "&Swedish"); InsertGuiPair(menu_view_close_program, "&Çàêðûòü"); InsertGuiPair(menu_edit_undo, "&Îòìåíèòü äåéñòâèå"); + InsertGuiPair(menu_edit_cut, "Cu&t \tCtrl+X"); + InsertGuiPair(menu_edit_copy, "&Copy \tCtrl+C"); + InsertGuiPair(menu_edit_paste, "&Paste"); + InsertGuiPair(menu_edit_del, "&Delete \tDel"); InsertGuiPair(menu_edit_paste_formula, "&Âñòàâèòü"); InsertGuiPair(menu_edit_copy_result, "&Êîïèðîâàòü ðåçóëüòàò"); + InsertGuiPair(menu_edit_copy_both, "Copy &both \tCtrl+B"); + InsertGuiPair(menu_edit_select_all, "Select &all \tEsc"); + InsertGuiPair(menu_edit_bracket, "Bracke&t \tCtrl+0"); InsertGuiPair(menu_help_help, "&Ïîìîùü"); InsertGuiPair(menu_help_project_page, "&Ñàéò ïðîåêòà"); + InsertGuiPair(menu_help_check_update, "&Check update..."); InsertGuiPair(menu_help_about, "&Î ïðîãðàììå"); + InsertGuiPair(menu_update_available, "&New version is available"); + InsertGuiPair(cant_init_calculations, "Íå ìîãó èíèöèàëèçèðîâàòü ìîäóëü äëÿ ðàñ÷åòîâ"); InsertGuiPair(message_box_error_caption,"TTCalc"); InsertGuiPair(cant_create_thread, "Íå ìîãó ñîçäàòü âòîðîé ïîòîê äëÿ ðàñ÷åòîâ"); @@ -1141,18 +1445,19 @@ void Languages::InitGuiMessagesTab() InsertGuiPair(cant_create_main_window, "Íå ìîãó îòêðûòü ãëàâíîå îêíî ïðîãðàììû"); InsertGuiPair(cant_init_common_controls,"Íå ìîãó èíèöèàëèçèðîâàòü óïðàâëåíèå (InitCommonControlsEx)"); InsertGuiPair(about_text, - "Ìàòåìàòè÷åñêèé êàëüêóëÿòîð TTCalc %d.%d.%d%s%s\r\n" + "Ìàòåìàòè÷åñêèé êàëüêóëÿòîð TTCalc %d.%d.%d%s%s\r\n\r\n" "Àâòîð: Tomasz Sowa\r\n" "e-mail: t.sowa@ttmath.org\r\n" "Ëèöåíçèÿ: BSD (open source)\r\n" "Ñàéò ïðîåêòà: http://ttcalc.sourceforge.net\r\n" "Áèáëèîòåêà Bignum: TTMath %d.%d.%d%s\r\n" + "Bignum type: binary floating point numbers\r\n" "ßçûê ïðîãðàììèðîâàíèÿ: C++\r\n" "Êîìïèëÿòîð: %s\r\n" "%s" // for upx "\r\n" "TTCalc èñïîëüçóåò áèáëèîòåêó ñâåðõáîëüøèõ ÷èñåë TTMath," - " êîòîðàÿ íàõîäèòñÿ çäåñü: http://sourceforge.net/projects/ttmath\r\n" + " êîòîðàÿ íàõîäèòñÿ çäåñü: http://www.ttmath.org\r\n" "\r\n" #ifdef TTCALC_PORTABLE "Ýòî ïåðåíîñíàÿ âåðñèÿ ïðîãðàììû.  ýòîé âåðñèè ìîæíî ñ÷èòàòü " @@ -1160,9 +1465,14 @@ void Languages::InitGuiMessagesTab() " 32 áèòà íà ïîêàçàòåëü ñòåïåíè), òî åñòü +/-6.9e+646457021.\r\n" "\r\n" #endif - "Åñëè ó Âàñ åñòü êàêèå-ëèáî âîïðîñû, ïîæåëàíèÿ èëè èíòåðåñíûå èäåè äëÿ" - " ýòîé ïðîãðàììû, èëè Âû õîòèòå ïðèñîåäèíèòüñÿ ê ïðîåêòó â êà÷åñòâå" - " ðàçðàáîò÷èêà èëè ïðîãðàììèñòa, íå ñòåñíÿéòåñü íàïèñàòü àâòîðó." + "Translations:\r\n" + "English Author\r\n" // one tabulator between language and the name of the author + "Polish Author\r\n" + "Spanish Alejandro S. Valdezate \r\n" + "Danish Rune Bisgaard Vammen \r\n" + "Chinese Juis \r\n" + "Russian Vladimir Gladilovich \r\n" + "Swedish Lars 'Bafvert' Gafvert \r\n" ); InsertGuiPair(about_text_portable_version, " ïåðåíîñíàÿ âåðñèÿ"); InsertGuiPair(about_text_exe_packer, "óïàêîâùèê EXE: UPX 3.03\r\n"); @@ -1171,6 +1481,37 @@ void Languages::InitGuiMessagesTab() InsertGuiPair(unknown_error, "Íåèçâåñòíàÿ îøèáêà"); InsertGuiPair(cant_find_help, "Íå óäàåòñÿ íàéòè ôàéëû ïîìîùè"); InsertGuiPair(cant_open_project_page, "Íå óäàåòñÿ îòêðûòü ñàéò ïðîåêòà"); + InsertGuiPair(update_title, "Check for a new version"); + InsertGuiPair(update_button_next, "Next"); + InsertGuiPair(update_button_finish, "Finish"); + InsertGuiPair(update_button_cancel, "Cancel"); + InsertGuiPair(update_check_at_startup, "Always check for the update on startup"); + InsertGuiPair(update_check_for_info, "Press Next to check for the update..."); + InsertGuiPair(update_is_new_version, "Version %d.%d.%d is available, press Next to download..."); + InsertGuiPair(update_no_new_version, "There is not a new version available."); + InsertGuiPair(update_download_from, "Downloading from..."); +#ifndef TTCALC_PORTABLE + InsertGuiPair(update_downloaded_info1, "A new setup program has been downloaded."); + InsertGuiPair(update_downloaded_info2, "Press Finish to close TTCalc and run the installer."); +#else + InsertGuiPair(update_downloaded_info1, "A new version of TTCalc has been downloaded."); + InsertGuiPair(update_downloaded_info2, ""); +#endif + InsertGuiPair(update_download_error, "There was a problem with downloading, please try again later."); + + InsertGuiPair(pad_title, "Pad"); + InsertGuiPair(pad_menu_file, "&File"); + InsertGuiPair(pad_menu_edit, "&Edit"); + InsertGuiPair(pad_menu_file_new, "&New"); // temporarily not used + InsertGuiPair(pad_menu_file_open, "&Open..."); + InsertGuiPair(pad_menu_file_saveas, "Save &as..."); + InsertGuiPair(pad_menu_file_close, "&Close"); + InsertGuiPair(pad_menu_edit_undo, "&Undo \tCtrl+Z"); + InsertGuiPair(pad_menu_edit_cut, "Cu&t \tCtrl+X"); + InsertGuiPair(pad_menu_edit_copy, "&Copy \tCtrl+C"); + InsertGuiPair(pad_menu_edit_paste, "&Paste \tCtrl+V"); + InsertGuiPair(pad_menu_edit_del, "&Del \tDel"); + InsertGuiPair(pad_menu_edit_select_all, "Select &all \tCtrl+A"); @@ -1240,12 +1581,20 @@ void Languages::InitGuiMessagesTab() InsertGuiPair(display_always_scientific,"Alltid"); InsertGuiPair(display_not_always_scientific,"När exponenten är större än:"); InsertGuiPair(display_group_scientific, "Visa resultatet som vetenskapligt värde"); - InsertGuiPair(display_decimal_point, "Decimalpunkt"); - InsertGuiPair(display_deg_rad_grad, "sin/cos asin/acos"); + InsertGuiPair(display_deg_rad_grad, "Trigonometric functions"); InsertGuiPair(convert_type, "Type"); InsertGuiPair(convert_input, "Input"); InsertGuiPair(convert_output, "Output"); InsertGuiPair(convert_dynamic_output, "Auto prefix"); + InsertGuiPair(display_grouping, "Grouping"); + InsertGuiPair(display_grouping_none, "None"); + InsertGuiPair(display_grouping_space, "Space"); + InsertGuiPair(display_input_decimal_point, "Input decimal point"); + InsertGuiPair(display_input_decimal_point_item1, " . or ,"); + InsertGuiPair(display_output_decimal_point, "Output decimal point"); + InsertGuiPair(display_param_sep, "Parameters separated by"); + InsertGuiPair(display_param_sep_item2, " ; or ."); + InsertGuiPair(display_param_sep_item3, " ; or ,"); InsertGuiPair(menu_view, "&Visa"); InsertGuiPair(menu_edit, "&Redigera"); @@ -1265,11 +1614,21 @@ void Languages::InitGuiMessagesTab() InsertGuiPair(menu_view_lang_swedish, "S&venska"); InsertGuiPair(menu_view_close_program, "&Avsluta"); InsertGuiPair(menu_edit_undo, "&Ångra"); + InsertGuiPair(menu_edit_cut, "Cu&t \tCtrl+X"); + InsertGuiPair(menu_edit_copy, "&Copy \tCtrl+C"); + InsertGuiPair(menu_edit_paste, "&Paste"); + InsertGuiPair(menu_edit_del, "&Delete \tDel"); InsertGuiPair(menu_edit_paste_formula, "&Klistra in"); InsertGuiPair(menu_edit_copy_result, "&Kopiera result"); + InsertGuiPair(menu_edit_copy_both, "Copy &both \tCtrl+B"); + InsertGuiPair(menu_edit_select_all, "Select &all \tEsc"); + InsertGuiPair(menu_edit_bracket, "Bracke&t \tCtrl+0"); InsertGuiPair(menu_help_help, "&Hjälp"); InsertGuiPair(menu_help_project_page, "&Projektsida"); + InsertGuiPair(menu_help_check_update, "&Check update..."); InsertGuiPair(menu_help_about, "&Om"); + InsertGuiPair(menu_update_available, "&New version is available"); + InsertGuiPair(cant_init_calculations, "Beräkningen kunde inte initieras!"); InsertGuiPair(message_box_error_caption,"TTCalc"); InsertGuiPair(cant_create_thread, "Den andra tråden för uträkning kunde inte skapas"); @@ -1277,18 +1636,19 @@ void Languages::InitGuiMessagesTab() InsertGuiPair(cant_create_main_window, "Applikationens huvudfönster kunde inte skapas"); InsertGuiPair(cant_init_common_controls,"Inställningarna kunde inte initieras (InitCommonControlsEx)"); InsertGuiPair(about_text, - "Matematisk kalkylator TTCalc %d.%d.%d%s%s\r\n" + "Matematisk kalkylator TTCalc %d.%d.%d%s%s\r\n\r\n" "Upphovsman: Tomasz Sowa\r\n" "Kontakt: t.sowa@ttmath.org\r\n" "Licens: BSD (open source)\r\n" "Projektsida: http://ttcalc.sourceforge.net\r\n" "Bignumbiblotek: TTMath %d.%d.%d%s\r\n" + "Bignum type: binary floating point numbers\r\n" "Programmeringsspråk: C++\r\n" "Kompilator: %s\r\n" "%s" // for upx "\r\n" "TTCalc använder sig av TTMath bignum bibloteket" - " som kan hittas här: http://sourceforge.net/projects/ttmath\r\n" + " som kan hittas här: http://www.ttmath.org\r\n" "\r\n" #ifdef TTCALC_PORTABLE "Detta är den portabla versionen av TTCalc. I denna version " @@ -1296,9 +1656,14 @@ void Languages::InitGuiMessagesTab() "mantissan och 32 bitar för exponenten) det är omkring +/-6.9e+646457021.\r\n" "\r\n" #endif - "Har du frågor, goda råd eller interessanta idéer beträffande" - " detta program eller vill du rentav bidra med din kompetens som" - " utvecklare eller programmerare är du välkommen att kontakta upphovsmannen." + "Translations:\r\n" + "English Author\r\n" // one tabulator between language and the name of the author + "Polish Author\r\n" + "Spanish Alejandro S. Valdezate \r\n" + "Danish Rune Bisgaard Vammen \r\n" + "Chinese Juis \r\n" + "Russian Vladimir Gladilovich \r\n" + "Swedish Lars 'Bafvert' Gafvert \r\n" ); InsertGuiPair(about_text_portable_version, " transportabel version"); InsertGuiPair(about_text_exe_packer, "EXE Packer: UPX 3.03\r\n"); @@ -1307,6 +1672,37 @@ void Languages::InitGuiMessagesTab() InsertGuiPair(unknown_error, "Det har inträffat ett okänt fel"); InsertGuiPair(cant_find_help, "Kunde inte hitta några hjälpfiler"); InsertGuiPair(cant_open_project_page, "Projektsidan kunde inte öppnas"); + InsertGuiPair(update_title, "Check for a new version"); + InsertGuiPair(update_button_next, "Next"); + InsertGuiPair(update_button_finish, "Finish"); + InsertGuiPair(update_button_cancel, "Cancel"); + InsertGuiPair(update_check_at_startup, "Always check for the update on startup"); + InsertGuiPair(update_check_for_info, "Press Next to check for the update..."); + InsertGuiPair(update_is_new_version, "Version %d.%d.%d is available, press Next to download..."); + InsertGuiPair(update_no_new_version, "There is not a new version available."); + InsertGuiPair(update_download_from, "Downloading from..."); +#ifndef TTCALC_PORTABLE + InsertGuiPair(update_downloaded_info1, "A new setup program has been downloaded."); + InsertGuiPair(update_downloaded_info2, "Press Finish to close TTCalc and run the installer."); +#else + InsertGuiPair(update_downloaded_info1, "A new version of TTCalc has been downloaded."); + InsertGuiPair(update_downloaded_info2, ""); +#endif + InsertGuiPair(update_download_error, "There was a problem with downloading, please try again later."); + + InsertGuiPair(pad_title, "Pad"); + InsertGuiPair(pad_menu_file, "&File"); + InsertGuiPair(pad_menu_edit, "&Edit"); + InsertGuiPair(pad_menu_file_new, "&New"); // temporarily not used + InsertGuiPair(pad_menu_file_open, "&Open..."); + InsertGuiPair(pad_menu_file_saveas, "Save &as..."); + InsertGuiPair(pad_menu_file_close, "&Close"); + InsertGuiPair(pad_menu_edit_undo, "&Undo \tCtrl+Z"); + InsertGuiPair(pad_menu_edit_cut, "Cu&t \tCtrl+X"); + InsertGuiPair(pad_menu_edit_copy, "&Copy \tCtrl+C"); + InsertGuiPair(pad_menu_edit_paste, "&Paste \tCtrl+V"); + InsertGuiPair(pad_menu_edit_del, "&Del \tDel"); + InsertGuiPair(pad_menu_edit_select_all, "Select &all \tCtrl+A"); } diff --git a/src/languages.h b/src/languages.h index 4dd532c..4e81220 100644 --- a/src/languages.h +++ b/src/languages.h @@ -101,8 +101,16 @@ public: display_rounding, display_always_scientific, display_not_always_scientific, - display_decimal_point, display_deg_rad_grad, + display_grouping, + display_grouping_none, + display_grouping_space, + display_input_decimal_point, + display_input_decimal_point_item1, + display_output_decimal_point, + display_param_sep, + display_param_sep_item2, + display_param_sep_item3, convert_type, convert_input, convert_output, @@ -125,11 +133,20 @@ public: menu_view_lang_swedish, menu_view_close_program, menu_edit_undo, + menu_edit_cut, + menu_edit_copy, + menu_edit_paste, + menu_edit_del, menu_edit_paste_formula, menu_edit_copy_result, + menu_edit_copy_both, + menu_edit_select_all, + menu_edit_bracket, menu_help_help, menu_help_project_page, + menu_help_check_update, menu_help_about, + menu_update_available, cant_init_calculations, message_box_error_caption, cant_create_thread, @@ -138,12 +155,37 @@ public: cant_init_common_controls, cant_find_help, cant_open_project_page, + update_title, + update_button_next, + update_button_finish, + update_button_cancel, + update_check_at_startup, + update_check_for_info, + update_is_new_version, + update_no_new_version, + update_download_from, + update_downloaded_info1, + update_downloaded_info2, + update_download_error, about_text, about_text_portable_version, about_text_exe_packer, about_box_title, about_box_button_close, display_group_scientific, + pad_title, + pad_menu_file, + pad_menu_edit, + pad_menu_file_new, + pad_menu_file_open, + pad_menu_file_saveas, + pad_menu_file_close, + pad_menu_edit_undo, + pad_menu_edit_cut, + pad_menu_edit_copy, + pad_menu_edit_paste, + pad_menu_edit_del, + pad_menu_edit_select_all, unknown_error }; diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp index fc6f371..a185edb 100644 --- a/src/mainwindow.cpp +++ b/src/mainwindow.cpp @@ -39,6 +39,7 @@ #include "compileconfig.h" #include "winmain.h" #include "update.h" +#include "pad.h" @@ -417,10 +418,18 @@ HMENU menu = GetMenu(hWnd); SetMenuLanguageItem(menu, IDM_LANGUAGE_SWEDISH, Languages::menu_view_lang_swedish); SetMenuLanguageItem(menu, IDM_CLOSE_PROGRAM, Languages::menu_view_close_program); SetMenuLanguageItem(menu, IDM_EDIT_UNDO, Languages::menu_edit_undo); + SetMenuLanguageItem(menu, IDM_EDIT_CUT, Languages::menu_edit_cut); + SetMenuLanguageItem(menu, IDM_EDIT_COPY, Languages::menu_edit_copy); + SetMenuLanguageItem(menu, IDM_EDIT_PASTE, Languages::menu_edit_paste); + SetMenuLanguageItem(menu, IDM_EDIT_DEL, Languages::menu_edit_del); SetMenuLanguageItem(menu, IDM_EDIT_PASTE_FORMULA, Languages::menu_edit_paste_formula); SetMenuLanguageItem(menu, IDM_EDIT_COPY_RESULT, Languages::menu_edit_copy_result); + SetMenuLanguageItem(menu, IDM_EDIT_COPY_BOTH, Languages::menu_edit_copy_both); + SetMenuLanguageItem(menu, IDM_EDIT_SELECT_ALL, Languages::menu_edit_select_all); + SetMenuLanguageItem(menu, IDM_EDIT_BRACKET, Languages::menu_edit_bracket); SetMenuLanguageItem(menu, IDM_HELP_HELP, Languages::menu_help_help); SetMenuLanguageItem(menu, IDM_HELP_PROJECT_PAGE, Languages::menu_help_project_page); + SetMenuLanguageItem(menu, IDM_HELP_CHECK_UPDATE, Languages::menu_help_check_update); SetMenuLanguageItem(menu, IDM_HELP_ABOUT, Languages::menu_help_about); DrawMenuBar(hWnd); @@ -822,7 +831,6 @@ void WmInitMenuPopUpEdit(HWND hWnd, HMENU menu) bool edit = false; // an edit control has the focus bool edit_sel = false; // there is something selected on the edit bool edit_readonly = false; // the edit is read only -bool can_undo = false; HWND focus = GetFocus(); edit = IsEditControl(focus); @@ -1220,6 +1228,7 @@ BOOL WmCommand_LanguageEnglish(HWND hWnd, UINT message, WPARAM wParam, LPARAM lP SetMenuLanguage(hWnd); SetOutputEditLanguage(hWnd); TabWindowFunctions::SetLanguage( GetDlgItem(hWnd, IDC_TAB) ); + SetPadLanguage(); return true; } @@ -1232,6 +1241,7 @@ BOOL WmCommand_LanguagePolish(HWND hWnd, UINT message, WPARAM wParam, LPARAM lPa SetMenuLanguage(hWnd); SetOutputEditLanguage(hWnd); TabWindowFunctions::SetLanguage( GetDlgItem(hWnd, IDC_TAB) ); + SetPadLanguage(); return true; } @@ -1244,6 +1254,7 @@ BOOL WmCommand_LanguageSpanish(HWND hWnd, UINT message, WPARAM wParam, LPARAM lP SetMenuLanguage(hWnd); SetOutputEditLanguage(hWnd); TabWindowFunctions::SetLanguage( GetDlgItem(hWnd, IDC_TAB) ); + SetPadLanguage(); return true; } @@ -1255,6 +1266,7 @@ BOOL WmCommand_LanguageDanish(HWND hWnd, UINT message, WPARAM wParam, LPARAM lPa SetMenuLanguage(hWnd); SetOutputEditLanguage(hWnd); TabWindowFunctions::SetLanguage( GetDlgItem(hWnd, IDC_TAB) ); + SetPadLanguage(); return true; } @@ -1266,6 +1278,7 @@ BOOL WmCommand_LanguageChinese(HWND hWnd, UINT message, WPARAM wParam, LPARAM lP SetMenuLanguage(hWnd); SetOutputEditLanguage(hWnd); TabWindowFunctions::SetLanguage( GetDlgItem(hWnd, IDC_TAB) ); + SetPadLanguage(); return true; } @@ -1277,6 +1290,7 @@ BOOL WmCommand_LanguageRussian(HWND hWnd, UINT message, WPARAM wParam, LPARAM lP SetMenuLanguage(hWnd); SetOutputEditLanguage(hWnd); TabWindowFunctions::SetLanguage( GetDlgItem(hWnd, IDC_TAB) ); + SetPadLanguage(); return true; } @@ -1288,6 +1302,7 @@ BOOL WmCommand_LanguageSwedish(HWND hWnd, UINT message, WPARAM wParam, LPARAM lP SetMenuLanguage(hWnd); SetOutputEditLanguage(hWnd); TabWindowFunctions::SetLanguage( GetDlgItem(hWnd, IDC_TAB) ); + SetPadLanguage(); return true; } diff --git a/src/pad.cpp b/src/pad.cpp index 4541a18..e4a2860 100644 --- a/src/pad.cpp +++ b/src/pad.cpp @@ -43,6 +43,7 @@ #include "resource.h" #include "messages.h" #include "bigtypes.h" +#include "pad.h" namespace Pad @@ -330,6 +331,47 @@ return CallWindowProc(old_edit_proc, hwnd, msg, wParam, lParam); +inline void SetMenuLanguageItem(HMENU menu, DWORD menu_id, Languages::GuiMsg msg) +{ +Languages * pLang = GetPrgRes()->GetLanguages(); + + ModifyMenu(menu, menu_id, MF_BYCOMMAND|MF_STRING, menu_id, pLang->GuiMessage(msg) ); +} + +void SetPadMenuLanguage(HWND hWnd) +{ +HMENU menu = GetMenu(hWnd); + + if( !menu ) + return; + + MENUITEMINFO mi; + mi.cbSize = sizeof(mi); + mi.fMask = MIIM_TYPE; + mi.fType = MFT_STRING; + + // on popup menus we're using indexes because they don't want to work correctly + // with the identifiers + mi.dwTypeData = const_cast( GetPrgRes()->GetLanguages()->GuiMessage(Languages::pad_menu_file) ); + SetMenuItemInfo(menu, MENUPAD_FILE_INDEX, true, &mi); + + mi.dwTypeData = const_cast( GetPrgRes()->GetLanguages()->GuiMessage(Languages::pad_menu_edit) ); + SetMenuItemInfo(menu, MENUPAD_EDIT_INDEX, true, &mi); + + SetMenuLanguageItem(menu, MENUPAD_FILE_OPEN, Languages::pad_menu_file_open); + SetMenuLanguageItem(menu, MENUPAD_FILE_SAVE, Languages::pad_menu_file_saveas); + SetMenuLanguageItem(menu, MENUPAD_FILE_CLOSE, Languages::pad_menu_file_close); + SetMenuLanguageItem(menu, MENUPAD_EDIT_UNDO, Languages::pad_menu_edit_undo); + SetMenuLanguageItem(menu, MENUPAD_EDIT_CUT, Languages::pad_menu_edit_cut); + SetMenuLanguageItem(menu, MENUPAD_EDIT_COPY, Languages::pad_menu_edit_copy); + SetMenuLanguageItem(menu, MENUPAD_EDIT_PASTE, Languages::pad_menu_edit_paste); + SetMenuLanguageItem(menu, MENUPAD_EDIT_DEL, Languages::pad_menu_edit_del); + SetMenuLanguageItem(menu, MENUPAD_EDIT_SELECTALL, Languages::pad_menu_edit_select_all); + + DrawMenuBar(hWnd); +} + + LRESULT PadCreate(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam) { edit = CreateWindow("edit", "", @@ -350,6 +392,8 @@ LRESULT PadCreate(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam) if( font != 0 ) SendMessage(edit, WM_SETFONT, (WPARAM)font, 0); + SetPadLanguage(); + return 0; } @@ -713,6 +757,7 @@ return 0; } + void CreatePadCommandTable(Messages & messages) { messages.Associate(MENUPAD_FILE_NEW, PadNew); @@ -818,13 +863,15 @@ ATOM a = RegisterPadClass(ttcalc_pad_class_name); bool pad_maximized_from_file = GetPrgRes()->GetPadMaximized(); // CreateWindow() would change maximizing + Languages * pl = GetPrgRes()->GetLanguages(); + font = CreateFont(0, 0, 0, 0, FW_NORMAL, false, false, false, ANSI_CHARSET, OUT_DEFAULT_PRECIS, CLIP_DEFAULT_PRECIS, DEFAULT_QUALITY, DEFAULT_PITCH, "Ms Shell Dlg"); HWND pad = CreateWindowEx(WS_EX_CLIENTEDGE, ttcalc_pad_class_name, - "Pad", + pl->GuiMessage(Languages::pad_title), WS_OVERLAPPEDWINDOW | WS_POPUPWINDOW , GetPrgRes()->GetPadXPos(), GetPrgRes()->GetPadYPos(), GetPrgRes()->GetPadXSize(), GetPrgRes()->GetPadYSize(), @@ -846,3 +893,14 @@ using namespace Pad; } +void SetPadLanguage() +{ +using namespace Pad; + + HWND pad = GetPrgRes()->GetPadWindow(); + Languages * pl = GetPrgRes()->GetLanguages(); + + SetPadMenuLanguage(pad); + SetWindowText(pad, pl->GuiMessage(Languages::pad_title)); +} + diff --git a/src/pad.h b/src/pad.h index f037e1a..3381fa6 100644 --- a/src/pad.h +++ b/src/pad.h @@ -42,6 +42,7 @@ bool CreatePadWindow(); void DestroyPadWindow(); +void SetPadLanguage(); #endif diff --git a/src/parsermanager.cpp b/src/parsermanager.cpp index 770f944..4fb3cd9 100644 --- a/src/parsermanager.cpp +++ b/src/parsermanager.cpp @@ -131,7 +131,7 @@ ttmath::ErrorCode ParserManager::Parse() parser1.SetDegRadGrad(angle_deg_rad_grad); parser1.SetComma(input_comma1, input_comma2); parser1.SetGroup(grouping); - parser1.SetParamSeparator(param_sep); + parser1.SetParamSep(param_sep); code = parser1.Parse(buffer); #endif diff --git a/src/programresources.cpp b/src/programresources.cpp index 6216dba..9d6df3b 100644 --- a/src/programresources.cpp +++ b/src/programresources.cpp @@ -630,9 +630,10 @@ ProgramResources::ProgramResources() #endif - decimal_point = 0; + decimal_point = 0; // output decimal point angle_deg_rad_grad = 1; // rad is default grouping = 0; + input_decimal_point = 2; // dot or comma param_sep = 0; diff --git a/src/resource.h b/src/resource.h index abc2eff..81dc501 100644 --- a/src/resource.h +++ b/src/resource.h @@ -168,26 +168,26 @@ // display tab #define IDC_COMBO_DISPLAY_INPUT 1156 #define IDC_COMBO_DISPLAY_OUTPUT 1157 -#define IDC_COMBO_DISPLAY_ROUNDING 1159 -#define IDC_RADIO_DISPLAY_ALWAYS_SCIENTIFIC 1160 -#define IDC_RADIO_DISPLAY_NOT_ALWAYS_SCIENTIFIC 1161 -#define IDC_LABEL_DISPLAY_INPUT 1162 -#define IDC_LABEL_DISPLAY_OUTPUT 1163 -#define IDC_LABEL_DISPLAY_ROUNDING 1164 -#define IDC_UPDOWN_DISPLAY_WHEN_SCIENTIFIC 1165 -#define IDC_EDIT_DISPLAY_WHEN_SCIENTIFIC 1166 -#define IDC_LABEL_GROUP_SCIENTIFIC 1168 -#define IDC_LABEL_DECIMAL_POINT 1169 -#define IDC_COMBO_DECIMAL_POINT 1170 -#define IDC_CHECK_REMOVE_ZEROES 1171 -#define IDC_LABEL_DISPLAY_DEG_RAD_GRAD 1172 -#define IDC_COMBO_DEG_RAD_GRAD 1173 -#define IDC_COMBO_DISPLAY_GROUPING 1174 -#define IDC_LABEL_GROUPING 1175 -#define IDC_COMBO_INPUT_DECIMAL_POINT 1176 -#define IDC_LABEL_INPUT_DECIMAL_POINT 1177 -#define IDC_LABEL_PARAM_SEPARATE 1178 -#define IDC_COMBO_PARAM_SEPARATE 1179 +#define IDC_COMBO_DISPLAY_ROUNDING 1158 +#define IDC_RADIO_DISPLAY_ALWAYS_SCIENTIFIC 1159 +#define IDC_RADIO_DISPLAY_NOT_ALWAYS_SCIENTIFIC 1160 +#define IDC_LABEL_DISPLAY_INPUT 1161 +#define IDC_LABEL_DISPLAY_OUTPUT 1162 +#define IDC_LABEL_DISPLAY_ROUNDING 1163 +#define IDC_UPDOWN_DISPLAY_WHEN_SCIENTIFIC 1164 +#define IDC_EDIT_DISPLAY_WHEN_SCIENTIFIC 1165 +#define IDC_LABEL_GROUP_SCIENTIFIC 1166 +#define IDC_LABEL_OUTPUT_DECIMAL_POINT 1167 +#define IDC_COMBO_OUTPUT_DECIMAL_POINT 1168 +#define IDC_CHECK_REMOVE_ZEROES 1169 +#define IDC_LABEL_DISPLAY_DEG_RAD_GRAD 1170 +#define IDC_COMBO_DEG_RAD_GRAD 1171 +#define IDC_COMBO_DISPLAY_GROUPING 1172 +#define IDC_LABEL_DISPLAY_GROUPING 1173 +#define IDC_COMBO_INPUT_DECIMAL_POINT 1174 +#define IDC_LABEL_INPUT_DECIMAL_POINT 1175 +#define IDC_LABEL_PARAM_SEPARATE 1176 +#define IDC_COMBO_PARAM_SEPARATE 1177 // convert tab #define IDC_LIST_UNIT_TYPE 1200 @@ -240,6 +240,7 @@ // pad menu +#define MENUPAD_FILE_INDEX 0 #define MENUPAD_EDIT_INDEX 1 #define MENUPAD_FILE_NEW 40500 #define MENUPAD_FILE_OPEN 40501 @@ -263,6 +264,6 @@ #define IDC_PROGRESS 1302 #define IDC_BUTTON_NEXT 1303 #define IDC_BUTTON_CANCEL 1304 - +#define IDC_CHECK_UPDATE_STURTUP 1305 #endif diff --git a/src/resource.rc b/src/resource.rc index d0cf707..f187966 100644 --- a/src/resource.rc +++ b/src/resource.rc @@ -15,52 +15,52 @@ LANGUAGE LANG_NEUTRAL, 0 200 MENU FIXED IMPURE LOADONCALL DISCARDABLE BEGIN - POPUP "&View" + POPUP "View" BEGIN - MENUITEM "&New window", IDM_NEW_WINDOW + MENUITEM "New window", IDM_NEW_WINDOW MENUITEM SEPARATOR - MENUITEM "No&rmal", IDM_NORMAL_VIEW - MENUITEM "&Compact", IDM_COMPACT_VIEW + MENUITEM "Normal", IDM_NORMAL_VIEW + MENUITEM "Compact", IDM_COMPACT_VIEW MENUITEM SEPARATOR - MENUITEM "&Pad", IDM_PAD + MENUITEM "Pad", IDM_PAD MENUITEM SEPARATOR - MENUITEM "&Always on top", IDM_ALWAYS_ON_TOP - POPUP "&Language" + MENUITEM "Always on top", IDM_ALWAYS_ON_TOP + POPUP "Language" BEGIN - MENUITEM "&English", IDM_LANGUAGE_ENGLISH - MENUITEM "&Polish", IDM_LANGUAGE_POLISH - MENUITEM "&Spanish", IDM_LANGUAGE_SPANISH - MENUITEM "&Danish", IDM_LANGUAGE_DANISH - MENUITEM "&Chinese", IDM_LANGUAGE_CHINESE - MENUITEM "&Russian", IDM_LANGUAGE_RUSSIAN - MENUITEM "&Swedish", IDM_LANGUAGE_SWEDISH + MENUITEM "English", IDM_LANGUAGE_ENGLISH + MENUITEM "Polish", IDM_LANGUAGE_POLISH + MENUITEM "Spanish", IDM_LANGUAGE_SPANISH + MENUITEM "Danish", IDM_LANGUAGE_DANISH + MENUITEM "Chinese", IDM_LANGUAGE_CHINESE + MENUITEM "Russian", IDM_LANGUAGE_RUSSIAN + MENUITEM "Swedish", IDM_LANGUAGE_SWEDISH END MENUITEM SEPARATOR - MENUITEM "&Close", IDM_CLOSE_PROGRAM + MENUITEM "Close", IDM_CLOSE_PROGRAM END - POPUP "&Edit" + POPUP "Edit" BEGIN - MENUITEM "&Undo \tCtrl+Z", IDM_EDIT_UNDO + MENUITEM "Undo", IDM_EDIT_UNDO MENUITEM SEPARATOR - MENUITEM "&Cut \tCtrl+X", IDM_EDIT_CUT - MENUITEM "&Copy \TCtrl+C", IDM_EDIT_COPY - MENUITEM "&Paste", IDM_EDIT_PASTE - MENUITEM "&Delete \tDel", IDM_EDIT_DEL + MENUITEM "Cut", IDM_EDIT_CUT + MENUITEM "Copy", IDM_EDIT_COPY + MENUITEM "Paste", IDM_EDIT_PASTE + MENUITEM "Delete", IDM_EDIT_DEL MENUITEM SEPARATOR - MENUITEM "&Copy result \tCtrl+R", IDM_EDIT_COPY_RESULT - MENUITEM "&Copy both\tCtrl+B", IDM_EDIT_COPY_BOTH - MENUITEM "&Paste formula\tCtrl+V", IDM_EDIT_PASTE_FORMULA + MENUITEM "Copy result", IDM_EDIT_COPY_RESULT + MENUITEM "Copy both", IDM_EDIT_COPY_BOTH + MENUITEM "Paste formula", IDM_EDIT_PASTE_FORMULA MENUITEM SEPARATOR - MENUITEM "&Select all \tEsc", IDM_EDIT_SELECT_ALL - MENUITEM "&Bracket \tCtrl+0", IDM_EDIT_BRACKET + MENUITEM "Select all", IDM_EDIT_SELECT_ALL + MENUITEM "Bracket", IDM_EDIT_BRACKET END - POPUP "&Help" + POPUP "Help" BEGIN - MENUITEM "&Help", IDM_HELP_HELP - MENUITEM "&Project page", IDM_HELP_PROJECT_PAGE - MENUITEM "&Check update...", IDM_HELP_CHECK_UPDATE + MENUITEM "Help", IDM_HELP_HELP + MENUITEM "Project page", IDM_HELP_PROJECT_PAGE + MENUITEM "Check update...", IDM_HELP_CHECK_UPDATE MENUITEM SEPARATOR - MENUITEM "&About", IDM_HELP_ABOUT + MENUITEM "About", IDM_HELP_ABOUT END END @@ -253,27 +253,35 @@ BEGIN SS_LEFTNOWORDWRAP | WS_GROUP,8,18,43,8 CONTROL "Rounding",IDC_LABEL_DISPLAY_ROUNDING,"Static", SS_LEFTNOWORDWRAP | WS_GROUP,8,32,43,8 - CONTROL "Grouping",IDC_LABEL_GROUPING,"Static",SS_LEFTNOWORDWRAP | + CONTROL "Grouping",IDC_LABEL_DISPLAY_GROUPING,"Static",SS_LEFTNOWORDWRAP | WS_GROUP,8,46,43,8 - COMBOBOX IDC_COMBO_DISPLAY_INPUT,61,2,49,200,CBS_DROPDOWNLIST | + CONTROL "Input decimal point",IDC_LABEL_INPUT_DECIMAL_POINT, + "Static",SS_LEFTNOWORDWRAP | WS_GROUP,143,4,87,8 + CONTROL "Output decimal point",IDC_LABEL_OUTPUT_DECIMAL_POINT,"Static", + SS_LEFTNOWORDWRAP | WS_GROUP,143,18,87,8 + CONTROL "Parameters separated by",IDC_LABEL_PARAM_SEPARATE, + "Static",SS_LEFTNOWORDWRAP | WS_GROUP,143,32,87,8 + CONTROL "trigonometric functions",IDC_LABEL_DISPLAY_DEG_RAD_GRAD, + "Static",SS_LEFTNOWORDWRAP | WS_GROUP,143,46,87,8 + COMBOBOX IDC_COMBO_DISPLAY_INPUT,61,2,59,200,CBS_DROPDOWNLIST | WS_GROUP | WS_TABSTOP - COMBOBOX IDC_COMBO_DISPLAY_OUTPUT,61,16,49,200,CBS_DROPDOWNLIST | + COMBOBOX IDC_COMBO_DISPLAY_OUTPUT,61,16,59,200,CBS_DROPDOWNLIST | WS_TABSTOP - COMBOBOX IDC_COMBO_DISPLAY_ROUNDING,61,30,49,200,CBS_DROPDOWNLIST | + COMBOBOX IDC_COMBO_DISPLAY_ROUNDING,61,30,59,200,CBS_DROPDOWNLIST | WS_TABSTOP - COMBOBOX IDC_COMBO_DISPLAY_GROUPING,61,44,49,112,CBS_DROPDOWNLIST | + COMBOBOX IDC_COMBO_DISPLAY_GROUPING,61,44,59,112,CBS_DROPDOWNLIST | + WS_VSCROLL | WS_TABSTOP + COMBOBOX IDC_COMBO_INPUT_DECIMAL_POINT,234,2,49,56, + CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + COMBOBOX IDC_COMBO_OUTPUT_DECIMAL_POINT,234,16,49,62,CBS_DROPDOWNLIST | + WS_TABSTOP + COMBOBOX IDC_COMBO_PARAM_SEPARATE,234,30,49,54,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP COMBOBOX IDC_COMBO_DEG_RAD_GRAD,234,44,49,53,CBS_DROPDOWNLIST | WS_TABSTOP - CONTROL "sin/cos asin/acos",IDC_LABEL_DISPLAY_DEG_RAD_GRAD, - "Static",SS_LEFTNOWORDWRAP | WS_GROUP,143,46,87,8 - COMBOBOX IDC_COMBO_DECIMAL_POINT,234,16,49,62,CBS_DROPDOWNLIST | - WS_TABSTOP - CONTROL "Output decimal point",IDC_LABEL_DECIMAL_POINT,"Static", - SS_LEFTNOWORDWRAP | WS_GROUP,143,18,87,8 CONTROL "remove trailing zeroes",IDC_CHECK_REMOVE_ZEROES,"Button", BS_AUTOCHECKBOX | BS_LEFTTEXT | BS_LEFT | WS_TABSTOP,142, - 60,139,10 + 60,140,10 CONTROL "Always",IDC_RADIO_DISPLAY_ALWAYS_SCIENTIFIC,"Button", BS_AUTORADIOBUTTON | BS_LEFT | WS_GROUP | WS_TABSTOP,14, 87,54,10 @@ -287,14 +295,6 @@ BEGIN 11,14 GROUPBOX "Print scientific value",IDC_LABEL_GROUP_SCIENTIFIC,8,75, 275,27 - COMBOBOX IDC_COMBO_INPUT_DECIMAL_POINT,234,2,49,56, - CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - CONTROL "Input decimal point",IDC_LABEL_INPUT_DECIMAL_POINT, - "Static",SS_LEFTNOWORDWRAP | WS_GROUP,143,4,87,8 - COMBOBOX IDC_COMBO_PARAM_SEPARATE,234,30,49,54,CBS_DROPDOWNLIST | - WS_VSCROLL | WS_TABSTOP - CONTROL "Parameters separated by",IDC_LABEL_PARAM_SEPARATE, - "Static",SS_LEFTNOWORDWRAP | WS_GROUP,143,32,87,8 END @@ -333,27 +333,27 @@ END #endif #ifndef TTCALC_PORTABLE -200 DIALOG DISCARDABLE 0, 0, 349, 202 +200 DIALOG DISCARDABLE 0, 0, 349, 256 STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "About" FONT 8, "MS Sans Serif" BEGIN - CONTROL 1201,0,"Static",SS_BITMAP,3,3,101,197 - EDITTEXT 1200,112,3,231,158,ES_MULTILINE | ES_READONLY | NOT + CONTROL IDB_BITMAP_ABOUT,0,"Static",SS_BITMAP | SS_REALSIZEIMAGE,3,3,115,250 + EDITTEXT IDC_ABOUT_TEXT,128,11,215,212,ES_MULTILINE | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP - DEFPUSHBUTTON "Close",IDOK,175,172,86,14 + DEFPUSHBUTTON "Close",IDOK,191,231,86,14 END #else -200 DIALOG DISCARDABLE 0, 0, 268, 239 +200 DIALOG DISCARDABLE 0, 0, 268, 301 STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "About" FONT 8, "MS Sans Serif" BEGIN - EDITTEXT 1200,16,18,234,183,ES_MULTILINE | ES_READONLY | NOT - WS_BORDER | NOT WS_TABSTOP - DEFPUSHBUTTON "Close",IDOK,90,213,86,14 + EDITTEXT IDC_ABOUT_TEXT,16,18,234,245,ES_MULTILINE | ES_READONLY | + NOT WS_BORDER | NOT WS_TABSTOP + DEFPUSHBUTTON "Close",IDOK,90,274,86,14 END #endif @@ -368,12 +368,11 @@ BEGIN DEFPUSHBUTTON "Next",IDC_BUTTON_NEXT,226,65,60,14 PUSHBUTTON "Cancel",IDC_BUTTON_CANCEL,290,65,60,14 CTEXT "url",IDC_UPDATE_INFO2,7,26,343,8 + CONTROL "Always check for the update on sturtup", + IDC_CHECK_UPDATE_STURTUP,"Button",BS_AUTOCHECKBOX | + WS_TABSTOP,7,67,206,10 END - - - - #ifndef TTCALC_PORTABLE -1201 BITMAP "..\\res\\abacus_01.bmp" +IDB_BITMAP_ABOUT BITMAP "..\\res\\aboutbox.bmp" #endif diff --git a/src/tabs.cpp b/src/tabs.cpp index b1f7cd4..8930f05 100644 --- a/src/tabs.cpp +++ b/src/tabs.cpp @@ -417,18 +417,20 @@ void SetLanguageTabDisplay(HWND hWnd) char buffer[50]; int i; + Languages * pl = GetPrgRes()->GetLanguages(); + SendDlgItemMessage(hWnd, IDC_COMBO_DISPLAY_ROUNDING, CB_RESETCONTENT, 0, 0); - SendDlgItemMessage(hWnd, IDC_COMBO_DISPLAY_ROUNDING, CB_ADDSTRING, 0, (LPARAM)GetPrgRes()->GetLanguages()->GuiMessage(Languages::combo_rounding_none) ); - SendDlgItemMessage(hWnd, IDC_COMBO_DISPLAY_ROUNDING, CB_ADDSTRING, 0, (LPARAM)GetPrgRes()->GetLanguages()->GuiMessage(Languages::combo_rounding_integer) ); + SendDlgItemMessage(hWnd, IDC_COMBO_DISPLAY_ROUNDING, CB_ADDSTRING, 0, (LPARAM)pl->GuiMessage(Languages::combo_rounding_none) ); + SendDlgItemMessage(hWnd, IDC_COMBO_DISPLAY_ROUNDING, CB_ADDSTRING, 0, (LPARAM)pl->GuiMessage(Languages::combo_rounding_integer) ); const int max_r = 9; for(i=1 ; i<=max_r ; ++i) { sprintf(buffer,"%s %d %s", - GetPrgRes()->GetLanguages()->GuiMessage(Languages::combo_rounding_to_number), + pl->GuiMessage(Languages::combo_rounding_to_number), i, - GetPrgRes()->GetLanguages()->GuiMessage(Languages::combo_rounding_after_comma) ); + pl->GuiMessage(Languages::combo_rounding_after_comma) ); SendDlgItemMessage(hWnd, IDC_COMBO_DISPLAY_ROUNDING, CB_ADDSTRING, 0, (LPARAM)buffer); } @@ -440,20 +442,42 @@ int i; SendDlgItemMessage(hWnd, IDC_COMBO_DISPLAY_ROUNDING, CB_SETCURSEL, r+1, 0); - SetDlgItemText(hWnd, IDC_LABEL_DISPLAY_INPUT, GetPrgRes()->GetLanguages()->GuiMessage(Languages::display_input)); - SetDlgItemText(hWnd, IDC_LABEL_DISPLAY_OUTPUT, GetPrgRes()->GetLanguages()->GuiMessage(Languages::display_output)); - SetDlgItemText(hWnd, IDC_LABEL_DISPLAY_ROUNDING, GetPrgRes()->GetLanguages()->GuiMessage(Languages::display_rounding)); + SetDlgItemText(hWnd, IDC_LABEL_DISPLAY_INPUT, pl->GuiMessage(Languages::display_input)); + SetDlgItemText(hWnd, IDC_LABEL_DISPLAY_OUTPUT, pl->GuiMessage(Languages::display_output)); + SetDlgItemText(hWnd, IDC_LABEL_DISPLAY_ROUNDING, pl->GuiMessage(Languages::display_rounding)); + SetDlgItemText(hWnd, IDC_LABEL_DISPLAY_GROUPING, pl->GuiMessage(Languages::display_grouping)); + SetDlgItemText(hWnd, IDC_LABEL_INPUT_DECIMAL_POINT, pl->GuiMessage(Languages::display_input_decimal_point)); + SetDlgItemText(hWnd, IDC_LABEL_OUTPUT_DECIMAL_POINT, pl->GuiMessage(Languages::display_output_decimal_point)); + SetDlgItemText(hWnd, IDC_LABEL_PARAM_SEPARATE, pl->GuiMessage(Languages::display_param_sep)); - SetDlgItemText(hWnd, IDC_RADIO_DISPLAY_ALWAYS_SCIENTIFIC, GetPrgRes()->GetLanguages()->GuiMessage(Languages::display_always_scientific)); - SetDlgItemText(hWnd, IDC_RADIO_DISPLAY_NOT_ALWAYS_SCIENTIFIC, GetPrgRes()->GetLanguages()->GuiMessage(Languages::display_not_always_scientific)); + SetDlgItemText(hWnd, IDC_RADIO_DISPLAY_ALWAYS_SCIENTIFIC, pl->GuiMessage(Languages::display_always_scientific)); + SetDlgItemText(hWnd, IDC_RADIO_DISPLAY_NOT_ALWAYS_SCIENTIFIC, pl->GuiMessage(Languages::display_not_always_scientific)); - SetDlgItemText(hWnd, IDC_LABEL_GROUP_SCIENTIFIC, GetPrgRes()->GetLanguages()->GuiMessage(Languages::display_group_scientific)); + SetDlgItemText(hWnd, IDC_LABEL_GROUP_SCIENTIFIC, pl->GuiMessage(Languages::display_group_scientific)); + SetDlgItemText(hWnd, IDC_CHECK_REMOVE_ZEROES, pl->GuiMessage(Languages::check_remove_zeroes)); + SetDlgItemText(hWnd, IDC_LABEL_DISPLAY_DEG_RAD_GRAD, pl->GuiMessage(Languages::display_deg_rad_grad)); - SetDlgItemText(hWnd, IDC_LABEL_DECIMAL_POINT, GetPrgRes()->GetLanguages()->GuiMessage(Languages::display_decimal_point)); + SendDlgItemMessage(hWnd, IDC_COMBO_DISPLAY_GROUPING, CB_RESETCONTENT, 0, 0); + SendDlgItemMessage(hWnd, IDC_COMBO_DISPLAY_GROUPING, CB_ADDSTRING, 0, (LPARAM)pl->GuiMessage(Languages::display_grouping_none)); + SendDlgItemMessage(hWnd, IDC_COMBO_DISPLAY_GROUPING, CB_ADDSTRING, 0, (LPARAM)pl->GuiMessage(Languages::display_grouping_space)); + SendDlgItemMessage(hWnd, IDC_COMBO_DISPLAY_GROUPING, CB_ADDSTRING, 0, (LPARAM)" `"); + SendDlgItemMessage(hWnd, IDC_COMBO_DISPLAY_GROUPING, CB_ADDSTRING, 0, (LPARAM)" '"); + SendDlgItemMessage(hWnd, IDC_COMBO_DISPLAY_GROUPING, CB_ADDSTRING, 0, (LPARAM)" ."); + SendDlgItemMessage(hWnd, IDC_COMBO_DISPLAY_GROUPING, CB_ADDSTRING, 0, (LPARAM)" ,"); + SendDlgItemMessage(hWnd, IDC_COMBO_DISPLAY_GROUPING, CB_SETCURSEL, GetPrgRes()->GetGrouping(), 0); - SetDlgItemText(hWnd, IDC_CHECK_REMOVE_ZEROES, GetPrgRes()->GetLanguages()->GuiMessage(Languages::check_remove_zeroes)); + SendDlgItemMessage(hWnd, IDC_COMBO_INPUT_DECIMAL_POINT, CB_RESETCONTENT, 0, 0); + SendDlgItemMessage(hWnd, IDC_COMBO_INPUT_DECIMAL_POINT, CB_ADDSTRING, 0, (LPARAM)pl->GuiMessage(Languages::display_input_decimal_point_item1)); + SendDlgItemMessage(hWnd, IDC_COMBO_INPUT_DECIMAL_POINT, CB_ADDSTRING, 0, (LPARAM)" ."); + SendDlgItemMessage(hWnd, IDC_COMBO_INPUT_DECIMAL_POINT, CB_ADDSTRING, 0, (LPARAM)" ,"); + SendDlgItemMessage(hWnd, IDC_COMBO_INPUT_DECIMAL_POINT, CB_SETCURSEL, GetPrgRes()->GetInputDecimalPoint(), 0); + + SendDlgItemMessage(hWnd, IDC_COMBO_PARAM_SEPARATE, CB_RESETCONTENT, 0, 0); + SendDlgItemMessage(hWnd, IDC_COMBO_PARAM_SEPARATE, CB_ADDSTRING, 0, (LPARAM)" ;"); + SendDlgItemMessage(hWnd, IDC_COMBO_PARAM_SEPARATE, CB_ADDSTRING, 0, (LPARAM)pl->GuiMessage(Languages::display_param_sep_item2)); + SendDlgItemMessage(hWnd, IDC_COMBO_PARAM_SEPARATE, CB_ADDSTRING, 0, (LPARAM)pl->GuiMessage(Languages::display_param_sep_item3)); + SendDlgItemMessage(hWnd, IDC_COMBO_PARAM_SEPARATE, CB_SETCURSEL, GetPrgRes()->GetParamSep(), 0); - SetDlgItemText(hWnd, IDC_LABEL_DISPLAY_DEG_RAD_GRAD, GetPrgRes()->GetLanguages()->GuiMessage(Languages::display_deg_rad_grad)); } @@ -795,7 +819,7 @@ BOOL WmTabCommand_DisplayDecimalPointChanged(HWND hWnd, UINT message, WPARAM wPa return false; GetPrgRes()->GetThreadController()->StopCalculating(); - GetPrgRes()->SetDecimalPoint( (int)SendDlgItemMessage(hWnd, IDC_COMBO_DECIMAL_POINT, CB_GETCURSEL, 0, 0) ); + GetPrgRes()->SetDecimalPoint( (int)SendDlgItemMessage(hWnd, IDC_COMBO_OUTPUT_DECIMAL_POINT, CB_GETCURSEL, 0, 0) ); GetPrgRes()->GetThreadController()->StartCalculating(); return true; @@ -1298,7 +1322,7 @@ void CreateTabCommandMessagesTable(Messages & cmessages) cmessages.Associate(IDC_RADIO_DISPLAY_ALWAYS_SCIENTIFIC, WmTabCommand_SetDisplayAlwaysScientific); cmessages.Associate(IDC_RADIO_DISPLAY_NOT_ALWAYS_SCIENTIFIC, WmTabCommand_SetDisplayNotAlwaysScientific); cmessages.Associate(IDC_EDIT_DISPLAY_WHEN_SCIENTIFIC, WmTabCommand_SetDisplayWhenScientific); - cmessages.Associate(IDC_COMBO_DECIMAL_POINT, WmTabCommand_DisplayDecimalPointChanged); + cmessages.Associate(IDC_COMBO_OUTPUT_DECIMAL_POINT, WmTabCommand_DisplayDecimalPointChanged); cmessages.Associate(IDC_COMBO_DEG_RAD_GRAD, WmTabCommand_DisplayDegRadGradChanged); cmessages.Associate(IDC_COMBO_DISPLAY_GROUPING, WmTabCommand_DisplayGrouping); cmessages.Associate(IDC_COMBO_INPUT_DECIMAL_POINT, WmTabCommand_DisplayInputDecimalPoint); @@ -1557,38 +1581,18 @@ char buffer[20]; sprintf(buffer,"%d", GetPrgRes()->GetDisplayWhenScientific()); SetDlgItemText(hWnd, IDC_EDIT_DISPLAY_WHEN_SCIENTIFIC, buffer); - SendDlgItemMessage(hWnd, IDC_COMBO_DECIMAL_POINT, CB_ADDSTRING, 0, (LPARAM)" ."); - SendDlgItemMessage(hWnd, IDC_COMBO_DECIMAL_POINT, CB_ADDSTRING, 0, (LPARAM)" ,"); - SendDlgItemMessage(hWnd, IDC_COMBO_DECIMAL_POINT, CB_SETCURSEL, GetPrgRes()->GetDecimalPoint(), 0); + SendDlgItemMessage(hWnd, IDC_COMBO_OUTPUT_DECIMAL_POINT, CB_ADDSTRING, 0, (LPARAM)" ."); + SendDlgItemMessage(hWnd, IDC_COMBO_OUTPUT_DECIMAL_POINT, CB_ADDSTRING, 0, (LPARAM)" ,"); + SendDlgItemMessage(hWnd, IDC_COMBO_OUTPUT_DECIMAL_POINT, CB_SETCURSEL, GetPrgRes()->GetDecimalPoint(), 0); if( GetPrgRes()->GetRemovingZeroes() ) CheckDlgButton(hWnd, IDC_CHECK_REMOVE_ZEROES, BST_CHECKED); - - SendDlgItemMessage(hWnd, IDC_COMBO_DEG_RAD_GRAD, CB_ADDSTRING, 0, (LPARAM)"deg"); SendDlgItemMessage(hWnd, IDC_COMBO_DEG_RAD_GRAD, CB_ADDSTRING, 0, (LPARAM)"rad"); SendDlgItemMessage(hWnd, IDC_COMBO_DEG_RAD_GRAD, CB_ADDSTRING, 0, (LPARAM)"grad"); SendDlgItemMessage(hWnd, IDC_COMBO_DEG_RAD_GRAD, CB_SETCURSEL, GetPrgRes()->GetDegRadGrad(), 0); - SendDlgItemMessage(hWnd, IDC_COMBO_DISPLAY_GROUPING, CB_ADDSTRING, 0, (LPARAM)"none"); - SendDlgItemMessage(hWnd, IDC_COMBO_DISPLAY_GROUPING, CB_ADDSTRING, 0, (LPARAM)"space"); - SendDlgItemMessage(hWnd, IDC_COMBO_DISPLAY_GROUPING, CB_ADDSTRING, 0, (LPARAM)" `"); - SendDlgItemMessage(hWnd, IDC_COMBO_DISPLAY_GROUPING, CB_ADDSTRING, 0, (LPARAM)" '"); - SendDlgItemMessage(hWnd, IDC_COMBO_DISPLAY_GROUPING, CB_ADDSTRING, 0, (LPARAM)" ."); - SendDlgItemMessage(hWnd, IDC_COMBO_DISPLAY_GROUPING, CB_ADDSTRING, 0, (LPARAM)" ,"); - SendDlgItemMessage(hWnd, IDC_COMBO_DISPLAY_GROUPING, CB_SETCURSEL, GetPrgRes()->GetGrouping(), 0); - - SendDlgItemMessage(hWnd, IDC_COMBO_INPUT_DECIMAL_POINT, CB_ADDSTRING, 0, (LPARAM)" . or ,"); - SendDlgItemMessage(hWnd, IDC_COMBO_INPUT_DECIMAL_POINT, CB_ADDSTRING, 0, (LPARAM)" ."); - SendDlgItemMessage(hWnd, IDC_COMBO_INPUT_DECIMAL_POINT, CB_ADDSTRING, 0, (LPARAM)" ,"); - SendDlgItemMessage(hWnd, IDC_COMBO_INPUT_DECIMAL_POINT, CB_SETCURSEL, GetPrgRes()->GetInputDecimalPoint(), 0); - - SendDlgItemMessage(hWnd, IDC_COMBO_PARAM_SEPARATE, CB_ADDSTRING, 0, (LPARAM)" ;"); - SendDlgItemMessage(hWnd, IDC_COMBO_PARAM_SEPARATE, CB_ADDSTRING, 0, (LPARAM)" ; or ."); - SendDlgItemMessage(hWnd, IDC_COMBO_PARAM_SEPARATE, CB_ADDSTRING, 0, (LPARAM)" ; or ,"); - SendDlgItemMessage(hWnd, IDC_COMBO_PARAM_SEPARATE, CB_SETCURSEL, GetPrgRes()->GetParamSep(), 0); - return true; } diff --git a/src/update.cpp b/src/update.cpp index fe13dd4..27d0df1 100644 --- a/src/update.cpp +++ b/src/update.cpp @@ -43,6 +43,7 @@ #include "programresources.h" #include "messages.h" #include "resource.h" +#include "languages.h" #include "winmain.h" @@ -281,6 +282,7 @@ void CheckUpdate(HWND hwnd) char buffer[200]; level = -1; // nothing to do when Next is pressed + Languages * pl = GetPrgRes()->GetLanguages(); EnableWindow(GetDlgItem(hwnd, IDC_BUTTON_NEXT), false); EnableWindow(GetDlgItem(hwnd, IDC_UPDATE_INFO1), false); ShowWindow(GetDlgItem(hwnd, IDC_PROGRESS), SW_SHOW); @@ -289,14 +291,14 @@ char buffer[200]; if( CheckUpdateFromIni(hwnd) ) { level = 1; - sprintf(buffer, "Version %d.%d.%d is available, press Next to download...", major, minor, revision); + sprintf(buffer, pl->GuiMessage(Languages::update_is_new_version), major, minor, revision); SetDlgItemText(hwnd, IDC_UPDATE_INFO1, buffer); } else { level = 100; - SetDlgItemText(hwnd, IDC_UPDATE_INFO1, "There is not a new version available."); - SetDlgItemText(hwnd, IDC_BUTTON_NEXT, "Finish"); + SetDlgItemText(hwnd, IDC_UPDATE_INFO1, pl->GuiMessage(Languages::update_no_new_version)); + SetDlgItemText(hwnd, IDC_BUTTON_NEXT, pl->GuiMessage(Languages::update_button_finish)); ShowWindow(GetDlgItem(hwnd, IDC_PROGRESS), SW_HIDE); EnableWindow(GetDlgItem(hwnd, IDC_BUTTON_CANCEL), false); } @@ -366,10 +368,11 @@ DownloadProgram down; level = -1; // nothing to do when Next is pressed EnableWindow(GetDlgItem(hwnd, IDC_BUTTON_NEXT), false); + Languages * pl = GetPrgRes()->GetLanguages(); if( SaveDialog(hwnd) ) { - SetDlgItemText(hwnd, IDC_UPDATE_INFO1, "Downloading from:"); + SetDlgItemText(hwnd, IDC_UPDATE_INFO1, pl->GuiMessage(Languages::update_download_from)); SetDlgItemText(hwnd, IDC_UPDATE_INFO2, url.c_str()); ShowWindow(GetDlgItem(hwnd, IDC_PROGRESS), SW_SHOW); @@ -378,27 +381,26 @@ DownloadProgram down; if( down.DownloadUrl( url.c_str()) ) { - #ifndef TTCALC_PORTABLE + SetDlgItemText(hwnd, IDC_UPDATE_INFO1, pl->GuiMessage(Languages::update_downloaded_info1)); + SetDlgItemText(hwnd, IDC_UPDATE_INFO2, pl->GuiMessage(Languages::update_downloaded_info2)); + + #ifndef TTCALC_PORTABLE level = 2; - SetDlgItemText(hwnd, IDC_UPDATE_INFO1, "A new setup program has been downloaded."); - SetDlgItemText(hwnd, IDC_UPDATE_INFO2, "Press Finish to close TTCalc and run the installer."); - #else + #else level = 100; - SetDlgItemText(hwnd, IDC_UPDATE_INFO1, "A new version of TTCalc has been downloaded"); - SetDlgItemText(hwnd, IDC_UPDATE_INFO2, ""); EnableWindow(GetDlgItem(hwnd, IDC_BUTTON_CANCEL), false); - #endif + #endif } else { level = 100; DeleteFile(local_file_name.c_str()); - SetDlgItemText(hwnd, IDC_UPDATE_INFO1, "There was a problem with downloading, please try again later"); + SetDlgItemText(hwnd, IDC_UPDATE_INFO1, pl->GuiMessage(Languages::update_download_error)); SetDlgItemText(hwnd, IDC_UPDATE_INFO2, ""); } ShowWindow(GetDlgItem(hwnd, IDC_PROGRESS), SW_HIDE); - SetDlgItemText(hwnd, IDC_BUTTON_NEXT, "Finish"); + SetDlgItemText(hwnd, IDC_BUTTON_NEXT, pl->GuiMessage(Languages::update_button_finish)); } else { @@ -421,10 +423,14 @@ return false; BOOL UpdateInit(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam) { - SetDlgItemText(hwnd, IDC_UPDATE_INFO1, "Press Next to check for the update..."); + Languages * pl = GetPrgRes()->GetLanguages(); + + SetDlgItemText(hwnd, IDC_UPDATE_INFO1, pl->GuiMessage(Languages::update_check_for_info)); SetDlgItemText(hwnd, IDC_UPDATE_INFO2, ""); - SetDlgItemText(hwnd, IDC_BUTTON_NEXT, "Next"); - SetDlgItemText(hwnd, IDC_BUTTON_CANCEL, "Cancel"); + SetDlgItemText(hwnd, IDC_BUTTON_NEXT, pl->GuiMessage(Languages::update_button_next)); + SetDlgItemText(hwnd, IDC_BUTTON_CANCEL, pl->GuiMessage(Languages::update_button_cancel)); + SetWindowText(hwnd, pl->GuiMessage(Languages::update_title)); + SetDlgItemText(hwnd, IDC_CHECK_UPDATE_STURTUP, pl->GuiMessage(Languages::update_check_at_startup)); ShowWindow(GetDlgItem(hwnd, IDC_PROGRESS), SW_HIDE); return true;