Subversion Repositories Kolibri OS

Compare Revisions

Regard whitespace Rev 5661 → Rev 5674

/programs/cmm/eolite/Eolite.c
141,7 → 141,6
dword menu_stak,about_stak,properties_stak,settings_stak,copy_stak;
 
proc_info Form;
system_colors sc;
int mouse_dd, scroll_used, sc_slider_h, sorting_arrow_x, kolibrios_drive;
dword buf;
dword file_mas[6898];
603,7 → 602,7
 
void draw_window()
{
DefineAndDrawWindow(GetScreenWidth()-550/4+rand_n,rand_n+30,550,500,0x73,sc.work,TITLE,0);
DefineAndDrawWindow(GetScreenWidth()-550/4+rand_n,rand_n+30,550,500,0x73,system.color.work,TITLE,0);
GetProcessInfo(#Form, SelfInfo);
if (Form.status_window>2) return;
files.SetSizes(192, 57, Form.cwidth - 210, onTop(57,6), disc_num*16+195,files.line_h);
612,26 → 611,26
GetProcessInfo(#Form, SelfInfo); //if win_size changed
 
PutPaletteImage(#toolbar,246,34,0,0,8,#toolbar_pal);
DrawBar(127, 8, 1, 25, sc.work_graph);
for (j=0; j<3; j++) DefineButton(toolbar_buttons_x[j]+2,5+2,31-5,29-5,21+j+BT_HIDE,sc.work);
for (j=3; j<6; j++) DefineButton(toolbar_buttons_x[j],5,31,29,21+j+BT_HIDE,sc.work);
DrawBar(246,0,Form.cwidth - 297,12, sc.work); //upper editbox
DrawBar(246,29,Form.cwidth - 297,5,sc.work); //under editbox
DrawRectangle(246,12,Form.cwidth - 303,16,sc.work_graph);
DrawBar(127, 8, 1, 25, system.color.work_graph);
for (j=0; j<3; j++) DefineButton(toolbar_buttons_x[j]+2,5+2,31-5,29-5,21+j+BT_HIDE,system.color.work);
for (j=3; j<6; j++) DefineButton(toolbar_buttons_x[j],5,31,29,21+j+BT_HIDE,system.color.work);
DrawBar(246,0,Form.cwidth - 297,12, system.color.work); //upper editbox
DrawBar(246,29,Form.cwidth - 297,5,system.color.work); //under editbox
DrawRectangle(246,12,Form.cwidth - 303,16,system.color.work_graph);
DefineButton(Form.cwidth - 32,6,27,28,51+BT_HIDE+BT_NOFRAME,0); //about
PutPaletteImage(#goto_about,56,34,Form.width-65,0,8,#goto_about_pal);
//main rectangles
DrawRectangle(1,40,Form.cwidth-3,onTop(46,0),sc.work_graph);
DrawRectangle(1,40,Form.cwidth-3,onTop(46,0),system.color.work_graph);
DrawRectangle(0,39,Form.cwidth-1,onTop(44,0),col_palette[4]); //bg
for (i=0; i<5; i++) DrawBar(0, 34+i, Form.cwidth, 1, col_palette[8-i]);
DrawLeftPanel();
//ListBox
DrawFlatButton(files.x,40,Form.cwidth - files.x - 159,16,31,sc.work,T_FILE);
DrawFlatButton(Form.cwidth - 159,40,73,16,32,sc.work,T_TYPE);
DrawFlatButton(Form.cwidth - 86,40,68,16,33,sc.work,T_SIZE);
DrawBar(files.x+files.w,files.y,1,onTop(22,files.y),sc.work_graph); //line to the left from the scroll
DrawFlatButton(files.x+files.w,40,16,16,0,sc.work,"\x18");
DrawFlatButton(files.x+files.w,onTop(22,0),16,16,0,sc.work,"\x19");
DrawFlatButton(files.x,40,Form.cwidth - files.x - 159,16,31,system.color.work,T_FILE);
DrawFlatButton(Form.cwidth - 159,40,73,16,32,system.color.work,T_TYPE);
DrawFlatButton(Form.cwidth - 86,40,68,16,33,system.color.work,T_SIZE);
DrawBar(files.x+files.w,files.y,1,onTop(22,files.y),system.color.work_graph); //line to the left from the scroll
DrawFlatButton(files.x+files.w,40,16,16,0,system.color.work,"\x18");
DrawFlatButton(files.x+files.w,onTop(22,0),16,16,0,system.color.work,"\x19");
Open_Dir(#path,ONLY_SHOW);
if (del_active) Del_Form();
if (new_element_active) NewElement_Form(new_element_active, #new_element_name);
715,8 → 714,8
//in the bottom
paint_y = j * files.line_h + files.y;
DrawBar(files.x,paint_y,files.w,onTop(paint_y,6),0xFFFFFF);
DrawBar(Form.cwidth-159,paint_y,1,onTop(paint_y,6),sc.work);
DrawBar(Form.cwidth-86,paint_y,1,onTop(paint_y,6),sc.work);
DrawBar(Form.cwidth-159,paint_y,1,onTop(paint_y,6),system.color.work);
DrawBar(Form.cwidth-86,paint_y,1,onTop(paint_y,6),system.color.work);
Scroll();
}
 
771,8 → 770,8
PathShow_prepare stdcall(#FileShow);
PathShow_draw stdcall(#FileShow);
}
DrawBar(Form.cwidth-159,y,1,files.line_h,sc.work); //gray line 1
DrawBar(Form.cwidth-86,y,1,files.line_h,sc.work); //gray line 2
DrawBar(Form.cwidth-159,y,1,files.line_h,system.color.work); //gray line 1
DrawBar(Form.cwidth-86,y,1,files.line_h,system.color.work); //gray line 2
}
 
 
805,7 → 804,7
if (sort_num==1) sorting_arrow_x = Form.width+60/2;
if (sort_num==2) sorting_arrow_x = Form.width-115;
if (sort_num==3) sorting_arrow_x = strlen(T_SIZE)*3-30+files.x+files.w;
WriteText(sorting_arrow_x,45,0x80,sc.work_graph,"\x19");
WriteText(sorting_arrow_x,45,0x80,system.color.work_graph,"\x19");
if (redraw!=ONLY_SHOW) Sorting();
if (redraw!=ONLY_OPEN)&&(!_not_draw) List_ReDraw();
DrawSystemDiscs();
863,8 → 862,8
else
{
if (!files.count) return;
DrawPopup(dform_x,160,220,85,1,sc.work,sc.work_graph);
WriteText(-strlen(T_DELETE_FILE)*3+110+dform_x,175,0x80,sc.work_text,T_DELETE_FILE);
DrawPopup(dform_x,160,220,85,1,system.color.work,system.color.work_graph);
WriteText(-strlen(T_DELETE_FILE)*3+110+dform_x,175,0x80,system.color.work_text,T_DELETE_FILE);
for (i=0; i<files.count; i++)
{
selected_offset2 = file_mas[i]*304 + buf+32 + 7;
873,14 → 872,14
if (cont)
{
sprintf(#f_count,"%s%d%s",DEL_MORE_FILES_1,cont,DEL_MORE_FILES_2);
WriteText(-strlen(#f_count)*3+110+dform_x,190,0x80,sc.work_text,#f_count);
WriteText(-strlen(#f_count)*3+110+dform_x,190,0x80,system.color.work_text,#f_count);
}
else
{
if (strlen(#file_name)<28)
{
WriteText(strlen(#file_name)*3+110+dform_x+2,190,0x80,sc.work_text,"?");
WriteText(-strlen(#file_name)*3+110+dform_x,190,0x80,sc.work_text,#file_name);
WriteText(strlen(#file_name)*3+110+dform_x+2,190,0x80,system.color.work_text,"?");
WriteText(-strlen(#file_name)*3+110+dform_x,190,0x80,system.color.work_text,#file_name);
}
else
{
1115,11 → 1114,11
strcpy(#new_element_name, strng);
new_file_ed.size = new_file_ed.pos = strlen(strng);
}
DrawPopup(dform_x,160,220,85,1,sc.work,sc.work_graph);
DrawPopup(dform_x,160,220,85,1,system.color.work,system.color.work_graph);
new_file_ed.left = dform_x+24;
edit_box_draw stdcall (#new_file_ed);
DrawRectangle(new_file_ed.left-1, new_file_ed.top-1, new_file_ed.width+2, 16, 0xFFFfff);
DrawRectangle(new_file_ed.left-2, new_file_ed.top-2, new_file_ed.width+4, 18, sc.work_graph);
DrawRectangle(new_file_ed.left-2, new_file_ed.top-2, new_file_ed.width+4, 18, system.color.work_graph);
if (new_element_active==3) DrawFlatButton(dform_x+22,208,85,22,301,0xFFB6B5,T_RENAME);
else DrawFlatButton(dform_x+27,208,70,22,301,0xFFB6B5,T_CREATE);
DrawFlatButton(dform_x+120,208,70,22,302,0xC6DFC6,T_CANCEL);
/programs/cmm/eolite/include/about.h
50,7 → 50,7
break;
case evReDraw:
DefineAndDrawWindow(Form.left+Form.width/2,Form.top+Form.height/2-114,300,228+GetSkinHeight(),0x34,sc.work,INTRO_TEXT_1);
DefineAndDrawWindow(Form.left+Form.width/2,Form.top+Form.height/2-114,300,228+GetSkinHeight(),0x34,system.color.work,INTRO_TEXT_1);
GetProcessInfo(#about_form, SelfInfo);
if (Form.status_window>2) break;
DrawBar(0,0,about_form.cwidth,50,0x8494C4);
/programs/cmm/eolite/include/copy.h
114,10 → 114,10
break;
case evReDraw:
DefineAndDrawWindow(Form.left+Form.width-200,Form.top+90,WIN_COPY_W,GetSkinHeight()+WIN_COPY_H,0x34,sc.work,T_PASTE_WINDOW_TITLE);
DefineAndDrawWindow(Form.left+Form.width-200,Form.top+90,WIN_COPY_W,GetSkinHeight()+WIN_COPY_H,0x34,system.color.work,T_PASTE_WINDOW_TITLE);
GetProcessInfo(#Copy_Form, SelfInfo);
WriteText(45, 11, 0x80, sc.work_text, T_PASTE_WINDOW_TEXT);
DrawFlatButton(Copy_Form.cwidth - 90, Copy_Form.cheight - 32, 80, 22, 10, sc.work_button, T_PASTE_WINDOW_BUTTON);
WriteText(45, 11, 0x80, system.color.work_text, T_PASTE_WINDOW_TEXT);
DrawFlatButton(Copy_Form.cwidth - 90, Copy_Form.cheight - 32, 80, 22, 10, system.color.work_button, T_PASTE_WINDOW_BUTTON);
DrawBar(8, 10, 32, 32, 0xFFFfff);
break;
}
134,6 → 134,6
if (Copy_Form.cwidth==0) return;
DisplayCopyfForm();
Put_icon(copying_filename+strrchr(copying_filename,'.'), 16, 19, 0xFFFfff, 0);
DrawBar(45, 29, Copy_Form.cwidth-40, 10, sc.work);
WriteText(45, 29, 0x80, sc.work_text, copying_filename);
DrawBar(45, 29, Copy_Form.cwidth-40, 10, system.color.work);
WriteText(45, 29, 0x80, system.color.work_text, copying_filename);
}
/programs/cmm/eolite/include/gui.h
45,12 → 45,12
void DrawFlatButton(dword x,y,width,height,id,color,text)
{
int fill_h;
DrawRectangle(x,y,width,height,sc.work_graph);
DrawRectangle(x,y,width,height,system.color.work_graph);
DrawRectangle3D(x+1,y+1,width-2,height-2,0xFEFEFE,col_padding);
PutPixel(x+width-1, y+1, col_padding);
if (color!=-1) DrawFilledBar(x+2, y+2, width-3, height-3);
IF (id<>0) DefineButton(x+1,y+1,width-2,height-2,id+BT_HIDE,0xEFEBEF);
WriteText(-strlen(text)*6+width/2+x+1,height/2-3+y,0x80,sc.work_text,text);
WriteText(-strlen(text)*6+width/2+x+1,height/2-3+y,0x80,system.color.work_text,text);
}
 
void DrawFilledBar(dword x, y, w, h)
65,8 → 65,8
{
int form_x=files.w-220/2+files.x;
int form_y=160;
DrawPopup(form_x,form_y,220,80,1,sc.work,sc.work_graph);
WriteText(-strlen(message)*3+110+form_x,80/2-4+form_y,0x80,sc.work_text,message);
DrawPopup(form_x,form_y,220,80,1,system.color.work,system.color.work_graph);
WriteText(-strlen(message)*3+110+form_x,80/2-4+form_y,0x80,system.color.work_text,message);
pause(pause_duration);
if (pause_duration) List_ReDraw();
}
/programs/cmm/eolite/include/left_panel.h
62,10 → 62,10
int i;
DrawBar(17,y,160,1,0xEFEDEE);
DrawFilledBar(17, y+1, 160, 16);
WriteText(25,y+5,0x80,sc.work_text,caption);
WriteText(25,y+5,0x80,system.color.work_text,caption);
if (id) DefineButton(159,y+1,16,16,id+BT_HIDE+BT_NOFRAME,0); //arrow button
WriteText(165,y+5,0x80,sc.work_text,arrow); //arrow
DrawBar(17,y+17,160,1,sc.work_graph);
WriteText(165,y+5,0x80,system.color.work_text,arrow); //arrow
DrawBar(17,y+17,160,1,system.color.work_graph);
}
 
 
/programs/cmm/eolite/include/menu.h
88,7 → 88,7
if (menu_call_mouse) DefineAndDrawWindow(mouse.x+Form.left+5, mouse.y+Form.top+GetSkinHeight(),menu.w+3,menu.h+6,0x01, 0, 0, 0x01fffFFF);
else DefineAndDrawWindow(Form.left+files.x+15, files.line_h*files.current+files.y+Form.top+30,menu.w+3,menu.h+6,0x01, 0, 0, 0x01fffFFF);
GetProcessInfo(#MenuForm, SelfInfo);
DrawRectangle(0,0,menu.w+1,menu.h+2,sc.work_graph);
DrawRectangle(0,0,menu.w+1,menu.h+2,system.color.work_graph);
DrawBar(1,1,menu.w,1,0xFFFfff);
DrawPopupShadow(1,1,menu.w,menu.h,0);
MenuListRedraw();
110,10 → 110,10
}
else
{
DrawBar(2,start_y+2,menu.w-1,menu.line_h,sc.work);
DrawBar(2,start_y+2,menu.w-1,menu.line_h,system.color.work);
WriteText(8,start_y+menu.text_y+3,0x80,0xf2f2f2,file_captions[index*3]);
}
WriteText(7,start_y+menu.text_y+2,0x80,sc.work_text,file_captions[index*3]);
WriteText(7,start_y+menu.text_y+2,0x80,system.color.work_text,file_captions[index*3]);
WriteText(-strlen(file_captions[index*3+1])*6-6+menu.w,start_y+menu.text_y+2,0x80,0x888888,file_captions[index*3+1]);
start_y+=menu.line_h;
}
/programs/cmm/eolite/include/properties.h
192,7 → 192,7
break;
case evReDraw:
DefineAndDrawWindow(Form.left + 150,150,270,285+GetSkinHeight(),0x34,sc.work,WINDOW_TITLE_PROPERTIES);
DefineAndDrawWindow(Form.left + 150,150,270,285+GetSkinHeight(),0x34,system.color.work,WINDOW_TITLE_PROPERTIES);
GetProcessInfo(#settings_form, SelfInfo);
DrawFlatButton(settings_form.cwidth - 70 - 13, settings_form.cheight - 34, 70, 22, 10, 0xE4DFE1, BTN_CLOSE);
DrawBar(10, 10, 32, 32, 0xFFFfff);
239,9 → 239,9
WriteText(100, 65, 0x80, 0x000000, #element_size_label);
flags_frame.size_x = - flags_frame.start_x * 2 + settings_form.cwidth - 2;
flags_frame.font_color = sc.work_text;
flags_frame.font_backgr_color = sc.work;
flags_frame.ext_col = sc.work_graph;
flags_frame.font_color = system.color.work_text;
flags_frame.font_backgr_color = system.color.work;
flags_frame.ext_col = system.color.work_graph;
frame_draw stdcall (#flags_frame);
DrawPropertiesCheckBoxes();
}
/programs/cmm/eolite/include/settings.h
106,7 → 106,7
break;
case evReDraw:
DefineAndDrawWindow(Form.left + Form.width/2, Form.top + Form.height/2 - 75, 300, 234+GetSkinHeight(),0x34,sc.work,TITLE_SETT);
DefineAndDrawWindow(Form.left + Form.width/2, Form.top + Form.height/2 - 75, 300, 234+GetSkinHeight(),0x34,system.color.work,TITLE_SETT);
GetProcessInfo(#settings_form, SelfInfo);
DrawSettingsCheckBoxes();
DrawFlatButton(9, 166, strlen(EDIT_FILE_ASSOCIATIONS)+4*6, 22, 5, 0xE4DFE1, EDIT_FILE_ASSOCIATIONS);
122,8 → 122,8
CheckBox2(10, 33, 21, SHOW_REAL_NAMES, real_files_names_case);
CheckBox2(10, 55, 22, NOTIFY_COPY_END, info_after_copy);
CheckBox2(10, 77, 23, USE_BIG_FONTS, use_big_fonts);
MoreLessBox(10, 104, 18, 25, 26, #sc, files.line_h, LIST_LINE_HEIGHT);
MoreLessBox(10, 134, 18, 27, 28, #sc, MOUSE_TIME, T_DOUBLE_CLICK);
MoreLessBox(10, 104, 18, 25, 26, #system.color, files.line_h, LIST_LINE_HEIGHT);
MoreLessBox(10, 134, 18, 27, 28, #system.color, MOUSE_TIME, T_DOUBLE_CLICK);
}
 
 
176,11 → 176,11
 
void SetAppColors()
{
sc.work = 0xE4DFE1;
sc.work_text = 0;
sc.work_graph = 0x9098B0; //A0A0B8; //0x819FC5;
sc.work_button = 0xD2D3D3;
sc.work_button_text = 0x000000;
system.color.work = 0xE4DFE1;
system.color.work_text = 0;
system.color.work_graph = 0x9098B0; //A0A0B8; //0x819FC5;
system.color.work_button = 0xD2D3D3;
system.color.work_button_text = 0x000000;
col_padding = 0xC8C9C9;
//col_selec = 0x94AECE;
col_lpanel = 0x00699C;
188,5 → 188,5
 
 
void CheckBox2(dword x, y, id, text, byte value) {
CheckBox(x, y, 14, 14, id, text, sc.work_graph, sc.work_text, value);
CheckBox(x, y, 14, 14, id, text, system.color.work_graph, system.color.work_text, value);
}