From 644e406bf8b30505c6ecf43692d60544880c65bf Mon Sep 17 00:00:00 2001 From: Serhii Sakhno Date: Thu, 6 Aug 2015 22:18:15 +0000 Subject: [PATCH] Eolite 2.95: fixed copy file dialog git-svn-id: svn://kolibrios.org@5689 a494cfbc-eb01-0410-851d-a64ba20cac60 --- programs/cmm/eolite/Eolite.c | 4 ++-- programs/cmm/eolite/include/copy.h | 9 +++++---- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/programs/cmm/eolite/Eolite.c b/programs/cmm/eolite/Eolite.c index 3c37a3d242..fe9a9125fa 100644 --- a/programs/cmm/eolite/Eolite.c +++ b/programs/cmm/eolite/Eolite.c @@ -103,8 +103,8 @@ enum {ONLY_SHOW, WITH_REDRAW, ONLY_OPEN}; //OpenDir enum { CREATE_FILE=1, CREATE_FOLDER, RENAME_ITEM }; //NewElement -#define TITLE "Eolite File Manager v2.94" -#define ABOUT_TITLE "Eolite 2.94" +#define TITLE "Eolite File Manager v2.95" +#define ABOUT_TITLE "Eolite 2.95" dword col_padding, col_selec, col_lpanel; int toolbar_buttons_x[7]={9,46,85,134,167,203}; diff --git a/programs/cmm/eolite/include/copy.h b/programs/cmm/eolite/include/copy.h index dff2a0efed..51c25a4838 100644 --- a/programs/cmm/eolite/include/copy.h +++ b/programs/cmm/eolite/include/copy.h @@ -79,7 +79,8 @@ void PasteThread() CopyExit(); } - DisplayCopyfForm(); + copyf_Draw_Progress(#copy_from); + pause(1000); if (copy_rezult = copyf(#copy_from,#copy_to)) { @@ -114,7 +115,7 @@ void DisplayCopyfForm() break; case evReDraw: - DefineAndDrawWindow(Form.left+Form.width-200,Form.top+90,WIN_COPY_W,GetSkinHeight()+WIN_COPY_H,0x34,system.color.work,T_PASTE_WINDOW_TITLE); + DefineAndDrawWindow(Form.left+Form.width-200,Form.top+90,WIN_COPY_W,GetSkinHeight()+WIN_COPY_H,0x34,0xFFFFFF,T_PASTE_WINDOW_TITLE); GetProcessInfo(#Copy_Form, SelfInfo); WriteText(45, 11, 0x80, system.color.work_text, T_PASTE_WINDOW_TEXT); DrawFlatButton(Copy_Form.cwidth - 90, Copy_Form.cheight - 32, 80, 22, 10, system.color.work_button, T_PASTE_WINDOW_BUTTON); @@ -131,9 +132,9 @@ void CopyExit() { void copyf_Draw_Progress(dword copying_filename) { - if (Copy_Form.cwidth==0) return; + //if (Copy_Form.cwidth==0) return; DisplayCopyfForm(); Put_icon(copying_filename+strrchr(copying_filename,'.'), 16, 19, 0xFFFfff, 0); - DrawBar(45, 29, Copy_Form.cwidth-40, 10, system.color.work); + DrawBar(45, 29, Copy_Form.cwidth-45, 10, 0xFFFFFF); WriteText(45, 29, 0x80, system.color.work_text, copying_filename); } \ No newline at end of file