diff --git a/data/Tupfile.lua b/data/Tupfile.lua index 8fe1df548..21cf21932 100644 --- a/data/Tupfile.lua +++ b/data/Tupfile.lua @@ -17,6 +17,7 @@ img_files = { {"STRUCT.INC", PROGS .. "/struct.inc"}, {"FB2READ", "common/fb2read"}, {"ICONS32.PNG", "common/icons32.png"}, + {"ICONS16.PNG", "common/icons16.png"}, {"INDEX.HTM", "common/index_htm"}, {"KERPACK", "common/kerpack"}, {"KUZKINA.MID", "common/kuzkina.mid"}, @@ -29,7 +30,6 @@ img_files = { {"File Managers/EOLITE.INI", "common/File Managers/eolite.ini"}, {"File Managers/ICONS.INI", "common/File Managers/icons.ini"}, {"File Managers/KFM.INI", "common/File Managers/kfm.ini"}, - {"File Managers/Z_ICONS.PNG", PROGS .. "/fs/opendial/z_icons.png"}, {"File Managers/BUTTONS.BMP", PROGS .. "/fs/kfm/trunk/buttons.bmp"}, {"File Managers/ICONS.BMP", PROGS .. "/fs/kfm/trunk/icons.bmp"}, {"File Managers/FNAV/FNAV", "common/File Managers/fNav/fNav.kex"}, diff --git a/data/common/File Managers/icons.ini b/data/common/File Managers/icons.ini index b3496603e..fb53c565a 100644 --- a/data/common/File Managers/icons.ini +++ b/data/common/File Managers/icons.ini @@ -1,3 +1,4 @@ +[icons16] asm=4 inc=4 txt=3 diff --git a/data/common/icons16.png b/data/common/icons16.png new file mode 100644 index 000000000..912392c5e Binary files /dev/null and b/data/common/icons16.png differ diff --git a/data/common/icons32.png b/data/common/icons32.png index eaab746d7..ac754657b 100644 Binary files a/data/common/icons32.png and b/data/common/icons32.png differ diff --git a/programs/fs/opendial/opendial.asm b/programs/fs/opendial/opendial.asm index 3b6333dd2..e507b0157 100644 --- a/programs/fs/opendial/opendial.asm +++ b/programs/fs/opendial/opendial.asm @@ -1968,11 +1968,9 @@ calc_ini: ret ;--------------------------------------------------------------------- load_ini: - mov ebx,ini_file_name - mov esi,path - mov edi,file_name - call copy_file_path + mov edi,ini_file_name + mov [fileinfo.name],edi mov [fileinfo.subfunction],dword 5 mov [fileinfo.size],dword 0 mov [fileinfo.return],dword file_info @@ -2015,11 +2013,9 @@ load_icons: test eax,eax jz @f - mov ebx,icons_file_name - mov esi,path - mov edi,file_name - call copy_file_path + mov edi,icons_path + mov [fileinfo.name],edi mov [fileinfo.subfunction],dword 5 mov [fileinfo.size],dword 0 mov [fileinfo.return],dword file_info @@ -2872,9 +2868,9 @@ start_pach: root_pach: db '/',0 -icons_file_name_2 db 'buttons/' -icons_file_name db 'z_icons.png',0 -ini_file_name db 'icons.ini',0 +icons_file_name_2 db 'buttons/' +icons_path db '/sys/icons16.png',0 +ini_file_name db '/sys/File managers/icons.ini',0 ;--------------------------------------------------------------------- message: diff --git a/programs/fs/opendial/z_icons.png b/programs/fs/opendial/z_icons.png deleted file mode 100644 index dd6a64c53..000000000 Binary files a/programs/fs/opendial/z_icons.png and /dev/null differ