diff --git a/programs/cmm/eolite/Eolite.c b/programs/cmm/eolite/Eolite.c
index d9bc85062a..47e0612028 100644
--- a/programs/cmm/eolite/Eolite.c
+++ b/programs/cmm/eolite/Eolite.c
@@ -213,7 +213,7 @@ void main()
else {
param[strrchr(#param, '/')-1] = '\0';
strcpy(#path, #param);
- //in future we need also to select file
+ SelectFileByName(#param+strlen(#param)+1);
}
}
}
@@ -712,7 +712,7 @@ void Line_ReDraw(dword bgcol, filenum){
y=filenum*files.item_h+files.y,
icon_y = files.item_h-icon_size/2+1+y;
BDVK file;
- char temp_path[sizeof(file_path)];
+ char full_path[4096];
char label_file_name[4096];
if (filenum==-1) return;
DrawBar(files.x,y,4,files.item_h,bgcol);
@@ -727,7 +727,7 @@ void Line_ReDraw(dword bgcol, filenum){
file.sizelo = ESDWORD[file_offet+32];
file.sizehi = ESDWORD[file_offet+36];
file_name_off = file_offet+40;
- sprintf(#temp_path,"%s/%s",#path,file_name_off);
+ sprintf(#full_path,"%s/%s",#path,file_name_off);
if (! TestBit(attr, 4) ) //file or folder?
{
@@ -742,11 +742,11 @@ void Line_ReDraw(dword bgcol, filenum){
ext1="
";
WriteTextCenter(files.x+files.w-140, files.text_y+y+1, 72, col.list_gb_text, ext1);
}
- if (chrnum(#path, '/')==1) file_size = GetDeviceSizeLabel(#temp_path);
+ if (chrnum(#path, '/')==1) file_size = GetDeviceSizeLabel(#full_path);
}
if (file_size) WriteText(7-strlen(file_size)*6+files.x+files.w-58,
files.text_y+y+1, files.font_type, col.list_gb_text, file_size);
- DrawIconByExtension(#temp_path, ext1, files.x+4, icon_y, bgcol);
+ DrawIconByExtension(#full_path, ext1, files.x+4, icon_y, bgcol);
if (TestBit(attr, 1)) || (TestBit(attr, 2)) text_col=col.list_text_hidden; //system or hiden?
if (bgcol==col.selec)
diff --git a/programs/cmm/quark/Tupfile.lua b/programs/cmm/quark/Tupfile.lua
new file mode 100644
index 0000000000..e0e0203184
--- /dev/null
+++ b/programs/cmm/quark/Tupfile.lua
@@ -0,0 +1,6 @@
+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("quark.c", "c-- /D=AUTOBUILD /D=$(C_LANG) %f" .. tup.getconfig("KPACK_CMD"), "quark.com")
diff --git a/programs/cmm/quark/build.bat b/programs/cmm/quark/build.bat
new file mode 100644
index 0000000000..f6409a2c24
--- /dev/null
+++ b/programs/cmm/quark/build.bat
@@ -0,0 +1,15 @@
+@ECHO OFF
+
+C-- "quark.c"
+del "quark"
+rename "quark.com" "quark"
+del warning.txt
+
+if exist quark (
+ "C:\Program Files (x86)\WinImage\winimage.exe" "D:\Kolibri\Desktop\kolibri.img" /H /Q /I quark
+ d:
+ cd "D:\Kolibri\Infrastructure\QEMU"
+ call "z_kos.bat"
+) else (
+ pause
+)
diff --git a/programs/cmm/quark/data.h b/programs/cmm/quark/data.h
new file mode 100644
index 0000000000..92c9251216
--- /dev/null
+++ b/programs/cmm/quark/data.h
@@ -0,0 +1,140 @@
+//===================================================//
+// //
+// TRANSLATIONS //
+// //
+//===================================================//
+
+char short_app_name[] = "Quark";
+
+#ifdef LANG_RUS
+
+char intro[] = "Это простой просмотрщик текста.
+Попробуйте открыть какой-нибудь текстовый файл.";
+
+char copied_chars[] = "Скопировано сиволов: %i";
+
+char about[] = "Quark Text v0.2
+Автор: Кирилл Липатов aka Leency
+Сайт: http://aspero.pro
+
+Горячие клавиши:
+Ctrl+O - открыть файл
+Ctrl+I - показать информацию о файле
+Ctrl+Плюс - увеличить шрифт
+Ctrl+Минус - уменьшить шрифт
+Ctrl+Tab - выбрать кодировку текста
+Ctrl+E - открыть файл в другой программе
+
+Поиск:
+Ctrl+F - открыть панель поиска
+F3 - искать далее
+Esc - скрыть панель поиска";
+
+char color_scheme_names[] = "Творожек\nКосмос ";
+#define FILE_SAVED_WELL "'Файл успешно сохранен'O"
+#define FILE_NOT_SAVED "'Ошибка при сохранении файла!'E"
+
+char rmb_menu[] =
+"Вырезать|Ctrl+X
+Копировать|Ctrl+C
+Вставить|Ctrl+V
+-
+Открыть в папке
+Копировать путь файла";
+
+#else
+
+char intro[] = "Quark will be a nice Code Editor one day.
+Try to open some text file.";
+
+char copied_chars[] = "Copied %i chars";
+
+char about[] = "Quark Text v0.2
+Author: Kiril Lipatov aka Leency
+Website: http://aspero.pro
+
+Hotkeys:
+Ctrl+O - open file
+Ctrl+I - show file properties
+Ctrl+Plus - bigger font
+Ctrl+Down - smaller font
+Ctrl+Tab - select charset
+Ctrl+E - reopen current file in another app
+
+Search:
+Ctrl+F - open search
+F3 - search next
+Esc - hide search bar";
+
+char color_scheme_names[] = "Dairy\nCosmos ";
+#define FILE_SAVED_WELL "'File saved'O"
+#define FILE_NOT_SAVED "'Error saving file!'E"
+
+char rmb_menu[] =
+"Cut|Ctrl+X
+Copy|Ctrl+C
+Paste|Ctrl+V
+-
+Reveal in folder
+Copy file path";
+
+#endif
+
+//===================================================//
+// //
+// DATA //
+// //
+//===================================================//
+
+dword color_schemes[] = {
+//bg, text, scroll, selected, cursor
+0xFCF0DA, 0x171501, 0xB2ACA0, 0xD8CAA7, 0xFF0000, //Dairy
+0x282923, 0xD8D8D2, 0x555551, 0x5A574A, 0xFFFfff //Cosmos
+};
+
+struct THEME
+{
+ dword bg, text, cursor;
+} theme;
+
+char default_dir[] = "/rd/1";
+od_filter filter2 = { 33, "TXT\0ASM\0HTM\0HTML\0C\0H\0C--\0H--\0CPP\0\0" };
+
+DrawBufer DrawBuf;
+
+dword cursor_pos=0;
+
+collection_int lines = {0};
+
+//===================================================//
+// //
+// SETTINGS //
+// //
+//===================================================//
+
+
+_ini ini = { "/sys/settings/app.ini", "Quark" };
+
+void LoadIniSettings()
+{
+ font_size = ini.GetInt("FontSize", 'M');
+ user_encoding = ini.GetInt("Encoding", CH_AUTO);
+ curcol_scheme = ini.GetInt("ColorScheme", 0);
+ Form.left = ini.GetInt("WinX", 150);
+ Form.top = ini.GetInt("WinY", 50);
+ Form.width = ini.GetInt("WinW", 640);
+ Form.height = ini.GetInt("WinH", 560);
+}
+
+void SaveIniSettings()
+{
+ ini.SetInt("FontSize", font_size);
+ ini.SetInt("Encoding", user_encoding);
+ ini.SetInt("ColorScheme", curcol_scheme);
+ ini.SetInt("WinX", Form.left);
+ ini.SetInt("WinY", Form.top);
+ ini.SetInt("WinW", Form.width);
+ ini.SetInt("WinH", Form.height);
+}
+
+
diff --git a/programs/cmm/quark/prepare_page.h b/programs/cmm/quark/prepare_page.h
new file mode 100644
index 0000000000..55cd554f7b
--- /dev/null
+++ b/programs/cmm/quark/prepare_page.h
@@ -0,0 +1,86 @@
+
+void ParseAndPaint()
+{
+ //search.clear();
+ list.KeyHome();
+ list.count=0;
+
+ Parse();
+
+ list.visible = list.h / list.item_h;
+ if (list.count < list.visible) {
+ DrawBuf.bufh = list.visible;
+ } else {
+ DrawBuf.bufh = list.count;
+ }
+
+ DrawBuf.Init(list.x, list.y, list.w, DrawBuf.bufh+1*list.item_h);
+ DrawPage();
+}
+
+void Parse()
+{
+dword off;
+int line_end;
+dword line_length=0;
+dword line_start = io.buffer_data;
+dword buflen = strlen(io.buffer_data) + io.buffer_data;
+
+ lines.drop();
+ lines.add(io.buffer_data);
+ selection.cancel();
+
+ for (off = io.buffer_data; off < buflen; off++)
+ {
+ line_length += list.font_w;
+ if (line_length + 30 >= list.w) || (ESBYTE[off] == 10)
+ {
+ //searching a 'white' for a normal word-break
+ for(line_end = off; line_end != line_start; line_end--)
+ {
+ if (__isWhite(ESBYTE[line_end])) { off=line_end+1; break; }
+ }
+ line_length = off - line_start * list.font_w;
+ list.count++;
+ lines.add(off);
+ line_start = off;
+ line_length = 0;
+ }
+ }
+ lines.add(buflen);
+ list.count++;
+}
+
+void PaintVisible()
+{
+ int i;
+ dword y;
+ dword line_bg;
+ bool swapped = false;
+
+ list.column_max = lines.get(list.cur_y+1) - lines.get(list.cur_y);
+ list.CheckDoesValuesOkey();
+ if (selection.end_offset < selection.start_offset) {
+ swapped = selection.swap_start_end();
+ }
+
+ for ( i=list.first; i < list.first+list.visible+1; i++)
+ {
+ y = i * list.item_h;
+ line_bg = theme.bg;
+
+ if (selection.start_y < i) && (selection.end_y > i) line_bg = selection.color;
+ DrawBuf.DrawBar(0, y, list.w, list.item_h, line_bg);
+
+ selection.draw(i);
+
+ if (i= list.column_max) return;
+
+ ESBYTE[cursor_pos] = key_ascii;
+ list.KeyRight();
+ PaintVisible();
+}
+
+void EventOpenSysfuncs()
+{
+ if (io.run("/sys/docpack", "f") <= 0) {
+ notify("'Can not open SysFunctions because\n/rd/1/docpack is not found!'E");
+ }
+}
+
+void EventOpenPipet()
+{
+ io.run("/sys/develop/pipet", NULL);
+}
+
+void EventRbmMenuClick(dword id)
+{
+ switch(id) {
+ case 0: EventCut(); break;
+ case 1: EventCopy(); break;
+ case 2: EventPaste(); break;
+ case 3: EventRevealInFolder(); break;
+ case 4: EventCopyFilePath(); break;
+ }
+}
+
+void EventCut()
+{
+ //selection.copy();
+}
+
+void EventCopy()
+{
+ char copy_status_text[32];
+
+ dword copy_buf;
+ dword copy_len;
+ dword copy_start;
+ dword copy_end;
+
+ if (selection.is_active()) {
+ copy_start = selection.start_offset;
+ copy_end = selection.end_offset;
+ if (copy_start > copy_end) copy_start >< copy_end;
+ } else {
+ copy_start = lines.get(list.cur_y);
+ copy_end = lines.get(list.cur_y+1);
+ }
+ copy_len = copy_end - copy_start;
+ copy_buf = malloc(copy_len + 2);
+ strncpy(copy_buf, copy_start, copy_len);
+ ESBYTE[copy_buf+copy_len] = '\0';
+ Clipboard__CopyText(copy_buf);
+ free(copy_buf);
+
+ sprintf(#copy_status_text, #copied_chars, copy_len);
+ DrawStatusBar(#copy_status_text);
+}
+
+void EventPaste()
+{
+ //selection.copy();
+}
+
+void EventRevealInFolder()
+{
+ RunProgram("/sys/File managers/Eolite", #param);
+}
+
+void EventCopyFilePath()
+{
+ char copy_status_text[32];
+ Clipboard__CopyText(#param);
+ sprintf(#copy_status_text, #copied_chars, strlen(#param));
+ DrawStatusBar(#copy_status_text);
+}
+
+//===================================================//
+// //
+// DRAWS AND OTHER FUNCS //
+// //
+//===================================================//
+
+void EncodeToDos()
+{
+ real_encoding = user_encoding;
+
+ // Autodetecting charset
+ if (real_encoding == CH_AUTO) {
+ real_encoding = CH_CP866;
+ if (strstr(io.buffer_data, "\208\190")) real_encoding = CH_UTF8;
+ else {
+ if (chrnum(io.buffer_data, '\246')>5)
+ || (strstr(io.buffer_data, "╨┐╤А")) real_encoding = CH_CP1251;
+ }
+ }
+ if (real_encoding != CH_CP866)
+ ChangeCharset(real_encoding, "CP866", io.buffer_data);
+}
+
+void LoadFile(dword f_path)
+{
+ if (io.buffer_data) free(io.buffer_data);
+ if (ESBYTE[f_path]) {
+ strcpy(#param, f_path);
+ if (!io.read(#param)) goto NO_DATA;
+ sprintf(#title, "%s - %s", #param, #short_app_name);
+ EncodeToDos();
+ }
+ else {
+ NO_DATA:
+ io.buffer_data = malloc(sizeof(intro));
+ strcpy(io.buffer_data, #intro);
+ strcpy(#title, #short_app_name);
+ }
+ list.ClearList();
+}
+
+int AddTopBarButton(dword _event, _hotkey, char image_id, int x, pressed) {
+ if (_hotkey) key.add_n(_hotkey, _event);
+ return DrawTopPanelButton(button.add(_event), x, 5, image_id, pressed);
+}
+
+
+void DrawToolbar()
+{
+ #define SMALL_GAP 26+5
+ #define BIG_GAP 26+18
+ incn x;
+ bool thema = false;
+ bool reopa = false;
+
+ bool serha = search.draw(BTN_FIND_NEXT+10, BTN_FIND_CLOSE+10, Form.cheight - SEARCH_H - STATUSBAR_H);
+ if (menu_id == COLOR_SCHEME) thema = true;
+ if (menu_id == REOPEN_IN_APP) reopa = true;
+
+ DrawBar(0, 0, Form.cwidth, TOOLBAR_H - 1, sc.work);
+ DrawBar(0, TOOLBAR_H - 1, Form.cwidth, 1, sc.work_graph);
+
+ //AddTopBarButton(#EventNewFile, ECTRL+SCAN_CODE_KEY_N, 2, x.set(8), false);
+ AddTopBarButton(#EventOpenDialog, ECTRL+SCAN_CODE_KEY_O, 0, x.set(8), false);
+ //AddTopBarButton(#EventSave, ECTRL+SCAN_CODE_KEY_S, 5, x.inc(SMALL_GAP), false);
+ AddTopBarButton(#EventShowFileInfo, ECTRL+SCAN_CODE_KEY_I, 10, x.inc(SMALL_GAP), false);
+ AddTopBarButton(#EventMagnifyMinus, ECTRL+SCAN_CODE_MINUS, 32, x.inc(BIG_GAP), false);
+ AddTopBarButton(#EventMagnifyPlus, ECTRL+SCAN_CODE_PLUS, 33, x.inc(SMALL_GAP), false);
+ AddTopBarButton(#EventClickSearch, ECTRL+SCAN_CODE_KEY_F, 49, x.inc(BIG_GAP), serha); search_mx = EAX;
+ x.set(Form.cwidth-4);
+ AddTopBarButton(#EventShowInfo, NULL, -1, x.inc(-SMALL_GAP), false); burger_mx = EAX;
+ AddTopBarButton(#EventShowThemesList, NULL, 40, x.inc(-BIG_GAP), thema); theme_mx = EAX;
+ AddTopBarButton(#EventShowReopenMenu, ECTRL+SCAN_CODE_KEY_E, 16, x.inc(-SMALL_GAP), reopa); reopenin_mx = EAX;
+ //AddTopBarButton(#EventOpenSysfuncs, NULL, 18, x.inc(-SMALL_GAP), false);
+ //AddTopBarButton(#EventOpenPipet, NULL, 39, x.inc(-SMALL_GAP), false);
+ DefineHiddenButton(Form.cwidth-70, Form.cheight - STATUSBAR_H + 1,
+ 60, 12, button.add(#EventShowCharsetsList));
+}
+
+void DrawStatusBar(dword _in_text)
+{
+ static char status_text[64];
+ if (Form.status_window>2) return;
+ if (_in_text) strncpy(#status_text, _in_text, sizeof(status_text));
+ DrawBar(0,Form.cheight - STATUSBAR_H, Form.cwidth,1, sc.work_graph);
+ DrawBar(0,Form.cheight - STATUSBAR_H+1, Form.cwidth,STATUSBAR_H-1, sc.work);
+ WriteTextCenter(Form.cwidth-70, Form.cheight - STATUSBAR_H + 4,
+ 60, sc.work_text, real_encoding*10+#charsets);
+ WriteText(5, Form.cheight - STATUSBAR_H + 4, 0x80, sc.work_text, #status_text);
+}
+
+void draw_window()
+{
+ int old_w = list.w;
+ DefineAndDrawWindow(Form.left,Form.top,Form.width,Form.height,0x73,0,#title,0);
+ GetProcessInfo(#Form, SelfInfo);
+ sc.get();
+ if (Form.status_window>2) return;
+ if (Form.width < 430) { MoveSize(OLD,OLD,430,OLD); return; }
+ if (Form.height < 200) { MoveSize(OLD,OLD,OLD,200); return; }
+
+ button.init(40);
+ key.init(40);
+
+ SetSizes(font_size);
+
+ if ((list.w == old_w) && (list.count)) {
+ DrawPage();
+ } else {
+ ParseAndPaint();
+ }
+
+ DrawToolbar();
+ DrawStatusBar(NULL);
+}
+
+void DrawPage()
+{
+ scroll.max_area = list.count;
+ scroll.cur_area = list.visible;
+ scroll.position = list.first;
+ scroll.all_redraw = 0;
+ scroll.start_x = list.x + list.w;
+ scroll.start_y = list.y;
+ scroll.size_y = list.h;
+ scrollbar_v_draw(#scroll);
+
+ DrawRectangle(scroll.start_x, scroll.start_y, scroll.size_x,
+ scroll.size_y-1, scroll.bckg_col);
+ PaintVisible();
+}
+
+
+void SetSizes(char _size)
+{
+ font_size = _size;
+ if (font_size == 'S') list.SetFont(6, 9, 00001000b);
+ if (font_size == 'M') list.SetFont(8, 14, 00011000b);
+ list.item_w = list.font_w;
+ list.horisontal_selelection = true;
+ list.SetSizes(0, TOOLBAR_H, Form.cwidth-scroll.size_x-1,
+ Form.cheight - TOOLBAR_H - search.height() - STATUSBAR_H /*- TAB_H*/,
+ math.round(list.font_h * 1.4));
+}
\ No newline at end of file
diff --git a/programs/cmm/quark/selection.h b/programs/cmm/quark/selection.h
new file mode 100644
index 0000000000..1b01fe302c
--- /dev/null
+++ b/programs/cmm/quark/selection.h
@@ -0,0 +1,94 @@
+struct SELECTION {
+ dword start_x, start_y, start_offset;
+ dword end_x, end_y, end_offset;
+ dword color;
+ bool is_active();
+ void set_start();
+ void set_end();
+ void draw();
+ void draw_line();
+ void cancel();
+ bool swap_start_end();
+ void normalize();
+ void select_all();
+} selection;
+
+bool SELECTION::is_active()
+{
+ if (start_offset) && (end_offset) && (start_offset != end_offset) {
+ return true;
+ } else {
+ return false;
+ }
+}
+
+void SELECTION::draw_line(dword x,y,w)
+{
+ DrawBuf.DrawBar(x, y, w, list.item_h, color);
+}
+
+void SELECTION::draw(int i)
+{
+ if (is_active()) {
+ if (start_y == i) && (end_y == i) draw_line(start_x * list.font_w+2, start_y * list.item_h, end_x - start_x * list.font_w);
+ else if (start_y == i) draw_line(start_x * list.font_w+2, start_y * list.item_h, list.w -2- calc(start_x * list.font_w));
+ else if (end_y == i) draw_line(0, end_y * list.item_h, end_x * list.font_w+2);
+ //DrawBuf.DrawBar(start_x * list.font_w + 2, start_y * list.item_h, 2, list.item_h, 0x00FF00);
+ //DrawBuf.DrawBar(end_x * list.font_w + 0, end_y * list.item_h, 2, list.item_h, 0xFF00FF);
+ }
+ DrawBuf.DrawBar(list.cur_x * list.font_w + 2, list.cur_y * list.item_h, 2, list.item_h, theme.cursor); //DrawCursor
+}
+
+void SELECTION::cancel()
+{
+ start_offset = end_offset = lines.get(list.cur_y) + list.cur_x;
+ start_x = end_x = list.cur_x;
+ start_y = end_y = list.cur_y;
+ normalize();
+}
+
+void SELECTION::set_start()
+{
+ start_x = list.cur_x;
+ start_y = list.cur_y;
+ normalize();
+ start_offset = lines.get(start_y) + start_x;
+}
+
+void SELECTION::set_end()
+{
+ end_x = list.cur_x;
+ end_y = list.cur_y;
+ normalize();
+ end_offset = lines.get(end_y) + end_x;
+ debugval("end_x", end_x);
+ debugval("end_y", end_y);
+}
+
+
+void SELECTION::normalize()
+{
+ start_x = math.min(start_x, lines.get(start_y+1) - lines.get(start_y));
+ end_x = math.min(end_x, lines.get(end_y+1) - lines.get(end_y));
+}
+
+void SELECTION::select_all()
+{
+ start_y = 0;
+ start_x = 0;
+ end_y = lines.count-2;
+ end_x = lines.get(end_y+1) - lines.get(end_y);
+ //normalize();
+ start_offset = lines.get(start_y) + start_x;
+ end_offset = lines.get(end_y) + end_x;
+ debugval("end_x__", end_x);
+ debugval("end_y__", end_y);
+}
+
+bool SELECTION::swap_start_end()
+{
+ start_offset >< end_offset;
+ start_x >< end_x;
+ start_y >< end_y;
+ return true;
+}
diff --git a/skins/_old/Fever/Fever2 blue/Fever_blue.asm b/skins/_old/Fever/Fever2 blue/Fever_blue.asm
deleted file mode 100644
index 4f8554f877..0000000000
--- a/skins/_old/Fever/Fever2 blue/Fever_blue.asm
+++ /dev/null
@@ -1,35 +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=0x000057:\ ; border inner color
- bouter=0x000057:\ ; border outer color
- bframe=0x0039D4],\ ; border frame color
- colors inactive = [binner=0x000057:\ ; border inner color
- bouter=0x000057:\ ; border outer color
- bframe=0x5065A1],\ ; border frame color
- dtp = 'NEWSKIN.DTP' ; dtp colors
-
-SKIN_BUTTONS \
- close = [-25:3][18:18],\ ; buttons coordinates
- minimize = [-45:3][18:18] ; [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/Fever/Fever2 blue/NEWSKIN.DTP b/skins/_old/Fever/Fever2 blue/NEWSKIN.DTP
deleted file mode 100644
index ac7ca62968..0000000000
Binary files a/skins/_old/Fever/Fever2 blue/NEWSKIN.DTP and /dev/null differ
diff --git a/skins/_old/Fever/Fever2 blue/Tupfile.lua b/skins/_old/Fever/Fever2 blue/Tupfile.lua
deleted file mode 100644
index 99773dc0e6..0000000000
--- a/skins/_old/Fever/Fever2 blue/Tupfile.lua
+++ /dev/null
@@ -1,2 +0,0 @@
-if tup.getconfig("NO_FASM") ~= "" then return end
-tup.rule("Fever_blue.asm", 'fasm "%f" "%o" ' .. tup.getconfig("KPACK_CMD"), "Fever2 blue.skn")
diff --git a/skins/_old/Fever/Fever2 blue/active/base.bmp b/skins/_old/Fever/Fever2 blue/active/base.bmp
deleted file mode 100644
index 1d43142c37..0000000000
Binary files a/skins/_old/Fever/Fever2 blue/active/base.bmp and /dev/null differ
diff --git a/skins/_old/Fever/Fever2 blue/active/left.bmp b/skins/_old/Fever/Fever2 blue/active/left.bmp
deleted file mode 100644
index 52e326cb3c..0000000000
Binary files a/skins/_old/Fever/Fever2 blue/active/left.bmp and /dev/null differ
diff --git a/skins/_old/Fever/Fever2 blue/active/oper.bmp b/skins/_old/Fever/Fever2 blue/active/oper.bmp
deleted file mode 100644
index bd009839bd..0000000000
Binary files a/skins/_old/Fever/Fever2 blue/active/oper.bmp and /dev/null differ
diff --git a/skins/_old/Fever/Fever2 blue/inactive/base.bmp b/skins/_old/Fever/Fever2 blue/inactive/base.bmp
deleted file mode 100644
index 2d795d9737..0000000000
Binary files a/skins/_old/Fever/Fever2 blue/inactive/base.bmp and /dev/null differ
diff --git a/skins/_old/Fever/Fever2 blue/inactive/left.bmp b/skins/_old/Fever/Fever2 blue/inactive/left.bmp
deleted file mode 100644
index b4aec7ae05..0000000000
Binary files a/skins/_old/Fever/Fever2 blue/inactive/left.bmp and /dev/null differ
diff --git a/skins/_old/Fever/Fever2 blue/inactive/oper.bmp b/skins/_old/Fever/Fever2 blue/inactive/oper.bmp
deleted file mode 100644
index 4a1fbfa5d7..0000000000
Binary files a/skins/_old/Fever/Fever2 blue/inactive/oper.bmp and /dev/null differ
diff --git a/skins/_old/Fever/Fever2 blue/skin.inc b/skins/_old/Fever/Fever2 blue/skin.inc
deleted file mode 100644
index 81a6bd8f3f..0000000000
--- a/skins/_old/Fever/Fever2 blue/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/Fever/Fever2 green/Fever_green.asm b/skins/_old/Fever/Fever2 green/Fever_green.asm
deleted file mode 100644
index 55183e5b1e..0000000000
--- a/skins/_old/Fever/Fever2 green/Fever_green.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=0x005E00:\ ; border inner color
- bouter=0x005E00:\ ; border outer color
- bframe=0x008900],\ ; border frame color
- colors inactive = [binner=0x005E00:\ ; border inner color
- bouter=0x005E00:\ ; border outer color
- bframe=0x508950],\ ; border frame color
- dtp = 'NEWSKIN.DTP' ; dtp colors
-
-SKIN_BUTTONS \
- close = [-25:3][18:18],\ ; buttons coordinates
- minimize = [-45:3][18:18] ; [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/Fever/Fever2 green/NEWSKIN.DTP b/skins/_old/Fever/Fever2 green/NEWSKIN.DTP
deleted file mode 100644
index ac7ca62968..0000000000
Binary files a/skins/_old/Fever/Fever2 green/NEWSKIN.DTP and /dev/null differ
diff --git a/skins/_old/Fever/Fever2 green/Tupfile.lua b/skins/_old/Fever/Fever2 green/Tupfile.lua
deleted file mode 100644
index 683513a9f5..0000000000
--- a/skins/_old/Fever/Fever2 green/Tupfile.lua
+++ /dev/null
@@ -1,2 +0,0 @@
-if tup.getconfig("NO_FASM") ~= "" then return end
-tup.rule("Fever_green.asm", 'fasm "%f" "%o" ' .. tup.getconfig("KPACK_CMD"), "Fever2 green.skn")
diff --git a/skins/_old/Fever/Fever2 green/active/base.bmp b/skins/_old/Fever/Fever2 green/active/base.bmp
deleted file mode 100644
index 4140861c78..0000000000
Binary files a/skins/_old/Fever/Fever2 green/active/base.bmp and /dev/null differ
diff --git a/skins/_old/Fever/Fever2 green/active/left.bmp b/skins/_old/Fever/Fever2 green/active/left.bmp
deleted file mode 100644
index 9145262914..0000000000
Binary files a/skins/_old/Fever/Fever2 green/active/left.bmp and /dev/null differ
diff --git a/skins/_old/Fever/Fever2 green/active/oper.bmp b/skins/_old/Fever/Fever2 green/active/oper.bmp
deleted file mode 100644
index 5242848f1d..0000000000
Binary files a/skins/_old/Fever/Fever2 green/active/oper.bmp and /dev/null differ
diff --git a/skins/_old/Fever/Fever2 green/inactive/base.bmp b/skins/_old/Fever/Fever2 green/inactive/base.bmp
deleted file mode 100644
index a64d4a9cb7..0000000000
Binary files a/skins/_old/Fever/Fever2 green/inactive/base.bmp and /dev/null differ
diff --git a/skins/_old/Fever/Fever2 green/inactive/left.bmp b/skins/_old/Fever/Fever2 green/inactive/left.bmp
deleted file mode 100644
index 1e7257244b..0000000000
Binary files a/skins/_old/Fever/Fever2 green/inactive/left.bmp and /dev/null differ
diff --git a/skins/_old/Fever/Fever2 green/inactive/oper.bmp b/skins/_old/Fever/Fever2 green/inactive/oper.bmp
deleted file mode 100644
index d2d8a97bbe..0000000000
Binary files a/skins/_old/Fever/Fever2 green/inactive/oper.bmp and /dev/null differ
diff --git a/skins/_old/Fever/Fever2 green/skin.inc b/skins/_old/Fever/Fever2 green/skin.inc
deleted file mode 100644
index 81a6bd8f3f..0000000000
--- a/skins/_old/Fever/Fever2 green/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/Fever/Fever2 red/Fever_red.asm b/skins/_old/Fever/Fever2 red/Fever_red.asm
deleted file mode 100644
index fe0bb33ba9..0000000000
--- a/skins/_old/Fever/Fever2 red/Fever_red.asm
+++ /dev/null
@@ -1,35 +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=0x870000:\ ; border inner color
- bouter=0x870000:\ ; border outer color
- bframe=0xC10000],\ ; border frame color
- colors inactive = [binner=0x870000:\ ; border inner color
- bouter=0x870000:\ ; border outer color
- bframe=0x9A5050],\ ; border frame color
- dtp = 'NEWSKIN.DTP' ; dtp colors
-
-SKIN_BUTTONS \
- close = [-25:3][18:18],\ ; buttons coordinates
- minimize = [-45:3][18:18] ; [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/Fever/Fever2 red/NEWSKIN.DTP b/skins/_old/Fever/Fever2 red/NEWSKIN.DTP
deleted file mode 100644
index ac7ca62968..0000000000
Binary files a/skins/_old/Fever/Fever2 red/NEWSKIN.DTP and /dev/null differ
diff --git a/skins/_old/Fever/Fever2 red/Tupfile.lua b/skins/_old/Fever/Fever2 red/Tupfile.lua
deleted file mode 100644
index 1970bfc520..0000000000
--- a/skins/_old/Fever/Fever2 red/Tupfile.lua
+++ /dev/null
@@ -1,2 +0,0 @@
-if tup.getconfig("NO_FASM") ~= "" then return end
-tup.rule("Fever_red.asm", 'fasm "%f" "%o" ' .. tup.getconfig("KPACK_CMD"), "Fever2 red.skn")
diff --git a/skins/_old/Fever/Fever2 red/active/base.bmp b/skins/_old/Fever/Fever2 red/active/base.bmp
deleted file mode 100644
index 0a885118ef..0000000000
Binary files a/skins/_old/Fever/Fever2 red/active/base.bmp and /dev/null differ
diff --git a/skins/_old/Fever/Fever2 red/active/left.bmp b/skins/_old/Fever/Fever2 red/active/left.bmp
deleted file mode 100644
index 018a4ee3dd..0000000000
Binary files a/skins/_old/Fever/Fever2 red/active/left.bmp and /dev/null differ
diff --git a/skins/_old/Fever/Fever2 red/active/oper.bmp b/skins/_old/Fever/Fever2 red/active/oper.bmp
deleted file mode 100644
index dd4ed3c769..0000000000
Binary files a/skins/_old/Fever/Fever2 red/active/oper.bmp and /dev/null differ
diff --git a/skins/_old/Fever/Fever2 red/inactive/base.bmp b/skins/_old/Fever/Fever2 red/inactive/base.bmp
deleted file mode 100644
index 4197dc2f99..0000000000
Binary files a/skins/_old/Fever/Fever2 red/inactive/base.bmp and /dev/null differ
diff --git a/skins/_old/Fever/Fever2 red/inactive/left.bmp b/skins/_old/Fever/Fever2 red/inactive/left.bmp
deleted file mode 100644
index 13764c223f..0000000000
Binary files a/skins/_old/Fever/Fever2 red/inactive/left.bmp and /dev/null differ
diff --git a/skins/_old/Fever/Fever2 red/inactive/oper.bmp b/skins/_old/Fever/Fever2 red/inactive/oper.bmp
deleted file mode 100644
index ba2095b88d..0000000000
Binary files a/skins/_old/Fever/Fever2 red/inactive/oper.bmp and /dev/null differ
diff --git a/skins/_old/Fever/Fever2 red/skin.inc b/skins/_old/Fever/Fever2 red/skin.inc
deleted file mode 100644
index 81a6bd8f3f..0000000000
--- a/skins/_old/Fever/Fever2 red/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/SashSkinPack_1_1/Src/Metal/colors.dtp b/skins/_old/SashSkinPack_1_1/Src/Metal/colors.dtp
index fdd649b440..b1c87b72eb 100644
Binary files a/skins/_old/SashSkinPack_1_1/Src/Metal/colors.dtp and b/skins/_old/SashSkinPack_1_1/Src/Metal/colors.dtp differ
diff --git a/skins/skinlist.lua b/skins/skinlist.lua
index 797dab3129..4dc181f340 100644
--- a/skins/skinlist.lua
+++ b/skins/skinlist.lua
@@ -55,9 +55,6 @@ skinlist = {
"_old/Fever/Fever1 blue/Fever1 blue.skn",
"_old/Fever/Fever1 green/Fever1 green.skn",
"_old/Fever/Fever1 red/Fever1 red.skn",
-"_old/Fever/Fever2 blue/Fever2 blue.skn",
-"_old/Fever/Fever2 green/Fever2 green.skn",
-"_old/Fever/Fever2 red/Fever2 red.skn",
"_old/first_skin/first_skin.skn",
"_old/Flowers/Flowers.skn",
"_old/Flyght/Flyght.skn",