From 628200ff1e8295c21a7ab1999a57998c4a4e7fc5 Mon Sep 17 00:00:00 2001 From: "Kirill Lipatov (Leency)" Date: Thu, 28 Dec 2017 10:04:00 +0000 Subject: [PATCH] Upload Win10.skn by ConLenov, fix buttons position and name cases git-svn-id: svn://kolibrios.org@7138 a494cfbc-eb01-0410-851d-a64ba20cac60 --- skins/Win10/Tupfile.lua | 2 + skins/Win10/Win10.asm | 31 +++++ skins/Win10/Win10.dtp | Bin 0 -> 40 bytes skins/Win10/Win10.dtp.asm | 10 ++ skins/Win10/Win10.skn | Bin 0 -> 316 bytes skins/Win10/base.bmp | Bin 0 -> 142 bytes skins/Win10/base_1.bmp | Bin 0 -> 142 bytes skins/Win10/build.bat | 4 + skins/Win10/left.bmp | Bin 0 -> 230 bytes skins/Win10/left_1.bmp | Bin 0 -> 230 bytes skins/Win10/me_skin.inc | 235 ++++++++++++++++++++++++++++++++++++++ skins/Win10/oper.bmp | Bin 0 -> 6478 bytes skins/Win10/oper_1.bmp | Bin 0 -> 6126 bytes skins/skinlist.lua | 1 + 14 files changed, 283 insertions(+) create mode 100644 skins/Win10/Tupfile.lua create mode 100644 skins/Win10/Win10.asm create mode 100644 skins/Win10/Win10.dtp create mode 100644 skins/Win10/Win10.dtp.asm create mode 100644 skins/Win10/Win10.skn create mode 100644 skins/Win10/base.bmp create mode 100644 skins/Win10/base_1.bmp create mode 100644 skins/Win10/build.bat create mode 100644 skins/Win10/left.bmp create mode 100644 skins/Win10/left_1.bmp create mode 100644 skins/Win10/me_skin.inc create mode 100644 skins/Win10/oper.bmp create mode 100644 skins/Win10/oper_1.bmp diff --git a/skins/Win10/Tupfile.lua b/skins/Win10/Tupfile.lua new file mode 100644 index 0000000000..a48300b4ce --- /dev/null +++ b/skins/Win10/Tupfile.lua @@ -0,0 +1,2 @@ +if tup.getconfig("NO_FASM") ~= "" then return end +tup.rule("Win10.asm", 'fasm "%f" "%o" ' .. tup.getconfig("KPACK_CMD"), "Win10.skn") diff --git a/skins/Win10/Win10.asm b/skins/Win10/Win10.asm new file mode 100644 index 0000000000..c1ef4b981b --- /dev/null +++ b/skins/Win10/Win10.asm @@ -0,0 +1,31 @@ +include 'me_skin.inc' + +SKIN_PARAMS \ + height = bmp_base.height,\ + margins = [5:1:97:1],\ + colors active = [binner=0xf3f3f3:\ + bouter=0xffffff:\ + bframe=0xf3f3f3],\ + colors inactive = [binner=0xf3f3f3:\ + bouter=0xffffff:\ + bframe=0xf3f3f3],\ + dtp = 'Win10.dtp' + +SKIN_BUTTONS \ + close = [-47:0][45:21],\ + minimize = [-92:0][45:21] + +SKIN_BITMAPS \ + left active = bmp_left,\ + 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' +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' \ No newline at end of file diff --git a/skins/Win10/Win10.dtp b/skins/Win10/Win10.dtp new file mode 100644 index 0000000000000000000000000000000000000000..c7c71259877bf0670223da7570eac491aa00cbc3 GIT binary patch literal 40 icmezW|3AZjApYL#38wk^`58Wc{tU(pQ1JZB76t&)&Jzm& literal 0 HcmV?d00001 diff --git a/skins/Win10/Win10.dtp.asm b/skins/Win10/Win10.dtp.asm new file mode 100644 index 0000000000..73d6b56c7c --- /dev/null +++ b/skins/Win10/Win10.dtp.asm @@ -0,0 +1,10 @@ +frame dd 0xffffff +grab dd 0xffffff +grab_button dd 0x498DF7 +grab_button_text dd 0xffffff +grab_text dd 0x0f0f0f +work dd 0xF3F3F3 +work_button dd 0xf3f3f3 +work_button_text dd 0x000000 +work_text dd 0x000000 +work_graph dd 0xB4CCE7 \ No newline at end of file diff --git a/skins/Win10/Win10.skn b/skins/Win10/Win10.skn new file mode 100644 index 0000000000000000000000000000000000000000..bb416646a8109f92bf27af142723ba7eb00444ca GIT binary patch literal 316 zcmV-C0mJ@FP(w>DGXMYq0000%#gZwsj&&}CIeQq_5y2*d7>JOE1r*L%2(Sr>sNNC- z^9cb(YaOXk7V3?MUCpe_5a~9pS3Jbg3AN(hR~>&)VkcCWXTV? zL@`Z`VTI}UWyGwRy^3;6r5ZGPbH1$`AD^S>cv5>`B~1{fA8fUQkUS7ySj8(%`#`rt z7y1RXezX>VRFE+TBesC~nC)HV49pO2WmUB#nz>cxqf&&eGCl%9BTvdNir{6o2A(Z; zv(HfTcGiqN_-k_oaeY<6aWIb6lSsR2Tjgy-T@IC91`&b#k5<#oyS}WWbTeC~UC#5z zF|>5zJ&<%Ve*CYOl6mC>pT4b{lJfQ|^rrMzoAnD;E|6gP{PTDk62xNV<*8@{9Lu}Z ON1=>|RrNP*a|cjnh?b84 literal 0 HcmV?d00001 diff --git a/skins/Win10/base.bmp b/skins/Win10/base.bmp new file mode 100644 index 0000000000000000000000000000000000000000..f0ecd34e825b4f40ffb8b14e79c08cb8399b816f GIT binary patch literal 142 qcmZ?r?PGudGa#h_#Ed{J2Bsx|Bm+YP5Fg=#V6Xs?`2YVuO)vmHh(%@q literal 0 HcmV?d00001 diff --git a/skins/Win10/base_1.bmp b/skins/Win10/base_1.bmp new file mode 100644 index 0000000000000000000000000000000000000000..f0ecd34e825b4f40ffb8b14e79c08cb8399b816f GIT binary patch literal 142 qcmZ?r?PGudGa#h_#Ed{J2Bsx|Bm+YP5Fg=#V6Xs?`2YVuO)vmHh(%@q literal 0 HcmV?d00001 diff --git a/skins/Win10/build.bat b/skins/Win10/build.bat new file mode 100644 index 0000000000..183bec2c3e --- /dev/null +++ b/skins/Win10/build.bat @@ -0,0 +1,4 @@ +@fasm Win10.dtp.asm Win10.dtp +@fasm Win10.asm Win10.skn +@kpack Win10.skn +@pause \ No newline at end of file diff --git a/skins/Win10/left.bmp b/skins/Win10/left.bmp new file mode 100644 index 0000000000000000000000000000000000000000..35b058a692711feb5e82f415b77f8e01c2dc21b1 GIT binary patch literal 230 scmZ?reZ~L*W 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 +} \ No newline at end of file diff --git a/skins/Win10/oper.bmp b/skins/Win10/oper.bmp new file mode 100644 index 0000000000000000000000000000000000000000..e9dd64e05eb096c5fb2994e850d24f0d396f0901 GIT binary patch literal 6478 zcmeI0F%H5o3`N5QkXTTeSvUa)V23*}vvWc&z`z|?Sy|w#7EzQ&ja@Pz^P?tp9H*&Y z+@$Spe^`Y+ZBcHJkH|~pS?ExP(4qY@m)t8*yqIbPew5LAasP!w=#kObWRTGq9f@Kx zBBK^78sq5y;^=mLo==bAZU`lshI)<0TO5G}T*@#Nl^Qx?;ACkR3Z!$FwPJ?+wxk;#9JaeAXxnT#qMc6`L5U`3qTJB*`@ wOIA&tSIXWP6^Rs;NAGXMYp literal 0 HcmV?d00001 diff --git a/skins/Win10/oper_1.bmp b/skins/Win10/oper_1.bmp new file mode 100644 index 0000000000000000000000000000000000000000..f947d05a0de0c1da11ce724ffcb0ace2bd993f47 GIT binary patch literal 6126 zcmeHK!41P845SP6*>;3Z&;k1I1|1;-c7V>)6;dl!QDqw^I%I?*kRV`l=I-E=`{Q#? zOS{o{rT(OTqJBsh8dG{v{(a=W1ZbE?>(zm&kJgnveONLLPxM6$PlhMj0Ua6dWPhH} zooZ1WaZ)8n2KMt*e5$3asoe~gDu{SLhE%Hf*Hu%B>g>Z47Q(hv8dB-W@6W*g0&cS? zc;pjdcm@K@;~<$8HW{7>-^dV-YR1(?S{e5%c|aRPzL%~bmb0nFndKGkN~IDtUrW~%*z0OoNJ KpK7x#3;Y7~#ZKV> literal 0 HcmV?d00001 diff --git a/skins/skinlist.lua b/skins/skinlist.lua index e397c88f4b..702fea8b97 100644 --- a/skins/skinlist.lua +++ b/skins/skinlist.lua @@ -4,6 +4,7 @@ skinlist = { "Leency/Shkvorka/Shkvorka.skn", "Leency/Blueberries/Blueberries.skn", "loggy/loggy.skn", +"Win10/Win10.skn", "_old/5imple Alpha/1.5imple Alpha/1.5imple Alpha.skn", "_old/5imple Alpha/2.5imple Alpha/2.5imple Alpha.skn", "_old/5imple Alpha/3.5imple Alpha/3.5imple Alpha.skn",