diff --git a/data/common/File Managers/icons.ini b/data/common/File Managers/icons.ini index 8f392b620c..428d80a25c 100644 --- a/data/common/File Managers/icons.ini +++ b/data/common/File Managers/icons.ini @@ -178,7 +178,7 @@ mgb=47 =60 com=1 bat=1 -sh=1 +sh=55 exe=2 img=3 ini=5 diff --git a/programs/cmm/browser/texts.h b/programs/cmm/browser/texts.h index 99c9cc9e92..60595a3b64 100644 --- a/programs/cmm/browser/texts.h +++ b/programs/cmm/browser/texts.h @@ -1,4 +1,4 @@ -char version[]="WebView 2.47a"; +char version[]="WebView 2.47b"; #ifdef LANG_RUS char page_not_found[] = FROM "html\\page_not_found_ru.htm""\0"; diff --git a/programs/cmm/eolite/Eolite.c b/programs/cmm/eolite/Eolite.c index 7d52cbf091..b1f5ab22c8 100644 --- a/programs/cmm/eolite/Eolite.c +++ b/programs/cmm/eolite/Eolite.c @@ -432,7 +432,6 @@ void main() EventSelectAllFiles(true); break; case SCAN_CODE_KEY_U: //unselect all files - selected_count = 0; EventSelectAllFiles(false); break; } @@ -529,7 +528,7 @@ void draw_window() //main rectangles DrawRectangle(1,40,Form.cwidth-3,Form.cheight - 42-status_bar_h,col.graph); DrawRectangle(0,39,Form.cwidth-1,-show_status_bar.checked*status_bar_h + Form.cheight - 40,col.work_gradient[4]); //bg - for (i=0; i<5; i++) DrawBar(0, 34+i, Form.cwidth, 1, col.work_gradient[-i*3+15]); + for (i=0; i<6; i++) DrawBar(0, 34+i, Form.cwidth, 1, MixColors(system.color.work_dark, system.color.work, i*10)); llist_copy(#files_active, #files); strcpy(#active_path, #path); DrawStatusBar(); @@ -562,8 +561,13 @@ void DrawStatusBar() if (!show_status_bar.checked) return; if (files.count>0) && (strcmp(file_mas[0]*304+buf+72,"..")==0) go_up_folder_exists=1; DrawBar(0, Form.cheight - status_bar_h, Form.cwidth, status_bar_h, system.color.work); - sprintf(#status_bar_str, STATUS_STR, files.count-go_up_folder_exists, count_dir-go_up_folder_exists, files.count-count_dir, selected_count); + sprintf(#status_bar_str, T_STATUS_EVEMENTS, count_dir-go_up_folder_exists, files.count-count_dir); WriteText(6,Form.cheight - 13,0x80,system.color.work_text,#status_bar_str); + if (selected_count) { + sprintf(#status_bar_str, T_STATUS_SELECTED, selected_count); + WriteText(Form.cwidth - calc(strlen(#status_bar_str)*6)-6,Form.cheight - 13, + 0x80,system.color.work_text,#status_bar_str); + } } void DrawFilePanels() diff --git a/programs/cmm/eolite/include/copy.h b/programs/cmm/eolite/include/copy.h index 3adf5b9133..7a748ec040 100644 --- a/programs/cmm/eolite/include/copy.h +++ b/programs/cmm/eolite/include/copy.h @@ -14,6 +14,7 @@ void setElementSelectedFlag(dword n, int state) { } if (state==true) selected_count++; if (state==false) selected_count--; + if (selected_count<0) selected_count=0; } int getElementSelectedFlag(dword n) { diff --git a/programs/cmm/eolite/include/gui.h b/programs/cmm/eolite/include/gui.h index 18d23057a4..3896e2ba3e 100644 --- a/programs/cmm/eolite/include/gui.h +++ b/programs/cmm/eolite/include/gui.h @@ -64,14 +64,7 @@ void DrawFlatButtonSmall(dword x,y,width,height,id,text) } void DrawFilledBar(dword x, y, w, h) -{ - int i, fill_h; - if (h < 12) { - for (i=0; i