From 0ad879f18ad191f9920bae3f0a53f00b941dc354 Mon Sep 17 00:00:00 2001 From: heavyiron Date: Sun, 8 Sep 2013 21:35:54 +0000 Subject: [PATCH] Added new icon from GerdtR to autobuild git-svn-id: svn://kolibrios.org@3897 a494cfbc-eb01-0410-851d-a64ba20cac60 --- data/eng/ICON.INI | 173 +++++++++++++++++++++++++++++ data/eng/Makefile | 5 +- data/eng/autorun.dat | 4 +- data/eng/icons.dat | 28 ----- data/eng/menu.dat | 1 - data/it/ICON.INI | 173 +++++++++++++++++++++++++++++ data/it/Makefile | 5 +- data/it/autorun.dat | 4 +- data/it/icons.dat | 28 ----- data/it/menu.dat | 1 - data/rus/ICON.INI | 173 +++++++++++++++++++++++++++++ data/rus/Makefile | 5 +- data/rus/autorun.dat | 4 +- data/rus/icons.dat | 28 ----- data/rus/menu.dat | 1 - data/sp/ICON.INI | 173 +++++++++++++++++++++++++++++ data/sp/Makefile | 5 +- data/sp/autorun.dat | 12 +- data/sp/icons.dat | 28 ----- data/sp/menu.dat | 1 - programs/system/icon_new/@ICON.ASM | 2 +- programs/system/icon_new/ICON.INI | 4 +- 22 files changed, 715 insertions(+), 143 deletions(-) create mode 100644 data/eng/ICON.INI delete mode 100644 data/eng/icons.dat create mode 100644 data/it/ICON.INI delete mode 100644 data/it/icons.dat create mode 100644 data/rus/ICON.INI delete mode 100644 data/rus/icons.dat create mode 100644 data/sp/ICON.INI delete mode 100644 data/sp/icons.dat diff --git a/data/eng/ICON.INI b/data/eng/ICON.INI new file mode 100644 index 0000000000..32c228d409 --- /dev/null +++ b/data/eng/ICON.INI @@ -0,0 +1,173 @@ +[rbmenu] +Shell=/rd/1/shell +Processes=/rd/1/cpu +Themes=desktop +Device setup=setup +[KFM] +path=/SYS/FILE MANAGERS/KFM +param= +ico=5 +x=0 +y=0 +[TINYPAD] +path=/SYS/TINYPAD +param= +ico=9 +x=0 +y=68 +[EOLITE] +path=/SYS/FILE MANAGERS/EOLITE +param= +ico=2 +x=68 +y=0 +[SHELL] +path=/SYS/SHELL +param= +ico=20 +x=136 +y=0 +[KFAR] +path=/SYS/FILE MANAGERS/KFAR +param= +ico=16 +x=68 +y=68 +[RDSAVE] +path=/SYS/RDSAVE +param= +ico=17 +x=0 +y=136 +[CALC] +path=/SYS/CALC +param= +ico=4 +x=68 +y=136 +[ANIMAGE] +path=/SYS/MEDIA/ANIMAGE +param= +ico=15 +x=136 +y=68 +[KPACK] +path=/SYS/KPACK +param= +ico=10 +x=-67 +y=0 +[SNAKE] +path=/SYS/GAMES/SNAKE +param= +ico=3 +x=-135 +y=-135 +[MINE] +path=/SYS/GAMES/MINE +param= +ico=14 +x=-67 +y=-67 +[LIFE2] +path=/SYS/DEMOS/LIFE2 +param= +ico=13 +x=-135 +y=-67 +[MBLOCKS] +path=/SYS/GAMES/MBLOCKS +param= +ico=11 +x=-67 +y=-135 +[PONG] +path=/SYS/GAMES/PONG3 +param= +ico=12 +x=-203 +y=-67 +[15] +path=/SYS/GAMES/15 +param= +ico=0 +x=-271 +y=-67 +[DOCPACK] +path=/SYS/DOCPACK +param= +ico=8 +x=-67 +y=68 +[BOARD] +path=/SYS/DEVELOP/BOARD +param= +ico=19 +x=-135 +y=0 +[HEXEDIT] +path=/SYS/DEVELOP/HEED +param= +ico=22 +x=-67 +y=136 +[MTDBG] +path=/SYS/DEVELOP/MTDBG +param= +ico=6 +x=-203 +y=0 +[PIPES] +path=/SYS/GAMES/PIPES +param= +ico=26 +x=0 +y=-135 +[SUDOKU] +path=/SYS/GAMES/SUDOKU +param= +ico=25 +x=0 +y=-67 +[GOMOKU] +path=/SYS/GAMES/GOMOKU +param= +ico=24 +x=68 +y=-67 +[XONIX] +path=/SYS/GAMES/XONIX +param= +ico=21 +x=68 +y=-135 +[CHECKERS] +path=/SYS/GAMES/CHECKERS +param= +ico=1 +x=-271 +y=-135 +[KOSILKA] +path=/SYS/GAMES/KOSILKA +param= +ico=23 +x=136 +y=-67 +[FLOOD-IT] +path=/SYS/GAMES/FLOOD-IT +param= +ico=27 +x=136 +y=-135 +[FASM] +path=/SYS/DEVELOP/FASM +param= +ico=10 +x=-135 +y=68 +[CLICKS] +path=/SYS/GAMES/CLICKS +param= +ico=18 +x=-203 +y=-135 diff --git a/data/eng/Makefile b/data/eng/Makefile index a2885b86e8..008357d172 100644 --- a/data/eng/Makefile +++ b/data/eng/Makefile @@ -60,7 +60,7 @@ FASM_PROGRAMS:=\ end:END:$(PROGS)/system/end/light/end.asm \ gmon:GMON:$(PROGS)/system/gmon/gmon.asm \ hdd_info:HDD_INFO:$(PROGS)/system/hdd_info/trunk/hdd_info.asm \ - icon:ICON:$(PROGS)/system/icon/trunk/icon.asm \ + @icon:@ICON:$(PROGS)/system/icon_new/@icon.asm \ cropflat:CROPFLAT:$(PROGS)/system/cropflat/cropflat.asm \ kbd:KBD:$(PROGS)/system/kbd/trunk/kbd.ASM \ kpack:KPACK:$(PROGS)/other/kpack/trunk/kpack.asm \ @@ -278,7 +278,6 @@ CMM_PROGRAMS:=\ 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 @@ -289,7 +288,7 @@ CMM_PROGRAMS:=\ OTHER_FILES:=autorun.dat:AUTORUN.DAT \ default.skn:DEFAULT.SKN \ graph:GRAPH hdread:HDREAD \ - icons.dat:ICONS.DAT iconstrp.png:ICONSTRP.PNG index_htm:INDEX.HTM \ + icon.ini:ICON.INI 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 \ menu.dat:MENU.DAT kolibri.lbl:KOLIBRI.LBL \ diff --git a/data/eng/autorun.dat b/data/eng/autorun.dat index d26a5af3de..c739d6f8b4 100644 --- a/data/eng/autorun.dat +++ b/data/eng/autorun.dat @@ -12,8 +12,8 @@ /SYS/MEDIA/PALITRA "H 007DCEDF 003C427F" 1 #SET BG /SYS/@PANEL "" 1 # Start panel /SYS/SETUP BOOT 1 # Load device settings -/SYS/ICON BOOT 1 # Multithread icon -/SYS/@RB "" 1 # Desktop right-click menu +/SYS/@ICON "" 1 # Multithread icon +#/SYS/@RB "" 1 # Desktop right-click menu /SYS/@SS ASSM 1 # Screensaver /SYS/TMPDISK A1 -1 # Add virtual RAM disk /tmp1/1 /SYS/SEARCHAP "" -1 # Search and mount additional system directory diff --git a/data/eng/icons.dat b/data/eng/icons.dat deleted file mode 100644 index d001b86c9a..0000000000 --- a/data/eng/icons.dat +++ /dev/null @@ -1,28 +0,0 @@ -AA-KFM -005-/SYS/FILE MANAGERS/KFM - * -AB-TINYPAD -009-/SYS/TINYPAD - * -BA-EOLITE -002-/SYS/FILE MANAGERS/EOLITE - * -CA-SHELL -020-/SYS/SHELL - * -BB-KFAR -016-/SYS/FILE MANAGERS/KFAR - * -AC-RDSAVE -017-/SYS/RDSAVE - * -BC-CALC -004-/SYS/CALC - * -CB-ANIMAGE -015-/SYS/MEDIA/ANIMAGE - * -JA-KPACK -010-/SYS/KPACK - * -IH-SNAKE -003-/SYS/GAMES/SNAKE - * -JI-MINE -014-/SYS/GAMES/MINE - * -II-LIFE2 -013-/SYS/DEMOS/LIFE2 - * -JH-MBLOCKS -011-/SYS/GAMES/MBLOCKS - * -HI-PONG -012-/SYS/GAMES/PONG3 - * -GI-15 -000-/SYS/GAMES/15 - * -HH-CLICKS -018-/SYS/GAMES/CLICKS - * -JB-DOCPACK -008-/SYS/DOCPACK - * -IA-BOARD -019-/SYS/DEVELOP/BOARD - * -JC-HEXEDIT -022-/SYS/DEVELOP/HEED - * -HA-MTDBG -006-/SYS/DEVELOP/MTDBG - * -AH-PIPES -026-/SYS/GAMES/PIPES - * -AI-SUDOKU -025-/SYS/GAMES/SUDOKU - * -BI-GOMOKU -024-/SYS/GAMES/GOMOKU - * -BH-XONIX -021-/SYS/GAMES/XONIX - * -GH-CHECKERS-001-/SYS/GAMES/CHECKERS - * -CI-KOSILKA -023-/SYS/GAMES/KOSILKA - * -CH-FLOOD-IT-027-/SYS/GAMES/FLOOD-IT - * -IB-FASM -010-/SYS/DEVELOP/FASM - * diff --git a/data/eng/menu.dat b/data/eng/menu.dat index b6fa353d84..34635ed1ac 100644 --- a/data/eng/menu.dat +++ b/data/eng/menu.dat @@ -102,7 +102,6 @@ Debug board /sys/develop/board Devices /sys/setup Background generator /sys/media/palitra Colors & Skin /sys/desktop -Icons manager /sys/icon MyKey /sys/mykey Video mode for ATI /sys/vmode #12 **** SYSTEM SENSORS **** diff --git a/data/it/ICON.INI b/data/it/ICON.INI new file mode 100644 index 0000000000..32c228d409 --- /dev/null +++ b/data/it/ICON.INI @@ -0,0 +1,173 @@ +[rbmenu] +Shell=/rd/1/shell +Processes=/rd/1/cpu +Themes=desktop +Device setup=setup +[KFM] +path=/SYS/FILE MANAGERS/KFM +param= +ico=5 +x=0 +y=0 +[TINYPAD] +path=/SYS/TINYPAD +param= +ico=9 +x=0 +y=68 +[EOLITE] +path=/SYS/FILE MANAGERS/EOLITE +param= +ico=2 +x=68 +y=0 +[SHELL] +path=/SYS/SHELL +param= +ico=20 +x=136 +y=0 +[KFAR] +path=/SYS/FILE MANAGERS/KFAR +param= +ico=16 +x=68 +y=68 +[RDSAVE] +path=/SYS/RDSAVE +param= +ico=17 +x=0 +y=136 +[CALC] +path=/SYS/CALC +param= +ico=4 +x=68 +y=136 +[ANIMAGE] +path=/SYS/MEDIA/ANIMAGE +param= +ico=15 +x=136 +y=68 +[KPACK] +path=/SYS/KPACK +param= +ico=10 +x=-67 +y=0 +[SNAKE] +path=/SYS/GAMES/SNAKE +param= +ico=3 +x=-135 +y=-135 +[MINE] +path=/SYS/GAMES/MINE +param= +ico=14 +x=-67 +y=-67 +[LIFE2] +path=/SYS/DEMOS/LIFE2 +param= +ico=13 +x=-135 +y=-67 +[MBLOCKS] +path=/SYS/GAMES/MBLOCKS +param= +ico=11 +x=-67 +y=-135 +[PONG] +path=/SYS/GAMES/PONG3 +param= +ico=12 +x=-203 +y=-67 +[15] +path=/SYS/GAMES/15 +param= +ico=0 +x=-271 +y=-67 +[DOCPACK] +path=/SYS/DOCPACK +param= +ico=8 +x=-67 +y=68 +[BOARD] +path=/SYS/DEVELOP/BOARD +param= +ico=19 +x=-135 +y=0 +[HEXEDIT] +path=/SYS/DEVELOP/HEED +param= +ico=22 +x=-67 +y=136 +[MTDBG] +path=/SYS/DEVELOP/MTDBG +param= +ico=6 +x=-203 +y=0 +[PIPES] +path=/SYS/GAMES/PIPES +param= +ico=26 +x=0 +y=-135 +[SUDOKU] +path=/SYS/GAMES/SUDOKU +param= +ico=25 +x=0 +y=-67 +[GOMOKU] +path=/SYS/GAMES/GOMOKU +param= +ico=24 +x=68 +y=-67 +[XONIX] +path=/SYS/GAMES/XONIX +param= +ico=21 +x=68 +y=-135 +[CHECKERS] +path=/SYS/GAMES/CHECKERS +param= +ico=1 +x=-271 +y=-135 +[KOSILKA] +path=/SYS/GAMES/KOSILKA +param= +ico=23 +x=136 +y=-67 +[FLOOD-IT] +path=/SYS/GAMES/FLOOD-IT +param= +ico=27 +x=136 +y=-135 +[FASM] +path=/SYS/DEVELOP/FASM +param= +ico=10 +x=-135 +y=68 +[CLICKS] +path=/SYS/GAMES/CLICKS +param= +ico=18 +x=-203 +y=-135 diff --git a/data/it/Makefile b/data/it/Makefile index 443815c650..af92cc2cf9 100644 --- a/data/it/Makefile +++ b/data/it/Makefile @@ -60,7 +60,7 @@ FASM_PROGRAMS:=\ end:END:$(PROGS)/system/end/light/end.asm \ gmon:GMON:$(PROGS)/system/gmon/gmon.asm \ hdd_info:HDD_INFO:$(PROGS)/system/hdd_info/trunk/hdd_info.asm \ - icon:ICON:$(PROGS)/system/icon/trunk/icon.asm \ + @icon:@ICON:$(PROGS)/system/icon_new/@icon.asm \ cropflat:CROPFLAT:$(PROGS)/system/cropflat/cropflat.asm \ kbd:KBD:$(PROGS)/system/kbd/trunk/kbd.ASM \ kpack:KPACK:$(PROGS)/other/kpack/trunk/kpack.asm \ @@ -277,7 +277,6 @@ CMM_PROGRAMS:=\ 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 @@ -288,7 +287,7 @@ CMM_PROGRAMS:=\ OTHER_FILES:=autorun.dat:AUTORUN.DAT \ default.skn:DEFAULT.SKN \ graph:GRAPH hdread:HDREAD \ - icons.dat:ICONS.DAT iconstrp.png:ICONSTRP.PNG index_htm:INDEX.HTM \ + icon.ini:ICON.INI 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 \ menu.dat:MENU.DAT kolibri.lbl:KOLIBRI.LBL \ diff --git a/data/it/autorun.dat b/data/it/autorun.dat index d26a5af3de..c739d6f8b4 100644 --- a/data/it/autorun.dat +++ b/data/it/autorun.dat @@ -12,8 +12,8 @@ /SYS/MEDIA/PALITRA "H 007DCEDF 003C427F" 1 #SET BG /SYS/@PANEL "" 1 # Start panel /SYS/SETUP BOOT 1 # Load device settings -/SYS/ICON BOOT 1 # Multithread icon -/SYS/@RB "" 1 # Desktop right-click menu +/SYS/@ICON "" 1 # Multithread icon +#/SYS/@RB "" 1 # Desktop right-click menu /SYS/@SS ASSM 1 # Screensaver /SYS/TMPDISK A1 -1 # Add virtual RAM disk /tmp1/1 /SYS/SEARCHAP "" -1 # Search and mount additional system directory diff --git a/data/it/icons.dat b/data/it/icons.dat deleted file mode 100644 index d001b86c9a..0000000000 --- a/data/it/icons.dat +++ /dev/null @@ -1,28 +0,0 @@ -AA-KFM -005-/SYS/FILE MANAGERS/KFM - * -AB-TINYPAD -009-/SYS/TINYPAD - * -BA-EOLITE -002-/SYS/FILE MANAGERS/EOLITE - * -CA-SHELL -020-/SYS/SHELL - * -BB-KFAR -016-/SYS/FILE MANAGERS/KFAR - * -AC-RDSAVE -017-/SYS/RDSAVE - * -BC-CALC -004-/SYS/CALC - * -CB-ANIMAGE -015-/SYS/MEDIA/ANIMAGE - * -JA-KPACK -010-/SYS/KPACK - * -IH-SNAKE -003-/SYS/GAMES/SNAKE - * -JI-MINE -014-/SYS/GAMES/MINE - * -II-LIFE2 -013-/SYS/DEMOS/LIFE2 - * -JH-MBLOCKS -011-/SYS/GAMES/MBLOCKS - * -HI-PONG -012-/SYS/GAMES/PONG3 - * -GI-15 -000-/SYS/GAMES/15 - * -HH-CLICKS -018-/SYS/GAMES/CLICKS - * -JB-DOCPACK -008-/SYS/DOCPACK - * -IA-BOARD -019-/SYS/DEVELOP/BOARD - * -JC-HEXEDIT -022-/SYS/DEVELOP/HEED - * -HA-MTDBG -006-/SYS/DEVELOP/MTDBG - * -AH-PIPES -026-/SYS/GAMES/PIPES - * -AI-SUDOKU -025-/SYS/GAMES/SUDOKU - * -BI-GOMOKU -024-/SYS/GAMES/GOMOKU - * -BH-XONIX -021-/SYS/GAMES/XONIX - * -GH-CHECKERS-001-/SYS/GAMES/CHECKERS - * -CI-KOSILKA -023-/SYS/GAMES/KOSILKA - * -CH-FLOOD-IT-027-/SYS/GAMES/FLOOD-IT - * -IB-FASM -010-/SYS/DEVELOP/FASM - * diff --git a/data/it/menu.dat b/data/it/menu.dat index d75559a4a8..8c36c5818b 100644 --- a/data/it/menu.dat +++ b/data/it/menu.dat @@ -101,7 +101,6 @@ Debug board /sys/develop/board Device /sys/setup Generatore di sfondi /sys/media/palitra Colori e temi /sys/desktop -Gestore icone /sys/icon MyKey /sys/mykey Video mode for ATI /sys/vmode #12 **** SYSTEM SENSORS **** diff --git a/data/rus/ICON.INI b/data/rus/ICON.INI new file mode 100644 index 0000000000..f099b3faf9 --- /dev/null +++ b/data/rus/ICON.INI @@ -0,0 +1,173 @@ +[rbmenu] +Консоль=/rd/1/shell +Диспетчер процессов=/rd/1/cpu +Управление темой=desktop +Настройка устройств=setup +[KFM] +path=/SYS/FILE MANAGERS/KFM +param= +ico=5 +x=0 +y=0 +[TINYPAD] +path=/SYS/TINYPAD +param= +ico=9 +x=0 +y=68 +[EOLITE] +path=/SYS/FILE MANAGERS/EOLITE +param= +ico=2 +x=68 +y=0 +[SHELL] +path=/SYS/SHELL +param= +ico=20 +x=136 +y=0 +[KFAR] +path=/SYS/FILE MANAGERS/KFAR +param= +ico=16 +x=68 +y=68 +[RDSAVE] +path=/SYS/RDSAVE +param= +ico=17 +x=0 +y=136 +[CALC] +path=/SYS/CALC +param= +ico=4 +x=68 +y=136 +[ANIMAGE] +path=/SYS/MEDIA/ANIMAGE +param= +ico=15 +x=136 +y=68 +[KPACK] +path=/SYS/KPACK +param= +ico=10 +x=-67 +y=0 +[SNAKE] +path=/SYS/GAMES/SNAKE +param= +ico=3 +x=-135 +y=-135 +[MINE] +path=/SYS/GAMES/MINE +param= +ico=14 +x=-67 +y=-67 +[LIFE2] +path=/SYS/DEMOS/LIFE2 +param= +ico=13 +x=-135 +y=-67 +[MBLOCKS] +path=/SYS/GAMES/MBLOCKS +param= +ico=11 +x=-67 +y=-135 +[PONG] +path=/SYS/GAMES/PONG3 +param= +ico=12 +x=-203 +y=-67 +[15] +path=/SYS/GAMES/15 +param= +ico=0 +x=-271 +y=-67 +[DOCPACK] +path=/SYS/DOCPACK +param= +ico=8 +x=-67 +y=68 +[BOARD] +path=/SYS/DEVELOP/BOARD +param= +ico=19 +x=-135 +y=0 +[HEXEDIT] +path=/SYS/DEVELOP/HEED +param= +ico=22 +x=-67 +y=136 +[MTDBG] +path=/SYS/DEVELOP/MTDBG +param= +ico=6 +x=-203 +y=0 +[PIPES] +path=/SYS/GAMES/PIPES +param= +ico=26 +x=0 +y=-135 +[SUDOKU] +path=/SYS/GAMES/SUDOKU +param= +ico=25 +x=0 +y=-67 +[GOMOKU] +path=/SYS/GAMES/GOMOKU +param= +ico=24 +x=68 +y=-67 +[XONIX] +path=/SYS/GAMES/XONIX +param= +ico=21 +x=68 +y=-135 +[CHECKERS] +path=/SYS/GAMES/CHECKERS +param= +ico=1 +x=-271 +y=-135 +[KOSILKA] +path=/SYS/GAMES/KOSILKA +param= +ico=23 +x=136 +y=-67 +[FLOOD-IT] +path=/SYS/GAMES/FLOOD-IT +param= +ico=27 +x=136 +y=-135 +[FASM] +path=/SYS/DEVELOP/FASM +param= +ico=10 +x=-135 +y=68 +[CLICKS] +path=/SYS/GAMES/CLICKS +param= +ico=18 +x=-203 +y=-135 diff --git a/data/rus/Makefile b/data/rus/Makefile index b67c2c2191..7f053221d1 100644 --- a/data/rus/Makefile +++ b/data/rus/Makefile @@ -60,7 +60,7 @@ FASM_PROGRAMS:=\ end:END:$(PROGS)/system/end/light/end.asm \ gmon:GMON:$(PROGS)/system/gmon/gmon.asm \ hdd_info:HDD_INFO:$(PROGS)/system/hdd_info/trunk/hdd_info.asm \ - icon:ICON:$(PROGS)/system/icon/trunk/icon.asm \ + @icon:@ICON:$(PROGS)/system/icon_new/@icon.asm \ cropflat:CROPFLAT:$(PROGS)/system/cropflat/cropflat.asm \ kbd:KBD:$(PROGS)/system/kbd/trunk/kbd.ASM \ kpack:KPACK:$(PROGS)/other/kpack/trunk/kpack.asm \ @@ -271,7 +271,6 @@ CMM_PROGRAMS:=\ 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 \ # end of list # List of other files to be included in the image file. @@ -283,7 +282,7 @@ CMM_PROGRAMS:=\ OTHER_FILES:=autorun.dat:AUTORUN.DAT \ default.skn:DEFAULT.SKN \ graph:GRAPH hdread:HDREAD \ - icons.dat:ICONS.DAT iconstrp.png:ICONSTRP.PNG index_htm:INDEX.HTM \ + icon.ini:ICON.INI 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 \ menu.dat:MENU.DAT kolibri.lbl:KOLIBRI.LBL \ diff --git a/data/rus/autorun.dat b/data/rus/autorun.dat index d26a5af3de..c739d6f8b4 100644 --- a/data/rus/autorun.dat +++ b/data/rus/autorun.dat @@ -12,8 +12,8 @@ /SYS/MEDIA/PALITRA "H 007DCEDF 003C427F" 1 #SET BG /SYS/@PANEL "" 1 # Start panel /SYS/SETUP BOOT 1 # Load device settings -/SYS/ICON BOOT 1 # Multithread icon -/SYS/@RB "" 1 # Desktop right-click menu +/SYS/@ICON "" 1 # Multithread icon +#/SYS/@RB "" 1 # Desktop right-click menu /SYS/@SS ASSM 1 # Screensaver /SYS/TMPDISK A1 -1 # Add virtual RAM disk /tmp1/1 /SYS/SEARCHAP "" -1 # Search and mount additional system directory diff --git a/data/rus/icons.dat b/data/rus/icons.dat deleted file mode 100644 index d001b86c9a..0000000000 --- a/data/rus/icons.dat +++ /dev/null @@ -1,28 +0,0 @@ -AA-KFM -005-/SYS/FILE MANAGERS/KFM - * -AB-TINYPAD -009-/SYS/TINYPAD - * -BA-EOLITE -002-/SYS/FILE MANAGERS/EOLITE - * -CA-SHELL -020-/SYS/SHELL - * -BB-KFAR -016-/SYS/FILE MANAGERS/KFAR - * -AC-RDSAVE -017-/SYS/RDSAVE - * -BC-CALC -004-/SYS/CALC - * -CB-ANIMAGE -015-/SYS/MEDIA/ANIMAGE - * -JA-KPACK -010-/SYS/KPACK - * -IH-SNAKE -003-/SYS/GAMES/SNAKE - * -JI-MINE -014-/SYS/GAMES/MINE - * -II-LIFE2 -013-/SYS/DEMOS/LIFE2 - * -JH-MBLOCKS -011-/SYS/GAMES/MBLOCKS - * -HI-PONG -012-/SYS/GAMES/PONG3 - * -GI-15 -000-/SYS/GAMES/15 - * -HH-CLICKS -018-/SYS/GAMES/CLICKS - * -JB-DOCPACK -008-/SYS/DOCPACK - * -IA-BOARD -019-/SYS/DEVELOP/BOARD - * -JC-HEXEDIT -022-/SYS/DEVELOP/HEED - * -HA-MTDBG -006-/SYS/DEVELOP/MTDBG - * -AH-PIPES -026-/SYS/GAMES/PIPES - * -AI-SUDOKU -025-/SYS/GAMES/SUDOKU - * -BI-GOMOKU -024-/SYS/GAMES/GOMOKU - * -BH-XONIX -021-/SYS/GAMES/XONIX - * -GH-CHECKERS-001-/SYS/GAMES/CHECKERS - * -CI-KOSILKA -023-/SYS/GAMES/KOSILKA - * -CH-FLOOD-IT-027-/SYS/GAMES/FLOOD-IT - * -IB-FASM -010-/SYS/DEVELOP/FASM - * diff --git a/data/rus/menu.dat b/data/rus/menu.dat index c693999c20..b5a2aebd70 100644 --- a/data/rus/menu.dat +++ b/data/rus/menu.dat @@ -107,7 +107,6 @@ Color Slider /sys/demos/cslide Устройства /sys/setup Установить фон /sys/media/palitra Стиль окон /sys/desktop -Менеджер иконок /sys/icon MyKey /sys/mykey Видеорежим для ATI /sys/vmode #12 **** SENSORS **** diff --git a/data/sp/ICON.INI b/data/sp/ICON.INI new file mode 100644 index 0000000000..32c228d409 --- /dev/null +++ b/data/sp/ICON.INI @@ -0,0 +1,173 @@ +[rbmenu] +Shell=/rd/1/shell +Processes=/rd/1/cpu +Themes=desktop +Device setup=setup +[KFM] +path=/SYS/FILE MANAGERS/KFM +param= +ico=5 +x=0 +y=0 +[TINYPAD] +path=/SYS/TINYPAD +param= +ico=9 +x=0 +y=68 +[EOLITE] +path=/SYS/FILE MANAGERS/EOLITE +param= +ico=2 +x=68 +y=0 +[SHELL] +path=/SYS/SHELL +param= +ico=20 +x=136 +y=0 +[KFAR] +path=/SYS/FILE MANAGERS/KFAR +param= +ico=16 +x=68 +y=68 +[RDSAVE] +path=/SYS/RDSAVE +param= +ico=17 +x=0 +y=136 +[CALC] +path=/SYS/CALC +param= +ico=4 +x=68 +y=136 +[ANIMAGE] +path=/SYS/MEDIA/ANIMAGE +param= +ico=15 +x=136 +y=68 +[KPACK] +path=/SYS/KPACK +param= +ico=10 +x=-67 +y=0 +[SNAKE] +path=/SYS/GAMES/SNAKE +param= +ico=3 +x=-135 +y=-135 +[MINE] +path=/SYS/GAMES/MINE +param= +ico=14 +x=-67 +y=-67 +[LIFE2] +path=/SYS/DEMOS/LIFE2 +param= +ico=13 +x=-135 +y=-67 +[MBLOCKS] +path=/SYS/GAMES/MBLOCKS +param= +ico=11 +x=-67 +y=-135 +[PONG] +path=/SYS/GAMES/PONG3 +param= +ico=12 +x=-203 +y=-67 +[15] +path=/SYS/GAMES/15 +param= +ico=0 +x=-271 +y=-67 +[DOCPACK] +path=/SYS/DOCPACK +param= +ico=8 +x=-67 +y=68 +[BOARD] +path=/SYS/DEVELOP/BOARD +param= +ico=19 +x=-135 +y=0 +[HEXEDIT] +path=/SYS/DEVELOP/HEED +param= +ico=22 +x=-67 +y=136 +[MTDBG] +path=/SYS/DEVELOP/MTDBG +param= +ico=6 +x=-203 +y=0 +[PIPES] +path=/SYS/GAMES/PIPES +param= +ico=26 +x=0 +y=-135 +[SUDOKU] +path=/SYS/GAMES/SUDOKU +param= +ico=25 +x=0 +y=-67 +[GOMOKU] +path=/SYS/GAMES/GOMOKU +param= +ico=24 +x=68 +y=-67 +[XONIX] +path=/SYS/GAMES/XONIX +param= +ico=21 +x=68 +y=-135 +[CHECKERS] +path=/SYS/GAMES/CHECKERS +param= +ico=1 +x=-271 +y=-135 +[KOSILKA] +path=/SYS/GAMES/KOSILKA +param= +ico=23 +x=136 +y=-67 +[FLOOD-IT] +path=/SYS/GAMES/FLOOD-IT +param= +ico=27 +x=136 +y=-135 +[FASM] +path=/SYS/DEVELOP/FASM +param= +ico=10 +x=-135 +y=68 +[CLICKS] +path=/SYS/GAMES/CLICKS +param= +ico=18 +x=-203 +y=-135 diff --git a/data/sp/Makefile b/data/sp/Makefile index 72c5c99d91..cab159f1e3 100644 --- a/data/sp/Makefile +++ b/data/sp/Makefile @@ -60,7 +60,7 @@ FASM_PROGRAMS:=\ end:END:$(PROGS)/system/end/light/end.asm \ gmon:GMON:$(PROGS)/system/gmon/gmon.asm \ hdd_info:HDD_INFO:$(PROGS)/system/hdd_info/trunk/hdd_info.asm \ - icon:ICON:$(PROGS)/system/icon/trunk/icon.asm \ + @icon:@ICON:$(PROGS)/system/icon_new/@icon.asm \ cropflat:CROPFLAT:$(PROGS)/system/cropflat/cropflat.asm \ kbd:KBD:$(PROGS)/system/kbd/trunk/kbd.ASM \ kpack:KPACK:$(PROGS)/other/kpack/trunk/kpack.asm \ @@ -277,7 +277,6 @@ CMM_PROGRAMS:=\ 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 @@ -288,7 +287,7 @@ CMM_PROGRAMS:=\ OTHER_FILES:=autorun.dat:AUTORUN.DAT \ default.skn:DEFAULT.SKN \ graph:GRAPH hdread:HDREAD \ - icons.dat:ICONS.DAT iconstrp.png:ICONSTRP.PNG index_htm:INDEX.HTM \ + icon.ini:ICON.INI 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 \ menu.dat:MENU.DAT kolibri.lbl:KOLIBRI.LBL \ diff --git a/data/sp/autorun.dat b/data/sp/autorun.dat index 5a39597ade..c739d6f8b4 100644 --- a/data/sp/autorun.dat +++ b/data/sp/autorun.dat @@ -3,17 +3,17 @@ # Delay time means how much the system should wait, before running the next line. It is measured in 1/100 seconds. # If delay is negative, wait for termination of the spawned process. Otherwise, simply wait # -#/SYS/CROPFLAT "XS800 YS480" 1 # set limits of screen -#/SYS/COMMOUSE "" 1 # COM mice detector -#/SYS/DEVELOP/BOARD "" 1 # Load DEBUG board -#/SYS/refrscrn "" 1 # Refresh screen +#/SYS/CROPFLAT "XS800 YS480" 1 # set limits of screen +#/SYS/COMMOUSE "" 1 # COM mice detector +#/SYS/DEVELOP/BOARD "" 1 # Load DEBUG board +#/SYS/refrscrn "" 1 # Refresh screen /SYS/NETWORK/NETCFG A 1 # /SYS/NETWORK/ZEROCONF "" 1 # Network configuration /SYS/MEDIA/PALITRA "H 007DCEDF 003C427F" 1 #SET BG /SYS/@PANEL "" 1 # Start panel /SYS/SETUP BOOT 1 # Load device settings -/SYS/ICON BOOT 1 # Multithread icon -/SYS/@RB "" 1 # Desktop right-click menu +/SYS/@ICON "" 1 # Multithread icon +#/SYS/@RB "" 1 # Desktop right-click menu /SYS/@SS ASSM 1 # Screensaver /SYS/TMPDISK A1 -1 # Add virtual RAM disk /tmp1/1 /SYS/SEARCHAP "" -1 # Search and mount additional system directory diff --git a/data/sp/icons.dat b/data/sp/icons.dat deleted file mode 100644 index d001b86c9a..0000000000 --- a/data/sp/icons.dat +++ /dev/null @@ -1,28 +0,0 @@ -AA-KFM -005-/SYS/FILE MANAGERS/KFM - * -AB-TINYPAD -009-/SYS/TINYPAD - * -BA-EOLITE -002-/SYS/FILE MANAGERS/EOLITE - * -CA-SHELL -020-/SYS/SHELL - * -BB-KFAR -016-/SYS/FILE MANAGERS/KFAR - * -AC-RDSAVE -017-/SYS/RDSAVE - * -BC-CALC -004-/SYS/CALC - * -CB-ANIMAGE -015-/SYS/MEDIA/ANIMAGE - * -JA-KPACK -010-/SYS/KPACK - * -IH-SNAKE -003-/SYS/GAMES/SNAKE - * -JI-MINE -014-/SYS/GAMES/MINE - * -II-LIFE2 -013-/SYS/DEMOS/LIFE2 - * -JH-MBLOCKS -011-/SYS/GAMES/MBLOCKS - * -HI-PONG -012-/SYS/GAMES/PONG3 - * -GI-15 -000-/SYS/GAMES/15 - * -HH-CLICKS -018-/SYS/GAMES/CLICKS - * -JB-DOCPACK -008-/SYS/DOCPACK - * -IA-BOARD -019-/SYS/DEVELOP/BOARD - * -JC-HEXEDIT -022-/SYS/DEVELOP/HEED - * -HA-MTDBG -006-/SYS/DEVELOP/MTDBG - * -AH-PIPES -026-/SYS/GAMES/PIPES - * -AI-SUDOKU -025-/SYS/GAMES/SUDOKU - * -BI-GOMOKU -024-/SYS/GAMES/GOMOKU - * -BH-XONIX -021-/SYS/GAMES/XONIX - * -GH-CHECKERS-001-/SYS/GAMES/CHECKERS - * -CI-KOSILKA -023-/SYS/GAMES/KOSILKA - * -CH-FLOOD-IT-027-/SYS/GAMES/FLOOD-IT - * -IB-FASM -010-/SYS/DEVELOP/FASM - * diff --git a/data/sp/menu.dat b/data/sp/menu.dat index 4205d65547..3c0a0ffe78 100644 --- a/data/sp/menu.dat +++ b/data/sp/menu.dat @@ -102,7 +102,6 @@ Debug board /sys/develop/board Dispositivos /sys/setup Generador de fondo /sys/media/palitra Colores y Apariencia /sys/desktop -Iconos /sys/icon Atajos de teclado /sys/mykey Modo de video ATI /sys/vmode #12 **** SENSORES **** diff --git a/programs/system/icon_new/@ICON.ASM b/programs/system/icon_new/@ICON.ASM index f954545c59..f057449610 100644 --- a/programs/system/icon_new/@ICON.ASM +++ b/programs/system/icon_new/@ICON.ASM @@ -1178,7 +1178,7 @@ NameIconsDat db ICONS_DAT,0 align 4 MaxNumIcon dd 0 ;количество иконок -bFixIcons dd 1 +bFixIcons dd 0 bNotSave dd 0 LButtonActiv dd 0 diff --git a/programs/system/icon_new/ICON.INI b/programs/system/icon_new/ICON.INI index 19b9fa0867..f099b3faf9 100644 --- a/programs/system/icon_new/ICON.INI +++ b/programs/system/icon_new/ICON.INI @@ -169,5 +169,5 @@ y=68 path=/SYS/GAMES/CLICKS param= ico=18 -x=513 -y=287 +x=-203 +y=-135