Subversion Repositories Kolibri OS

Compare Revisions

Regard whitespace Rev 4697 → Rev 4698

/programs/cmm/eolite/Eolite.c
80,8 → 80,8
 
enum {ONLY_SHOW, WITH_REDRAW, ONLY_OPEN}; //OpenDir
 
#define TITLE "Eolite File Manager v2.16.2"
#define ABOUT_TITLE "Eolite v2.16.2"
#define TITLE "Eolite File Manager v2.17"
#define ABOUT_TITLE "Eolite v2.17"
dword col_padding, col_selec, col_lpanel;
 
int toolbar_buttons_x[7]={9,46,85,134,167,203};
305,9 → 305,11
Dir_Up();
break;
case 24: //cut
add_to_copy(#file_path);
Copy(#file_path, CUT);
break;
case 25: //copy
add_to_copy(#file_path);
Copy(#file_path, NOCUT);
break;
case 26: //paste
385,9 → 387,11
RunProgram("/sys/File Managers/Eolite", #path);
break;
case 024: //Ctrl+X
add_to_copy(#file_path);
Copy(#file_path, CUT);
break;
case 003: //Ctrl+C
add_to_copy(#file_path);
Copy(#file_path, NOCUT);
break;
case 022: //Ctrl+V
429,6 → 433,9
case 182: //del
Del_Form();
break;
case 185: //ins
add_to_copy(#file_path);
break;
case 050...059: //F1-F10
FnProcess(key-49);
break;
594,7 → 601,6
name_len=0,
attr,
y=filenum*files.line_h+files.y;
if (filenum==-1) return;
DrawBar(files.x,y,3,files.line_h,color);
DrawBar(files.x+19,y,files.w-19,files.line_h,color);
DrawBar(files.x+3,y+17,16,1,color);
607,7 → 613,7
if (! TestBit(attr, 4) ) //file or folder?
{
Put_icon(off+_strrchr(off,'.'), files.x+3, files.line_h/2-7+y, color, 0);
WriteText(7-strlen(ConvertSize(ESDWORD[off-8]))*6+onLeft(75,0),files.line_h-6/2+y,0x80,0,ConvertSize(ESDWORD[off-8])); //size
WriteText(7-strlen(ConvertMemSize(ESDWORD[off-8]))*6+onLeft(75,0),files.line_h-6/2+y,0x80,0,ConvertMemSize(ESDWORD[off-8])); //size
}
else
if (!strcmp("..",off))
/programs/cmm/eolite/include/copy.h
2,18 → 2,39
 
byte copy_to[4096];
byte cut_active=0;
byte id_add_to_copy=0;
byte add_to_copy_active=0;
enum {NOCUT, CUT, COPY_PASTE_END};
 
struct path_str {
char Item[4096];
};
#define MAX_HISTORY_NUM 10
 
Clipboard clipboard;
 
struct Copy_Path {
dword size;
dword type;
path_str copy_list[MAX_HISTORY_NUM];
};
 
Copy_Path copy_path;
 
void add_to_copy(dword pcth)
{
add_to_copy_active=1;
strlcpy(#copy_path.copy_list[id_add_to_copy].Item, pcth);
id_add_to_copy++;
}
 
 
void Copy(dword pcth, char cut)
{
clipboard.data.size = sizeof(buffer_data);
clipboard.data.type = 0;
clipboard.data.encoding = 1;
strcpy(#clipboard.data.buffer_data, pcth);
clipboard.SetSlotData(sizeof(buffer_data), #clipboard.data);
copy_path.type = 3;
copy_path.size = sizeof(copy_path);
clipboard.SetSlotData(sizeof(copy_path), #copy_path);
cut_active = cut;
}
 
36,9 → 57,12
{
char copy_rezult;
byte copy_from[4096];
int tst;
strcpy(#copy_from, clipboard.GetSlotData(clipboard.GetSlotCount()-1)+12);
for (j = 0; j < MAX_HISTORY_NUM; j++) {
tst = j*4096;
strlcpy(#copy_from, clipboard.GetSlotData(clipboard.GetSlotCount()-1)+8+tst, 4096);
debug(#copy_from);
if (!copy_from) ExitProcess();
strcpy(#copy_to, #path);
strcat(#copy_to, #copy_from+strrchr(#copy_from,'/'));
57,6 → 81,11
{
Write_Error(copy_rezult);
}
}
if (copy_rezult = copyf(#copy_from,#copy_to))
{
Write_Error(copy_rezult);
}
else if (cut_active)
{
strcpy(#file_path, #copy_from);
63,7 → 92,10
Del_File(true);
cut_active=false;
}
for (j = 0; j < MAX_HISTORY_NUM; j++) strcpy(#copy_path.copy_list[j].Item, 0);
action_buf = COPY_PASTE_END;
add_to_copy_active=0;
id_add_to_copy=0;
ActivateWindow(GetProcessSlot(Form.ID));
ExitProcess();
}