diff --git a/data/common/icons16.png b/data/common/icons16.png index 307272117c..e353e60570 100644 Binary files a/data/common/icons16.png and b/data/common/icons16.png differ diff --git a/programs/cmm/eolite/include/gui.h b/programs/cmm/eolite/include/gui.h index d379b35289..8d57c4aea4 100644 --- a/programs/cmm/eolite/include/gui.h +++ b/programs/cmm/eolite/include/gui.h @@ -63,14 +63,34 @@ void DrawFlatButtonSmall(dword x,y,width,height,id,text) WriteText(-strlen(text)*6+width/2+x+1,height/2+y-3,0x80,sc.work_text,text); } +void DrawFuncButton(dword x,y,width,id,text) +{ + #define FW 17 + #define FH 16 + if (skin_is_dark()) { + DrawFlatButtonSmall(x,y,width,FH,id,text); + return; + } + DrawRectangle(x,y,width,FH,sc.work_graph); + DrawRectangle3D(x+1,y+1,width-2,FH-2, sc.work_light, sc.work_dark); + PutPixel(x+width-1, y+1, sc.work_dark); + DrawBar(x+2, y+2, FW, FH-3, 0x6060FF); + DrawBar(x+2+FW, y+2, width-3-FW, FH-3, 0x00AA00); + DefineHiddenButton(x+1,y+1,width-2,FH-2,id); + WriteText(-strlen(text)*6+width/2+x+2,FH/2+y-2,0x80,0x444444,text); + $sub ebx, 1 <<16 + 1 + $add ecx, 0xFFFfff-0x444444 + $int 64 +} + void DrawFilledBar(dword x, y, w, h) { int i; for (i=0; i 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/_old/CodeOpusC/Opus_D/Opus_D.asm b/skins/_old/CodeOpusC/Opus_D.asm similarity index 100% rename from skins/_old/CodeOpusC/Opus_D/Opus_D.asm rename to skins/_old/CodeOpusC/Opus_D.asm diff --git a/skins/_old/CodeOpusC/Opus_D/Opus_D.dtp b/skins/_old/CodeOpusC/Opus_D.dtp similarity index 100% rename from skins/_old/CodeOpusC/Opus_D/Opus_D.dtp rename to skins/_old/CodeOpusC/Opus_D.dtp diff --git a/skins/_old/CodeOpusC/Opus_D/skin.inc b/skins/_old/CodeOpusC/Opus_D/skin.inc deleted file mode 100644 index 81a6bd8f3f..0000000000 --- a/skins/_old/CodeOpusC/Opus_D/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/_old/CodeOpusC/Opus_G/Opus_G.asm b/skins/_old/CodeOpusC/Opus_G/Opus_G.asm deleted file mode 100644 index 28419dd975..0000000000 --- a/skins/_old/CodeOpusC/Opus_G/Opus_G.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=0xD8D4D4:\ ; border inner color - bouter=0x928D87:\ ; border outer color - bframe=0xD8D4D4],\ ; border frame color - colors inactive = [binner=0xD8D4D4:\ ; border inner color - bouter=0x928D87:\ ; border outer color - bframe=0xD8D4D4],\ ; border frame color - dtp = 'Opus_G.dtp' ; dtp colors - -SKIN_BUTTONS \ - close = [-21:5][15:15],\ ; buttons coordinates - minimize = [-40:5][15: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' diff --git a/skins/_old/CodeOpusC/Opus_G/Opus_G.dtp b/skins/_old/CodeOpusC/Opus_G/Opus_G.dtp deleted file mode 100644 index e654236212..0000000000 Binary files a/skins/_old/CodeOpusC/Opus_G/Opus_G.dtp and /dev/null differ diff --git a/skins/_old/CodeOpusC/Opus_G/Tupfile.lua b/skins/_old/CodeOpusC/Opus_G/Tupfile.lua deleted file mode 100644 index 4ce9cfb46b..0000000000 --- a/skins/_old/CodeOpusC/Opus_G/Tupfile.lua +++ /dev/null @@ -1,2 +0,0 @@ -if tup.getconfig("NO_FASM") ~= "" then return end -tup.rule("Opus_G.asm", 'fasm "%f" "%o" ' .. tup.getconfig("KPACK_CMD"), "Opus_G.skn") diff --git a/skins/_old/CodeOpusC/Opus_G/active/base.bmp b/skins/_old/CodeOpusC/Opus_G/active/base.bmp deleted file mode 100644 index 2e83ca1e8e..0000000000 Binary files a/skins/_old/CodeOpusC/Opus_G/active/base.bmp and /dev/null differ diff --git a/skins/_old/CodeOpusC/Opus_G/active/left.bmp b/skins/_old/CodeOpusC/Opus_G/active/left.bmp deleted file mode 100644 index a884876a41..0000000000 Binary files a/skins/_old/CodeOpusC/Opus_G/active/left.bmp and /dev/null differ diff --git a/skins/_old/CodeOpusC/Opus_G/active/oper.bmp b/skins/_old/CodeOpusC/Opus_G/active/oper.bmp deleted file mode 100644 index 1ba9faa689..0000000000 Binary files a/skins/_old/CodeOpusC/Opus_G/active/oper.bmp and /dev/null differ diff --git a/skins/_old/CodeOpusC/Opus_G/inactive/base.bmp b/skins/_old/CodeOpusC/Opus_G/inactive/base.bmp deleted file mode 100644 index d7175aed69..0000000000 Binary files a/skins/_old/CodeOpusC/Opus_G/inactive/base.bmp and /dev/null differ diff --git a/skins/_old/CodeOpusC/Opus_G/inactive/left.bmp b/skins/_old/CodeOpusC/Opus_G/inactive/left.bmp deleted file mode 100644 index f336be20e6..0000000000 Binary files a/skins/_old/CodeOpusC/Opus_G/inactive/left.bmp and /dev/null differ diff --git a/skins/_old/CodeOpusC/Opus_G/inactive/oper.bmp b/skins/_old/CodeOpusC/Opus_G/inactive/oper.bmp deleted file mode 100644 index 8491a5c7fc..0000000000 Binary files a/skins/_old/CodeOpusC/Opus_G/inactive/oper.bmp and /dev/null differ diff --git a/skins/_old/CodeOpusC/Opus_G/skin.inc b/skins/_old/CodeOpusC/Opus_G/skin.inc deleted file mode 100644 index 81a6bd8f3f..0000000000 --- a/skins/_old/CodeOpusC/Opus_G/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/_old/CodeOpusC/Opus_D/Tupfile.lua b/skins/_old/CodeOpusC/Tupfile.lua similarity index 100% rename from skins/_old/CodeOpusC/Opus_D/Tupfile.lua rename to skins/_old/CodeOpusC/Tupfile.lua diff --git a/skins/_old/CodeOpusC/Opus_D/active/base.bmp b/skins/_old/CodeOpusC/active/base.bmp similarity index 100% rename from skins/_old/CodeOpusC/Opus_D/active/base.bmp rename to skins/_old/CodeOpusC/active/base.bmp diff --git a/skins/_old/CodeOpusC/Opus_D/active/left.bmp b/skins/_old/CodeOpusC/active/left.bmp similarity index 100% rename from skins/_old/CodeOpusC/Opus_D/active/left.bmp rename to skins/_old/CodeOpusC/active/left.bmp diff --git a/skins/_old/CodeOpusC/Opus_D/active/oper.bmp b/skins/_old/CodeOpusC/active/oper.bmp similarity index 100% rename from skins/_old/CodeOpusC/Opus_D/active/oper.bmp rename to skins/_old/CodeOpusC/active/oper.bmp diff --git a/skins/_old/CodeOpusC/Opus_D/inactive/base.bmp b/skins/_old/CodeOpusC/inactive/base.bmp similarity index 100% rename from skins/_old/CodeOpusC/Opus_D/inactive/base.bmp rename to skins/_old/CodeOpusC/inactive/base.bmp diff --git a/skins/_old/CodeOpusC/Opus_D/inactive/left.bmp b/skins/_old/CodeOpusC/inactive/left.bmp similarity index 100% rename from skins/_old/CodeOpusC/Opus_D/inactive/left.bmp rename to skins/_old/CodeOpusC/inactive/left.bmp diff --git a/skins/_old/CodeOpusC/Opus_D/inactive/oper.bmp b/skins/_old/CodeOpusC/inactive/oper.bmp similarity index 100% rename from skins/_old/CodeOpusC/Opus_D/inactive/oper.bmp rename to skins/_old/CodeOpusC/inactive/oper.bmp diff --git a/skins/_old/CodeOpusC/Opus_A/skin.inc b/skins/_old/CodeOpusC/skin.inc similarity index 100% rename from skins/_old/CodeOpusC/Opus_A/skin.inc rename to skins/_old/CodeOpusC/skin.inc diff --git a/skins/_old/MenuetOS/1.MenuetOS/menuet.dtp b/skins/_old/MenuetOS/1.MenuetOS/menuet.dtp index 5d9a097609..15b66db988 100644 Binary files a/skins/_old/MenuetOS/1.MenuetOS/menuet.dtp and b/skins/_old/MenuetOS/1.MenuetOS/menuet.dtp differ diff --git a/skins/_old/MenuetOS/4.MenuetOS/GRAY.DTP b/skins/_old/MenuetOS/4.MenuetOS/GRAY.DTP deleted file mode 100644 index 15b66db988..0000000000 Binary files a/skins/_old/MenuetOS/4.MenuetOS/GRAY.DTP and /dev/null differ diff --git a/skins/_old/MenuetOS/4.MenuetOS/MenuetOS.asm b/skins/_old/MenuetOS/4.MenuetOS/MenuetOS.asm deleted file mode 100644 index c97838a0a9..0000000000 --- a/skins/_old/MenuetOS/4.MenuetOS/MenuetOS.asm +++ /dev/null @@ -1,36 +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=0x152D41:\ ; border inner color - bouter=0x0B1721:\ ; border outer color - bframe=0x152D41],\ ; border frame color - colors inactive = [binner=0x576067:\ ; border inner color - bouter=0x0B1721:\ ; border outer color - bframe=0x576067],\ ; border frame color - dtp = 'GRAY.DTP' ; dtp colors - -SKIN_BUTTONS \ - close = [-20:6][12:12],\ ; buttons coordinates - minimize = [-36:6][12:12] ; [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/MenuetOS/4.MenuetOS/Tupfile.lua b/skins/_old/MenuetOS/4.MenuetOS/Tupfile.lua deleted file mode 100644 index 6ff1f91794..0000000000 --- a/skins/_old/MenuetOS/4.MenuetOS/Tupfile.lua +++ /dev/null @@ -1,2 +0,0 @@ -if tup.getconfig("NO_FASM") ~= "" then return end -tup.rule("MenuetOS.asm", 'fasm "%f" "%o" ' .. tup.getconfig("KPACK_CMD"), "MenuetOS 4.skn") diff --git a/skins/_old/MenuetOS/4.MenuetOS/active/base.bmp b/skins/_old/MenuetOS/4.MenuetOS/active/base.bmp deleted file mode 100644 index f9f550465b..0000000000 Binary files a/skins/_old/MenuetOS/4.MenuetOS/active/base.bmp and /dev/null differ diff --git a/skins/_old/MenuetOS/4.MenuetOS/active/left.bmp b/skins/_old/MenuetOS/4.MenuetOS/active/left.bmp deleted file mode 100644 index d22cc363a3..0000000000 Binary files a/skins/_old/MenuetOS/4.MenuetOS/active/left.bmp and /dev/null differ diff --git a/skins/_old/MenuetOS/4.MenuetOS/active/oper.bmp b/skins/_old/MenuetOS/4.MenuetOS/active/oper.bmp deleted file mode 100644 index 64f44d10f7..0000000000 Binary files a/skins/_old/MenuetOS/4.MenuetOS/active/oper.bmp and /dev/null differ diff --git a/skins/_old/MenuetOS/4.MenuetOS/inactive/base.bmp b/skins/_old/MenuetOS/4.MenuetOS/inactive/base.bmp deleted file mode 100644 index 20e634f962..0000000000 Binary files a/skins/_old/MenuetOS/4.MenuetOS/inactive/base.bmp and /dev/null differ diff --git a/skins/_old/MenuetOS/4.MenuetOS/inactive/left.bmp b/skins/_old/MenuetOS/4.MenuetOS/inactive/left.bmp deleted file mode 100644 index 642290eb28..0000000000 Binary files a/skins/_old/MenuetOS/4.MenuetOS/inactive/left.bmp and /dev/null differ diff --git a/skins/_old/MenuetOS/4.MenuetOS/inactive/oper.bmp b/skins/_old/MenuetOS/4.MenuetOS/inactive/oper.bmp deleted file mode 100644 index 0df14a3d08..0000000000 Binary files a/skins/_old/MenuetOS/4.MenuetOS/inactive/oper.bmp and /dev/null differ diff --git a/skins/skinlist.lua b/skins/skinlist.lua index 7f7885a1b9..b3f8298cf4 100644 --- a/skins/skinlist.lua +++ b/skins/skinlist.lua @@ -31,10 +31,7 @@ skinlist = { "_old/blackskin/blackskin.skn", "_old/Black_lace/2.Black_lace/Black_lace.skn", "_old/Blended/Blended.skn", -"_old/CodeOpusC/Opus_A/Opus_A.skn", -"_old/CodeOpusC/Opus_B/Opus_B.skn", -"_old/CodeOpusC/Opus_D/Opus_D.skn", -"_old/CodeOpusC/Opus_G/Opus_G.skn", +"_old/CodeOpusC/Opus_D.skn", "_old/Cyclops/1.Cyclops/1.Cyclops.skn", "_old/dark_night/dark_night.skn", "_old/Eyes/Eyes.skn", @@ -54,7 +51,6 @@ skinlist = { "_old/mage-scroll/mage-scroll.skn", "_old/MenuetOS/1.MenuetOS/MenuetOS 1.skn", "_old/MenuetOS/3.MenuetOS/MenuetOS 3.skn", -"_old/MenuetOS/4.MenuetOS/MenuetOS 4.skn", "_old/MenuetOS/5.MenuetOS/MenuetOS 5.skn", "_old/MetalColor/MCBlue/MCBlue.skn", "_old/MetalColor/MCRed/MCRed.skn",