From 9d4b206358869299efd5e149a43f895ad7e38cee Mon Sep 17 00:00:00 2001
From: "Kirill Lipatov (Leency)" <lipatov.kiril@gmail.com>
Date: Sat, 5 Jun 2021 19:30:53 +0000
Subject: [PATCH] eolite: - rework two panes header - use specific ini section
 for two-panes mode - avoid double lines in scroll and table headers - proper
 fix scroll issue - do not save window size when the window is rolled-up efm:
 yet another file manager :) icons16.png: add scissors (cut) and paste icons

git-svn-id: svn://kolibrios.org@8764 a494cfbc-eb01-0410-851d-a64ba20cac60
---
 data/Tupfile.lua                              |   1 +
 data/common/File Managers/efm                 | Bin 0 -> 461 bytes
 data/common/icons16.png                       | Bin 8682 -> 8975 bytes
 data/common/settings/app.ini                  |   7 +-
 programs/cmm/eolite/Eolite.c                  | 125 ++++++++++--------
 programs/cmm/eolite/include/breadcrumbs.h     |   2 +
 programs/cmm/eolite/include/copy_and_delete.h |   1 -
 programs/cmm/eolite/include/gui.h             |  16 +--
 programs/cmm/eolite/include/left_panel.h      |   2 -
 programs/cmm/eolite/include/menu.h            |  12 +-
 programs/cmm/eolite/include/settings.h        |  42 +++---
 programs/cmm/eolite/include/translations.h    |   4 +-
 12 files changed, 117 insertions(+), 95 deletions(-)
 create mode 100644 data/common/File Managers/efm

diff --git a/data/Tupfile.lua b/data/Tupfile.lua
index fb1f624476..b5e89da670 100644
--- a/data/Tupfile.lua
+++ b/data/Tupfile.lua
@@ -28,6 +28,7 @@ img_files = {
  {"UNIMG", PROGS .. "/fs/unimg/unimg"},
  {"3D/HOUSE.3DS", "common/3d/house.3ds"},
  {"File Managers/ICONS.INI", "common/File Managers/icons.ini"},
+ {"File Managers/EFM", "common/File Managers/efm"},
  {"File Managers/KFM.INI", "common/File Managers/kfm.ini"},
  {"File Managers/FNAV/ABOUT.TXT", "common/File Managers/fNav/About.txt"},
  {"File Managers/FNAV/FNAV", "common/File Managers/fNav/fNav.kex"},
diff --git a/data/common/File Managers/efm b/data/common/File Managers/efm
new file mode 100644
index 0000000000000000000000000000000000000000..6e4e82b52ee9a4f99e2fe0b0c1bd135024d97df2
GIT binary patch
literal 461
zcmeZu^$T?kF)(CgU|{G2VizE0(174`K*4i@3=Ah&7#RMS@?@#LkOGQyy8h`d{iD`U
z$5_nYstHutT`JIB%hMhEM?041#WavWtw47v$BP3n<{vk=7n^~clZSX1LOY*kxkO}1
zM|b-QoOJ*yQ|lD#F6B|{WQzsLp6C!}=-pfK=KueFr+^w>lmZDTALN)9xj=r#1(0AX
zNKwFxgCJFZfyBwf`mS!i3Jm(imBspQnK`Knxrup+>8VA<`mXsonI)+Vt+)A`fgWLK
zKJovs;iWG24mLM;C(B#>t?WR-V{BmYhWh^urB4hG9R9OrRm*|WUxzz?8=o{j;Q48t
zf9J2x?@)I0$N!zzJ5P1~IQWw3^U}_X%@3JBFX_B-7!*!GzjU#6xc+H505RC`z)MM>
z`CYCY7OsEzTRDL2Zdaa{tU&s|E6?i-Cl7Ie!-Tz`^^zh3gW-Wi&w$k8M<C)Jh`0tM
kx?MRI-vZM-i=PAO9d1DFyFu#DI>Z7E*zq3-&N>_h02)oQDgXcg

literal 0
HcmV?d00001

diff --git a/data/common/icons16.png b/data/common/icons16.png
index df2044fc6df03486c2be104ba2b25320953290ae..601fa85b494159e2f6c3cde7c69394480901d86d 100644
GIT binary patch
literal 8975
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

literal 8682
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
IM6N<$g8CiQod5s;

diff --git a/data/common/settings/app.ini b/data/common/settings/app.ini
index b0cd9ac0be..81a728bf47 100644
--- a/data/common/settings/app.ini
+++ b/data/common/settings/app.ini
@@ -4,8 +4,11 @@ last_folder=
 
 [Eolite]
 ShowDeviceName=1
-RealFileNamesCase=1
-InfoAfterCopy=0
+ShowStatusBar=1
+LineHeight=20
+
+[EFM]
+ShowDeviceName=1
 ShowStatusBar=1
 LineHeight=20
 
diff --git a/programs/cmm/eolite/Eolite.c b/programs/cmm/eolite/Eolite.c
index afb596370a..9427a3dba3 100644
--- a/programs/cmm/eolite/Eolite.c
+++ b/programs/cmm/eolite/Eolite.c
@@ -3,8 +3,8 @@
 
 // 70.5 - get volume info and label
 
-#define TITLE "Eolite File Manager 4.51"
-#define ABOUT_TITLE "EOLITE 4.51"
+#define TITLE "Eolite File Manager 4.6"
+#define ABOUT_TITLE "EOLITE 4.6"
 
 #ifndef AUTOBUILD
 #include "lang.h--"
@@ -28,6 +28,7 @@
 #include "../lib/obj/libimg.h"
 
 #include "../lib/patterns/history.h"
+#include "../lib/patterns/toolbar_button.h"
 
 #include "imgs/images.h"
 
@@ -74,6 +75,8 @@ struct Eolite_colors
 } col;
 dword waves_pal[256];
 
+bool efm = false;
+
 int toolbar_buttons_x[7]={9,46,85,134,167,203};
 
 bool active_about = false;
@@ -163,31 +166,51 @@ void handle_param()
 	//-p <path> : just show file/folder properties dialog
 	//-d <path> : delete file/folder
 	//-v : paste files/folder from clipboard
-	if (param) && (param[0]=='-') switch (param[1]) 
+	dword p = #param;
+	if (param[0]=='/') && (param[1]=='E') && (param[2]=='F') && (param[3]=='M') {
+		efm = true;
+		p += 4;
+		if (param[4]==' ') p++;
+	}
+
+	if (ESBYTE[p]=='\0') return;
+
+	if (ESBYTE[p]=='-') switch (ESBYTE[p+1]) 
 	{
 		case 'p':
-			strcpy(#file_path, #param + 3);
+			strcpy(#file_path, p + 3);
 			itdir = dir_exists(#file_path);
-			strcpy(#file_name, #param + strrchr(#param, '/'));
-			param[strrchr(#param, '/')-1] = '\0';
-			strcpy(#path, #param + 3);
+			strcpy(#file_name, p + strrchr(p, '/'));
+			ESBYTE[strrchr(p, '/')+p-1] = '\0';
+			strcpy(#path, p + 3);
 			properties_dialog();
 			ExitProcess();
-			return;
 		case 'd':
-			strcpy(#file_path, #param + 3);
+			strcpy(#file_path, p + 3);
 			itdir = dir_exists(#file_path);
 			DisplayOperationForm(DELETE_FLAG);
 			DeleteSingleElement();
 			ExitProcess();
-			return;
 		case 'v':
-			cut_active = param[2] - '0';
-			strcpy(#path, #param + 4);
+			cut_active = ESBYTE[p+2] - '0';
+			strcpy(#path, p + 4);
 			PasteThread();
 			ExitProcess();
-			return;
 	}
+
+	if (ESBYTE[strlen(p)+p-1]=='/') ESBYTE[strlen(p)+p-1]=NULL; //no "/" at the end
+
+	if (dir_exists(p)) {
+		strcpy(#path, p);
+	} else {
+		if (file_exists(p)) {
+			ESBYTE[strrchr(p, '/')+p-1] = '\0';
+			strcpy(#path, p);
+			SelectFileByName(p+strlen(p)+1);
+		} else {
+			notify(T_NOTIFY_APP_PARAM_WRONG);
+		}
+	}	
 }
 
 void main() 
@@ -195,35 +218,17 @@ void main()
 	dword id;
 	int old_cur_y;
 
+	handle_param();
+	ESBYTE[0] = NULL;
+
 	rand_n = random(80);
 
-	load_libraries();
-	
+	load_libraries();	
+
 	SetAppColors();
 	LoadIniSettings();
 	SystemDiscs.Get();
 
-	handle_param();
-
-	ESBYTE[0] = NULL;
-
-	if (param)
-	{
-		if (strlen(#param)>1) && (param[strlen(#param)-1]=='/') param[strlen(#param)-1]=NULL; //no "/" at the end
-
-		if (dir_exists(#param)) {
-			strcpy(#path, #param);
-		} else {
-			if (file_exists(#param)) {
-				param[strrchr(#param, '/')-1] = '\0';
-				strcpy(#path, #param);
-				SelectFileByName(#param+strlen(#param)+1);
-			} else {
-				notify(T_NOTIFY_APP_PARAM_WRONG);
-			}
-		}
-	}
-	
 	Open_Dir(#path,ONLY_OPEN);
 	strcpy(#inactive_path, #path);
 	llist_copy(#files_inactive, #files);
@@ -307,7 +312,7 @@ void main()
 
 			//Scrooll
 			if (mouse.x>=files.x+files.w) && (mouse.x<=files.x+files.w+18) && (mouse.y>files.y) && (mouse.y<files.y+files.h-18) && (mouse.lkm) && (!scroll_used) {scroll_used=true; Scroll();}
-			if (scroll_used) && (mouse.up) { scroll_used=false; Scroll(); }
+			if (scroll_used) && (!mouse.key&MOUSE_LEFT) { scroll_used=false; Scroll(); }
 			
 			if (scroll_used)
 			{
@@ -525,7 +530,7 @@ void main()
 							DrawStatusBar();
 							List_ReDraw();
 							break;
-					case SCAN_CODE_F1...SCAN_CODE_F10:
+					case SCAN_CODE_F2...SCAN_CODE_F10:
 							FnProcess(key_scancode-58);
 							break; 
 					default:
@@ -560,26 +565,42 @@ void main()
 void draw_window()
 {
 	dword i;
+	incn x;
 	if (show_status_bar.checked) status_bar_h = STATUS_BAR_H; else status_bar_h = 0;
 	DefineAndDrawWindow(Form.left+rand_n,Form.top+rand_n,Form.width,Form.height,0x73,NULL,TITLE,0);
 	GetProcessInfo(#Form, SelfInfo);
 	if (Form.status_window>2) return;
 	if (Form.height < 350) { MoveSize(OLD,OLD,OLD,350); return; }
-	if (!two_panels.checked) && (Form.width < 480) { MoveSize(OLD,OLD,480,OLD); return; }
-	if ( two_panels.checked) && (Form.width < 573) { MoveSize(OLD,OLD,573,OLD); return; }
 	GetProcessInfo(#Form, SelfInfo);
 	SetAppColors();
-	ESDWORD[#toolbar_pal] = sc.work;
-	ESDWORD[#toolbar_pal+4] = MixColors(0, sc.work, 35);
-	PutPaletteImage(#toolbar, 246, 34, 0, 0, 8, #toolbar_pal);
-	DrawBar(127, 8, 1, 25, sc.work_graph);
-	for (i=0; i<3; i++) DefineHiddenButton(toolbar_buttons_x[i]+2,7,31-5,29-5,21+i);
-	for (i=3; i<6; i++) DefineHiddenButton(toolbar_buttons_x[i],  5,31,  29,  21+i);
-	DrawBar(246,0, Form.cwidth - 246, 34, sc.work);
-	DrawDot(Form.cwidth-17,12);
-	DrawDot(Form.cwidth-17,12+6);
-	DrawDot(Form.cwidth-17,12+12);
-	DefineHiddenButton(Form.cwidth-24,7,20,25,51+BT_NOFRAME); //dots
+	if (two_panels.checked) {
+		if (Form.width < 573) { MoveSize(OLD,OLD,573,OLD); return; }
+		DrawBar(0, 0, Form.cwidth, 34, sc.work);
+		#define PAD 7
+		#define GAP_S 26+5
+		#define GAP_B 26+14
+		x.set(-GAP_S+8);
+		DrawTopPanelButton(21, x.inc(GAP_S), PAD, 30, false);
+		DrawTopPanelButton(22, x.inc(GAP_S), PAD, 31, false);
+		DrawTopPanelButton(23, x.inc(GAP_B), PAD, 01, false);
+		DrawTopPanelButton(24, x.inc(GAP_B), PAD, 55, false);
+		DrawTopPanelButton(25, x.inc(GAP_S), PAD, 20, false);
+		DrawTopPanelButton(26, x.inc(GAP_S), PAD, 56, false);
+		DrawTopPanelButton(51, Form.cwidth-GAP_S-PAD, PAD, -1, false); //burger menu
+	} else {
+		if (Form.width < 480) { MoveSize(OLD,OLD,480,OLD); return; }
+		ESDWORD[#toolbar_pal] = sc.work;
+		ESDWORD[#toolbar_pal+4] = MixColors(0, sc.work, 35);
+		PutPaletteImage(#toolbar, 246, 34, 0, 0, 8, #toolbar_pal);		
+		for (i=0; i<3; i++) DefineHiddenButton(toolbar_buttons_x[i]+2,7,31-5,29-5,21+i);
+		for (i=3; i<6; i++) DefineHiddenButton(toolbar_buttons_x[i],  5,31,  29,  21+i);
+		DrawBar(127, 8, 1, 25, sc.work_graph);
+		DrawBar(246,0, Form.cwidth - 246, 34, sc.work);
+		DrawDot(Form.cwidth-17,12);
+		DrawDot(Form.cwidth-17,12+6);
+		DrawDot(Form.cwidth-17,12+12);
+		DefineHiddenButton(Form.cwidth-24,7,20,25,51+BT_NOFRAME); //dots
+	}
 	//main rectangles
 	DrawRectangle(1,40,Form.cwidth-3,Form.cheight - 42-status_bar_h,sc.work_graph);
 	DrawRectangle(0,39,Form.cwidth-1,-show_status_bar.checked*status_bar_h + Form.cheight - 40,col.work_gradient[4]); //bg
@@ -597,7 +618,7 @@ void DrawList()
 	word sorting_arrow_x;
 	dword sorting_arrow_t = "\x19";
 	if (sort_desc) sorting_arrow_t = "\x18";
-	DrawFlatButtonSmall(files.x, files.y-17,     files.w - 141,16,31,T_FILE);
+	DrawFlatButtonSmall(files.x - efm,           files.y-17,files.w-141+efm,16,31,T_FILE);
 	DrawFlatButtonSmall(files.x + files.w - 141, files.y-17,73,16,32,T_TYPE);
 	DrawFlatButtonSmall(files.x + files.w -  68, files.y-17,68,16,33,T_SIZE);
 	DrawFlatButtonSmall(files.x + files.w,       files.y-17,16,16, 0,"\x18");
diff --git a/programs/cmm/eolite/include/breadcrumbs.h b/programs/cmm/eolite/include/breadcrumbs.h
index d66b269762..1eead2c8c3 100644
--- a/programs/cmm/eolite/include/breadcrumbs.h
+++ b/programs/cmm/eolite/include/breadcrumbs.h
@@ -2,6 +2,8 @@
 PathShow_data PathShow = {0, 17,250, 6, 250, 0, 0, 0x0, 0xFFFfff, #path, #temp, 0};
 void DrawPathBar()
 {
+	PathShow.start_x = -efm*20 + 250;
+	
 	PathShow.area_size_x = Form.cwidth-300;
 	DrawBar(PathShow.start_x-3, PathShow.start_y-6, PathShow.area_size_x+3, 19, col.odd_line);
 	DrawRectangle(PathShow.start_x-4,PathShow.start_y-7,PathShow.area_size_x+4,20,sc.work_graph);
diff --git a/programs/cmm/eolite/include/copy_and_delete.h b/programs/cmm/eolite/include/copy_and_delete.h
index 223e09d814..f02cd80efe 100644
--- a/programs/cmm/eolite/include/copy_and_delete.h
+++ b/programs/cmm/eolite/include/copy_and_delete.h
@@ -160,7 +160,6 @@ void PasteThread()
 		path_offset += strlen(path_offset) + 1;
 	}
 	cut_active=false;
-	if (info_after_copy.checked) notify(INFO_AFTER_COPY);
 	DialogExit();
 }
 
diff --git a/programs/cmm/eolite/include/gui.h b/programs/cmm/eolite/include/gui.h
index 61fda060ad..8acc4e2578 100644
--- a/programs/cmm/eolite/include/gui.h
+++ b/programs/cmm/eolite/include/gui.h
@@ -10,15 +10,15 @@ void Scroll() {
 
 	if (files.count<=0)
 	{
-		sc_slider_y = sc_y;
-		sc_slider_h = sc_h - 1;
+		sc_slider_y = sc_y - 1;
+		sc_slider_h = sc_h + 1;
 	}
 	else
 	{
-		sc_slider_y = files.first * sc_h / files.count + sc_y;
-		sc_slider_h = sc_h * files.visible - files.visible / files.count;
-		if (sc_slider_h < 20) sc_slider_h = 20; //minimal scroll width
-		if (sc_slider_h > sc_h-sc_slider_y+56) || (files.first+files.visible>=files.count) sc_slider_y= sc_y + sc_h - sc_slider_h - 1; //фы  сюы№°юую ёяшёър 
+		sc_slider_y = files.first * sc_h / files.count + sc_y - 1;
+		sc_slider_h = sc_h * files.visible - files.visible / files.count + 2;
+		if (sc_slider_h < 20) sc_slider_h = 20; //minimal scroll height
+		if (sc_slider_h > sc_h-sc_slider_y+56) || (files.first+files.visible>=files.count) sc_slider_y= sc_y + sc_h - sc_slider_h; //фы  сюы№°юую ёяшёър 
 	}
 	//slider
 	DrawRectangle(sc_x,sc_slider_y,16,sc_slider_h,sc.work_graph);
@@ -72,8 +72,8 @@ void DrawEolitePopup(dword b1_text, b2_text)
 	int but_x;
 	int popin_x = files.w - popin_w / 2 + files.x ;
 	DrawPopup(popin_x, 160, popin_w, 95, 1, sc.work, sc.work_graph);
-	but_x = DrawStandartCaptButton(popin_x+23, 215, POPUP_BTN1, b1_text);
-	DrawStandartCaptButton(popin_x+23 + but_x, 215, POPUP_BTN2, b2_text);
+	DrawCaptButton(popin_x+23+000, 215, 100, 26, POPUP_BTN1, sc.button, sc.button_text, b1_text);
+	DrawCaptButton(popin_x+23+114, 215, 100, 26, POPUP_BTN2, sc.button, sc.button_text, b2_text);
 }
 
 void DrawDot(dword x,y) {
diff --git a/programs/cmm/eolite/include/left_panel.h b/programs/cmm/eolite/include/left_panel.h
index 00540ce96a..787f5604ec 100644
--- a/programs/cmm/eolite/include/left_panel.h
+++ b/programs/cmm/eolite/include/left_panel.h
@@ -174,8 +174,6 @@ void _SystemDiscs::Draw()
 	if (two_panels.checked)
 	{
 		DrawBar(draw_x, draw_y, Form.cwidth - draw_x - 2, DEV_H_HOR, 0xFFFFFF);
-		DefineButton(Form.cwidth - 23, draw_y+2, 17,16, 60+BT_HIDE, 0xCCCccc);
-		_PutImage(Form.cwidth - 21, draw_y+4, 14,13, 2*14*13*3+#factions);
 		files.y = draw_y + DEV_H_HOR + 17;
 	} else {
 		DrawBar(draw_x+6, draw_y, 18, 1, 0xFFFfff);
diff --git a/programs/cmm/eolite/include/menu.h b/programs/cmm/eolite/include/menu.h
index ecc78ceaf5..e82770f4bf 100644
--- a/programs/cmm/eolite/include/menu.h
+++ b/programs/cmm/eolite/include/menu.h
@@ -26,7 +26,8 @@ char burger_menu_items[] =
 "Новое окно|Ctrl+N
 Открыть консоль|Ctrl+G
 Обновить папку|F5
-О программе|F1";
+Настройки|F10
+О программе";
 
 #elif LANG_EST
 char file_actions[]= 
@@ -55,7 +56,8 @@ char burger_menu_items[] =
 "New window|Ctrl+N
 Open console here|Ctrl+G
 Vфrskenda|F5
-About|F1";
+Settings|F10
+About";
 
 #else
 char file_actions[]= 
@@ -84,7 +86,8 @@ char burger_menu_items[] =
 "New window|Ctrl+N
 Open console here|Ctrl+G
 Refresh folder|F5
-About|F1";
+Settings|F10
+About";
 #endif
 
 
@@ -119,7 +122,8 @@ void EventMenuClick(dword _id)
 		case 1: EventOpenNewEolite(); break;
 		case 2: EventOpenConsoleHere(); break;
 		case 3: EventRefreshDisksAndFolders(); break;
-		case 4: FnProcess(1); break;		
+		case 4: FnProcess(10); break;
+		case 5: FnProcess(1); break;		
 	}
 	active_menu = NULL;
 }
diff --git a/programs/cmm/eolite/include/settings.h b/programs/cmm/eolite/include/settings.h
index e4faef5406..090e158907 100644
--- a/programs/cmm/eolite/include/settings.h
+++ b/programs/cmm/eolite/include/settings.h
@@ -3,7 +3,6 @@
 	?define TITLE_SETT "Настройки"
 	?define SHOW_DEVICE_CLASS "Выводить названия класса устройств"
 	?define SHOW_STATUS_BAR "Показывать статус бар"
-	?define NOTIFY_COPY_END "Уведомлять о завершении копирования"
 	?define SHOW_BREADCRUMBS "Использовать 'хлебные крошки'"
 	?define BIG_ICONS "Использовать большие иконки"
 	?define USE_TWO_PANELS "Две панели"
@@ -18,7 +17,6 @@
 	?define TITLE_SETT "Settings"
 	?define SHOW_DEVICE_CLASS "Show device class name"
 	?define SHOW_STATUS_BAR "Show status bar"
-	?define NOTIFY_COPY_END "Notify when copying finished"
 	?define SHOW_BREADCRUMBS "Show breadcrumbs"
 	?define BIG_ICONS "Big icons in list"
 	?define USE_TWO_PANELS "Two panels"
@@ -39,7 +37,6 @@ more_less_box font_size   = { NULL, 9, 22, FONT_SIZE_LABEL };
 more_less_box line_height = { NULL, 16, 64, LIST_LINE_HEIGHT };
 checkbox show_dev_name    = { SHOW_DEVICE_CLASS };
 checkbox show_status_bar  = { SHOW_STATUS_BAR };
-checkbox info_after_copy  = { NOTIFY_COPY_END };
 checkbox show_breadcrumb  = { SHOW_BREADCRUMBS };
 checkbox big_icons        = { BIG_ICONS };
 checkbox two_panels       = { USE_TWO_PANELS };
@@ -50,7 +47,7 @@ void settings_dialog()
 {   
 	proc_info Settings;
 	int id;
-	active_settings=1;
+	active_settings = true;
 	font_size.value = kfont.size.pt;
 	line_height.value = files.item_h;
 	SetEventMask(0x27);
@@ -66,7 +63,7 @@ void settings_dialog()
 				if (1==id) { ExitSettings(); break; }
 				else if (id==5)
 				{
-					RunProgram("/sys/tinypad", "/sys/settings/assoc.ini");
+					RunProgram("/sys/@open", "/sys/settings/assoc.ini");
 					break;
 				}
 				else if (id==6)
@@ -83,7 +80,6 @@ void settings_dialog()
 					break;
 				}
 				show_dev_name.click(id);
-				info_after_copy.click(id);
 				two_panels.click(id);
 				show_breadcrumb.click(id);
 				show_status_bar.click(id);
@@ -108,7 +104,7 @@ void settings_dialog()
 				
 			case evReDraw:
 				DefineAndDrawWindow(Form.cwidth-300/2+Form.left, Form.cheight-292/2+Form.top, 400, 
-					435+skin_height,0x34,sc.work,TITLE_SETT,0);
+					365+skin_height,0x34,sc.work,TITLE_SETT,0);
 				GetProcessInfo(#Settings, SelfInfo);
 				DrawSettingsCheckBoxes();
 		}
@@ -117,7 +113,7 @@ void settings_dialog()
 
 void ExitSettings()
 {
-	active_settings = 0;
+	active_settings = false;
 	settings_window = 0;
 	cmd_free = 4;
 	ExitProcess();
@@ -130,10 +126,9 @@ void DrawSettingsCheckBoxes()
 	y.n = 0;
 	show_dev_name.draw(x, y.inc(14));
 	show_status_bar.draw(x, y.inc(25));
-	info_after_copy.draw(x, y.inc(25));
 	show_breadcrumb.draw(x, y.inc(25));
 	big_icons.draw(x, y.inc(25));
-	two_panels.draw(x, y.inc(25));
+	//two_panels.draw(x, y.inc(25));
 	colored_lines.draw(x, y.inc(25));
 	font_size.draw(x, y.inc(31));
 	line_height.draw(x, y.inc(31));
@@ -152,21 +147,21 @@ void DrawSettingsCheckBoxes()
 void LoadIniSettings()
 {
 	ini.path = GetIni(#eolite_ini_path, "app.ini");
-	ini.section = "Eolite";
+	if (efm) ini.section = "EFM"; else ini.section = "Eolite";
+	two_panels.checked = efm;
 
 	files.SetFont(6, 9, 10000000b);
 	show_dev_name.checked   = ini.GetInt("ShowDeviceName", true); 
 	show_status_bar.checked = ini.GetInt("ShowStatusBar", true); 
-	info_after_copy.checked = ini.GetInt("InfoAfterCopy", false); 
 	big_icons.checked       = ini.GetInt("BigIcons", false); BigIconsSwitch();
-	two_panels.checked      = ini.GetInt("TwoPanels", false); 
+	//two_panels.checked      = ini.GetInt("TwoPanels", false); 
 	colored_lines.checked   = ini.GetInt("ColoredLines", false); 
 	kfont.size.pt   = ini.GetInt("FontSize", 13); 
 	files.item_h    = ini.GetInt("LineHeight", 19);
-	Form.left   = ini.GetInt("WinX", 200); 
-	Form.top    = ini.GetInt("WinY", 50); 
-	Form.width  = ini.GetInt("WinW", 550); 
-	Form.height = ini.GetInt("WinH", 503); 
+	Form.left   = ini.GetInt("WinX", 100); 
+	Form.top    = ini.GetInt("WinY", 30); 
+	Form.width  = ini.GetInt("WinW", efm*170+550); 
+	Form.height = ini.GetInt("WinH", efm*116+503); 
 	ini.GetString("DefaultPath", #path, 4096, "/rd/1");
 	ini.GetString("DefaultPath", #path_start, 4096, "/rd/1");
 	path_start_ed.size = path_start_ed.pos = strlen(#path_start);
@@ -182,16 +177,17 @@ void SaveIniSettings()
 {
 	ini.SetInt("ShowDeviceName", show_dev_name.checked);
 	ini.SetInt("ShowStatusBar", show_status_bar.checked);
-	ini.SetInt("InfoAfterCopy", info_after_copy.checked);
 	ini.SetInt("BigIcons", big_icons.checked);
-	ini.SetInt("TwoPanels", two_panels.checked);
+	//ini.SetInt("TwoPanels", two_panels.checked);
 	ini.SetInt("ColoredLines", colored_lines.checked);
 	ini.SetInt("FontSize", kfont.size.pt);
 	ini.SetInt("LineHeight", files.item_h);
-	ini.SetInt("WinX", Form.left);
-	ini.SetInt("WinY", Form.top);
-	ini.SetInt("WinW", Form.width);
-	ini.SetInt("WinH", Form.height);
+	if (Form.status_window<=2) {
+		ini.SetInt("WinX", Form.left);
+		ini.SetInt("WinY", Form.top);
+		ini.SetInt("WinW", Form.width);
+		ini.SetInt("WinH", Form.height);		
+	}
 }
 
 
diff --git a/programs/cmm/eolite/include/translations.h b/programs/cmm/eolite/include/translations.h
index 0ed7bc5416..86a56d2b24 100644
--- a/programs/cmm/eolite/include/translations.h
+++ b/programs/cmm/eolite/include/translations.h
@@ -9,7 +9,7 @@
 ?define T_NO "Нет"
 ?define T_CANCEL "Отмена"
 ?define T_CREATE "Создать"
-?define T_RENAME "Переименовать"
+?define T_RENAME "Переназвать"
 ?define FS_ITEM_ALREADY_EXISTS "'Элемент с таким именем уже существует' -E"
 ?define NOT_CREATE_FOLDER "'Не удалось создать папку.' -E"
 ?define NOT_CREATE_FILE "'Не удалось создать файл.' -E"
@@ -18,7 +18,6 @@
 ?define T_MOVE_WINDOW_TITLE "Перемещаю..."
 ?define T_DELETE_WINDOW_TITLE "Удаляю..."
 ?define T_ABORT_WINDOW_BUTTON "Прервать"
-?define INFO_AFTER_COPY "Копирование завершено"
 ?define T_CANCEL_PASTE "Копирование прекращено. Папка скопирована не полностью."
 ?define T_SELECT_APP_TO_OPEN_WITH "Выберите программу для открытия файла"
 ?define DEL_MORE_FILES_1 "выбранные элементы ("
@@ -49,7 +48,6 @@
 ?define T_MOVE_WINDOW_TITLE "Moving..."
 ?define T_DELETE_WINDOW_TITLE "Deleting..."
 ?define T_ABORT_WINDOW_BUTTON "Abort"	
-?define INFO_AFTER_COPY "Copy finished"
 ?define T_CANCEL_PASTE "Copy process terminated. Folder copied incompletely."
 ?define T_SELECT_APP_TO_OPEN_WITH "Select application to open file"
 ?define DEL_MORE_FILES_1 "selected items("