Subversion Repositories Kolibri OS

Compare Revisions

No changes between revisions

Regard whitespace Rev 7457 → Rev 7458

/programs/cmm/lib/gui/checkbox.h
67,21 → 67,20
DefineButton(x-1, y-1, strlen(text)*8 + SIZE + 17, SIZE+2, id+BT_HIDE+BT_NOFRAME, 0);
WriteTextWithBg(x+SIZE+8, SIZE / 2 + y -7, 0xD0, system.color.work_text, text, system.color.work);
DrawRectangle(x, y, SIZE, SIZE, system.color.work_graph);
if (checked == 0)
if (disabled)
{
DrawRectangle(x+1, y+1, SIZE-2, SIZE-2, 0xffffff);
DrawBar(x+2, y+2, SIZE-3, SIZE-3, 0xCCCccc);
}
else if (checked == 0)
{
DrawRectangle3D(x+1, y+1, SIZE-2, SIZE-2, 0xDDDddd, 0xffffff);
DrawBar(x+2, y+2, SIZE-3, SIZE-3, 0xffffff);
}
else if (checked == 1)
{
DrawWideRectangle(x+1, y+1, SIZE-1, SIZE-1, 2, 0xffffff);
_PutImage(x+1, y+1, 13, 13, #checkbox_flag);
}
else if (checked == 2) //not active
{
DrawWideRectangle(x+1, y+1, SIZE-1, SIZE-1, 2, 0xffffff);
DrawBar(x+3, y+3, SIZE-5, SIZE-5, 0x888888);
}
DrawRectangle3D(x-1,y-1,SIZE+2,SIZE+2,system.color.work_dark,system.color.work_light);
}
 
/programs/cmm/panels_cfg/panels_cfg.c
61,7 → 61,8
_ini docky_ini = { "/sys/settings/docky.ini", "@" };
 
unsigned char panels_img_data[] = FROM "panels_image.raw";
raw_image panels_img = { 37, 27, #panels_img_data };
#define PIMG_W 37
#define PIMG_H 27 //27*5
 
proc_info Form;
 
147,6 → 148,11
}
}
 
void DrawPanelsImage(dword y, n)
{
_PutImage(22, y, PIMG_W, PIMG_H, n * PIMG_W * PIMG_H * 3 + #panels_img_data);
}
 
void DrawWindowContent()
{
#define PD 10
156,8 → 162,8
 
frame_y = 15;
y.n = frame_y;
DefineButton(22, y.inc(18), panels_img.w-1, 27-1, 100 + BT_HIDE, 0);
_PutImage(22, y.n, 37, 27, tbAttachment * 37 * 27 * 3 + panels_img.data);
DefineButton(22, y.inc(18), PIMG_W-1, PIMG_H-1, 100 + BT_HIDE, 0);
DrawPanelsImage(y.n, tbAttachment);
WriteText(68, y.inc(7), 0x90, system.color.work_text, CHANGE_POS);
tbSoftenUp.draw(22, y.inc(35));
tbClock.draw(win_center_x, y.n);
173,8 → 179,8
DrawFrame(PD, frame_y, Form.cwidth-PD-PD, y.inc(32)-frame_y, TASK_FRAME_T);
//DOCKY
frame_y = calc(y.inc(20));
DefineButton(22, y.inc(18), panels_img.w-1, 27-1, 200 + BT_HIDE, 0);
_PutImage(22, y.n, 37, 27, dkLocation + 1 * 37 * 27 * 3 + panels_img.data);
DefineButton(22, y.inc(18), PIMG_W-1, PIMG_H-1, 200 + BT_HIDE, 0);
DrawPanelsImage(y.n, dkLocation);
WriteText(68, y.inc(7), 0x90, system.color.work_text, CHANGE_POS);
dkFsize.draw(22, y.inc(35));
dkAshow.draw(win_center_x, y.n);
/programs/cmm/panels_cfg/panels_cfg.png
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
/programs/cmm/panels_cfg/panels_image.raw
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream