diff --git a/skins/_old/Leency/Luna/Tupfile.lua b/skins/Leency/Luna/Tupfile.lua similarity index 100% rename from skins/_old/Leency/Luna/Tupfile.lua rename to skins/Leency/Luna/Tupfile.lua diff --git a/skins/Leency/Luna/base.bmp b/skins/Leency/Luna/base.bmp new file mode 100644 index 0000000000..4b1d05bb4f Binary files /dev/null and b/skins/Leency/Luna/base.bmp differ diff --git a/skins/Leency/Luna/base_1.bmp b/skins/Leency/Luna/base_1.bmp new file mode 100644 index 0000000000..8a0aed0fc6 Binary files /dev/null and b/skins/Leency/Luna/base_1.bmp differ diff --git a/skins/Leency/Luna/build.bat b/skins/Leency/Luna/build.bat new file mode 100644 index 0000000000..6c4ab5e7f8 --- /dev/null +++ b/skins/Leency/Luna/build.bat @@ -0,0 +1,5 @@ +fasm default.dtp.asm default.dtp +fasm default.asm default.skn +kpack default.skn +del default.dtp +pause \ No newline at end of file diff --git a/skins/_old/Leency/Luna/default.asm b/skins/Leency/Luna/default.asm similarity index 66% rename from skins/_old/Leency/Luna/default.asm rename to skins/Leency/Luna/default.asm index c70f06b00b..bd6f8dccf7 100644 --- a/skins/_old/Leency/Luna/default.asm +++ b/skins/Leency/Luna/default.asm @@ -2,18 +2,18 @@ include '..\skin.inc' SKIN_PARAMS \ height = bmp_base.height,\ ; skin height - margins = [5:1:43:1],\ ; margins [left:top:right:bottom] - colors active = [binner=0x4C6389:\ ; border inner color - bouter=0x575746:\ ; border outer color - bframe=0x7E98CA],\ ; border frame color + margins = [5:2:43:0],\ ; margins [left:top:right:bottom] + colors active = [binner=0x375181:\ ; border inner color + bouter=0x444430:\ ; border outer color + bframe=0x7794CA],\ ; border frame color colors inactive = [binner=0x73839D:\ ; border inner color bouter=0x73736E:\ ; border outer color bframe=0xA6B2CB],\ ; border frame color dtp = 'default.dtp' ; dtp colors SKIN_BUTTONS \ - close = [-19:3][15:15],\ ; buttons coordinates - minimize = [-36:3][15:15] ; [left:top][width:height] + close = [-21:4][17:17],\ ; buttons coordinates + minimize = [-41:4][17:17] ; [left:top][width:height] SKIN_BITMAPS \ left active = bmp_left,\ ; skin bitmaps pointers diff --git a/skins/Leency/Luna/default.dtp.asm b/skins/Leency/Luna/default.dtp.asm new file mode 100644 index 0000000000..7d72c04fe2 --- /dev/null +++ b/skins/Leency/Luna/default.dtp.asm @@ -0,0 +1,14 @@ +struc system_colors + { + .null1 dd 0x000000 + .null2 dd 0x006393 + .dark dd 0xD1CFC7 + .light dd 0xF2F2F0 + .grab_text dd 0xFFFFFF + .work dd 0xE3E2DD + .button dd 0x7794CA + .button_text dd 0xFFFfff + .work_text dd 0x000000 + .graph dd 0x6380B1 + } +struct system_colors \ No newline at end of file diff --git a/skins/Leency/Luna/left.bmp b/skins/Leency/Luna/left.bmp new file mode 100644 index 0000000000..79cbb1a161 Binary files /dev/null and b/skins/Leency/Luna/left.bmp differ diff --git a/skins/Leency/Luna/left_1.bmp b/skins/Leency/Luna/left_1.bmp new file mode 100644 index 0000000000..43a6e763eb Binary files /dev/null and b/skins/Leency/Luna/left_1.bmp differ diff --git a/skins/Leency/Luna/oper.bmp b/skins/Leency/Luna/oper.bmp new file mode 100644 index 0000000000..0fbf33b7eb Binary files /dev/null and b/skins/Leency/Luna/oper.bmp differ diff --git a/skins/Leency/Luna/oper_1.bmp b/skins/Leency/Luna/oper_1.bmp new file mode 100644 index 0000000000..3e889511d1 Binary files /dev/null and b/skins/Leency/Luna/oper_1.bmp differ diff --git a/skins/_old/Leency/Luna/base.bmp b/skins/_old/Leency/Luna/base.bmp deleted file mode 100644 index 15bcaf30f1..0000000000 Binary files a/skins/_old/Leency/Luna/base.bmp and /dev/null differ diff --git a/skins/_old/Leency/Luna/base_1.bmp b/skins/_old/Leency/Luna/base_1.bmp deleted file mode 100644 index 1f3eb1ecf0..0000000000 Binary files a/skins/_old/Leency/Luna/base_1.bmp and /dev/null differ diff --git a/skins/_old/Leency/Luna/build.bat b/skins/_old/Leency/Luna/build.bat deleted file mode 100644 index 2131bf7f71..0000000000 --- a/skins/_old/Leency/Luna/build.bat +++ /dev/null @@ -1,3 +0,0 @@ -fasm default.asm default.skn -kpack default.skn -pause \ No newline at end of file diff --git a/skins/_old/Leency/Luna/default.dtp b/skins/_old/Leency/Luna/default.dtp deleted file mode 100644 index 303f039efe..0000000000 Binary files a/skins/_old/Leency/Luna/default.dtp and /dev/null differ diff --git a/skins/_old/Leency/Luna/default.dtp.asm b/skins/_old/Leency/Luna/default.dtp.asm deleted file mode 100644 index a182bb44b3..0000000000 --- a/skins/_old/Leency/Luna/default.dtp.asm +++ /dev/null @@ -1,14 +0,0 @@ -struc system_colors - { - .frame dd 0x000000 - .grab dd 0x006393 - .grab_button dd 0xB1B1B1 - .grab_button_text dd 0x000000 - .grab_text dd 0xFFFFFF - .work dd 0xE8E8E8 - .work_button dd 0xB1B1B1 - .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/Leency/Luna/left.bmp b/skins/_old/Leency/Luna/left.bmp deleted file mode 100644 index cfb1fc2a4c..0000000000 Binary files a/skins/_old/Leency/Luna/left.bmp and /dev/null differ diff --git a/skins/_old/Leency/Luna/left_1.bmp b/skins/_old/Leency/Luna/left_1.bmp deleted file mode 100644 index 8cf88e2833..0000000000 Binary files a/skins/_old/Leency/Luna/left_1.bmp and /dev/null differ diff --git a/skins/_old/Leency/Luna/oper.bmp b/skins/_old/Leency/Luna/oper.bmp deleted file mode 100644 index 52d290d4b0..0000000000 Binary files a/skins/_old/Leency/Luna/oper.bmp and /dev/null differ diff --git a/skins/_old/Leency/Luna/oper_1.bmp b/skins/_old/Leency/Luna/oper_1.bmp deleted file mode 100644 index c2c25c5a10..0000000000 Binary files a/skins/_old/Leency/Luna/oper_1.bmp and /dev/null differ diff --git a/skins/skinlist.lua b/skins/skinlist.lua index 601b173062..0a4fe18e94 100644 --- a/skins/skinlist.lua +++ b/skins/skinlist.lua @@ -11,6 +11,7 @@ skinlist = { "Leency/Florence/Florence.skn", "Leency/HydrogenOS/HydrogenOS.skn", "Leency/Latte/Latte.skn", +"Leency/Luna/Luna.skn", "Leency/ObsidianOS/ObsidianOS.skn", "Leency/Octo_flat/Octo_flat.skn", "Leency/Shkvorka/Shkvorka.skn", @@ -76,7 +77,6 @@ skinlist = { "_old/humanoid_OSX/humanoid_OSX_red/humanoid_OSX_red.skn", "_old/humanoid_OSX/humanoid_OSX_yellow/humanoid_OSX_yellow.skn", "_old/khrome2/khrome2.skn", -"_old/Leency/Luna/Luna.skn", "_old/Leency/Octo/Octo.skn", "_old/Leency/Sandwich/Sandwich.skn", "_old/lightskin/lightskin.skn",