add fNav and Bomber game icons, fix/update my skins and Night skin (moved from _old to ok), Eolite small fixes for big icons support

git-svn-id: svn://kolibrios.org@7256 a494cfbc-eb01-0410-851d-a64ba20cac60

data/common/File Managers/icons.ini

@@ -166,8 +166,8 @@ pas=27
 fb2=29
 
 [icons32]
-<dir>=0
+<dir>=94
-<up>=0
+<up>=94
 <lot>=60
 txt=9
 png=70
@@ -181,8 +181,8 @@ img=3
 xls=28
 xlsx=28
 pdf=73
-wav=63
+wav=64
-mp3=63
+mp3=64
 midi=74
 mnt=90
 avi=40

data/common/settings/app_plus.ini

@@ -13,7 +13,7 @@ uPDF=/sys/lod|*pdf* /kolibrios/media/updf,73
 [Misc]
 DosBox=/kolibrios/emul/dosbox/dosbox,11
 Dicty=/kolibrios/utils/DICTY.KEX,79
-fNav=/sys/File managers/fNav/fNav,45
+fNav=/sys/File managers/fNav/fNav,93
 Life=/kolibrios/demos/life2,13
 Calc+=/kolibrios/utils/calcplus,4
 TinyBasic=/kolibrios/develop/TinyBasic/TinyBasic,91

data/common/settings/game_center.ini

@@ -17,7 +17,7 @@ Loderunner=/kolibrios/games/LRL/LRL,41
 TheBus=/kolibrios/games/the_bus/the_bus,86
 Mun=/kolibrios/games/mun/mun
 Kosilka=/sys/games/kosilka,23
-Bomber=/kolibrios/games/bomber/bomber,14
+Bomber=/kolibrios/games/bomber/bomber,97
 Invaders=/kolibrios/games/invaders
 Tanks=/sys/games/tanks,67
 RocketForces=/sys/games/rforces

programs/cmm/eolite/include/icons.h

@@ -8,23 +8,26 @@ void DrawIconByExtension(dword file_path, extension, xx, yy, fairing_color)
 	dword icon_n;
 	dword selected_image;
 	dword default_image;
+	dword default_icon;
 
 	if (big_icons.checked) {
 		icons_ini.section = "icons32";
 		selected_image = icons32_selected.image;
 		default_image = icons32_default.image;
+		default_icon=95;
 	}
 	else {
 		icons_ini.section = "icons16";
 		selected_image = icons16_selected.image;
 		default_image = icons16_default.image;
+		default_icon=2;
 	}
 
 	if (extension)
 	{
 		strcpy(#ext, extension);
 		strlwr(#ext);
-		icon_n = icons_ini.GetInt(#ext, 2);
+		icon_n = icons_ini.GetInt(#ext, default_icon);
 	} 
 	else if (file_path)
 	{

programs/cmm/eolite/include/settings.h

@@ -235,7 +235,7 @@ void BigIconsSwitch()
 	if (big_icons.checked) 
 	{
 		icon_size=32;
-		files.item_h = line_height.value = 34;
+		files.item_h = line_height.value = 35;
 		if (!icons32_default.image)
 		{
 			Libimg_LoadImage(#icons32_default, "/sys/icons32.png");

skins/Leency/AreaSq/default.asm

@@ -2,7 +2,7 @@ include '..\skin.inc'
 
 SKIN_PARAMS \
   height          = bmp_center1.height,\     ; skin height
-  margins         = [9:6:37:6],\          ; margins [left:top:right:bottom]
+  margins         = [9:4:37:0],\          ; margins [left:top:right:bottom]
   colors active   = [binner=0xE1E1E1:\    ; border inner color
                      bouter=0x3E3635:\    ; border outer color
                      bframe=0xE1E1E1],\   ; border frame color

skins/Leency/Latte/build.bat

@@ -1,3 +1,4 @@
 delete default.skn
 fasm default.dtp.asm default.dtp
-fasm default.asm default.skn
+fasm default.asm default.skn
+@pause

skins/Leency/Latte/default.asm

@@ -2,7 +2,7 @@ include '..\skin.inc'
 
 SKIN_PARAMS \
   height          = bmp_center1.height,\     ; skin height
-  margins         = [5:6:40:4],\          ; margins [left:top:right:bottom]
+  margins         = [5:2:40:0],\          ; margins [left:top:right:bottom]
   colors active   = [binner=0xCACACA:\    ; border inner color
                      bouter=0xA1A1A1:\    ; border outer color
                      bframe=0xCACACA],\   ; border frame color
@@ -12,8 +12,8 @@ SKIN_PARAMS \
   dtp             = 'default.dtp'          ; dtp colors
 
 SKIN_BUTTONS \
-  close    = [-18:4][13:14],\             ; buttons coordinates
+  close    = [-19:3][16:16],\             ; buttons coordinates
-  minimize = [-36:4][13:14]               ; [left:top][width:height]
+  minimize = [-37:3][16:16]               ; [left:top][width:height]
 
 SKIN_BITMAPS \
   left active   = bmp_left1,\              ; skin bitmaps pointers
@@ -24,8 +24,8 @@ SKIN_BITMAPS \
   base inactive = bmp_center2
 
 BITMAP bmp_left1,  'left1.bmp'               ; skin bitmaps
-BITMAP bmp_left2,  'left2.bmp'
+BITMAP bmp_left2,  'left1.bmp'
 BITMAP bmp_right1, 'right1.bmp'
 BITMAP bmp_right2, 'right2.bmp'
 BITMAP bmp_center1,'center1.bmp'
-BITMAP bmp_center2,'center2.bmp'
+BITMAP bmp_center2,'center1.bmp'

skins/Leency/Latte/default.dtp.asm

@@ -1,14 +1,14 @@
 struc system_colors
- {
+{
-.frame			dd 0x006393
+.frame            dd 0x006393
-.grab			dd 0x0077b0
+.grab             dd 0x0077b0
-.grab_button		dd 0xc0c0c0
+.work_dark        dd 0xA5A5A5
-.grab_button_text	dd 0x000000
+.work_light       dd 0xE4E4E4
-.title_text		dd 0x444444
+.title_text       dd 0x444444
-.work			dd 0xCACACA
+.work             dd 0xCACACA
-.work_button		dd 0xE9E9E9
+.work_button      dd 0xE9E9E9
-.work_button_text	dd 0x000000
+.work_button_text dd 0x000000
-.work_text		dd 0x000000
+.work_text        dd 0x000000
-.work_graph		dd 0x777777
+.work_graph       dd 0x777777
- }
+}
 struct system_colors

skins/Leency/ObsidianOS/default.asm

@@ -2,7 +2,7 @@ include '../skin.inc'
 
 SKIN_PARAMS \
   height          = bmp_center1.height,\  ; skin height
-  margins         = [6:5:43:3],\          ; margins [left:top:right:bottom]
+  margins         = [7:5:43:3],\          ; margins [left:top:right:bottom]
   colors active   = [binner=0x202020:\    ; border inner
                      bouter=0x000000:\    ; border outer
                      bframe=0x555555],\   ; border middle

skins/Leency/Octo_flat/default.asm

@@ -2,7 +2,7 @@ include '..\skin.inc'
 
 SKIN_PARAMS \
   height          = bmp_center1.height,\  ; skin height
-  margins         = [25:4:40:6],\         ; margins [left:top:right:bottom]
+  margins         = [25:2:40:0],\         ; margins [left:top:right:bottom]
   colors active   = [binner=0xE1E1E1:\    ; border inner color
                      bouter=0x204962:\    ; border outer color
                      bframe=0xE1E1E1],\   ; border frame color

skins/Leency/Shkvorka/default.dtp.asm

@@ -2,8 +2,8 @@ struc system_colors
  {
   .taskbar          dd 0x586786
   .taskbar_text     dd 0xFEFEFE
-  .work_3d_dark     dd 0xC0BBB4
+  .work_dark        dd 0xC0BBB4
-  .work_3d_light    dd 0xECE9E5
+  .work_light       dd 0xECE9E5
   .window_title     dd 0x333333
   .work             dd 0xDDD7CF
   .work_button      dd 0x7887A6

skins/night/night.asm

@@ -4,7 +4,7 @@ include 'skin.inc'
 
 SKIN_PARAMS \
   height          = bmp_base.height,\     ; skin height
-  margins         = [5:1:37:1],\          ; margins [left:top:right:bottom]
+  margins         = [5:4:37:0],\          ; margins [left:top:right:bottom]
   colors active   = [binner=0x000000:\    ; border inner color
                      bouter=0x000000:\    ; border outer color
                      bframe=0x2d2d2d],\   ; border frame color
@@ -14,8 +14,8 @@ SKIN_PARAMS \
   dtp             = 'default.dtp'          ; dtp colors
 
 SKIN_BUTTONS \
-  close    = [-18:3][14:14],\             ; buttons coordinates
+  close    = [-19:3][16:16],\             ; buttons coordinates
-  minimize = [-35:3][14:14]               ; [left:top][width:height]
+  minimize = [-36:3][16:16]               ; [left:top][width:height]
 
 SKIN_BITMAPS \
   left active   = bmp_left,\              ; skin bitmaps pointers
@@ -28,6 +28,6 @@ SKIN_BITMAPS \
 BITMAP bmp_left ,'left.bmp'               ; skin bitmaps
 BITMAP bmp_oper ,'oper.bmp'
 BITMAP bmp_base ,'base.bmp'
-BITMAP bmp_left1,'left_1.bmp'
+BITMAP bmp_left1,'left.bmp'
 BITMAP bmp_oper1,'oper_1.bmp'
-BITMAP bmp_base1,'base_1.bmp'
+BITMAP bmp_base1,'base.bmp'

skins/skinlist.lua

@@ -8,6 +8,7 @@ skinlist = {
 "Leency/Shkvorka/Shkvorka.skn",
 "Leency/Yeah/Yeah.skn",
 "loggy/loggy.skn",
+"night/night.skn",
 "Win10/Win10.skn",
 "_old/5imple Alpha/1.5imple Alpha/1.5imple Alpha.skn",
 "_old/5imple Alpha/2.5imple Alpha/2.5imple Alpha.skn",
@@ -111,7 +112,6 @@ skinlist = {
 "_old/neutral/neutral_blue/neutral_blue.skn",
 "_old/neutral/neutral_green/neutral_green.skn",
 "_old/neutral/neutral_lilac/neutral_lilac.skn",
-"_old/night/night.skn",
 "_old/nix/nix_big/nix_big.skn",
 "_old/nix/nix_medium/nix_medium.skn",
 "_old/nix/nix_small/nix_small.skn",