From 4f2c3778d627ee84e34650fb33201280eff60c07 Mon Sep 17 00:00:00 2001 From: "Kirill Lipatov (Leency)" Date: Sun, 10 Mar 2019 21:03:36 +0000 Subject: [PATCH] delete panther skin duplication git-svn-id: svn://kolibrios.org@7595 a494cfbc-eb01-0410-851d-a64ba20cac60 --- skins/_old/StyleXP/panther/Tupfile.lua | 2 +- skins/_old/panther/Tupfile.lua | 2 - skins/_old/panther/base.bmp | Bin 582 -> 0 bytes skins/_old/panther/build.bat | 2 - skins/_old/panther/default.asm | 31 ---- skins/_old/panther/default.dtp | Bin 40 -> 0 bytes skins/_old/panther/default.dtp.asm | 14 -- skins/_old/panther/left.bmp | Bin 670 -> 0 bytes skins/_old/panther/oper.bmp | Bin 2694 -> 0 bytes skins/_old/panther/oper_1.bmp | Bin 2694 -> 0 bytes skins/_old/panther/panther.txt | 4 - skins/_old/panther/skin.inc | 239 ------------------------- skins/skinlist.lua | 3 +- 13 files changed, 2 insertions(+), 295 deletions(-) delete mode 100644 skins/_old/panther/Tupfile.lua delete mode 100644 skins/_old/panther/base.bmp delete mode 100644 skins/_old/panther/build.bat delete mode 100644 skins/_old/panther/default.asm delete mode 100644 skins/_old/panther/default.dtp delete mode 100644 skins/_old/panther/default.dtp.asm delete mode 100644 skins/_old/panther/left.bmp delete mode 100644 skins/_old/panther/oper.bmp delete mode 100644 skins/_old/panther/oper_1.bmp delete mode 100644 skins/_old/panther/panther.txt delete mode 100644 skins/_old/panther/skin.inc diff --git a/skins/_old/StyleXP/panther/Tupfile.lua b/skins/_old/StyleXP/panther/Tupfile.lua index d8c6cb6180..767b7b4853 100644 --- a/skins/_old/StyleXP/panther/Tupfile.lua +++ b/skins/_old/StyleXP/panther/Tupfile.lua @@ -1,2 +1,2 @@ if tup.getconfig("NO_FASM") ~= "" then return end -tup.rule("default.asm", 'fasm "%f" "%o" ' .. tup.getconfig("KPACK_CMD"), "StyleXP_panther.skn") +tup.rule("default.asm", 'fasm "%f" "%o" ' .. tup.getconfig("KPACK_CMD"), "panther.skn") diff --git a/skins/_old/panther/Tupfile.lua b/skins/_old/panther/Tupfile.lua deleted file mode 100644 index 767b7b4853..0000000000 --- a/skins/_old/panther/Tupfile.lua +++ /dev/null @@ -1,2 +0,0 @@ -if tup.getconfig("NO_FASM") ~= "" then return end -tup.rule("default.asm", 'fasm "%f" "%o" ' .. tup.getconfig("KPACK_CMD"), "panther.skn") diff --git a/skins/_old/panther/base.bmp b/skins/_old/panther/base.bmp deleted file mode 100644 index 93df8952256a4669022628af9b64694fbd86bb54..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 582 zcmZ?rbz@=x12Z700mK|YEC$4k3=%++fk6N$e}oT$!2&>H6%KF;2RK6_IFAEd!~rhj s0M~GU8#usC9N;z%a2E%-j{`iw0UqH1k8yw}IKVS1ffqOcj%Z&60O4A_A^-pY diff --git a/skins/_old/panther/build.bat b/skins/_old/panther/build.bat deleted file mode 100644 index 2828114c6b..0000000000 --- a/skins/_old/panther/build.bat +++ /dev/null @@ -1,2 +0,0 @@ -fasm default.asm default.skn -pause \ No newline at end of file diff --git a/skins/_old/panther/default.asm b/skins/_old/panther/default.asm deleted file mode 100644 index b7fc1748ae..0000000000 --- a/skins/_old/panther/default.asm +++ /dev/null @@ -1,31 +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=0xAAAAAA:\ ; border inner color - bouter=0xAAAAAA:\ ; border outer color - bframe=0xCACACA],\ ; border frame color - colors inactive = [binner=0xAAAAAA:\ ; border inner color - bouter=0xAAAAAA:\ ; border outer color - bframe=0xCACACA],\ ; border frame color - dtp = 'default.dtp' ; dtp colors - -SKIN_BUTTONS \ - close = [-21:3][16:16],\ ; buttons coordinates - minimize = [-39:3][16:16] ; [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.bmp' ; skin bitmaps -BITMAP bmp_oper ,'oper.bmp' -BITMAP bmp_base ,'base.bmp' -BITMAP bmp_left1,'left.bmp' -BITMAP bmp_oper1,'oper_1.bmp' -BITMAP bmp_base1,'base.bmp' diff --git a/skins/_old/panther/default.dtp b/skins/_old/panther/default.dtp deleted file mode 100644 index dd4d173c12249200a31f98b4ffcf5164950bf1f7..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 40 ecmZ3rY8At&Q>PftoH@e)120~@0E@x+AQ}Kd2@BT% diff --git a/skins/_old/panther/default.dtp.asm b/skins/_old/panther/default.dtp.asm deleted file mode 100644 index 588ae5a5e4..0000000000 --- a/skins/_old/panther/default.dtp.asm +++ /dev/null @@ -1,14 +0,0 @@ -struc system_colors - { - .frame dd 0xAAAAAA - .grab dd 0xCACACA - .grab_button dd 0xCCCCCC - .grab_button_text dd 0x000000 - .grab_text dd 0x000000 - .work dd 0xE8E8E8 - .work_button dd 0xCACACA - .work_button_text dd 0x000000 - .work_text dd 0x000000 - .work_graph dd 0x000000 - } -struct system_colors \ No newline at end of file diff --git a/skins/_old/panther/left.bmp b/skins/_old/panther/left.bmp deleted file mode 100644 index 7e2c8687f308f04aa4db94faa9f6466d8ef207f4..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 670 zcmbu%K?;IU6h`4|GbawiCA0z;;Jkgbsuu9p;YfmrAPkYDL|R7oe@K1XK-AU{N0W9jr diff --git a/skins/_old/panther/oper.bmp b/skins/_old/panther/oper.bmp deleted file mode 100644 index 8437e6d0b3552c7256143cbe69c695f1041add47..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2694 zcmc&$c}&xH9K~e&W6QEF8*___*PtzQi-`~sK`clo1(DNvq65b^P7e+_S~QibrbUfT zqNsr4G1Q456I__nI+$8$Y3W_A(qTI&M?K2Imh81(O0?U*W1qa==l9`|Jaz-EZno-?qi_&+9cuR8;JtgcGR;M zR<&Av@1|W^uVkVZN|FcTU?i z`Mh2BvOFET(NrItziC5#38%Y}-!B9}AYo#J07<^wtxqjA7wdfeGm=u9dEY8e*BSuc z2^AzvjI7VbU(ORw?#g7ciLtR8_21L>1;#z95KMHGPdpY_M1YM}tjlDPDbh2iuvUaNKk`0v?|2SFm*Pc8hg~~y|X$$M*?#ReUmqhB96zF$* zcbfis_LG|jM}I1LDg;0vVfr?7_As=}gmNh!bO9y&K+@f)qtSIfr^QsSU zj+#wIvPC+%+o$gjPY9))VJ-hPiy_L}q7r;La3+1|JOBa-)2BV#{Va=>6xyTj$DbK$ zP~Xd3n@(NYvYOc)x2bn$ieVpnw17L2$DII4Oc{#X)Uzf;PIGSw3CbAI_mVBr$z6?F zOO5@+t1jI0Uc#~mDZ%302u1NmH6H+hgozOXv}k&dcDmFmjTbd-;ev)0z8#@qs;G_q zJ9Zg%B^wiyjUbTgSW4fOod_VN*6JL4wl}#eQ*_fdxYKKbX}3Q2_#qA_ydS2n>c|8@ zAYsy);^^lYvOQ3iy?sOhjP7;e>h;mO$e13GfFS8|pH4be zhyb0Mj4;_Eo!nK(mCS8{i+M}wSJ!(t?N}w;9nzk|ddLPqAYo#Jz-QYT2>00wKR^g0 z<=r`_++3Ue14I!qir8(^t?|mu@yeL(()BU2fYlv~T$|r>sbmJFB22bOCwK9|GxIZD z6JBREf0Zsio*_E6TYNmN%LWigm|-nnzyHN+i0O2?etT&&nw;E&Z@3h!@o!BVn97YV`nbOD=0>SZxb9d$E-?@MP_x4{* zLg6p~0tpi%1Q459A!PdV8f+zzNQ!u6?jiHn<_DGDF0GYZ1wbHS7V%0Eum@jh__{sJ z6VNGJ)-iZo&Yg2-Bmf8`OpFkCWx+1U-62OwrP9k+E+wTWu8dsf!I}?%K*Gexk#c^^ zB+`plE~TYrGgimDFWC%$K*GexIc?WYcj5K)^+~&A58B%9wzdKwkTCysea7tT?eCIy nK4@$Ix%Dmp0ts^_;6(m;*D3HHNpct8&$C?QF8b^j{;&HRz0?Et diff --git a/skins/_old/panther/oper_1.bmp b/skins/_old/panther/oper_1.bmp deleted file mode 100644 index 73612e3f5c0fc25559c056ff67510ceea91d5b98..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2694 zcmc(hTTIhX7{~EZ9@NBmi3y0&WK6|)2@53XoQNhGGl3Xh)L~-0jX7{QC*GnAqJY_m z-~~yTaw+$1ZI*wuv2sv2NkXV~;b6Pd0J>)AOC4_WSjh)AXU+ z_EaV&(BXiZ3I+>|#bC@ySPE)F!d`H{cOD${1yI`Kl@GB1A@Igl@tdLdW8Cw9y@pt# z6lFt4>sp!x3MIc*$yX>2DU>&xTkRu`sR$M8nmse1;C@YXLZMJc=Zl=PmHFD|GQ@nz zHCo|xmRc=&&t7bo$+ev?Lz6++`Dy6u_aEBuTJ^E&I=GRvQIqKpcq3Lg9LmKx#0V$*%!~4l@d}(Chd6uU6G137c|yeEk0LLKi6-r%q2sB-0VGKV0Yt z^7SO|jd!{5-qmX5xZgKShZzM~=*2K>U!gRqT*qnma5bL%0e|68@CY$=*fj;VpZCGH z`KgrKCp zv2Hq(FPk>)kc^_JjSe#kvd|0Oc^a>Hk@WMjN=HhKJ+0BjQMtKKh^!7zhRU7Rh_ATr zSW;nMB>l9GchZUs+UYQ(APc?bAtXOnJYUeY@VuQ><={19*)7EGhi-7>v=G@1?$m1A z{0sI42Ve1X#e)dqq{EDY?2q?s8#!AhPt2^(s=-RsUXjLK^3*5RdPLf>Vy$1K9xGA% zGHdX;oLlG0%25<`(HUk$K^A&(0@FNGv)3QpTKc)oGJUsi;w-4|@oPu$UsH}sQ_ zt>J9RK!|Dybjpb%pg9^?D?tL#em;ln$dL zHwKee%5K!w4kHL?{uyQzz@gVo$7nQGRV!ArMZ7$f{0?%z%h%N9xzd1e_qMUv;%nCw zp9}`r`Dq}S`aySsaOdis0c4Vq1(4(Dvy@9V#%{`CI-ynnTVUSHe;y`aWF;J@x0R$5XO diff --git a/skins/_old/panther/panther.txt b/skins/_old/panther/panther.txt deleted file mode 100644 index 440133a901..0000000000 --- a/skins/_old/panther/panther.txt +++ /dev/null @@ -1,4 +0,0 @@ -STYLE XP -Panther theme for KolibriOS - -Author: Aqwas andrew_qs@bk.ru \ No newline at end of file diff --git a/skins/_old/panther/skin.inc b/skins/_old/panther/skin.inc deleted file mode 100644 index 81a6bd8f3f..0000000000 --- a/skins/_old/panther/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 ac2ae07405..9167733eec 100644 --- a/skins/skinlist.lua +++ b/skins/skinlist.lua @@ -128,7 +128,6 @@ skinlist = { "_old/Orange_aureole/Orange_aureole.skn", "_old/Orange_Silence/Orange_Silence.skn", "_old/Organics/Organics.skn", -"_old/panther/panther.skn", "_old/plum/plum.skn", "_old/Rednex/Rednex.skn", "_old/RoboTech/BRoboTech/BRoboTech.skn", @@ -151,7 +150,7 @@ skinlist = { "_old/StyleVista/vista_basic_black/vista_basic_black.skn", "_old/StyleVista/vista_dark/vista_dark.skn", "_old/StyleXP/orqua/orqua.skn", -"_old/StyleXP/panther/StyleXP_panther.skn", +"_old/StyleXP/panther/panther.skn", "_old/StyleXP/wmpx/wmpx.skn", "_old/subsilv/subsilv.skn", "_old/Syllable/Syllable.skn",