Subversion Repositories Kolibri OS

Compare Revisions

Regard whitespace Rev 5511 → Rev 5512

/programs/cmm/eolite/Eolite.c
43,6 → 43,8
?define T_PASTE_WINDOW_TEXT "Š®¯¨àã¥âáï ä ©«:"
?define T_CANCEL_PASTE "Š®¯¨à®¢ ­¨¥ ¯à¥ªà é¥­®.  ¯ª  ᪮¯¨à®¢ ­  ­¥ ¯®«­®áâìî."
?define T_SELECT_APP_TO_OPEN_WITH "‚ë¡¥à¨â¥ ¯à®£à ¬¬ã ¤«ï ®âªàëâ¨ï ä ©« "
?define DEL_MORE_FILES_1 "íâ¨ í«¥¬¥­âë ("
?define DEL_MORE_FILES_2 " èâ.)?"
#elif LANG_EST
?define T_FILE "Fail"
?define T_TYPE "Tüüp"
61,6 → 63,8
?define T_PASTE_WINDOW_TEXT "Kopeerin faili:"
?define T_CANCEL_PASTE "Copy process terminated. Folder copied incompletely."
?define T_SELECT_APP_TO_OPEN_WITH "Select application to open file"
?define DEL_MORE_FILES_1 "íâ¨ í«¥¬¥­âë ("
?define DEL_MORE_FILES_2 " èâ.)?"
#else
?define T_FILE "File"
?define T_TYPE "Type"
79,12 → 83,14
?define T_PASTE_WINDOW_TEXT "Copying file:"
?define T_CANCEL_PASTE "Copy process terminated. Folder copied incompletely."
?define T_SELECT_APP_TO_OPEN_WITH "Select application to open file"
?define DEL_MORE_FILES_1 "íâ¨ í«¥¬¥­âë ("
?define DEL_MORE_FILES_2 " èâ.)?"
#endif
 
enum {ONLY_SHOW, WITH_REDRAW, ONLY_OPEN}; //OpenDir
 
#define TITLE "Eolite File Manager v2.62"
#define ABOUT_TITLE "Eolite v2.62"
#define TITLE "Eolite File Manager v2.63"
#define ABOUT_TITLE "Eolite v2.63"
dword col_padding, col_selec, col_lpanel;
 
int toolbar_buttons_x[7]={9,46,85,134,167,203};
380,6 → 386,24
case 022: //Ctrl+V
CreateThread(#Paste,#copy_stak+4092);
break;
case 001: //Ctrl+A
debugln("press Ctrl+A");
for (i=0; i<files.count; i++)
{
selected_offset = file_mas[i]*304 + buf+32 + 7;
ESBYTE[selected_offset] = 1;
}
List_ReDraw();
break;
case 021: //Ctrl+U
debugln("press Ctrl+A");
for (i=0; i<files.count; i++)
{
selected_offset = file_mas[i]*304 + buf+32 + 7;
ESBYTE[selected_offset] = 0;
}
List_ReDraw();
break;
case ASCII_KEY_ESC:
IF (rename_active==1) ReName(false);
break;
728,6 → 752,9
 
void Del_Form()
{
dword selected_offset2;
int cont = 0;
byte f_count[128];
int dform_x=files.w-220/2+files.x;
if (strcmp(#file_name,".")==0) || (strcmp(#file_name,"..")==0) return;
if (del_active==2)
739,6 → 766,20
if (!files.count) return;
DrawPopup(dform_x,160,220,80,1,sc.work,sc.work_graph);
WriteText(-strlen(T_DELETE_FILE)*3+110+dform_x,175,0x80,sc.work_text,T_DELETE_FILE);
for (i=0; i<files.count; i++)
{
selected_offset2 = file_mas[i]*304 + buf+32 + 7;
if (ESBYTE[selected_offset2]) cont++;
}
if (cont)
{
strcpy(#f_count, DEL_MORE_FILES_1);
strcat(#f_count, itoa(cont));
strcat(#f_count, DEL_MORE_FILES_2);
WriteText(-strlen(#f_count)*3+110+dform_x,190,0x80,sc.work_text,#f_count);
}
else
{
IF (strlen(#file_name)<28)
{
WriteText(strlen(#file_name)*3+110+dform_x+2,190,0x80,sc.work_text,"?");
750,6 → 791,7
ESI = 24;
WriteText(dform_x+20,190,0,0,#file_name);
}
}
DrawFlatButton(dform_x+27,208,70,20,301,0xFFB6B5,T_YES);
DrawFlatButton(dform_x+120,208,70,20,302,0xC6DFC6,T_NO);
del_active=1;
/programs/cmm/eolite/include/copy.h
61,18 → 61,11
}
 
void copyf_Draw_Progress(dword filename) {
#define WIN_W 300
#define WIN_H 50
DefineAndDrawWindow(Form.left+Form.width-200,Form.top+90,WIN_W,GetSkinHeight()+WIN_H-1,0x34,sc.work,T_PASTE_WINDOW);
DrawRectangle(0,0,WIN_COPY_W-5, 15,sc.work);
WriteText(5,8, 0x80, sc.work_text, T_PASTE_WINDOW_TEXT);
DrawBar(5, 26, WIN_W-10, 10, sc.work);
DrawBar(5, 26, WIN_COPY_W-10, 10, sc.work);
WriteText(5,26, 0x80, sc.work_text, filename);
if (CheckEvent()==evButton)
{
notify(T_CANCEL_PASTE);
CopyExit();
}
}
 
void Paste()
{
/programs/cmm/lib/copyf.h
1,8 → 1,11
//copyf - copy file or folder with content
#define WIN_COPY_W 300
#define WIN_COPY_H 50
:int copyf(dword from1, in1)
{
dword error;
BDVK CopyFile_atr1;
DefineAndDrawWindow(Form.left+Form.width-200,Form.top+90,WIN_COPY_W,GetSkinHeight()+WIN_COPY_H-1,0x34,sc.work,T_PASTE_WINDOW);
if (!from1) || (!in1)
{
notify("Error: too less copyf params!");
22,7 → 25,12
copyf_Draw_Progress(from1+strchr(from1, '/'));
return CopyFile(from1, in1);
}
if (CheckEvent()==evButton)
{
notify(T_CANCEL_PASTE);
CopyExit();
}
}
 
:int CopyFile(dword copy_from3, copy_in3)
{