clean skins, small fixes in icons16.png

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

programs/cmm/eolite/include/gui.h

@@ -63,14 +63,34 @@ void DrawFlatButtonSmall(dword x,y,width,height,id,text)
 	WriteText(-strlen(text)*6+width/2+x+1,height/2+y-3,0x80,sc.work_text,text);
 }
 
+void DrawFuncButton(dword x,y,width,id,text)
+{
+	#define FW 17
+	#define FH 16
+	if (skin_is_dark()) {
+		DrawFlatButtonSmall(x,y,width,FH,id,text);
+		return;
+	}
+	DrawRectangle(x,y,width,FH,sc.work_graph);
+	DrawRectangle3D(x+1,y+1,width-2,FH-2, sc.work_light, sc.work_dark);
+	PutPixel(x+width-1, y+1, sc.work_dark);
+	DrawBar(x+2, y+2, FW, FH-3, 0x6060FF);
+	DrawBar(x+2+FW, y+2, width-3-FW, FH-3, 0x00AA00);
+	DefineHiddenButton(x+1,y+1,width-2,FH-2,id);
+	WriteText(-strlen(text)*6+width/2+x+2,FH/2+y-2,0x80,0x444444,text);
+	$sub ebx, 1 <<16 + 1
+	$add ecx, 0xFFFfff-0x444444
+	$int 64
+}
+
 void DrawFilledBar(dword x, y, w, h)
 { int i; for (i=0; i<h; i++) DrawBar(x, y+h-i-1, w, 1, col.work_gradient[i]); }
 
-int popin_w=260;
 void DrawEolitePopup(dword b1_text, b2_text)
 {
-	int popin_x = files.w - popin_w / 2 + files.x ;
+	#define POPIN_W 260
-	DrawPopup(popin_x, 160, popin_w, 95, 1, sc.work, sc.work_graph);
+	int popin_x = files.w - POPIN_W / 2 + files.x ;
+	DrawPopup(popin_x, 160, POPIN_W, 95, 1, sc.work, sc.work_graph);
 	DrawCaptButton(popin_x+23+000, 215, 100, 26, POPUP_BTN1, sc.button, sc.button_text, b1_text);
 	DrawCaptButton(popin_x+23+114, 215, 100, 26, POPUP_BTN2, sc.button, sc.button_text, b2_text);
 }

programs/cmm/eolite/include/translations.h

@@ -36,7 +36,7 @@ char *kfm_func = {
 	"F7 <20> ¯ª ",
 	"F8 “¤ «¨âì",
 	"F9 ” ©«",
-	"F10 <20> áâனª¨"
+	"F0 <20> áâனª¨"
 }
 #else
 ?define T_FILE "File"
@@ -77,7 +77,7 @@ char *kfm_func = {
 	"F7 Folder",
 	"F8 Delete",
 	"F9 File",
-	"F10 Settings"
+	"F0 Settings"
 }
 #endif
 

programs/cmm/lib/obj/box_lib.h

@@ -58,17 +58,17 @@ char aFrame_draw[] = "frame_draw";
 struct PathShow_data
 {
 dword type;
-word start_y,
+word  start_y;
-	start_x,
+word  start_x;
-	font_w,    // 6 - for font 0, 8 - for font 1
+word  font_w;       // 6 - for font 0, 8 - for font 1
-	area_size_x;
+word  area_size_x;
-dword font_number,  // 0 - monospace, 1 - variable
+dword font_number;  // 0 - monospace, 1 - variable
-	background_flag,
+dword background_flag;
-	font_color,
+dword font_color;
-	background_color,
+dword background_color;
-	text_pointer,
+dword text_pointer;
-	work_area_pointer,
+dword work_area_pointer;
-	temp_text_length;
+dword temp_text_length;
 };
 /*
 char temp[128];

skins/_old/CodeOpusC/Opus_A/Opus_A.asm

@@ -1,31 +0,0 @@
-include 'skin.inc'
-
-SKIN_PARAMS \
-  height          = bmp_base.height,\                       ; skin height
-  margins         = [8:3:10:2],\                            ; margins [left:top:right:bottom]
-  colors active   = [binner=0xDAD9D4:\                      ; border inner color
-                     bouter=0x93938F:\                      ; border outer color
-                     bframe=0xDAD9D4],\                     ; border frame color
-  colors inactive = [binner=0xDAD9D4:\                      ; border inner color
-                     bouter=0x93938F:\                      ; border outer color
-                     bframe=0xDAD9D4],\                     ; border frame color
-  dtp             = 'Opus_A.dtp'                            ; dtp colors
-
-SKIN_BUTTONS \
-  close    = [-21:5][15:15],\                               ; buttons coordinates
-  minimize = [-40:5][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'

skins/_old/CodeOpusC/Opus_A/Tupfile.lua

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

skins/_old/CodeOpusC/Opus_B/Opus_B.asm

@@ -1,31 +0,0 @@
-include 'skin.inc'
-
-SKIN_PARAMS \
-  height          = bmp_base.height,\                       ; skin height
-  margins         = [8:3:10:2],\                            ; margins [left:top:right:bottom]
-  colors active   = [binner=0xE3E2DD:\                      ; border inner color
-                     bouter=0xA6A6A1:\                      ; border outer color
-                     bframe=0xE3E2DD],\                     ; border frame color
-  colors inactive = [binner=0xE3E2DD:\                      ; border inner color
-                     bouter=0xA6A6A1:\                      ; border outer color
-                     bframe=0xE3E2DD],\                     ; border frame color
-  dtp             = 'Opus_B.dtp'                            ; dtp colors
-
-SKIN_BUTTONS \
-  close    = [-21:5][15:15],\                               ; buttons coordinates
-  minimize = [-40:5][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'

skins/_old/CodeOpusC/Opus_B/Tupfile.lua

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

skins/_old/CodeOpusC/Opus_B/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/CodeOpusC/Opus_D/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/CodeOpusC/Opus_G/Opus_G.asm

@@ -1,31 +0,0 @@
-include 'skin.inc'
-
-SKIN_PARAMS \
-  height          = bmp_base.height,\                       ; skin height
-  margins         = [8:3:10:2],\                            ; margins [left:top:right:bottom]
-  colors active   = [binner=0xD8D4D4:\                      ; border inner color
-                     bouter=0x928D87:\                      ; border outer color
-                     bframe=0xD8D4D4],\                     ; border frame color
-  colors inactive = [binner=0xD8D4D4:\                      ; border inner color
-                     bouter=0x928D87:\                      ; border outer color
-                     bframe=0xD8D4D4],\                     ; border frame color
-  dtp             = 'Opus_G.dtp'                            ; dtp colors
-
-SKIN_BUTTONS \
-  close    = [-21:5][15:15],\                               ; buttons coordinates
-  minimize = [-40:5][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'

skins/_old/CodeOpusC/Opus_G/Tupfile.lua

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

skins/_old/CodeOpusC/Opus_G/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/MenuetOS/4.MenuetOS/MenuetOS.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=0x152D41:\	  ; border inner color
-		     bouter=0x0B1721:\	  ; border outer color
-		     bframe=0x152D41],\   ; border frame color
-  colors inactive = [binner=0x576067:\	  ; border inner color
-		     bouter=0x0B1721:\	  ; border outer color
-		     bframe=0x576067],\   ; border frame color
-  dtp		  = 'GRAY.DTP'		  ; dtp colors
-
-SKIN_BUTTONS \
-  close    = [-20:6][12:12],\		  ; buttons coordinates
-  minimize = [-36: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 ,'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/4.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 4.skn")

skins/skinlist.lua

@@ -31,10 +31,7 @@ skinlist = {
 "_old/blackskin/blackskin.skn",
 "_old/Black_lace/2.Black_lace/Black_lace.skn",
 "_old/Blended/Blended.skn",
-"_old/CodeOpusC/Opus_A/Opus_A.skn",
+"_old/CodeOpusC/Opus_D.skn",
-"_old/CodeOpusC/Opus_B/Opus_B.skn",
-"_old/CodeOpusC/Opus_D/Opus_D.skn",
-"_old/CodeOpusC/Opus_G/Opus_G.skn",
 "_old/Cyclops/1.Cyclops/1.Cyclops.skn",
 "_old/dark_night/dark_night.skn",
 "_old/Eyes/Eyes.skn",
@@ -54,7 +51,6 @@ skinlist = {
 "_old/mage-scroll/mage-scroll.skn",
 "_old/MenuetOS/1.MenuetOS/MenuetOS 1.skn",
 "_old/MenuetOS/3.MenuetOS/MenuetOS 3.skn",
-"_old/MenuetOS/4.MenuetOS/MenuetOS 4.skn",
 "_old/MenuetOS/5.MenuetOS/MenuetOS 5.skn",
 "_old/MetalColor/MCBlue/MCBlue.skn",
 "_old/MetalColor/MCRed/MCRed.skn",