WebSVN – Kolibri OS – Path Comparison – / – /skins/_old/Leency Rev 5700 and /skins/

Regard whitespace Rev 5700 → Rev 6007

/skins/_old/Leency/AreaO/me_skin.inc
File deleted
\ No newline at end of file

/skins/_old/Leency/AreaO/build.bat
1,4 → 1,4
del default.skn
..\fasm default.asm default.skn
..\kpack default.skn
fasm default.asm default.skn
kpack default.skn
pause

/skins/_old/Leency/AreaO/default.asm
1,4 → 1,4
include 'me_skin.inc'
include '../me_skin.inc'

SKIN_PARAMS \
height = bmp_center1.height,\ ; skin height

/skins/_old/Leency/AreaSq/me_skin.inc
File deleted
\ No newline at end of file

/skins/_old/Leency/AreaSq/build.bat
1,4 → 1,4
del default.skn
..\fasm default.asm default.skn
..\kpack default.skn
fasm default.asm default.skn
kpack default.skn
pause

/skins/_old/Leency/AreaSq/default.asm
1,4 → 1,4
include 'me_skin.inc'
include '..\me_skin.inc'

SKIN_PARAMS \
height = bmp_center1.height,\ ; skin height

/skins/_old/Leency/L-Junior/ME_SKIN.INC
File deleted
\ No newline at end of file

/skins/_old/Leency/L-Junior/DEFAULT.ASM
1,4 → 1,4
include 'ME_SKIN.INC'
include '..\me_skin.inc'

SKIN_PARAMS \
height = bmp_base.height,\ ; skin height

/skins/_old/Leency/L-Junior/build.bat
1,3 → 1,3
..\fasm default.asm default.skn
..\kpack default.skn
fasm default.asm default.skn
kpack default.skn
pause

/skins/_old/Leency/Latte/me_skin.inc
File deleted
\ No newline at end of file

/skins/_old/Leency/Latte/build.bat
1,3 → 1,3
..\fasm default.asm Latte.skn
..\kpack Latte.skn
fasm default.asm Latte.skn
kpack Latte.skn
pause

/skins/_old/Leency/Latte/default.asm
1,4 → 1,4
include 'me_skin.inc'
include '..\me_skin.inc'

SKIN_PARAMS \
height = bmp_center1.height,\ ; skin height

/skins/_old/Leency/Luna/me_skin.inc
File deleted
\ No newline at end of file

/skins/_old/Leency/Luna/build.bat
1,3 → 1,3
..\fasm default.asm default.skn
..\kpack default.skn
fasm default.asm default.skn
kpack default.skn
pause

/skins/_old/Leency/Luna/default.asm
1,4 → 1,4
include 'me_skin.inc'
include '..\me_skin.inc'

SKIN_PARAMS \
height = bmp_base.height,\ ; skin height

/skins/_old/Leency/Octo/me_skin.inc
File deleted
\ No newline at end of file

/skins/_old/Leency/Octo/build.bat
1,3 → 1,3
..\fasm default.asm default.skn
..\kpack default.skn
fasm default.asm default.skn
kpack default.skn
pause

/skins/_old/Leency/Octo/default.asm
1,4 → 1,4
include 'me_skin.inc'
include '..\me_skin.inc'

SKIN_PARAMS \
height = bmp_center1.height,\ ; skin height

/skins/_old/Leency/Octo_flat/me_skin.inc
File deleted
\ No newline at end of file

/skins/_old/Leency/Octo_flat/default.asm
1,4 → 1,4
include 'me_skin.inc'
include '..\me_skin.inc'

SKIN_PARAMS \
height = bmp_center1.height,\ ; skin height

/skins/_old/Leency/OpusN/my_skin.inc
File deleted
\ No newline at end of file

/skins/_old/Leency/OpusN/OpusN.asm
1,4 → 1,4
include 'my_skin.inc'
include '..\me_skin.inc'

SKIN_PARAMS \
height = bmp_base.height,\ ; skin height

/skins/_old/Leency/Sandwich/me_skin.inc
File deleted
\ No newline at end of file

/skins/_old/Leency/Sandwich/build.bat
1,3 → 1,3
..\fasm default.asm default.skn
..\kpack default.skn
fasm default.asm default.skn
kpack default.skn
pause

/skins/_old/Leency/Sandwich/default.asm
1,4 → 1,4
include 'me_skin.inc'
include '..\me_skin.inc'

SKIN_PARAMS \
height = bmp_center1.height,\ ; skin height

/skins/_old/Leency/Shkvorka/me_skin.inc
File deleted
\ No newline at end of file

/skins/_old/Leency/Shkvorka/build.bat
1,3 → 1,4
fasm default.dtp.asm default.dtp
fasm default.asm default.skn
kpack default.skn
pause

 /skins/_old/Leency/Shkvorka/default.asm
 ,19 → 1,19
-include 'me_skin.inc'
+include '..\me_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=0x646464:\    ; border outer color
-                     bframe=0xE1E1E1],\   ; border frame color
-  colors inactive = [binner=0xE1E1E1:\    ; border inner color
-                     bouter=0x747474:\    ; border outer color
-                     bframe=0xE1E1E1],\   ; border frame color
+  margins         = [6:5:43:3],\          ; margins [left:top:right:bottom]
+  colors active   = [binner=0xE4DFE1:\    ; border inner
+                     bouter=0x646464:\    ; border outer
+                     bframe=0xE4DFE1],\   ; border middle
+  colors inactive = [binner=0xE4DFE1:\    ; border inner
+                     bouter=0x646464:\    ; border outer
+                     bframe=0xE4DFE1],\   ; border middle
   dtp             = 'default.dtp'          ; dtp colors
 SKIN_BUTTONS \
-  close    = [-31:1][27:17],\             ; buttons coordinates
-  minimize = [-58:1][27:17]               ; [left:top][width:height]
+  close    = [-31:1][27:18],\             ; buttons coordinates
+  minimize = [-58:1][27:18]               ; [left:top][width:height]
 SKIN_BITMAPS \
   left active   = bmp_left1,\              ; skin bitmaps pointers

 /skins/_old/Leency/Shkvorka/default.dtp.asm
 ,11 → 4,11
   .grab             dd 0x000000
   .grab_button      dd 0x000000
   .grab_button_text dd 0x000000
-  .grab_text        dd 0x000000
-  .work             dd 0xE1E1E1
-  .work_button      dd 0x7D7D8A
-  .work_button_text dd 0xFFFFFF
+  .grab_text        dd 0x333333
+  .work             dd 0xE4DFE1
+  .work_button      dd 0xE9E9E9
+  .work_button_text dd 0x444444
   .work_text        dd 0x000000
-  .work_graph       dd 0x6B677A
+  .work_graph       dd 0x7E7E7E
  }
 struct system_colors

/skins/_old/Leency/Shkvorka/default.skn
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes:
Added: svn:mime-type
+application/octet-stream
\ No newline at end of property

/skins/_old/Leency/Yeah/me_skin.inc
File deleted
\ No newline at end of file

/skins/_old/Leency/Yeah/build.bat
1,3 → 1,3
..\fasm default.asm default.skn
..\kpack default.skn
fasm default.asm default.skn
kpack default.skn
pause

/skins/_old/Leency/Yeah/default.asm
1,4 → 1,4
include 'me_skin.inc'
include '..\me_skin.inc'

SKIN_PARAMS \
height = bmp_center1.height,\ ; skin height

 /skins/_old/Leency/me_skin.inc
 ,0 → 1,235
+;============================================================================
+; 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 _fname
+    load w dword from _bmp.i.biWidth
+    load h dword from _bmp.i.biHeight
+  end virtual
+  align 4
+  label _name
+    .width  = w
+    .height = h
+  dd w,h
+  a=54+(w*3+(w mod 4))*(h-1)
+  size = $
+  repeat h
+    repeat w
+      virtual at 0
+        file _fname
+        load r from a+0
+        load g from a+1
+        load b from a+2
+      end virtual
+      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,_dtp_sz
+    __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
+    virtual at 0
+      file _dtp
+      _dtp_sz = $
+    end virtual
+    dd _dtp_sz
+    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
+}

Subversion Repositories Kolibri OS

Compare Revisions

Regard whitespace Rev 5700 → Rev 6007