From b43350b8b97d3982f173dbccce1e13bb3badd274 Mon Sep 17 00:00:00 2001 From: "Kirill Lipatov (Leency)" Date: Fri, 27 Nov 2020 13:25:36 +0000 Subject: [PATCH] Appearance: added sorting to the list git-svn-id: svn://kolibrios.org@8261 a494cfbc-eb01-0410-851d-a64ba20cac60 --- programs/cmm/appearance/appearance.c | 19 ++- skins/_old/Rednex/RED.DTP | Bin 40 -> 0 bytes skins/_old/Rednex/Rednex.asm | 36 ---- skins/_old/Rednex/Tupfile.lua | 2 - skins/_old/Rednex/active/base.bmp | Bin 150 -> 0 bytes skins/_old/Rednex/active/left.bmp | Bin 438 -> 0 bytes skins/_old/Rednex/active/oper.bmp | Bin 4374 -> 0 bytes skins/_old/Rednex/inactive/base.bmp | Bin 150 -> 0 bytes skins/_old/Rednex/inactive/left.bmp | Bin 438 -> 0 bytes skins/_old/Rednex/inactive/oper.bmp | Bin 4374 -> 0 bytes skins/_old/Rednex/skin.inc | 239 --------------------------- skins/skinlist.lua | 1 - 12 files changed, 17 insertions(+), 280 deletions(-) delete mode 100644 skins/_old/Rednex/RED.DTP delete mode 100644 skins/_old/Rednex/Rednex.asm delete mode 100644 skins/_old/Rednex/Tupfile.lua delete mode 100644 skins/_old/Rednex/active/base.bmp delete mode 100644 skins/_old/Rednex/active/left.bmp delete mode 100644 skins/_old/Rednex/active/oper.bmp delete mode 100644 skins/_old/Rednex/inactive/base.bmp delete mode 100644 skins/_old/Rednex/inactive/left.bmp delete mode 100644 skins/_old/Rednex/inactive/oper.bmp delete mode 100644 skins/_old/Rednex/skin.inc diff --git a/programs/cmm/appearance/appearance.c b/programs/cmm/appearance/appearance.c index 6f4db9ac9..825c230e3 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 e912af8543ec412d472d48d21a5cb66de4b89649..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 40 lcmZQzc)-8_#Xo-hVEFRo3m7XXTwwV2?i&LK2T&R)4**cz5E}ph diff --git a/skins/_old/Rednex/Rednex.asm b/skins/_old/Rednex/Rednex.asm deleted file mode 100644 index 037c82164..000000000 --- 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 4d37eee3c..000000000 --- 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 cd54226dca49d1fe13c3e582d02a529968706e2b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 150 zcmZ?royGtGWfYb^gUJJxqfOr=W?+4-|3`|U? z7?_#QF|e^+W#Htz$-u>RpMj6>F#|vUO9nx~cMPJUUl_#1zB5Ql{$-Go`p+OE^PfRp S{y&3)!hZ&3<^Mo48W;flu^6ZT diff --git a/skins/_old/Rednex/active/left.bmp b/skins/_old/Rednex/active/left.bmp deleted file mode 100644 index 341c1e3c5e5382eb8df65d0a5632f063dc153b45..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 438 zcmY+-u?m7v7{&2VB|!tlKuHl4TzY~YpuKmxuhQ1i77Z;eO$}`gO$|*gO+i!KzGHQ` zU4G}{Uk7LNjVJw?>OIj7bYq>@-y%l8kA|P=>+dlliywU!-O__2pvUdLdWri&`EM7bei4>on?1I=lO%sMe!tbS-uEeRhH0oZ3*2p Ome6f$3Eg#;(0|^R?r2#6 diff --git a/skins/_old/Rednex/active/oper.bmp b/skins/_old/Rednex/active/oper.bmp deleted file mode 100644 index fcea01d9eb1e47b7e49e7cdae11770fccb1f61fc..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4374 zcmdVcK}*7L7{~EP4NDE@3?)TS@X{;j)Tw*#!WZKE=+v!Cw+_<5Ktmxk5cHrRiGh%U zcn}34pMFmHCq8N>4Y%>#*mQ0m$M$E}H({NO=@QEe%vYGtF*}SUQ7b?c^v!2{yqMBN zw&;#%9<=v%3+4yA1@oibg89jA!Th|XREiJVIvdO{n}YV>LyBQo5vHBa*R?Icxf~rf zN<*?N#AS53-ef=EOop;qDio+(rfQYybw{h^>U7+_o@X%djYg-FiN>rm2bn`g_>Z^D zVPpM_8R0AJ5Mb7(Q|#{>kG;d;$zX8Y?;mx$IGUr~re>2G4XV|sQlV0bibcxjXQ##$ zGuR4=O}D!yv!GcaVfJ|HG7Fj&5@xUWU1mYELc;9#f56IT~e|sb+xpcm@>`=2(nn=9vNBZ>&>DnB#Gl lnP=YneM2E(P9#`nL9;@_oJ_LJf@Xz;d0U5lb5>^;$ZxY=k!#k z9@iN>J#R61dEIC5^?k(P=l7f;Fz_WqP|#b3;NVXTp`l+G!ot2YL`3{$h>ZNt5FP!W VAvX3uLtNZ{hWPmZKrz=dKwATYoJKA?wyzMMRg@ANR zr^r^3N$>dDTS7ucRSSs})=Batp zxuFUHOQ%`PJ2SwWUW2L-uuO)V7VNN`O2&c0n6uE T%vWYrXv0>t^M_{_uq6Bh*Foac diff --git a/skins/_old/Rednex/skin.inc b/skins/_old/Rednex/skin.inc deleted file mode 100644 index 81a6bd8f3..000000000 --- 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 6ae108a9d..3c5caeb9c 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",