Eolite 3.59: bug fixes

git-svn-id: svn://kolibrios.org@6406 a494cfbc-eb01-0410-851d-a64ba20cac60

programs/cmm/eolite/Eolite.c

@@ -67,7 +67,7 @@ byte list_full_redraw;
 dword buf;
 dword file_mas[6898];
 int selected_count;
-
+int count_dir;
 
 byte
 	path[4096],
@@ -563,8 +563,8 @@ void draw_window()
 	for (i=0; i<5; i++) DrawBar(0, 34+i, Form.cwidth, 1, col_palette[8-i]);
 	llist_copy(#files_active, #files);
 	strcpy(#active_path, #path);
-	DrawFilePanels();
 	DrawStatusBar();
+	DrawFilePanels();
 	if (del_active) Del_Form();
 	if (new_element_active) NewElement_Form(new_element_active, #new_element_name);
 }
@@ -587,8 +587,8 @@ void DrawList()
 
 void DrawStatusBar()
 {
-	DrawBar(1, Form.cheight - 18, Form.cwidth-2, 17, col_palette);
+	DrawBar(1, Form.cheight - 18, Form.cwidth-2, 17, system.color.work);
-	sprintf(#status_bar_str, STATUS_STR, files.count, selected_count);
+	sprintf(#status_bar_str, STATUS_STR, files.count-1, count_dir-1, files.count-count_dir, selected_count);
 	WriteText(6,Form.cheight - 13,0x80,0x000000,#status_bar_str);
 }
 
@@ -753,8 +753,8 @@ void Line_ReDraw(dword bgcol, filenum){
 
 
 void Open_Dir(dword dir_path, redraw){
-	int errornum, maxcount;
+	int errornum, maxcount, i;
-
+	count_dir = 0;
 	if (redraw!=ONLY_SHOW)
 	{
 		if (ESBYTE[dir_path+1]!='\0') ESBYTE[dir_path+strlen(dir_path)-1] = '\0';
@@ -772,6 +772,10 @@ void Open_Dir(dword dir_path, redraw){
 		if (files.count>maxcount) files.count = maxcount;
 		if (files.count>0) && (files.cur_y-files.first==-1) files.cur_y=0;
 	}
+	for (i=0; i<files.count; i++) 
+	{
+		if (TestBit(ESDWORD[i*304+buf+32], 4) ) count_dir++;
+	}
 	if (files.count!=-1)
 	{
 		if(!_not_draw) if (show_breadcrumb) DrawBreadCrumbs(); else DrawPathBar();
@@ -781,12 +785,12 @@ void Open_Dir(dword dir_path, redraw){
 		if (files.count < files.visible) files.visible = files.count;
 		if (redraw!=ONLY_SHOW) Sorting();
 		list_full_redraw = true;
-		if (redraw!=ONLY_OPEN)&&(!_not_draw) List_ReDraw();
+		if (redraw!=ONLY_OPEN)&&(!_not_draw) {DrawStatusBar(); List_ReDraw();}
 	}
 	if (files.count==-1) && (redraw!=ONLY_OPEN) 
 	{
 		files.KeyHome();
-		if(!_not_draw) { list_full_redraw=true; List_ReDraw(); }
+		if(!_not_draw) { list_full_redraw=true; DrawStatusBar(); List_ReDraw(); }
 	}
 }
 

programs/cmm/eolite/include/settings.h

@@ -11,6 +11,7 @@
 	?define SAVE_PATH_AS_DEFAULT "’¥ªã騩 ¯ãâì"
 	?define SAVE_START_PATH_AS_DEFAULT "‚¢¥¤¥­­ë© ¯ãâì"
 	?define EDIT_FILE_ASSOCIATIONS "<EFBFBD>¥¤ ªâ¨à®¢ âì  áá®æ¨ æ¨¨ ä ©«®¢"
+	?define START_PATH "‘â àâ®¢ë© ¯ãâì:"
 #else
 	?define TITLE_SETT "Settings"
 	?define SHOW_DEVICE_CLASS "Show device class name"
@@ -23,6 +24,7 @@
 	?define SAVE_PATH_AS_DEFAULT "‘urrent path"
 	?define SAVE_START_PATH_AS_DEFAULT "Typed path"
 	?define EDIT_FILE_ASSOCIATIONS "Edit file associations"
+	?define START_PATH "Start path:"
 #endif
 
 char config_section[] = "Config";
@@ -30,7 +32,7 @@ int WinX, WinY, WinW, WinH;
 
 dword set_mouse_dd;
 char path_start[4096]="\0";
-edit_box path_start_ed = {230,50,57,0xffffff,0x94AECE,0x000000,0xffffff,2,4098,#path_start,#set_mouse_dd, 100000000000010b,0,0};
+edit_box path_start_ed = {230,50,57,0xffffff,0x94AECE,0xffffff,0xffffff,2,4098,#path_start,#set_mouse_dd, 100000000000010b,0,0};
 
 void settings_dialog()
 {   
@@ -86,7 +88,7 @@ void settings_dialog()
 				break;
 				
 			case evReDraw:
-				DefineAndDrawWindow(Form.cwidth-300/2+Form.left, Form.cheight-292/2+Form.top, 376, 312+GetSkinHeight(),0x34,system.color.work,TITLE_SETT);
+				DefineAndDrawWindow(Form.cwidth-300/2+Form.left, Form.cheight-292/2+Form.top, 376, 332+GetSkinHeight(),0x34,system.color.work,TITLE_SETT);
 				DrawSettingsCheckBoxes();
 		}
 	}
@@ -112,9 +114,10 @@ void DrawSettingsCheckBoxes()
 	CheckBox(x, y.inc(25), 24, USE_TWO_PANELS,  two_panels);
 	MoreLessBox(x, y.inc(31), 30, 31, label.size.pt, FONT_SIZE_LABEL);
 	MoreLessBox(x, y.inc(31), 25, 26, files.item_h, LIST_LINE_HEIGHT);
-	path_start_ed.top = y.inc(31);
+	WriteText(6, y.inc(28), 0xD0, system.color.work_text, START_PATH);
+	path_start_ed.top = y.inc(23);
 	path_start_ed.left = x;
-	edit_box_draw stdcall (#path_start_ed);
+	DrawEditBox(#path_start_ed);
 	DrawFlatButton(x-1, y.inc(26), strlen(SAVE_PATH_AS_DEFAULT)+3*8, 24, 6, SAVE_PATH_AS_DEFAULT);
 	DrawFlatButton(x-1+strlen(SAVE_PATH_AS_DEFAULT)+3*8, y.inc(0), strlen(SAVE_START_PATH_AS_DEFAULT)+3*8, 24, 7, SAVE_START_PATH_AS_DEFAULT);
 	DrawFlatButton(x-1, y.inc(36), strlen(EDIT_FILE_ASSOCIATIONS)+3*8, 24, 5, EDIT_FILE_ASSOCIATIONS);

programs/cmm/eolite/include/translations.h

@@ -1,5 +1,5 @@
-#define TITLE "Eolite File Manager v3.58"
+#define TITLE "Eolite File Manager v3.59"
-#define ABOUT_TITLE "EOLITE 3.58"
+#define ABOUT_TITLE "EOLITE 3.59"
 
 #ifdef LANG_RUS
 	?define T_FILE "” ©«"
@@ -28,7 +28,7 @@
 	?define T_SELECT_APP_TO_OPEN_WITH "‚ë¡¥à¨â¥ ¯à®£à ¬¬ã ¤«ï ®âªàëâ¨ï ä ©« "
 	?define DEL_MORE_FILES_1 "¢ë¡à ­­ë¥ í«¥¬¥­âë ("
 	?define DEL_MORE_FILES_2 " èâ.)?"
-	?define STATUS_STR "<EFBFBD>«¥¬¥­â®¢: %d  ‚뤥«¥­­®: %d"
+	?define STATUS_STR "<EFBFBD>«¥¬¥­â®¢: %d  <EFBFBD> ¯®ª: %d  ” ©«®¢: %d  ‚뤥«¥­­®: %d"
 #else
 	?define T_FILE "File"
 	?define T_TYPE "Type"
@@ -57,5 +57,5 @@
 	?define T_SELECT_APP_TO_OPEN_WITH "Select application to open file"
 	?define DEL_MORE_FILES_1 "selected items("
 	?define DEL_MORE_FILES_2 " pcs.)?"
-	?define STATUS_STR "Elements: %d  Selected: %d"
+	?define STATUS_STR "Elements: %d  Dirs: %d  Files: %d  Selected: %d"
 #endif