From a013d74bf9b6480d41c4f2df8643e23945f217d6 Mon Sep 17 00:00:00 2001 From: "Kirill Lipatov (Leency)" Date: Sat, 26 Dec 2020 23:09:56 +0000 Subject: [PATCH] system menu: smaller config files git-svn-id: svn://kolibrios.org@8484 a494cfbc-eb01-0410-851d-a64ba20cac60 --- data/common/File Managers/fNav/fnav.ext | 2 +- data/eng/settings/menu.dat | 236 ++++++++++---------- data/et/settings/menu.dat | 240 ++++++++++---------- data/it/settings/menu.dat | 280 ++++++++++++------------ data/rus/settings/menu.dat | 232 ++++++++++---------- data/sp/settings/menu.dat | 277 ++++++++++++----------- programs/cmm/browser/history.h | 33 +-- programs/cmm/browser/res/test.htm | 1 - programs/cmm/lib/strings.h | 11 + programs/system/menu/trunk/menu.asm | 90 ++++---- 10 files changed, 699 insertions(+), 703 deletions(-) diff --git a/data/common/File Managers/fNav/fnav.ext b/data/common/File Managers/fNav/fnav.ext index 723573a0ba..e0f5e5c628 100644 --- a/data/common/File Managers/fNav/fnav.ext +++ b/data/common/File Managers/fNav/fnav.ext @@ -1,4 +1,4 @@ -6: gif, bmp, png, tga, jpg, ico, cur, tif, tiff, jpeg, ppm, pgm, pbm, pnm, pcx, wbmp, xcf +6: gif, bmp, png, tga, jpg, ico, cur, tif, tiff, jpeg, ppm, pgm, pbm, pnm, pcx, wbmp, xcf, xbm 7: wav, mp3, mid, m3u, lap, asf 8: avi, mp4, mkv, mov, mpg, mpeg 9: txt, log, docx diff --git a/data/eng/settings/menu.dat b/data/eng/settings/menu.dat index 3ebc442174..0ee7f6b32b 100644 --- a/data/eng/settings/menu.dat +++ b/data/eng/settings/menu.dat @@ -1,119 +1,119 @@ -#0 **** MAIN **** -Game Center /sys/allgames -Demos > /@1 -Graphics > /@3 -Multimedia > /@4 -Development > /@5 -System > /@7 -Data processing > /@10 -Network > /@11 -Other > /@14 -Help /sys/docpack -Run /sys/run -Shutdown /sys/end -#1 **** DEMOS **** -3D > /@2 -Circle /sys/demos/circle -Fractal /sys/demos/tinyfrac -Color demo /sys/demos/colorref -Eyes /sys/demos/eyes -Tube /sys/demos/tube -Plasma /sys/demos/plasma -Spiral /sys/demos/spiral -Moveback /sys/demos/movback -TranTest /sys/demos/trantest -WEB /sys/demos/web -FireWork /sys/demos/firework -UnvWater /sys/demos/unvwater -#2 **** 3D demos **** -ScreenSaver /sys/3d/crownscr -3D-labyrinth /sys/3d/free3d04 -3D-cube /sys/3d/3dcube2 -Ray tracing /sys/3d/ray -View3DS /sys/3d/view3ds -Gears /sys/3d/gears -3D-waved area /sys/3d/3dwav -#3 **** GRAPHICS **** -Kolibri Image Viewer /sys/media/kiv -zSea* Image Viewer /kolibrios/media/zsea/zsea -Animage /sys/media/animage -Image Filtering /sys/media/imgf/imgf -Palitra /sys/media/palitra -Pipet /sys/develop/pipet -#4 **** MULTIMEDIA **** -Pixie AudioPlayer /sys/media/pixie -AC97SND Audioplayer /sys/media/ac97snd -Fplay* Video player /kolibrios/media/fplay -MidAMP /sys/media/midamp -#5 **** DEVELOPMENT **** -KPack Archiver /sys/kpack -Flat Assembler /sys/develop/fasm -Diff Tool /sys/develop/diff -Debug Board /sys/develop/board -Debugger /sys/develop/mtdbg -Base Converter /sys/develop/h2d2b -Character table /sys/develop/ASCIIVju -Key ASCII-codes /sys/develop/keyascii -Key SCAN-codes /sys/develop/scancode -#6 **** EMULATORS **** -DOSBox* (DOS PC) /kolibrios/emul/DosBox/dosbox -e80* (ZX Spectrum) /kolibrios/emul/e80/e80 -FCE Ultra* (NES) /kolibrios/emul/fceu/fceu -Gameboy Color* /kolibrios/emul/gameboy -ScummVM* (adventure) /kolibrios/emul/scummvm -ZSNES* (super Nintendo) /kolibrios/emul/zsnes -#7 **** SYSTEM **** -File Management > /@8 -Accessibility > /@9 -Hotkeys /sys/mykey -Debug board /sys/develop/board -Clipboard viewer /sys/develop/clipview -Calendar /sys/calendar -Terminal /sys/terminal -Task manager /sys/cpu -System panel /sys/syspanel -#8 **** FILE MANAGEMENT **** -KFAR /sys/File Managers/kfar -fNav /sys/File Managers/fNav/fNav -KFM /sys/File Managers/kfm -Eolite /sys/File Managers/Eolite -Virtual disks /sys/tmpdisk -Shell /sys/shell -Save ramdisk /sys/rdsave -#9 **** ACCESSIBILITY **** -Screen magnifier /sys/magnify -Screen keyboard /sys/zkey -#10 **** DATA PROCESSING **** -Calculator /sys/calc -Tinypad /sys/tinypad -TextEdit /sys/develop/t_edit -Table processor /sys/table -Graph builder /sys/graph -Hex editor /sys/develop/heed -Unarchiver Unz /sys/unz -#11 **** NETWORK **** -Clients > /@12 -Servers > /@13 -Network devices /sys/network/netcfg -Network status /sys/network/netstat -#12 **** CLIENTS **** -IRC /sys/network/ircc -FTP /sys/network/ftpc -TFTP /sys/network/tftpc -Ping /sys/network/ping -Telnet /sys/network/telnet -Synergy /sys/network/synergyc -DNS lookup /sys/network/nslookup -VNC Viewer /sys/network/vncc -Downloader /sys/network/downloader -Text-based browser /sys/network/webview -#13 **** SERVERS **** -FTP /sys/network/ftpd -#14 **** OTHER **** -Emulators* > /@6 -Analog clock /sys/aclock -Binary clock /sys/demos/bcdclk -Timer /sys/timer -Screenshooter /sys/scrshoot -RTF reader /sys/rtfread +#0 **** MAIN +Game Center |allgames +Demos > |@1 +Graphics > |@3 +Multimedia > |@4 +Development > |@5 +System > |@7 +Data processing > |@10 +Network > |@11 +Other > |@14 +Help |docpack +Run |run +Shutdown |end +#1 **** DEMOS +3D > |@2 +Circle |demos/circle +Fractal |demos/tinyfrac +Color demo |demos/colorref +Eyes |demos/eyes +Tube |demos/tube +Plasma |demos/plasma +Spiral |demos/spiral +Moveback |demos/movback +TranTest |demos/trantest +WEB |demos/web +FireWork |demos/firework +UnvWater |demos/unvwater +#2 **** 3D +ScreenSaver |3d/crownscr +3D-labyrinth |3d/free3d04 +3D-cube |3d/3dcube2 +Ray tracing |3d/ray +View3DS |3d/view3ds +Gears |3d/gears +3D-waved area |3d/3dwav +#3 **** GRAPHICS +Kolibri Image Viewer |media/kiv +zSea* Image Viewer |/kolibrios/media/zsea/zsea +Animage |media/animage +Image Filtering |media/imgf/imgf +Palitra |media/palitra +Pipet |develop/pipet +#4 **** MULTIMEDIA +Pixie AudioPlayer |media/pixie +AC97SND Audioplayer |media/ac97snd +Fplay* Video player |/kolibrios/media/fplay +MidAMP |media/midamp +#5 **** DEV +KPack Archiver |kpack +Flat Assembler |develop/fasm +Diff Tool |develop/diff +Debug Board |develop/board +Debugger |develop/mtdbg +Base Converter |develop/h2d2b +Character table |develop/ASCIIVju +Key ASCII-codes |develop/keyascii +Key SCAN-codes |develop/scancode +#6 **** EMUL +DOSBox* (DOS PC) |/kolibrios/emul/DosBox/dosbox +e80* (ZX Spectrum) |/kolibrios/emul/e80/e80 +FCE Ultra* (NES) |/kolibrios/emul/fceu/fceu +Gameboy Color* |/kolibrios/emul/gameboy +ScummVM* (adventure) |/kolibrios/emul/scummvm +ZSNES* (super Nintendo) //kolibrios/emul/zsnes +#7 **** SYSTEM +File Management > |@8 +Accessibility > |@9 +Hotkeys |mykey +Debug board |develop/board +Clipboard viewer |develop/clipview +Calendar |calendar +Terminal |terminal +Task manager |cpu +System panel |syspanel +#8 **** FM +KFAR |File Managers/kfar +fNav |File Managers/fNav/fNav +KFM |File Managers/kfm +Eolite |File Managers/Eolite +Virtual disks |tmpdisk +Shell |shell +Save ramdisk |rdsave +#9 **** ACCESSIBILITY +Screen magnifier |magnify +Screen keyboard |zkey +#10 **** DATA PROCESSING +Calculator |calc +Tinypad |tinypad +TextEdit |develop/t_edit +Table processor |table +Graph builder |graph +Hex editor |develop/heed +Unarchiver Unz |unz +#11 **** NETWORK +Clients > |@12 +Servers > |@13 +Network devices |network/netcfg +Network status |network/netstat +#12 **** CLIENTS +IRC |network/ircc +FTP |network/ftpc +TFTP |network/tftpc +Ping |network/ping +Telnet |network/telnet +Synergy |network/synergyc +DNS lookup |network/nslookup +VNC Viewer |network/vncc +Downloader |network/downloader +Text-based browser |network/webview +#13 **** SERVERS +FTP |network/ftpd +#14 **** OTHER +Emulators* > |@6 +Analog clock |aclock +Binary clock |demos/bcdclk +Timer |timer +Screenshooter |scrshoot +RTF reader |rtfread ## diff --git a/data/et/settings/menu.dat b/data/et/settings/menu.dat index 65a68f1098..a3f6df7c5a 100644 --- a/data/et/settings/menu.dat +++ b/data/et/settings/menu.dat @@ -1,140 +1,140 @@ #0 **** MAIN **** -Game center /sys/allgames -Demod > /@1 -Graafika > /@3 -Multimeedia > /@4 -Emulators > /@18 -Arendus > /@5 -S№steem > /@7 -AndmetЎЎtlus > /@11 -Vїrk > /@12 -Teised > /@15 -Abi /sys/docpack -Kфivita programm /sys/run -Sule /sys/end +Game center |allgames +Demod > |@1 +Graafika > |@3 +Multimeedia > |@4 +Emulators > |@18 +Arendus > |@5 +S№steem > |@7 +AndmetЎЎtlus > |@11 +Vїrk > |@12 +Teised > |@15 +Abi |docpack +Kфivita programm |run +Sule |end #1 **** DEMOS **** -3D > /@2 -Circle /sys/demos/circle -Fractal /sys/demos/tinyfrac -Color demo /sys/demos/colorref -Eyes /sys/demos/eyes -Tube /sys/demos/tube -Plasma /sys/demos/plasma -Spiral /sys/demos/spiral -Moveback /sys/demos/movback -TranTest /sys/demos/trantest -WEB /sys/demos/web -FireWork /sys/demos/firework -UnvWater /sys/demos/unvwater +3D > |@2 +Circle |demos/circle +Fractal |demos/tinyfrac +Color demo |demos/colorref +Eyes |demos/eyes +Tube |demos/tube +Plasma |demos/plasma +Spiral |demos/spiral +Moveback |demos/movback +TranTest |demos/trantest +WEB |demos/web +FireWork |demos/firework +UnvWater |demos/unvwater #2 **** 3D demos **** -ScreenSaver /sys/3d/crownscr -3D-labyrinth /sys/3d/free3d04 -3D-cube /sys/3d/3dcube2 -Ray tracing /sys/3d/ray -View3DS /sys/3d/view3ds -Gears /sys/3d/gears -3D-waved area /sys/3d/3dwav +ScreenSaver |3d/crownscr +3D-labyrinth |3d/free3d04 +3D-cube |3d/3dcube2 +Ray tracing |3d/ray +View3DS |3d/view3ds +Gears |3d/gears +3D-waved area |3d/3dwav #3 **** GRAPHICS **** -Image viewer KIV /sys/media/kiv -Image viewer zSea /kolibrios/media/zsea/zsea -Animage /sys/media/animage -Image Filtering /sys/media/imgf/imgf -Palitra /sys/media/palitra +Image viewer KIV |media/kiv +Image viewer zSea |/kolibrios/media/zsea/zsea +Animage |media/animage +Image Filtering |media/imgf/imgf +Palitra |media/palitra #4 **** MULTIMEDIA **** -Pixie Audioplayer /sys/media/pixie -AC97SND Audioplayer /sys/media/ac97snd -Fplay - video /kolibrios/media/fplay -MidAMP /sys/media/midamp +Pixie Audioplayer |media/pixie +AC97SND Audioplayer |media/ac97snd +Fplay - video |/kolibrios/media/fplay +MidAMP |media/midamp #5 **** PROGRAMMING **** -Examples > /@6 -Arhivaator KPack /sys/kpack -Flat Assembler /sys/develop/fasm -Diff Tool /sys/develop/diff -Silumisaken /sys/develop/board -Silur /sys/develop/mtdbg -Hex2Dec2Bin /sys/develop/h2d2b -Mфrgistiku tabel /sys/develop/ASCIIVju -ASCII-koodid /sys/develop/keyascii -SCAN-koodid /sys/develop/scancode +Examples > |@6 +Arhivaator KPack |kpack +Flat Assembler |develop/fasm +Diff Tool |develop/diff +Silumisaken |develop/board +Silur |develop/mtdbg +Hex2Dec2Bin |develop/h2d2b +Mфrgistiku tabel |develop/ASCIIVju +ASCII-koodid |develop/keyascii +SCAN-koodid |develop/scancode #6 **** EXAMPLES **** -Lїimed /sys/develop/thread -Color slider /sys/demos/cslide -Konsooli nфide 1 /sys/develop/testcon2 -Konsooli nфide 2 /sys/develop/test_gets -Message Boxes example /sys/demos/use_mb +Lїimed |develop/thread +Color slider |demos/cslide +Konsooli nфide 1 |develop/testcon2 +Konsooli nфide 2 |develop/test_gets +Message Boxes example |demos/use_mb #7 **** SYSTEM **** -Sфtted > /@11 -S№steemi sensorid > /@12 -TЎЎ failidega > /@13 -Testimine > /@16 -Hїlbustus seaded > /@17 -Silumisaken /sys/develop/board -Clipboard viewer /sys/develop/clipview -Terminal /sys/terminal +Sфtted > |@11 +S№steemi sensorid > |@12 +TЎЎ failidega > |@13 +Testimine > |@16 +Hїlbustus seaded > |@17 +Silumisaken |develop/board +Clipboard viewer |develop/clipview +Terminal |terminal #8 **** SETTINGS **** -Seadmed /sys/setup -Tausta genereerija /sys/media/palitra -Vфrvid & Teemad /sys/skincfg -MyKey /sys/mykey +Seadmed |setup +Tausta genereerija |media/palitra +Vфrvid & Teemad |skincfg +MyKey |mykey #9 **** SYSTEM SENSORS **** -Protsesside haldur /sys/cpu -PCI seadmed /sys/pcidev -CPUID /sys/cpuid -Ghost Monitor /sys/gmon -K. Bus disconnected /sys/kbd -HDD info /sys/hdd_info +Protsesside haldur |cpu +PCI seadmed |pcidev +CPUID |cpuid +Ghost Monitor |gmon +K. Bus disconnected |kbd +HDD info |hdd_info #10 **** WORK WITH FILES **** -KFAR /sys/File Managers/kfar -KFM /sys/File Managers/kfm -Eolite /sys/File Managers/Eolite -Virtual disks /sys/tmpdisk -SHELL konsool /sys/shell -Salvesta RD tїmmis /sys/rdsave +KFAR |File Managers/kfar +KFM |File Managers/kfm +Eolite |File Managers/Eolite +Virtual disks |tmpdisk +SHELL konsool |shell +Salvesta RD tїmmis |rdsave #11 **** DATA PROCESSING **** -Kalkulaator /sys/calc -Teksti redaktor /sys/tinypad -TextEdit /sys/develop/t_edit -Tabelarvutus /sys/table -Graph builder /sys/graph -Hex-Editor /sys/develop/heed +Kalkulaator |calc +Teksti redaktor |tinypad +TextEdit |develop/t_edit +Tabelarvutus |table +Graph builder |graph +Hex-Editor |develop/heed #12 **** NET **** -Teenused > /@13 -Kliendid > /@14 -Vїrgu seadistus /sys/network/netcfg -Vїrgu staatus /sys/network/netstat +Teenused > |@13 +Kliendid > |@14 +Vїrgu seadistus |network/netcfg +Vїrgu staatus |network/netstat #13 **** SERVERS **** -FTP daemon /sys/network/ftpd +FTP daemon |network/ftpd #14 **** CLIENTS **** -IRC klient /sys/network/ircc -FTP klient /sys/network/ftpc -TFTP klient /sys/network/tftpc -Ping /sys/network/ping -Telnet klient /sys/network/telnet -Synergy klient /sys/network/synergyc -DNS otsing /sys/network/nslookup -VNC Viewer /sys/network/vncc -Interneti allalaadija /sys/network/downloader -Tekstipїhine brauser /sys/network/webview +IRC klient |network/ircc +FTP klient |network/ftpc +TFTP klient |network/tftpc +Ping |network/ping +Telnet klient |network/telnet +Synergy klient |network/synergyc +DNS otsing |network/nslookup +VNC Viewer |network/vncc +Interneti allalaadija |network/downloader +Tekstipїhine brauser |network/webview #15 **** OTHER **** -Analoogkell /sys/aclock -Digitaalne kell /sys/demos/bcdclk -Taimer /sys/timer -Ekraani tїmmis /sys/scrshoot -Kalender /sys/calendar -RTF faili lugeja /sys/rtfread +Analoogkell |aclock +Digitaalne kell |demos/bcdclk +Taimer |timer +Ekraani tїmmis |scrshoot +Kalender |calendar +RTF faili lugeja |rtfread #16 **** SYSTEM TESTS **** -Protection test /sys/test -Monitor test /sys/disptest -Testi graafika kiirust /sys/mgb -FSPEED speed of FS /sys/fspeed +Protection test |test +Monitor test |disptest +Testi graafika kiirust|mgb +FSPEED speed of FS |fspeed #17 **** SYSTEM SPECIAL **** -Ekraani suurendusklaas /sys/magnify -Ekraani klaviatuur /sys/zkey +Ekraani suurendusklaas|magnify +Ekraani klaviatuur |zkey #18 **** EMULATORS **** -DOSBox DOS Emulator /kolibrios/emul/DosBox/dosbox -e80 (ZX Spectrum) /kolibrios/emul/e80/e80 -FCE Ultra - NES /kolibrios/emul/fceu/fceu -Gameboy Color /kolibrios/emul/gameboy -ScummVM (adventure) /kolibrios/emul/scummvm -ZSNES Super Nintendo /kolibrios/emul/zsnes +DOSBox DOS Emulator |/kolibrios/emul/DosBox/dosbox +e80 (ZX Spectrum) |/kolibrios/emul/e80/e80 +FCE Ultra - NES |/kolibrios/emul/fceu/fceu +Gameboy Color |/kolibrios/emul/gameboy +ScummVM (adventure) |/kolibrios/emul/scummvm +ZSNES Super Nintendo |/kolibrios/emul/zsnes ## diff --git a/data/it/settings/menu.dat b/data/it/settings/menu.dat index 4c94c5d9fa..85ed3392db 100644 --- a/data/it/settings/menu.dat +++ b/data/it/settings/menu.dat @@ -1,141 +1,141 @@ -я╗┐#0 **** MAIN **** -Centro gioco /sys/allgames -Demo > /@1 -Grafica > /@3 -Multimedia > /@4 -Emulators > /@18 -Sviluppo > /@5 -Sistema > /@7 -Data processing > /@11 -Network > /@12 -Altro > /@15 -Aiuto /sys/docpack -Esegui applicazione /sys/run -Spegni /sys/end -#1 **** DEMOS **** -3D > /@2 -Cerchio /sys/demos/circle -Frattale /sys/demos/tinyfrac -Demo Colori /sys/demos/colorref -Occhi /sys/demos/eyes -Vortice /sys/demos/tube -Plasma /sys/demos/plasma -Spiral /sys/demos/spiral -Moveback /sys/demos/movback -TranTest /sys/demos/trantest -WEB /sys/demos/web -Fuochi d'artificio /sys/demos/firework -UnvWater /sys/demos/unvwater -#2 **** 3D demos **** -ScreenSaver /sys/3d/crownscr -Labirinto 3D /sys/3d/free3d04 -3D-cube /sys/3d/3dcube2 -Ray tracing /sys/3d/ray -View3DS /sys/3d/view3ds -Gears /sys/3d/gears -3D-waved area /sys/3d/3dwav -#3 **** GRAPHICS **** -Image viewer KIV /sys/media/kiv -Image viewer zSea /KolibriOS/media/zsea/zsea -Animage /sys/media/animage -Palitra /sys/media/palitra -#4 **** MULTIMEDIA **** -Pixie Audioplayer /sys/media/pixie -AC97SND Audioplayer /sys/media/ac97snd -Fplay - video /KolibriOS/media/fplay -MidAMP /sys/media/midamp -#5 **** PROGRAMMING **** -Esempi > /@6 -Gestore di archivi KPack /sys/kpack -Compilatore FASM /sys/develop/fasm -Diff Tool /sys/develop/diff -Debug Board /sys/develop/board -Debugger /sys/develop/mtdbg -Hex2Dec2Bin /sys/develop/h2d2b -Tavola caratteri /sys/develop/ASCIIVju -Codici ASCII /sys/develop/keyascii -SCAN-codes /sys/develop/scancode -#6 **** EXAMPLES **** -Thread /sys/develop/thread -Color slider /sys/demos/cslide -Esempio Console 1 /sys/develop/testcon2 -Esempio Console 2 /sys/develop/test_gets -Esempio Message Boxes /sys/demos/use_mb -#7 **** SYSTEM **** -Impostazioni > /@8 -Sensori di sistema > /@9 -Work with files > /@10 -Testing > /@13 -Opzioni Accessibil.> /@17 -Debug board /sys/develop/board -Clipboard viewer /sys/develop/clipview -Terminal /sys/terminal -#8 **** SETTINGS **** -Device /sys/setup -Generatore di sfondi /sys/media/palitra -Colori e temi /sys/skincfg -MyKey /sys/mykey -Video mode for ATI /sys/vmode -#9 **** SYSTEM SENSORS **** -Gestore processi /sys/cpu -PCI devices /sys/pcidev -CPUID /sys/cpuid -Ghost Monitor /sys/gmon -K. Bus disconnected /sys/kbd -HDD informer /sys/hdd_info -#10 **** WORK WITH FILES **** -KFAR /sys/File Managers/kfar -fNav /sys/File Managers/fNav/fNav -KFM /sys/File Managers/kfm -Eolite /sys/File Managers/Eolite -Virtual disks /sys/tmpdisk -SHELL console /sys/shell -Salva immagine RD /sys/rdsave -#11 **** DATA PROCESSING **** -Calcolatrice /sys/calc -Tinypad /sys/tinypad -TextEdit /sys/develop/t_edit -Table Processor /sys/table -Graph builder /sys/graph -Hex-Editor /sys/develop/heed -#12 **** NET **** -Servers > /@13 -Clients > /@14 -Network devices /sys/network/netcfg -Network status /sys/network/netstat -#13 **** SERVERS **** -Demone FTP /sys/network/ftpd -#14 **** CLIENTS **** -Client IRC /sys/network/ircc -Client FTP /sys/network/ftpc -Client TFTP /sys/network/tftpc -Ping /sys/network/ping -Client Telnet /sys/network/telnet -Client Synergy /sys/network/synergyc -VNC Viewer /sys/network/vncc -DNS lookup /sys/network/nslookup -Internet downloader /sys/network/downloader -Text-based browser /sys/network/webview -#15 **** OTHER **** -Orologio analogico /sys/aclock -Orologio binario /sys/demos/bcdclk -Timer /sys/timer -ScreenShoter /sys/scrshoot -Calendario /sys/calendar -Lettore RTF /sys/rtfread -#16 **** SYSTEM TESTS **** -Protection test /sys/test -Test Monitor /sys/disptest -Test graphics speed /sys/mgb -FSPEED speed of FS /sys/fspeed -#17 **** SYSTEM SPECIAL **** -Lente di ingrandimento /sys/magnify -Tastiera da schermo /sys/zkey -#18 **** EMULATORS **** -DOSBox DOS Emulator /KolibriOS/emul/DosBox/dosbox -e80 (ZX Spectrum) /KolibriOS/emul/e80/e80 -FCE Ultra - NES /KolibriOS/emul/fceu/fceu -Gameboy Color /KolibriOS/emul/gameboy -ScummVM (adventure) /KolibriOS/emul/scummvm -ZSNES Super Nintendo /KolibriOS/emul/zsnes +я╗┐#0 **** MAIN +Centro gioco |allgames +Demo > |@1 +Grafica > |@3 +Multimedia > |@4 +Emulators > |@18 +Sviluppo > |@5 +Sistema > |@7 +Data processing > |@11 +Network > |@12 +Altro > |@15 +Aiuto |docpack +Esegui applicazione |run +Spegni |end +#1 **** DEMOS +3D > |@2 +Cerchio |demos/circle +Frattale |demos/tinyfrac +Demo Colori |demos/colorref +Occhi |demos/eyes +Vortice |demos/tube +Plasma |demos/plasma +Spiral |demos/spiral +Moveback |demos/movback +TranTest |demos/trantest +WEB |demos/web +Fuochi d'artificio |demos/firework +UnvWater |demos/unvwater +#2 **** 3D +ScreenSaver |3d/crownscr +Labirinto 3D |3d/free3d04 +3D-cube |3d/3dcube2 +Ray tracing |3d/ray +View3DS |3d/view3ds +Gears |3d/gears +3D-waved area |3d/3dwav +#3 **** GRAPHICS +Image viewer KIV |media/kiv +Image viewer zSea |/kolibrios/media/zsea/zsea +Animage |media/animage +Palitra |media/palitra +#4 **** MULTIMEDIA +Pixie Audioplayer |media/pixie +AC97SND Audioplayer |media/ac97snd +Fplay - video |/kolibrios/media/fplay +MidAMP |media/midamp +#5 **** DEV +Esempi > |@6 +Gestore di archivi KPack /kpack +Compilatore FASM |develop/fasm +Diff Tool |develop/diff +Debug Board |develop/board +Debugger |develop/mtdbg +Hex2Dec2Bin |develop/h2d2b +Tavola caratteri |develop/ASCIIVju +Codici ASCII |develop/keyascii +SCAN-codes |develop/scancode +#6 **** EXAMPLES +Thread |develop/thread +Color slider |demos/cslide +Esempio Console 1 |develop/testcon2 +Esempio Console 2 |develop/test_gets +Esempio Message Boxes |demos/use_mb +#7 **** SYSTEM +Impostazioni > |@8 +Sensori di sistema > |@9 +Work with files > |@10 +Testing > |@13 +Opzioni Accessibil.> |@17 +Debug board |develop/board +Clipboard viewer |develop/clipview +Terminal |terminal +#8 **** SETTINGS +Device |setup +Generatore di sfondi |media/palitra +Colori e temi |skincfg +MyKey |mykey +Video mode for ATI |vmode +#9 **** SYSTEM SENSORS +Gestore processi |cpu +PCI devices |pcidev +CPUID |cpuid +Ghost Monitor |gmon +K. Bus disconnected |kbd +HDD informer |hdd_info +#10 **** FM +KFAR |File Managers/kfar +fNav |File Managers/fNav/fNav +KFM |File Managers/kfm +Eolite |File Managers/Eolite +Virtual disks |tmpdisk +SHELL console |shell +Salva immagine RD |rdsave +#11 **** DATA PROCESSING +Calcolatrice |calc +Tinypad |tinypad +TextEdit |develop/t_edit +Table Processor |table +Graph builder |graph +Hex-Editor |develop/heed +#12 **** NET +Servers > |@13 +Clients > |@14 +Network devices |network/netcfg +Network status |network/netstat +#13 **** SERVERS +Demone FTP |network/ftpd +#14 **** CLIENTS +Client IRC |network/ircc +Client FTP |network/ftpc +Client TFTP |network/tftpc +Ping |network/ping +Client Telnet |network/telnet +Client Synergy |network/synergyc +VNC Viewer |network/vncc +DNS lookup |network/nslookup +Internet downloader |network/downloader +Text-based browser |network/webview +#15 **** OTHER +Orologio analogico |aclock +Orologio binario |demos/bcdclk +Timer |timer +ScreenShoter |scrshoot +Calendario |calendar +Lettore RTF |rtfread +#16 **** TESTS +Protection test |test +Test Monitor |disptest +Test graphics speed |mgb +FSPEED speed of FS |fspeed +#17 **** SPECIAL +Lente di ingrandimento|magnify +Tastiera da schermo |zkey +#18 **** EMUL +DOSBox DOS Emulator |/kolibrios/emul/DosBox/dosbox +e80 (ZX Spectrum) |/kolibrios/emul/e80/e80 +FCE Ultra - NES |/kolibrios/emul/fceu/fceu +Gameboy Color |/kolibrios/emul/gameboy +ScummVM (adventure) |/kolibrios/emul/scummvm +ZSNES Super Nintendo |/kolibrios/emul/zsnes ## diff --git a/data/rus/settings/menu.dat b/data/rus/settings/menu.dat index 1e5f3a84b3..15f18a6204 100644 --- a/data/rus/settings/menu.dat +++ b/data/rus/settings/menu.dat @@ -1,117 +1,117 @@ -#0 **** Главное меню **** -Игровой центр /sys/allgames -Демки > /@1 -Графика > /@3 -Звук и видео > /@4 -Разработка > /@5 -Система > /@7 -Офис > /@10 -Сеть > /@11 -Разное > /@14 -Документация /sys/docpack -Запуск программы /sys/run -Завершение работы /sys/end -#1 **** Демки **** -Трёхмерные > /@2 -Кружок /sys/demos/circle -Фрактал Мандельброта /sys/demos/tinyfrac -Цвета /sys/demos/colorref -Глаза /sys/demos/eyes -Труба /sys/demos/tube -Plasma /sys/demos/plasma -Спираль /sys/demos/spiral -Moveback /sys/demos/movback -TranTest /sys/demos/trantest -Паутинка /sys/demos/web -Фейерверк /sys/demos/firework -UnvWater /sys/demos/unvwater -#2 **** Демки -> 3D **** -Скринсейвер /sys/3d/crownscr -3D-Лабиринт /sys/3d/free3d04 -3D-Куб /sys/3d/3dcube2 -Ray tracing /sys/3d/ray -Просмотрщик 3DS /sys/3d/view3ds -Шестерёнки /sys/3d/gears -3D-Волны /sys/3d/3dwav -#3 **** Графика **** -Просмотр фото KIV /sys/media/kiv -Просмотр фото zSea /kolibrios/media/zsea/zsea -Редактор Animage /sys/media/animage -Наложение фильтров /sys/media/imgf/imgf -Палитра /sys/media/palitra -Пипетка /sys/develop/pipet -#4 **** Звук и видео **** -Аудиоплеер Pixie /sys/media/pixie -Аудиоплеер AC97SND /sys/media/ac97snd -Видеоплеер Fplay /kolibrios/media/fplay -Midi-плеер /sys/media/midamp -Детское пианино /sys/media/piano -#5 **** Разработка **** -Упаковщик KPack /sys/kpack -Flat Assembler /sys/develop/fasm -Доска отладки /sys/develop/board -HEX-редактор /sys/develop/heed -Diff tool /sys/develop/diff -Отладчик /sys/develop/mtdbg -Hex2Dec2Bin /sys/develop/h2d2b -Таблица символов /sys/develop/ASCIIVju -ASCII-коды /sys/develop/keyascii -SCAN-коды /sys/develop/scancode -#6 **** Эмуляторы **** -DOSBox DOS Emulator /kolibrios/emul/DosBox/dosbox -e80 (ZX Spectrum) /kolibrios/emul/e80/e80 -FCE Ultra - NES /kolibrios/emul/fceu/fceu -ScummVM /kolibrios/emul/scummvm -ZSNES Super Nintendo /kolibrios/emul/zsnes -#7 **** Система **** -Файловые менеджеры > /@8 -Спец. возможности > /@9 -Календарь /sys/calendar -Терминал /sys/terminal -Виртуальные диски /sys/tmpdisk -Консоль SHELL /sys/shell -Сохранение образа /sys/rdsave -Системная панель /sys/syspanel -#8 **** Система -> Файловые менеджеры **** -KFAR /sys/File Managers/kfar -fNav /sys/File Managers/fNav/fNav -KFM /sys/File Managers/kfm -Eolite /sys/File Managers/Eolite -#9 **** Система -> Спец.возможности **** -Экранная лупа /sys/magnify -Экранная клавиатура /sys/zkey -#10 **** Офис **** -Калькулятор /sys/calc -Редактор Tinypad /sys/tinypad -Редактор TextEdit /sys/develop/t_edit -Табличный процессор /sys/table -Построение графиков /sys/graph -Просмотр RTF /sys/rtfread -#11 **** Сеть **** -Серверы > /@12 -Клиенты > /@13 -Настройки сети /sys/network/netcfg -Статус подключения /sys/network/netstat -#12 **** Сеть -> Серверы **** -FTP daemon /sys/network/ftpd -#13 **** Сеть -> Клиенты **** -IRC клиент /sys/network/ircc -FTP клиент /sys/network/ftpc -TFTP клиент /sys/network/tftpc -Ping /sys/network/ping -Telnet /sys/network/telnet -Synergy клиент /sys/network/synergyc -DNS lookup /sys/network/nslookup -VNC Клиент /sys/network/vncc -Интернет загрузчик /sys/network/downloader -Текстовый браузер /sys/network/webview -#14 **** Разное **** -Эмуляторы > /@6 -Создание скриншотов /sys/scrshoot -Аналоговые часы /sys/aclock -Таблица Менделеева /sys/period -Тренажёр KJ|ABuIIIA /sys/games/klavisha -Бинарные часы /sys/demos/bcdclk -Таймер /sys/timer -Разархиватор Unz /sys/unz +#0 +Игровой центр |allgames +Демки > |@1 +Графика > |@3 +Звук и видео > |@4 +Разработка > |@5 +Система > |@7 +Офис > |@10 +Сеть > |@11 +Разное > |@14 +Документация |docpack +Запуск программы |run +Завершение работы |end +#1 ==Демки +Трёхмерные > |@2 +Кружок |demos/circle +Фрактал Мандельброта |demos/tinyfrac +Цвета |demos/colorref +Глаза |demos/eyes +Труба |demos/tube +Plasma |demos/plasma +Спираль |demos/spiral +Moveback |demos/movback +TranTest |demos/trantest +Паутинка |demos/web +Фейерверк |demos/firework +UnvWater |demos/unvwater +#2 ==3D +Скринсейвер |3d/crownscr +3D-Лабиринт |3d/free3d04 +3D-Куб |3d/3dcube2 +Трассировка лучей |3d/ray +Просмотрщик 3DS |3d/view3ds +Шестерёнки |3d/gears +3D-Волны |3d/3dwav +#3 ==Графика +Просмотр фото KIV |media/kiv +Просмотр фото zSea |/kolibrios/media/zsea/zsea +Редактор Animage |media/animage +Наложение фильтров |media/imgf/imgf +Палитра |media/palitra +Пипетка |develop/pipet +#4 ==Звук и видео +Аудиоплеер Pixie |media/pixie +Аудиоплеер AC97SND |media/ac97snd +Видеоплеер Fplay |/kolibrios/media/fplay +Midi-плеер |media/midamp +Детское пианино |media/piano +#5 ==Разработка +Упаковщик KPack |kpack +Flat Assembler |develop/fasm +Доска отладки |develop/board +HEX-редактор |develop/heed +Diff tool |develop/diff +Отладчик |develop/mtdbg +Hex2Dec2Bin |develop/h2d2b +Таблица символов |develop/ASCIIVju +ASCII-коды |develop/keyascii +SCAN-коды |develop/scancode +#6 ==Эмуляторы +DOSBox |/kolibrios/emul/DosBox/dosbox +e80 (ZX Spectrum) |/kolibrios/emul/e80/e80 +FCE Ultra - NES |/kolibrios/emul/fceu/fceu +ZSNES Super Nintendo |/kolibrios/emul/zsnes +ScummVM |/kolibrios/emul/scummvm +#7 ==Система +Файловые менеджеры > |@8 +Спец. возможности > |@9 +Календарь |calendar +Терминал |terminal +Виртуальные диски |tmpdisk +Консоль SHELL |shell +Сохранение образа |rdsave +Системная панель |syspanel +#8 ==Система > ФМ +KFAR |File Managers/kfar +fNav |File Managers/fNav/fNav +KFM |File Managers/kfm +Eolite |File Managers/Eolite +#9 ==Система > Спец.возможности +Экранная лупа |magnify +Экранная клавиатура |zkey +#10 ==Офис +Калькулятор |calc +Редактор Tinypad |tinypad +Редактор TextEdit |develop/t_edit +Табличный процессор |table +Построение графиков |graph +Просмотр RTF |rtfread +#11 ==Сеть +Серверы > |@12 +Клиенты > |@13 +Настройки сети |network/netcfg +Статус подключения |network/netstat +#12 ==Сеть > Серверы +FTP daemon |network/ftpd +#13 ==Сеть > Клиенты +IRC клиент |network/ircc +FTP клиент |network/ftpc +TFTP клиент |network/tftpc +Ping |network/ping +Telnet |network/telnet +Synergy клиент |network/synergyc +DNS lookup |network/nslookup +VNC Клиент |network/vncc +Интернет загрузчик |network/downloader +Браузер WebView |network/webview +#14 ==Разное +Эмуляторы > |@6 +Создание скриншотов |scrshoot +Аналоговые часы |aclock +Таблица Менделеева |period +Тренажёр KJ|ABuIIIA |games/klavisha +Бинарные часы |demos/bcdclk +Таймер |timer +Разархиватор Unz |unz ## diff --git a/data/sp/settings/menu.dat b/data/sp/settings/menu.dat index 3e9644d0e2..edc8f1b801 100644 --- a/data/sp/settings/menu.dat +++ b/data/sp/settings/menu.dat @@ -1,141 +1,140 @@ -#0 **** MAIN **** -Centro de juegos /sys/allgames -Demos > /@1 -Grаficos > /@3 -Multimedia > /@4 -Emulators > /@18 -Desarrollo > /@5 -Sistema > /@7 -Proceso de datos > /@11 -Red > /@12 -Otros > /@15 -Ayuda /sys/docpack -Ejecutar aplicaciвn /sys/run -Apagar /sys/end -#1 **** DEMOS **** -3D > /@2 -Cбrculo /sys/demos/circle -Fractal /sys/demos/tinyfrac -Color demo /sys/demos/colorref -Ojos /sys/demos/eyes -Tube /sys/demos/tube -Plasma /sys/demos/plasma -Spiral /sys/demos/spiral -Moveback /sys/demos/movback -TranTest /sys/demos/trantest -WEB /sys/demos/web -FireWork /sys/demos/firework -UnvWater /sys/demos/unvwater +#0 **** MAIN +Centro de juegos |allgames +Demos > |@1 +Grаficos > |@3 +Multimedia > |@4 +Emulators > |@18 +Desarrollo > |@5 +Sistema > |@7 +Proceso de datos > |@11 +Red > |@12 +Otros > |@15 +Ayuda |docpack +Ejecutar aplicaciвn |run +Apagar |end +#1 **** DEMOS +3D > |@2 +Cбrculo |demos/circle +Fractal |demos/tinyfrac +Color demo |demos/colorref +Ojos |demos/eyes +Tube |demos/tube +Plasma |demos/plasma +Spiral |demos/spiral +Moveback |demos/movback +TranTest |demos/trantest +WEB |demos/web +FireWork |demos/firework +UnvWater |demos/unvwater #2 **** 3D **** -ScreenSaver /sys/3d/crownscr -3D-labyrinth /sys/3d/free3d04 -3D-cube /sys/3d/3dcube2 -Ray tracing /sys/3d/ray -View3DS /sys/3d/view3ds -Gears /sys/3d/gears -3D-waved area /sys/3d/3dwav -#3 **** GR╡FICOS **** -Image viewer KIV /sys/media/kiv -Image viewer zSea /kolibrios/media/zsea/zsea -Animage /sys/media/animage -Efectos de imаgenes /sys/media/imgf/imgf -Palitra /sys/media/palitra -#4 **** MULTIMEDIA **** -Pixie Audioplayer /sys/media/pixie -AC97SND Audioplayer /sys/media/ac97snd -Fplay - video /kolibrios/media/fplay -MidAMP /sys/media/midamp -#5 **** DESARROLLO **** -Ejemplos > /@6 -Archiver KPack /sys/kpack -Flat Assembler /sys/develop/fasm -Diff Tool /sys/develop/diff -Debug Board /sys/develop/board -Debugger /sys/develop/mtdbg -Hex2Dec2Bin /sys/develop/h2d2b -Tabla de caracteres /sys/ASCIIVju -Cвdigos ASCII /sys/develop/keyascii -Cвdigos SCAN /sys/develop/scancode -#6 **** EJEMPLOS **** -Threads /sys/develop/thread -Selector de color /sys/demos/cslide -Ejemplo de consola 1 /sys/develop/testcon2 -Ejemplo de consola 2 /sys/develop/test_gets -Ejemplo de Messages /sys/demos/use_mb -#7 **** SISTEMA **** -Configuraciвn > /@8 -Sensores > /@9 -Archivos > /@10 -Pruebas > /@16 -Accesibilidad > /@17 -Debug board /sys/develop/board -Clipboard viewer /sys/develop/clipview -Terminal /sys/terminal -#8 **** CONFIGURACIрN **** -Dispositivos /sys/setup -Generador de fondo /sys/media/palitra -Colores y Apariencia /sys/skincfg -Atajos de teclado /sys/mykey -#9 **** SENSORES **** -Procesos /sys/cpu -Dispositivos PCI /sys/pcidev -CPUID /sys/cpuid -Ghost Monitor /sys/gmon -K. Bus desconectado /sys/kbd -Informaciвn de HDD /sys/hdd_info -#10 **** ARCHIVOS **** -KFAR /sys/File Managers/kfar -fNav /sys/File Managers/fNav/fNav -KFM /sys/File Managers/kfm -Eolite /sys/File Managers/Eolite -Virtual disks /sys/tmpdisk -SHELL /sys/shell -Guardar imаgen RD /sys/rdsave -#11 **** PROCESO DE DATOS **** -Calculadora /sys/calc -Tinypad /sys/tinypad -TextEdit /sys/develop/t_edit -Procesador de tablas /sys/table -Generador de grаficas /sys/graph -Hex-Editor /sys/develop/heed -#12 **** RED **** -Servidores > /@13 -Clientes > /@14 -Network devices /sys/network/netcfg -Network status /sys/network/netstat -#13 **** SERVIDORES **** -FTP daemon /sys/network/ftpd -#14 **** CLIENTES **** -Cliente IRC /sys/network/ircc -Cliente FTP /sys/network/ftpc -Cliente TFTP /sys/network/tftpc -Ping /sys/network/ping -Cliente Telnet /sys/network/telnet -Cliente Synergy /sys/network/synergyc -Resoluciвn de nombres /sys/network/nslookup -VNC Viewer /sys/network/vncc -Cliente de descarga /sys/network/downloader -Navegador (modo texto) /sys/network/webview -#15 **** OTROS **** -Reloj analвgico /sys/demos/aclock -Reloj binario /sys/demos/bcdclk -Contador /sys/demos/timer -Capturar de pantalla /sys/scrshoot -Calendario /sys/calendar -Lector de RTF /sys/rtfread -#16 **** PRUEBAS **** -Protecciвn /sys/test -Monitor /sys/disptest -Velocidad de grаficos /sys/mgb -FSPEED speed of FS /sys/fspeed -#17 **** ACCESIBILIDAD **** -Ampliaciвn de pantalla /sys/magnify -Teclado en pantalla /sys/zkey -#18 **** EMULATORS **** -DOSBox DOS Emulator /kolibrios/emul/DosBox/dosbox -e80 (ZX Spectrum) /kolibrios/emul/e80/e80 -FCE Ultra - NES /kolibrios/emul/fceu/fceu -Gameboy Color /kolibrios/emul/gameboy -ScummVM (adventure) /kolibrios/emul/scummvm -ZSNES Super Nintendo /kolibrios/emul/zsnes +ScreenSaver |3d/crownscr +3D-labyrinth |3d/free3d04 +3D-cube |3d/3dcube2 +Ray tracing |3d/ray +View3DS |3d/view3ds +Gears |3d/gears +3D-waved area |3d/3dwav +#3 **** GR╡FICOS +Image viewer KIV |media/kiv +Image viewer zSea |/kolibrios/media/zsea/zsea +Animage |media/animage +Efectos de imаgenes |media/imgf/imgf +Palitra |media/palitra +#4 **** MULTIMEDIA +Pixie Audioplayer |media/pixie +AC97SND Audioplayer |media/ac97snd +Fplay - video |/kolibrios/media/fplay +MidAMP |media/midamp +#5 **** DESARROLLO +Ejemplos > |@6 +Archiver KPack |kpack +Flat Assembler |develop/fasm +Diff Tool |develop/diff +Debug Board |develop/board +Debugger |develop/mtdbg +Hex2Dec2Bin |develop/h2d2b +Tabla de caracteres |ASCIIVju +Cвdigos ASCII |develop/keyascii +Cвdigos SCAN |develop/scancode +#6 **** EJEMPLOS +Threads |develop/thread +Selector de color |demos/cslide +Ejemplo de consola 1 |develop/testcon2 +Ejemplo de consola 2 |develop/test_gets +Ejemplo de Messages |demos/use_mb +#7 **** SISTEMA +Configuraciвn > |@8 +Sensores > |@9 +Archivos > |@10 +Pruebas > |@16 +Accesibilidad > |@17 +Debug board |develop/board +Clipboard viewer |develop/clipview +Terminal |terminal +#8 **** CFG +Dispositivos |setup +Generador de fondo |media/palitra +Colores y Apariencia |skincfg +Atajos de teclado |mykey +#9 **** SENSORES +Procesos |cpu +Dispositivos PCI |pcidev +CPUID |cpuid +Ghost Monitor |gmon +K. Bus desconectado |kbd +Informaciвn de HDD |hdd_info +#10 **** ARCHIVOS +KFAR |File Managers/kfar +fNav |File Managers/fNav/fNav +KFM |File Managers/kfm +Eolite |File Managers/Eolite +Virtual disks |tmpdisk +SHELL |shell +Guardar imаgen RD |rdsave +#11 **** PROCESO DE DATOS +Calculadora |calc +Tinypad |tinypad +TextEdit |develop/t_edit +Procesador de tablas |table +Generador de grаficas |graph +Hex-Editor |develop/heed +#12 **** RED +Servidores > |@13 +Clientes > |@14 +Network devices |network/netcfg +Network status |network/netstat +#13 **** SERVIDORES +FTP daemon |network/ftpd +#14 **** CLIENTES +Cliente IRC |network/ircc +Cliente FTP |network/ftpc +Cliente TFTP |network/tftpc +Ping |network/ping +Cliente Telnet |network/telnet +Cliente Synergy |network/synergyc +Resoluciвn de nombres |network/nslookup +VNC Viewer |network/vncc +Cliente de descarga |network/downloader +Navegador (modo texto)|network/webview +#15 **** OTROS +Reloj analвgico |demos/aclock +Reloj binario |demos/bcdclk +Contador |demos/timer +Capturar de pantalla |scrshoot +Calendario |calendar +Lector de RTF |rtfread +#16 **** PRUEBAS +Protecciвn |test +Monitor |disptest +Velocidad de grаficos |mgb +FSPEED speed of FS |fspeed +#17 **** ACCESIBILIDAD +Ampliaciвn de pantalla|magnify +Teclado en pantalla |zkey +#18 **** EMULATORS +DOSBox |/kolibrios/emul/DosBox/dosbox +e80 (ZX Spectrum) |/kolibrios/emul/e80/e80 +FCE Ultra - NES |/kolibrios/emul/fceu/fceu +ZSNES Super Nintendo |/kolibrios/emul/zsnes +ScummVM (adventure) |/kolibrios/emul/scummvm ## diff --git a/programs/cmm/browser/history.h b/programs/cmm/browser/history.h index 4f0112c57a..21e2bfa1b7 100644 --- a/programs/cmm/browser/history.h +++ b/programs/cmm/browser/history.h @@ -1,38 +1,19 @@ #ifdef LANG_RUS -#define HISTORY_HEADER " - - История - - -

История

-
- Посещенные страницы
-" +#define HISTORY_HEADER "ИсторияПосещенные страницы
" #else -#define HISTORY_HEADER " - - History - - -

History

-
- Visited pages
-" +#define HISTORY_HEADER "HistoryVisited pages
" #endif ShowHistory() { int i; - static int history_pointer; - int t; - - free(history_pointer); - history_pointer = malloc(history.items.data_size+256); + dword history_pointer = malloc(history.items.data_size+256); strcat(history_pointer, HISTORY_HEADER); + for (i=0; i"); strcat(history_pointer, history.items.get(i)); @@ -48,6 +29,6 @@ ShowHistory() strcat(history_pointer, "'>
"); } - strcat(history_pointer, ""); LoadInternalPage(history_pointer, strlen(history_pointer)); -} \ No newline at end of file + free(history_pointer); +} diff --git a/programs/cmm/browser/res/test.htm b/programs/cmm/browser/res/test.htm index 2f6625181d..28abcc53de 100644 --- a/programs/cmm/browser/res/test.htm +++ b/programs/cmm/browser/res/test.htm @@ -13,7 +13,6 @@ http://baravy.by/me/b.html artcon.ru -zophar.net acmp.ru cnn 1996 vetusware.com diff --git a/programs/cmm/lib/strings.h b/programs/cmm/lib/strings.h index db81cd3c22..c0007a48f3 100644 --- a/programs/cmm/lib/strings.h +++ b/programs/cmm/lib/strings.h @@ -500,6 +500,17 @@ inline fastcall unsigned int chrnum( ESI, BL) return num; } +inline fastcall unsigned int chrlnum( ESI, BL, EDI) +{ + int num = 0; + while(DSBYTE[ESI]) && (EDI) + { + if (DSBYTE[ESI] == BL) num++; + ESI++; + EDI--; + } + return num; +} inline fastcall signed int strstr( EBX, EDX) { diff --git a/programs/system/menu/trunk/menu.asm b/programs/system/menu/trunk/menu.asm index 921d3df6d9..60db6df596 100644 --- a/programs/system/menu/trunk/menu.asm +++ b/programs/system/menu/trunk/menu.asm @@ -20,25 +20,26 @@ ; ; Compile with FASM for Menuet ;****************************************************************************** - BTN_HEIGHT = 22 - BTN_WIDTH = 140 - TXT_Y = (BTN_HEIGHT)/2-4 + BTN_HEIGHT = 22 ;26 + BTN_WIDTH = 140 ;178 + TXT_Y = (BTN_HEIGHT)/2-4 + FONT_TYPE = 0x80000000 ;0x90000000 - PANEL_HEIGHT = 20 - MENU_BOTTON_X_POS = 10 - MENU_BOTTON_X_SIZE = 50 + PANEL_HEIGHT = 20 + MENU_BOTTON_X_POS = 10 + MENU_BOTTON_X_SIZE = 50 ;------------------------------------------------------------------------------ use32 org 0x0 - db 'MENUET01' ; 8 byte id - dd 0x01 ; header version - dd START ; start of code - dd IM_END ; size of image - dd mem_end ; memory for app - dd stack_area ; esp - dd bootparam ; boot parameters - dd 0x0 ; path + db 'MENUET01' ; 8 byte id + dd 0x01 ; header version + dd START ; start of code + dd IM_END ; size of image + dd mem_end ; memory for app + dd stack_area ; esp + dd bootparam ; boot parameters + dd 0x0 ; path ;------------------------------------------------------------------------------ include "..\..\..\macros.inc" include "..\..\..\gui_patterns.inc" @@ -76,6 +77,8 @@ align 4 align 4 START: ; start of execution mcall 68,11 + + mcall 30, 1, default_dir mov esi,bootparam cmp [esi],byte 0 @@ -378,10 +381,10 @@ align 4 pop eax mov ecx,40 - mov al,'/' + mov al,'|' cld repne scasb - test ecx,ecx ; if '/' not found + test ecx,ecx ; if '|' not found je searchexit cmp [edi],byte '@' ; check for submenu @@ -390,7 +393,7 @@ align 4 cmp [last_key],179 je searchexit - dec edi + ;dec edi push edi ; pointer to start of filename call searchstartstring ; search for next string sub edi,2 ; to last byte of string @@ -435,7 +438,7 @@ runthread: mov [esi + child],al ; this is my child mov cx,[esi + x_start] - add cx,141 ; new x_start in cx + add cx,BTN_WIDTH+1 ; new x_start in cx movzx edx,al shl edx,4 add edx,[menu_data] ; edx points to child's base address @@ -684,9 +687,10 @@ align 4 mov eax,[menu_mame] cmp [ebx+10],eax jne @f - mov ax,[menu_mame+4] - cmp [ebx+14],ax - jne @f + ; temporary to fit into 3 IMG sectors + ;mov ax,[menu_mame+4] + ;cmp [ebx+14],ax + ;jne @f cmp ecx,[active_process] je @f ; dph ecx @@ -855,18 +859,20 @@ align 4 ; from system close button with 0x000001 id ; dunkaist] mcall - pusha + push edx mov edx, esi mcall 13 - mcall , BTN_WIDTH, <[draw_y],1>, [sc.work_light] - mcall , 1, <[draw_y],BTN_HEIGHT> - mcall , , <[draw_y],BTN_HEIGHT+1>, [sc.work_dark] - add [draw_y], BTN_HEIGHT-1 - mcall , BTN_WIDTH, <[draw_y],1> + mcall , BTN_WIDTH,<[draw_y],1>,[sc.work_light] + add ecx, BTN_HEIGHT-1 + mcall , 1 + inc ecx + mcall , , , [sc.work_dark] + add [draw_y], BTN_HEIGHT-1 + mcall , BTN_WIDTH,<[draw_y],1> - popa + pop edx movzx edx,dl dec dl imul ebx,edx,BTN_HEIGHT @@ -905,8 +911,8 @@ searchstartstring: ret ;------------------------------------------------------------------------------ ;*** DATA AREA **************************************************************** -menu_mame: - db '@MENU',0 +menu_mame: db '@MENU',0 +default_dir: db '/sys',0 align 4 free_my_area_lock dd 0 @@ -933,7 +939,7 @@ fileinfo: .size dd 0 ; bytes to read .return dd procinfo ; return data pointer .name: - db '/SYS/SETTINGS/MENU.DAT',0 ; ASCIIZ dir & filename + db 'SETTINGS/MENU.DAT',0 ; ASCIIZ dir & filename ;-------------------------------------- align 4 fileinfo_start: @@ -981,18 +987,18 @@ prior_thread_h dd ? prior_thread_selected_y_end db ? ;------------------------------------------------------------------------------ align 4 -menu_data dd ? +menu_data dd ? ;-------------------------------------- -virtual at 0 ; PROCESSES TABLE (located at menu_data) - pointer dd ? ; +0 pointer in file - rows db ? ; +4 numer of strings - x_start dw ? ; +5 x start - y_end dw ? ; +7 y end - child db ? ; +9 id of child menu - parent db ? ; +10 id of parent menu - cur_sel db ? ; +11 current selection - prev_sel db ? ; +12 previous selection - rb 16-$+1 ; [16 bytes per element] +virtual at 0 ; PROCESSES TABLE (located at menu_data) + pointer dd ? ; +0 pointer in file + rows db ? ; +4 numer of strings + x_start dw ? ; +5 x start + y_end dw ? ; +7 y end + child db ? ; +9 id of child menu + parent db ? ; +10 id of parent menu + cur_sel db ? ; +11 current selection + prev_sel db ? ; +12 previous selection + rb 16-$+1 ; [16 bytes per element] end virtual ;------------------------------------------------------------------------------ align 4