diff --git a/skins/_old/Leency/AreaO/Tupfile.lua b/skins/_old/Leency/AreaO/Tupfile.lua deleted file mode 100644 index 0374b9f177..0000000000 --- a/skins/_old/Leency/AreaO/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"), "AreaO.skn") diff --git a/skins/_old/Leency/AreaO/build.bat b/skins/_old/Leency/AreaO/build.bat deleted file mode 100644 index 32faafdd9c..0000000000 --- a/skins/_old/Leency/AreaO/build.bat +++ /dev/null @@ -1,4 +0,0 @@ -del default.skn -fasm default.asm default.skn -kpack default.skn -pause \ No newline at end of file diff --git a/skins/_old/Leency/AreaO/center1.bmp b/skins/_old/Leency/AreaO/center1.bmp deleted file mode 100644 index 28e3880f3e..0000000000 Binary files a/skins/_old/Leency/AreaO/center1.bmp and /dev/null differ diff --git a/skins/_old/Leency/AreaO/default.asm b/skins/_old/Leency/AreaO/default.asm deleted file mode 100644 index 57fef45ddf..0000000000 --- a/skins/_old/Leency/AreaO/default.asm +++ /dev/null @@ -1,29 +0,0 @@ -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 - bouter=0x3E3635:\ ; border outer color - bframe=0xE1E1E1],\ ; border frame color - colors inactive = [binner=0xE1E1E1:\ ; border inner color - bouter=0x3E3635:\ ; border outer color - bframe=0xE1E1E1],\ ; border frame color - dtp = 'default.dtp' ; dtp colors - -SKIN_BUTTONS \ - close = [-18:5][12:12],\ ; buttons coordinates - minimize = [-38:5][12:12] ; [left:top][width:height] - -SKIN_BITMAPS \ - left active = bmp_left1,\ ; skin bitmaps pointers - left inactive = bmp_left1,\ - oper active = bmp_right1,\ - oper inactive = bmp_right2,\ - base active = bmp_center1,\ - base inactive = bmp_center1 - -BITMAP bmp_left1, 'left1.bmp' ; skin bitmaps -BITMAP bmp_right1, 'right1.bmp' -BITMAP bmp_right2, 'right2.bmp' -BITMAP bmp_center1,'center1.bmp' diff --git a/skins/_old/Leency/AreaO/default.dtp b/skins/_old/Leency/AreaO/default.dtp deleted file mode 100644 index 59d1623806..0000000000 Binary files a/skins/_old/Leency/AreaO/default.dtp and /dev/null differ diff --git a/skins/_old/Leency/AreaO/default.dtp.asm b/skins/_old/Leency/AreaO/default.dtp.asm deleted file mode 100644 index a182bb44b3..0000000000 --- a/skins/_old/Leency/AreaO/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/AreaO/left1.bmp b/skins/_old/Leency/AreaO/left1.bmp deleted file mode 100644 index b9c0e758d5..0000000000 Binary files a/skins/_old/Leency/AreaO/left1.bmp and /dev/null differ diff --git a/skins/_old/Leency/AreaO/right1.bmp b/skins/_old/Leency/AreaO/right1.bmp deleted file mode 100644 index 376a8c26db..0000000000 Binary files a/skins/_old/Leency/AreaO/right1.bmp and /dev/null differ diff --git a/skins/_old/Leency/AreaO/right2.bmp b/skins/_old/Leency/AreaO/right2.bmp deleted file mode 100644 index 56184ae587..0000000000 Binary files a/skins/_old/Leency/AreaO/right2.bmp and /dev/null differ diff --git a/skins/_old/Leency/AreaSq/center1.bmp b/skins/_old/Leency/AreaSq/center1.bmp index f614507ddb..6886a8f31e 100644 Binary files a/skins/_old/Leency/AreaSq/center1.bmp and b/skins/_old/Leency/AreaSq/center1.bmp differ diff --git a/skins/_old/Leency/AreaSq/center2.bmp b/skins/_old/Leency/AreaSq/center2.bmp index dcd6f95680..ea7f81559f 100644 Binary files a/skins/_old/Leency/AreaSq/center2.bmp and b/skins/_old/Leency/AreaSq/center2.bmp differ diff --git a/skins/_old/Leency/AreaSq/default.asm b/skins/_old/Leency/AreaSq/default.asm index 82ac9f8e87..a61fdc22b5 100644 --- a/skins/_old/Leency/AreaSq/default.asm +++ b/skins/_old/Leency/AreaSq/default.asm @@ -2,7 +2,7 @@ include '..\skin.inc' SKIN_PARAMS \ height = bmp_center1.height,\ ; skin height - margins = [5:1:43:1],\ ; margins [left:top:right:bottom] + margins = [9:6:37:6],\ ; margins [left:top:right:bottom] colors active = [binner=0xE1E1E1:\ ; border inner color bouter=0x3E3635:\ ; border outer color bframe=0xE1E1E1],\ ; border frame color @@ -12,8 +12,8 @@ SKIN_PARAMS \ dtp = 'default.dtp' ; dtp colors SKIN_BUTTONS \ - close = [-18:6][11:11],\ ; buttons coordinates - minimize = [-34:6][11:11] ; [left:top][width:height] + close = [-18:7][11:11],\ ; buttons coordinates + minimize = [-34:7][11:11] ; [left:top][width:height] SKIN_BITMAPS \ left active = bmp_left1,\ ; skin bitmaps pointers @@ -24,7 +24,7 @@ SKIN_BITMAPS \ base inactive = bmp_center2 BITMAP bmp_left1, 'left1.bmp' ; skin bitmaps -BITMAP bmp_left2, 'left2.bmp' +BITMAP bmp_left2, 'left1.bmp' BITMAP bmp_right1, 'right1.bmp' BITMAP bmp_right2, 'right2.bmp' BITMAP bmp_center1,'center1.bmp' diff --git a/skins/_old/Leency/AreaSq/left1.bmp b/skins/_old/Leency/AreaSq/left1.bmp index 54d76366f3..db82f28f2f 100644 Binary files a/skins/_old/Leency/AreaSq/left1.bmp and b/skins/_old/Leency/AreaSq/left1.bmp differ diff --git a/skins/_old/Leency/AreaSq/left2.bmp b/skins/_old/Leency/AreaSq/left2.bmp deleted file mode 100644 index 54d76366f3..0000000000 Binary files a/skins/_old/Leency/AreaSq/left2.bmp and /dev/null differ diff --git a/skins/_old/Leency/AreaSq/right1.bmp b/skins/_old/Leency/AreaSq/right1.bmp index 699d3997ff..a75d3806e3 100644 Binary files a/skins/_old/Leency/AreaSq/right1.bmp and b/skins/_old/Leency/AreaSq/right1.bmp differ diff --git a/skins/_old/Leency/AreaSq/right2.bmp b/skins/_old/Leency/AreaSq/right2.bmp index d6bc759b40..db837ab91e 100644 Binary files a/skins/_old/Leency/AreaSq/right2.bmp and b/skins/_old/Leency/AreaSq/right2.bmp differ diff --git a/skins/_old/Leency/L-Junior/DEFAULT.ASM b/skins/_old/Leency/L-Junior/DEFAULT.ASM deleted file mode 100644 index fdd996fcb2..0000000000 --- a/skins/_old/Leency/L-Junior/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=0x00081d:\ ; border inner color - bouter=0x00081d:\ ; border outer color - bframe=0xDEDFDE],\ ; border frame color - colors inactive = [binner=0x00081d:\ ; border inner color - bouter=0x00081d:\ ; border outer color - bframe=0xEFEFEF],\ ; border frame color 0x1a8acc - dtp = 'myblue.DTP' ; dtp colors - -SKIN_BUTTONS \ - close = [-17:5][13:13],\ ; buttons coordinates - minimize = [-33:5][13:13] ; [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 ,'left1.BMP' ; skin bitmaps -BITMAP bmp_oper ,'right1.BMP' -BITMAP bmp_base ,'center1.BMP' -BITMAP bmp_left1,'left2.BMP' -BITMAP bmp_oper1,'right2.BMP' -BITMAP bmp_base1,'center2.BMP' diff --git a/skins/_old/Leency/L-Junior/Tupfile.lua b/skins/_old/Leency/L-Junior/Tupfile.lua deleted file mode 100644 index 8eb0d26cbe..0000000000 --- a/skins/_old/Leency/L-Junior/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"), "L-Junior.skn") diff --git a/skins/_old/Leency/L-Junior/build.bat b/skins/_old/Leency/L-Junior/build.bat deleted file mode 100644 index 2131bf7f71..0000000000 --- a/skins/_old/Leency/L-Junior/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/L-Junior/center1.BMP b/skins/_old/Leency/L-Junior/center1.BMP deleted file mode 100644 index a1fccaeb0d..0000000000 Binary files a/skins/_old/Leency/L-Junior/center1.BMP and /dev/null differ diff --git a/skins/_old/Leency/L-Junior/center2.BMP b/skins/_old/Leency/L-Junior/center2.BMP deleted file mode 100644 index ea41d666ee..0000000000 Binary files a/skins/_old/Leency/L-Junior/center2.BMP and /dev/null differ diff --git a/skins/_old/Leency/L-Junior/left1.BMP b/skins/_old/Leency/L-Junior/left1.BMP deleted file mode 100644 index b66752249c..0000000000 Binary files a/skins/_old/Leency/L-Junior/left1.BMP and /dev/null differ diff --git a/skins/_old/Leency/L-Junior/left2.BMP b/skins/_old/Leency/L-Junior/left2.BMP deleted file mode 100644 index 19b72469a7..0000000000 Binary files a/skins/_old/Leency/L-Junior/left2.BMP and /dev/null differ diff --git a/skins/_old/Leency/L-Junior/myblue.DTP b/skins/_old/Leency/L-Junior/myblue.DTP deleted file mode 100644 index d30b7d2eb2..0000000000 Binary files a/skins/_old/Leency/L-Junior/myblue.DTP and /dev/null differ diff --git a/skins/_old/Leency/L-Junior/right1.BMP b/skins/_old/Leency/L-Junior/right1.BMP deleted file mode 100644 index 5204c07a14..0000000000 Binary files a/skins/_old/Leency/L-Junior/right1.BMP and /dev/null differ diff --git a/skins/_old/Leency/L-Junior/right2.BMP b/skins/_old/Leency/L-Junior/right2.BMP deleted file mode 100644 index 8276fcc7a4..0000000000 Binary files a/skins/_old/Leency/L-Junior/right2.BMP and /dev/null differ diff --git a/skins/_old/Leency/Octo_flat/build.bat b/skins/_old/Leency/Octo_flat/build.bat index 2131bf7f71..9401c44c1d 100644 --- a/skins/_old/Leency/Octo_flat/build.bat +++ b/skins/_old/Leency/Octo_flat/build.bat @@ -1,3 +1,2 @@ -fasm default.asm default.skn -kpack default.skn -pause \ No newline at end of file +@del default.skn +@fasm default.asm default.skn \ No newline at end of file diff --git a/skins/_old/Leency/Octo_flat/center1.bmp b/skins/_old/Leency/Octo_flat/center1.bmp index a05da5ca5b..e3c9076e6c 100644 Binary files a/skins/_old/Leency/Octo_flat/center1.bmp and b/skins/_old/Leency/Octo_flat/center1.bmp differ diff --git a/skins/_old/Leency/Octo_flat/center2.bmp b/skins/_old/Leency/Octo_flat/center2.bmp index b9d6a32c72..5da9abcf65 100644 Binary files a/skins/_old/Leency/Octo_flat/center2.bmp and b/skins/_old/Leency/Octo_flat/center2.bmp differ diff --git a/skins/_old/Leency/Octo_flat/default.asm b/skins/_old/Leency/Octo_flat/default.asm index 897179eead..da11beb353 100644 --- a/skins/_old/Leency/Octo_flat/default.asm +++ b/skins/_old/Leency/Octo_flat/default.asm @@ -2,7 +2,7 @@ include '..\skin.inc' SKIN_PARAMS \ height = bmp_center1.height,\ ; skin height - margins = [25:1:43:1],\ ; margins [left:top:right:bottom] + margins = [25:4:40:6],\ ; margins [left:top:right:bottom] colors active = [binner=0xE1E1E1:\ ; border inner color bouter=0x204962:\ ; border outer color bframe=0xE1E1E1],\ ; border frame color @@ -12,8 +12,8 @@ SKIN_PARAMS \ dtp = 'default.dtp' ; dtp colors SKIN_BUTTONS \ - close = [-20:3][14:14],\ ; buttons coordinates - minimize = [-37:3][14:14] ; [left:top][width:height] + close = [-21:4][16:16],\ ; buttons coordinates + minimize = [-38:4][16:16] ; [left:top][width:height] SKIN_BITMAPS \ left active = bmp_left1,\ ; skin bitmaps pointers diff --git a/skins/_old/Leency/Octo_flat/left1.bmp b/skins/_old/Leency/Octo_flat/left1.bmp index 2c0df20e77..f7f87cb6a2 100644 Binary files a/skins/_old/Leency/Octo_flat/left1.bmp and b/skins/_old/Leency/Octo_flat/left1.bmp differ diff --git a/skins/_old/Leency/Octo_flat/left2.bmp b/skins/_old/Leency/Octo_flat/left2.bmp index d5c39503cc..9ac5119a04 100644 Binary files a/skins/_old/Leency/Octo_flat/left2.bmp and b/skins/_old/Leency/Octo_flat/left2.bmp differ diff --git a/skins/_old/Leency/Octo_flat/right1.bmp b/skins/_old/Leency/Octo_flat/right1.bmp index bcdb2de043..60b3b32483 100644 Binary files a/skins/_old/Leency/Octo_flat/right1.bmp and b/skins/_old/Leency/Octo_flat/right1.bmp differ diff --git a/skins/_old/Leency/Octo_flat/right2.bmp b/skins/_old/Leency/Octo_flat/right2.bmp index 036d53e3f1..7ac5a88c07 100644 Binary files a/skins/_old/Leency/Octo_flat/right2.bmp and b/skins/_old/Leency/Octo_flat/right2.bmp differ diff --git a/skins/_old/Leency/Yeah/build.bat b/skins/_old/Leency/Yeah/build.bat index 2131bf7f71..9401c44c1d 100644 --- a/skins/_old/Leency/Yeah/build.bat +++ b/skins/_old/Leency/Yeah/build.bat @@ -1,3 +1,2 @@ -fasm default.asm default.skn -kpack default.skn -pause \ No newline at end of file +@del default.skn +@fasm default.asm default.skn \ No newline at end of file diff --git a/skins/_old/Leency/Yeah/center1.bmp b/skins/_old/Leency/Yeah/center1.bmp index 7ace5d2b65..dc962a1901 100644 Binary files a/skins/_old/Leency/Yeah/center1.bmp and b/skins/_old/Leency/Yeah/center1.bmp differ diff --git a/skins/_old/Leency/Yeah/center2.bmp b/skins/_old/Leency/Yeah/center2.bmp index 3b76995c20..bda2336a78 100644 Binary files a/skins/_old/Leency/Yeah/center2.bmp and b/skins/_old/Leency/Yeah/center2.bmp differ diff --git a/skins/_old/Leency/Yeah/default.asm b/skins/_old/Leency/Yeah/default.asm index 11ced3f47e..8f7671c43e 100644 --- a/skins/_old/Leency/Yeah/default.asm +++ b/skins/_old/Leency/Yeah/default.asm @@ -2,18 +2,18 @@ include '..\skin.inc' SKIN_PARAMS \ height = bmp_center1.height,\ ; skin height - margins = [5:1:43:1],\ ; margins [left:top:right:bottom] + margins = [7:6:40:1],\ ; margins [left:top:right:bottom] colors active = [binner=0xE1E1E1:\ ; border inner color bouter=0x646464:\ ; border outer color bframe=0xE1E1E1],\ ; border frame color - colors inactive = [binner=0xE1E1E1:\ ; border inner color - bouter=0xD4D4D4:\ ; border outer color - bframe=0xE1E1E1],\ ; border frame color + colors inactive = [binner=0xDCDCDC:\ ; border inner color + bouter=0x6D6D6D:\ ; border outer color + bframe=0xDCDCDC],\ ; border frame color dtp = 'default.dtp' ; dtp colors SKIN_BUTTONS \ - close = [-29:1][25:15],\ ; buttons coordinates - minimize = [-54:1][25:15] ; [left:top][width:height] + close = [-31:1][26:16],\ ; buttons coordinates + minimize = [-58:1][26:16] ; [left:top][width:height] SKIN_BITMAPS \ left active = bmp_left1,\ ; skin bitmaps pointers diff --git a/skins/_old/Leency/Yeah/left1.bmp b/skins/_old/Leency/Yeah/left1.bmp index 59dc9d1968..9e2ac6ab8e 100644 Binary files a/skins/_old/Leency/Yeah/left1.bmp and b/skins/_old/Leency/Yeah/left1.bmp differ diff --git a/skins/_old/Leency/Yeah/left2.bmp b/skins/_old/Leency/Yeah/left2.bmp index 0d9ae202f7..152bc4cf93 100644 Binary files a/skins/_old/Leency/Yeah/left2.bmp and b/skins/_old/Leency/Yeah/left2.bmp differ diff --git a/skins/_old/Leency/Yeah/right1.bmp b/skins/_old/Leency/Yeah/right1.bmp index cc6b262471..ff47189443 100644 Binary files a/skins/_old/Leency/Yeah/right1.bmp and b/skins/_old/Leency/Yeah/right1.bmp differ diff --git a/skins/_old/Leency/Yeah/right2.bmp b/skins/_old/Leency/Yeah/right2.bmp index 66ed653a7b..aed5303812 100644 Binary files a/skins/_old/Leency/Yeah/right2.bmp and b/skins/_old/Leency/Yeah/right2.bmp differ