fix autobuild

git-svn-id: svn://kolibrios.org@5707 a494cfbc-eb01-0410-851d-a64ba20cac60
This commit is contained in:
Kirill Lipatov (Leency) 2015-08-10 10:55:14 +00:00
parent b24c17580f
commit c032ebbe0f
4 changed files with 13 additions and 25 deletions

View File

@ -412,7 +412,7 @@ void main()
switch (key_scancode) switch (key_scancode)
{ {
case 041: case 198:
two_panels ^= 1; two_panels ^= 1;
draw_window(); draw_window();
break; break;

View File

@ -50,7 +50,6 @@ int cur_action_buf;
void FileMenu() void FileMenu()
{ {
word key,key2;
proc_info MenuForm; proc_info MenuForm;
int index; int index;
@ -78,13 +77,10 @@ void FileMenu()
break; break;
case evKey: case evKey:
GetFullKey(); GetKeys();
key = AH; if (key_scancode==SCAN_CODE_ESC){cmd_free=1;ExitProcess();}
$shr eax,16 else if (key_scancode == SCAN_CODE_ENTER) {action_buf = cur_action_buf; cmd_free=1; ExitProcess(); }
key2 = AL; if (menu.ProcessKey(key_scancode)) MenuListRedraw();
if (key2==SCAN_CODE_ESC){cmd_free=1;ExitProcess();}
else if (key2 == SCAN_CODE_ENTER) {action_buf = cur_action_buf; cmd_free=1; ExitProcess(); }
if (menu.ProcessKey(key2)) MenuListRedraw();
break; break;
case evReDraw: _MENU_DRAW: case evReDraw: _MENU_DRAW:

View File

@ -214,7 +214,6 @@ void GetSizeMoreFiles(dword way)
void properties_dialog() void properties_dialog()
{ {
byte id; byte id;
byte key,key2;
dword file_name_off; dword file_name_off;
dword selected_offset2; dword selected_offset2;
@ -285,23 +284,20 @@ void properties_dialog()
break; break;
case evKey: case evKey:
GetFullKey(); GetKeys();
key = AH;
$shr eax,16
key2 = AL;
if (quest_active) if (quest_active)
{ {
IF (key2==SCAN_CODE_ENTER) SetProperties(2); IF (key_scancode==SCAN_CODE_ENTER) SetProperties(2);
IF (key2==SCAN_CODE_ESC) SetProperties(1); IF (key_scancode==SCAN_CODE_ESC) SetProperties(1);
break; break;
} }
if (key2==SCAN_CODE_ESC) if (key_scancode==SCAN_CODE_ESC)
{ {
cmd_free=3; cmd_free=3;
ExitProcess(); ExitProcess();
} }
if (key2==SCAN_CODE_ENTER) if (key_scancode==SCAN_CODE_ENTER)
{ {
if (selected_count) || (itdir) if (selected_count) || (itdir)
{ {
@ -314,7 +310,7 @@ void properties_dialog()
} }
break; break;
} }
EAX=key<<8; EAX = key_ascii << 8;
edit_box_key stdcall(#file_name_ed); edit_box_key stdcall(#file_name_ed);
edit_box_key stdcall(#path_to_file_ed); edit_box_key stdcall(#path_to_file_ed);
break; break;

View File

@ -32,7 +32,6 @@ char confir_section = "Config";
void settings_dialog() void settings_dialog()
{ {
byte id; byte id;
unsigned int key, key2;
proc_info settings_form; proc_info settings_form;
dword save_show_dev_name,save_real_files_names_case, save_info_after_copy, save_use_big_fonts, save_files_h, save_DBLTime; dword save_show_dev_name,save_real_files_names_case, save_info_after_copy, save_use_big_fonts, save_files_h, save_DBLTime;
@ -96,11 +95,8 @@ void settings_dialog()
break; break;
case evKey: case evKey:
GetFullKey(); GetKeys();
key = AH; if (key_scancode==SCAN_CODE_ESC)
$shr eax,16
key2 = AL;
if (key2==SCAN_CODE_ESC)
{ {
active_settings = 0; active_settings = 0;
action_buf = 300; action_buf = 300;