diff --git a/data/common/wallpapers/T_Grass.png b/data/common/wallpapers/T_Grass.png new file mode 100644 index 0000000000..fa9039254b Binary files /dev/null and b/data/common/wallpapers/T_Grass.png differ diff --git a/data/common/wallpapers/T_Rug.png b/data/common/wallpapers/T_Rug.png new file mode 100644 index 0000000000..5b2bd88ef0 Binary files /dev/null and b/data/common/wallpapers/T_Rug.png differ diff --git a/data/common/wallpapers/copyright.txt b/data/common/wallpapers/copyright.txt index 33479aa828..e67b3682e3 100644 --- a/data/common/wallpapers/copyright.txt +++ b/data/common/wallpapers/copyright.txt @@ -7,6 +7,7 @@ Free Yourself Jonathan Besler https://interfacelift.com Unsplash Alexander Popov https://unsplash.com/@5tep5 KolibriOS Tan Viktorya Sidorova Brick house islands Mrmo Tarius https://pixeljoint.com/pixelart/85317.htm +Grass; Rug Dusty https://pixeljoint.com/pixelart/67541.htm =====Icons==== diff --git a/skins/_old/OpusOs_D/Opus_D.asm b/skins/_old/OpusOs_D/Opus_D.asm index a3bf0f7fbd..f8b6e4f12a 100644 --- a/skins/_old/OpusOs_D/Opus_D.asm +++ b/skins/_old/OpusOs_D/Opus_D.asm @@ -2,7 +2,7 @@ include 'skin.inc' SKIN_PARAMS \ height = bmp_base.height,\ ; skin height - margins = [8:2:10:2],\ ; margins [left:top:right:bottom] + margins = [8:4:10:4],\ ; margins [left:top:right:bottom] colors active = [binner=0xDCD6CB:\ ; border inner color bouter=0x948B7B:\ ; border outer color bframe=0xDCD6CB],\ ; border frame color diff --git a/skins/_old/RoboTech/BRoboTech/BRoboTech.asm b/skins/_old/RoboTech/BRoboTech/BRoboTech.asm deleted file mode 100644 index 27e33aa4d5..0000000000 --- a/skins/_old/RoboTech/BRoboTech/BRoboTech.asm +++ /dev/null @@ -1,35 +0,0 @@ -include 'skin.inc' - -SKIN_PARAMS \ - height = bmp_base.height,\ ; skin height - margins = [6:1:43:1],\ ; margins [left:top:right:bottom] - colors active = [binner=0x060606:\ ; border inner color - bouter=0x060606:\ ; border outer color - bframe=0x101010],\ ; border frame color - colors inactive = [binner=0x121212:\ ; border inner color - bouter=0x121212:\ ; border outer color - bframe=0x1B1B1B],\ ; border frame color - dtp = 'BRoboTech.dtp' ; dtp colors - -SKIN_BUTTONS \ - close = [-25:4][16:15],\ ; buttons coordinates - minimize = [-46:4][16:15] ; [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 ,'active/left.bmp' ; skin bitmaps -BITMAP bmp_oper ,'active/oper.bmp' -BITMAP bmp_base ,'active/base.bmp' -BITMAP bmp_left1,'inactive/left.bmp' -BITMAP bmp_oper1,'inactive/oper.bmp' -BITMAP bmp_base1,'inactive/base.bmp' - -;================================; -; Created by Rock_maniak_forever ; -;================================; diff --git a/skins/_old/RoboTech/BRoboTech/BRoboTech.dtp b/skins/_old/RoboTech/BRoboTech/BRoboTech.dtp deleted file mode 100644 index 0e71e89f31..0000000000 Binary files a/skins/_old/RoboTech/BRoboTech/BRoboTech.dtp and /dev/null differ diff --git a/skins/_old/RoboTech/BRoboTech/Tupfile.lua b/skins/_old/RoboTech/BRoboTech/Tupfile.lua deleted file mode 100644 index 2f798b7b9e..0000000000 --- a/skins/_old/RoboTech/BRoboTech/Tupfile.lua +++ /dev/null @@ -1,2 +0,0 @@ -if tup.getconfig("NO_FASM") ~= "" then return end -tup.rule("BRoboTech.asm", 'fasm "%f" "%o" ' .. tup.getconfig("KPACK_CMD"), "BRoboTech.skn") diff --git a/skins/_old/RoboTech/BRoboTech/active/base.bmp b/skins/_old/RoboTech/BRoboTech/active/base.bmp deleted file mode 100644 index ee38dd3e71..0000000000 Binary files a/skins/_old/RoboTech/BRoboTech/active/base.bmp and /dev/null differ diff --git a/skins/_old/RoboTech/BRoboTech/active/left.bmp b/skins/_old/RoboTech/BRoboTech/active/left.bmp deleted file mode 100644 index e66d30d771..0000000000 Binary files a/skins/_old/RoboTech/BRoboTech/active/left.bmp and /dev/null differ diff --git a/skins/_old/RoboTech/BRoboTech/active/oper.bmp b/skins/_old/RoboTech/BRoboTech/active/oper.bmp deleted file mode 100644 index 4a8a8b4f0f..0000000000 Binary files a/skins/_old/RoboTech/BRoboTech/active/oper.bmp and /dev/null differ diff --git a/skins/_old/RoboTech/BRoboTech/inactive/base.bmp b/skins/_old/RoboTech/BRoboTech/inactive/base.bmp deleted file mode 100644 index bdb01f0977..0000000000 Binary files a/skins/_old/RoboTech/BRoboTech/inactive/base.bmp and /dev/null differ diff --git a/skins/_old/RoboTech/BRoboTech/inactive/left.bmp b/skins/_old/RoboTech/BRoboTech/inactive/left.bmp deleted file mode 100644 index 5ed4e324b2..0000000000 Binary files a/skins/_old/RoboTech/BRoboTech/inactive/left.bmp and /dev/null differ diff --git a/skins/_old/RoboTech/BRoboTech/inactive/oper.bmp b/skins/_old/RoboTech/BRoboTech/inactive/oper.bmp deleted file mode 100644 index 52892ff2ad..0000000000 Binary files a/skins/_old/RoboTech/BRoboTech/inactive/oper.bmp and /dev/null differ diff --git a/skins/_old/RoboTech/BRoboTech/screenshot.png b/skins/_old/RoboTech/BRoboTech/screenshot.png deleted file mode 100644 index 88dd50bca4..0000000000 Binary files a/skins/_old/RoboTech/BRoboTech/screenshot.png and /dev/null differ diff --git a/skins/_old/RoboTech/BRoboTech/skin.inc b/skins/_old/RoboTech/BRoboTech/skin.inc deleted file mode 100644 index 81a6bd8f3f..0000000000 --- a/skins/_old/RoboTech/BRoboTech/skin.inc +++ /dev/null @@ -1,239 +0,0 @@ -;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; -;; ;; -;; Copyright (C) KolibriOS team 2004-2017. All rights reserved. ;; -;; Distributed under terms of the GNU General Public License ;; -;; ;; -;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; - -;============================================================================ -; This file should be used to generate skins of new standard -;============================================================================ -; skin file structure: -;---------------------------------------------------------------------------- -; header: -; dd 'SKIN' -; dd = version (1 for now) -; dd @ params -; dd @ buttons -; dd @ bitmaps -; ... -;---------------------------------------------------------------------------- -; NOTE: order of sections listed below is insignificant -; since they're identified by pointer in above header -;---------------------------------------------------------------------------- -; ... -; params: -; dd = skin height -; dw = right margin -; dw = left margin -; dw = bottom margin -; dw = top margin -; dd = inner line color -; dd = outer line color -; dd = frame color -; dd = dtp file size -; ?? = dtp file itself -; ... -;---------------------------------------------------------------------------- -; ... -; buttons: -; dd = button type (1 = close, 2 = minimize) -; dw = left button coord (could be negative) -; dw = top button coord (could be negative) -; dw = button width -; dw = button height -; ... etc for all buttons -; dd = 0 (end of buttons list) -; ... -;---------------------------------------------------------------------------- -; ... -; bitmaps: -; dw = bitmap kind (1 = left, 2 = oper, 3 = base) -; dw = bitmap type (1 = active, 0 = inactive) -; dd @ bitmap -; ... etc for all bitmaps -; dd 0 (end of bitmaps list) -; ... -;---------------------------------------------------------------------------- -; ... -; bitmap: -; dd = bitmap width -; dd = bitmap height -; ?? = raw bitmap data -; ... etc for all bitmaps -; ... -;============================================================================ - -dd 'SKIN',1,__params__,__buttons__,__bitmaps__ - -struc BITMAPFILEHEADER { - .bfType dw ? ; WORD - .bfSize dd ? ; DWORD - .bfReserved1 dw ? ; WORD - .bfReserved2 dw ? ; WORD - .bfOffBits dd ? ; DWORD -} - -struc BITMAPINFOHEADER { - .biSize dd ? ; DWORD - .biWidth dd ? ; LONG - .biHeight dd ? ; LONG - .biPlanes dw ? ; WORD - .biBitCount dw ? ; WORD - .biCompression dd ? ; DWORD - .biSizeImage dd ? ; DWORD - .biXPelsPerMeter dd ? ; LONG - .biYPelsPerMeter dd ? ; LONG - .biClrUsed dd ? ; DWORD - .biClrImportant dd ? ; DWORD -} - -struc _bmp { - .h BITMAPFILEHEADER - .i BITMAPINFOHEADER -} -virtual at 0 - _bmp _bmp -end virtual - -macro BITMAP _name*,_fname* -{ - local w,h,a,r,g,b - virtual at 0 - _file equ _#_name - _file:: - file _fname - end virtual - load w dword from _file:_bmp.i.biWidth - load h dword from _file:_bmp.i.biHeight - load hsize dword from _file:_bmp.h.bfOffBits - align 4 - label _name - .width = w - .height = h - dd w,h - a=hsize+(w*3+(w mod 4))*(h-1) - size = $ - repeat h - repeat w - load r from _file:a+0 - load g from _file:a+1 - load b from _file:a+2 - db r,g,b - a=a+3 - end repeat - a=a-w*3*2-(w mod 4) - end repeat -} - -macro define_colors name,[col,val] -{ - common - local a,b,c - forward - match =binner,col \{ a = val \} - match =bouter,col \{ b = val \} - match =bframe,col \{ c = val \} - common - name equ a,b,c -} - -macro SKIN_PARAMS [a] -{ - common - local _height,_margins,_colors,_colors_1,_dtp - __params__: - forward - match qq == ww,a - \{ - match =height,qq \\{ _height = ww \\} - match =margins,qq \\{ - match [q1:q2:q3:q4],ww - \\\{ - _margins equ q3,q1,q4,q2 - \\\} - \\} - match =colors =active,qq - \\{ - match [q10==q11:q20==q21:q30==q31],ww - \\\{ - define_colors _colors,q10,q11,q20,q21,q30,q31 - \\\} - \\} - match =colors =inactive,qq - \\{ - match [q10==q11:q20==q21:q30==q31],ww - \\\{ - define_colors _colors_1,q10,q11,q20,q21,q30,q31 - \\\} - \\} - match =dtp,qq \\{ _dtp equ ww \\} - \} - common - dd _height - dw _margins - dd _colors,_colors_1 - dd @f - $ - 4 - file _dtp - @@: -} - -macro SKIN_BUTTONS [a] -{ - common - local btn - __buttons__: - forward - match qq == ww,a - \{ - btn = 0 - match =close,qq \\{ btn = 1 \\} - match =minimize,qq \\{ btn = 2 \\} - match [q1:q2][q3:q4],ww - \\{ - if btn <> 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 -} diff --git a/skins/maxcodehack/blacky/default.asm b/skins/maxcodehack/blacky/default.asm index 89e3ea2383..bd276c5fd8 100755 --- a/skins/maxcodehack/blacky/default.asm +++ b/skins/maxcodehack/blacky/default.asm @@ -4,10 +4,10 @@ SKIN_PARAMS \ height = bmp_center1.height,\ ; skin height margins = [6:5:65:3],\ ; margins [left:top:right:bottom] colors active = [binner=0x626262:\ ; border inner - bouter=0x646464:\ ; border outer + bouter=0x010812:\ ; border outer bframe=0x626262],\ ; border middle colors inactive = [binner=0x626262:\ ; border inner - bouter=0x646464:\ ; border outer + bouter=0x010812:\ ; border outer bframe=0x626262],\ ; border middle dtp = 'default.dtp' ; dtp colors diff --git a/skins/skinlist.lua b/skins/skinlist.lua index d86b92d4f2..b99d48190e 100644 --- a/skins/skinlist.lua +++ b/skins/skinlist.lua @@ -52,7 +52,6 @@ skinlist = { "_old/MetalColor/MCRed/MCRed.skn", "_old/nix/nix.skn", "_old/OpusOs_Blue/OpusOs_Blue.skn", -"_old/RoboTech/BRoboTech/BRoboTech.skn", "_old/Sad_grey/Sad_grey.skn", "_old/Simple_gray/Simple_gray.skn", "_old/skin_feol/skin_feol.skn",