From 76bd014d8b1c03c8b26bd5b7f3b9e264fb9b35c1 Mon Sep 17 00:00:00 2001 From: "Kirill Lipatov (Leency)" Date: Fri, 16 Feb 2018 15:53:51 +0000 Subject: [PATCH] - add UNZ to autobuild - remove unused data//fonts folders - update associations and set KIV as default viewer instead of zSea as it has resize now - remove some debug info from C-- programs and make functions includable only if they are used in app git-svn-id: svn://kolibrios.org@7160 a494cfbc-eb01-0410-851d-a64ba20cac60 --- data/Tupfile.lua | 13 +++++++------ data/common/File Managers/icons.ini | 2 ++ data/common/settings/assoc.ini | 14 +++++++------- programs/cmm/eolite/include/icons.h | 1 - programs/cmm/lib/gui.h | 10 +++++----- programs/cmm/lib/kfont.h | 2 +- programs/cmm/lib/kolibri.h | 4 ++-- programs/cmm/lib/list_box.h | 5 +++-- programs/cmm/lib/mem.h | 8 ++++---- 9 files changed, 31 insertions(+), 28 deletions(-) diff --git a/data/Tupfile.lua b/data/Tupfile.lua index c36f27e113..c682edbac9 100644 --- a/data/Tupfile.lua +++ b/data/Tupfile.lua @@ -337,23 +337,22 @@ tup.append_table(img_files, { {"CALC", PROGS .. "/other/calc/trunk/calc"}, {"CALENDAR", PROGS .. "/system/calendar/trunk/calendar"}, {"COLRDIAL", PROGS .. "/system/colrdial/color_dialog"}, - {"LOADDRV", PROGS .. "/system/loaddrv/loaddrv"}, + {"CROPFLAT", PROGS .. "/system/cropflat/cropflat"}, {"CPU", PROGS .. "/system/cpu/trunk/cpu"}, {"CPUID", PROGS .. "/system/cpuid/trunk/CPUID"}, - {"SKINCFG", PROGS .. "/system/skincfg/trunk/skincfg"}, + {"DOCPACK", PROGS .. "/system/docpack/trunk/docpack"}, {"DEFAULT.SKN", "../skins/Leency/Shkvorka/Shkvorka.skn"}, {"DISPTEST", PROGS .. "/system/disptest/trunk/disptest"}, - {"DOCPACK", PROGS .. "/system/docpack/trunk/docpack"}, {"END", PROGS .. "/system/end/light/end"}, + {"ESKIN", PROGS .. "/system/eskin/trunk/eskin"}, {"FSPEED", PROGS .. "/fs/fspeed/fspeed"}, {"GMON", PROGS .. "/system/gmon/gmon"}, {"HDD_INFO", PROGS .. "/system/hdd_info/trunk/hdd_info"}, - {"CROPFLAT", PROGS .. "/system/cropflat/cropflat"}, {"KBD", PROGS .. "/system/kbd/trunk/kbd"}, {"KPACK", PROGS .. "/other/kpack/trunk/kpack"}, {"KERPACK", PROGS .. "/other/outdated/kerpack/trunk/kerpack"}, {"LAUNCHER", PROGS .. "/system/launcher/trunk/launcher"}, - {"ESKIN", PROGS .. "/system/eskin/trunk/eskin"}, + {"LOADDRV", PROGS .. "/system/loaddrv/loaddrv"}, {"MAGNIFY", PROGS .. "/demos/magnify/trunk/magnify"}, {"MGB", PROGS .. "/system/mgb/trunk/mgb"}, {"MOUSEMUL", PROGS .. "/system/mousemul/trunk/mousemul"}, @@ -365,10 +364,12 @@ tup.append_table(img_files, { {"SEARCHAP", PROGS .. "/system/searchap/searchap"}, {"SCRSHOOT", PROGS .. "/media/scrshoot/scrshoot"}, {"SETUP", PROGS .. "/system/setup/trunk/setup"}, + {"SKINCFG", PROGS .. "/system/skincfg/trunk/skincfg"}, + {"TERMINAL", PROGS .. "/system/terminal/terminal"}, {"TEST", PROGS .. "/system/test/trunk/test"}, {"TINYPAD", PROGS .. "/develop/tinypad/trunk/tinypad"}, + {"UNZ", PROGS .. "/fs/unz/unz"}, {"ZKEY", PROGS .. "/system/zkey/trunk/ZKEY"}, - {"TERMINAL", PROGS .. "/system/terminal/terminal"}, {"3D/3DWAV", PROGS .. "/demos/3dwav/trunk/3dwav"}, {"3D/CROWNSCR", PROGS .. "/demos/crownscr/trunk/crownscr"}, {"3D/FREE3D04", PROGS .. "/demos/free3d04/trunk/free3d04"}, diff --git a/data/common/File Managers/icons.ini b/data/common/File Managers/icons.ini index 93dd7a0034..ce2b238939 100644 --- a/data/common/File Managers/icons.ini +++ b/data/common/File Managers/icons.ini @@ -126,6 +126,8 @@ mkv=11 wmv=11 mov=11 mp4=11 +vob=11 +webm=11 ttf=12 ttc=12 chr=12 diff --git a/data/common/settings/assoc.ini b/data/common/settings/assoc.ini index 55e4872cb9..793786fed1 100644 --- a/data/common/settings/assoc.ini +++ b/data/common/settings/assoc.ini @@ -97,11 +97,6 @@ htm=$WebView html=$WebView mht=$WebView -png=$zSea -jpg=$zSea -jpeg=$zSea -bmp=$zSea - avi=$FPlay mkv=$FPlay wmv=$FPlay @@ -113,6 +108,11 @@ mpeg=$FPlay mov=$FPlay webm=$FPlay +png=$KIV +jpg=$KIV +jpeg=$KIV +bmp=$KIV + gif=$KIV ico=$KIV cur=$KIV @@ -171,5 +171,5 @@ gb=/kolibrios/emul/gameboy gbc=/kolibrios/emul/gameboy min=/kolibrios/emul/pokemini -zip=/sys/File Managers/KFAR -7z=/sys/File Managers/KFAR \ No newline at end of file +zip=/sys/unz +7z=/sys/unz \ No newline at end of file diff --git a/programs/cmm/eolite/include/icons.h b/programs/cmm/eolite/include/icons.h index 5b962a5312..adbba9584b 100644 --- a/programs/cmm/eolite/include/icons.h +++ b/programs/cmm/eolite/include/icons.h @@ -43,7 +43,6 @@ void IconFairing(dword filenum, x,y, color) PutPixel(x+14,y+3,color); PutPixel(x,y+13,color); PutPixel(x+14,y+13,color); - debugi(filenum); } if (filenum == 22) PutPixel(x+10,y+2,0x1A7B17); //green arrow part } diff --git a/programs/cmm/lib/gui.h b/programs/cmm/lib/gui.h index e360a24004..413f89c8fe 100644 --- a/programs/cmm/lib/gui.h +++ b/programs/cmm/lib/gui.h @@ -350,13 +350,13 @@ TODO: scroll //this function increase falue and return it //useful for list of controls which goes one after one -struct incn +:struct incn { dword n; dword inc(dword _addition); }; -dword incn::inc(dword _addition) +:dword incn::inc(dword _addition) { n+=_addition; return n; @@ -411,7 +411,7 @@ dword incn::inc(dword _addition) == /========================================================*/ -struct more_less_box +:struct more_less_box { signed x,y; unsigned value, min, max; @@ -421,14 +421,14 @@ struct more_less_box void draw(); }; -bool more_less_box::click(unsigned id) +:bool more_less_box::click(unsigned id) { if (id==bt_id_less) { value = math.max(value-1, min); draw(); return 1; } if (id==bt_id_more) { value = math.min(value+1, max); draw(); return 1; } return 0; } -void more_less_box::draw() +:void more_less_box::draw() { #define VALUE_FIELD_W 34 #define SIZE 18 diff --git a/programs/cmm/lib/kfont.h b/programs/cmm/lib/kfont.h index 44f1a74ce8..d2768a9d0a 100644 --- a/programs/cmm/lib/kfont.h +++ b/programs/cmm/lib/kfont.h @@ -71,7 +71,7 @@ if(font)free(font); label_io.read(font_path); if(!EAX) { - debugln(font_path); + //debugln(font_path); label_io.run("/sys/@notify", "'Error: KFONT is not loaded.' -E"); return false; } diff --git a/programs/cmm/lib/kolibri.h b/programs/cmm/lib/kolibri.h index cd48313367..724369fe70 100644 --- a/programs/cmm/lib/kolibri.h +++ b/programs/cmm/lib/kolibri.h @@ -442,7 +442,7 @@ inline fastcall dword SetWindowLayerBehaviour(EDX, ESI) #define DRAW_DESKTOP_BG_TILE 1 #define DRAW_DESKTOP_BG_STRETCH 2 -void SetBackgroundImage(dword w,h, image, mode) +:void SetBackgroundImage(dword w,h, image, mode) { $mov eax,15 // SF_BACKGROUND_SET 15 - work with desktop background graphics $mov ebx,4 // SSF_MODE_BG 4 - set drawing mode for the background @@ -536,7 +536,7 @@ inline RefreshWindow(dword ID_REFRESH,ID_ACTIVE) $int 0x40 } -void DefineDragableWindow(dword _x, _y, _w, _h) +:void DefineDragableWindow(dword _x, _y, _w, _h) { DefineAndDrawWindow(_x, _y, _w, _h, 0x41,0x000000,NULL,0b); } diff --git a/programs/cmm/lib/list_box.h b/programs/cmm/lib/list_box.h index 0a80640632..f322b89a76 100644 --- a/programs/cmm/lib/list_box.h +++ b/programs/cmm/lib/list_box.h @@ -33,15 +33,16 @@ struct llist int KeyLeft(); int KeyRight(); void CheckDoesValuesOkey(); - void debug(); + //void debug(); }; +/* void llist::debug() { char yi[128]; sprintf(#yi, "%s %d %s %d %s %d %s %d %s %d %s %d", "first:", first, "visible:", visible, "count:", count, "col_max:", column_max, "cur_y:", cur_y, "cur_x:", cur_x); debugln(#yi); -} +}*/ void llist::ClearList() diff --git a/programs/cmm/lib/mem.h b/programs/cmm/lib/mem.h index 534becf747..e5c2dccc0a 100644 --- a/programs/cmm/lib/mem.h +++ b/programs/cmm/lib/mem.h @@ -5,7 +5,7 @@ #include "../lib/kolibri.h" #endif -dword mem_init() +:dword mem_init() { $push ebx $mov eax, 68 @@ -16,7 +16,7 @@ dword mem_init() return EAX; } -dword malloc(dword size) +:dword malloc(dword size) { $push ebx $push ecx @@ -31,7 +31,7 @@ dword malloc(dword size) return EAX; } -stdcall dword realloc(dword mptr, size) +:stdcall dword realloc(dword mptr, size) { $push ebx $push ecx @@ -49,7 +49,7 @@ stdcall dword realloc(dword mptr, size) return EAX; } -dword free(dword mptr) +:dword free(dword mptr) { $push eax $push ebx