Subversion Repositories Kolibri OS

Compare Revisions

Regard whitespace Rev 5956 → Rev 5957

/programs/cmm/eolite/Eolite.c
18,7 → 18,6
//obj
#include "..\lib\obj\libini.h"
#include "..\lib\obj\box_lib.h"
#include "..\lib\obj\fs.h"
 
byte CMD_ENABLE_SAVE_IMG = false;
 
125,9 → 124,6
 
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";
879,7 → 875,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))
901,8 → 897,7
}
}
}
if (error = DeleteFile(way)) del_error = error;*/
fs.remove(way);
if (error = DeleteFile(way)) del_error = error;
}
 
void Del_File_Thread()
/programs/cmm/eolite/include/copy.h
7,7 → 7,6
 
Clipboard clipboard;
 
dword _copy_path_ = 0;
void Copy(dword pcth, char cut)
{
dword selected_offset2;
14,7 → 13,6
byte copy_t[4096];
dword buff_data;
int ind = 0;
if (selected_count)
{
buff_data = malloc(selected_count*4096+10);
58,7 → 56,6
int j;
int cnt = 0;
dword buf;
dword tmp;
file_count_copy = 0;
copy_bar.value = 0;
65,23 → 62,50
buf = clipboard.GetSlotData(clipboard.GetSlotCount()-1);
if (DSDWORD[buf+4] != 3) return;
cnt = ESINT[buf+8];
for (j = 0; j < cnt; j++) {
strlcpy(#copy_from, j*4096+buf+10, 4096);
GetFileInfo(#copy_from, #file_info_count);
if ( file_info_count.isfolder ) DirFileCount(#copy_from);
else file_count_copy++;
}
copy_bar.max = file_count_copy;
if (cut_active) operation_flag = MOVE_FLAG;
else operation_flag = COPY_FLAG;
DisplayOperationForm();
for (j = 0; j < cnt; j++) {
strlcpy(#copy_from, j*4096+buf+10, 4096);
if (!copy_from) DialogExit();
strcpy(#copy_to, #path);
strcat(#copy_to, #copy_from+strrchr(#copy_from,'/'));
if (!strcmp(#copy_from,#copy_to))
{
strcpy(#copy_to, #path);
strcat(#copy_to, "new_");
strcat(#copy_to, #copy_from+strrchr(#copy_from,'/'));
}
if (strstr(#copy_to, #copy_from))
{
cut_active=false;
notify("Copy directory into itself is a bad idea...");
DialogExit();
}
IF (cut_active) fs.move(#copy_from, #copy_to);
ELSE fs.copy(#copy_from, #copy_to);
 
if (copy_rezult = copyf(#copy_from,#copy_to))
{
Write_Error(copy_rezult);
}
else if (cut_active)
{
//strcpy(#file_path, #copy_from);
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,7 → 155,6
DrawFlatButton(145,138,70,20,302,0xC6DFC6,T_NO);
}
 
/*
void GetSizeDir(dword way)
{
dword dirbuf, fcount, i, filename;
185,31 → 184,27
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);
fs.get_size(#cur_file);
dir_count = dir_count + ECX;
debugln(#cur_file);
GetSizeDir(#cur_file);
dir_count++;
file_count = file_count + EDX;
}
else
{
size_dir += fs.get_size(#cur_file);
GetFileInfo(#cur_file, #file_info_dirsize);
size_dir += file_info_dirsize.sizelo;
file_count++;
}
}
240,11 → 235,7
GetFileInfo(#file_path, #file_info_general);
strcpy(#file_name2, #file_name);
file_name_ed.size = strlen(#file_name2);
fs.get_size(#file_path);
element_size = EAX;
file_count = EDX;
dir_count =ECX;
debugi(dir_count);
if(itdir) GetSizeDir(#file_path);
atr_readonly = file_info_general.readonly;
atr_hidden = file_info_general.hidden;
atr_system = file_info_general.system;
360,12 → 351,13
WriteText(50, 13, 0x80, 0x000000, PR_T_NAME);
edit_box_draw stdcall (#file_name_ed);
if (itdir)
if (!itdir) element_size = file_info_general.sizelo;
else
{
WriteText(10, 80, 0x80, 0x000000, PR_T_CONTAINS);
sprintf(#folder_info,"%s%d%s%d",SET_6,file_count,SET_7,dir_count);
WriteText(100, 80, 0x80, 0x000000, #folder_info);
//element_size = size_dir;
element_size = size_dir;
}
WriteText(10, 95, 0x80, 0x000000, SET_3);
WriteText(10, 110, 0x80, 0x000000, SET_4);
/programs/cmm/eolite/include/translations.h
1,5 → 1,5
#define TITLE "Eolite File Manager v3.23"
#define ABOUT_TITLE "Eolite 3.23"
#define TITLE "Eolite File Manager v3.25"
#define ABOUT_TITLE "Eolite 3.25"
 
#ifdef LANG_RUS
?define T_FILE "” ©«"