Subversion Repositories Kolibri OS

Compare Revisions

Regard whitespace Rev 7928 → Rev 7972

/programs/cmm/eolite/Eolite.c
89,7 → 89,7
byte list_full_redraw;
 
dword buf;
dword file_mas[6898];
collection_int items=0;
int selected_count;
int count_dir;
 
585,7 → 585,7
char status_bar_str[80];
int go_up_folder_exists=0;
if (!show_status_bar.checked) return;
if (files.count>0) && (strcmp(file_mas[0]*304+buf+72,"..")==0) go_up_folder_exists=1;
if (files.count>0) && (streq(items.get(0)*304+buf+72,"..")) go_up_folder_exists=1;
DrawBar(0, Form.cheight - status_bar_h, Form.cwidth, status_bar_h, sc.work);
sprintf(#status_bar_str, T_STATUS_EVEMENTS, count_dir-go_up_folder_exists, files.count-count_dir);
WriteText(6,Form.cheight - 13,0x80,sc.work_text,#status_bar_str);
721,7 → 721,7
if (colored_lines.checked) && (bgcol!=col.selec) && (filenum%2) bgcol=col.odd_line;
DrawBar(files.x+icon_size+4,y,files.w-icon_size-4,files.item_h,bgcol);
 
file_offet = file_mas[filenum+files.first]*304 + buf+32;
file_offet = items.get(filenum+files.first)*304 + buf+32;
attr = ESDWORD[file_offet];
file.selected = ESBYTE[file_offet+7];
file.sizelo = ESDWORD[file_offet+32];
806,8 → 806,6
Write_Error(errornum);
return;
}
maxcount = sizeof(file_mas)/sizeof(dword)-1;
if (files.count>maxcount) files.count = maxcount;
if (files.count>0) && (files.cur_y-files.first==-1) files.cur_y=0;
}
if (files.count!=-1)
835,11 → 833,14
{
dword d=0, f=1;
int j=0;
dword tmp;
dword file_off;
 
items.drop();
 
if (!strcmp(#path,"/")) //do not sort root folder
{
for(d=1;d<files.count;d++;) file_mas[d]=d;
for(d=1;d<files.count;d++;) items.set(d, d);
count_dir = d;
return;
}
848,12 → 849,12
if (dir_at_fat16) && (file_name_is_8_3(file_off+40)) strttl(file_off+40);
if (TestBit(ESDWORD[file_off],4)) //directory?
{
file_mas[d]=j;
items.set(d, j);
d++;
}
else
{
file_mas[files.count-f]=j;
items.set(files.count-f, j);
f++;
}
}
865,12 → 866,14
else if (sort_type==3) Sort_by_Size(d,files.count-1);
//reversed sorting
if (sort_desc) {
for (j=0; j<f/2; j++) file_mas[files.count-j-1]><file_mas[d+j];
//if (sort_type==1) for (j=0; j<d/2; j++) file_mas[d-j]><file_mas[j];
for (j=0; j<f/2; j++) {
items.swap(files.count-j-1, d+j);
}
//if (sort_type==1) for (j=0; j<d/2; j++) items[d-j]><items[j];
}
//make ".." first item in list
if (d>0) && (strncmp(file_mas[0]*304+buf+72,"..",2)!=0)
for(d--; d>0; d--;) if (!strncmp(file_mas[d]*304+buf+72,"..",2)) {file_mas[d]><file_mas[0]; break;}
if (d>0) && (strncmp(items.get(0)*304+buf+72,"..",2)!=0)
for(d--; d>0; d--;) if (!strncmp(items.get(d)*304+buf+72,"..",2)) {items.swap(d,0); break;}
}
 
 
913,7 → 916,7
files.KeyHome();
Open_Dir(#path,ONLY_OPEN);
if (dir_at_fat16) && (file_name_is_8_3(that_file)) strttl(that_file);
for (ind=files.count-1; ind>=0; ind--;) { if (!strcmp(file_mas[ind]*304+buf+72,that_file)) break; }
for (ind=files.count-1; ind>=0; ind--;) { if (streq(items.get(ind)*304+buf+72,that_file)) break; }
files.cur_y = ind - 1;
files.KeyDown();
DrawStatusBar();
1150,7 → 1153,7
int i;
for (i=files.cur_y+1; i<files.count; i++)
{
strcpy(#temp, file_mas[i]*304+buf+72);
strcpy(#temp, items.get(i)*304+buf+72);
if (temp[0]==key_ascii) || (temp[0]==key_ascii-32)
{
files.cur_y = i - 1;
/programs/cmm/eolite/include/breadcrumbs.h
17,7 → 17,7
}
 
void DrawBreadCrumbs()
collection_int breadCrumb;
collection_int breadCrumb=0;
char PathShow_path[4096];
block btn;
int i;
/programs/cmm/eolite/include/copy_and_delete.h
6,9 → 6,9
//===================================================//
 
void setElementSelectedFlag(dword n, int state) {
dword selected_offset = file_mas[n]*304 + buf+32 + 7;
dword selected_offset = items.get(n)*304 + buf+32 + 7;
ESBYTE[selected_offset] = state;
if (n==0) && (strncmp(file_mas[n]*304+buf+72,"..",2)==0) {
if (n==0) && (strncmp(items.get(n)*304+buf+72,"..",2)==0) {
ESBYTE[selected_offset] = false; //do not selec ".." directory
return;
}
18,7 → 18,7
}
 
int getElementSelectedFlag(dword n) {
dword selected_offset = file_mas[n]*304 + buf+32 + 7;
dword selected_offset = items.get(n)*304 + buf+32 + 7;
return ESBYTE[selected_offset];
}
 
71,7 → 71,7
for (i=0; i<files.count; i++)
{
if (getElementSelectedFlag(i) == true) {
sprintf(#copy_t,"%s/%s",#path,file_mas[i]*304+buf+72);
sprintf(#copy_t,"%s/%s",#path,items.get(i)*304+buf+72);
path_len = strlen(#copy_t);
size_buf += path_len + 1;
}
85,7 → 85,7
for (i=0; i<files.count; i++)
{
if (getElementSelectedFlag(i) == true) {
sprintf(copy_buf_offset,"%s/%s",#path,file_mas[i]*304+buf+72);
sprintf(copy_buf_offset,"%s/%s",#path,items.get(i)*304+buf+72);
copy_buf_offset += strlen(copy_buf_offset) + 1;
}
}
216,7 → 216,7
for (i=0; i<files.count; i++)
{
if (getElementSelectedFlag(i) == true) {
sprintf(#del_from,"%s/%s",#path,file_mas[i]*304+buf+72);
sprintf(#del_from,"%s/%s",#path,items.get(i)*304+buf+72);
copy_bar.max += GetFilesCount(#del_from);
}
}
226,7 → 226,7
for (i=0; i<files.count; i++)
{
if (getElementSelectedFlag(i) == true) {
sprintf(#del_from,"%s/%s", #path, file_mas[i]*304+buf+72);
sprintf(#del_from,"%s/%s", #path, items.get(i)*304+buf+72);
Del_File2(#del_from, 1);
}
}
/programs/cmm/eolite/include/left_panel.h
44,7 → 44,7
void Get();
void Draw();
void Click();
} SystemDiscs;
} SystemDiscs=0;
 
 
void GetDiskIconAndName(char disk_first_letter, dword dev_icon, disc_name)
/programs/cmm/eolite/include/properties.h
115,7 → 115,7
{
if (getElementSelectedFlag(i) == true)
{
sprintf(#pcur_file,"%s/%s",#path,file_mas[i]*304+buf+72);
sprintf(#pcur_file,"%s/%s",#path,items.get(i)*304+buf+72);
SetPropertiesFile(#pcur_file, #file_info_general);
if (SET_PROPERTIES_ALL_SUBFOLDER == mode) {
if (dir_exists(#pcur_file)) SetPropertiesDir(#pcur_file);
157,8 → 157,8
{
if (getElementSelectedFlag(i) == true)
{
sprintf(#cur_file,"%s/%s",way,file_mas[i]*304+buf+72);
if (TestBit(ESDWORD[file_mas[i]*304+buf+32], 4) )
sprintf(#cur_file,"%s/%s",way,items.get(i)*304+buf+72);
if (TestBit(ESDWORD[items.get(i)*304+buf+32], 4) )
{
more_files_count.calculate_loop(#cur_file);
more_files_count.folders++;
/programs/cmm/eolite/include/sorting.h
3,9 → 3,13
{
int j;
int iss = a;
int size1, size2;
if (a >= b) return;
for (j = a; j <= b; j++)
if (ESDWORD[file_mas[j]*304 + buf+64] <= ESDWORD[file_mas[b]*304 + buf+64]) { file_mas[iss] >< file_mas[j]; iss++;}
size2 = items.get(b)*304 + buf+64;
for (j = a; j <= b; j++) {
size1 = items.get(j)*304 + buf+64;
if (ESDWORD[size1] <= ESDWORD[size2]) { items.swap(iss,j); iss++;}
}
Sort_by_Size (a, iss-2);
Sort_by_Size (iss, b);
}
15,9 → 19,10
{
int j;
int isn = a;
dword name2 = items.get(b)*304 + buf+72;
if (a >= b) return;
for (j = a; j <= b; j++) {
if (strcmpi(file_mas[j]*304 + buf+72, file_mas[b]*304 + buf+72)<=0) { file_mas[isn] >< file_mas[j]; isn++;}
if (strcmpi(items.get(j)*304 + buf+72, name2)<=0) { items.swap(isn,j); isn++;}
}
Sort_by_Name(a, isn-2);
Sort_by_Name(isn, b);
30,10 → 35,10
dword filename1, filename2, ext1, ext2;
int n, isn = a;
if (a >= b) return;
filename2 = items.get(b)*304 + buf+72;
for (j = a; j <= b; j++)
{
filename1 = file_mas[j]*304 + buf+72;
filename2 = file_mas[b]*304 + buf+72;
filename1 = items.get(j)*304 + buf+72;
 
n=strlen(filename1)-1;
WHILE (n>0) && (ESBYTE[filename1+n]!='.') n--;
44,8 → 49,8
if (n) ext2 = filename2+n+1; else ext2=0;
 
n=strcmp(ext1, ext2);
if (n<0) { file_mas[isn] >< file_mas[j]; isn++;}
if (!n) && (strcmp(filename1, filename2) <= 0) { file_mas[isn] >< file_mas[j]; isn++;}
if (n<0) { items.swap(isn, j); isn++;}
if (!n) && (strcmp(filename1, filename2) <= 0) { items.swap(isn,j); isn++;}
}
Sort_by_Type(a, isn-2);
Sort_by_Type(isn, b);
/programs/cmm/eolite/include/translations.h
1,5 → 1,5
#define TITLE "Eolite File Manager 4.28b"
#define ABOUT_TITLE "EOLITE 4.28b"
#define TITLE "Eolite File Manager 4.3"
#define ABOUT_TITLE "EOLITE 4.3"
 
#ifdef LANG_RUS
?define T_FILE "” ©«"