Subversion Repositories Kolibri OS

Compare Revisions

Regard whitespace Rev 5882 → Rev 5883

/programs/cmm/eolite/Eolite.c
18,6 → 18,7
//obj
#include "..\lib\obj\libini.h"
#include "..\lib\obj\box_lib.h"
#include "..\lib\obj\fs.h"
 
byte CMD_ENABLE_SAVE_IMG = false;
 
124,6 → 125,9
 
load_dll(boxlib, #box_lib_init,0);
load_dll(libini, #lib_init,1);
lib_init_fs();
eolite_ini_path = abspath("Eolite.ini");
fd_path_eolite_ini_path = "/fd/1/File Managers/Eolite.ini";
874,7 → 878,7
int del_error;
int Del_File2(dword way, sh_progr)
{
dword dirbuf, fcount, i, filename;
/*dword dirbuf, fcount, i, filename;
int error;
char del_from[4096];
if (isdir(way))
896,7 → 900,8
}
}
}
if (error = DeleteFile(way)) del_error = error;
if (error = DeleteFile(way)) del_error = error;*/
fs.remove(way);
}
 
void Del_File_Thread()
/programs/cmm/eolite/include/copy.h
7,6 → 7,7
 
Clipboard clipboard;
 
dword _copy_path_ = 0;
void Copy(dword pcth, char cut)
{
dword selected_offset2;
13,6 → 14,7
byte copy_t[4096];
dword buff_data;
int ind = 0;
/*
if (selected_count)
{
buff_data = malloc(selected_count*4096+10);
42,6 → 44,9
}
cut_active = cut;
free(buff_data);
*/
_copy_path_ = strdup(#file_path);
cut_active = cut;
}
 
 
56,9 → 61,27
int j;
int cnt = 0;
dword buf;
dword tmp;
file_count_copy = 0;
copy_bar.value = 0;
if(_copy_path_)
{
DisplayOperationForm();
IF(!TEMP) TEMP = malloc(4096);
buf = _copy_path_;
while(DSBYTE[buf])
{
IF(DSBYTE[buf]=='/')tmp = buf;
buf++;
}
sprintf(TEMP,"%s/%s",#path,tmp);
IF(cut_active) fs.move(_copy_path_,TEMP);
ELSE fs.copy(_copy_path_,TEMP);
free(_copy_path_);
DialogExit();
}
_copy_path_ = 0;
/*
buf = clipboard.GetSlotData(clipboard.GetSlotCount()-1);
if (DSDWORD[buf+4] != 3) return;
cnt = ESINT[buf+8];
101,11 → 124,8
Del_File2(#copy_from, 0);
}
}
if (cut_active)
{
}*/
cut_active=false;
}
if (info_after_copy) notify(INFO_AFTER_COPY);
DialogExit();
}
/programs/cmm/eolite/include/properties.h
155,6 → 155,7
DrawFlatButton(145,138,70,20,302,0xC6DFC6,T_NO);
}
 
/*
void GetSizeDir(dword way)
{
dword dirbuf, fcount, i, filename;
184,17 → 185,21
free(cur_file);
}
}
*/
 
void GetSizeMoreFiles(dword way)
{
char cur_file[4096];
dword selected_offset2;
size_dir = 0;
for (i=0; i<files.count; i++)
{
selected_offset2 = file_mas[i]*304 + buf+32 + 7;
if (ESBYTE[selected_offset2]) {
if(ESBYTE[selected_offset2])
{
sprintf(#cur_file,"%s%s",way,file_mas[i]*304+buf+72);
size_dir += fs.get_size(#cur_file);
/*
if (TestBit(ESDWORD[file_mas[i]*304+buf+32], 4) )
{
debugln(#cur_file);
203,10 → 208,10
}
else
{
GetFileInfo(#cur_file, #file_info_dirsize);
size_dir += file_info_dirsize.sizelo;
size_dir += fs.get_size(#cur_file);
file_count++;
}
*/
}
}
}
235,7 → 240,8
GetFileInfo(#file_path, #file_info_general);
strcpy(#file_name2, #file_name);
file_name_ed.size = strlen(#file_name2);
if(itdir) GetSizeDir(#file_path);
//if(itdir) GetSizeDir(#file_path);
size_dir = fs.get_size(#file_path);
atr_readonly = file_info_general.readonly;
atr_hidden = file_info_general.hidden;
atr_system = file_info_general.system;