From 5ce4d443d8325a34cdd15728abfdd81e414c81cd Mon Sep 17 00:00:00 2001
From: Serhii Sakhno <sergei.sakhno@gmail.com>
Date: Wed, 20 Apr 2016 00:11:28 +0000
Subject: [PATCH] Eolite 3.58: add status bar

git-svn-id: svn://kolibrios.org@6404 a494cfbc-eb01-0410-851d-a64ba20cac60
---
 programs/cmm/eolite/Eolite.c               | 23 +++++++++++++++++-----
 programs/cmm/eolite/include/left_panel.h   |  2 +-
 programs/cmm/eolite/include/translations.h |  6 ++++--
 3 files changed, 23 insertions(+), 8 deletions(-)

diff --git a/programs/cmm/eolite/Eolite.c b/programs/cmm/eolite/Eolite.c
index 6b9f81b54c..c5f6923862 100644
--- a/programs/cmm/eolite/Eolite.c
+++ b/programs/cmm/eolite/Eolite.c
@@ -76,6 +76,7 @@ byte
 	file_name[256],
 	new_element_name[256],
 	temp[4096],
+	status_bar_str[50],
 	itdir;
 
 char active_path[4096], inactive_path[4096];
@@ -424,6 +425,7 @@ void main()
 									selected_count++;
 								}
 								List_ReDraw();
+								DrawStatusBar();
 								break;
 						case 022: //Ctrl+U - unselect all files
 								for (i=0; i<files.count; i++) 
@@ -433,6 +435,7 @@ void main()
 								}
 								selected_count = 0;
 								List_ReDraw();
+								DrawStatusBar();
 								break;
 					}
 					break;
@@ -451,6 +454,7 @@ void main()
 								if (!two_panels) break;
 								if (active_panel==1) active_panel=2; else active_panel=1;
 								ChangeActivePanel();
+								DrawStatusBar();
 								break;
 						case 093: //menu
 								menu_call_mouse=0;
@@ -476,6 +480,7 @@ void main()
 								_INSERT_END:
 								files.KeyDown();
 								List_ReDraw();
+								DrawStatusBar();
 								break;
 						case 059...068: //F1-F10
 								FnProcess(key_scancode-58);
@@ -559,6 +564,7 @@ void draw_window()
 	llist_copy(#files_active, #files);
 	strcpy(#active_path, #path);
 	DrawFilePanels();
+	DrawStatusBar();
 	if (del_active) Del_Form();
 	if (new_element_active) NewElement_Form(new_element_active, #new_element_name);
 }
@@ -579,13 +585,20 @@ void DrawList()
 	if (two_panels) && (files.x<5) DrawBar(files.x+files.w+16,files.y,1,files.h,col_graph);	
 }
 
+void DrawStatusBar()
+{
+	DrawBar(1, Form.cheight - 18, Form.cwidth-2, 17, col_palette);
+	sprintf(#status_bar_str, STATUS_STR, files.count, selected_count);
+	WriteText(6,Form.cheight - 13,0x80,0x000000,#status_bar_str);
+}
+
 void DrawFilePanels()
 {
 	int files_y;
 	if (!two_panels)
 	{
 		DrawDeviceAndActionsLeftPanel();
-		files.SetSizes(192, 57, Form.cwidth - 210, Form.cheight - 59, files.item_h);
+		files.SetSizes(192, 57, Form.cwidth - 210, Form.cheight - 75, files.item_h);
 		DrawList();
 		Open_Dir(#path,ONLY_SHOW);
 	}
@@ -603,25 +616,25 @@ void DrawFilePanels()
 			llist_copy(#files, #files_inactive);
 			strcpy(#path, #inactive_path);
 			col_selec = 0xCCCccc;
-			files.SetSizes(Form.cwidth/2, files_y, Form.cwidth/2 -17, Form.cheight-files_y-2, files.item_h);
+			files.SetSizes(Form.cwidth/2, files_y, Form.cwidth/2 -17, Form.cheight-files_y-2-16, files.item_h);
 			DrawList();
 			Open_Dir(#path,WITH_REDRAW);
 			llist_copy(#files, #files_active);
 			strcpy(#path, #active_path);
 			col_selec = 0x94AECE;
-			files.SetSizes(2, files_y, Form.cwidth/2-2-17, Form.cheight-files_y-2, files.item_h);
+			files.SetSizes(2, files_y, Form.cwidth/2-2-17, Form.cheight-files_y-2-16, files.item_h);
 			DrawList();
 			Open_Dir(#path,WITH_REDRAW);
 		}
 		if (active_panel==2)
 		{
-			files.SetSizes(2, files_y, Form.cwidth/2-2-17, Form.cheight-files_y-2, files.item_h);
+			files.SetSizes(2, files_y, Form.cwidth/2-2-17, Form.cheight-files_y-2-16, files.item_h);
 			DrawList();
 			Open_Dir(#path,WITH_REDRAW);
 			llist_copy(#files, #files_active);
 			strcpy(#path, #active_path);
 			col_selec = 0x94AECE;
-			files.SetSizes(Form.cwidth/2, files_y, Form.cwidth/2 -17, Form.cheight-files_y-2, files.item_h);
+			files.SetSizes(Form.cwidth/2, files_y, Form.cwidth/2 -17, Form.cheight-files_y-2-16, files.item_h);
 			DrawList();
 			Open_Dir(#path,WITH_REDRAW);
 		}
diff --git a/programs/cmm/eolite/include/left_panel.h b/programs/cmm/eolite/include/left_panel.h
index 13735df22b..dc52a63bda 100644
--- a/programs/cmm/eolite/include/left_panel.h
+++ b/programs/cmm/eolite/include/left_panel.h
@@ -232,7 +232,7 @@ void DrawLeftPanelBg()
 	PutShadow(18,actions_y+75+1,158,1,1,1);
 	DrawBar(2,56,15,actions_y+103,col_lpanel);	          //ñèíèé ïðÿìîóãîëüíèê - ñëåâà       
 	DrawBar(177,56,15,actions_y+103,col_lpanel);            //ñèíèé ïðÿìîóãîëüíèê - ñïðàâà
-	onTop1 = Form.cheight-start_y-2;
+	onTop1 = Form.cheight-start_y-2-16;
 	if (onTop1 < 268)
 	{
 		PutPaletteImage(#blue_hl, 190, onTop1, 2, start_y, 8, #blue_hl_pal);
diff --git a/programs/cmm/eolite/include/translations.h b/programs/cmm/eolite/include/translations.h
index 6b70687409..3ea06594b3 100644
--- a/programs/cmm/eolite/include/translations.h
+++ b/programs/cmm/eolite/include/translations.h
@@ -1,5 +1,5 @@
-#define TITLE "Eolite File Manager v3.57"
-#define ABOUT_TITLE "EOLITE 3.57"
+#define TITLE "Eolite File Manager v3.58"
+#define ABOUT_TITLE "EOLITE 3.58"
 
 #ifdef LANG_RUS
 	?define T_FILE "” ©«"
@@ -28,6 +28,7 @@
 	?define T_SELECT_APP_TO_OPEN_WITH "‚ë¡¥à¨â¥ ¯à®£à ¬¬ã ¤«ï ®âªàëâ¨ï ä ©« "
 	?define DEL_MORE_FILES_1 "¢ë¡à ­­ë¥ í«¥¬¥­âë ("
 	?define DEL_MORE_FILES_2 " èâ.)?"
+	?define STATUS_STR "�«¥¬¥­â®¢: %d  ‚뤥«¥­­®: %d"
 #else
 	?define T_FILE "File"
 	?define T_TYPE "Type"
@@ -56,4 +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"
 #endif