WebSVN – Kolibri OS – Path Comparison – /

Regard whitespace Rev 3897 → Rev 3896

 /programs/system/icon_new/@ICON.ASM
 ,7 → 1178,7
 align 4
 MaxNumIcon      dd 0           ;ª®«¨ç¥áâ¢® ¨ª®®ª
-bFixIcons       dd 0
+bFixIcons       dd 1
 bNotSave        dd 0
 LButtonActiv    dd 0

/programs/system/icon_new/ICON.INI
169,5 → 169,5
path=/SYS/GAMES/CLICKS
param=
ico=18
x=-203
y=-135
x=513
y=287

/data/rus/ICON.INI
File deleted

 /data/rus/Makefile
 ,7 → 60,7
  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_new/@icon.asm \
+ icon:ICON:$(PROGS)/system/icon/trunk/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 \
 ,6 → 271,7
  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.
 ,7 → 283,7
 OTHER_FILES:=autorun.dat:AUTORUN.DAT \
  default.skn:DEFAULT.SKN \
  graph:GRAPH hdread:HDREAD \
- icon.ini:ICON.INI iconstrp.png:ICONSTRP.PNG index_htm:INDEX.HTM \
+ 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 \
  menu.dat:MENU.DAT kolibri.lbl:KOLIBRI.LBL \

/data/rus/menu.dat
107,6 → 107,7
áâà®©áâ¢ /sys/setup
áâ ®¢¨âì ä® /sys/media/palitra
â¨«ì ®ª® /sys/desktop
¥¥¤¦¥à ¨ª®®ª /sys/icon
MyKey /sys/mykey
¨¤¥®à¥¦¨¬ ¤«ï ATI /sys/vmode
#12 ** SENSORS **

 /data/rus/autorun.dat
 ,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            ""          1    # Multithread icon
-#/SYS/@RB             ""          1    # Desktop right-click menu
+/SYS/ICON            BOOT         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

 /data/rus/icons.dat
 ,0 → 1,28
+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             -                              *

/data/eng/ICON.INI
File deleted

 /data/eng/Makefile
 ,7 → 60,7
  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_new/@icon.asm \
+ icon:ICON:$(PROGS)/system/icon/trunk/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 \
 ,6 → 278,7
  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
 ,7 → 289,7
 OTHER_FILES:=autorun.dat:AUTORUN.DAT \
  default.skn:DEFAULT.SKN \
  graph:GRAPH hdread:HDREAD \
- icon.ini:ICON.INI iconstrp.png:ICONSTRP.PNG index_htm:INDEX.HTM \
+ 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 \
  menu.dat:MENU.DAT kolibri.lbl:KOLIBRI.LBL \

/data/eng/menu.dat
102,6 → 102,7
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 **

 /data/eng/autorun.dat
 ,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            ""          1    # Multithread icon
-#/SYS/@RB             ""          1    # Desktop right-click menu
+/SYS/ICON            BOOT         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

 /data/eng/icons.dat
 ,0 → 1,28
+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             -                              *

/data/it/ICON.INI
File deleted

 /data/it/Makefile
 ,7 → 60,7
  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_new/@icon.asm \
+ icon:ICON:$(PROGS)/system/icon/trunk/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 \
 ,6 → 277,7
  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
 ,7 → 288,7
 OTHER_FILES:=autorun.dat:AUTORUN.DAT \
  default.skn:DEFAULT.SKN \
  graph:GRAPH hdread:HDREAD \
- icon.ini:ICON.INI iconstrp.png:ICONSTRP.PNG index_htm:INDEX.HTM \
+ 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 \
  menu.dat:MENU.DAT kolibri.lbl:KOLIBRI.LBL \

/data/it/menu.dat
101,6 → 101,7
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 **

 /data/it/autorun.dat
 ,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            ""          1    # Multithread icon
-#/SYS/@RB             ""          1    # Desktop right-click menu
+/SYS/ICON            BOOT         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

 /data/it/icons.dat
 ,0 → 1,28
+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             -                              *

/data/sp/ICON.INI
File deleted

 /data/sp/Makefile
 ,7 → 60,7
  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_new/@icon.asm \
+ icon:ICON:$(PROGS)/system/icon/trunk/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 \
 ,6 → 277,7
  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
 ,7 → 288,7
 OTHER_FILES:=autorun.dat:AUTORUN.DAT \
  default.skn:DEFAULT.SKN \
  graph:GRAPH hdread:HDREAD \
- icon.ini:ICON.INI iconstrp.png:ICONSTRP.PNG index_htm:INDEX.HTM \
+ 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 \
  menu.dat:MENU.DAT kolibri.lbl:KOLIBRI.LBL \

/data/sp/menu.dat
102,6 → 102,7
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 **

 /data/sp/autorun.dat
 ,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            ""          1    # Multithread icon
-#/SYS/@RB             ""          1    # Desktop right-click menu
+/SYS/ICON            BOOT         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

 /data/sp/icons.dat
 ,0 → 1,28
+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             -                              *

Subversion Repositories Kolibri OS

Compare Revisions

Regard whitespace Rev 3897 → Rev 3896