file managers: associate .img with unimg

add LUA to ISO

git-svn-id: svn://kolibrios.org@7866 a494cfbc-eb01-0410-851d-a64ba20cac60

data/Tupfile.lua

@@ -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/*"},

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

@@ -1 +1 @@
-/sys/TinyPad:              asm, inc, txt, mac, log, dat
/sys/media/kiv:            gif, bmp, png, tga, jpg, ico, cur, tif, tiff, jpeg, ppm, pgm, pbm, pnm, pcx, wbmp, xcf
/sys/Network/Webview:      htm, html, mht, xhtml, docx, url
/sys/fb2read:              fb2
/sys/develop/cObj:         obj
/sys/skincfg:              skn
/sys/rtfRead:              rtf
/sys/develop/t_edit:       cpp, h, c, c--, pas, set, ext, ini
/sys/media/mgb:            mgb
/sys/media/pixie:          mp3
/sys/media/AC97SND:        wav, xm
/sys/media/MIDAMP:         mid
/sys/media/listplay:       m3u, lap, asf
/sys/shell:                sh
/sys/3d/view3ds:           3ds, asc
/sys/graph:                cvs, grf
/sys/unz:                  zip, 7z
/sys/table:                csv
/kolibrios/media/updf:     pdf
/kolibrios/media/fplay:    avi, mpg, mov, flv, wmv, vob, mkv, mp4, mpeg, divx, 3gp, webm
/kolibrios/emul/zsnes:     smc
/kolibrios/emul/psx4all:   mcr
/kolibrios/emul/fceu/fceu: nes
/kolibrios/emul/e80/e80:   sna
/kolibrios/emul/gameboy:   gb, gbc
/kolibrios/emul/pokemini:  min
/sys/develop/heed:
+/sys/TinyPad:              asm, inc, txt, mac, log, dat
/sys/media/kiv:            gif, bmp, png, tga, jpg, ico, cur, tif, tiff, jpeg, ppm, pgm, pbm, pnm, pcx, wbmp, xcf
/sys/Network/Webview:      htm, html, mht, xhtml, docx, url
/sys/fb2read:              fb2
/sys/develop/cObj:         obj
/sys/skincfg:              skn
/sys/rtfRead:              rtf
/sys/develop/t_edit:       cpp, h, c, c--, pas, set, ext, ini
/sys/media/mgb:            mgb
/sys/media/pixie:          mp3
/sys/media/AC97SND:        wav, xm
/sys/media/MIDAMP:         mid
/sys/media/listplay:       m3u, lap, asf
/sys/shell:                sh
/sys/3d/view3ds:           3ds, asc
/sys/graph:                cvs, grf
/sys/unz:                  zip, 7z
/sys/unimg:                img
/sys/table:                csv
/kolibrios/media/updf:     pdf
/kolibrios/media/fplay:    avi, mpg, mov, flv, wmv, vob, mkv, mp4, mpeg, divx, 3gp, webm
/kolibrios/emul/zsnes:     smc
/kolibrios/emul/psx4all:   mcr
/kolibrios/emul/fceu/fceu: nes
/kolibrios/emul/e80/e80:   sna
/kolibrios/emul/gameboy:   gb, gbc
/kolibrios/emul/pokemini:  min
/sys/develop/heed:

data/common/File Managers/kfar.ini

@@ -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

data/common/settings/assoc.ini

@@ -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

data/rus/File Managers/kfar.ini

@@ -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=&‚­¥è­¨© । ªâ®à,/sys/TinyPad

programs/cmm/browser/WebView.c

@@ -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);
+	DrawTopPanelButton(SANDWICH_BUTTON, Form.cwidth-PADDING-TSZE-3, PADDING, -1); //burger menu
-	for (i=0; i<=2; i++) DrawBar(Form.cwidth-PADDING-TSZE+3, i*5+PADDING+7, 15, 3, sc.work_graph);
 
 	DrawBar(0,Form.cheight - STATUSBAR_H, Form.cwidth,1, sc.work_graph);
 

programs/cmm/lib/draw_buf.h

@@ -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;

programs/cmm/lib/patterns/toolbar_button.h

@@ -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;
 }