Subversion Repositories Kolibri OS

Compare Revisions

Regard whitespace Rev 5701 → Rev 5702

/programs/cmm/eolite/Eolite.c
339,19 → 339,19
if (Form.status_window>2) break;
if (del_active)
{
if (key == ASCII_KEY_ENTER) Del_File(true);
if (key == ASCII_KEY_ESC) Del_File(false);
if (key2 == SCAN_CODE_ENTER) Del_File(true);
if (key2 == SCAN_CODE_ESC) Del_File(false);
break;
}
if (new_element_active)
{
if (key == ASCII_KEY_ESC) NewElement(0);
if (key == ASCII_KEY_ENTER) NewElement(1);
if (key2 == SCAN_CODE_ESC) NewElement(0);
if (key2 == SCAN_CODE_ENTER) NewElement(1);
EAX=key<<8;
edit_box_key stdcall (#new_file_ed);
break;
}
if (files.ProcessKey(key))
if (files.ProcessKey(key2))
{
List_ReDraw();
break;
361,6 → 361,15
{
switch(key2)
{
case 059...068:
key2 -= 59;
if (key2<disc_num)
{
DrawRectangle(17,key2*16+74,159,16, 0); //display click
pause(7);
ClickOnDisk(key2);
}
break;
case 45: //Ctrl+X
Copy(#file_path, CUT);
break;
379,6 → 388,10
if (Form.left==98) MoveSize(Form.left-20,Form.top-20,OLD,OLD);
RunProgram("/sys/File Managers/Eolite", #path);
break;
case 028: //Ctrl+Enter
if (!itdir) ShowOpenWithDialog();
else Open(1);
break;
case 030: //Ctrl+A - select all files
for (i=0; i<files.count; i++)
{
402,41 → 415,28
break;
}
 
switch (key)
switch (key2)
{
case 096:
case 041:
two_panels ^= 1;
draw_window();
break;
case 209...217:
key -= 210;
if (key<disc_num)
{
DrawRectangle(17,key*16+74,159,16, 0); //display click
pause(7);
ClickOnDisk(key);
}
break;
case ASCII_KEY_BS:
case SCAN_CODE_BS:
//GoBack();
Dir_Up();
break;
case ASCII_KEY_ENTER:
case SCAN_CODE_ENTER:
Open(0);
break;
case 074: //menu
case 093: //menu
menu_call_mouse=0;
menu_stak = malloc(4096);
CreateThread(#FileMenu,menu_stak+4092);
break;
case 173: //Ctrl+Enter
if (!itdir) ShowOpenWithDialog();
else Open(1);
break;
case ASCII_KEY_DEL:
case SCAN_CODE_DEL:
Del_Form();
break;
case ASCII_KEY_INS:
case SCAN_CODE_INS:
selected_offset = file_mas[files.current]*304 + buf+32 + 7;
if (files.current==0) && (!strncmp(selected_offset+33, "..", 2)) goto _INSERT_END; //do not selec ".." directory
if (ESBYTE[selected_offset])
452,8 → 452,8
_INSERT_END:
if (files.KeyDown()) List_ReDraw();
break;
case 049...059: //F1-F10
FnProcess(key-49);
case 059...068: //F1-F10
FnProcess(key2-58);
break;
default:
for (i=files.current+1; i<files.count; i++)
/programs/cmm/eolite/include/menu.h
50,7 → 50,7
 
void FileMenu()
{
word key;
word key,key2;
proc_info MenuForm;
int index;
 
78,10 → 78,13
break;
case evKey:
key = GetKey();
if (key==27){cmd_free=1;ExitProcess();}
else if (key == 13) {action_buf = cur_action_buf; cmd_free=1; ExitProcess(); }
if (menu.ProcessKey(key)) MenuListRedraw();
GetFullKey();
key = AH;
$shr eax,16
key2 = AL;
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;
case evReDraw: _MENU_DRAW:
/programs/cmm/eolite/include/properties.h
214,7 → 214,7
void properties_dialog()
{
byte id;
byte key;
byte key,key2;
dword file_name_off;
dword selected_offset2;
285,18 → 285,35
break;
case evKey:
key = GetKey();
GetFullKey();
key = AH;
$shr eax,16
key2 = AL;
if (quest_active)
{
IF (key==013) SetProperties(2);
IF (key==027) SetProperties(1);
IF (key2==SCAN_CODE_ENTER) SetProperties(2);
IF (key2==SCAN_CODE_ESC) SetProperties(1);
break;
}
if (key==27)
if (key2==SCAN_CODE_ESC)
{
cmd_free=3;
ExitProcess();
}
if (key2==SCAN_CODE_ENTER)
{
if (selected_count) || (itdir)
{
quest_active = 1;
Quest();
}
else
{
SetProperties(0);
}
break;
}
EAX=key<<8;
edit_box_key stdcall(#file_name_ed);
edit_box_key stdcall(#path_to_file_ed);
/programs/cmm/eolite/include/settings.h
32,7 → 32,7
void settings_dialog()
{
byte id;
unsigned int key;
unsigned int key, key2;
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;
96,8 → 96,11
break;
case evKey:
key = GetKey();
if (key==27)
GetFullKey();
key = AH;
$shr eax,16
key2 = AL;
if (key2==SCAN_CODE_ESC)
{
active_settings = 0;
action_buf = 300;
/programs/cmm/eolite/include/translations.h
1,5 → 1,5
#define TITLE "Eolite File Manager v3.0 beta 3"
#define ABOUT_TITLE "Eolite 3.0 beta 3"
#define TITLE "Eolite File Manager v3.0 beta 4"
#define ABOUT_TITLE "Eolite 3.0 beta 4"
 
#ifdef LANG_RUS
?define T_FILE "” ©«"
/programs/cmm/lib/kolibri.h
66,6 → 66,24
#define ASCII_KEY_PGDN 183
#define ASCII_KEY_PGUP 184
 
//SCAN CODE KEYS
#define SCAN_CODE_BS 014
#define SCAN_CODE_TAB 015
#define SCAN_CODE_ENTER 028
#define SCAN_CODE_ESC 001
#define SCAN_CODE_DEL 083
#define SCAN_CODE_INS 082
#define SCAN_CODE_SPACE 057
#define SCAN_CODE_LEFT 075
#define SCAN_CODE_RIGHT 077
#define SCAN_CODE_DOWN 080
#define SCAN_CODE_UP 072
#define SCAN_CODE_HOME 071
#define SCAN_CODE_END 079
#define SCAN_CODE_PGDN 081
#define SCAN_CODE_PGUP 073
 
//allow event mask
#define EVENT_MASK_REDRAW 000000001b
#define EVENT_MASK_KEYBOARD 000000010b
/programs/cmm/lib/list_box.h
123,12 → 123,12
{
switch(key)
{
case ASCII_KEY_DOWN: return KeyDown();
case ASCII_KEY_UP: return KeyUp();
case ASCII_KEY_HOME: return KeyHome();
case ASCII_KEY_END: return KeyEnd();
case ASCII_KEY_PGUP: return KeyPgUp();
case ASCII_KEY_PGDN: return KeyPgDown();
case SCAN_CODE_DOWN: return KeyDown();
case SCAN_CODE_UP: return KeyUp();
case SCAN_CODE_HOME: return KeyHome();
case SCAN_CODE_END: return KeyEnd();
case SCAN_CODE_PGUP: return KeyPgUp();
case SCAN_CODE_PGDN: return KeyPgDown();
}
return 0;
}