diff --git a/programs/cmm/eolite/Eolite.c b/programs/cmm/eolite/Eolite.c index 6ed3f92e99..651b7a0002 100644 --- a/programs/cmm/eolite/Eolite.c +++ b/programs/cmm/eolite/Eolite.c @@ -3,9 +3,9 @@ // 70.5 - get volume info and label -#define ABOUT_TITLE "EOLITE 5 RC2" -#define TITLE_EOLITE "Eolite File Manager 5 RC2" -#define TITLE_KFM "Kolibri File Manager 2 RC2"; +#define ABOUT_TITLE "EOLITE 5 RC3" +#define TITLE_EOLITE "Eolite File Manager 5 RC3" +#define TITLE_KFM "Kolibri File Manager 2 RC3"; #define MEMSIZE 1024 * 250 #include "../lib/clipboard.h" @@ -654,12 +654,12 @@ void DrawButtonsAroundList() void DrawFuncButtonsInKfm() { int i, x=0, len, min_w=0, padding; - for (i=0; i<10; i++) min_w += strlen(kfm_func[i])*6 + 2; + for (i=0; i<10; i++) min_w += strlen(kfm_func[i])+2*6 + 2; padding = Form.cwidth - min_w + 4 / 10; for (i=0; i<10; i++) { - len = strlen(kfm_func[i])*6 + padding; + len = strlen(kfm_func[i])+2*6 + padding; if (i==9) len = Form.cwidth - x - 3; - DrawFuncButton(x+1, Form.cheight - 19, len, i+KFM_FUNC_ID+1, kfm_func[i]); + DrawFuncButton(x+1, Form.cheight - 19, len, i+KFM_FUNC_ID+1, i+1, kfm_func[i]); x += len + 2; } } diff --git a/programs/cmm/eolite/include/gui.h b/programs/cmm/eolite/include/gui.h index 8d57c4aea4..3f8d127962 100644 --- a/programs/cmm/eolite/include/gui.h +++ b/programs/cmm/eolite/include/gui.h @@ -63,21 +63,26 @@ void DrawFlatButtonSmall(dword x,y,width,height,id,text) WriteText(-strlen(text)*6+width/2+x+1,height/2+y-3,0x80,sc.work_text,text); } -void DrawFuncButton(dword x,y,width,id,text) +void DrawFuncButton(dword x,y,width,id,number,text) { - #define FW 17 + #define FW 12 #define FH 16 + int numw = calc(number/10)*6+FW; if (skin_is_dark()) { DrawFlatButtonSmall(x,y,width,FH,id,text); return; } DrawRectangle(x,y,width,FH,sc.work_graph); - DrawRectangle3D(x+1,y+1,width-2,FH-2, sc.work_light, sc.work_dark); + DrawRectangle3D(x+1,y+1,width-2,FH-2, 0x97D194, 0x00A100); PutPixel(x+width-1, y+1, sc.work_dark); - DrawBar(x+2, y+2, FW, FH-3, 0x6060FF); - DrawBar(x+2+FW, y+2, width-3-FW, FH-3, 0x00AA00); + DrawBar(x+2, y+2, numw, FH-2, 0x6060FF); + WriteText(x+6,FH/2+y-2,0x80,0x444444,itoa(number)); + $sub ebx, 1 <<16 + 1 + $add ecx, 0xFFFfff-0x444444 + $int 64 + DrawBar(x+2+numw, y+2, width-3-numw, FH-3, 0x00AA00); DefineHiddenButton(x+1,y+1,width-2,FH-2,id); - WriteText(-strlen(text)*6+width/2+x+2,FH/2+y-2,0x80,0x444444,text); + WriteText(-strlen(text)*6+width/2+x+8,FH/2+y-2,0x80,0x444444,text); $sub ebx, 1 <<16 + 1 $add ecx, 0xFFFfff-0x444444 $int 64 diff --git a/programs/cmm/eolite/include/translations.h b/programs/cmm/eolite/include/translations.h index c28f7ef8e1..bb91ef3379 100644 --- a/programs/cmm/eolite/include/translations.h +++ b/programs/cmm/eolite/include/translations.h @@ -27,16 +27,16 @@ ?define T_ABOUT "О программе" ?define T_USE_SHIFT_ENTER "'Используйте Shift+Enter чтобы открыть все выделенные файлы.' -I" char *kfm_func = { - "F1 Инфо", - "F2 Переим.", - "F3 Просм.", - "F4 Редакт.", - "F5 Копировать", - "F6 Переместить", - "F7 Папка", - "F8 Удалить", - "F9 Файл", - "F0 Настройки" + "Инфо", + "Переимен.", + "Просмотр", + "Редакт.", + "Копировать", + "Переместить", + "Папка", + "Удалить", + "Файл", + " Настройки" } #else ?define T_FILE "File" @@ -68,16 +68,16 @@ char *kfm_func = { ?define T_ABOUT "About" ?define T_USE_SHIFT_ENTER "'Use Shift+Enter to open all selected files.' -I" char *kfm_func = { - "F1 Info", - "F2 Rename", - "F3 View", - "F4 Edit", - "F5 Copy", - "F6 Move", - "F7 Folder", - "F8 Delete", - "F9 File", - "F0 Settings" + "Info", + "Rename", + "View", + "Edit", + "Copy", + "Move", + "Folder", + "Delete", + "File", + " Settings" } #endif