diff --git a/programs/cmm/appearance/appearance.c b/programs/cmm/appearance/appearance.c index 6f4db9ac91..825c230e3b 100644 --- a/programs/cmm/appearance/appearance.c +++ b/programs/cmm/appearance/appearance.c @@ -1,5 +1,5 @@ //11.03.12 - start! -//ver 2.3 +//ver 2.31 #ifndef AUTOBUILD ?include "lang.h--" @@ -263,9 +263,24 @@ void Open_Dir() } cur = select_list.count; files_mas[cur]=j; - if (!strcmpi("default.skn",#temp_filename)) files_mas[0]>= b) return; + for (j = a; j <= b; j++) { + if (strcmpi(io.dir.position(files_mas[j]), io.dir.position(files_mas[b]))<=0) { + files_mas[isn] >< files_mas[j]; + isn++; + } + } + Sort_by_Name(a, isn-2); + Sort_by_Name(isn, b); } void SelectList_DrawLine(dword i) diff --git a/skins/_old/Rednex/RED.DTP b/skins/_old/Rednex/RED.DTP deleted file mode 100644 index e912af8543..0000000000 Binary files a/skins/_old/Rednex/RED.DTP and /dev/null differ diff --git a/skins/_old/Rednex/Rednex.asm b/skins/_old/Rednex/Rednex.asm deleted file mode 100644 index 037c821644..0000000000 --- a/skins/_old/Rednex/Rednex.asm +++ /dev/null @@ -1,36 +0,0 @@ -include 'skin.inc' - -SKIN_PARAMS \ - height = bmp_base.height,\ ; skin height - margins = [6:1:43:1],\ ; margins [left:top:right:bottom] - colors active = [binner=0x800000:\ ; border inner color - bouter=0x800000:\ ; border outer color - bframe=0xA10000],\ ; border frame color - colors inactive = [binner=0xA34747:\ ; border inner color - bouter=0xA34747:\ ; border outer color - bframe=0xBA4747],\ ; border frame color - dtp = 'RED.DTP' ; dtp colors - -SKIN_BUTTONS \ - close = [-32:0][26:17],\ ; buttons coordinates - minimize = [-51:0][19: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 ,'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 ; -;================================; - diff --git a/skins/_old/Rednex/Tupfile.lua b/skins/_old/Rednex/Tupfile.lua deleted file mode 100644 index 4d37eee3c8..0000000000 --- a/skins/_old/Rednex/Tupfile.lua +++ /dev/null @@ -1,2 +0,0 @@ -if tup.getconfig("NO_FASM") ~= "" then return end -tup.rule("Rednex.asm", 'fasm "%f" "%o" ' .. tup.getconfig("KPACK_CMD"), "Rednex.skn") diff --git a/skins/_old/Rednex/active/base.bmp b/skins/_old/Rednex/active/base.bmp deleted file mode 100644 index cd54226dca..0000000000 Binary files a/skins/_old/Rednex/active/base.bmp and /dev/null differ diff --git a/skins/_old/Rednex/active/left.bmp b/skins/_old/Rednex/active/left.bmp deleted file mode 100644 index 341c1e3c5e..0000000000 Binary files a/skins/_old/Rednex/active/left.bmp and /dev/null differ diff --git a/skins/_old/Rednex/active/oper.bmp b/skins/_old/Rednex/active/oper.bmp deleted file mode 100644 index fcea01d9eb..0000000000 Binary files a/skins/_old/Rednex/active/oper.bmp and /dev/null differ diff --git a/skins/_old/Rednex/inactive/base.bmp b/skins/_old/Rednex/inactive/base.bmp deleted file mode 100644 index 478d6e963d..0000000000 Binary files a/skins/_old/Rednex/inactive/base.bmp and /dev/null differ diff --git a/skins/_old/Rednex/inactive/left.bmp b/skins/_old/Rednex/inactive/left.bmp deleted file mode 100644 index d2a5b1dc8f..0000000000 Binary files a/skins/_old/Rednex/inactive/left.bmp and /dev/null differ diff --git a/skins/_old/Rednex/inactive/oper.bmp b/skins/_old/Rednex/inactive/oper.bmp deleted file mode 100644 index 6c1b296039..0000000000 Binary files a/skins/_old/Rednex/inactive/oper.bmp and /dev/null differ diff --git a/skins/_old/Rednex/skin.inc b/skins/_old/Rednex/skin.inc deleted file mode 100644 index 81a6bd8f3f..0000000000 --- a/skins/_old/Rednex/skin.inc +++ /dev/null @@ -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 -} diff --git a/skins/skinlist.lua b/skins/skinlist.lua index 6ae108a9d8..3c5caeb9cc 100644 --- a/skins/skinlist.lua +++ b/skins/skinlist.lua @@ -95,7 +95,6 @@ skinlist = { "_old/OpusOs_Blue/OpusOs_Blue.skn", "_old/Organics/Organics.skn", "_old/plum/plum.skn", -"_old/Rednex/Rednex.skn", "_old/RoboTech/BRoboTech/BRoboTech.skn", "_old/RoboTech/GRoboTech/GRoboTech.skn", "_old/Russia/Russia.skn",