KolibriOS/kolibrios
12
4
Fork 12
Code Issues 78 Pull Requests 5 Projects Releases Activity

Eolite 3.93: fix bigs related to big icons and two pannels mode

Browse Source 
git-svn-id: svn://kolibrios.org@7375 a494cfbc-eb01-0410-851d-a64ba20cac60
This commit is contained in:
Kirill Lipatov (Leency) 2018-09-16 22:30:13 +00:00
parent 05b54d494a
commit 81e648fa3a
3 changed files with 23 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
programs/cmm/eolite/Eolite.c
View File

@ -133,7 +133,7 @@ byte cmd_free=0;
void main() void main()
{ {
byte update = 0; bool update_files_list = false;
dword files_count = 0; dword files_count = 0;
dword countPathFile = 0; dword countPathFile = 0;
dword countPathFile2 = 0; dword countPathFile2 = 0;
@ -153,9 +153,9 @@ void main()
load_dll(libio, #libio_init,1); load_dll(libio, #libio_init,1);
load_dll(libimg, #libimg_init,1); load_dll(libimg, #libimg_init,1);
SetAppColors();
LoadIniSettings(); LoadIniSettings();
SystemDiscs.Get(); SystemDiscs.Get();
SetAppColors();
Libimg_LoadImage(#icons16_default, "/sys/icons16.png"); Libimg_LoadImage(#icons16_default, "/sys/icons16.png");
Libimg_LoadImage(#icons16_selected, "/sys/icons16.png"); Libimg_LoadImage(#icons16_selected, "/sys/icons16.png");
@ -541,7 +541,7 @@ void main()
default: default:
ReadDir(19, devbuf, "/"); // get disk ReadDir(19, devbuf, "/"); // get disk
IF(countDisk != EBX) // if different then if(countDisk != EBX) // if different then
{ {
countDisk = EBX; countDisk = EBX;
FnProcess(5); FnProcess(5);
@ -551,28 +551,28 @@ void main()
if(two_panels.checked) if(two_panels.checked)
{ {
// this add code update list files // this add code update list files
update = 0; update_files_list = false;
//strcpy(#inactive_path,#path); //strcpy(#inactive_path,#path);
ReadDir(19, devbuf, #inactive_path); ReadDir(19, devbuf, #inactive_path);
IF(countPathFile != EBX) // if different then if(countPathFile != EBX) // if different then
{ {
countPathFile = EBX; countPathFile = EBX;
update = 0xFF; update_files_list = true;
} }
//strcpy(#active_path,#path); //strcpy(#active_path,#path);
ReadDir(19, devbuf, #active_path); ReadDir(19, devbuf, #active_path);
IF(countPathFile2 != EBX) // if different then if(countPathFile2 != EBX) // if different then
{ {
countPathFile2 = EBX; countPathFile2 = EBX;
update = 0xFF; update_files_list = true;
} }
IF(update) DrawFilePanels(); if(update_files_list) DrawFilePanels();
} }
ELSE else
{ {
ReadDir(19, devbuf, #path); ReadDir(19, devbuf, #path);
IF(countPathFile != EBX) // if different then if(countPathFile != EBX) // if different then
{ {
countPathFile = EBX; countPathFile = EBX;
Open_Dir(#path,WITH_REDRAW); Open_Dir(#path,WITH_REDRAW);

13
programs/cmm/eolite/include/settings.h
View File

@ -93,7 +93,7 @@ void settings_dialog()
kfont.changeSIZE(); kfont.changeSIZE();
BigFontsChange(); BigFontsChange();
} }
if (line_height.click(id)) files.item_h = line_height.value; if (line_height.click(id)) files.item_h = files_inactive.item_h = line_height.value;
if (big_icons.click(id)) BigIconsSwitch(); if (big_icons.click(id)) BigIconsSwitch();
EventRedrawWindow(Form.left,Form.top); EventRedrawWindow(Form.left,Form.top);
//RefreshWindow(Form.slot, Settings.slot); //RefreshWindow(Form.slot, Settings.slot);
@ -159,6 +159,7 @@ void LoadIniSettings()
show_dev_name.checked = ini.GetInt("ShowDeviceName", true); show_dev_name.checked = ini.GetInt("ShowDeviceName", true);
show_status_bar.checked = ini.GetInt("ShowStatusBar", true); show_status_bar.checked = ini.GetInt("ShowStatusBar", true);
info_after_copy.checked = ini.GetInt("InfoAfterCopy", false); 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);
kfont.size.pt = ini.GetInt("FontSize", 13); kfont.size.pt = ini.GetInt("FontSize", 13);
files.item_h = ini.GetInt("LineHeight", 19); files.item_h = ini.GetInt("LineHeight", 19);
@ -184,6 +185,7 @@ void SaveIniSettings()
ini.SetInt("RealFileNamesCase", show_real_names.checked); ini.SetInt("RealFileNamesCase", show_real_names.checked);
ini.SetInt("InfoAfterCopy", info_after_copy.checked); ini.SetInt("InfoAfterCopy", info_after_copy.checked);
ini.SetInt("FontSize", kfont.size.pt); ini.SetInt("FontSize", kfont.size.pt);
ini.SetInt("BigIcons", big_icons.checked);
ini.SetInt("TwoPanels", two_panels.checked); ini.SetInt("TwoPanels", two_panels.checked);
ini.SetInt("LineHeight", files.item_h); ini.SetInt("LineHeight", files.item_h);
ini.SetInt("WinX", Form.left); ini.SetInt("WinX", Form.left);
@ -224,7 +226,11 @@ void SetAppColors()
void BigFontsChange() void BigFontsChange()
{ {
files.item_h = kfont.size.pt + 4; files.item_h = kfont.size.pt + 4;
if (files.item_h<18) files.item_h = 18; if (files.item_h<icon_size+3) {
files.item_h = icon_size+3;
line_height.value = files.item_h;
line_height.redraw();
}
files_active.item_h = files_inactive.item_h = files.item_h; files_active.item_h = files_inactive.item_h = files.item_h;
} }
@ -233,7 +239,6 @@ void BigIconsSwitch()
if (big_icons.checked) if (big_icons.checked)
{ {
icon_size=32; icon_size=32;
files.item_h = line_height.value = 35;
if (!icons32_default.image) if (!icons32_default.image)
{ {
Libimg_LoadImage(#icons32_default, "/sys/icons32.png"); Libimg_LoadImage(#icons32_default, "/sys/icons32.png");
@ -246,6 +251,6 @@ void BigIconsSwitch()
} }
else { else {
icon_size=16; icon_size=16;
files.item_h = line_height.value = 18;
} }
BigFontsChange();
} }

4
programs/cmm/eolite/include/translations.h
View File

@ -1,5 +1,5 @@
#define TITLE "Eolite File Manager v3.92" #define TITLE "Eolite File Manager v3.93"
#define ABOUT_TITLE "EOLITE 3.92" #define ABOUT_TITLE "EOLITE 3.93"
#ifdef LANG_RUS #ifdef LANG_RUS
?define T_FILE "” ©«" ?define T_FILE "” ©«"