diff --git a/programs/cmm/eolite/Eolite.c b/programs/cmm/eolite/Eolite.c
index e646b8b775..0028ccb7cc 100644
--- a/programs/cmm/eolite/Eolite.c
+++ b/programs/cmm/eolite/Eolite.c
@@ -6,7 +6,7 @@
#endif
//libraries
-#define MEMSIZE 500000
+#define MEMSIZE 510000
#include "..\lib\clipboard.h"
#include "..\lib\strings.h"
#include "..\lib\mem.h"
@@ -64,9 +64,13 @@ byte use_big_fonts=false,
show_dev_name=true,
real_files_names_case=false,
info_after_copy=false,
- two_panels=false;
+ two_panels=false,
+ active_panel=1;
//} settings;
+int active_current, inactive_current, active_first, inactive_first;
+char active_path[4096], inactive_path[4096];
+
dword eolite_ini_path;
@@ -128,6 +132,8 @@ void main()
{
strlcpy(#path, "/rd/1/", 6);
}
+ strcpy(#active_path, #path);
+ strcpy(#inactive_path, #path);
Open_Dir(#path,ONLY_OPEN);
SetEventMask(1100111b);
loop(){
@@ -255,7 +261,7 @@ void main()
//Scrooll
if (!mouse.lkm) && (scroll_used) { scroll_used=false; Scroll(); }
- if (mouse.x>=Form.width-26) && (mouse.x<=Form.width-6) && (mouse.y>56) && (mouse.y
=files.x+files.w) && (mouse.x<=files.x+files.w+18) && (mouse.y>files.y) && (mouse.yfiles.count) files.first=files.count-files.visible;
if (id!=files.first) List_ReDraw();
+ break;
+ }
+
+ if (two_panels) && (mouse.y > files.y) {
+ if (mouse.x14) files.line_h--;
else if (id==27) MOUSE_TIME++;
@@ -105,10 +110,10 @@ void settings_dialog()
break;
case evReDraw:
- DefineAndDrawWindow(Form.left + Form.width/2, Form.top + Form.height/2 - 75, 300, 234+GetSkinHeight(),0x34,system.color.work,TITLE_SETT);
+ DefineAndDrawWindow(Form.left + Form.width/2-10, Form.top + Form.height/2 - 75, 300, 254+GetSkinHeight(),0x34,system.color.work,TITLE_SETT);
GetProcessInfo(#settings_form, SelfInfo);
DrawSettingsCheckBoxes();
- DrawFlatButton(9, 166, strlen(EDIT_FILE_ASSOCIATIONS)+4*6, 22, 5, 0xE4DFE1, EDIT_FILE_ASSOCIATIONS);
+ DrawFlatButton(9, 186, strlen(EDIT_FILE_ASSOCIATIONS)+4*6, 22, 5, 0xE4DFE1, EDIT_FILE_ASSOCIATIONS);
DrawFlatButton(128, settings_form.cheight - 30, 70, 22, 10, 0xE4DFE1, APPLY_T);
DrawFlatButton(208, settings_form.cheight - 30, 70, 22, 11, 0xE4DFE1, CANCEL_T);
}
@@ -121,8 +126,9 @@ void DrawSettingsCheckBoxes()
CheckBox2(10, 33, 21, SHOW_REAL_NAMES, real_files_names_case);
CheckBox2(10, 55, 22, NOTIFY_COPY_END, info_after_copy);
CheckBox2(10, 77, 23, USE_BIG_FONTS, use_big_fonts);
- MoreLessBox(10, 104, 18, 25, 26, #system.color, files.line_h, LIST_LINE_HEIGHT);
- MoreLessBox(10, 134, 18, 27, 28, #system.color, MOUSE_TIME, T_DOUBLE_CLICK);
+ CheckBox2(10, 99, 24, USE_TWO_PANELS, two_panels);
+ MoreLessBox(10, 124, 18, 25, 26, #system.color, files.line_h, LIST_LINE_HEIGHT);
+ MoreLessBox(10, 154, 18, 27, 28, #system.color, MOUSE_TIME, T_DOUBLE_CLICK);
}
@@ -133,6 +139,7 @@ void LoadIniSettings()
ini_get_int stdcall (eolite_ini_path, #confir_section, "RealFileNamesCase", 0); real_files_names_case = EAX;
ini_get_int stdcall (eolite_ini_path, #confir_section, "InfoAfterCopy", 0); info_after_copy = EAX;
ini_get_int stdcall (eolite_ini_path, #confir_section, "UseBigFonts", 0); use_big_fonts = EAX;
+ ini_get_int stdcall (eolite_ini_path, #confir_section, "TwoPanels", 0); two_panels = EAX;
ini_get_int stdcall (eolite_ini_path, #confir_section, "LineHeight", 18); files.line_h = EAX;
ini_get_int stdcall (eolite_ini_path, #confir_section, "TimeDoubleClick", 50); MOUSE_TIME = EAX;
BigFontsChange();
@@ -145,6 +152,7 @@ void SaveIniSettings()
ini_set_int stdcall (eolite_ini_path, #confir_section, "RealFileNamesCase", real_files_names_case);
ini_set_int stdcall (eolite_ini_path, #confir_section, "InfoAfterCopy", info_after_copy);
ini_set_int stdcall (eolite_ini_path, #confir_section, "UseBigFonts", use_big_fonts);
+ ini_set_int stdcall (eolite_ini_path, #confir_section, "TwoPanels", two_panels);
ini_set_int stdcall (eolite_ini_path, #confir_section, "LineHeight", files.line_h);
ini_set_int stdcall (eolite_ini_path, #confir_section, "TimeDoubleClick", MOUSE_TIME);
}
diff --git a/programs/cmm/eolite/include/translations.h b/programs/cmm/eolite/include/translations.h
index 686ceee3b2..3fbf285837 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.0 beta 6"
-#define ABOUT_TITLE "Eolite 3.0 beta 6"
+#define TITLE "Eolite File Manager v3.0 RC1"
+#define ABOUT_TITLE "Eolite 3.0 RC1"
#ifdef LANG_RUS
?define T_FILE "Файл"
diff --git a/programs/cmm/lib/io.h b/programs/cmm/lib/io.h
index 01e6d511c6..e7147ab32e 100644
--- a/programs/cmm/lib/io.h
+++ b/programs/cmm/lib/io.h
@@ -241,6 +241,7 @@
if(!strncmp(pos,"cd/",3)) return PATH;
if(!strncmp(pos,"bd/",3)) return PATH;
if(!strncmp(pos,"usbhd/",6)) return PATH;
+ if(!strncmp(pos,"kolibrios/",10)) return PATH;
sprintf(#__PATH_NEW,"/sys%s",PATH);
return #__PATH_NEW;
}