KolibriOS/kolibrios
13
14
Fork 12
Code Issues 113 Pull Requests 16 Actions Projects 1 Releases Wiki Activity

file managers: associate .img with unimg

Browse Source 
add LUA to ISO

git-svn-id: svn://kolibrios.org@7866 a494cfbc-eb01-0410-851d-a64ba20cac60
This commit is contained in:
Kiril Lipatov
2020-05-05 01:16:36 +00:00
parent 271f2d75e8
commit 7169ea5d6b
8 changed files with 15 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
data/Tupfile.lua
View File

@@ -170,6 +170,9 @@ extra_files = {
{"kolibrios/develop/oberon07/Lib/KolibriOS/", PROGS .. "/develop/oberon07/Lib/KolibriOS/*"},
{"kolibrios/develop/oberon07/Samples/", PROGS .. "/develop/oberon07/Samples/*"},
{"kolibrios/develop/c--/", PROGS .. "/cmm/c--/*"},
{"kolibrios/develop/lua/lua", "../contrib/other/lua-5.2.0/lua"},
{"kolibrios/develop/lua/calc.lua", "../contrib/other/lua-5.2.0/calc.lua"},
{"kolibrios/develop/lua/console.lua", "../contrib/other/lua-5.2.0/console.lua"},
{"kolibrios/develop/tcc/", PROGS .. "/develop/ktcc/trunk/*"},
{"kolibrios/develop/tcc/", PROGS .. "/develop/ktcc/trunk/bin/*"},
{"kolibrios/develop/tcc/lib/", PROGS .. "/develop/ktcc/trunk/bin/lib/*"},

2
data/common/File Managers/fNav/fnav.set
View File

@@ -1 +1 @@
/sys/TinyPad: asm, inc, txt, mac, log, dat
/sys/TinyPad: asm, inc, txt, mac, log, dat

1
data/common/File Managers/kfar.ini
View File

@@ -64,6 +64,7 @@ nc=/kolibrios/utils/cnc_editor/cnc_editor
kf=/sys/KF_VIEW
csv=/sys/table
mgb=/sys/mgb
img=/sys/unimg
[Menu]
AsmMenu1=&Edit,/sys/TinyPad

2
data/common/settings/assoc.ini
View File

@@ -176,6 +176,8 @@ nc=/kolibrios/utils/cnc_editor/cnc_editor
zip=$Unz
7z=$Unz
img=/sys/unimg
bas=/kolibrios/develop/TinyBasic/TinyBasic
vox=/kolibrios/3D/voxel_editor/VOXEL_EDITOR

1
data/rus/File Managers/kfar.ini
View File

@@ -64,6 +64,7 @@ nc=/kolibrios/utils/cnc_editor/cnc_editor
kf=/sys/KF_VIEW
csv=/sys/table
mgb=/sys/mgb
img=/sys/unimg
[Menu]
AsmMenu1=&<26><><EFBFBD>譨<EFBFBD> ।<><E0A5A4><EFBFBD><EFBFBD><EFBFBD>,/sys/TinyPad

3
programs/cmm/browser/WebView.c
View File

@@ -318,8 +318,7 @@ void draw_window()
DrawTopPanelButton(BACK_BUTTON, PADDING-1, PADDING, 30);
DrawTopPanelButton(FORWARD_BUTTON, PADDING+TSZE+PADDING-2, PADDING, 31);
DrawTopPanelButton(SANDWICH_BUTTON, Form.cwidth-PADDING-TSZE-3, PADDING, -1);
for (i=0; i<=2; i++) DrawBar(Form.cwidth-PADDING-TSZE+3, i*5+PADDING+7, 15, 3, sc.work_graph);
DrawTopPanelButton(SANDWICH_BUTTON, Form.cwidth-PADDING-TSZE-3, PADDING, -1); //burger menu
DrawBar(0,Form.cheight - STATUSBAR_H, Form.cwidth,1, sc.work_graph);

4
programs/cmm/lib/draw_buf.h
View File

@@ -6,7 +6,7 @@
#include "../lib/kolibri.h"
#endif
dword buf_data;
dword buf_data=0;
struct DrawBufer {
@@ -37,7 +37,7 @@ bool DrawBufer::Init(dword i_bufx, i_bufy, i_bufw, i_bufh)
bufy = i_bufy;
bufw = i_bufw;
bufh = i_bufh;
buf_data = free(buf_data);
if (buf_data) buf_data = free(buf_data);
IncreaseBufSize();
if (!buf_data) return false;
ESDWORD[buf_data] = bufw;

5
programs/cmm/lib/patterns/toolbar_button.h
View File

@@ -1,9 +1,10 @@
void DrawTopPanelButton(dword _button_id, _x, _y, signed int _icon_n)
unsigned int DrawTopPanelButton(dword _button_id, _x, _y, signed int _icon_n)
{
#define TSZE 25
static libimg_image top_icons;
static dword semi_white=0, bg_col_light, bg_col_dark;
int i;
if (!semi_white) {
Libimg_LoadImage(#top_icons, "/sys/icons16.png");
@@ -21,7 +22,9 @@ void DrawTopPanelButton(dword _button_id, _x, _y, signed int _icon_n)
DefineHiddenButton(_x, _y, TSZE+1, TSZE+1, _button_id);
if (_icon_n==-1) {
DrawBar(_x+6, _y+5, 16, 16, semi_white);
for (i=0; i<=2; i++) DrawBar(_x+6, i*5+_y+7, 15, 3, sc.work_graph);
} else {
img_draw stdcall(top_icons.image, _x+6, _y+5, 16, 16, 0, _icon_n*16);
}
return _x;
}