Subversion Repositories Kolibri OS

Compare Revisions

Regard whitespace Rev 9601 → Rev 9602

/programs/cmm/eolite/include/about.h
37,7 → 37,7
GetProcessInfo(#about_form, SelfInfo);
if (about_form.status_window>2) break;
logo_pal[0] = sc.work;
ESDWORD[#logo_pal+16] = sc.work_dark;
ESDWORD[#logo_pal+16] = sc.dark;
PutPaletteImage(#logo,86,86,about_form.cwidth-86/2,10,8,#logo_pal);
about_x = -strlen(ABOUT_TITLE)*18+about_form.cwidth/2;
WriteTextB(about_x+2,107,0x82,0xD49CD2,ABOUT_TITLE);
/programs/cmm/eolite/include/gui.h
29,9 → 29,9
}
}
//slider
DrawRectangle(sc_x,sc_slider_y,16,sc_slider_h,sc.work_graph);
DrawRectangle(sc_x,sc_slider_y,16,sc_slider_h,sc.line);
sc_x++;
DrawRectangle3D(sc_x,sc_slider_y+1,14,sc_slider_h-2, sc.work_light , sc.work_dark);
DrawRectangle3D(sc_x,sc_slider_y+1,14,sc_slider_h-2, sc.light , sc.dark);
for (i=0; i<13; i++) {
if (!_scroll_used) EDX = col.work_gradient[13-i]; else EDX = col.work_gradient[i];
DrawBar(sc_x + 1 + i, sc_slider_y+2, 1, sc_slider_h-3, EDX);
39,11 → 39,11
 
sc_center = sc_slider_h / 2 + sc_slider_y;
 
DrawBar(sc_x+2, sc_center, 10, 1, sc.work_graph);
DrawBar(sc_x+2, sc_center, 10, 1, sc.line);
DrawBar(sc_x+3, sc_center-3, 8, 1, EDX);
DrawBar(sc_x+3, sc_center+3, 8, 1, EDX);
 
DrawBar(sc_x+3, sc_center+1, 10, 1, sc.work_light);
DrawBar(sc_x+3, sc_center+1, 10, 1, sc.light);
DrawBar(sc_x+4, sc_center-2, 8, 1, EDX);
DrawBar(sc_x+4, sc_center+4, 8, 1, EDX);
 
71,9 → 71,9
 
void DrawFlatButtonSmall(dword x,y,width,height,id,text)
{
DrawRectangle(x,y,width,height,sc.work_graph);
DrawRectangle3D(x+1,y+1,width-2,height-2, sc.work_light, sc.work_dark);
PutPixel(x+width-1, y+1, sc.work_dark);
DrawRectangle(x,y,width,height,sc.line);
DrawRectangle3D(x+1,y+1,width-2,height-2, sc.light, sc.dark);
PutPixel(x+width-1, y+1, sc.dark);
DrawFilledBar(x+2, y+2, width-3, height-3);
if (id) DefineHiddenButton(x+1,y+1,width-2,height-2,id);
WriteText(-strlen(text)*6+width/2+x+1,height/2+y-3,0x80,sc.work_text,text);
91,9 → 91,9
DrawFlatButtonSmall(x,y,width,FH,id,text);
return;
}
DrawRectangle(x,y,width,FH,sc.work_graph);
DrawRectangle(x,y,width,FH,sc.line);
DrawRectangle3D(x+1,y+1,width-2,FH-2, 0x97D194, 0x00A100);
PutPixel(x+width-1, y+1, sc.work_dark);
PutPixel(x+width-1, y+1, sc.dark);
DrawBar(x+2, y+2, numw, FH-2, 0x6060FF);
WriteText(x+6,FH/2+y-2,0x80,0x444444,itoa(number));
$sub ebx, 1 <<16 + 1
116,9 → 116,9
void Tip(int y, dword caption, id, arrow)
{
DrawBar(SB_BLOCKX,y,SB_BLOCKW,1,col.list_bg);
DrawBar(SB_BLOCKX,y+1,1,16,sc.work_light);
DrawBar(SB_BLOCKX,y+1,1,16,sc.light);
DrawFilledBar(SB_BLOCKX+1, y+1, SB_BLOCKW-1, 16);
DrawBar(SB_BLOCKX,y+SB_BLOCKX,SB_BLOCKW,1,sc.work_graph);
DrawBar(SB_BLOCKX,y+SB_BLOCKX,SB_BLOCKW,1,sc.line);
WriteText(SB_BLOCKX+8,y+5,0x80,col.list_gb_text,caption);
if (id) DefineButton(159,y+1,16,16,id+BT_HIDE+BT_NOFRAME,0); //arrow button
WriteText(165,y+5,0x80,col.list_gb_text,arrow); //arrow
134,7 → 134,7
DefineButton(SB_BLOCKX,actions_y,SB_BLOCKW-1,DEV_H,actions[i*3]+BT_HIDE,0xE4DFE1);
WriteText(45,actions_y+4,0x80,0,actions[i*3+1]);
WriteText(-strlen(actions[i*3+2])*6+SIDEBAR_W-SBPAD-7,actions_y+4,0x80,0x999999,actions[i*3+2]);
_PutImage(23,actions_y+2, 14,13, i*14*13*3+#factions);
PutImage(23,actions_y+2, 14,13, i*14*13*3+#factions);
}
}
 
181,9 → 181,9
PathShow.text_pointer = location[0];
PathShow.area_size_x = Form.cwidth-300;
DrawBar(PathShow.start_x-3, PathShow.start_y-6, PathShow.area_size_x+3, 19, col.odd_line);
DrawRectangle(PathShow.start_x-4,PathShow.start_y-7,PathShow.area_size_x+4,20,sc.work_graph);
DrawRectangle(PathShow.start_x-4,PathShow.start_y-7,PathShow.area_size_x+4,20,sc.line);
DefineHiddenButton(PathShow.start_x-4+1,PathShow.start_y-7+1,PathShow.area_size_x+4-2,20-2,BTN_PATH);
DrawBar(PathShow.start_x-4, PathShow.start_y+14, PathShow.area_size_x+5+18, 1, sc.work_light);
DrawBar(PathShow.start_x-4, PathShow.start_y+14, PathShow.area_size_x+5+18, 1, sc.light);
 
DrawFlatButtonSmall(PathShow.start_x+PathShow.area_size_x,PathShow.start_y-7,18,20, BTN_BREADCRUMB, "\x19");
 
209,10 → 209,10
draw_x = 3 + DDW;
draw_w = Form.cwidth/2 - draw_x - 17;
do {
DrawBar(draw_x, SELECTY-1, draw_w-KFM2_DEVH+1, 1, sc.work_graph);
DrawBar(draw_x, SELECTY-1, draw_w-KFM2_DEVH+1, 1, sc.line);
DrawBar(draw_x, SELECTY, draw_w-KFM2_DEVH+1, KFM2_DEVH, back_color);
DefineHiddenButton(draw_x, SELECTY, draw_w-KFM2_DEVH, KFM2_DEVH-1, BTN_PATH+i);
DrawBar(draw_x, SELECTY+KFM2_DEVH, draw_w-KFM2_DEVH+1, 1, sc.work_graph);
DrawBar(draw_x, SELECTY+KFM2_DEVH, draw_w-KFM2_DEVH+1, 1, sc.line);
kfont.WriteIntoWindow(draw_x + 3, math.max(KFM2_DEVH-kfont.height/2+SELECTY,0),
back_color, text_color, kfont.size.pt, location[i]+strrchr(location[i], '/'));
DrawFlatButtonSmall(draw_x+draw_w-KFM2_DEVH+1, SELECTY-1, KFM2_DEVH-1, KFM2_DEVH+1, BTN_BREADCRUMB+i, "\x19");
286,7 → 286,7
int DrawEolitePopup(dword b1_text, b2_text)
{
int popin_x = files.w - POPIN_W / 2 + files.x ;
DrawPopup(popin_x, 160, POPIN_W, 95, 1, sc.work, sc.work_graph);
DrawPopup(popin_x, 160, POPIN_W, 95, 1, sc.work, sc.line);
DrawCaptButton(popin_x+23+000, 215, 100, 26, POPUP_BTN1, sc.button, sc.button_text, b1_text);
DrawCaptButton(popin_x+23+114, 215, 100, 26, POPUP_BTN2, sc.button, sc.button_text, b2_text);
popin_text.left = popin_x+30;
295,9 → 295,9
}
 
void DrawDot(dword x,y) {
dword col_pxl = MixColors(sc.work_graph, sc.work, 60);
DrawBar(x+1,y,2,4,sc.work_graph);
DrawBar(x,y+1,4,2,sc.work_graph);
dword col_pxl = MixColors(sc.line, sc.work, 60);
DrawBar(x+1,y,2,4,sc.line);
DrawBar(x,y+1,4,2,sc.line);
PutPixel(x,y,col_pxl);
PutPixel(x+3,y,EDX);
PutPixel(x,y+3,EDX);
/programs/cmm/eolite/include/left_panel.h
110,7 → 110,7
if (is_active) WriteText(draw_x+30,draw_y+5,0x80,0x555555,#dev_name);
WriteText(draw_x+29,draw_y+5,0x80,0,#dev_name);
}
_PutImage(draw_x+6,draw_y, 18,17, is_active*7+dev_icon*17*18*3+#devices);
PutImage(draw_x+6,draw_y, 18,17, is_active*7+dev_icon*17*18*3+#devices);
draw_y += DEV_H;
}
DrawBar(draw_x+6, draw_y, 18, 1, 0xFFFfff);
134,9 → 134,9
GetDiskIconAndName(#dev_name, #dev_icon, #disc_name);
if (strstr(_path, #dev_name)-_path==0) break;
}
DrawRectangle(draw_x-1, SELECTY-1, DDW+2-KFM2_DEVH, KFM2_DEVH+1, sc.work_graph);
DrawRectangle(draw_x-1, SELECTY-1, DDW+2-KFM2_DEVH, KFM2_DEVH+1, sc.line);
DrawBar(draw_x, SELECTY, DDW+1-KFM2_DEVH, KFM2_DEVH, 0xFFFFFF);
_PutImage(draw_x + 5, SELECTY+2, 18,17, dev_icon*17*18*3+#devices);
PutImage(draw_x + 5, SELECTY+2, 18,17, dev_icon*17*18*3+#devices);
kfont.WriteIntoWindow(draw_x + 24, math.max(KFM2_DEVH-kfont.height/2+SELECTY,0), 0xFFFfff, 0x000000, kfont.size.pt, #dev_name+1);
DefineHiddenButton(draw_x, SELECTY, DDW-1, KFM2_DEVH-1, btid);
DrawFlatButtonSmall(draw_x+DDW-KFM2_DEVH+1, SELECTY-1, KFM2_DEVH-1, KFM2_DEVH+1, NULL, "\x19");
150,7 → 150,7
SystemDiscs.Get();
 
DrawPopup(draw_x, optionsy, DDW, list.count*KFM2_DEVH, 1, -1, sc.work_graph);
DrawPopup(draw_x, optionsy, DDW, list.count*KFM2_DEVH, 1, -1, sc.line);
 
for (i=0;i<list.count;i++) {
strcpy(#dev_name, list.get(i));
159,7 → 159,7
 
DrawBar(draw_x, optionsy, DDW, KFM2_DEVH, 0xFFFFFF);
DefineButton(draw_x, optionsy, DDW, KFM2_DEVH-1, 100+i+BT_HIDE,0xFFFFFF);
_PutImage(draw_x + 5, optionsy+2, 18,17, is_active*7+dev_icon*17*18*3+#devices);
PutImage(draw_x + 5, optionsy+2, 18,17, is_active*7+dev_icon*17*18*3+#devices);
if (is_active) kfont.bold = true;
//strncpy(#volume_label, GetVolumeLabel(#dev_name), sizeof(volume_label));
strcpy(#label_file_name, #dev_name);
/programs/cmm/eolite/include/progress_dialog.h
45,7 → 45,7
copy_bar.value = 0;
copy_bar.max = 0;
}
copy_bar.frame_color = sc.work_graph;
copy_bar.frame_color = sc.line;
if (copy_state == FILE_EXISTS) {
event_mode = #WaitEvent;
96,7 → 96,7
remember_choice.draw(PR_LEFT+225, REPLACEY+37);
}
 
DrawRectangle3D(PR_LEFT-1, PR_TOP-1, PR_W+1, PR_H+1, sc.work_dark, sc.work_light);
DrawRectangle3D(PR_LEFT-1, PR_TOP-1, PR_W+1, PR_H+1, sc.dark, sc.light);
}
}
 
/programs/cmm/eolite/include/properties.h
94,7 → 94,7
void ShowConfirmQuestionPopin()
{
apply_question_active = true;
DrawPopup(15,80,250,90,1,sc.work, sc.work_graph);
DrawPopup(15,80,250,90,1,sc.work, sc.line);
WriteText(35, 102, 0x90, 0x000000, QUEST_1);
WriteText(65, 117, 0x90, 0x000000, QUEST_2);
DrawStandartCaptButton(62,138,B_SETINGS_APPLY_SUBFOLDER,T_YES);
/programs/cmm/eolite/include/settings.h
200,7 → 200,7
static dword bg_col;
dword old_list_bg_color = col.list_bg;
sc.get();
sc.work_dark = MixColors(0, sc.work, 35);
sc.dark = MixColors(0, sc.work, 35);
if (sc.work == 0) sc.work = 1;
if (bg_col == sc.work) return;
bg_col = sc.work;
211,11 → 211,11
col.list_bg = sc.work;
col.list_gb_text = sc.work_text;
col.list_text_hidden = 0xA6A6B7;
col.list_vert_line = sc.work_graph;
col.lpanel = MixColors(sc.work_graph, sc.work, 65);
col.list_vert_line = sc.line;
col.lpanel = MixColors(sc.line, sc.work, 65);
col.selec = col.selec_active = sc.button;
col.selec_text = sc.button_text;
if (col.list_bg==col.selec) col.selec = sc.work_graph; //for fucking skins
if (col.list_bg==col.selec) col.selec = sc.line; //for fucking skins
col.slider_bg_big = MixColors(0xCED0D0, sc.work, 35);
col.odd_line = MixColors(0xFFFfff, sc.work, 15);
for (i=0; blue_hl_pal[i]!=0; i++) waves_pal[i] = MixColors(col.lpanel, blue_hl_pal[i], 180);
237,8 → 237,8
for (i=0; blue_hl_pal[i]!=0; i++) waves_pal[i] = blue_hl_pal[i];
}
col.selec_inactive = MixColors(0xBBBbbb, col.list_bg, 65);
col.slider_bg_left = MixColors(sc.work_graph, col.slider_bg_big, 10);
for (i=0; i<20; i++) col.work_gradient[i] = MixColors(sc.work_light, sc.work, i*5);
col.slider_bg_left = MixColors(sc.line, col.slider_bg_big, 10);
for (i=0; i<20; i++) col.work_gradient[i] = MixColors(sc.light, sc.work, i*5);
if (old_list_bg_color!=col.list_bg) LoadIcons();
}