diff --git a/data/Tupfile.lua b/data/Tupfile.lua index b9f6a7fa70..e87623858b 100644 --- a/data/Tupfile.lua +++ b/data/Tupfile.lua @@ -168,7 +168,7 @@ extra_files = { {"kolibrios/3D/TEXT_2.PNG", PROGS .. "/develop/libraries/TinyGL/asm_fork/examples/text_2.png"}, {"kolibrios/develop/c--/", PROGS .. "/cmm/c--/*"}, {"kolibrios/develop/fpc/", "common/develop/fpc/*"}, - {"kolibrios/develop/fpc/examples/", PROGS .. "/develop/fp/examples/*"}, + {"kolibrios/develop/fpc/examples/", PROGS .. "/develop/fp/examples/src/*"}, {"kolibrios/develop/fpc/examples/build.sh", "common/develop/fpc/build.sh"}, {"kolibrios/develop/lua/lua", "../contrib/other/lua-5.2.0/lua"}, {"kolibrios/develop/lua/calc.lua", "../contrib/other/lua-5.2.0/calc.lua"}, diff --git a/skins/Leency/Blueberries/Tupfile.lua b/skins/Leency/Blueberries/Tupfile.lua deleted file mode 100644 index f5c9e0e095..0000000000 --- a/skins/Leency/Blueberries/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"), "Blueberries.skn") diff --git a/skins/Leency/Blueberries/build.bat b/skins/Leency/Blueberries/build.bat deleted file mode 100644 index 4da7975657..0000000000 --- a/skins/Leency/Blueberries/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/Blueberries/center1.bmp b/skins/Leency/Blueberries/center1.bmp deleted file mode 100644 index c25dca6239..0000000000 Binary files a/skins/Leency/Blueberries/center1.bmp and /dev/null differ diff --git a/skins/Leency/Blueberries/center2.bmp b/skins/Leency/Blueberries/center2.bmp deleted file mode 100644 index 3dcff5a243..0000000000 Binary files a/skins/Leency/Blueberries/center2.bmp and /dev/null differ diff --git a/skins/Leency/Blueberries/default.asm b/skins/Leency/Blueberries/default.asm deleted file mode 100644 index 25ce5d2415..0000000000 --- a/skins/Leency/Blueberries/default.asm +++ /dev/null @@ -1,31 +0,0 @@ -include '../../skin.inc' - -SKIN_PARAMS \ - height = bmp_center1.height,\ ; skin height - margins = [6:5:58:3],\ ; margins [left:top:right:bottom] - colors active = [binner=0x626262:\ ; border inner - bouter=0x33383A:\ ; border outer - bframe=0x626262],\ ; border middle - colors inactive = [binner=0x626262:\ ; border inner - bouter=0x33383A:\ ; border outer - bframe=0x626262],\ ; border middle - dtp = 'default.dtp' ; dtp colors - -SKIN_BUTTONS \ - close = [-30:1][26:18],\ ; buttons coordinates - minimize = [-57:1][26:18] ; [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/Blueberries/default.dtp b/skins/Leency/Blueberries/default.dtp deleted file mode 100644 index 397eff1ba7..0000000000 Binary files a/skins/Leency/Blueberries/default.dtp and /dev/null differ diff --git a/skins/Leency/Blueberries/default.dtp.asm b/skins/Leency/Blueberries/default.dtp.asm deleted file mode 100644 index 628e4f97ce..0000000000 --- a/skins/Leency/Blueberries/default.dtp.asm +++ /dev/null @@ -1,14 +0,0 @@ -struc system_colors - { - .unused1 dd 0x363535 - .unused2 dd 0xE7E5E5 - .work_3d_dark dd 0x505050 - .work_3d_light dd 0x828282 - .window_title dd 0xE3E3E3 - .work dd 0x626262 - .work_button dd 0x535353 - .work_button_text dd 0xCC9777 - .work_text dd 0xF5EEee - .work_graph dd 0x404040 - } -struct system_colors \ No newline at end of file diff --git a/skins/Leency/Blueberries/left1.bmp b/skins/Leency/Blueberries/left1.bmp deleted file mode 100644 index 48fbb0ea99..0000000000 Binary files a/skins/Leency/Blueberries/left1.bmp and /dev/null differ diff --git a/skins/Leency/Blueberries/left2.bmp b/skins/Leency/Blueberries/left2.bmp deleted file mode 100644 index 48fbb0ea99..0000000000 Binary files a/skins/Leency/Blueberries/left2.bmp and /dev/null differ diff --git a/skins/Leency/Blueberries/right1.bmp b/skins/Leency/Blueberries/right1.bmp deleted file mode 100644 index a028be9c2f..0000000000 Binary files a/skins/Leency/Blueberries/right1.bmp and /dev/null differ diff --git a/skins/Leency/Blueberries/right2.bmp b/skins/Leency/Blueberries/right2.bmp deleted file mode 100644 index 5a54fe6c19..0000000000 Binary files a/skins/Leency/Blueberries/right2.bmp and /dev/null differ diff --git a/skins/_old/Leency/Octo/Tupfile.lua b/skins/_old/Leency/Octo/Tupfile.lua deleted file mode 100644 index 7292022faf..0000000000 --- a/skins/_old/Leency/Octo/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"), "Octo.skn") diff --git a/skins/_old/Leency/Octo/build.bat b/skins/_old/Leency/Octo/build.bat deleted file mode 100644 index 2131bf7f71..0000000000 --- a/skins/_old/Leency/Octo/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/Octo/center1.bmp b/skins/_old/Leency/Octo/center1.bmp deleted file mode 100644 index bd3913a83c..0000000000 Binary files a/skins/_old/Leency/Octo/center1.bmp and /dev/null differ diff --git a/skins/_old/Leency/Octo/center2.bmp b/skins/_old/Leency/Octo/center2.bmp deleted file mode 100644 index d142ed2b72..0000000000 Binary files a/skins/_old/Leency/Octo/center2.bmp and /dev/null differ diff --git a/skins/_old/Leency/Octo/default.asm b/skins/_old/Leency/Octo/default.asm deleted file mode 100644 index fe53274dce..0000000000 --- a/skins/_old/Leency/Octo/default.asm +++ /dev/null @@ -1,31 +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=0x204962:\ ; border outer color - bframe=0xE1E1E1],\ ; border frame color - colors inactive = [binner=0xE1E1E1:\ ; border inner color - bouter=0xA1A1A1:\ ; border outer color - bframe=0xE1E1E1],\ ; border frame color - dtp = 'default.dtp' ; dtp colors - -SKIN_BUTTONS \ - close = [-20:3][14:14],\ ; buttons coordinates - minimize = [-37:3][14:14] ; [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/_old/Leency/Octo/default.dtp b/skins/_old/Leency/Octo/default.dtp deleted file mode 100644 index 5a62f2e7a1..0000000000 Binary files a/skins/_old/Leency/Octo/default.dtp and /dev/null differ diff --git a/skins/_old/Leency/Octo/left1.bmp b/skins/_old/Leency/Octo/left1.bmp deleted file mode 100644 index bb75b4c11f..0000000000 Binary files a/skins/_old/Leency/Octo/left1.bmp and /dev/null differ diff --git a/skins/_old/Leency/Octo/left2.bmp b/skins/_old/Leency/Octo/left2.bmp deleted file mode 100644 index 575d5e4770..0000000000 Binary files a/skins/_old/Leency/Octo/left2.bmp and /dev/null differ diff --git a/skins/_old/Leency/Octo/right1.bmp b/skins/_old/Leency/Octo/right1.bmp deleted file mode 100644 index 6daaefb658..0000000000 Binary files a/skins/_old/Leency/Octo/right1.bmp and /dev/null differ diff --git a/skins/_old/Leency/Octo/right2.bmp b/skins/_old/Leency/Octo/right2.bmp deleted file mode 100644 index aa31033e70..0000000000 Binary files a/skins/_old/Leency/Octo/right2.bmp and /dev/null differ diff --git a/skins/skinlist.lua b/skins/skinlist.lua index 4228cf3266..868ea89082 100644 --- a/skins/skinlist.lua +++ b/skins/skinlist.lua @@ -9,7 +9,6 @@ skinlist = { "ConLenov/LucidCream/LucidCream.skn", "ConLenov/Win10/Win10.skn", "Leency/AreaSq/AreaSq.skn", -"Leency/Blueberries/Blueberries.skn", "Leency/Florence/Florence.skn", "Leency/HydrogenOS/HydrogenOS.skn", "Leency/Latte/Latte.skn", @@ -79,7 +78,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/Octo/Octo.skn", "_old/Leency/Sandwich/Sandwich.skn", "_old/lightskin/lightskin.skn", "_old/macos_l/macos_l.skn",