diff --git a/data/it/File Managers/eolite.ini b/data/it/File Managers/eolite.ini index 4fd8834f8b..3f6445f56d 100644 --- a/data/it/File Managers/eolite.ini +++ b/data/it/File Managers/eolite.ini @@ -28,7 +28,6 @@ mht=/sys/HTMLv fb2=/sys/HTMLv rtf=/sys/RtfRead obj=/sys/develop/cObj -sna=/sys/e80 nes=/sys/games/fceu xm=/sys/media/AC97SND wav=/sys/media/AC97SND diff --git a/data/it/File Managers/kfar.ini b/data/it/File Managers/kfar.ini index d5848a1973..6edf269c41 100644 --- a/data/it/File Managers/kfar.ini +++ b/data/it/File Managers/kfar.ini @@ -5,23 +5,20 @@ ini=/sys/TinyPad txt=/sys/TinyPad jpg=/sys/media/kiv jpeg=/sys/media/kiv +jpe=/sys/media/kiv gif=/sys/media/kiv; ViewGraph,MenuAnimage -wav=/sys/media/AC97SND -mp3=/sys/media/AC97SND -xm=/sys/media/AC97SND -mid=/sys/media/MIDAMP +ico=/sys/media/kiv bmp=/sys/media/kiv; ViewGraph,MenuAnimage png=/sys/media/kiv -ico=/sys/media/kiv cur=/sys/media/kiv pcx=/sys/media/kiv -xcf=/sys/media/kiv pbm=/sys/media/kiv pgm=/sys/media/kiv pnm=/sys/media/kiv tif=/sys/media/kiv tiff=/sys/media/kiv wbmp=/sys/media/kiv +xcf=/sys/media/kiv rtf=/sys/RtfRead 3ds=/sys/3d/view3ds lif=/sys/demos/life2 @@ -29,14 +26,17 @@ skn=/sys/desktop m3u=/sys/media/listplay lap=/sys/media/listplay asf=/sys/media/listplay +wav=/sys/media/AC97SND +mp3=/sys/media/AC97SND +xm=/sys/media/AC97SND +mid=/sys/media/MIDAMP cvs=/sys/graph obj=/sys/develop/cObj -nes=/sys/fceu -sna=/sys/e80 htm=/sys/HTMLv html=/sys/HTMLv fb2=/sys/HTMLv - +mht=/sys/HTMLv +kla=/sys/games/klavisha [Menu] AsmMenu1=&Edit,/sys/TinyPad diff --git a/data/it/File Managers/kfm.ini b/data/it/File Managers/kfm.ini index dc8c6c4505..f3dcdd7450 100644 --- a/data/it/File Managers/kfm.ini +++ b/data/it/File Managers/kfm.ini @@ -2,6 +2,7 @@ start <>icons_associations asm 0004 inc 0004 +mac 0004 txt 0003 rtf 0003 ini 0003 @@ -25,6 +26,7 @@ j2c 0006 bmp 0006 dib 0006 rle 0006 +pbm 0006 wbm 0006 wbmp 0006 xbm 0006 @@ -61,6 +63,7 @@ pix 0006 pict 0006 pct 0006 pic 0006 +pgm 0006 pef 0006 pcd 0006 iff 0006 @@ -103,6 +106,7 @@ wlz 0005 exe 0008 com 0008 bat 0008 +sh 0008 7z 0009 rar 0009 zip 0009 @@ -124,6 +128,8 @@ uu 0009 xxe 0009 z 0009 dat 0010 +dbg 0010 +mgb 0010 ttf 0012 ttc 0012 chr 0012 @@ -139,20 +145,19 @@ skn 0017 <>files_associations asm /sys/tinypad inc /sys/tinypad +mac /sys/tinypad +dbg /sys/tinypad txt /sys/tinypad ini /sys/tinypad log /sys/tinypad dat /sys/tinypad inf /sys/tinypad bat /sys/tinypad +sh /sys/tinypad jpg /sys/media/kiv jpeg /sys/media/kiv jpe /sys/media/kiv gif /sys/media/kiv -wav /sys/media/ac97snd -mp3 /sys/media/ac97snd -xm /sys/media/ac97snd -mid /sys/media/midamp bmp /sys/media/kiv png /sys/media/kiv ico /sys/media/kiv @@ -165,6 +170,10 @@ pnm /sys/media/kiv tif /sys/media/kiv tiff /sys/media/kiv wbmp /sys/media/kiv +wav /sys/media/ac97snd +mp3 /sys/media/ac97snd +xm /sys/media/ac97snd +mid /sys/media/midamp rtf /sys/rtfread 3ds /sys/3d/view3ds lif /sys/demos/life2 @@ -184,12 +193,13 @@ lap /sys/media/listplay asf /sys/media/listplay cvs /sys/graph obj /sys/develop/cObj -nes /sys/fceu -sna /sys/e80 htm /sys/HTMLv html /sys/HTMLv +mht /sys/HTMLv fb2 /sys/HTMLv kla /sys/games/klavisha +bin /sys/develop/heed +mgb /sys/develop/heed <>end <>files_association1 diff --git a/data/it/Makefile b/data/it/Makefile index d84ab247ac..df05fab627 100644 --- a/data/it/Makefile +++ b/data/it/Makefile @@ -44,9 +44,7 @@ export DOCDIR FASM_PROGRAMS:=\ @clip:@CLIP:$(PROGS)/system/clip/trunk/@clip.ASM \ @menu:@MENU:$(PROGS)/system/menu/trunk/menu.asm \ - @notify:@NOTIFY:$(PROGS)/system/notify/trunk/@notify.asm \ @panel:@PANEL:$(PROGS)/system/panel/trunk/@PANEL.ASM \ - @rb:@RB:$(PROGS)/system/rb/trunk/@RB.ASM \ @ss:@SS:$(PROGS)/system/ss/trunk/@ss.asm\ refrscrn:REFRSCRN:$(PROGS)/system/refrscrn/refrscrn.asm \ asciivju:ASCIIVJU:$(PROGS)/develop/asciivju/trunk/asciivju.asm \ @@ -72,7 +70,6 @@ FASM_PROGRAMS:=\ madmouse:MADMOUSE:$(PROGS)/other/madmouse/madmouse.asm \ mykey:MYKEY:$(PROGS)/system/MyKey/trunk/MyKey.asm \ pcidev:PCIDEV:$(PROGS)/system/pcidev/trunk/PCIDEV.ASM \ - pic4:PIC4:$(PROGS)/media/pic4/trunk/pic4.asm \ rdsave:RDSAVE:$(PROGS)/system/rdsave/trunk/rdsave.asm \ rtfread:RTFREAD:$(PROGS)/other/rtfread/trunk/rtfread.asm \ run:RUN:$(PROGS)/system/run/trunk/run.asm \ @@ -81,11 +78,9 @@ FASM_PROGRAMS:=\ test:TEST:$(PROGS)/system/test/trunk/test.asm \ tinypad:TINYPAD:$(PROGS)/develop/tinypad/trunk/tinypad.asm \ zkey:ZKEY:$(PROGS)/system/zkey/trunk/ZKEY.ASM \ - 3d/3dcube2:3D/3DCUBE2:$(PROGS)/demos/3dcube2/trunk/3DCUBE2.ASM \ 3d/3dsheart:3D/3DSHEART:$(PROGS)/demos/3dsheart/trunk/3dsheart.asm \ 3d/3dwav:3D/3DWAV:$(PROGS)/demos/3dwav/trunk/3dwav.asm \ 3d/crownscr:3D/CROWNSCR:$(PROGS)/demos/crownscr/trunk/crownscr.asm \ - 3d/flatwav:3D/FLATWAV:$(PROGS)/demos/flatwav/trunk/FLATWAV.ASM \ 3d/free3d04:3D/FREE3D04:$(PROGS)/demos/free3d04/trunk/free3d04.asm \ 3d/view3ds:3D/VIEW3DS:$(PROGS)/demos/3DS/VIEW3DS.ASM \ demos/bcdclk:DEMOS/BCDCLK:$(PROGS)/demos/bcdclk/trunk/bcdclk.asm \ @@ -93,7 +88,6 @@ FASM_PROGRAMS:=\ demos/colorref:DEMOS/COLORREF:$(PROGS)/demos/colorref/trunk/colorref.asm \ demos/cslide:DEMOS/CSLIDE:$(PROGS)/demos/cslide/trunk/cslide.asm \ demos/eyes:DEMOS/EYES:$(PROGS)/demos/eyes/trunk/eyes.asm \ - demos/fire:DEMOS/FIRE:$(PROGS)/demos/fire/trunk/fire.asm \ demos/firework:DEMOS/FIREWORK:$(PROGS)/demos/firework/trunk/firework.asm \ demos/movback:DEMOS/MOVBACK:$(PROGS)/demos/movback/trunk/movback.asm \ demos/plasma:DEMOS/PLASMA:$(PROGS)/demos/plasma/trunk/plasma.asm \ @@ -128,6 +122,7 @@ FASM_PROGRAMS:=\ drivers/emu10k1x.obj:DRIVERS/EMU10K1X.OBJ:$(KERNEL)/drivers/emu10k1x.asm \ drivers/fm801.obj:DRIVERS/FM801.OBJ:$(KERNEL)/drivers/fm801.asm \ drivers/infinity.obj:DRIVERS/INFINITY.OBJ:$(KERNEL)/drivers/infinity.asm \ + drivers/intel_hda.obj:DRIVERS/intel_hda.obj:$(REPOSITORY)/drivers/audio/intel_hda/intel_hda.asm \ drivers/ps2mouse.obj:DRIVERS/PS2MOUSE.OBJ:$(REPOSITORY)/drivers/mouse/ps2mouse4d/trunk/ps2mouse.asm \ drivers/sb16.obj:DRIVERS/SB16.OBJ:$(KERNEL)/drivers/sb16/sb16.asm \ drivers/sound.obj:DRIVERS/SOUND.OBJ:$(KERNEL)/drivers/sound.asm \ @@ -159,6 +154,7 @@ FASM_PROGRAMS:=\ games/tetris:GAMES/TETRIS:$(PROGS)/games/tetris/trunk/tetris.asm \ lib/archiver.obj:LIB/ARCHIVER.OBJ:$(PROGS)/fs/kfar/trunk/kfar_arc/kfar_arc.asm \ lib/box_lib.obj:LIB/BOX_LIB.OBJ:$(PROGS)/develop/libraries/box_lib/trunk/box_lib.asm \ + lib/buf2d.obj:LIB/BUF2D.OBJ:$(PROGS)/develop/libraries/buf2d/trunk/buf2d.asm \ lib/console.obj:LIB/CONSOLE.OBJ:$(PROGS)/develop/libraries/console/console.asm \ lib/libgfx.obj:LIB/LIBGFX.OBJ:$(PROGS)/develop/libraries/libs-dev/libgfx/libgfx.asm \ lib/libimg.obj:LIB/LIBIMG.OBJ:$(PROGS)/develop/libraries/libs-dev/libimg/libimg.asm \ @@ -172,6 +168,7 @@ FASM_PROGRAMS:=\ media/kiv:MEDIA/KIV:$(PROGS)/media/kiv/trunk/kiv.asm \ media/listplay:MEDIA/LISTPLAY:$(PROGS)/media/listplay/trunk/listplay.asm \ media/midamp:MEDIA/MIDAMP:$(PROGS)/media/midamp/trunk/midamp.asm \ + media/palitra:MEDIA/PALITRA:$(PROGS)/media/palitra/trunk/palitra.asm \ media/startmus:MEDIA/STARTMUS:$(PROGS)/media/startmus/trunk/STARTMUS.ASM \ network/airc:NETWORK/AIRC:$(PROGS)/network/airc/trunk/airc.asm \ network/arpstat:NETWORK/ARPSTAT:$(PROGS)/network/arpstat/trunk/arpstat.asm \ @@ -256,7 +253,10 @@ CMM_PROGRAMS:=\ games/FindNumbers:GAMES/FindNumbers:$(PROGS)/games/FindNumbers/trunk/FindNumbers.c-- \ games/flood-it:GAMES/flood-it:$(PROGS)/games/flood-it/trunk/flood-it.c \ games/mine:GAMES/MINE:$(PROGS)/games/mine/trunk/mine.c--:/MEOS \ - HTMLv:HTMLv:$(PROGS)/network/htmlv/browser/HTMLv.c \ + HTMLv:HTMLv:$(PROGS)/cmm/browser/HTMLv.c \ + tmpdisk:tmpdisk:$(PROGS)/cmm/tmpdisk/tmpdisk.c \ + @notify:@notify:$(PROGS)/cmm/notify/notify.c \ + @rb:@rb:$(PROGS)/cmm/rb/rb.c \ #develop/c--:DEVELOP/C--:$(PROGS)/develop/c--/trunk/32.c-- \ # end of list @@ -265,8 +265,8 @@ CMM_PROGRAMS:=\ # Each item is of the form :. # Spaces should be represented as |. OTHER_FILES:=autorun.dat:AUTORUN.DAT \ - background.png:background.png default.skn:DEFAULT.SKN \ - e80:E80 graph:GRAPH hdread:HDREAD \ + default.skn:DEFAULT.SKN \ + graph:GRAPH hdread:HDREAD \ icons.dat:ICONS.DAT iconstrp.png:ICONSTRP.PNG index_htm:INDEX.HTM \ kernel.mnt:KERNEL.MNT kerpack:KERPACK keymap.key:KEYMAP.KEY \ kuzkina.mid:KUZKINA.MID lang.inc:LANG.INC lang.ini:LANG.INI \ @@ -276,7 +276,6 @@ OTHER_FILES:=autorun.dat:AUTORUN.DAT \ vmode:VMODE 3d/3dsheart:3D/3DSHEART \ 3d/cubeline:3D/CUBELINE 3d/gears:3D/GEARS 3d/house.3ds:3D/HOUSE.3DS \ demos/ak47.lif:DEMOS/AK47.LIF \ - demos/barge.lif:DEMOS/BARGE.LIF demos/life2:DEMOS/LIFE2 \ demos/relay.lif:DEMOS/RELAY.LIF demos/rpento.lif:DEMOS/RPENTO.LIF \ demos/use_mb:DEMOS/USE_MB \ File|Managers/eolite.ini:File|Managers/EOLITE.INI \ @@ -284,16 +283,14 @@ OTHER_FILES:=autorun.dat:AUTORUN.DAT \ File|Managers/kfar.ini:File|Managers/KFAR.INI \ File|Managers/kfm.ini:File|Managers/KFM.INI \ games/checkers:GAMES/CHECKERS \ - games/kosilka:GAMES/KOSILKA games/kosskin.gfx:GAMES/KOSSKIN.GFX \ games/reversi:GAMES/REVERSI games/rforces:GAMES/RFORCES \ games/xonix:GAMES/XONIX games/megamaze:GAMES/MEGAMAZE \ + games/kosilka:GAMES/KOSILKA \ lib/msgbox.obj:LIB/MSGBOX.OBJ \ lib/pixlib.obj:LIB/PIXLIB.OBJ lib/sort.obj:LIB/SORT.OBJ \ - drivers/intel_hda.obj:DRIVERS/intel_hda.obj \ media/ac97snd:MEDIA/AC97SND \ network/jmail:NETWORK/JMAIL network/zeroconf.ini:NETWORK/ZEROCONF.INI \ #end of list -#3d/logio.bmp:3D/LOGIO.BMP 3d/cubetext:3D/CUBETEXT # Generate skins list understandable by gnu make Makefile.skins: $(REPOSITORY)/skins/authors.txt $(REPOSITORY)/data/generate_makefile_skins.sh @@ -302,9 +299,10 @@ include Makefile.skins # Extra targets for LiveCD image in the syntax of mkisofs MKISOFS_EXTRA:=\ - dosbox/=$(PROGS)/emulator/DosBox/dosbox \ - dosbox/=$(PROGS)/emulator/DosBox/dosbox.conf \ - dosbox/=$(PROGS)/emulator/DosBox/readme.txt \ + emu/e80/e80=e80 \ + emu/dosbox/=$(PROGS)/emulator/DosBox/dosbox \ + emu/dosbox/=$(PROGS)/emulator/DosBox/dosbox.conf \ + emu/dosbox/=$(PROGS)/emulator/DosBox/readme.txt \ /=distr_data/autorun.inf \ /=distr_data/KolibriOS_icon.ico \ /=distr_data/readme.txt \ diff --git a/data/it/autorun.dat b/data/it/autorun.dat index 8549750a7d..a53468d052 100644 --- a/data/it/autorun.dat +++ b/data/it/autorun.dat @@ -4,15 +4,15 @@ # If delay is negative, wait for termination of the spawned process. Otherwise, simply wait # #/RD/1/CROPFLAT "XS800 YS480" 1 # set limits of screen -/RD/1/refrscrn "" 1 # Refresh screen -/RD/1/COMMOUSE "" 1 # COM mice detector -/RD/1/MEDIA/KIV \T__background.png -1 # Desktop background image -/RD/1/@CLIP "" 1 # Clipboard -/RD/1/@RB "" 1 # Desktop right-click menu -/RD/1/@SS ASSM 1 # Screensaver -/RD/1/@PANEL "" 1 # Start panel +#/RD/1/COMMOUSE "" 1 # COM mice detector #/RD/1/DEVELOP/BOARD "" 1 # Load DEBUG board -/RD/1/SETUP BOOT 1 # Load device settings -/RD/1/ICON BOOT 1 # Multithread icon -/RD/1/NETWORK/ZEROCONF "" 1 # Network configuration +#/RD/1/refrscrn "" 1 # Refresh screen +/RD/1/NETWORK/ZEROCONF "" 1 # Network configuration +/RD/1/MEDIA/PALITRA "H 007DCEDF 003C427F" 1 #SET BG +/RD/1/@PANEL "" 1 # Start panel +/RD/1/SETUP BOOT 1 # Load device settings +/RD/1/ICON BOOT 1 # Multithread icon +/RD/1/@RB "" 1 # Desktop right-click menu +/RD/1/@SS ASSM 1 # Screensaver +/RD/1/TMPDISK A1 1 # Add virtual RAM disk /tmp1/1 ### Hello, ASM World! ### diff --git a/data/it/default.skn b/data/it/default.skn index e6b4f208e5..c7ab605102 100644 Binary files a/data/it/default.skn and b/data/it/default.skn differ diff --git a/data/it/drivers/intel_hda.obj b/data/it/drivers/intel_hda.obj deleted file mode 100644 index de3150d8b1..0000000000 Binary files a/data/it/drivers/intel_hda.obj and /dev/null differ diff --git a/data/it/games/kosskin.gfx b/data/it/games/kosskin.gfx deleted file mode 100644 index bb40014f13..0000000000 Binary files a/data/it/games/kosskin.gfx and /dev/null differ diff --git a/data/it/menu.dat b/data/it/menu.dat index eb13da7c13..57bf7c0b31 100644 --- a/data/it/menu.dat +++ b/data/it/menu.dat @@ -14,7 +14,6 @@ Spegni /rd/1/end #1 **** GAMES **** Giochi di logica > /@2 Arcade > /@3 -Emulatori /rd/1/e80 Memory /rd/1/games/mblocks FreeCell /rd/1/games/freecell Pipes /rd/1/games/pipes @@ -46,7 +45,6 @@ Phenix /rd/1/games/phenix Snake /rd/1/games/snake #4 **** DEMOS **** 3D > /@5 -Fuoco /rd/1/demos/fire Cerchio /rd/1/demos/circle Frattale /rd/1/demos/tinyfrac Demo Colori /rd/1/demos/colorref @@ -61,18 +59,16 @@ Fuochi d'artificio /rd/1/demos/firework UnvWater /rd/1/demos/unvwater #5 **** 3D demos **** ScreenSaver /rd/1/3d/crownscr -Cubo 3D /rd/1/3d/3dcube2 Labirinto 3D /rd/1/3d/free3d04 Cuore 3D /rd/1/3d/3dsheart View3DS /rd/1/3d/view3ds CubeLine /rd/1/3d/cubeline -3D-textured cube 2 /rd/1/3d/cubetext Gears /rd/1/3d/gears -FlatWave /rd/1/3d/flatwav 3D-waved area /rd/1/3d/3dwav #6 **** GRAPHICS **** Visualizzatore Immagini /rd/1/media/kiv Animage /rd/1/media/animage +Palitra /rd/1/media/palitra #7 **** AUDIO **** MidAMP /rd/1/media/midamp CD player /rd/1/media/cdp