Burer/kolibrios
1
0
Fork 0
forked from KolibriOS/kolibrios
Code Pull Requests Activity

Eolite: fix deletion memory leak, fix selection moving to the first element after deletion

Browse Source 
git-svn-id: svn://kolibrios.org@5991 a494cfbc-eb01-0410-851d-a64ba20cac60
This commit is contained in:
Kirill Lipatov (Leency) 2015-12-20 21:56:53 +00:00
parent a96fb73670
commit 80fbb11ee1
3 changed files with 47 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -370,8 +370,8 @@ void main()
} }
if (new_element_active) if (new_element_active)
{ {
if (key_scancode == SCAN_CODE_ESC) NewElement(0); if (key_scancode == SCAN_CODE_ENTER) NewElement(true);
if (key_scancode == SCAN_CODE_ENTER) NewElement(1); if (key_scancode == SCAN_CODE_ESC) NewElement(false);
EAX= key_ascii << 8; EAX= key_ascii << 8;
edit_box_key stdcall (#new_file_ed); edit_box_key stdcall (#new_file_ed);
break; break;
@ -507,7 +507,7 @@ void main()
if (action_buf==OPERATION_END) if (action_buf==OPERATION_END)
{ {
FnProcess(5); FnProcess(5);
SelectFileByName(#copy_to+strrchr(#copy_to,'/')); if (copy_stak) SelectFileByName(#copy_to+strrchr(#copy_to,'/'));
} }
if (action_buf==100) Open(0); if (action_buf==100) Open(0);
if (action_buf==201) ShowOpenWithDialog(); if (action_buf==201) ShowOpenWithDialog();
@ -523,14 +523,14 @@ void main()
action_buf=0; action_buf=0;
} }
} }
if(cmd_free) if(cmd_free)
{ {
if(cmd_free==1) free(menu_stak); if(cmd_free==1) menu_stak=free(menu_stak);
else if(cmd_free==2)free(about_stak); else if(cmd_free==2) about_stak=free(about_stak);
else if(cmd_free==3)free(properties_stak); else if(cmd_free==3) properties_stak=free(properties_stak);
else if(cmd_free==4)free(settings_stak); else if(cmd_free==4) settings_stak=free(settings_stak);
else if(cmd_free==5)free(copy_stak); else if(cmd_free==5) copy_stak=free(copy_stak);
else if(cmd_free==6) delete_stak=free(delete_stak);
cmd_free = false; cmd_free = false;
} }
} }
@ -905,10 +905,6 @@ void Del_File_Thread()
copy_bar.max = file_count_copy; copy_bar.max = file_count_copy;
//if (dodel==true)
//{
//del_active=2;
//if (itdir) ShowMessage(WAIT_DELETING_FOLDER, 0);
del_error = 0; del_error = 0;
DisplayOperationForm(); DisplayOperationForm();
if (selected_count) if (selected_count)
@ -927,12 +923,8 @@ void Del_File_Thread()
Del_File2(#file_path, 1); Del_File2(#file_path, 1);
} }
if (del_error) Write_Error(del_error); if (del_error) Write_Error(del_error);
cmd_free = 6;
DialogExit(); DialogExit();
//}
//del_active=0;
//DeleteButton(301);
//DeleteButton(302);
//Open_Dir(#path,WITH_REDRAW);
} }
void Del_File(byte dodel) { void Del_File(byte dodel) {

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

@ -1,5 +1,5 @@
#define TITLE "Eolite File Manager v3.28" #define TITLE "Eolite File Manager v3.29"
#define ABOUT_TITLE "Eolite 3.28" #define ABOUT_TITLE "Eolite 3.29"
#ifdef LANG_RUS #ifdef LANG_RUS
?define T_FILE "” ©«" ?define T_FILE "” ©«"

6
programs/cmm/kolibri font viewer/Tupfile.lua Normal file
View File

@ -0,0 +1,6 @@
if tup.getconfig("NO_CMM") ~= "" then return end
if tup.getconfig("LANG") == "ru"
then C_LANG = "LANG_RUS"
else C_LANG = "LANG_ENG" -- this includes default case without config
end
tup.rule("kolibri font viewer.c", "c-- /D=AUTOBUILD /D=$(C_LANG) %f" .. tup.getconfig("KPACK_CMD"), "kolibri font viewer.com")