Leency skins: delete AreaO and L-Junior, update Octo_flat, Year, AreaSq

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

skins/_old/Leency/AreaO/Tupfile.lua

@@ -1,2 +0,0 @@
-if tup.getconfig("NO_FASM") ~= "" then return end
-tup.rule("default.asm", 'fasm "%f" "%o" ' .. tup.getconfig("KPACK_CMD"), "AreaO.skn")

skins/_old/Leency/AreaO/build.bat

@@ -1,4 +0,0 @@
-del default.skn
-fasm default.asm default.skn
-kpack default.skn
-pause

skins/_old/Leency/AreaO/default.asm

@@ -1,29 +0,0 @@
-include '../skin.inc'
-
-SKIN_PARAMS \
-  height          = bmp_center1.height,\     ; skin height
-  margins         = [5:1:43:1],\          ; margins [left:top:right:bottom]
-  colors active   = [binner=0xE1E1E1:\    ; border inner color
-                     bouter=0x3E3635:\    ; border outer color
-                     bframe=0xE1E1E1],\   ; border frame color
-  colors inactive = [binner=0xE1E1E1:\    ; border inner color
-                     bouter=0x3E3635:\    ; border outer color
-                     bframe=0xE1E1E1],\   ; border frame color
-  dtp             = 'default.dtp'          ; dtp colors
-
-SKIN_BUTTONS \
-  close    = [-18:5][12:12],\             ; buttons coordinates
-  minimize = [-38:5][12:12]               ; [left:top][width:height]
-
-SKIN_BITMAPS \
-  left active   = bmp_left1,\              ; skin bitmaps pointers
-  left inactive = bmp_left1,\
-  oper active   = bmp_right1,\
-  oper inactive = bmp_right2,\
-  base active   = bmp_center1,\
-  base inactive = bmp_center1
-
-BITMAP bmp_left1,  'left1.bmp'               ; skin bitmaps
-BITMAP bmp_right1, 'right1.bmp'
-BITMAP bmp_right2, 'right2.bmp'
-BITMAP bmp_center1,'center1.bmp'

skins/_old/Leency/AreaO/default.dtp.asm

@@ -1,14 +0,0 @@
-struc system_colors
- {
-  .frame            dd 0x000000
-  .grab             dd 0x006393
-  .grab_button      dd 0xB1B1B1
-  .grab_button_text dd 0x000000
-  .grab_text        dd 0xFFFFFF
-  .work             dd 0xE8E8E8
-  .work_button      dd 0xB1B1B1
-  .work_button_text dd 0x000000
-  .work_text        dd 0x000000
-  .work_graph       dd 0x000000
- }
-struct system_colors

skins/_old/Leency/AreaSq/default.asm

@@ -2,7 +2,7 @@ include '..\skin.inc'
 
 SKIN_PARAMS \
   height          = bmp_center1.height,\     ; skin height
-  margins         = [5:1:43:1],\          ; margins [left:top:right:bottom]
+  margins         = [9:6:37:6],\          ; margins [left:top:right:bottom]
   colors active   = [binner=0xE1E1E1:\    ; border inner color
                      bouter=0x3E3635:\    ; border outer color
                      bframe=0xE1E1E1],\   ; border frame color
@@ -12,8 +12,8 @@ SKIN_PARAMS \
   dtp             = 'default.dtp'          ; dtp colors
 
 SKIN_BUTTONS \
-  close    = [-18:6][11:11],\             ; buttons coordinates
+  close    = [-18:7][11:11],\             ; buttons coordinates
-  minimize = [-34:6][11:11]               ; [left:top][width:height]
+  minimize = [-34:7][11:11]               ; [left:top][width:height]
 
 SKIN_BITMAPS \
   left active   = bmp_left1,\              ; skin bitmaps pointers
@@ -24,7 +24,7 @@ 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'

skins/_old/Leency/L-Junior/DEFAULT.ASM

@@ -1,31 +0,0 @@
-include '..\skin.inc'
-
-SKIN_PARAMS \
-  height	  = bmp_base.height,\	  ; skin height
-  margins	  = [5:1:43:1],\	  ; margins [left:top:right:bottom]
-  colors active   = [binner=0x00081d:\	  ; border inner color
-		     bouter=0x00081d:\	  ; border outer color
-		     bframe=0xDEDFDE],\   ; border frame color
-  colors inactive = [binner=0x00081d:\	  ; border inner color
-		     bouter=0x00081d:\	  ; border outer color
-		     bframe=0xEFEFEF],\   ; border frame color          0x1a8acc
-  dtp		  = 'myblue.DTP'	  ; dtp colors
-
-SKIN_BUTTONS \
-  close    = [-17:5][13:13],\		  ; buttons coordinates
-  minimize = [-33:5][13:13]		  ; [left:top][width:height]
-
-SKIN_BITMAPS \
-  left active	= bmp_left,\		  ; skin bitmaps pointers
-  left inactive = bmp_left1,\
-  oper active	= bmp_oper,\
-  oper inactive = bmp_oper1,\
-  base active	= bmp_base,\
-  base inactive = bmp_base1
-
-BITMAP bmp_left ,'left1.BMP'		  ; skin bitmaps
-BITMAP bmp_oper ,'right1.BMP'
-BITMAP bmp_base ,'center1.BMP'
-BITMAP bmp_left1,'left2.BMP'
-BITMAP bmp_oper1,'right2.BMP'
-BITMAP bmp_base1,'center2.BMP'

skins/_old/Leency/L-Junior/Tupfile.lua

@@ -1,2 +0,0 @@
-if tup.getconfig("NO_FASM") ~= "" then return end
-tup.rule("DEFAULT.ASM", 'fasm "%f" "%o" ' .. tup.getconfig("KPACK_CMD"), "L-Junior.skn")

skins/_old/Leency/L-Junior/build.bat

@@ -1,3 +0,0 @@
-fasm default.asm default.skn
-kpack default.skn
-pause

skins/_old/Leency/Octo_flat/build.bat

@@ -1,3 +1,2 @@
-fasm default.asm default.skn
+@del default.skn
-kpack default.skn
+@fasm default.asm default.skn
-pause

skins/_old/Leency/Octo_flat/default.asm

@@ -2,7 +2,7 @@ include '..\skin.inc'
 
 SKIN_PARAMS \
   height          = bmp_center1.height,\  ; skin height
-  margins         = [25:1:43:1],\         ; margins [left:top:right:bottom]
+  margins         = [25:4:40:6],\         ; margins [left:top:right:bottom]
   colors active   = [binner=0xE1E1E1:\    ; border inner color
                      bouter=0x204962:\    ; border outer color
                      bframe=0xE1E1E1],\   ; border frame color
@@ -12,8 +12,8 @@ SKIN_PARAMS \
   dtp             = 'default.dtp'         ; dtp colors
 
 SKIN_BUTTONS \
-  close    = [-20:3][14:14],\             ; buttons coordinates
+  close    = [-21:4][16:16],\             ; buttons coordinates
-  minimize = [-37:3][14:14]               ; [left:top][width:height]
+  minimize = [-38:4][16:16]               ; [left:top][width:height]
 
 SKIN_BITMAPS \
   left active   = bmp_left1,\              ; skin bitmaps pointers

skins/_old/Leency/Yeah/build.bat

@@ -1,3 +1,2 @@
-fasm default.asm default.skn
+@del default.skn
-kpack default.skn
+@fasm default.asm default.skn
-pause

skins/_old/Leency/Yeah/default.asm

@@ -2,18 +2,18 @@ include '..\skin.inc'
 
 SKIN_PARAMS \
   height          = bmp_center1.height,\     ; skin height
-  margins         = [5:1:43:1],\          ; margins [left:top:right:bottom]
+  margins         = [7:6:40:1],\          ; margins [left:top:right:bottom]
   colors active   = [binner=0xE1E1E1:\    ; border inner color
                      bouter=0x646464:\    ; border outer color
                      bframe=0xE1E1E1],\   ; border frame color
-  colors inactive = [binner=0xE1E1E1:\    ; border inner color
+  colors inactive = [binner=0xDCDCDC:\    ; border inner color
-                     bouter=0xD4D4D4:\    ; border outer color
+                     bouter=0x6D6D6D:\    ; border outer color
-                     bframe=0xE1E1E1],\   ; border frame color
+                     bframe=0xDCDCDC],\   ; border frame color
   dtp             = 'default.dtp'          ; dtp colors
 
 SKIN_BUTTONS \
-  close    = [-29:1][25:15],\             ; buttons coordinates
+  close    = [-31:1][26:16],\             ; buttons coordinates
-  minimize = [-54:1][25:15]               ; [left:top][width:height]
+  minimize = [-58:1][26:16]               ; [left:top][width:height]
 
 SKIN_BITMAPS \
   left active   = bmp_left1,\              ; skin bitmaps pointers