Subversion Repositories Kolibri OS

Compare Revisions

Regard whitespace Rev 5582 → Rev 5591

/programs/cmm/eolite/include/menu.h
75,7 → 75,7
mm.get();
if (!CheckActiveProcess(MenuForm.ID)){ cmd_free=1; ExitProcess();}
else if (mm.move)&&(menu.ProcessMouse(mm.x, mm.y)) MenuListRedraw();
else if (mm.key&MOUSE_LEFT)&&(mm.down) {action_buf = cur_action_buf; pause(5); cmd_free=1; ExitProcess(); }
else if (mm.key&MOUSE_LEFT)&&(mm.up) {action_buf = cur_action_buf; cmd_free=1; ExitProcess(); }
break;
case evKey:
/programs/cmm/eolite/include/properties.h
14,6 → 14,7
?define PR_T_HIDDEN "‘ªàëâë©"
?define PR_T_SYSTEM "‘¨á⥬­ë©"
?define PR_T_ONLY_READ "’®«ìª® ç⥭¨¥"
?define SET_BYTE_LANG "¡ ©â"
#else
?define WINDOW_TITLE_PROPERTIES "Properties"
?define BTN_CLOSE "Close"
30,6 → 31,7
?define PR_T_HIDDEN "Hidden"
?define PR_T_SYSTEM "System"
?define PR_T_ONLY_READ "Read-only"
?define SET_BYTE_LANG "byte"
#endif
 
dword mouse_ddd2;
49,9 → 51,9
if (selected_count) return;
else
{
if (id==20) file_info_general.readonly ^= 1;
if (id==21) file_info_general.hidden ^= 1;
if (id==22) file_info_general.system ^= 1;
if (id==20) file_info_general.readonly ^= true;
if (id==21) file_info_general.hidden ^= true;
if (id==22) file_info_general.system ^= true;
SetFileInfo(#file_path, #file_info_general);
}
}
59,26 → 61,30
void GetSizeDir(dword way)
{
dword dirbuf, fcount, i, filename;
char cur_file[4096];
dword cur_file;
if (isdir(way))
{
cur_file = malloc(4096);
// In the process of recursive descent, memory must be allocated dynamically, because the static memory -> was a bug !!! But unfortunately pass away to sacrifice speed.
GetDir(#dirbuf, #fcount, way, DIRS_ONLYREAL);
for (i=0; i<fcount; i++)
{
filename = i*304+dirbuf+72;
sprintf(#cur_file,"%s/%s",way,filename);
sprintf(cur_file,"%s/%s",way,filename);
if ( TestBit(ESDWORD[filename-40], 4) )
{
dir_count++;
GetSizeDir(#cur_file);
GetSizeDir(cur_file);
}
else
{
GetFileInfo(#cur_file, #file_info_dirsize);
size_dir = size_dir + file_info_dirsize.sizelo;
GetFileInfo(cur_file, #file_info_dirsize);
size_dir += file_info_dirsize.sizelo;
file_count++;
}
}
free(cur_file);
}
}
 
96,7 → 102,7
{
selected_offset2 = file_mas[i]*304 + buf+32 + 7;
if (ESBYTE[selected_offset2]) {
sprintf(#cur_file,way,file_mas[i]*304+buf+72);
sprintf(#cur_file,"%s/%s",way,file_mas[i]*304+buf+72);
 
GetFileInfo(#cur_file, #file_info_general);
if ( file_info_general.isfolder )
149,7 → 155,11
{
case evButton:
id=GetButtonID();
IF (id==1) || (id==10){cmd_free=3;ExitProcess();}
if (id==1) || (id==10)
{
cmd_free=3;
ExitProcess();
}
if (id==20) SetProperties(id);
if (id==21) SetProperties(id);
if (id==22) SetProperties(id);
163,7 → 173,11
case evKey:
key = GetKey();
IF (key==27){cmd_free=3;ExitProcess();}
if (key==27)
{
cmd_free=3;
ExitProcess();
}
EAX=key<<8;
edit_box_key stdcall(#file_name_ed);
edit_box_key stdcall(#path_to_file_ed);
185,13 → 199,7
Put_icon('', 18, 19, 0xFFFfff, 0);
sprintf(#folder_info,"%s%d%s%d",SET_6,file_count,SET_7,dir_count);
WriteText(50, 23, 0x80, 0x000000, #folder_info);
EAX = ConvertSize(size_dir);
strcpy(#element_size_label, EAX);
strcat(#element_size_label, " (");
strcat(#element_size_label, itoa(size_dir));
strcat(#element_size_label, " b)");
//tmp = ConvertSize(size_dir);
//sprintf(#element_size_label," ( byte)");
sprintf(#element_size_label,"%s (%d %s)",ConvertSize(size_dir),size_dir,SET_BYTE_LANG);
WriteText(100, 65, 0x80, 0x000000, #element_size_label);
}
else
204,10 → 212,7
WriteText(50, 13, 0x80, 0x000000, PR_T_NAME);
edit_box_draw stdcall (#file_name_ed);
if (!itdir)
{
element_size = file_info_general.sizelo;
}
if (!itdir) element_size = file_info_general.sizelo;
else
{
WriteText(10, 80, 0x80, 0x000000, PR_T_CONTAINS);
215,7 → 220,6
WriteText(100, 80, 0x80, 0x000000, #folder_info);
element_size = size_dir;
}
WriteText(10, 95, 0x80, 0x000000, SET_3);
WriteText(10, 110, 0x80, 0x000000, SET_4);
WriteText(10, 125, 0x80, 0x000000, SET_5);
223,14 → 227,7
DrawDate(100, 110, 0, #file_info_general.datelastaccess);
DrawDate(100, 125, 0, #file_info_general.datelastedit);
EAX = ConvertSize(element_size);
strcpy(#element_size_label, EAX);
strcat(#element_size_label, " (");
strcat(#element_size_label, itoa(element_size));
strcat(#element_size_label, " b)");
//sprintf(#element_size_label,"%s (%d byte)","",element_size);
//tmp = ConvertSize(element_size);
//sprintf(#element_size_label,"%s (%d byte)",tmp,element_size);
sprintf(#element_size_label,"%s (%d %s)",ConvertSize(element_size),element_size,SET_BYTE_LANG);
WriteText(100, 65, 0x80, 0x000000, #element_size_label);
flags_frame.size_x = - flags_frame.start_x * 2 + settings_form.cwidth - 2;
/programs/cmm/eolite/include/settings.h
57,14 → 57,9
save_files_h = files.line_h;
save_DBLTime = MOUSE_TIME;
//SetEventMask(0x27);
loop(){
switch(WaitEvent())
{
/*case evMouse:
break;*/
case evButton:
id=GetButtonID();
if (id==10)
75,25 → 70,27
cmd_free = 4;
ExitProcess();
}
if (id==1) || (id==11)
else if (id==1) || (id==11)
{
active_settings=0;
goto EXIT_SETTING;
}
if (id==5)
else if (id==5)
{
RunProgram("tinypad", "/sys/settings/assoc.ini");
break;
}
if (id==20) show_dev_name ^= 1;
if (id==21) real_files_names_case ^= 1;
if (id==22) info_after_copy ^= 1;
if (id==23) use_big_fonts ^= 1;
if (id==25) files.line_h++;
if (id==26) && (files.line_h>8) files.line_h--;
if (id==27) MOUSE_TIME++;
if (id==28) && (MOUSE_TIME>30) MOUSE_TIME--;
RefreshWindow(Form.ID,settings_form.ID);
else if (id==20) show_dev_name ^= 1;
else if (id==21) real_files_names_case ^= 1;
else if (id==22) info_after_copy ^= 1;
else if (id==23) use_big_fonts ^= 1;
else if (id==25) files.line_h++;
else if (id==26) && (files.line_h>14) files.line_h--;
else if (id==27) MOUSE_TIME++;
else if (id==28) && (MOUSE_TIME>29) MOUSE_TIME--;
//CMD_REFRESH = true;
MoveSize(-1,-1,-1,settings_form.height+1);
MoveSize(-1,-1,-1,settings_form.height);
DrawSettingsCheckBoxes();
break;