Rev 5987 | Rev 5996 | Go to most recent revision | Show entire file | Regard whitespace | Details | Blame | Last modification | View Log | RSS feed
| Rev 5987 | Rev 5991 | ||
|---|---|---|---|
| Line 368... | Line 368... | ||
| 368 | if (key_scancode == SCAN_CODE_ESC) Del_File(false); |
368 | if (key_scancode == SCAN_CODE_ESC) Del_File(false); |
| 369 | break; |
369 | break; |
| 370 | } |
370 | } |
| 371 | if (new_element_active) |
371 | if (new_element_active) |
| 372 | { |
372 | { |
| 373 | if (key_scancode == SCAN_CODE_ESC) NewElement(0); |
373 | if (key_scancode == SCAN_CODE_ENTER) NewElement(true); |
| 374 | if (key_scancode == SCAN_CODE_ENTER) NewElement(1); |
374 | if (key_scancode == SCAN_CODE_ESC) NewElement(false); |
| 375 | EAX= key_ascii << 8; |
375 | EAX= key_ascii << 8; |
| 376 | edit_box_key stdcall (#new_file_ed); |
376 | edit_box_key stdcall (#new_file_ed); |
| 377 | break; |
377 | break; |
| 378 | } |
378 | } |
| 379 | if (files.ProcessKey(key_scancode)) |
379 | if (files.ProcessKey(key_scancode)) |
| Line 505... | Line 505... | ||
| 505 | if (action_buf) |
505 | if (action_buf) |
| 506 | { |
506 | { |
| 507 | if (action_buf==OPERATION_END) |
507 | if (action_buf==OPERATION_END) |
| 508 | { |
508 | { |
| 509 | FnProcess(5); |
509 | FnProcess(5); |
| 510 | SelectFileByName(#copy_to+strrchr(#copy_to,'/')); |
510 | if (copy_stak) SelectFileByName(#copy_to+strrchr(#copy_to,'/')); |
| 511 | } |
511 | } |
| 512 | if (action_buf==100) Open(0); |
512 | if (action_buf==100) Open(0); |
| 513 | if (action_buf==201) ShowOpenWithDialog(); |
513 | if (action_buf==201) ShowOpenWithDialog(); |
| 514 | if (action_buf==202) FnProcess(3); //F3 |
514 | if (action_buf==202) FnProcess(3); //F3 |
| 515 | if (action_buf==203) FnProcess(4); //F4 |
515 | if (action_buf==203) FnProcess(4); //F4 |
| Line 521... | Line 521... | ||
| 521 | if (action_buf==109) FnProcess(5); |
521 | if (action_buf==109) FnProcess(5); |
| 522 | if (action_buf==110) FnProcess(8); |
522 | if (action_buf==110) FnProcess(8); |
| 523 | action_buf=0; |
523 | action_buf=0; |
| 524 | } |
524 | } |
| 525 | } |
525 | } |
| 526 | - | ||
| 527 | if(cmd_free) |
526 | if(cmd_free) |
| 528 | { |
527 | { |
| 529 | if(cmd_free==1) free(menu_stak); |
528 | if(cmd_free==1) menu_stak=free(menu_stak); |
| 530 | else if(cmd_free==2)free(about_stak); |
529 | else if(cmd_free==2) about_stak=free(about_stak); |
| 531 | else if(cmd_free==3)free(properties_stak); |
530 | else if(cmd_free==3) properties_stak=free(properties_stak); |
| 532 | else if(cmd_free==4)free(settings_stak); |
531 | else if(cmd_free==4) settings_stak=free(settings_stak); |
| 533 | else if(cmd_free==5)free(copy_stak); |
532 | else if(cmd_free==5) copy_stak=free(copy_stak); |
| - | 533 | else if(cmd_free==6) delete_stak=free(delete_stak); |
|
| 534 | cmd_free = false; |
534 | cmd_free = false; |
| 535 | } |
535 | } |
| 536 | } |
536 | } |
| 537 | } |
537 | } |
| Line 903... | Line 903... | ||
| 903 | else file_count_copy++; |
903 | else file_count_copy++; |
| 904 | } |
904 | } |
| Line 905... | Line 905... | ||
| 905 | 905 | ||
| Line 906... | Line -... | ||
| 906 | copy_bar.max = file_count_copy; |
- | |
| 907 | - | ||
| 908 | //if (dodel==true) |
- | |
| 909 | //{ |
- | |
| 910 | //del_active=2; |
906 | copy_bar.max = file_count_copy; |
| 911 | //if (itdir) ShowMessage(WAIT_DELETING_FOLDER, 0); |
907 | |
| 912 | del_error = 0; |
908 | del_error = 0; |
| 913 | DisplayOperationForm(); |
909 | DisplayOperationForm(); |
| 914 | if (selected_count) |
910 | if (selected_count) |
| Line 925... | Line 921... | ||
| 925 | else |
921 | else |
| 926 | { |
922 | { |
| 927 | Del_File2(#file_path, 1); |
923 | Del_File2(#file_path, 1); |
| 928 | } |
924 | } |
| 929 | if (del_error) Write_Error(del_error); |
925 | if (del_error) Write_Error(del_error); |
| - | 926 | cmd_free = 6; |
|
| 930 | DialogExit(); |
927 | DialogExit(); |
| 931 | //} |
- | |
| 932 | //del_active=0; |
- | |
| 933 | //DeleteButton(301); |
- | |
| 934 | //DeleteButton(302); |
- | |
| 935 | //Open_Dir(#path,WITH_REDRAW); |
- | |
| 936 | } |
928 | } |
| Line 937... | Line 929... | ||
| 937 | 929 | ||
| 938 | void Del_File(byte dodel) { |
930 | void Del_File(byte dodel) { |
| 939 | del_active=0; |
931 | del_active=0; |