From 667c49c5af7929c7ba24ec52ba0c5c6aacd42d3a Mon Sep 17 00:00:00 2001
From: "Kirill Lipatov (Leency)" <lipatov.kiril@gmail.com>
Date: Fri, 17 Apr 2020 17:04:54 +0000
Subject: [PATCH] WebView: fix crash on End and PgDown mousecfg: -1 img sector
 Eolite: small fixes and improvements in status bar

git-svn-id: svn://kolibrios.org@7804 a494cfbc-eb01-0410-851d-a64ba20cac60
---
 data/common/File Managers/icons.ini        |  2 +-
 programs/cmm/browser/texts.h               |  2 +-
 programs/cmm/eolite/Eolite.c               | 10 +++++++---
 programs/cmm/eolite/include/copy.h         |  1 +
 programs/cmm/eolite/include/gui.h          |  9 +--------
 programs/cmm/eolite/include/settings.h     |  2 +-
 programs/cmm/eolite/include/translations.h | 10 ++++++----
 programs/cmm/lib/list_box.h                |  1 +
 programs/cmm/mousecfg/mousecfg.c           |  2 --
 9 files changed, 19 insertions(+), 20 deletions(-)

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
 <lot>=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<h; i++) DrawBar(x, y+i, w, 1, col.work_gradient[-i*3+15]);
-	} else {
-		DrawBar(x, y, w, h, col.work_gradient[12]);
-	}
-}
+{ int i; for (i=0; i<h; i++) DrawBar(x, y+h-i-1, w, 1, col.work_gradient[i]); }
 
 int popin_w=260;
 void DrawEolitePopup(dword b1_text, b2_text)
diff --git a/programs/cmm/eolite/include/settings.h b/programs/cmm/eolite/include/settings.h
index 5ecb740dfb..32ae554fbd 100644
--- a/programs/cmm/eolite/include/settings.h
+++ b/programs/cmm/eolite/include/settings.h
@@ -267,7 +267,7 @@ void SetAppColors()
 	}
 	col.selec_inactive = MixColors(0xBBBbbb, col.list_bg, 65);
 	col.slider_bg_left = MixColors(col.graph, col.slider_bg_big, 10);
-	for (i=0; i<=20; i++) col.work_gradient[20-i] = MixColors(0, system.color.work, i);
+	for (i=0; i<20; i++) col.work_gradient[i] = MixColors(system.color.work_light, system.color.work, i*5);
 	if (old_list_bg_color!=col.list_bg) LoadIcons();
 }
 
diff --git a/programs/cmm/eolite/include/translations.h b/programs/cmm/eolite/include/translations.h
index f47db9fd30..5fe0f7a5f7 100644
--- a/programs/cmm/eolite/include/translations.h
+++ b/programs/cmm/eolite/include/translations.h
@@ -1,5 +1,5 @@
-#define TITLE "Eolite File Manager 4.22"
-#define ABOUT_TITLE "EOLITE 4.22"
+#define TITLE "Eolite File Manager 4.23"
+#define ABOUT_TITLE "EOLITE 4.23"
 
 #ifdef LANG_RUS
 ?define T_FILE "Файл"
@@ -26,7 +26,8 @@
 ?define T_SELECT_APP_TO_OPEN_WITH "Выберите программу для открытия файла"
 ?define DEL_MORE_FILES_1 "выбранные элементы ("
 ?define DEL_MORE_FILES_2 " шт.)?"
-?define STATUS_STR "Элементов: %d  Папок: %d  Файлов: %d  Выделенно: %d"
+?define T_STATUS_EVEMENTS "Папок: %d  Файлов: %d"
+?define T_STATUS_SELECTED "Выделенно: %d"
 ?define COPY_PATH_STR "'Путь папки скопирован в буфер обмена' -I"
 ?define T_ABOUT "О программе"
 #else
@@ -55,7 +56,8 @@
 ?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  Dirs: %d  Files: %d  Selected: %d"
+?define T_STATUS_EVEMENTS "Dirs: %d  Files: %d"
+?define T_STATUS_SELECTED "Selected: %d"
 ?define COPY_PATH_STR "'Directory path copied to clipboard' -I"
 ?define T_ABOUT "About"
 #endif
diff --git a/programs/cmm/lib/list_box.h b/programs/cmm/lib/list_box.h
index e4f098696c..8c833e7250 100644
--- a/programs/cmm/lib/list_box.h
+++ b/programs/cmm/lib/list_box.h
@@ -206,6 +206,7 @@ struct llist
 	if (cur_y==count-1) && (first==count-visible) return 0;
 	cur_y = count-1;
 	first = count - visible;
+	CheckDoesValuesOkey();
 	return 1;
 }
 
diff --git a/programs/cmm/mousecfg/mousecfg.c b/programs/cmm/mousecfg/mousecfg.c
index 9fffe6ca1e..c82f5eaf82 100644
--- a/programs/cmm/mousecfg/mousecfg.c
+++ b/programs/cmm/mousecfg/mousecfg.c
@@ -11,7 +11,6 @@
 #include "..\lib\fs.h"
 #include "..\lib\gui.h"
 #include "..\lib\obj\libio.h"
-#include "..\lib\obj\box_lib.h"
 #include "..\lib\obj\libini.h"
 #include "..\lib\patterns\restart_process.h"
 
@@ -59,7 +58,6 @@ void main() {
 	int id;
 	
 	load_dll(libini, #lib_init,1);
-	load_dll(boxlib, #box_lib_init,0);
 	
 	LoadCfg();