From 2b5d87ce0d9afe413a18e97121a268fc55a5eae0 Mon Sep 17 00:00:00 2001 From: "Kirill Lipatov (Leency)" Date: Sat, 20 Nov 2021 21:35:46 +0000 Subject: [PATCH] clean and fix skins git-svn-id: svn://kolibrios.org@9290 a494cfbc-eb01-0410-851d-a64ba20cac60 --- skins/_old/CodeOpusC/Opus_D.dtp | Bin 40 -> 0 bytes skins/_old/Flyght/FLIGHT.DTP | Bin 40 -> 0 bytes skins/_old/Flyght/Flight.png | Bin 1802 -> 0 bytes skins/_old/Flyght/Flyght.asm | 35 --- skins/_old/Flyght/Tupfile.lua | 2 - skins/_old/Flyght/active/base.bmp | Bin 150 -> 0 bytes skins/_old/Flyght/active/left.bmp | Bin 438 -> 0 bytes skins/_old/Flyght/active/oper.bmp | Bin 4374 -> 0 bytes skins/_old/Flyght/inactive/base.bmp | Bin 150 -> 0 bytes skins/_old/Flyght/inactive/left.bmp | Bin 438 -> 0 bytes skins/_old/Flyght/inactive/oper.bmp | Bin 4374 -> 0 bytes skins/_old/Flyght/skin.inc | 239 ------------------ skins/_old/OpusOs_Blue/OpusOs_Blue.dtp | Bin 40 -> 40 bytes skins/_old/{CodeOpusC => OpusOs_D}/Opus_D.asm | 2 +- skins/_old/OpusOs_D/Opus_D.dtp | Bin 0 -> 40 bytes .../_old/{CodeOpusC => OpusOs_D}/Tupfile.lua | 0 .../{CodeOpusC => OpusOs_D}/active/base.bmp | Bin .../{CodeOpusC => OpusOs_D}/active/left.bmp | Bin .../{CodeOpusC => OpusOs_D}/active/oper.bmp | Bin .../{CodeOpusC => OpusOs_D}/inactive/base.bmp | Bin .../{CodeOpusC => OpusOs_D}/inactive/left.bmp | Bin .../{CodeOpusC => OpusOs_D}/inactive/oper.bmp | Bin skins/_old/{CodeOpusC => OpusOs_D}/skin.inc | 0 skins/_old/blackskin/Tupfile.lua | 2 - skins/_old/blackskin/base.bmp | Bin 582 -> 0 bytes skins/_old/blackskin/base_1.bmp | Bin 582 -> 0 bytes skins/_old/blackskin/build.bat | 2 - skins/_old/blackskin/default.asm | 31 --- skins/_old/blackskin/default.dtp | Bin 40 -> 0 bytes skins/_old/blackskin/left.bmp | Bin 670 -> 0 bytes skins/_old/blackskin/left_1.bmp | Bin 670 -> 0 bytes skins/_old/blackskin/oper.bmp | Bin 2694 -> 0 bytes skins/_old/blackskin/oper_1.bmp | Bin 2694 -> 0 bytes skins/_old/blackskin/skin.inc | 239 ------------------ skins/skinlist.lua | 4 +- 35 files changed, 2 insertions(+), 554 deletions(-) delete mode 100644 skins/_old/CodeOpusC/Opus_D.dtp delete mode 100644 skins/_old/Flyght/FLIGHT.DTP delete mode 100644 skins/_old/Flyght/Flight.png delete mode 100644 skins/_old/Flyght/Flyght.asm delete mode 100644 skins/_old/Flyght/Tupfile.lua delete mode 100644 skins/_old/Flyght/active/base.bmp delete mode 100644 skins/_old/Flyght/active/left.bmp delete mode 100644 skins/_old/Flyght/active/oper.bmp delete mode 100644 skins/_old/Flyght/inactive/base.bmp delete mode 100644 skins/_old/Flyght/inactive/left.bmp delete mode 100644 skins/_old/Flyght/inactive/oper.bmp delete mode 100644 skins/_old/Flyght/skin.inc rename skins/_old/{CodeOpusC => OpusOs_D}/Opus_D.asm (93%) create mode 100644 skins/_old/OpusOs_D/Opus_D.dtp rename skins/_old/{CodeOpusC => OpusOs_D}/Tupfile.lua (100%) rename skins/_old/{CodeOpusC => OpusOs_D}/active/base.bmp (100%) rename skins/_old/{CodeOpusC => OpusOs_D}/active/left.bmp (100%) rename skins/_old/{CodeOpusC => OpusOs_D}/active/oper.bmp (100%) rename skins/_old/{CodeOpusC => OpusOs_D}/inactive/base.bmp (100%) rename skins/_old/{CodeOpusC => OpusOs_D}/inactive/left.bmp (100%) rename skins/_old/{CodeOpusC => OpusOs_D}/inactive/oper.bmp (100%) rename skins/_old/{CodeOpusC => OpusOs_D}/skin.inc (100%) delete mode 100644 skins/_old/blackskin/Tupfile.lua delete mode 100644 skins/_old/blackskin/base.bmp delete mode 100644 skins/_old/blackskin/base_1.bmp delete mode 100644 skins/_old/blackskin/build.bat delete mode 100644 skins/_old/blackskin/default.asm delete mode 100644 skins/_old/blackskin/default.dtp delete mode 100644 skins/_old/blackskin/left.bmp delete mode 100644 skins/_old/blackskin/left_1.bmp delete mode 100644 skins/_old/blackskin/oper.bmp delete mode 100644 skins/_old/blackskin/oper_1.bmp delete mode 100644 skins/_old/blackskin/skin.inc diff --git a/skins/_old/CodeOpusC/Opus_D.dtp b/skins/_old/CodeOpusC/Opus_D.dtp deleted file mode 100644 index a3826ca1ca03392bba0339900272d70a16858f4a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 40 fcmbQ&Ue7QOh)-X;!vF&R|NjTGL1G{_2!PlCd4&;$ diff --git a/skins/_old/Flyght/FLIGHT.DTP b/skins/_old/Flyght/FLIGHT.DTP deleted file mode 100644 index fd459196bdd73e73f8980223452ca6d39517398d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 40 jcmZo@kYi|o;w=~EFx>g@fB{5<#J;`z#=ybB0A>RKO2H3p diff --git a/skins/_old/Flyght/Flight.png b/skins/_old/Flyght/Flight.png deleted file mode 100644 index d6c6315b82960979742a07382dd189a7b8db29f6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1802 zcmZvcdsxz08pnTTSwLRO23OM*uXvv)P0e&1FC?1gLKg(5@q!3uAR-8(Ho9Y`X5PwR zZ8UY%T1!nc*O}2Fr&7tt@Pd{~nTlD2Yk7gnV1Bgg&a=<6f1LB4_w#@eoZ#M|HGDE^qTc2(+ zgc+OM;4h0mBUB{QpT(pkGl0exAsR&6nIH-xr4kv5bY@~Q4KRcttUwOc@W5pHcZ@_b zg$Xq23%x)jZR+R`=em zhJ?V~OE!NwFVkuNJI4$jnvS&A>Dpz^^;S*?)VA2$mT%6K!5K@nF=gMH67qK&da5q6 z^y>zT4_e`ei__S13ZlMS^0UnJ8xdBCIF+`+*^w>NBT{J^Z)iwp1eLq|p0hBXSsSCJ zT$Vmu6BBiUgYWEX6p2|odWPDsvY!2hd{5His9qnt_^VyE--^Izyv7P7%9pFMc~<+N zo9|v%_XYI#ctGXrMfuiKw%!n&5S&vy$J-L4SZe)F(zF~-bU{&+U`5^9;*Am6$W%8$ZrhC1UP`vz&JYz905fox0|3S#+>Knd2`pFay_m52PK?e!RGDc`mP}_GU&5PO>&{ zQEB(P0~Ds13%plhyron<<2WYOB`1`3G;Av=+#jc%kugw-^ltJ=L0+V*BQsLJ^b*T> z4MGfOIyd<8R5ONIKig>7Dktvr@FYT^vXYLH6im;i>_yr$Uc_;UWVkWxoclb~@|;DI zl40`lmig$07Xxl}v;!8`%1ZYKsSSEjDMr7*=NaAA)mNzB6kR2kJuKM4bwa%xX;QNkJKM|n{4}xn#hWi-k0W1y#QuKgksglCz>n?>e+Zm&*C27(#Aes?fo7 z(ea$*m(>RMLc|67`CMW93%+H=c$@Y9GCjo?PYc<-wKb+=Ty6)}!`g0OtZww8P2BUr zd`B#ys{4kpA}TsgUb@e$-ZV+pmO#q3X4k8T6{zwq+cDM503;zKO~;;GVh#VGNEX<* zjbW-!H7h$^UT+px8plNm2G7LdOfE-7?@V23xoaRTJ;FpkGOmFc?9t+dt_Y0G)I;AZ z@9rDg`yuV1zp@iirE~fK(I>w4ZE0>_AlyVBPx=4JUdXFg8(wUvC>c*yRzyQKtbm1% zcLXN$E7z%KV=HW21kgcfR=n1A#(Fz9jmu2L`T2jIZck838YbfueX|ElI#G1&ZTiBv zJpkj`;d9WCDs#Eap*$RyKzd^mP&e%syGlhrPe!FU&%HgV9-W@3 zA5EwO-7@~>$9QUrd%UbkJ`TBTV~h6oU$y2K*$-i1T1P)#tM@9*Tz^Q-`bvLH9sLLq z_0};fYqfY6sH915&iZ++mm$6Fhfc!$2$$652MT>mk;{lHk8?0ib0g+@<+9aZkpfFZ z`~7%z6B2%Qp+5YOvr~(qnX4!Gn^tK4&hxIPIlTTt$Jxws-7j!`y{6o33Ouyy*u-(A z6MvO%*0?8&I>1I84%4RIfiJI!o<4aZIx-50NlHqxe#Nf0R}sRllQS*1{n=4_-kX$o zz%rVo4- Q;3a_&)Zw6(fS4ct01}2cy8r+H diff --git a/skins/_old/Flyght/Flyght.asm b/skins/_old/Flyght/Flyght.asm deleted file mode 100644 index 3c15958439..0000000000 --- a/skins/_old/Flyght/Flyght.asm +++ /dev/null @@ -1,35 +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=0x000000:\ ; border inner color - bouter=0x000000:\ ; border outer color - bframe=0x008080],\ ; border frame color - colors inactive = [binner=0x000000:\ ; border inner color - bouter=0x000000:\ ; border outer color - bframe=0x575E5E],\ ; border frame color - dtp = 'FLIGHT.DTP' ; dtp colors - -SKIN_BUTTONS \ - close = [-29:1][24:19],\ ; buttons coordinates - minimize = [-53:1][24:19] ; [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/Flyght/Tupfile.lua b/skins/_old/Flyght/Tupfile.lua deleted file mode 100644 index 17780fd6ba..0000000000 --- a/skins/_old/Flyght/Tupfile.lua +++ /dev/null @@ -1,2 +0,0 @@ -if tup.getconfig("NO_FASM") ~= "" then return end -tup.rule("Flyght.asm", 'fasm "%f" "%o" ' .. tup.getconfig("KPACK_CMD"), "Flyght.skn") diff --git a/skins/_old/Flyght/active/base.bmp b/skins/_old/Flyght/active/base.bmp deleted file mode 100644 index 8af904709599a947e26ebd6a74c823a360f47ab2..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 150 zcmZ?royGtGW(2iAbwYuI2?iaZEd`81meT(12RCMstSQX{L)ec0`Ut95D3K2%tRn; ze025b=Aqk%?jE>ffeeuOaL)i4AU@o)Kn92p4-6m!#D@nKkOAVu0~5#q@lgN(6IyF_ diff --git a/skins/_old/Flyght/active/oper.bmp b/skins/_old/Flyght/active/oper.bmp deleted file mode 100644 index 7d211935542c3236d1be4f0439662fd785ce4e43..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4374 zcmdUyu}%U(5Qfj%n5czXTH4uJSy|8-Itmji3qnUjLa3-HNC=g|#s*4aLhUP9@CX=R zWc-)OO>SrB7QAh^$$yub|7K@DK#$|;`RXFu#RJZFI397_;5gZxv+U$+HR}JAM574 zY^%th!<-m49-o%wpw|hLBeWQkSL3{Ysula zi4w)k?GG~4&O@%|M%b(%QOb8>F@fJ9N)$79mSm{23w6mfm!u$3nh!|u2SkZt=D{Z= zN{BDNza%rTN1O{)Q+~%)I%fL@7v=<_}oj O?s(2c$m5~<7s($|OdMYT diff --git a/skins/_old/Flyght/inactive/base.bmp b/skins/_old/Flyght/inactive/base.bmp deleted file mode 100644 index a5d8262b917f0749d39c32df7b8d60c0317b725c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 150 zcmZ?royGtGW+1%_AT~%0BnMIhQVY@p(hD*JWERLw5C8yQ%N;HN diff --git a/skins/_old/Flyght/inactive/left.bmp b/skins/_old/Flyght/inactive/left.bmp deleted file mode 100644 index 94554df9af48fdcb1f6a60b46b4dd4219342bd3a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 438 zcmZvYEe^s!5QVn_g+p-!PQU>wP;5wOQc|;S6;(}e6$o5CuGipvyw}n%fiQWqdEd-t zf2NGDB22N@x>K%{TV*k=A>7s9tmjmDiIgt0K8107BA15Yfy{k>L*}l#B6HhjWX?Gu zGxy1uo92wnb$vqSsyZTbj0g0O*(~Eehsl_^Ove2C9v&;>KA({>^H~`)!;mpEEEzMy IlrewB8*&(NM*si- diff --git a/skins/_old/Flyght/inactive/oper.bmp b/skins/_old/Flyght/inactive/oper.bmp deleted file mode 100644 index 5fef8b0722a1a199610822196e72245a4a3a2564..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4374 zcmdUyu}fP~7{#x%i*}Iy3H}96P8~Wm1Qa3}%oaLSC>7etv0HYxj1m+P?V`98N+}eF z(xr1LE>cTPh**Sxzn4o6*L&{^=H3qG`zy7rB*xy^yD>8jUpzQn%aN(*-iOTJNU|WZv3(J6$02=H{z0U?8DF!vqtyggz+f z8yn3su=?ffECHS^?dv!165#pRoQTb4BMO!h(rSyGAqi=c-Csw5a>GElH&NW<;~OD@#x1JU5biqM|Ts_uCBfa zf$n9nhGXvD{6jM1roTweQbbsC6Vg^H&qJVl8RS_;y!r8&?Wbq0Jg%rBjJXNDR!it% zhDjAg(&-+t1G;;wY8g;42(A0Ei=$7PFr2qxbaa&18Sc?lE3&F!5L)-^Esp;C>M9eM zP&=LdGF0zZ*%&4Y2BCEyBjV_n-EJl@p*p(WJ2&lb9$Ngw}mri=+SP^)i78 zwYPs1VtrIv8VT!CL@-e>2(A7nx&-}izn=+AsKXD(Azlv4)1x9Yn0VQuFG!4K24;Ja z*qD>kkD0*44M|(}zSq0C$wZOZm`|U-W&#s8ByIGCAN~6FHWQdo-@gCI1SW1s+UO4} i^nZgvCNQCXonK@E6E`Gn^apHl*kdX; 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/_old/OpusOs_Blue/OpusOs_Blue.dtp b/skins/_old/OpusOs_Blue/OpusOs_Blue.dtp index 2ceb6675ab5a7282dd2333a2e947da46d4c2c556..9fd60e8bd2686e1f468fc8099f2836835681fc2c 100644 GIT binary patch literal 40 pcmbPT7SAvnh)*8a$ng93Z-)Q>|1&&!^_Jn=w{HwEFt0j`0RX5b5-9)x literal 40 mcmbPT7SAvnh@ZZE!%)&af#LuE{|rxFy=8dz;xz*dfaC#>co7Q# diff --git a/skins/_old/CodeOpusC/Opus_D.asm b/skins/_old/OpusOs_D/Opus_D.asm similarity index 93% rename from skins/_old/CodeOpusC/Opus_D.asm rename to skins/_old/OpusOs_D/Opus_D.asm index 0136eaafd8..a3bf0f7fbd 100644 --- a/skins/_old/CodeOpusC/Opus_D.asm +++ b/skins/_old/OpusOs_D/Opus_D.asm @@ -2,7 +2,7 @@ include 'skin.inc' SKIN_PARAMS \ height = bmp_base.height,\ ; skin height - margins = [8:3:10:2],\ ; margins [left:top:right:bottom] + margins = [8:2:10:2],\ ; margins [left:top:right:bottom] colors active = [binner=0xDCD6CB:\ ; border inner color bouter=0x948B7B:\ ; border outer color bframe=0xDCD6CB],\ ; border frame color diff --git a/skins/_old/OpusOs_D/Opus_D.dtp b/skins/_old/OpusOs_D/Opus_D.dtp new file mode 100644 index 0000000000000000000000000000000000000000..92dfb5cf75ff6337020b427ef6ce3ec24b71a6b9 GIT binary patch literal 40 scmZomk6`%s?;pd?y+;|IzI?;*@!cDS^Vjb(ENia-i!%U0U0odm0M@t^oB#j- literal 0 HcmV?d00001 diff --git a/skins/_old/CodeOpusC/Tupfile.lua b/skins/_old/OpusOs_D/Tupfile.lua similarity index 100% rename from skins/_old/CodeOpusC/Tupfile.lua rename to skins/_old/OpusOs_D/Tupfile.lua diff --git a/skins/_old/CodeOpusC/active/base.bmp b/skins/_old/OpusOs_D/active/base.bmp similarity index 100% rename from skins/_old/CodeOpusC/active/base.bmp rename to skins/_old/OpusOs_D/active/base.bmp diff --git a/skins/_old/CodeOpusC/active/left.bmp b/skins/_old/OpusOs_D/active/left.bmp similarity index 100% rename from skins/_old/CodeOpusC/active/left.bmp rename to skins/_old/OpusOs_D/active/left.bmp diff --git a/skins/_old/CodeOpusC/active/oper.bmp b/skins/_old/OpusOs_D/active/oper.bmp similarity index 100% rename from skins/_old/CodeOpusC/active/oper.bmp rename to skins/_old/OpusOs_D/active/oper.bmp diff --git a/skins/_old/CodeOpusC/inactive/base.bmp b/skins/_old/OpusOs_D/inactive/base.bmp similarity index 100% rename from skins/_old/CodeOpusC/inactive/base.bmp rename to skins/_old/OpusOs_D/inactive/base.bmp diff --git a/skins/_old/CodeOpusC/inactive/left.bmp b/skins/_old/OpusOs_D/inactive/left.bmp similarity index 100% rename from skins/_old/CodeOpusC/inactive/left.bmp rename to skins/_old/OpusOs_D/inactive/left.bmp diff --git a/skins/_old/CodeOpusC/inactive/oper.bmp b/skins/_old/OpusOs_D/inactive/oper.bmp similarity index 100% rename from skins/_old/CodeOpusC/inactive/oper.bmp rename to skins/_old/OpusOs_D/inactive/oper.bmp diff --git a/skins/_old/CodeOpusC/skin.inc b/skins/_old/OpusOs_D/skin.inc similarity index 100% rename from skins/_old/CodeOpusC/skin.inc rename to skins/_old/OpusOs_D/skin.inc diff --git a/skins/_old/blackskin/Tupfile.lua b/skins/_old/blackskin/Tupfile.lua deleted file mode 100644 index be45bac4ae..0000000000 --- a/skins/_old/blackskin/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"), "blackskin.skn") diff --git a/skins/_old/blackskin/base.bmp b/skins/_old/blackskin/base.bmp deleted file mode 100644 index fbc6c4d031539466c5dcba6d857d86d2d1449c28..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 582 zcmZ?rbz@=x12Z700mK|YEC$4k3=%++fk6N$e}oT$!2&?S3$v6OxXg31@YQsBw diff --git a/skins/_old/blackskin/base_1.bmp b/skins/_old/blackskin/base_1.bmp deleted file mode 100644 index d0ad2cded4c0c1baad09b6762bc017533d1ca9da..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 582 zcmZ?rbz@=x12Z700mK|YEC$4k3=%++fk6N$e}oT$!2)=Q+EGB&5U9riR^R}eaDWXY Lg7r86uBZn9xjzL0 diff --git a/skins/_old/blackskin/build.bat b/skins/_old/blackskin/build.bat deleted file mode 100644 index 2828114c6b..0000000000 --- a/skins/_old/blackskin/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/blackskin/default.asm b/skins/_old/blackskin/default.asm deleted file mode 100644 index 0e7a062ab6..0000000000 --- a/skins/_old/blackskin/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=0x363636:\ ; border inner color - bouter=0x363636:\ ; border outer color - bframe=0x000000],\ ; border frame color - colors inactive = [binner=0x000000:\ ; border inner color - bouter=0x000000:\ ; border outer color - bframe=0x7D7D7D],\ ; 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_1.bmp' -BITMAP bmp_oper1,'oper_1.bmp' -BITMAP bmp_base1,'base_1.bmp' diff --git a/skins/_old/blackskin/default.dtp b/skins/_old/blackskin/default.dtp deleted file mode 100644 index b247fde937e21f23e222f2a5dde2bc9f828df292..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 40 jcmeC`>SE}E;vYYLFo5u>Q>Pfp%F4iO1|X=as$u{Dp-&RQ diff --git a/skins/_old/blackskin/left.bmp b/skins/_old/blackskin/left.bmp deleted file mode 100644 index 792e31d81927972c027e554494b8f93b8967d5ec..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 670 zcmZ?royWug24+A~1Bf|+SPY0686X;sAu?l5qf#K3sqS06HN^G5`Po diff --git a/skins/_old/blackskin/left_1.bmp b/skins/_old/blackskin/left_1.bmp deleted file mode 100644 index 892f09c1975c1ca44e3cb0e64de4ea1bcaeaa229..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 670 zcmZ?royWug24+A~1Bf|+SPY0686Tv*&nJaJrklZF503^2o2OuQ39tQyF!wCSC5(*dq diff --git a/skins/_old/blackskin/oper.bmp b/skins/_old/blackskin/oper.bmp deleted file mode 100644 index 9bd793d6bf7e6afc97457d64c718bf1e93b01290..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2694 zcmc(dF>b>!3`JESQ-+R3Z_q3rvg80=g906TgCanV;VDP(iF&W}OJDw=DHu=yOCcng zB0u>cS)X6GeMok~dcgd^e8YSR?^r|lM*i=WGX=1mdf5z&MEO0P=W_33cxdou9x8#@ z8qe#3R#5s9%PBQw#EBgj*>boh>OhBjr_okfRWaqc({L|_n$S@PI_#{V73b76Am{{+ zYpd3Lb+8T*wuBL!f^1fhdseM*R@DLd=Yl%~rabCogr=wIet*k-J?gI(|Cg^yAhyPN zUC;`0Ut&4ACXYC=<06|c*F+uYQ13K)R900?d2ZLdvZW?;)PW8=D`>?r)inq@f#ce$ zK3^TILxe411XD05F&_uvqE)1%%j2LFkT@*YqI2k|+=%A&NP}~_zvSu_%h9mo&FkK2 zjz+}VAotlp+25i2xW{5c2Wr_W_D|m_pvdNERk2p{o{J3~F2UfS=)>)rzUogl$ymix p+_u=z=N=4BaZ#%(){2XG`ML!w*Hg(Vp5)rdG(Nf4$&K7!oo^CdMsNTC diff --git a/skins/_old/blackskin/skin.inc b/skins/_old/blackskin/skin.inc deleted file mode 100644 index 81a6bd8f3f..0000000000 --- a/skins/_old/blackskin/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 3211185dfa..15e37af253 100644 --- a/skins/skinlist.lua +++ b/skins/skinlist.lua @@ -27,15 +27,13 @@ skinlist = { "_old/5imple Alpha/2.5imple Alpha/Simple Alpha.skn", "_old/black-glass/black-glass/black-glass.skn", "_old/black-glass/black-glass_light/black-glass_light.skn", -"_old/blackskin/blackskin.skn", "_old/Black_lace/2.Black_lace/Black_lace.skn", -"_old/CodeOpusC/Opus_D.skn", +"_old/OpusOs_D/Opus_D.skn", "_old/Cyclops/1.Cyclops/1.Cyclops.skn", "_old/dark_night/dark_night.skn", "_old/Eyes/Eyes.skn", "_old/falloutskn/falloutskn.skn", "_old/first_skin/first_skin.skn", -"_old/Flyght/Flyght.skn", "_old/gliteskin/gliteskin_deepsky/gliteskin_deepsky.skn", "_old/gliteskin/gliteskin_red/gliteskin_red.skn", "_old/gnome_style/gnome_green/gnome_green.skn",