From b49d7898b746e02cfe9ed0e094a22a343b7d58b3 Mon Sep 17 00:00:00 2001 From: "Kirill Lipatov (Leency)" Date: Mon, 10 Dec 2012 01:35:06 +0000 Subject: [PATCH] 3d/3dcube2, 3d/flatwav, 3d/barge.lif, demos/fire deleted from distro. Menu fixed git-svn-id: svn://kolibrios.org@3092 a494cfbc-eb01-0410-851d-a64ba20cac60 --- data/eng/Makefile | 5 ----- data/eng/menu.dat | 7 ++----- data/rus/Makefile | 4 ---- data/rus/menu.dat | 7 +++---- 4 files changed, 5 insertions(+), 18 deletions(-) diff --git a/data/eng/Makefile b/data/eng/Makefile index aca1982558..4864d521d5 100644 --- a/data/eng/Makefile +++ b/data/eng/Makefile @@ -78,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 \ @@ -90,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 \ @@ -277,7 +274,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 \ @@ -293,7 +289,6 @@ OTHER_FILES:=autorun.dat:AUTORUN.DAT \ 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 diff --git a/data/eng/menu.dat b/data/eng/menu.dat index d6dc0d65fe..e8641efc84 100644 --- a/data/eng/menu.dat +++ b/data/eng/menu.dat @@ -46,7 +46,6 @@ Phenix /rd/1/games/phenix Snake /rd/1/games/snake #4 **** DEMOS **** 3D > /@5 -Fire /rd/1/demos/fire Circle /rd/1/demos/circle Fractal /rd/1/demos/tinyfrac Color demo /rd/1/demos/colorref @@ -61,18 +60,16 @@ FireWork /rd/1/demos/firework UnvWater /rd/1/demos/unvwater #5 **** 3D demos **** ScreenSaver /rd/1/3d/crownscr -3D-cube /rd/1/3d/3dcube2 3D-labyrinth /rd/1/3d/free3d04 -3DSHeart /rd/1/3d/3dsheart +Heart /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 **** Image viewer /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 diff --git a/data/rus/Makefile b/data/rus/Makefile index 61c82e73f3..c0ac2a5581 100644 --- a/data/rus/Makefile +++ b/data/rus/Makefile @@ -79,11 +79,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 \ @@ -91,7 +89,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 \ @@ -270,7 +267,6 @@ OTHER_FILES:=autorun.dat:AUTORUN.DAT \ shell:SHELL table:TABLE vmode:VMODE \ 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 \ diff --git a/data/rus/menu.dat b/data/rus/menu.dat index d6a448bf97..f2839e0c46 100644 --- a/data/rus/menu.dat +++ b/data/rus/menu.dat @@ -49,7 +49,6 @@ PheniX /rd/1/games/phenix Змейка /rd/1/games/snake #4 **** DEMOS **** Трёхмерные > /@5 -Огонь /rd/1/demos/fire Кружок /rd/1/demos/circle Фрактал Мандельброта /rd/1/demos/tinyfrac Цвета /rd/1/demos/colorref @@ -64,7 +63,6 @@ TranTest /rd/1/demos/trantest UnvWater /rd/1/demos/unvwater #5 **** 3D demos **** Скринсейвер /rd/1/3d/crownscr -3D-Куб /rd/1/3d/3dcube2 3D-Лабиринт /rd/1/3d/free3d04 Сердце /rd/1/3d/3dsheart Просмотрщик 3DS /rd/1/3d/view3ds @@ -75,6 +73,7 @@ FlatWave /rd/1/3d/flatwav #6 **** GRAPHICS **** Просмотр изображений /rd/1/media/kiv Редактор Animage /rd/1/media/animage +Палитра /rd/1/media/palitra #7 **** AUDIO **** Midi-плеер /rd/1/media/midamp CD-плейер /rd/1/media/cdp @@ -104,7 +103,7 @@ Color Slider /rd/1/demos/cslide Доска отладки /rd/1/develop/board #11 **** SETUP **** Устройства /rd/1/setup -Генератор фона /rd/1/pic4 +Установить фон /rd/1/palitra Стиль окон /rd/1/desktop Менеджер иконок /rd/1/icon MyKey /rd/1/mykey @@ -117,7 +116,7 @@ GHOST Monitor /rd/1/gmon K. Bus disconnected /rd/1/kbd HDD информер /rd/1/hdd_info Чтение HDD /rd/1/hdread -#13 **** FM **** +#13 **** File Managers **** KFAR /rd/1/File Managers/kfar KFM /rd/1/File Managers/kfm Eolite /rd/1/File Managers/Eolite