From 77914283f61c71899b9b25249d97e26f656947b7 Mon Sep 17 00:00:00 2001 From: "Kirill Lipatov (Leency)" Date: Mon, 31 Oct 2016 12:37:22 +0000 Subject: [PATCH] CMM: ability to use Ctrl+C/Ctrl+V in EditBox for the rest apps git-svn-id: svn://kolibrios.org@6641 a494cfbc-eb01-0410-851d-a64ba20cac60 --- programs/cmm/aelia/aelia.c | 3 +-- programs/cmm/browser/WebView.c | 6 ++++-- programs/cmm/eolite/Eolite.c | 2 +- programs/cmm/eolite/include/properties.h | 2 +- programs/cmm/eolite/include/translations.h | 4 ++-- programs/cmm/liza/login.c | 2 +- 6 files changed, 10 insertions(+), 9 deletions(-) diff --git a/programs/cmm/aelia/aelia.c b/programs/cmm/aelia/aelia.c index 7070c168a5..cefcde6b9b 100644 --- a/programs/cmm/aelia/aelia.c +++ b/programs/cmm/aelia/aelia.c @@ -203,7 +203,6 @@ void HandleKeyEvent() EventChangeEncoding(); break; } - return; } if (list.ProcessKey(key_scancode)) { DrawPage(); @@ -212,7 +211,7 @@ void HandleKeyEvent() if (key_ascii != 0x0d) && (key_ascii != ASCII_KEY_PGDN) && (key_ascii != ASCII_KEY_PGUP) { - EAX = key_ascii << 8; + EAX = key_editbox; edit_box_key stdcall(#address_box); } } diff --git a/programs/cmm/browser/WebView.c b/programs/cmm/browser/WebView.c index a1ac7c0d4a..c717f2e7a7 100644 --- a/programs/cmm/browser/WebView.c +++ b/programs/cmm/browser/WebView.c @@ -165,8 +165,10 @@ void main() GetKeys(); if (address_box.flags & 0b10) { - if (key_ascii == ASCII_KEY_ENTER) Scan(key_scancode); else - if (key_ascii != 0x0d) && (key_ascii != 183) && (key_ascii != 184) {EAX = key_ascii << 8; edit_box_key stdcall(#address_box);} + if (key_ascii == ASCII_KEY_ENTER) Scan(key_scancode); else { + EAX = key_editbox; + edit_box_key stdcall(#address_box); + } } else { diff --git a/programs/cmm/eolite/Eolite.c b/programs/cmm/eolite/Eolite.c index 18fec2f0e1..29e1240615 100644 --- a/programs/cmm/eolite/Eolite.c +++ b/programs/cmm/eolite/Eolite.c @@ -368,7 +368,7 @@ void main() { if (key_scancode == SCAN_CODE_ENTER) NewElement(true); if (key_scancode == SCAN_CODE_ESC) NewElement(false); - EAX= key_ascii << 8; + EAX = key_editbox; edit_box_key stdcall (#new_file_ed); break; } diff --git a/programs/cmm/eolite/include/properties.h b/programs/cmm/eolite/include/properties.h index 5c2765e243..2c3e941976 100644 --- a/programs/cmm/eolite/include/properties.h +++ b/programs/cmm/eolite/include/properties.h @@ -338,7 +338,7 @@ void properties_dialog() } break; } - EAX = key_ascii << 8; + EAX = key_editbox; edit_box_key stdcall(#file_name_ed); edit_box_key stdcall(#path_to_file_ed); break; diff --git a/programs/cmm/eolite/include/translations.h b/programs/cmm/eolite/include/translations.h index 4f4db5e008..ffdcaaeaee 100644 --- a/programs/cmm/eolite/include/translations.h +++ b/programs/cmm/eolite/include/translations.h @@ -1,5 +1,5 @@ -#define TITLE "Eolite File Manager v3.68" -#define ABOUT_TITLE "EOLITE 3.68" +#define TITLE "Eolite File Manager v3.7" +#define ABOUT_TITLE "EOLITE 3.7" #ifdef LANG_RUS ?define T_FILE "” ©«" diff --git a/programs/cmm/liza/login.c b/programs/cmm/liza/login.c index 0e4169075b..46c6353811 100644 --- a/programs/cmm/liza/login.c +++ b/programs/cmm/liza/login.c @@ -155,7 +155,7 @@ void LoginBoxLoop() GetSettings(); DrawLoginScreen(); } - EAX=key_ascii<<8; + EAX = key_editbox; edit_box_key stdcall(#login_box); edit_box_key stdcall(#pass_box); break;