diff --git a/skins/Leency/KNX/Tupfile.lua b/skins/Leency/KNX/Tupfile.lua deleted file mode 100644 index bea716f2dd..0000000000 --- a/skins/Leency/KNX/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"), "KNX.skn") diff --git a/skins/Leency/KNX/build.bat b/skins/Leency/KNX/build.bat deleted file mode 100644 index 4da7975657..0000000000 --- a/skins/Leency/KNX/build.bat +++ /dev/null @@ -1,4 +0,0 @@ -@fasm default.dtp.asm default.dtp -@fasm default.asm default.skn -@kpack default.skn -@pause \ No newline at end of file diff --git a/skins/Leency/KNX/center1.bmp b/skins/Leency/KNX/center1.bmp deleted file mode 100644 index 4126a9357b..0000000000 Binary files a/skins/Leency/KNX/center1.bmp and /dev/null differ diff --git a/skins/Leency/KNX/center2.bmp b/skins/Leency/KNX/center2.bmp deleted file mode 100644 index 5c662e053a..0000000000 Binary files a/skins/Leency/KNX/center2.bmp and /dev/null differ diff --git a/skins/Leency/KNX/default.asm b/skins/Leency/KNX/default.asm deleted file mode 100644 index a32e3e7d7c..0000000000 --- a/skins/Leency/KNX/default.asm +++ /dev/null @@ -1,31 +0,0 @@ -include '../skin.inc' - -SKIN_PARAMS \ - height = bmp_center1.height,\ ; skin height - margins = [6:5:43:3],\ ; margins [left:top:right:bottom] - colors active = [binner=0xDDD7CF:\ ; border inner - bouter=0x343434:\ ; border outer - bframe=0xDDD7CF],\ ; border middle - colors inactive = [binner=0xDDD7CF:\ ; border inner - bouter=0x343434:\ ; border outer - bframe=0xDDD7CF],\ ; border middle - dtp = 'default.dtp' ; dtp colors - -SKIN_BUTTONS \ - close = [-33:4][29:19],\ ; buttons coordinates - minimize = [-62:4][29:19] ; [left:top][width:height] - -SKIN_BITMAPS \ - left active = bmp_left1,\ ; skin bitmaps pointers - left inactive = bmp_left2,\ - oper active = bmp_right1,\ - oper inactive = bmp_right2,\ - base active = bmp_center1,\ - base inactive = bmp_center2 - -BITMAP bmp_left1, 'left1.bmp' ; skin bitmaps -BITMAP bmp_left2, 'left2.bmp' -BITMAP bmp_right1, 'right1.bmp' -BITMAP bmp_right2, 'right2.bmp' -BITMAP bmp_center1,'center1.bmp' -BITMAP bmp_center2,'center2.bmp' diff --git a/skins/Leency/KNX/default.dtp b/skins/Leency/KNX/default.dtp deleted file mode 100644 index 1a2e2b5ed8..0000000000 Binary files a/skins/Leency/KNX/default.dtp and /dev/null differ diff --git a/skins/Leency/KNX/default.dtp.asm b/skins/Leency/KNX/default.dtp.asm deleted file mode 100644 index 49e614fa90..0000000000 --- a/skins/Leency/KNX/default.dtp.asm +++ /dev/null @@ -1,14 +0,0 @@ -struc system_colors - { - .taskbar dd 0x586786 - .taskbar_text dd 0xFEFEFE - .work_3d_dark dd 0xC0BBB4 - .work_3d_light dd 0xECE9E5 - .window_title dd 0xFFFfff - .work dd 0xDDD7CF - .work_button dd 0x999999 - .work_button_text dd 0xFEFEFE - .work_text dd 0x000000 - .work_graph dd 0x7E7E7E - } -struct system_colors \ No newline at end of file diff --git a/skins/Leency/KNX/left1.bmp b/skins/Leency/KNX/left1.bmp deleted file mode 100644 index c9351513ca..0000000000 Binary files a/skins/Leency/KNX/left1.bmp and /dev/null differ diff --git a/skins/Leency/KNX/left2.bmp b/skins/Leency/KNX/left2.bmp deleted file mode 100644 index 5cf4c3f01d..0000000000 Binary files a/skins/Leency/KNX/left2.bmp and /dev/null differ diff --git a/skins/Leency/KNX/right1.bmp b/skins/Leency/KNX/right1.bmp deleted file mode 100644 index 5e83529d89..0000000000 Binary files a/skins/Leency/KNX/right1.bmp and /dev/null differ diff --git a/skins/Leency/KNX/right2.bmp b/skins/Leency/KNX/right2.bmp deleted file mode 100644 index 612bae419b..0000000000 Binary files a/skins/Leency/KNX/right2.bmp and /dev/null differ diff --git a/skins/_old/Leency/Latte/Tupfile.lua b/skins/Leency/Latte/Tupfile.lua similarity index 100% rename from skins/_old/Leency/Latte/Tupfile.lua rename to skins/Leency/Latte/Tupfile.lua diff --git a/skins/Leency/Latte/build.bat b/skins/Leency/Latte/build.bat new file mode 100644 index 0000000000..04141da69f --- /dev/null +++ b/skins/Leency/Latte/build.bat @@ -0,0 +1,3 @@ +delete default.skn +fasm default.dtp.asm default.dtp +fasm default.asm default.skn \ No newline at end of file diff --git a/skins/Leency/Latte/center1.bmp b/skins/Leency/Latte/center1.bmp new file mode 100644 index 0000000000..4f5cb9ff5a Binary files /dev/null and b/skins/Leency/Latte/center1.bmp differ diff --git a/skins/_old/Leency/Latte/center2.bmp b/skins/Leency/Latte/center2.bmp similarity index 100% rename from skins/_old/Leency/Latte/center2.bmp rename to skins/Leency/Latte/center2.bmp diff --git a/skins/_old/Leency/Latte/default.asm b/skins/Leency/Latte/default.asm similarity index 72% rename from skins/_old/Leency/Latte/default.asm rename to skins/Leency/Latte/default.asm index b15a962563..f8c3ec67a5 100644 --- a/skins/_old/Leency/Latte/default.asm +++ b/skins/Leency/Latte/default.asm @@ -2,13 +2,13 @@ include '..\skin.inc' SKIN_PARAMS \ height = bmp_center1.height,\ ; skin height - margins = [5:1:43:1],\ ; margins [left:top:right:bottom] - colors active = [binner=0xE1E1E1:\ ; border inner color + margins = [5:6:40:4],\ ; margins [left:top:right:bottom] + colors active = [binner=0xCACACA:\ ; border inner color bouter=0xA1A1A1:\ ; border outer color - bframe=0xE1E1E1],\ ; border frame color - colors inactive = [binner=0xE1E1E1:\ ; border inner color + bframe=0xCACACA],\ ; border frame color + colors inactive = [binner=0xCACACA:\ ; border inner color bouter=0xA1A1A1:\ ; border outer color - bframe=0xE1E1E1],\ ; border frame color + bframe=0xCACACA],\ ; border frame color dtp = 'default.dtp' ; dtp colors SKIN_BUTTONS \ diff --git a/skins/Leency/Latte/default.dtp b/skins/Leency/Latte/default.dtp new file mode 100644 index 0000000000..db4d2cd941 Binary files /dev/null and b/skins/Leency/Latte/default.dtp differ diff --git a/skins/_old/Leency/Latte/default.dtp.asm b/skins/Leency/Latte/default.dtp.asm similarity index 70% rename from skins/_old/Leency/Latte/default.dtp.asm rename to skins/Leency/Latte/default.dtp.asm index 6815087c93..e22c9e9eb5 100644 --- a/skins/_old/Leency/Latte/default.dtp.asm +++ b/skins/Leency/Latte/default.dtp.asm @@ -4,11 +4,11 @@ struc system_colors .grab dd 0x0077b0 .grab_button dd 0xc0c0c0 .grab_button_text dd 0x000000 -.grab_text dd 0xFFFFFF +.title_text dd 0x444444 .work dd 0xCACACA -.work_button dd 0xCACACA +.work_button dd 0xE9E9E9 .work_button_text dd 0x000000 .work_text dd 0x000000 -.work_graph dd 0x868686 +.work_graph dd 0x777777 } struct system_colors \ No newline at end of file diff --git a/skins/Leency/Latte/left1.bmp b/skins/Leency/Latte/left1.bmp new file mode 100644 index 0000000000..02e4a56f0f Binary files /dev/null and b/skins/Leency/Latte/left1.bmp differ diff --git a/skins/_old/Leency/Latte/left2.bmp b/skins/Leency/Latte/left2.bmp similarity index 100% rename from skins/_old/Leency/Latte/left2.bmp rename to skins/Leency/Latte/left2.bmp diff --git a/skins/Leency/Latte/right1.bmp b/skins/Leency/Latte/right1.bmp new file mode 100644 index 0000000000..022e05d4f4 Binary files /dev/null and b/skins/Leency/Latte/right1.bmp differ diff --git a/skins/_old/Leency/Latte/right2.bmp b/skins/Leency/Latte/right2.bmp similarity index 100% rename from skins/_old/Leency/Latte/right2.bmp rename to skins/Leency/Latte/right2.bmp diff --git a/skins/_old/Leency/Latte/build.bat b/skins/_old/Leency/Latte/build.bat deleted file mode 100644 index 26a1daf097..0000000000 --- a/skins/_old/Leency/Latte/build.bat +++ /dev/null @@ -1,3 +0,0 @@ -fasm default.asm Latte.skn -kpack Latte.skn -pause \ No newline at end of file diff --git a/skins/_old/Leency/Latte/center1.bmp b/skins/_old/Leency/Latte/center1.bmp deleted file mode 100644 index 31940e6a62..0000000000 Binary files a/skins/_old/Leency/Latte/center1.bmp and /dev/null differ diff --git a/skins/_old/Leency/Latte/default.dtp b/skins/_old/Leency/Latte/default.dtp deleted file mode 100644 index 11dc1c69f0..0000000000 Binary files a/skins/_old/Leency/Latte/default.dtp and /dev/null differ diff --git a/skins/_old/Leency/Latte/left1.bmp b/skins/_old/Leency/Latte/left1.bmp deleted file mode 100644 index 4c48fa9284..0000000000 Binary files a/skins/_old/Leency/Latte/left1.bmp and /dev/null differ diff --git a/skins/_old/Leency/Latte/right1.bmp b/skins/_old/Leency/Latte/right1.bmp deleted file mode 100644 index e8ebe135f2..0000000000 Binary files a/skins/_old/Leency/Latte/right1.bmp and /dev/null differ diff --git a/skins/_old/Leency/OpusN/OpusN.asm b/skins/_old/Leency/OpusN/OpusN.asm deleted file mode 100644 index 8386c3e070..0000000000 --- a/skins/_old/Leency/OpusN/OpusN.asm +++ /dev/null @@ -1,31 +0,0 @@ -include '..\skin.inc' - -SKIN_PARAMS \ - height = bmp_base.height,\ ; skin height - margins = [8:3:10:2],\ ; margins [left:top:right:bottom] - colors active = [binner=0xDCD6CB:\ ; border inner color - bouter=0x948B7B:\ ; border outer color - bframe=0xDCD6CB],\ ; border frame color - colors inactive = [binner=0xDCD6CB:\ ; border inner color - bouter=0x948B7B:\ ; border outer color - bframe=0xDCD6CB],\ ; border frame color - dtp = 'OpusN.dtp' ; dtp colors - -SKIN_BUTTONS \ - close = [-20:6][14:14],\ ; buttons coordinates - minimize = [-39:6][14:14] ; [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 ,'a_left.bmp' ; skin bitmaps -BITMAP bmp_oper ,'a_oper.bmp' -BITMAP bmp_base ,'a_base.bmp' -BITMAP bmp_left1,'i_left.bmp' -BITMAP bmp_oper1,'i_oper.bmp' -BITMAP bmp_base1,'i_base.bmp' diff --git a/skins/_old/Leency/OpusN/OpusN.dtp b/skins/_old/Leency/OpusN/OpusN.dtp deleted file mode 100644 index a3826ca1ca..0000000000 Binary files a/skins/_old/Leency/OpusN/OpusN.dtp and /dev/null differ diff --git a/skins/_old/Leency/OpusN/Tupfile.lua b/skins/_old/Leency/OpusN/Tupfile.lua deleted file mode 100644 index 107dd04c33..0000000000 --- a/skins/_old/Leency/OpusN/Tupfile.lua +++ /dev/null @@ -1,2 +0,0 @@ -if tup.getconfig("NO_FASM") ~= "" then return end -tup.rule("OpusN.asm", 'fasm "%f" "%o" ' .. tup.getconfig("KPACK_CMD"), "OpusN.skn") diff --git a/skins/_old/Leency/OpusN/a_base.bmp b/skins/_old/Leency/OpusN/a_base.bmp deleted file mode 100644 index 576fccf232..0000000000 Binary files a/skins/_old/Leency/OpusN/a_base.bmp and /dev/null differ diff --git a/skins/_old/Leency/OpusN/a_left.bmp b/skins/_old/Leency/OpusN/a_left.bmp deleted file mode 100644 index cbee197e2a..0000000000 Binary files a/skins/_old/Leency/OpusN/a_left.bmp and /dev/null differ diff --git a/skins/_old/Leency/OpusN/a_oper.bmp b/skins/_old/Leency/OpusN/a_oper.bmp deleted file mode 100644 index 5848bec1dc..0000000000 Binary files a/skins/_old/Leency/OpusN/a_oper.bmp and /dev/null differ diff --git a/skins/_old/Leency/OpusN/build.bat b/skins/_old/Leency/OpusN/build.bat deleted file mode 100644 index f50e41182a..0000000000 --- a/skins/_old/Leency/OpusN/build.bat +++ /dev/null @@ -1,3 +0,0 @@ -fasm OpusN.asm OpusN.skn -kpack OpusN.skn -pause \ No newline at end of file diff --git a/skins/_old/Leency/OpusN/i_base.bmp b/skins/_old/Leency/OpusN/i_base.bmp deleted file mode 100644 index a64daf84da..0000000000 Binary files a/skins/_old/Leency/OpusN/i_base.bmp and /dev/null differ diff --git a/skins/_old/Leency/OpusN/i_left.bmp b/skins/_old/Leency/OpusN/i_left.bmp deleted file mode 100644 index 5aedf4ff4d..0000000000 Binary files a/skins/_old/Leency/OpusN/i_left.bmp and /dev/null differ diff --git a/skins/_old/Leency/OpusN/i_oper.bmp b/skins/_old/Leency/OpusN/i_oper.bmp deleted file mode 100644 index 268ef3e07f..0000000000 Binary files a/skins/_old/Leency/OpusN/i_oper.bmp and /dev/null differ diff --git a/skins/skinlist.lua b/skins/skinlist.lua index 604e043188..a2ce9b6c40 100644 --- a/skins/skinlist.lua +++ b/skins/skinlist.lua @@ -6,6 +6,7 @@ skinlist = { "Leency/Latte/Latte.skn", "Leency/Octo_flat/Octo_flat.skn", "Leency/Shkvorka/Shkvorka.skn", +"Leency/Yeah/Yeah.skn", "loggy/loggy.skn", "Win10/Win10.skn", "_old/5imple Alpha/1.5imple Alpha/1.5imple Alpha.skn", @@ -78,7 +79,6 @@ skinlist = { "_old/Leency/Octo/Octo.skn", "_old/Leency/OpusN/OpusN.skn", "_old/Leency/Sandwich/Sandwich.skn", -"_old/Leency/Yeah/Yeah.skn", "_old/lightskin/lightskin.skn", "_old/macos_l/macos_l.skn", "_old/mage-scroll/mage-scroll.skn",