diff --git a/data/en_US/settings/icon.ini b/data/en_US/settings/icon.ini index e30f3d2e9..a52b7835f 100644 --- a/data/en_US/settings/icon.ini +++ b/data/en_US/settings/icon.ini @@ -236,7 +236,7 @@ x=68 y=68 [21] name=CALC+ -path=/sys/calcplus +path=CALCPLUS param= ico=4 x=204 diff --git a/data/es_ES/settings/icon.ini b/data/es_ES/settings/icon.ini index e30f3d2e9..a52b7835f 100644 --- a/data/es_ES/settings/icon.ini +++ b/data/es_ES/settings/icon.ini @@ -236,7 +236,7 @@ x=68 y=68 [21] name=CALC+ -path=/sys/calcplus +path=CALCPLUS param= ico=4 x=204 diff --git a/data/es_ES/settings/menu.dat b/data/es_ES/settings/menu.dat index 96b51011a..e909638ca 100644 --- a/data/es_ES/settings/menu.dat +++ b/data/es_ES/settings/menu.dat @@ -2,7 +2,7 @@ 58 Welcome |welcome.htm 00 2D Demos > |@1 00 3D Demos > |@2 -00 Gr�ficos > |@3 +00 Gr ficos > |@3 00 Multimedia > |@4 00 Emulators > |@6 00 Desarrollo > |@5 @@ -14,10 +14,10 @@ 60 System panel |syspanel 18 Ayuda |docpack 49 Buscar |search -53 Ejecutar aplicaci�n |run +53 Ejecutar aplicaci¢n |run 04 Apagar |end #1 **** DEMOS -16 C�rculo |demos/circle +16 C¡rculo |demos/circle 16 Fractal |demos/tinyfrac 16 Color demo |demos/colorref 16 Ojos |demos/eyes @@ -37,11 +37,11 @@ 15 View3DS |3d/view3ds 15 Gears |3d/gears 15 3D-waved area |3d/3dwav -#3 **** GR�FICOS +#3 **** GRµFICOS 16 Image viewer KIV |media/kiv 16 Image viewer zSea * |/kolibrios/media/zsea/zsea 16 Animage |media/animage -16 Efectos de im�genes |media/imgf/imgf +16 Efectos de im genes |media/imgf/imgf 16 Palitra |media/palitra #4 **** MULTIMEDIA 16 Pixie Audioplayer |media/pixie @@ -58,7 +58,7 @@ 49 Debugger koldbg * |/kolibrios/develop/koldbg 16 Hex2Dec2Bin |develop/h2d2b 16 Tabla de caracteres |develop/CHARSETS -16 C�digos SCAN |develop/scancode +16 C¢digos SCAN |develop/scancode #6 **** EMULATORS 24 DOSBox * |/kolibrios/emul/DosBox/dosbox 16 e80 (ZX Spectrum) * |/kolibrios/emul/e80/e80 @@ -72,7 +72,7 @@ 00 Accesibilidad > |@17 16 Virtual disks |tmpdisk 16 SHELL |shell -16 Guardar im�gen RD |rdsave +16 Guardar im gen RD |rdsave 16 Debug board |develop/board 16 Clipboard viewer |develop/clipview 16 Terminal |terminal @@ -87,7 +87,7 @@ 16 CPUID |cpuid 16 Ghost Monitor |gmon 16 K. Bus desconectado |kbd -16 Informaci�n de HDD |hdd_info +16 Informaci¢n de HDD |hdd_info #10 **** ARCHIVOS 50 Eolite |File Managers/Eolite 05 KFM2 |File Managers/kfm2 @@ -100,7 +100,7 @@ 16 Tinypad |tinypad 16 CodeEdit |develop/cedit 16 Procesador de tablas |table -16 Generador de gr�ficas |graph +16 Generador de gr ficas |graph 16 Hex-Editor |develop/heed #12 **** RED 00 Servidores > |@13 @@ -116,23 +116,23 @@ 16 Ping |network/ping 16 Cliente Telnet |network/telnet 16 Cliente Synergy |network/synergyc -16 Resoluci�n de nombres |network/nslookup +16 Resoluci¢n de nombres |network/nslookup 16 VNC Viewer |network/vncc 16 Cliente de descarga |network/downloader 16 Navegador (modo texto)|network/webview #15 **** OTROS -16 Reloj anal�gico |demos/aclock +16 Reloj anal¢gico |demos/aclock 16 Reloj binario |demos/bcdclk 16 Contador |demos/timer 16 Capturar de pantalla |scrshoot 16 Calendario |calendar 16 Lector de RTF |rtfread #16 **** PRUEBAS -16 Protecci�n |test +16 Protecci¢n |test 16 Monitor |disptest -16 Velocidad de gr�ficos |mgb +16 Velocidad de gr ficos |mgb 16 FSPEED speed of FS |fspeed #17 **** ACCESIBILIDAD -16 Ampliaci�n de pantalla|magnify +16 Ampliaci¢n de pantalla|magnify 16 Teclado en pantalla |zkey ## diff --git a/data/et_EE/settings/icon.ini b/data/et_EE/settings/icon.ini index d0f704bed..0e2a4d8ec 100644 --- a/data/et_EE/settings/icon.ini +++ b/data/et_EE/settings/icon.ini @@ -236,7 +236,7 @@ x=68 y=68 [21] name=CALC+ -path=/sys/calcplus +path=CALCPLUS param= ico=4 x=204 diff --git a/data/et_EE/settings/menu.dat b/data/et_EE/settings/menu.dat index 804684dd0..19f11a212 100644 --- a/data/et_EE/settings/menu.dat +++ b/data/et_EE/settings/menu.dat @@ -6,14 +6,14 @@ 00 Multimeedia > |@4 00 Emulators* > |@18 00 Arendus > |@5 -00 S�steem > |@7 -00 Andmet��tlus > |@11 -00 V�rk > |@12 +00 S?steem > |@7 +00 Andmet??tlus > |@11 +00 V?rk > |@12 00 Teised > |@15 16 Game center |allgames 60 System panel |syspanel 18 Abi |docpack -53 K�ivita programm |run +53 K?ivita programm |run 04 Sule |end #1 **** DEMOS **** 16 Circle |demos/circle @@ -56,16 +56,16 @@ 16 Silumisaken |develop/board 16 Silur |develop/mtdbg 16 Hex2Dec2Bin |develop/h2d2b -16 M�rgistiku tabel |develop/ASCIIVju +16 M?rgistiku tabel |develop/ASCIIVju 16 ASCII-koodid |develop/keyascii 16 SCAN-koodid |develop/scancode #6 **** EXAMPLES **** #7 **** SYSTEM **** -00 T�� failidega > |@10 -00 H�lbustus seaded > |@17 +00 T?? failidega > |@10 +00 H?lbustus seaded > |@17 16 Virtual disks |tmpdisk 16 SHELL konsool |shell -16 Salvesta RD t�mmis |rdsave +16 Salvesta RD t?mmis |rdsave 16 Silumisaken |develop/board 16 Clipboard viewer |develop/clipview 16 Terminal |terminal @@ -89,8 +89,8 @@ #12 **** NET **** 00 Teenused > |@13 00 Kliendid > |@14 -16 V�rgu seadistus |network/netcfg -16 V�rgu staatus |network/netstat +16 V?rgu seadistus |network/netcfg +16 V?rgu staatus |network/netstat #13 **** SERVERS **** 24 FTP daemon |network/ftpd #14 **** CLIENTS **** @@ -103,12 +103,12 @@ 24 DNS otsing |network/nslookup 61 VNC Viewer |network/vncc 33 Interneti allalaadija |network/downloader -12 Tekstip�hine brauser |network/webview +12 Tekstip?hine brauser |network/webview #15 **** OTHER **** 16 Analoogkell |aclock 16 Digitaalne kell |demos/bcdclk 16 Taimer |timer -16 Ekraani t�mmis |scrshoot +16 Ekraani t?mmis |scrshoot 62 Kalender |calendar 03 RTF faili lugeja |rtfread #16 **** SYSTEM TESTS **** diff --git a/data/it_IT/settings/icon.ini b/data/it_IT/settings/icon.ini index e30f3d2e9..a52b7835f 100644 --- a/data/it_IT/settings/icon.ini +++ b/data/it_IT/settings/icon.ini @@ -236,7 +236,7 @@ x=68 y=68 [21] name=CALC+ -path=/sys/calcplus +path=CALCPLUS param= ico=4 x=204 diff --git a/data/ru_RU/settings/icon.ini b/data/ru_RU/settings/icon.ini index e0d00f495..1ca4bc25c 100644 --- a/data/ru_RU/settings/icon.ini +++ b/data/ru_RU/settings/icon.ini @@ -236,7 +236,7 @@ x=68 y=68 [21] name=CALC+ -path=/sys/calcplus +path=CALCPLUS param= ico=4 x=204 diff --git a/programs/other/calcplus/calcplus.asm b/programs/other/calcplus/calcplus.asm index 4c96c1457..28fc7e4d0 100644 --- a/programs/other/calcplus/calcplus.asm +++ b/programs/other/calcplus/calcplus.asm @@ -7,7 +7,7 @@ ; Contributor Leency - Code refactoring and UX/UI update ; Contributor Burer - Code refactoring and UI update -; ================================================================ +; ==================================================================== use32 org 0 @@ -288,7 +288,7 @@ ev_button: ; ==================================================================== - ev_mouse: +ev_mouse: mcall SF_GET_KEY invoke editbox.mouse, edb1 @@ -607,10 +607,10 @@ proc draw_list jmp .next_txt .set_color_to_2_txt: - mov ecx, LIST_ITEM_TEXT1 + mov ecx, LIST_ITEM_TEXT1 .next_txt: - or ecx, 1 shl 31 + or ecx, 1 shl 31 dec edi cmp edi, 0 @@ -666,22 +666,32 @@ endp if lang eq ru_RU - engineering_str cp866 "Инженерный режим" - engineering_len = 16 + engineering_str cp866 "Инженерный режим" + engineering_len = $ - engineering_str else if lang eq es_ES - engineering_str db " Modo ingeniero " - engineering_len = 16 + engineering_str db " Modo ingeniero " + engineering_len = $ - engineering_str else - engineering_str db "Engineering calc" - engineering_len = 16 + engineering_str db "Engineering calc" + engineering_len = $ - engineering_str endf ; ==================================================================== +f70_calc: + dd SSF_START_APP + dd 0 + dd 0 + dd 0 + dd 0 + db '/sys/calc', 0 + + + I_END: rb 2048 @@ -719,12 +729,4 @@ struc system_colors_internal { scn system_colors_internal sc system_colors -f70_calc: - dd SSF_START_APP - dd 0 - dd 0 - dd 0 - dd 0 - db '/sys/calc', 0 - MEM: