diff --git a/data/common/KolibriNext/icons16.PNG b/data/common/KolibriNext/icons16.PNG deleted file mode 100644 index 49085c44c4..0000000000 Binary files a/data/common/KolibriNext/icons16.PNG and /dev/null differ diff --git a/data/common/icons16.png b/data/common/icons16.png index e68f995419..003282e919 100644 Binary files a/data/common/icons16.png and b/data/common/icons16.png differ diff --git a/data/common/settings/app.ini b/data/common/settings/app.ini index dad2380f4c..1c695d99a0 100644 --- a/data/common/settings/app.ini +++ b/data/common/settings/app.ini @@ -5,12 +5,12 @@ last_folder= [Eolite] ShowDeviceName=1 ShowStatusBar=1 -LineHeight=20 +LineHeight=23 [EFM] ShowDeviceName=1 ShowStatusBar=1 -LineHeight=18 +LineHeight=21 [Kiv] Next=PgDn diff --git a/data/common/settings/games.ini b/data/common/settings/games.ini index b9d7525418..e0d3d3d2c0 100644 --- a/data/common/settings/games.ini +++ b/data/common/settings/games.ini @@ -44,9 +44,9 @@ StarTrek71=/kg/sstartrek/SStarTrek Descent=games/descent [3D Shooter] -Quake=/kg/quake/sdlquake,56 -DOOM1=/kg/doom1/doom,43 Wolf3D=/kg/wolf3d/wolf3d,126 +DOOM1=/kg/doom1/doom,43 +Quake=/kg/quake/sdlquake,56 [Logical] Clicks=games/clicks,18 diff --git a/data/rus/settings/games.ini b/data/rus/settings/games.ini index abf2580885..b6ee0aa4c7 100644 --- a/data/rus/settings/games.ini +++ b/data/rus/settings/games.ini @@ -44,9 +44,9 @@ StarTrek71=/kg/sstartrek/SStarTrek Descent=games/descent [3D Шутеры] -Quake=/kg/quake/sdlquake,56 -DOOM1=/kg/doom1/doom,43 Wolf3D=/kg/wolf3d/wolf3d,126 +DOOM1=/kg/doom1/doom,43 +Quake=/kg/quake/sdlquake,56 [Логические] Clicks=games/clicks,18 diff --git a/programs/cmm/eolite/Eolite.c b/programs/cmm/eolite/Eolite.c index 66cb7f940c..917493ccac 100644 --- a/programs/cmm/eolite/Eolite.c +++ b/programs/cmm/eolite/Eolite.c @@ -3,8 +3,8 @@ // 70.5 - get volume info and label -#define TITLE "Eolite File Manager 4.70" -#define ABOUT_TITLE "EOLITE 4.70" +#define TITLE "Eolite File Manager 4.80" +#define ABOUT_TITLE "EOLITE 4.80" #ifndef AUTOBUILD #include "lang.h--" @@ -655,6 +655,8 @@ void DrawStatusBar() void DrawFilePanels() { int files_y; + int w2 = -Form.cwidth-1/2+Form.cwidth; + int h2; if (!two_panels.checked) { DrawDeviceAndActionsLeftPanel(); @@ -670,31 +672,32 @@ void DrawFilePanels() col.selec = col.selec_inactive; SystemDiscs.Draw(); files_y = files.y; + h2 = Form.cheight-files_y-2 - status_bar_h; if (active_panel==1) { llist_copy(#files, #files_inactive); strcpy(#path, #inactive_path); col.selec = col.selec_inactive; //this is a bad code: need to use some var to set inactive panel for DrawList(); - files.SetSizes(Form.cwidth/2, files_y, Form.cwidth/2 -17, Form.cheight-files_y-2 - status_bar_h, files.item_h); + files.SetSizes(Form.cwidth/2, files_y, w2-17, h2, files.item_h); DrawList(); Open_Dir(#path,WITH_REDRAW); llist_copy(#files, #files_active); strcpy(#path, #active_path); col.selec = col.selec_active; - files.SetSizes(2, files_y, Form.cwidth/2-2-17, Form.cheight-files_y-2 - status_bar_h, files.item_h); + files.SetSizes(2, files_y, Form.cwidth/2-2-17, h2, files.item_h); DrawList(); Open_Dir(#path,WITH_REDRAW); } if (active_panel==2) { - files.SetSizes(2, files_y, Form.cwidth/2-2-17, Form.cheight-files_y-2 - status_bar_h, files.item_h); + files.SetSizes(2, files_y, Form.cwidth/2-2-17, h2, files.item_h); DrawList(); Open_Dir(#path,WITH_REDRAW); llist_copy(#files, #files_active); strcpy(#path, #active_path); col.selec = col.selec_active; - files.SetSizes(Form.cwidth/2, files_y, Form.cwidth/2 -17, Form.cheight-files_y-2 - status_bar_h, files.item_h); + files.SetSizes(Form.cwidth/2, files_y, w2 -17, h2, files.item_h); DrawList(); Open_Dir(#path,WITH_REDRAW); } diff --git a/programs/cmm/eolite/include/copy_and_delete.h b/programs/cmm/eolite/include/copy_and_delete.h index f02cd80efe..a89633c795 100644 --- a/programs/cmm/eolite/include/copy_and_delete.h +++ b/programs/cmm/eolite/include/copy_and_delete.h @@ -109,7 +109,7 @@ void EventCopy(bool _cut_active) void PasteThread() { char copy_rezult; - int j; + int j, i, slash_count=0; int paste_elements_count = 0; dword buf; dword path_offset; @@ -125,6 +125,25 @@ void PasteThread() DisplayOperationForm(COPY_FLAG); } + if (cut_active) { + for (j = 0; j < paste_elements_count; j++) { + sprintf(#copy_to, "%s/%s", #path, path_offset+strrchr(path_offset,'/')); + slash_count = 0; + for (i=0; i<=10; i++) { + if (copy_to[i]=='/') slash_count++; + if (slash_count==3) break; + } + if (strncmp(#copy_to, path_offset, i)!=0) goto _DIFFERENT_DRIVES; + RenameMove(#copy_to+i, path_offset); + if (EAX!=0) goto _DIFFERENT_DRIVES; + path_offset += strlen(path_offset) + 1; + } + cut_active=false; + DialogExit(); + } + +_DIFFERENT_DRIVES: + path_offset = buf + 10; for (j = 0; j < paste_elements_count; j++) { copy_bar.max += GetFilesCount(path_offset); path_offset += strlen(path_offset) + 1; diff --git a/programs/cmm/eolite/include/icons.h b/programs/cmm/eolite/include/icons.h index 4639511162..199a86a144 100644 --- a/programs/cmm/eolite/include/icons.h +++ b/programs/cmm/eolite/include/icons.h @@ -21,8 +21,6 @@ void DrawIconByExtension(dword file_path, extension, xx, yy, fairing_color) default_icon=2; } - //KolibriNext - /* if (chrnum(file_path, '/')==2) { if (ESBYTE[file_path+1]=='/') ext[0] = ESBYTE[file_path+2]; else ext[0] = ESBYTE[file_path+1]; @@ -34,9 +32,7 @@ void DrawIconByExtension(dword file_path, extension, xx, yy, fairing_color) icons_ini.section = "drives16"; icon_n = icons_ini.GetInt(#ext, 50); } - } else - */ - if (extension) { + } else if (extension) { strcpy(#ext, extension); strlwr(#ext); icon_n = icons_ini.GetInt(#ext, default_icon); diff --git a/programs/cmm/eolite/include/left_panel.h b/programs/cmm/eolite/include/left_panel.h index 0a2efe0007..b55a161e1c 100644 --- a/programs/cmm/eolite/include/left_panel.h +++ b/programs/cmm/eolite/include/left_panel.h @@ -3,8 +3,8 @@ ?define T_DEVICES "Устройства" ?define T_ACTIONS "Действия" char *actions[] = { - 57, "Новый файл", "F7", - 56, "Новая папка", "F6", + 57, "Новый файл", "F9", + 56, "Новая папка", "F7", 60, "Настройки", "F10", 0,0,0 }; @@ -21,8 +21,8 @@ ?define T_DEVICES "Devices" ?define T_ACTIONS "Actions" char *actions[] = { - 57, "New file", "F7", - 56, "New folder", "F6", + 57, "New file", "F9", + 56, "New folder", "F7", 60, "Settings", "F10", 0,0,0 }; diff --git a/programs/cmm/eolite/include/menu.h b/programs/cmm/eolite/include/menu.h index 8ef980d2e7..ab16a7deeb 100644 --- a/programs/cmm/eolite/include/menu.h +++ b/programs/cmm/eolite/include/menu.h @@ -79,7 +79,7 @@ Cut |Crl+X Paste |Crl+V - Delete |Del -Properties |F8"; +Properties |F1"; char empty_folder_actions[]= "Paste |Crl+V"; char burger_menu_items[] = diff --git a/programs/cmm/eolite/include/settings.h b/programs/cmm/eolite/include/settings.h index c8b22ebc4c..9279b66ee5 100644 --- a/programs/cmm/eolite/include/settings.h +++ b/programs/cmm/eolite/include/settings.h @@ -155,13 +155,13 @@ void LoadIniSettings() show_status_bar.checked = ini.GetInt("ShowStatusBar", true); big_icons.checked = ini.GetInt("BigIcons", false); BigIconsSwitch(); //two_panels.checked = ini.GetInt("TwoPanels", false); - colored_lines.checked = ini.GetInt("ColoredLines", efm); + colored_lines.checked = ini.GetInt("ColoredLines", true); kfont.size.pt = ini.GetInt("FontSize", 13); files.item_h = ini.GetInt("LineHeight", 19); Form.left = ini.GetInt("WinX", 100); Form.top = ini.GetInt("WinY", 30); Form.width = ini.GetInt("WinW", efm*170+550); - Form.height = ini.GetInt("WinH", efm*116+503); + Form.height = ini.GetInt("WinH", efm*100+517); ini.GetString("DefaultPath", #path, 4096, "/rd/1"); ini.GetString("DefaultPath", #path_start, 4096, "/rd/1"); path_start_ed.size = path_start_ed.pos = strlen(#path_start); diff --git a/programs/cmm/template/Tupfile.lua b/programs/cmm/template/Tupfile.lua deleted file mode 100644 index 4103fe6042..0000000000 --- a/programs/cmm/template/Tupfile.lua +++ /dev/null @@ -1,6 +0,0 @@ -if tup.getconfig("NO_CMM") ~= "" then return end -if tup.getconfig("LANG") == "ru" -then C_LANG = "LANG_RUS" -else C_LANG = "LANG_ENG" -- this includes default case without config -end -tup.rule("template.c", "c-- /D=AUTOBUILD /D=$(C_LANG) %f" .. tup.getconfig("KPACK_CMD"), "template.com") diff --git a/programs/cmm/template/compile_en.bat b/programs/cmm/template/compile_en.bat deleted file mode 100644 index 911094a52a..0000000000 --- a/programs/cmm/template/compile_en.bat +++ /dev/null @@ -1,5 +0,0 @@ -@del *.kex -@c-- template.c -@rename *.com *.kex -@del warning.txt -@pause \ No newline at end of file diff --git a/programs/cmm/template/template.c b/programs/cmm/template/template.c deleted file mode 100644 index 3d79efe949..0000000000 --- a/programs/cmm/template/template.c +++ /dev/null @@ -1,37 +0,0 @@ -/* - * Template C-- program -*/ - -#define MEMSIZE 1024*40 - -#include "../lib/io.h" -#include "../lib/gui.h" - -proc_info Form; - -void main() -{ - word btn; - loop() switch(WaitEvent()) - { - case evButton: - btn = GetButtonID(); - if (btn == 1) ExitProcess(); - break; - - case evKey: - GetKeys(); - if (key_scancode == SCAN_CODE_ESC) ExitProcess(); - break; - - case evReDraw: - draw_window(); - break; - } -} - -void draw_window() -{ - DefineAndDrawWindow(215, 100, 350, 300, 0x34, 0xEEEeee, "Window title",0); - GetProcessInfo(#Form, SelfInfo); -} diff --git a/skins/_old/gliteskin/gliteskin_glider/Tupfile.lua b/skins/_old/gliteskin/gliteskin_glider/Tupfile.lua deleted file mode 100644 index 840f8d6f99..0000000000 --- a/skins/_old/gliteskin/gliteskin_glider/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"), "gliteskin_glider.skn") diff --git a/skins/_old/gliteskin/gliteskin_glider/base.bmp b/skins/_old/gliteskin/gliteskin_glider/base.bmp deleted file mode 100644 index 8e7d7e30b9..0000000000 Binary files a/skins/_old/gliteskin/gliteskin_glider/base.bmp and /dev/null differ diff --git a/skins/_old/gliteskin/gliteskin_glider/base_1.bmp b/skins/_old/gliteskin/gliteskin_glider/base_1.bmp deleted file mode 100644 index 6cccc49e5d..0000000000 Binary files a/skins/_old/gliteskin/gliteskin_glider/base_1.bmp and /dev/null differ diff --git a/skins/_old/gliteskin/gliteskin_glider/default.asm b/skins/_old/gliteskin/gliteskin_glider/default.asm deleted file mode 100644 index fd493349d8..0000000000 --- a/skins/_old/gliteskin/gliteskin_glider/default.asm +++ /dev/null @@ -1,33 +0,0 @@ -;SKIN (.SKN) - COMPILE WITH FASM - -include 'skin.inc' - -SKIN_PARAMS \ - height = bmp_base.height,\ ; skin height - margins = [5:1:46:1],\ ; margins [left:top:right:bottom] - colors active = [binner=0x000000:\ ; border inner color - bouter=0x000000:\ ; border outer color - bframe=0x5e7186],\ ; border frame color - colors inactive = [binner=0x000000:\ ; border inner color - bouter=0x000000:\ ; border outer color - bframe=0xeae8e3],\ ; border frame color - dtp = 'default.dtp' ; dtp colors - -SKIN_BUTTONS \ - close = [-22:3][17:17],\ ; buttons coordinates - minimize = [-41:3][17:17] ; [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 ,'left.bmp' ; skin bitmaps -BITMAP bmp_oper ,'oper.bmp' -BITMAP bmp_base ,'base.bmp' -BITMAP bmp_left1,'left_1.bmp' -BITMAP bmp_oper1,'oper_1.bmp' -BITMAP bmp_base1,'base_1.bmp' diff --git a/skins/_old/gliteskin/gliteskin_glider/default.dtp b/skins/_old/gliteskin/gliteskin_glider/default.dtp deleted file mode 100644 index 2d963add42..0000000000 Binary files a/skins/_old/gliteskin/gliteskin_glider/default.dtp and /dev/null differ diff --git a/skins/_old/gliteskin/gliteskin_glider/default.dtp.asm b/skins/_old/gliteskin/gliteskin_glider/default.dtp.asm deleted file mode 100644 index 59b534e6ce..0000000000 --- a/skins/_old/gliteskin/gliteskin_glider/default.dtp.asm +++ /dev/null @@ -1,11 +0,0 @@ -;SYSTEM COLORS (.DTP) - COMPILE WITH FASM -frame dd 0x5e7186 -grab dd 0x859fbb -grab_button dd 0xf0eeeb -grab_button_text dd 0x3a3a38 -grab_text dd 0xFFFFFF -work dd 0xEBE9E3 -work_button dd 0xEBE9E3 -work_button_text dd 0x000000 -work_text dd 0x000000 -work_graph dd 0x9E9A91 \ No newline at end of file diff --git a/skins/_old/gliteskin/gliteskin_glider/dtp_build.bat b/skins/_old/gliteskin/gliteskin_glider/dtp_build.bat deleted file mode 100644 index 2fddee0e38..0000000000 --- a/skins/_old/gliteskin/gliteskin_glider/dtp_build.bat +++ /dev/null @@ -1,2 +0,0 @@ -fasm default.dtp.asm default.dtp -pause \ No newline at end of file diff --git a/skins/_old/gliteskin/gliteskin_glider/left.bmp b/skins/_old/gliteskin/gliteskin_glider/left.bmp deleted file mode 100644 index 28db2fb3c0..0000000000 Binary files a/skins/_old/gliteskin/gliteskin_glider/left.bmp and /dev/null differ diff --git a/skins/_old/gliteskin/gliteskin_glider/left_1.bmp b/skins/_old/gliteskin/gliteskin_glider/left_1.bmp deleted file mode 100644 index eb532ed4cf..0000000000 Binary files a/skins/_old/gliteskin/gliteskin_glider/left_1.bmp and /dev/null differ diff --git a/skins/_old/gliteskin/gliteskin_glider/oper.bmp b/skins/_old/gliteskin/gliteskin_glider/oper.bmp deleted file mode 100644 index f5564c8f24..0000000000 Binary files a/skins/_old/gliteskin/gliteskin_glider/oper.bmp and /dev/null differ diff --git a/skins/_old/gliteskin/gliteskin_glider/oper_1.bmp b/skins/_old/gliteskin/gliteskin_glider/oper_1.bmp deleted file mode 100644 index 23ff27668e..0000000000 Binary files a/skins/_old/gliteskin/gliteskin_glider/oper_1.bmp and /dev/null differ diff --git a/skins/_old/gliteskin/gliteskin_glider/pack_build.bat b/skins/_old/gliteskin/gliteskin_glider/pack_build.bat deleted file mode 100644 index 7e7d474b2c..0000000000 --- a/skins/_old/gliteskin/gliteskin_glider/pack_build.bat +++ /dev/null @@ -1 +0,0 @@ -kpack default.skn default.pack.skn diff --git a/skins/_old/gliteskin/gliteskin_glider/skin.inc b/skins/_old/gliteskin/gliteskin_glider/skin.inc deleted file mode 100644 index 81a6bd8f3f..0000000000 --- a/skins/_old/gliteskin/gliteskin_glider/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/gliteskin/gliteskin_glider/skn_build.bat b/skins/_old/gliteskin/gliteskin_glider/skn_build.bat deleted file mode 100644 index 2828114c6b..0000000000 --- a/skins/_old/gliteskin/gliteskin_glider/skn_build.bat +++ /dev/null @@ -1,2 +0,0 @@ -fasm default.asm default.skn -pause \ No newline at end of file diff --git a/skins/_old/mygrey/Tupfile.lua b/skins/_old/mygrey/Tupfile.lua deleted file mode 100644 index 97faab2a2c..0000000000 --- a/skins/_old/mygrey/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"), "mygrey.skn") diff --git a/skins/_old/mygrey/base.bmp b/skins/_old/mygrey/base.bmp deleted file mode 100644 index ad9674f24e..0000000000 Binary files a/skins/_old/mygrey/base.bmp and /dev/null differ diff --git a/skins/_old/mygrey/build.bat b/skins/_old/mygrey/build.bat deleted file mode 100644 index c3a93565d4..0000000000 --- a/skins/_old/mygrey/build.bat +++ /dev/null @@ -1,9 +0,0 @@ -@echo off -set fasm=c:\kolibri\usr\dos\fasm.exe -set file=default -set srcext=asm -set binext=skn - -%fasm% %file%.%srcext% %file%.%binext% -pause -echo. \ No newline at end of file diff --git a/skins/_old/mygrey/default.asm b/skins/_old/mygrey/default.asm deleted file mode 100644 index 2e7f9e9abb..0000000000 --- a/skins/_old/mygrey/default.asm +++ /dev/null @@ -1,28 +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=0xffffff:\ ; border inner color - bouter=0x6e6e6e:\ ; border outer color - bframe=0x7d7d7d],\ ; border frame color - colors inactive = [binner=0xffffff:\ ; border inner color - bouter=0x6e6e6e:\ ; border outer color - bframe=0x7d7d7d],\ ; border frame color - dtp = 'gray.dtp' ; dtp colors - -SKIN_BUTTONS \ - close = [-21:3][16:16],\ ; buttons coordinates - minimize = [-39:3][16:16] ; [left:top][width:height] - -SKIN_BITMAPS \ - left active = bmp_left,\ ; skin bitmaps pointers - left inactive = bmp_left,\ - oper active = bmp_oper,\ - oper inactive = bmp_oper,\ - base active = bmp_base,\ - base inactive = bmp_base - -BITMAP bmp_left ,'left.bmp' ; skin bitmaps -BITMAP bmp_oper ,'oper.bmp' -BITMAP bmp_base ,'base.bmp' \ No newline at end of file diff --git a/skins/_old/mygrey/gray.dtp b/skins/_old/mygrey/gray.dtp deleted file mode 100644 index 15b66db988..0000000000 Binary files a/skins/_old/mygrey/gray.dtp and /dev/null differ diff --git a/skins/_old/mygrey/left.bmp b/skins/_old/mygrey/left.bmp deleted file mode 100644 index f2bf274df6..0000000000 Binary files a/skins/_old/mygrey/left.bmp and /dev/null differ diff --git a/skins/_old/mygrey/oper.bmp b/skins/_old/mygrey/oper.bmp deleted file mode 100644 index cd5cacefe3..0000000000 Binary files a/skins/_old/mygrey/oper.bmp and /dev/null differ diff --git a/skins/_old/mygrey/skin.inc b/skins/_old/mygrey/skin.inc deleted file mode 100644 index 81a6bd8f3f..0000000000 --- a/skins/_old/mygrey/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/myskin1/Tupfile.lua b/skins/_old/myskin1/Tupfile.lua deleted file mode 100644 index 5c3dd43576..0000000000 --- a/skins/_old/myskin1/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"), "myskin1.skn") diff --git a/skins/_old/myskin1/base.bmp b/skins/_old/myskin1/base.bmp deleted file mode 100644 index 2183439ff2..0000000000 Binary files a/skins/_old/myskin1/base.bmp and /dev/null differ diff --git a/skins/_old/myskin1/default.asm b/skins/_old/myskin1/default.asm deleted file mode 100644 index 8829a195b6..0000000000 --- a/skins/_old/myskin1/default.asm +++ /dev/null @@ -1,28 +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=0x000000:\ ; border inner color - bouter=0x000000:\ ; border outer color - bframe=0x4488ff],\ ; border frame color - colors inactive = [binner=0x000000:\ ; border inner color - bouter=0x000000:\ ; border outer color - bframe=0x4488ff],\ ; border frame color - dtp = 'myblue.dtp' ; dtp colors - -SKIN_BUTTONS \ - close = [-21:3][16:16],\ ; buttons coordinates - minimize = [-39:3][16:16] ; [left:top][width:height] - -SKIN_BITMAPS \ - left active = bmp_left,\ ; skin bitmaps pointers - left inactive = bmp_left,\ - oper active = bmp_oper,\ - oper inactive = bmp_oper,\ - base active = bmp_base,\ - base inactive = bmp_base - -BITMAP bmp_left ,'left.bmp' ; skin bitmaps -BITMAP bmp_oper ,'oper.bmp' -BITMAP bmp_base ,'base.bmp' \ No newline at end of file diff --git a/skins/_old/myskin1/left.bmp b/skins/_old/myskin1/left.bmp deleted file mode 100644 index 263f4cecb3..0000000000 Binary files a/skins/_old/myskin1/left.bmp and /dev/null differ diff --git a/skins/_old/myskin1/myblue.dtp b/skins/_old/myskin1/myblue.dtp deleted file mode 100644 index 9e268cc7a7..0000000000 Binary files a/skins/_old/myskin1/myblue.dtp and /dev/null differ diff --git a/skins/_old/myskin1/oper.bmp b/skins/_old/myskin1/oper.bmp deleted file mode 100644 index 2e77ff3585..0000000000 Binary files a/skins/_old/myskin1/oper.bmp and /dev/null differ diff --git a/skins/_old/myskin1/skin.inc b/skins/_old/myskin1/skin.inc deleted file mode 100644 index 81a6bd8f3f..0000000000 --- a/skins/_old/myskin1/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/myskin3/Tupfile.lua b/skins/_old/myskin3/Tupfile.lua deleted file mode 100644 index 47505c41d8..0000000000 --- a/skins/_old/myskin3/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"), "myskin3.skn") diff --git a/skins/_old/myskin3/base.bmp b/skins/_old/myskin3/base.bmp deleted file mode 100644 index 38fc96e93c..0000000000 Binary files a/skins/_old/myskin3/base.bmp and /dev/null differ diff --git a/skins/_old/myskin3/default.asm b/skins/_old/myskin3/default.asm deleted file mode 100644 index 322632e3ef..0000000000 --- a/skins/_old/myskin3/default.asm +++ /dev/null @@ -1,28 +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=0x3355dd:\ ; border inner color - bouter=0x1133dd:\ ; border outer color - bframe=0x6688dd],\ ; border frame color - colors inactive = [binner=0x3355dd:\ ; border inner color - bouter=0x1133dd:\ ; border outer color - bframe=0x6688dd],\ ; border frame color - dtp = 'myblue.dtp' ; dtp colors - -SKIN_BUTTONS \ - close = [-21:3][16:16],\ ; buttons coordinates - minimize = [-39:3][16:16] ; [left:top][width:height] - -SKIN_BITMAPS \ - left active = bmp_left,\ ; skin bitmaps pointers - left inactive = bmp_left,\ - oper active = bmp_oper,\ - oper inactive = bmp_oper,\ - base active = bmp_base,\ - base inactive = bmp_base - -BITMAP bmp_left ,'left.bmp' ; skin bitmaps -BITMAP bmp_oper ,'oper.bmp' -BITMAP bmp_base ,'base.bmp' \ No newline at end of file diff --git a/skins/_old/myskin3/left.bmp b/skins/_old/myskin3/left.bmp deleted file mode 100644 index fb97cfc05c..0000000000 Binary files a/skins/_old/myskin3/left.bmp and /dev/null differ diff --git a/skins/_old/myskin3/myblue.dtp b/skins/_old/myskin3/myblue.dtp deleted file mode 100644 index 9e268cc7a7..0000000000 Binary files a/skins/_old/myskin3/myblue.dtp and /dev/null differ diff --git a/skins/_old/myskin3/oper.bmp b/skins/_old/myskin3/oper.bmp deleted file mode 100644 index 2563659891..0000000000 Binary files a/skins/_old/myskin3/oper.bmp and /dev/null differ diff --git a/skins/_old/myskin3/skin.inc b/skins/_old/myskin3/skin.inc deleted file mode 100644 index 81a6bd8f3f..0000000000 --- a/skins/_old/myskin3/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/myskin4/Tupfile.lua b/skins/_old/myskin4/Tupfile.lua deleted file mode 100644 index 8eaadc9ef4..0000000000 --- a/skins/_old/myskin4/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"), "myskin4.skn") diff --git a/skins/_old/myskin4/base.bmp b/skins/_old/myskin4/base.bmp deleted file mode 100644 index cf52d233fe..0000000000 Binary files a/skins/_old/myskin4/base.bmp and /dev/null differ diff --git a/skins/_old/myskin4/build.bat b/skins/_old/myskin4/build.bat deleted file mode 100644 index c3a93565d4..0000000000 --- a/skins/_old/myskin4/build.bat +++ /dev/null @@ -1,9 +0,0 @@ -@echo off -set fasm=c:\kolibri\usr\dos\fasm.exe -set file=default -set srcext=asm -set binext=skn - -%fasm% %file%.%srcext% %file%.%binext% -pause -echo. \ No newline at end of file diff --git a/skins/_old/myskin4/default.asm b/skins/_old/myskin4/default.asm deleted file mode 100644 index c919d39d6c..0000000000 --- a/skins/_old/myskin4/default.asm +++ /dev/null @@ -1,28 +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=0xffffff:\ ; border inner color - bouter=0x7d7d7d:\ ; border outer color - bframe=0x6e6e6e],\ ; border frame color - colors inactive = [binner=0xffffff:\ ; border inner color - bouter=0x7d7d7d:\ ; border outer color - bframe=0x6e6e6e],\ ; border frame color - dtp = 'default.dtp' ; dtp colors - -SKIN_BUTTONS \ - close = [-21:3][16:16],\ ; buttons coordinates - minimize = [-39:3][16:16] ; [left:top][width:height] - -SKIN_BITMAPS \ - left active = bmp_left,\ ; skin bitmaps pointers - left inactive = bmp_left,\ - oper active = bmp_oper,\ - oper inactive = bmp_oper,\ - base active = bmp_base,\ - base inactive = bmp_base - -BITMAP bmp_left ,'left.bmp' ; skin bitmaps -BITMAP bmp_oper ,'oper.bmp' -BITMAP bmp_base ,'base.bmp' \ No newline at end of file diff --git a/skins/_old/myskin4/default.dtp b/skins/_old/myskin4/default.dtp deleted file mode 100644 index d87c183321..0000000000 Binary files a/skins/_old/myskin4/default.dtp and /dev/null differ diff --git a/skins/_old/myskin4/left.bmp b/skins/_old/myskin4/left.bmp deleted file mode 100644 index 547f638ddb..0000000000 Binary files a/skins/_old/myskin4/left.bmp and /dev/null differ diff --git a/skins/_old/myskin4/oper.bmp b/skins/_old/myskin4/oper.bmp deleted file mode 100644 index 27c8185866..0000000000 Binary files a/skins/_old/myskin4/oper.bmp and /dev/null differ diff --git a/skins/_old/myskin4/skin.inc b/skins/_old/myskin4/skin.inc deleted file mode 100644 index 81a6bd8f3f..0000000000 --- a/skins/_old/myskin4/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/nix/nix_big/Tupfile.lua b/skins/_old/nix/nix_big/Tupfile.lua deleted file mode 100644 index 19cd6c8fc5..0000000000 --- a/skins/_old/nix/nix_big/Tupfile.lua +++ /dev/null @@ -1,2 +0,0 @@ -if tup.getconfig("NO_FASM") ~= "" then return end -tup.rule("nix_big.asm", 'fasm "%f" "%o" ' .. tup.getconfig("KPACK_CMD"), "nix_big.skn") diff --git a/skins/_old/nix/nix_big/active/base.bmp b/skins/_old/nix/nix_big/active/base.bmp deleted file mode 100644 index d7180535d1..0000000000 Binary files a/skins/_old/nix/nix_big/active/base.bmp and /dev/null differ diff --git a/skins/_old/nix/nix_big/active/left.bmp b/skins/_old/nix/nix_big/active/left.bmp deleted file mode 100644 index 800ed0337c..0000000000 Binary files a/skins/_old/nix/nix_big/active/left.bmp and /dev/null differ diff --git a/skins/_old/nix/nix_big/active/oper.bmp b/skins/_old/nix/nix_big/active/oper.bmp deleted file mode 100644 index 7ed01543ed..0000000000 Binary files a/skins/_old/nix/nix_big/active/oper.bmp and /dev/null differ diff --git a/skins/_old/nix/nix_big/inactive/base.bmp b/skins/_old/nix/nix_big/inactive/base.bmp deleted file mode 100644 index 0fa0344f67..0000000000 Binary files a/skins/_old/nix/nix_big/inactive/base.bmp and /dev/null differ diff --git a/skins/_old/nix/nix_big/inactive/left.bmp b/skins/_old/nix/nix_big/inactive/left.bmp deleted file mode 100644 index befa12e299..0000000000 Binary files a/skins/_old/nix/nix_big/inactive/left.bmp and /dev/null differ diff --git a/skins/_old/nix/nix_big/inactive/oper.bmp b/skins/_old/nix/nix_big/inactive/oper.bmp deleted file mode 100644 index ee61593987..0000000000 Binary files a/skins/_old/nix/nix_big/inactive/oper.bmp and /dev/null differ diff --git a/skins/_old/nix/nix_big/nix_big.asm b/skins/_old/nix/nix_big/nix_big.asm deleted file mode 100644 index 99be99144d..0000000000 --- a/skins/_old/nix/nix_big/nix_big.asm +++ /dev/null @@ -1,31 +0,0 @@ -include 'skin.inc' - -SKIN_PARAMS \ - height = bmp_base.height,\ ; skin height - margins = [5:1:18:3],\ ; margins [left:top:right:bottom] - colors active = [binner=0x363C46:\ ; border inner color - bouter=0x363C46:\ ; border outer color - bframe=0x363C46],\ ; border frame color - colors inactive = [binner=0x393C46:\ ; border inner color - bouter=0x393C46:\ ; border outer color - bframe=0x393C46],\ ; border frame color - dtp = 'nix_big.dtp' ; dtp colors - -SKIN_BUTTONS \ - close = [-25:9][15:15],\ ; buttons coordinates - minimize = [-43:9][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/nix/nix_big/nix_big.dtp b/skins/_old/nix/nix_big/nix_big.dtp deleted file mode 100644 index 15b66db988..0000000000 Binary files a/skins/_old/nix/nix_big/nix_big.dtp and /dev/null differ diff --git a/skins/_old/nix/nix_big/skin.inc b/skins/_old/nix/nix_big/skin.inc deleted file mode 100644 index 81a6bd8f3f..0000000000 --- a/skins/_old/nix/nix_big/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/nix/nix_medium/Tupfile.lua b/skins/_old/nix/nix_medium/Tupfile.lua deleted file mode 100644 index daf4a249dc..0000000000 --- a/skins/_old/nix/nix_medium/Tupfile.lua +++ /dev/null @@ -1,2 +0,0 @@ -if tup.getconfig("NO_FASM") ~= "" then return end -tup.rule("nix_medium.asm", 'fasm "%f" "%o" ' .. tup.getconfig("KPACK_CMD"), "nix_medium.skn") diff --git a/skins/_old/nix/nix_medium/active/base.bmp b/skins/_old/nix/nix_medium/active/base.bmp deleted file mode 100644 index d368470fea..0000000000 Binary files a/skins/_old/nix/nix_medium/active/base.bmp and /dev/null differ diff --git a/skins/_old/nix/nix_medium/active/left.bmp b/skins/_old/nix/nix_medium/active/left.bmp deleted file mode 100644 index 8500f7a82a..0000000000 Binary files a/skins/_old/nix/nix_medium/active/left.bmp and /dev/null differ diff --git a/skins/_old/nix/nix_medium/active/oper.bmp b/skins/_old/nix/nix_medium/active/oper.bmp deleted file mode 100644 index 574b576191..0000000000 Binary files a/skins/_old/nix/nix_medium/active/oper.bmp and /dev/null differ diff --git a/skins/_old/nix/nix_medium/inactive/base.bmp b/skins/_old/nix/nix_medium/inactive/base.bmp deleted file mode 100644 index 354be176a5..0000000000 Binary files a/skins/_old/nix/nix_medium/inactive/base.bmp and /dev/null differ diff --git a/skins/_old/nix/nix_medium/inactive/left.bmp b/skins/_old/nix/nix_medium/inactive/left.bmp deleted file mode 100644 index c730539428..0000000000 Binary files a/skins/_old/nix/nix_medium/inactive/left.bmp and /dev/null differ diff --git a/skins/_old/nix/nix_medium/inactive/oper.bmp b/skins/_old/nix/nix_medium/inactive/oper.bmp deleted file mode 100644 index ed30564aac..0000000000 Binary files a/skins/_old/nix/nix_medium/inactive/oper.bmp and /dev/null differ diff --git a/skins/_old/nix/nix_medium/nix_medium.asm b/skins/_old/nix/nix_medium/nix_medium.asm deleted file mode 100644 index 910bbaa1bc..0000000000 --- a/skins/_old/nix/nix_medium/nix_medium.asm +++ /dev/null @@ -1,31 +0,0 @@ -include 'skin.inc' - -SKIN_PARAMS \ - height = bmp_base.height,\ ; skin height - margins = [5:1:18:2],\ ; margins [left:top:right:bottom] - colors active = [binner=0x363C46:\ ; border inner color - bouter=0x363C46:\ ; border outer color - bframe=0x363C46],\ ; border frame color - colors inactive = [binner=0x393C46:\ ; border inner color - bouter=0x393C46:\ ; border outer color - bframe=0x393C46],\ ; border frame color - dtp = 'nix_medium.dtp' ; dtp colors - -SKIN_BUTTONS \ - close = [-19:6][12:12],\ ; buttons coordinates - minimize = [-33: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' diff --git a/skins/_old/nix/nix_medium/nix_medium.dtp b/skins/_old/nix/nix_medium/nix_medium.dtp deleted file mode 100644 index 15b66db988..0000000000 Binary files a/skins/_old/nix/nix_medium/nix_medium.dtp and /dev/null differ diff --git a/skins/_old/nix/nix_medium/skin.inc b/skins/_old/nix/nix_medium/skin.inc deleted file mode 100644 index 81a6bd8f3f..0000000000 --- a/skins/_old/nix/nix_medium/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/skinlist.lua b/skins/skinlist.lua index 243ebafcaa..273e4e9da2 100644 --- a/skins/skinlist.lua +++ b/skins/skinlist.lua @@ -44,7 +44,6 @@ skinlist = { "_old/first_skin/first_skin.skn", "_old/Flyght/Flyght.skn", "_old/gliteskin/gliteskin_deepsky/gliteskin_deepsky.skn", -"_old/gliteskin/gliteskin_glider/gliteskin_glider.skn", "_old/gliteskin/gliteskin_red/gliteskin_red.skn", "_old/gnome_style/gnome_blue/gnome_blue.skn", "_old/gnome_style/gnome_green/gnome_green.skn", @@ -74,17 +73,11 @@ skinlist = { "_old/mist/mist.skn", "_old/mist_color/mist_color.skn", "_old/mursky/mursky.skn", -"_old/mygrey/mygrey.skn", -"_old/myskin1/myskin1.skn", -"_old/myskin3/myskin3.skn", -"_old/myskin4/myskin4.skn", "_old/MyTango/MyTango.skn", "_old/Nature/Nature.skn", "_old/neutral/neutral_blue/neutral_blue.skn", "_old/neutral/neutral_green/neutral_green.skn", "_old/neutral/neutral_lilac/neutral_lilac.skn", -"_old/nix/nix_big/nix_big.skn", -"_old/nix/nix_medium/nix_medium.skn", "_old/nix/nix_small/nix_small.skn", "_old/Nova_skins/Nova_blue/Nova_blue.skn", "_old/OpusOs_Blue/OpusOs_Blue.skn",