From 7eda2587756c6e1ce3cc4889394855bd52cc44a7 Mon Sep 17 00:00:00 2001 From: Burer Date: Sun, 13 Apr 2025 12:18:44 +0300 Subject: [PATCH] [Apps/Calcplus] Add to desktop and menu, remove from App+ --- data/common/settings/app_plus.ini | 1 - data/en_US/settings/icon.ini | 4 ++-- data/en_US/settings/menu.dat | 1 + data/es_ES/settings/icon.ini | 4 ++-- data/es_ES/settings/menu.dat | 29 +++++++++++++++-------------- data/et_EE/settings/icon.ini | 4 ++-- data/et_EE/settings/menu.dat | 25 +++++++++++++------------ data/it_IT/settings/icon.ini | 4 ++-- data/it_IT/settings/menu.dat | 1 + data/ru_RU/settings/icon.ini | 12 ++++++------ data/ru_RU/settings/menu.dat | 1 + 11 files changed, 45 insertions(+), 41 deletions(-) diff --git a/data/common/settings/app_plus.ini b/data/common/settings/app_plus.ini index c5a571062..97faf56db 100644 --- a/data/common/settings/app_plus.ini +++ b/data/common/settings/app_plus.ini @@ -29,7 +29,6 @@ Dicty=/k/utils/DICTY.KEX,79 fNav=/k/utils/fNav/fNav,93 CncEditor=/k/utils/cnc_editor/cnc_editor,15 Life=/k/demos/life2,13 -Calc+=/k/utils/calcplus,4 TinyBasic=/k/develop/TinyBasic/TinyBasic,91 THashView=/k/utils/thashview,124 Notes=/k/utils/notes,117 diff --git a/data/en_US/settings/icon.ini b/data/en_US/settings/icon.ini index 918208874..e30f3d2e9 100644 --- a/data/en_US/settings/icon.ini +++ b/data/en_US/settings/icon.ini @@ -235,8 +235,8 @@ ico=58 x=68 y=68 [21] -name=CALC -path=CALC +name=CALC+ +path=/sys/calcplus param= ico=4 x=204 diff --git a/data/en_US/settings/menu.dat b/data/en_US/settings/menu.dat index d3fd5709a..8a58f3034 100644 --- a/data/en_US/settings/menu.dat +++ b/data/en_US/settings/menu.dat @@ -92,6 +92,7 @@ 59 Screen keyboard |zkey #10 **** DATA PROCESSING 16 Calculator |calc +16 Calc+ |other/calcplus 03 Tinypad |tinypad 28 CodeEdit |develop/cedit 21 Table processor |table diff --git a/data/es_ES/settings/icon.ini b/data/es_ES/settings/icon.ini index 918208874..e30f3d2e9 100644 --- a/data/es_ES/settings/icon.ini +++ b/data/es_ES/settings/icon.ini @@ -235,8 +235,8 @@ ico=58 x=68 y=68 [21] -name=CALC -path=CALC +name=CALC+ +path=/sys/calcplus param= ico=4 x=204 diff --git a/data/es_ES/settings/menu.dat b/data/es_ES/settings/menu.dat index 5ae082fe7..45a1cfe31 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 Grficos > |@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 aplicacin |run +53 Ejecutar aplicaci�n |run 04 Apagar |end #1 **** DEMOS -16 Crculo |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 **** GRFICOS +#3 **** GR�FICOS 16 Image viewer KIV |media/kiv 16 Image viewer zSea * |/kolibrios/media/zsea/zsea 16 Animage |media/animage -16 Efectos de imgenes |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 Cdigos 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 imgen 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 Informacin de HDD |hdd_info +16 Informaci�n de HDD |hdd_info #10 **** ARCHIVOS 50 Eolite |File Managers/Eolite 05 KFM2 |File Managers/kfm2 @@ -96,10 +96,11 @@ 24 NDN * |/kolibrios/utils/ndn/ndn #11 **** PROCESO DE DATOS 16 Calculadora |calc +16 Calc+ |other/calcplus 16 Tinypad |tinypad 16 CodeEdit |develop/cedit 16 Procesador de tablas |table -16 Generador de grficas |graph +16 Generador de gr�ficas |graph 16 Hex-Editor |develop/heed #12 **** RED 00 Servidores > |@13 @@ -115,23 +116,23 @@ 16 Ping |network/ping 16 Cliente Telnet |network/telnet 16 Cliente Synergy |network/synergyc -16 Resolucin 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 analgico |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 Proteccin |test +16 Protecci�n |test 16 Monitor |disptest -16 Velocidad de grficos |mgb +16 Velocidad de gr�ficos |mgb 16 FSPEED speed of FS |fspeed #17 **** ACCESIBILIDAD -16 Ampliacin 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 316e7459a..d0f704bed 100644 --- a/data/et_EE/settings/icon.ini +++ b/data/et_EE/settings/icon.ini @@ -235,8 +235,8 @@ ico=58 x=68 y=68 [21] -name=CALC -path=CALC +name=CALC+ +path=/sys/calcplus param= ico=4 x=204 diff --git a/data/et_EE/settings/menu.dat b/data/et_EE/settings/menu.dat index 56cc76124..b20fc4353 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 Ssteem > |@7 -00 Andmettlus > |@11 -00 Vrk > |@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 Kivita 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 Mrgistiku 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 Hlbustus seaded > |@17 +00 T�� failidega > |@10 +00 H�lbustus seaded > |@17 16 Virtual disks |tmpdisk 16 SHELL konsool |shell -16 Salvesta RD tmmis |rdsave +16 Salvesta RD t�mmis |rdsave 16 Silumisaken |develop/board 16 Clipboard viewer |develop/clipview 16 Terminal |terminal @@ -80,6 +80,7 @@ 65 NDN * |/kolibrios/utils/ndn/ndn #11 **** DATA PROCESSING **** 16 Kalkulaator |calc +16 Kalk+ |other/calcplus 16 Teksti redaktor |tinypad 16 CodeEdit |develop/cedit 16 Tabelarvutus |table @@ -88,8 +89,8 @@ #12 **** NET **** 00 Teenused > |@13 00 Kliendid > |@14 -16 Vrgu seadistus |network/netcfg -16 Vrgu staatus |network/netstat +16 V�rgu seadistus |network/netcfg +16 V�rgu staatus |network/netstat #13 **** SERVERS **** 24 FTP daemon |network/ftpd #14 **** CLIENTS **** @@ -102,12 +103,12 @@ 24 DNS otsing |network/nslookup 61 VNC Viewer |network/vncc 33 Interneti allalaadija |network/downloader -12 Tekstiphine brauser |network/webview +12 Tekstip�hine brauser |network/webview #15 **** OTHER **** 16 Analoogkell |aclock 16 Digitaalne kell |demos/bcdclk 16 Taimer |timer -16 Ekraani tmmis |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 918208874..e30f3d2e9 100644 --- a/data/it_IT/settings/icon.ini +++ b/data/it_IT/settings/icon.ini @@ -235,8 +235,8 @@ ico=58 x=68 y=68 [21] -name=CALC -path=CALC +name=CALC+ +path=/sys/calcplus param= ico=4 x=204 diff --git a/data/it_IT/settings/menu.dat b/data/it_IT/settings/menu.dat index 95d6703b8..e57983a12 100644 --- a/data/it_IT/settings/menu.dat +++ b/data/it_IT/settings/menu.dat @@ -79,6 +79,7 @@ 65 NDN * |/kolibrios/utils/ndn/ndn #11 **** DATA PROCESSING 16 Calcolatrice |calc +16 Calc+ |other/calcplus 16 Tinypad |tinypad 16 CodeEdit |develop/cedit 16 Table Processor |table diff --git a/data/ru_RU/settings/icon.ini b/data/ru_RU/settings/icon.ini index 3883986d9..e0d00f495 100644 --- a/data/ru_RU/settings/icon.ini +++ b/data/ru_RU/settings/icon.ini @@ -1,8 +1,8 @@ [rbmenu] -ᯥ ᮢ=cpu -ࠢ ⥬=skincfg -ன 䮭=/sys/media/palitra -⥬ =syspanel +��ᯥ��� ����ᮢ=cpu +��ࠢ����� ⥬��=skincfg +����ன�� 䮭�=/sys/media/palitra +���⥬��� ������=syspanel [00] name=KFM2 path=/SYS/FILE MANAGERS/KFM2 @@ -235,8 +235,8 @@ ico=58 x=68 y=68 [21] -name=CALC -path=CALC +name=CALC+ +path=/sys/calcplus param= ico=4 x=204 diff --git a/data/ru_RU/settings/menu.dat b/data/ru_RU/settings/menu.dat index 33ba40721..f71eb1605 100644 --- a/data/ru_RU/settings/menu.dat +++ b/data/ru_RU/settings/menu.dat @@ -90,6 +90,7 @@ 59 ࠭ |zkey #10 **** 16 |calc +16 + |other/calcplus 03 Tinypad |tinypad 28 CodeEdit |develop/cedit 21 |table