skins: clean and update

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

skins/Leency/Luna/Tupfile.lua

@@ -1,3 +0,0 @@
-if tup.getconfig("NO_FASM") ~= "" then return end
-tup.rule("default.dtp.asm", 'fasm "%f" "%o"', "default.dtp")
-tup.rule({"default.asm", extra_inputs = {"default.dtp"}}, 'fasm "%f" "%o" ' .. tup.getconfig("KPACK_CMD"), "Luna.skn")

skins/Leency/Luna/build.bat

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

skins/Leency/Luna/default.asm

@@ -1,31 +0,0 @@
-include '../../skin.inc'
-
-SKIN_PARAMS \
-  height          = bmp_base.height,\     ; skin height
-  margins         = [5:2:54:0],\          ; margins [left:top:right:bottom]
-  colors active   = [binner=0x3E4E68:\    ; border inner color
-                     bouter=0x3E4E68:\    ; border outer color
-                     bframe=0xDFE3ED],\   ; border frame color
-  colors inactive = [binner=0x3E4E68:\    ; border inner color
-                     bouter=0x3E4E68:\    ; border outer color
-                     bframe=0xDFE3ED],\   ; border frame color
-  dtp             = 'default.dtp'          ; dtp colors
-
-SKIN_BUTTONS \
-  close    = [-29:1][24:16],\             ; buttons coordinates
-  minimize = [-54:1][24:16]               ; [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 ,'left.bmp'               ; skin bitmaps
-BITMAP bmp_oper ,'oper.bmp'
-BITMAP bmp_base ,'base.bmp'
-BITMAP bmp_left1,'left_1.bmp'
-BITMAP bmp_oper1,'oper_1.bmp'
-BITMAP bmp_base1,'base_1.bmp'

skins/Leency/Luna/default.dtp.asm

@@ -1,11 +0,0 @@
-;SYSTEM COLORS (.DTP) - COMPILE WITH FASM
-frame            	dd 0xCACACA
-grab             	dd 0xE8E8E8
-grab_button      	dd 0xCCCCCC
-grab_button_text 	dd 0xF7F5F5
-grab_text        	dd 0x000000
-work             	dd 0xE8E8E8
-work_button      	dd 0xD5CFD8
-work_button_text 	dd 0x000000
-work_text        	dd 0x000000
-work_graph       	dd 0xAAAAAA

skins/_old/5imple Alpha/2.5imple Alpha/Tupfile.lua

@@ -1,2 +1,2 @@
 if tup.getconfig("NO_FASM") ~= "" then return end
-tup.rule("2.5imple_Alpha.asm", 'fasm "%f" "%o" ' .. tup.getconfig("KPACK_CMD"), "2.5imple Alpha.skn")
+tup.rule("2.5imple_Alpha.asm", 'fasm "%f" "%o" ' .. tup.getconfig("KPACK_CMD"), "Simple Alpha.skn")

skins/_old/5imple Alpha/3.5imple Alpha/3.5imple_Alpha.asm

@@ -1,36 +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=0x4F70A5],\ 	    ; border frame color
-  colors inactive = [binner=0x323232:\	    ; border inner color
-	     bouter=0x323232:\		    ; border outer color
-	     bframe=0x617598],\ 	    ; border frame color
-  dtp	       = '3.5imple_Alpha.dtp'		   ; dtp colors
-
-SKIN_BUTTONS \
-  close    = [-27:0][23:16],\		    ; buttons coordinates
-  minimize = [-50:0][23:16]		    ; [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 ,'active/left.bmp'	    ; skin bitmaps
-BITMAP bmp_oper ,'active/oper.bmp'  
-BITMAP bmp_base ,'active/base.bmp'
-BITMAP bmp_left1,'inactive/left.bmp'
-BITMAP bmp_oper1,'inactive/oper.bmp'
-BITMAP bmp_base1,'inactive/base.bmp'
-
-;================================;
-; Created by Rock_maniak_forever ;
-;================================;
-

skins/_old/5imple Alpha/3.5imple Alpha/Tupfile.lua

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

skins/_old/5imple Alpha/3.5imple Alpha/skin.inc

@@ -1,239 +0,0 @@
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;;                                                              ;;
-;; Copyright (C) KolibriOS team 2004-2017. All rights reserved. ;;
-;; Distributed under terms of the GNU General Public License    ;;
-;;                                                              ;;
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-
-;============================================================================
-; This file should be used to generate skins of new standard
-;============================================================================
-; skin file structure:
-;----------------------------------------------------------------------------
-;  header:
-;   dd 'SKIN'
-;   dd = version (1 for now)
-;   dd @ params
-;   dd @ buttons
-;   dd @ bitmaps
-; ...
-;----------------------------------------------------------------------------
-; NOTE: order of sections listed below is insignificant
-;       since they're identified by pointer in above header
-;----------------------------------------------------------------------------
-; ...
-;  params:
-;   dd = skin height
-;   dw = right margin
-;   dw = left margin
-;   dw = bottom margin
-;   dw = top margin
-;   dd = inner line color
-;   dd = outer line color
-;   dd = frame color
-;   dd = dtp file size
-;   ?? = dtp file itself
-; ...
-;----------------------------------------------------------------------------
-; ...
-;  buttons:
-;   dd = button type (1 = close, 2 = minimize)
-;   dw = left button coord (could be negative)
-;   dw = top button coord (could be negative)
-;   dw = button width
-;   dw = button height
-;   ... etc for all buttons
-;   dd = 0 (end of buttons list)
-; ...
-;----------------------------------------------------------------------------
-; ...
-;  bitmaps:
-;   dw = bitmap kind (1 = left, 2 = oper, 3 = base)
-;   dw = bitmap type (1 = active, 0 = inactive)
-;   dd @ bitmap
-;   ... etc for all bitmaps
-;   dd 0 (end of bitmaps list)
-; ...
-;----------------------------------------------------------------------------
-; ...
-;  bitmap:
-;   dd = bitmap width
-;   dd = bitmap height
-;   ?? = raw bitmap data
-;   ... etc for all bitmaps
-; ...
-;============================================================================
-
-dd 'SKIN',1,__params__,__buttons__,__bitmaps__
-
-struc BITMAPFILEHEADER {
-  .bfType      dw ? ; WORD
-  .bfSize      dd ? ; DWORD
-  .bfReserved1 dw ? ; WORD
-  .bfReserved2 dw ? ; WORD
-  .bfOffBits   dd ? ; DWORD
-}
-
-struc BITMAPINFOHEADER {
-  .biSize          dd ? ; DWORD
-  .biWidth         dd ? ; LONG
-  .biHeight        dd ? ; LONG
-  .biPlanes        dw ? ; WORD
-  .biBitCount      dw ? ; WORD
-  .biCompression   dd ? ; DWORD
-  .biSizeImage     dd ? ; DWORD
-  .biXPelsPerMeter dd ? ; LONG
-  .biYPelsPerMeter dd ? ; LONG
-  .biClrUsed       dd ? ; DWORD
-  .biClrImportant  dd ? ; DWORD
-}
-
-struc _bmp {
-  .h BITMAPFILEHEADER
-  .i BITMAPINFOHEADER
-}
-virtual at 0
-  _bmp _bmp
-end virtual
-
-macro BITMAP _name*,_fname*
-{
-  local w,h,a,r,g,b
-  virtual at 0
-    _file equ _#_name
-    _file::
-    file _fname
-  end virtual
-  load w dword from _file:_bmp.i.biWidth
-  load h dword from _file:_bmp.i.biHeight
-  load hsize dword from _file:_bmp.h.bfOffBits
-  align 4
-  label _name
-    .width  = w
-    .height = h
-  dd w,h
-  a=hsize+(w*3+(w mod 4))*(h-1)
-  size = $
-  repeat h
-    repeat w
-      load r from _file:a+0
-      load g from _file:a+1
-      load b from _file:a+2
-      db r,g,b
-      a=a+3
-    end repeat
-    a=a-w*3*2-(w mod 4)
-  end repeat
-}
-
-macro define_colors name,[col,val]
-{
-  common
-    local a,b,c
-  forward
-    match =binner,col \{ a = val \}
-    match =bouter,col \{ b = val \}
-    match =bframe,col \{ c = val \}
-  common
-    name equ a,b,c
-}
-
-macro SKIN_PARAMS [a]
-{
-  common
-    local _height,_margins,_colors,_colors_1,_dtp
-    __params__:
-  forward
-    match qq == ww,a
-    \{
-      match =height,qq \\{ _height = ww \\}
-      match =margins,qq \\{
-        match [q1:q2:q3:q4],ww
-        \\\{
-          _margins equ q3,q1,q4,q2
-        \\\}
-      \\}
-      match =colors =active,qq
-      \\{
-        match [q10==q11:q20==q21:q30==q31],ww
-        \\\{
-          define_colors _colors,q10,q11,q20,q21,q30,q31
-        \\\}
-      \\}
-      match =colors =inactive,qq
-      \\{
-        match [q10==q11:q20==q21:q30==q31],ww
-        \\\{
-          define_colors _colors_1,q10,q11,q20,q21,q30,q31
-        \\\}
-      \\}
-      match =dtp,qq \\{ _dtp equ ww \\}
-    \}
-  common
-    dd _height
-    dw _margins
-    dd _colors,_colors_1
-    dd @f - $ - 4
-    file _dtp
-    @@:
-}
-
-macro SKIN_BUTTONS [a]
-{
-  common
-    local btn
-    __buttons__:
-  forward
-    match qq == ww,a
-    \{
-      btn = 0
-      match =close,qq    \\{ btn = 1 \\}
-      match =minimize,qq \\{ btn = 2 \\}
-      match [q1:q2][q3:q4],ww
-      \\{
-        if btn <> 0
-          dd btn
-          dw q1,q2,q3,q4
-        end if
-      \\}
-    \}
-  common
-    dd 0
-}
-
-macro SKIN_BITMAPS [a]
-{
-  common
-    local bmp
-    __bitmaps__:
-  forward
-    match qq == ww,a
-    \{
-      bmp=-1
-      match qqq =active,qq   \\{ bmp = 1 \\}
-      match qqq =inactive,qq \\{ bmp = 0 \\}
-      match =left qqq,qq
-      \\{
-        if bmp >= 0
-          dw 1,bmp
-          dd ww
-        end if
-      \\}
-      match =oper qqq,qq
-      \\{
-        if bmp >= 0
-          dw 2,bmp
-          dd ww
-        end if
-      \\}
-      match =base qqq,qq
-      \\{
-        if bmp >= 0
-          dw 3,bmp
-          dd ww
-        end if
-      \\}
-    \}
-  common
-    dd 0
-}

skins/_old/Blended/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"), "Blended.skn")

skins/_old/Blended/default.asm

@@ -1,33 +0,0 @@
-;SKIN (.SKN) - COMPILE WITH FASM
-
-include 'skin.inc'
-
-SKIN_PARAMS \
-  height          = bmp_base.height,\     ; skin height
-  margins         = [5:1:54:1],\          ; margins [left:top:right:bottom]
-  colors active   = [binner=0xC7CACC:\    ; border inner color
-                     bouter=0xA3A6AA:\    ; border outer color
-                     bframe=0xF5F5F5],\   ; border frame color
-  colors inactive = [binner=0xC7CACC:\    ; border inner color
-                     bouter=0xA3A6AA:\    ; border outer color
-                     bframe=0xF5F5F5],\   ; border frame color
-  dtp             = 'default.dtp'          ; dtp colors
-
-SKIN_BUTTONS \
-  close    = [-29:3][25:17],\             ; buttons coordinates
-  minimize = [-55:3][25:17]               ; [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 ,'left.bmp'               ; skin bitmaps
-BITMAP bmp_oper ,'oper.bmp'
-BITMAP bmp_base ,'base.bmp'
-BITMAP bmp_left1,'left_1.bmp'
-BITMAP bmp_oper1,'oper_1.bmp'
-BITMAP bmp_base1,'base_1.bmp'

skins/_old/Blended/default.dtp.asm

@@ -1,11 +0,0 @@
-;SYSTEM COLORS (.DTP) - COMPILE WITH FASM
-frame            	dd 0xF5F5F5
-grab             	dd 0xF1F1F2
-grab_button      	dd 0x969A9E
-grab_button_text 	dd 0x4F4F50
-grab_text        	dd 0x515151
-work             	dd 0xECEDEE
-work_button      	dd 0xECEDEE
-work_button_text 	dd 0x474747
-work_text        	dd 0x474747
-work_graph       	dd 0xC7CACC

skins/_old/Blended/dtp_build.bat

@@ -1,2 +0,0 @@
-fasm default.dtp.asm default.dtp
-pause

skins/_old/Blended/pack_build.bat

@@ -1 +0,0 @@
-kpack default.skn default.pack.skn

skins/_old/Blended/skin.inc

@@ -1,239 +0,0 @@
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;;                                                              ;;
-;; Copyright (C) KolibriOS team 2004-2017. All rights reserved. ;;
-;; Distributed under terms of the GNU General Public License    ;;
-;;                                                              ;;
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-
-;============================================================================
-; This file should be used to generate skins of new standard
-;============================================================================
-; skin file structure:
-;----------------------------------------------------------------------------
-;  header:
-;   dd 'SKIN'
-;   dd = version (1 for now)
-;   dd @ params
-;   dd @ buttons
-;   dd @ bitmaps
-; ...
-;----------------------------------------------------------------------------
-; NOTE: order of sections listed below is insignificant
-;       since they're identified by pointer in above header
-;----------------------------------------------------------------------------
-; ...
-;  params:
-;   dd = skin height
-;   dw = right margin
-;   dw = left margin
-;   dw = bottom margin
-;   dw = top margin
-;   dd = inner line color
-;   dd = outer line color
-;   dd = frame color
-;   dd = dtp file size
-;   ?? = dtp file itself
-; ...
-;----------------------------------------------------------------------------
-; ...
-;  buttons:
-;   dd = button type (1 = close, 2 = minimize)
-;   dw = left button coord (could be negative)
-;   dw = top button coord (could be negative)
-;   dw = button width
-;   dw = button height
-;   ... etc for all buttons
-;   dd = 0 (end of buttons list)
-; ...
-;----------------------------------------------------------------------------
-; ...
-;  bitmaps:
-;   dw = bitmap kind (1 = left, 2 = oper, 3 = base)
-;   dw = bitmap type (1 = active, 0 = inactive)
-;   dd @ bitmap
-;   ... etc for all bitmaps
-;   dd 0 (end of bitmaps list)
-; ...
-;----------------------------------------------------------------------------
-; ...
-;  bitmap:
-;   dd = bitmap width
-;   dd = bitmap height
-;   ?? = raw bitmap data
-;   ... etc for all bitmaps
-; ...
-;============================================================================
-
-dd 'SKIN',1,__params__,__buttons__,__bitmaps__
-
-struc BITMAPFILEHEADER {
-  .bfType      dw ? ; WORD
-  .bfSize      dd ? ; DWORD
-  .bfReserved1 dw ? ; WORD
-  .bfReserved2 dw ? ; WORD
-  .bfOffBits   dd ? ; DWORD
-}
-
-struc BITMAPINFOHEADER {
-  .biSize          dd ? ; DWORD
-  .biWidth         dd ? ; LONG
-  .biHeight        dd ? ; LONG
-  .biPlanes        dw ? ; WORD
-  .biBitCount      dw ? ; WORD
-  .biCompression   dd ? ; DWORD
-  .biSizeImage     dd ? ; DWORD
-  .biXPelsPerMeter dd ? ; LONG
-  .biYPelsPerMeter dd ? ; LONG
-  .biClrUsed       dd ? ; DWORD
-  .biClrImportant  dd ? ; DWORD
-}
-
-struc _bmp {
-  .h BITMAPFILEHEADER
-  .i BITMAPINFOHEADER
-}
-virtual at 0
-  _bmp _bmp
-end virtual
-
-macro BITMAP _name*,_fname*
-{
-  local w,h,a,r,g,b
-  virtual at 0
-    _file equ _#_name
-    _file::
-    file _fname
-  end virtual
-  load w dword from _file:_bmp.i.biWidth
-  load h dword from _file:_bmp.i.biHeight
-  load hsize dword from _file:_bmp.h.bfOffBits
-  align 4
-  label _name
-    .width  = w
-    .height = h
-  dd w,h
-  a=hsize+(w*3+(w mod 4))*(h-1)
-  size = $
-  repeat h
-    repeat w
-      load r from _file:a+0
-      load g from _file:a+1
-      load b from _file:a+2
-      db r,g,b
-      a=a+3
-    end repeat
-    a=a-w*3*2-(w mod 4)
-  end repeat
-}
-
-macro define_colors name,[col,val]
-{
-  common
-    local a,b,c
-  forward
-    match =binner,col \{ a = val \}
-    match =bouter,col \{ b = val \}
-    match =bframe,col \{ c = val \}
-  common
-    name equ a,b,c
-}
-
-macro SKIN_PARAMS [a]
-{
-  common
-    local _height,_margins,_colors,_colors_1,_dtp
-    __params__:
-  forward
-    match qq == ww,a
-    \{
-      match =height,qq \\{ _height = ww \\}
-      match =margins,qq \\{
-        match [q1:q2:q3:q4],ww
-        \\\{
-          _margins equ q3,q1,q4,q2
-        \\\}
-      \\}
-      match =colors =active,qq
-      \\{
-        match [q10==q11:q20==q21:q30==q31],ww
-        \\\{
-          define_colors _colors,q10,q11,q20,q21,q30,q31
-        \\\}
-      \\}
-      match =colors =inactive,qq
-      \\{
-        match [q10==q11:q20==q21:q30==q31],ww
-        \\\{
-          define_colors _colors_1,q10,q11,q20,q21,q30,q31
-        \\\}
-      \\}
-      match =dtp,qq \\{ _dtp equ ww \\}
-    \}
-  common
-    dd _height
-    dw _margins
-    dd _colors,_colors_1
-    dd @f - $ - 4
-    file _dtp
-    @@:
-}
-
-macro SKIN_BUTTONS [a]
-{
-  common
-    local btn
-    __buttons__:
-  forward
-    match qq == ww,a
-    \{
-      btn = 0
-      match =close,qq    \\{ btn = 1 \\}
-      match =minimize,qq \\{ btn = 2 \\}
-      match [q1:q2][q3:q4],ww
-      \\{
-        if btn <> 0
-          dd btn
-          dw q1,q2,q3,q4
-        end if
-      \\}
-    \}
-  common
-    dd 0
-}
-
-macro SKIN_BITMAPS [a]
-{
-  common
-    local bmp
-    __bitmaps__:
-  forward
-    match qq == ww,a
-    \{
-      bmp=-1
-      match qqq =active,qq   \\{ bmp = 1 \\}
-      match qqq =inactive,qq \\{ bmp = 0 \\}
-      match =left qqq,qq
-      \\{
-        if bmp >= 0
-          dw 1,bmp
-          dd ww
-        end if
-      \\}
-      match =oper qqq,qq
-      \\{
-        if bmp >= 0
-          dw 2,bmp
-          dd ww
-        end if
-      \\}
-      match =base qqq,qq
-      \\{
-        if bmp >= 0
-          dw 3,bmp
-          dd ww
-        end if
-      \\}
-    \}
-  common
-    dd 0
-}

skins/_old/Blended/skn_build.bat

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

skins/_old/MenuetOS/3.MenuetOS/MenuetOS.asm

@@ -1,35 +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=0x1D2325:\	  ; border inner color
-		     bouter=0x1D2325:\	  ; border outer color
-		     bframe=0x3B454A],\   ; border frame color
-  colors inactive = [binner=0x1D2325:\	  ; border inner color
-		     bouter=0x1D2325:\	  ; border outer color
-		     bframe=0x65686A],\   ; border frame color
-  dtp		  = 'GRAY.DTP'	  ; dtp colors
-
-SKIN_BUTTONS \
-  close    = [-21:3][15:15],\		  ; buttons coordinates
-  minimize = [-39:3][15:15]		  ; [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 ,'active/left.bmp'		 ; skin bitmaps
-BITMAP bmp_oper ,'active/oper.bmp'
-BITMAP bmp_base ,'active/base.bmp'
-BITMAP bmp_left1,'inactive/left.bmp'
-BITMAP bmp_oper1,'inactive/oper.bmp'
-BITMAP bmp_base1,'inactive/base.bmp'
-
-;================================;
-; Created by Rock_maniak_forever ;
-;================================;

skins/_old/MenuetOS/3.MenuetOS/Tupfile.lua

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

skins/_old/MenuetOS/3.MenuetOS/skin.inc

@@ -1,239 +0,0 @@
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;;                                                              ;;
-;; Copyright (C) KolibriOS team 2004-2017. All rights reserved. ;;
-;; Distributed under terms of the GNU General Public License    ;;
-;;                                                              ;;
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-
-;============================================================================
-; This file should be used to generate skins of new standard
-;============================================================================
-; skin file structure:
-;----------------------------------------------------------------------------
-;  header:
-;   dd 'SKIN'
-;   dd = version (1 for now)
-;   dd @ params
-;   dd @ buttons
-;   dd @ bitmaps
-; ...
-;----------------------------------------------------------------------------
-; NOTE: order of sections listed below is insignificant
-;       since they're identified by pointer in above header
-;----------------------------------------------------------------------------
-; ...
-;  params:
-;   dd = skin height
-;   dw = right margin
-;   dw = left margin
-;   dw = bottom margin
-;   dw = top margin
-;   dd = inner line color
-;   dd = outer line color
-;   dd = frame color
-;   dd = dtp file size
-;   ?? = dtp file itself
-; ...
-;----------------------------------------------------------------------------
-; ...
-;  buttons:
-;   dd = button type (1 = close, 2 = minimize)
-;   dw = left button coord (could be negative)
-;   dw = top button coord (could be negative)
-;   dw = button width
-;   dw = button height
-;   ... etc for all buttons
-;   dd = 0 (end of buttons list)
-; ...
-;----------------------------------------------------------------------------
-; ...
-;  bitmaps:
-;   dw = bitmap kind (1 = left, 2 = oper, 3 = base)
-;   dw = bitmap type (1 = active, 0 = inactive)
-;   dd @ bitmap
-;   ... etc for all bitmaps
-;   dd 0 (end of bitmaps list)
-; ...
-;----------------------------------------------------------------------------
-; ...
-;  bitmap:
-;   dd = bitmap width
-;   dd = bitmap height
-;   ?? = raw bitmap data
-;   ... etc for all bitmaps
-; ...
-;============================================================================
-
-dd 'SKIN',1,__params__,__buttons__,__bitmaps__
-
-struc BITMAPFILEHEADER {
-  .bfType      dw ? ; WORD
-  .bfSize      dd ? ; DWORD
-  .bfReserved1 dw ? ; WORD
-  .bfReserved2 dw ? ; WORD
-  .bfOffBits   dd ? ; DWORD
-}
-
-struc BITMAPINFOHEADER {
-  .biSize          dd ? ; DWORD
-  .biWidth         dd ? ; LONG
-  .biHeight        dd ? ; LONG
-  .biPlanes        dw ? ; WORD
-  .biBitCount      dw ? ; WORD
-  .biCompression   dd ? ; DWORD
-  .biSizeImage     dd ? ; DWORD
-  .biXPelsPerMeter dd ? ; LONG
-  .biYPelsPerMeter dd ? ; LONG
-  .biClrUsed       dd ? ; DWORD
-  .biClrImportant  dd ? ; DWORD
-}
-
-struc _bmp {
-  .h BITMAPFILEHEADER
-  .i BITMAPINFOHEADER
-}
-virtual at 0
-  _bmp _bmp
-end virtual
-
-macro BITMAP _name*,_fname*
-{
-  local w,h,a,r,g,b
-  virtual at 0
-    _file equ _#_name
-    _file::
-    file _fname
-  end virtual
-  load w dword from _file:_bmp.i.biWidth
-  load h dword from _file:_bmp.i.biHeight
-  load hsize dword from _file:_bmp.h.bfOffBits
-  align 4
-  label _name
-    .width  = w
-    .height = h
-  dd w,h
-  a=hsize+(w*3+(w mod 4))*(h-1)
-  size = $
-  repeat h
-    repeat w
-      load r from _file:a+0
-      load g from _file:a+1
-      load b from _file:a+2
-      db r,g,b
-      a=a+3
-    end repeat
-    a=a-w*3*2-(w mod 4)
-  end repeat
-}
-
-macro define_colors name,[col,val]
-{
-  common
-    local a,b,c
-  forward
-    match =binner,col \{ a = val \}
-    match =bouter,col \{ b = val \}
-    match =bframe,col \{ c = val \}
-  common
-    name equ a,b,c
-}
-
-macro SKIN_PARAMS [a]
-{
-  common
-    local _height,_margins,_colors,_colors_1,_dtp
-    __params__:
-  forward
-    match qq == ww,a
-    \{
-      match =height,qq \\{ _height = ww \\}
-      match =margins,qq \\{
-        match [q1:q2:q3:q4],ww
-        \\\{
-          _margins equ q3,q1,q4,q2
-        \\\}
-      \\}
-      match =colors =active,qq
-      \\{
-        match [q10==q11:q20==q21:q30==q31],ww
-        \\\{
-          define_colors _colors,q10,q11,q20,q21,q30,q31
-        \\\}
-      \\}
-      match =colors =inactive,qq
-      \\{
-        match [q10==q11:q20==q21:q30==q31],ww
-        \\\{
-          define_colors _colors_1,q10,q11,q20,q21,q30,q31
-        \\\}
-      \\}
-      match =dtp,qq \\{ _dtp equ ww \\}
-    \}
-  common
-    dd _height
-    dw _margins
-    dd _colors,_colors_1
-    dd @f - $ - 4
-    file _dtp
-    @@:
-}
-
-macro SKIN_BUTTONS [a]
-{
-  common
-    local btn
-    __buttons__:
-  forward
-    match qq == ww,a
-    \{
-      btn = 0
-      match =close,qq    \\{ btn = 1 \\}
-      match =minimize,qq \\{ btn = 2 \\}
-      match [q1:q2][q3:q4],ww
-      \\{
-        if btn <> 0
-          dd btn
-          dw q1,q2,q3,q4
-        end if
-      \\}
-    \}
-  common
-    dd 0
-}
-
-macro SKIN_BITMAPS [a]
-{
-  common
-    local bmp
-    __bitmaps__:
-  forward
-    match qq == ww,a
-    \{
-      bmp=-1
-      match qqq =active,qq   \\{ bmp = 1 \\}
-      match qqq =inactive,qq \\{ bmp = 0 \\}
-      match =left qqq,qq
-      \\{
-        if bmp >= 0
-          dw 1,bmp
-          dd ww
-        end if
-      \\}
-      match =oper qqq,qq
-      \\{
-        if bmp >= 0
-          dw 2,bmp
-          dd ww
-        end if
-      \\}
-      match =base qqq,qq
-      \\{
-        if bmp >= 0
-          dw 3,bmp
-          dd ww
-        end if
-      \\}
-    \}
-  common
-    dd 0
-}

skins/_old/mist/default.dtp.asm

@@ -1,11 +1,11 @@
 ;SYSTEM COLORS (.DTP) - COMPILE WITH FASM
 frame            	dd 0xf4f4f4
-grab             	dd 0xf4f4f4
+grab             	dd 0xFFFfff
-grab_button      	dd 0xebebeb
+grab_button      	dd 0xb1b1b1
 grab_button_text 	dd 0x606060
 grab_text        	dd 0x606060
 work             	dd 0xf4f4f4
 work_button      	dd 0xebebeb
 work_button_text 	dd 0x606060
 work_text        	dd 0x606060
-work_graph       	dd 0xb1b1b1
+work_graph       	dd 0xBBBbbb

skins/_old/mist_color/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"), "mist_color.skn")

skins/_old/mist_color/default.asm

@@ -1,33 +0,0 @@
-;SKIN (.SKN) - COMPILE WITH FASM
-
-include 'skin.inc'
-
-SKIN_PARAMS \
-  height          = bmp_base.height,\     ; skin height
-  margins         = [5:1:66:1],\          ; margins [left:top:right:bottom]
-  colors active   = [binner=0xb1b1b1:\    ; border inner color
-                     bouter=0xb1b1b1:\    ; border outer color
-                     bframe=0xf4f4f4],\   ; border frame color
-  colors inactive = [binner=0xb1b1b1:\    ; border inner color
-                     bouter=0xb1b1b1:\    ; border outer color
-                     bframe=0xf4f4f4],\   ; border frame color
-  dtp             = 'default.dtp'          ; dtp colors
-
-SKIN_BUTTONS \
-  close    = [-19:6][12:12],\             ; buttons coordinates
-  minimize = [-38:6][12:12]               ; [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 ,'left.bmp'               ; skin bitmaps
-BITMAP bmp_oper ,'oper.bmp'
-BITMAP bmp_base ,'base.bmp'
-BITMAP bmp_left1,'left_1.bmp'
-BITMAP bmp_oper1,'oper_1.bmp'
-BITMAP bmp_base1,'base_1.bmp'

skins/_old/mist_color/default.dtp.asm

@@ -1,11 +0,0 @@
-;SYSTEM COLORS (.DTP) - COMPILE WITH FASM
-frame            	dd 0xf4f4f4
-grab             	dd 0xf4f4f4
-grab_button      	dd 0xebebeb
-grab_button_text 	dd 0x606060
-grab_text        	dd 0x606060
-work             	dd 0xf4f4f4
-work_button      	dd 0xebebeb
-work_button_text 	dd 0x606060
-work_text        	dd 0x606060
-work_graph       	dd 0xb1b1b1

skins/_old/mist_color/dtp_build.bat

@@ -1,2 +0,0 @@
-fasm default.dtp.asm default.dtp
-pause

skins/_old/mist_color/pack_build.bat

@@ -1 +0,0 @@
-kpack default.skn default.pack.skn

skins/_old/mist_color/skin.inc

@@ -1,239 +0,0 @@
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;;                                                              ;;
-;; Copyright (C) KolibriOS team 2004-2017. All rights reserved. ;;
-;; Distributed under terms of the GNU General Public License    ;;
-;;                                                              ;;
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-
-;============================================================================
-; This file should be used to generate skins of new standard
-;============================================================================
-; skin file structure:
-;----------------------------------------------------------------------------
-;  header:
-;   dd 'SKIN'
-;   dd = version (1 for now)
-;   dd @ params
-;   dd @ buttons
-;   dd @ bitmaps
-; ...
-;----------------------------------------------------------------------------
-; NOTE: order of sections listed below is insignificant
-;       since they're identified by pointer in above header
-;----------------------------------------------------------------------------
-; ...
-;  params:
-;   dd = skin height
-;   dw = right margin
-;   dw = left margin
-;   dw = bottom margin
-;   dw = top margin
-;   dd = inner line color
-;   dd = outer line color
-;   dd = frame color
-;   dd = dtp file size
-;   ?? = dtp file itself
-; ...
-;----------------------------------------------------------------------------
-; ...
-;  buttons:
-;   dd = button type (1 = close, 2 = minimize)
-;   dw = left button coord (could be negative)
-;   dw = top button coord (could be negative)
-;   dw = button width
-;   dw = button height
-;   ... etc for all buttons
-;   dd = 0 (end of buttons list)
-; ...
-;----------------------------------------------------------------------------
-; ...
-;  bitmaps:
-;   dw = bitmap kind (1 = left, 2 = oper, 3 = base)
-;   dw = bitmap type (1 = active, 0 = inactive)
-;   dd @ bitmap
-;   ... etc for all bitmaps
-;   dd 0 (end of bitmaps list)
-; ...
-;----------------------------------------------------------------------------
-; ...
-;  bitmap:
-;   dd = bitmap width
-;   dd = bitmap height
-;   ?? = raw bitmap data
-;   ... etc for all bitmaps
-; ...
-;============================================================================
-
-dd 'SKIN',1,__params__,__buttons__,__bitmaps__
-
-struc BITMAPFILEHEADER {
-  .bfType      dw ? ; WORD
-  .bfSize      dd ? ; DWORD
-  .bfReserved1 dw ? ; WORD
-  .bfReserved2 dw ? ; WORD
-  .bfOffBits   dd ? ; DWORD
-}
-
-struc BITMAPINFOHEADER {
-  .biSize          dd ? ; DWORD
-  .biWidth         dd ? ; LONG
-  .biHeight        dd ? ; LONG
-  .biPlanes        dw ? ; WORD
-  .biBitCount      dw ? ; WORD
-  .biCompression   dd ? ; DWORD
-  .biSizeImage     dd ? ; DWORD
-  .biXPelsPerMeter dd ? ; LONG
-  .biYPelsPerMeter dd ? ; LONG
-  .biClrUsed       dd ? ; DWORD
-  .biClrImportant  dd ? ; DWORD
-}
-
-struc _bmp {
-  .h BITMAPFILEHEADER
-  .i BITMAPINFOHEADER
-}
-virtual at 0
-  _bmp _bmp
-end virtual
-
-macro BITMAP _name*,_fname*
-{
-  local w,h,a,r,g,b
-  virtual at 0
-    _file equ _#_name
-    _file::
-    file _fname
-  end virtual
-  load w dword from _file:_bmp.i.biWidth
-  load h dword from _file:_bmp.i.biHeight
-  load hsize dword from _file:_bmp.h.bfOffBits
-  align 4
-  label _name
-    .width  = w
-    .height = h
-  dd w,h
-  a=hsize+(w*3+(w mod 4))*(h-1)
-  size = $
-  repeat h
-    repeat w
-      load r from _file:a+0
-      load g from _file:a+1
-      load b from _file:a+2
-      db r,g,b
-      a=a+3
-    end repeat
-    a=a-w*3*2-(w mod 4)
-  end repeat
-}
-
-macro define_colors name,[col,val]
-{
-  common
-    local a,b,c
-  forward
-    match =binner,col \{ a = val \}
-    match =bouter,col \{ b = val \}
-    match =bframe,col \{ c = val \}
-  common
-    name equ a,b,c
-}
-
-macro SKIN_PARAMS [a]
-{
-  common
-    local _height,_margins,_colors,_colors_1,_dtp
-    __params__:
-  forward
-    match qq == ww,a
-    \{
-      match =height,qq \\{ _height = ww \\}
-      match =margins,qq \\{
-        match [q1:q2:q3:q4],ww
-        \\\{
-          _margins equ q3,q1,q4,q2
-        \\\}
-      \\}
-      match =colors =active,qq
-      \\{
-        match [q10==q11:q20==q21:q30==q31],ww
-        \\\{
-          define_colors _colors,q10,q11,q20,q21,q30,q31
-        \\\}
-      \\}
-      match =colors =inactive,qq
-      \\{
-        match [q10==q11:q20==q21:q30==q31],ww
-        \\\{
-          define_colors _colors_1,q10,q11,q20,q21,q30,q31
-        \\\}
-      \\}
-      match =dtp,qq \\{ _dtp equ ww \\}
-    \}
-  common
-    dd _height
-    dw _margins
-    dd _colors,_colors_1
-    dd @f - $ - 4
-    file _dtp
-    @@:
-}
-
-macro SKIN_BUTTONS [a]
-{
-  common
-    local btn
-    __buttons__:
-  forward
-    match qq == ww,a
-    \{
-      btn = 0
-      match =close,qq    \\{ btn = 1 \\}
-      match =minimize,qq \\{ btn = 2 \\}
-      match [q1:q2][q3:q4],ww
-      \\{
-        if btn <> 0
-          dd btn
-          dw q1,q2,q3,q4
-        end if
-      \\}
-    \}
-  common
-    dd 0
-}
-
-macro SKIN_BITMAPS [a]
-{
-  common
-    local bmp
-    __bitmaps__:
-  forward
-    match qq == ww,a
-    \{
-      bmp=-1
-      match qqq =active,qq   \\{ bmp = 1 \\}
-      match qqq =inactive,qq \\{ bmp = 0 \\}
-      match =left qqq,qq
-      \\{
-        if bmp >= 0
-          dw 1,bmp
-          dd ww
-        end if
-      \\}
-      match =oper qqq,qq
-      \\{
-        if bmp >= 0
-          dw 2,bmp
-          dd ww
-        end if
-      \\}
-      match =base qqq,qq
-      \\{
-        if bmp >= 0
-          dw 3,bmp
-          dd ww
-        end if
-      \\}
-    \}
-  common
-    dd 0
-}

skins/_old/mist_color/skn_build.bat

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

skins/authors.txt

@@ -5,7 +5,6 @@ black-glass             ChE
 Black_lace              Rock_maniak_forever
 blackskin               Aqwas
 Blacky                  maxcodehack
-Blended                 Aqwas
 cherry                  Aqwas
 CodeOpusC               mike.dld
 Crystal                 Aqwas

skins/skinlist.lua

@@ -14,7 +14,6 @@ skinlist = {
 "Leency/AreaSq/AreaSq.skn",
 "Leency/Florence/Florence.skn",
 "Leency/HydrogenOS/HydrogenOS.skn",
-"Leency/Luna/Luna.skn",
 "Leency/Oasis/Oasis.skn",
 "Leency/ObsidianOS/ObsidianOS.skn",
 "Leency/Octo_flat/Octo_flat.skn",
@@ -24,7 +23,7 @@ skinlist = {
 "maxcodehack/blacky/Blacky.skn",
 "loggy/loggy.skn",
 "night/night.skn",
-"_old/5imple Alpha/2.5imple Alpha/2.5imple Alpha.skn",
+"_old/5imple Alpha/2.5imple Alpha/Simple Alpha.skn",
 "_old/5imple Alpha/3.5imple Alpha/3.5imple Alpha.skn",
 "_old/black-glass/black-glass/black-glass.skn",
 "_old/black-glass/black-glass_light/black-glass_light.skn",
@@ -49,12 +48,10 @@ skinlist = {
 "_old/macos_l/macos_l.skn",
 "_old/mage-scroll/mage-scroll.skn",
 "_old/MenuetOS/1.MenuetOS/MenuetOS 1.skn",
-"_old/MenuetOS/3.MenuetOS/MenuetOS 3.skn",
 "_old/MenuetOS/5.MenuetOS/MenuetOS 5.skn",
 "_old/MetalColor/MCBlue/MCBlue.skn",
 "_old/MetalColor/MCRed/MCRed.skn",
 "_old/mist/mist.skn",
-"_old/mist_color/mist_color.skn",
 "_old/nix/nix.skn",
 "_old/OpusOs_Blue/OpusOs_Blue.skn",
 "_old/RoboTech/BRoboTech/BRoboTech.skn",