KolibriOS/kolibrios
13
14
Fork 12
Code Issues 113 Pull Requests 16 Actions Projects 1 Releases Wiki Activity

fNav: update assoc (thanks for passerby report)

Browse Source 
Eolite: half-fix of a fise display in Properties dialog for files bigger than 4 Gb (thanks for Mario report)

git-svn-id: svn://kolibrios.org@9685 a494cfbc-eb01-0410-851d-a64ba20cac60
This commit is contained in:
Kiril Lipatov
2022-02-06 11:44:40 +00:00
parent beb0dd901c
commit 80ae64dc44
3 changed files with 14 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
data/common/File Managers/fNav/FNAV.SET
View File

@@ -1 +1 @@
/sys/TinyPad: asm, inc, mac, dat /sys/TinyPad: asm, inc, mac, dat

15
programs/cmm/eolite/include/properties.h
View File

@@ -120,6 +120,7 @@ void GetSizeMoreFiles(dword way)
{ {
GetFileInfo(#cur_file, #file_info_dirsize); GetFileInfo(#cur_file, #file_info_dirsize);
more_files_count.bytes += file_info_dirsize.sizelo; more_files_count.bytes += file_info_dirsize.sizelo;
more_files_count.bytes += file_info_dirsize.sizehi;
more_files_count.files++; more_files_count.files++;
} }
} }
@@ -219,10 +220,9 @@ void properties_dialog()
void DrawPropertiesWindow() void DrawPropertiesWindow()
{ {
proc_info pform; proc_info pform;
char element_size_label[32]; char size_lbl[32];
char folder_info[200]; char folder_info[200];
dword ext1; dword ext1;
dword element_size;
incn y; incn y;
char temp_path[PATHLEN]; char temp_path[PATHLEN];
bool show_date = false; bool show_date = false;
@@ -244,8 +244,8 @@ void DrawPropertiesWindow()
PropertiesDrawIcon(NULL, "<lot>"); PropertiesDrawIcon(NULL, "<lot>");
sprintf(#folder_info,T_FILES_FOLDERS,more_files_count.files,more_files_count.folders); sprintf(#folder_info,T_FILES_FOLDERS,more_files_count.files,more_files_count.folders);
WriteText(file_name_ed.left+4, 30, 0x90, sc.work_text, #folder_info); WriteText(file_name_ed.left+4, 30, 0x90, sc.work_text, #folder_info);
sprintf(#element_size_label,T_PROP_SIZE,ConvertSize64(more_files_count.bytes, NULL),more_files_count.bytes); sprintf(#size_lbl,T_PROP_SIZE,ConvertSize64(more_files_count.bytes, more_files_count.bytes>>32),more_files_count.bytes);
WriteText(10, 97, 0x90, sc.work_text, #element_size_label); WriteText(10, 97, 0x90, sc.work_text, #size_lbl);
} }
else else
{ {
@@ -261,15 +261,14 @@ void DrawPropertiesWindow()
DrawEditBox(#file_name_ed); DrawEditBox(#file_name_ed);
if (!itdir) { if (!itdir) {
element_size = file_info_general.sizelo; sprintf(#size_lbl,T_PROP_SIZE,ConvertSize64(file_info_general.sizelo, file_info_general.sizehi),file_info_general.sizelo);
} else { } else {
sprintf(#folder_info,T_FILES_FOLDERS,dir_size.files,dir_size.folders); sprintf(#folder_info,T_FILES_FOLDERS,dir_size.files,dir_size.folders);
WriteText(10, 117, 0x90, sc.work_text, PR_T_CONTAINS); WriteText(10, 117, 0x90, sc.work_text, PR_T_CONTAINS);
WriteText(120, 117, 0x90, sc.work_text, #folder_info); WriteText(120, 117, 0x90, sc.work_text, #folder_info);
element_size = dir_size.bytes; sprintf(#size_lbl,T_PROP_SIZE,ConvertSize64(dir_size.bytes, dir_size.bytes_high),dir_size.bytes);
} }
sprintf(#element_size_label,T_PROP_SIZE,ConvertSize64(element_size, NULL),element_size); WriteText(10, 99, 0x90, sc.work_text, #size_lbl);
WriteText(10, 99, 0x90, sc.work_text, #element_size_label);
} }
if (show_date) { if (show_date) {

10
programs/cmm/lib/fs.h
View File

@@ -395,9 +395,9 @@ char readbuf[32];
:dword ConvertSize64(dword bytes_lo, bytes_hi) :dword ConvertSize64(dword bytes_lo, bytes_hi)
{ {
if (bytes_hi > 0) { if (bytes_hi > 0) {
if (bytes_lo>=1073741824) bytes_lo >>= 30; else bytes_lo = 0; if (bytes_lo>=1073741824) bytes_lo >>= 30; else bytes_lo = 0;
sprintf(#ConvertSize_size_prefix,"%d GB",bytes_hi<<2 + bytes_lo); sprintf(#ConvertSize_size_prefix,"%d GB",bytes_hi<<2 + bytes_lo);
return #ConvertSize_size_prefix; return #ConvertSize_size_prefix;
} }
else return ConvertSize(bytes_lo); else return ConvertSize(bytes_lo);
} }
@@ -495,13 +495,14 @@ int block_size=1024*1024*4; //copy by 4 MiB
dword folders; dword folders;
dword files; dword files;
dword bytes; dword bytes;
dword bytes_high;
dword get(); dword get();
dword calculate_loop(); dword calculate_loop();
}; };
:dword DIR_SIZE::get(dword way1) :dword DIR_SIZE::get(dword way1)
{ {
folders = files = bytes = 0; folders = files = bytes = bytes_high = 0;
if (!way1) return 0; if (!way1) return 0;
calculate_loop(way1); calculate_loop(way1);
} }
@@ -531,6 +532,7 @@ int block_size=1024*1024*4; //copy by 4 MiB
{ {
GetFileInfo(cur_file, #dir_info); GetFileInfo(cur_file, #dir_info);
bytes += dir_info.sizelo; bytes += dir_info.sizelo;
bytes_high += dir_info.sizehi;
files++; files++;
} }
} }