Subversion Repositories Kolibri OS

Compare Revisions

No changes between revisions

Regard whitespace Rev 7865 → Rev 7866

/data/Tupfile.lua
170,6 → 170,9
{"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
/data/common/File Managers/kfar.ini
64,6 → 64,7
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
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
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
 
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);
 
/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
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
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;
}