fix build

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

data/Tupfile.lua

@@ -17,7 +17,7 @@ img_files = {
  {"STRUCT.INC", PROGS .. "/struct.inc"},
  {"FB2READ", "common/fb2read"},
  {"ALLGAMES", "common/allgames"},
- {"HOME.PNG", "common/wallpapers/T Home.png"},
+ {"HOME.PNG", "common/wallpapers/T_Home.png"},
  {"ICONS32.PNG", "common/icons32.png"},
  {"ICONS16.PNG", "common/icons16.png"},
  {"INDEX.HTM", "common/index_htm"},

programs/cmm/appearance/appearance.c

@@ -257,6 +257,7 @@ void SelectList_DrawLine(dword i)
 	strcpy(filename, list.get(i_abs));
 	EAX = math.min(strrchr(filename,'.')-1, LIST_W - 24 / 8);
 	filename_buf[EAX] = '\0';
+	if (filename_buf[0]=='T') && (filename_buf[1]=='_') filename+=2;
 	if (EAX = strrchr(filename,'/')) filename += EAX;
 
 	//save current item for tab change
@@ -382,7 +383,7 @@ void EventApply()
 		miniprintf(#kivparam, "\\S__%s", #cur_file_path);
 		if (optionbox_tiled.checked) kivparam[1]='T';
 		if (optionbox_auto.checked) {
-			if (ESBYTE[file_name+1] == ' ') && (ESBYTE[file_name] == 'T') {
+			if (ESBYTE[file_name+1] == '_') && (ESBYTE[file_name] == 'T') {
 				kivparam[1]='T';
 			}
 		}

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

skins/_old/sshock/default.asm

@@ -1,38 +0,0 @@
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;;                                                              ;;
-;; Copyright (C) KolibriOS team 2004-2007. All rights reserved. ;;
-;; Distributed under terms of the GNU General Public License    ;;
-;;                                                              ;;
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-
-include 'skin.inc'
-
-SKIN_PARAMS \
-  height	  = bmp_base.height,\	  ; skin height
-  margins	  = [5:1:43:1],\	  ; margins [left:top:right:bottom]
-  colors active   = [binner=0x2c2a2c:\	  ; border inner color
-		     bouter=0x2c2a2c:\	  ; border outer color
-		     bframe=0x343a3e],\   ; border frame color
-  colors inactive = [binner=0x2c2a2c:\	  ; border inner color
-		     bouter=0x2c2a2c:\	  ; border outer color
-		     bframe=0x343a3e],\   ; border frame color
-  dtp		  = 'GREEN.DTP' 	 ; dtp colors
-
-SKIN_BUTTONS \
-  close    = [-18:5][15:14],\		  ; buttons coordinates
-  minimize = [-35:5][15:14]		  ; [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_1.bmp'		    ; skin bitmaps
-BITMAP bmp_oper ,'oper_1.bmp'
-BITMAP bmp_base ,'base_1.bmp'
-BITMAP bmp_left1,'left_2.bmp'
-BITMAP bmp_oper1,'oper_2.bmp'
-BITMAP bmp_base1,'base_2.bmp'

skins/_old/sshock/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/sshock/sshock.txt

@@ -1,5 +0,0 @@
-sshock
-
- theme for KolibriOS
-
-Author: G@K

skins/skinlist.lua

@@ -57,7 +57,6 @@ skinlist = {
 "_old/skin_feol_new/skin_feol_new.skn",
 "_old/skin_ser/skin_ser.skn",
 "_old/skin_vhl/skin_vhl.skn",
-"_old/sshock/sshock.skn",
 "_old/StyleVista/vista_basic/vista_basic.skn",
 "_old/StyleVista/vista_basic_black/vista_basic_black.skn",
 "_old/StyleXP/orqua/orqua.skn",