10 Feb
2019
10 Feb
'19
3:04 p.m.
https://git.reactos.org/?p=reactos.git;a=commitdiff;h=3cd3d896b7659f1c5376f…
commit 3cd3d896b7659f1c5376f4036594e28cd2edbf7c
Author: Bișoc George <fraizeraust99(a)gmail.com>
AuthorDate: Sun Feb 10 16:04:16 2019 +0100
Commit: Hermès BÉLUSCA - MAÏTO <hermes.belusca-maito(a)reactos.org>
CommitDate: Sun Feb 10 16:04:16 2019 +0100
[OSK] Implement standard/enhanced keyboard handler (#1338)
- Add the respective standard keyboard resource.
- Implement the standard/enhanced keyboard dialog switcher.
- Implement save/load handler.
- Move the warning box conditinal check (bShowWarning) to wWinMain application entry
point (this will prevent the modal welcome box from displaying each time the user switches
into another dialog).
CORE-14428
---
base/applications/osk/lang/ar-DZ.rc | 125 +++++++++++++++++++++++++++++++++++-
base/applications/osk/lang/cs-CZ.rc | 125 +++++++++++++++++++++++++++++++++++-
base/applications/osk/lang/de-DE.rc | 125 +++++++++++++++++++++++++++++++++++-
base/applications/osk/lang/en-GB.rc | 125 +++++++++++++++++++++++++++++++++++-
base/applications/osk/lang/en-US.rc | 125 +++++++++++++++++++++++++++++++++++-
base/applications/osk/lang/es-ES.rc | 125 +++++++++++++++++++++++++++++++++++-
base/applications/osk/lang/et-EE.rc | 125 +++++++++++++++++++++++++++++++++++-
base/applications/osk/lang/fr-CA.rc | 125 +++++++++++++++++++++++++++++++++++-
base/applications/osk/lang/fr-FR.rc | 125 +++++++++++++++++++++++++++++++++++-
base/applications/osk/lang/he-IL.rc | 125 +++++++++++++++++++++++++++++++++++-
base/applications/osk/lang/it-IT.rc | 125 +++++++++++++++++++++++++++++++++++-
base/applications/osk/lang/pl-PL.rc | 125 +++++++++++++++++++++++++++++++++++-
base/applications/osk/lang/ro-RO.rc | 125 +++++++++++++++++++++++++++++++++++-
base/applications/osk/lang/ru-RU.rc | 125 +++++++++++++++++++++++++++++++++++-
base/applications/osk/lang/tr-TR.rc | 125 +++++++++++++++++++++++++++++++++++-
base/applications/osk/lang/zh-CN.rc | 125 +++++++++++++++++++++++++++++++++++-
base/applications/osk/lang/zh-TW.rc | 125 +++++++++++++++++++++++++++++++++++-
base/applications/osk/main.c | 96 ++++++++++++++++++++++++---
base/applications/osk/main.h | 1 +
base/applications/osk/osk_res.h | 79 ++++++++++++-----------
base/applications/osk/settings.c | 52 ++++++++++++---
21 files changed, 2246 insertions(+), 107 deletions(-)
diff --git a/base/applications/osk/lang/ar-DZ.rc b/base/applications/osk/lang/ar-DZ.rc
index 4feabe086a..3bf1192f0a 100644
--- a/base/applications/osk/lang/ar-DZ.rc
+++ b/base/applications/osk/lang/ar-DZ.rc
@@ -8,7 +8,7 @@
LANGUAGE LANG_ARABIC, SUBLANG_DEFAULT
-MAIN_DIALOG DIALOGEX DISCARDABLE 0, 0, 608, 164
+MAIN_DIALOG_ENHANCED_KB DIALOGEX DISCARDABLE 0, 0, 608, 164
CAPTION "On screen keyboard"
FONT 8, "MS Shell Dlg"
MENU IDR_OSK_MENU
@@ -127,6 +127,125 @@ BEGIN
CONTROL
"",IDC_LED_SCROLL,"Static",SS_CENTER|SS_NOTIFY,580,16,4,3
END
+MAIN_DIALOG_STANDARD_KB DIALOGEX DISCARDABLE 0, 0, 362, 115
+CAPTION "On screen keyboard"
+FONT 8, "MS Shell Dlg"
+MENU IDR_OSK_MENU
+STYLE WS_SYSMENU | WS_MINIMIZEBOX
+EXSTYLE WS_EX_TOPMOST | WS_EX_NOACTIVATE | WS_EX_APPWINDOW
+BEGIN
+ PUSHBUTTON "Esc",SCAN_CODE_110,3,3,15,15
+ PUSHBUTTON "F1",SCAN_CODE_112,43,3,15,15
+ PUSHBUTTON "F2",SCAN_CODE_113,63,3,15,15
+ PUSHBUTTON "F3",SCAN_CODE_114,83,3,15,15
+ PUSHBUTTON "F4",SCAN_CODE_115,103,3,15,15
+ PUSHBUTTON "F5",SCAN_CODE_116,123,3,15,15
+ PUSHBUTTON "F6",SCAN_CODE_117,143,3,15,15
+ PUSHBUTTON "F7",SCAN_CODE_118,183,3,15,15
+ PUSHBUTTON "F8",SCAN_CODE_119,203,3,15,15
+ PUSHBUTTON "F9",SCAN_CODE_120,223,3,15,15
+ PUSHBUTTON "F10",SCAN_CODE_121,243,3,15,15
+ PUSHBUTTON "F11",SCAN_CODE_122,263,3,15,15
+ PUSHBUTTON "F12",SCAN_CODE_123,283,3,15,15
+ PUSHBUTTON "Prn",SCAN_CODE_124,304,3,15,15
+ PUSHBUTTON "Stop",SCAN_CODE_125,324,3,15,15
+ PUSHBUTTON "Attn",SCAN_CODE_126,344,3,15,15
+ PUSHBUTTON "`",SCAN_CODE_1,3,22,15,15
+ PUSHBUTTON "1",SCAN_CODE_2,23,22,15,15
+ PUSHBUTTON "2",SCAN_CODE_3,43,22,15,15
+ PUSHBUTTON "3",SCAN_CODE_4,63,22,15,15
+ PUSHBUTTON "4",SCAN_CODE_5,83,22,15,15
+ PUSHBUTTON "5",SCAN_CODE_6,103,22,15,15
+ PUSHBUTTON "6",SCAN_CODE_7,123,22,15,15
+ PUSHBUTTON "7",SCAN_CODE_8,143,22,15,15
+ PUSHBUTTON "8",SCAN_CODE_9,163,22,15,15
+ PUSHBUTTON "9",SCAN_CODE_10,183,22,15,15
+ PUSHBUTTON "0",SCAN_CODE_11,203,22,15,15
+ PUSHBUTTON "-",SCAN_CODE_12,223,22,15,15
+ PUSHBUTTON "=",SCAN_CODE_13,243,22,15,15
+ PUSHBUTTON "<--",SCAN_CODE_15,263,22,36,15,BS_ICON
+ PUSHBUTTON "Tab",SCAN_CODE_16,3,41,35,15,BS_ICON
+ PUSHBUTTON "q",SCAN_CODE_17,42,41,15,15
+ PUSHBUTTON "w",SCAN_CODE_18,61,41,15,15
+ PUSHBUTTON "e",SCAN_CODE_19,80,41,15,15
+ PUSHBUTTON "r",SCAN_CODE_20,99,41,15,15
+ PUSHBUTTON "t",SCAN_CODE_21,118,41,15,15
+ PUSHBUTTON "y",SCAN_CODE_22,137,41,15,15
+ PUSHBUTTON "u",SCAN_CODE_23,156,41,15,15
+ PUSHBUTTON "i",SCAN_CODE_24,175,41,15,15
+ PUSHBUTTON "o",SCAN_CODE_25,194,41,15,15
+ PUSHBUTTON "p",SCAN_CODE_26,213,41,15,15
+ PUSHBUTTON "[",SCAN_CODE_27,232,41,15,15
+ PUSHBUTTON "]",SCAN_CODE_28,251,41,15,15
+ PUSHBUTTON "lock",SCAN_CODE_30,3,60,46,15,BS_ICON
+ PUSHBUTTON "a",SCAN_CODE_31,53,60,15,15
+ PUSHBUTTON "s",SCAN_CODE_32,72,60,15,15
+ PUSHBUTTON "d",SCAN_CODE_33,91,60,15,15
+ PUSHBUTTON "f",SCAN_CODE_34,110,60,15,15
+ PUSHBUTTON "g",SCAN_CODE_35,129,60,15,15
+ PUSHBUTTON "h",SCAN_CODE_36,148,60,15,15
+ PUSHBUTTON "j",SCAN_CODE_37,167,60,15,15
+ PUSHBUTTON "k",SCAN_CODE_38,186,60,15,15
+ PUSHBUTTON "l",SCAN_CODE_39,205,60,15,15
+ PUSHBUTTON ";",SCAN_CODE_40,224,60,15,15
+ PUSHBUTTON "'",SCAN_CODE_41,243,60,15,15
+ PUSHBUTTON "\\",SCAN_CODE_29,270,41,30,15
+ PUSHBUTTON "ret",SCAN_CODE_43,262,60,38,15,BS_ICON
+ PUSHBUTTON
"shift",SCAN_CODE_44,3,79,57,15,BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX
+ PUSHBUTTON "z",SCAN_CODE_46,64,79,15,15
+ PUSHBUTTON "x",SCAN_CODE_47,83,79,15,15
+ PUSHBUTTON "c",SCAN_CODE_48,102,79,15,15
+ PUSHBUTTON "v",SCAN_CODE_49,121,79,15,15
+ PUSHBUTTON "b",SCAN_CODE_50,140,79,15,15
+ PUSHBUTTON "n",SCAN_CODE_51,159,79,15,15
+ PUSHBUTTON "m",SCAN_CODE_52,178,79,15,15
+ PUSHBUTTON ",",SCAN_CODE_53,197,79,15,15
+ PUSHBUTTON ".",SCAN_CODE_54,216,79,15,15
+ PUSHBUTTON "/",SCAN_CODE_55,235,79,15,15
+ PUSHBUTTON
"shift",SCAN_CODE_57,254,79,45,15,BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX
+ PUSHBUTTON "ctrl",SCAN_CODE_58,3,98,24,15,BS_PUSHLIKE|BS_AUTOCHECKBOX
+ PUSHBUTTON "v",SCAN_CODE_84,324,98,15,15,BS_ICON
+ PUSHBUTTON "ROS",SCAN_CODE_127,30,98,24,15,BS_ICON
+ PUSHBUTTON "alt",SCAN_CODE_60,57,98,24,15,BS_PUSHLIKE|BS_AUTOCHECKBOX
+ PUSHBUTTON "",SCAN_CODE_61,84,98,106,15 //space
+ PUSHBUTTON
"alt",SCAN_CODE_62,194,98,24,15,BS_PUSHLIKE|BS_AUTOCHECKBOX
+ PUSHBUTTON "ROS",SCAN_CODE_128,221,98,24,15,BS_ICON
+ PUSHBUTTON "menu",SCAN_CODE_129,248,98,24,15,BS_ICON
+ PUSHBUTTON
"ctrl",SCAN_CODE_64,275,98,24,15,BS_PUSHLIKE|BS_AUTOCHECKBOX
+ PUSHBUTTON "ins",SCAN_CODE_75,304,22,15,15
+ PUSHBUTTON "del",SCAN_CODE_76,304,41,15,15
+ PUSHBUTTON "hm",SCAN_CODE_80,324,22,15,15
+ PUSHBUTTON "end",SCAN_CODE_81,324,41,15,15
+ PUSHBUTTON "pup",SCAN_CODE_85,344,22,15,15
+ PUSHBUTTON "pdn",SCAN_CODE_86,344,41,15,15
+ PUSHBUTTON "<-",SCAN_CODE_79,304,98,15,15,BS_ICON
+ PUSHBUTTON "^",SCAN_CODE_83,324,79,15,15,BS_ICON
+ PUSHBUTTON "->",SCAN_CODE_89,344,98,15,15,BS_ICON
+ PUSHBUTTON "nlk",SCAN_CODE_90,364,22,15,15
+ PUSHBUTTON "7",SCAN_CODE_91,364,41,15,15
+ PUSHBUTTON "4",SCAN_CODE_92,364,60,15,15
+ PUSHBUTTON "1",SCAN_CODE_93,364,79,15,15
+ PUSHBUTTON "/",SCAN_CODE_95,384,22,15,15
+ PUSHBUTTON "8",SCAN_CODE_96,384,41,15,15
+ PUSHBUTTON "5",SCAN_CODE_97,384,60,15,15
+ PUSHBUTTON "2",SCAN_CODE_98,384,79,15,15
+ PUSHBUTTON "0",SCAN_CODE_99,364,98,34,15
+ PUSHBUTTON "*",SCAN_CODE_100,404,22,15,15
+ PUSHBUTTON "9",SCAN_CODE_101,404,41,15,15
+ PUSHBUTTON "6",SCAN_CODE_102,404,60,15,15
+ PUSHBUTTON "3",SCAN_CODE_103,404,79,15,15
+ PUSHBUTTON ".",SCAN_CODE_104,404,98,15,15
+ PUSHBUTTON "-",SCAN_CODE_105,424,22,15,15
+ PUSHBUTTON "+",SCAN_CODE_106,424,41,15,35
+ PUSHBUTTON "ent",SCAN_CODE_108,424,78,15,35
+ CTEXT "Num",IDC_STATIC,364,3,21,8
+ CONTROL
"",IDC_LED_NUM,"Static",SS_CENTER|SS_NOTIFY,372,15,4,3
+ CTEXT "Caps",IDC_STATIC,389,3,21,8
+ CONTROL
"",IDC_LED_CAPS,"Static",SS_CENTER|SS_NOTIFY,398,15,4,3
+ CTEXT "Scroll",IDC_STATIC,414,3,21,8
+ CONTROL
"",IDC_LED_SCROLL,"Static",SS_CENTER|SS_NOTIFY,424,15,4,3
+END
+
IDR_OSK_MENU MENU DISCARDABLE
BEGIN
POPUP "File"
@@ -136,8 +255,8 @@ BEGIN
POPUP "Keyboard"
BEGIN
- MENUITEM "Enhanced Keyboard", IDM_ENCHANCED_KB, CHECKED, GRAYED
- MENUITEM "Standard Keyboard", IDM_STANDARD_KB, GRAYED
+ MENUITEM "Enhanced Keyboard", IDM_ENHANCED_KB, CHECKED
+ MENUITEM "Standard Keyboard", IDM_STANDARD_KB
MENUITEM SEPARATOR
MENUITEM "Regular Layout", IDM_REG_LAYOUT, CHECKED, GRAYED
MENUITEM "Block Layout", IDM_BLOCK_LAYOUT, GRAYED
diff --git a/base/applications/osk/lang/cs-CZ.rc b/base/applications/osk/lang/cs-CZ.rc
index 21b68ec8af..3d35fa2b47 100644
--- a/base/applications/osk/lang/cs-CZ.rc
+++ b/base/applications/osk/lang/cs-CZ.rc
@@ -8,7 +8,7 @@
LANGUAGE LANG_CZECH, SUBLANG_DEFAULT
-MAIN_DIALOG DIALOGEX DISCARDABLE 0, 0, 608, 164
+MAIN_DIALOG_ENHANCED_KB DIALOGEX DISCARDABLE 0, 0, 608, 164
CAPTION "Klávesnice na obrazovce"
FONT 8, "MS Shell Dlg"
MENU IDR_OSK_MENU
@@ -127,6 +127,125 @@ BEGIN
CONTROL
"",IDC_LED_SCROLL,"Static",SS_CENTER|SS_NOTIFY,580,16,4,3
END
+MAIN_DIALOG_STANDARD_KB DIALOGEX DISCARDABLE 0, 0, 362, 115
+CAPTION "On screen keyboard"
+FONT 8, "MS Shell Dlg"
+MENU IDR_OSK_MENU
+STYLE WS_SYSMENU | WS_MINIMIZEBOX
+EXSTYLE WS_EX_TOPMOST | WS_EX_NOACTIVATE | WS_EX_APPWINDOW
+BEGIN
+ PUSHBUTTON "Esc",SCAN_CODE_110,3,3,15,15
+ PUSHBUTTON "F1",SCAN_CODE_112,43,3,15,15
+ PUSHBUTTON "F2",SCAN_CODE_113,63,3,15,15
+ PUSHBUTTON "F3",SCAN_CODE_114,83,3,15,15
+ PUSHBUTTON "F4",SCAN_CODE_115,103,3,15,15
+ PUSHBUTTON "F5",SCAN_CODE_116,123,3,15,15
+ PUSHBUTTON "F6",SCAN_CODE_117,143,3,15,15
+ PUSHBUTTON "F7",SCAN_CODE_118,183,3,15,15
+ PUSHBUTTON "F8",SCAN_CODE_119,203,3,15,15
+ PUSHBUTTON "F9",SCAN_CODE_120,223,3,15,15
+ PUSHBUTTON "F10",SCAN_CODE_121,243,3,15,15
+ PUSHBUTTON "F11",SCAN_CODE_122,263,3,15,15
+ PUSHBUTTON "F12",SCAN_CODE_123,283,3,15,15
+ PUSHBUTTON "Prn",SCAN_CODE_124,304,3,15,15
+ PUSHBUTTON "Stop",SCAN_CODE_125,324,3,15,15
+ PUSHBUTTON "Attn",SCAN_CODE_126,344,3,15,15
+ PUSHBUTTON "`",SCAN_CODE_1,3,22,15,15
+ PUSHBUTTON "1",SCAN_CODE_2,23,22,15,15
+ PUSHBUTTON "2",SCAN_CODE_3,43,22,15,15
+ PUSHBUTTON "3",SCAN_CODE_4,63,22,15,15
+ PUSHBUTTON "4",SCAN_CODE_5,83,22,15,15
+ PUSHBUTTON "5",SCAN_CODE_6,103,22,15,15
+ PUSHBUTTON "6",SCAN_CODE_7,123,22,15,15
+ PUSHBUTTON "7",SCAN_CODE_8,143,22,15,15
+ PUSHBUTTON "8",SCAN_CODE_9,163,22,15,15
+ PUSHBUTTON "9",SCAN_CODE_10,183,22,15,15
+ PUSHBUTTON "0",SCAN_CODE_11,203,22,15,15
+ PUSHBUTTON "-",SCAN_CODE_12,223,22,15,15
+ PUSHBUTTON "=",SCAN_CODE_13,243,22,15,15
+ PUSHBUTTON "<--",SCAN_CODE_15,263,22,36,15,BS_ICON
+ PUSHBUTTON "Tab",SCAN_CODE_16,3,41,35,15,BS_ICON
+ PUSHBUTTON "q",SCAN_CODE_17,42,41,15,15
+ PUSHBUTTON "w",SCAN_CODE_18,61,41,15,15
+ PUSHBUTTON "e",SCAN_CODE_19,80,41,15,15
+ PUSHBUTTON "r",SCAN_CODE_20,99,41,15,15
+ PUSHBUTTON "t",SCAN_CODE_21,118,41,15,15
+ PUSHBUTTON "y",SCAN_CODE_22,137,41,15,15
+ PUSHBUTTON "u",SCAN_CODE_23,156,41,15,15
+ PUSHBUTTON "i",SCAN_CODE_24,175,41,15,15
+ PUSHBUTTON "o",SCAN_CODE_25,194,41,15,15
+ PUSHBUTTON "p",SCAN_CODE_26,213,41,15,15
+ PUSHBUTTON "[",SCAN_CODE_27,232,41,15,15
+ PUSHBUTTON "]",SCAN_CODE_28,251,41,15,15
+ PUSHBUTTON "lock",SCAN_CODE_30,3,60,46,15,BS_ICON
+ PUSHBUTTON "a",SCAN_CODE_31,53,60,15,15
+ PUSHBUTTON "s",SCAN_CODE_32,72,60,15,15
+ PUSHBUTTON "d",SCAN_CODE_33,91,60,15,15
+ PUSHBUTTON "f",SCAN_CODE_34,110,60,15,15
+ PUSHBUTTON "g",SCAN_CODE_35,129,60,15,15
+ PUSHBUTTON "h",SCAN_CODE_36,148,60,15,15
+ PUSHBUTTON "j",SCAN_CODE_37,167,60,15,15
+ PUSHBUTTON "k",SCAN_CODE_38,186,60,15,15
+ PUSHBUTTON "l",SCAN_CODE_39,205,60,15,15
+ PUSHBUTTON ";",SCAN_CODE_40,224,60,15,15
+ PUSHBUTTON "'",SCAN_CODE_41,243,60,15,15
+ PUSHBUTTON "\\",SCAN_CODE_29,270,41,30,15
+ PUSHBUTTON "ret",SCAN_CODE_43,262,60,38,15,BS_ICON
+ PUSHBUTTON
"shift",SCAN_CODE_44,3,79,57,15,BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX
+ PUSHBUTTON "z",SCAN_CODE_46,64,79,15,15
+ PUSHBUTTON "x",SCAN_CODE_47,83,79,15,15
+ PUSHBUTTON "c",SCAN_CODE_48,102,79,15,15
+ PUSHBUTTON "v",SCAN_CODE_49,121,79,15,15
+ PUSHBUTTON "b",SCAN_CODE_50,140,79,15,15
+ PUSHBUTTON "n",SCAN_CODE_51,159,79,15,15
+ PUSHBUTTON "m",SCAN_CODE_52,178,79,15,15
+ PUSHBUTTON ",",SCAN_CODE_53,197,79,15,15
+ PUSHBUTTON ".",SCAN_CODE_54,216,79,15,15
+ PUSHBUTTON "/",SCAN_CODE_55,235,79,15,15
+ PUSHBUTTON
"shift",SCAN_CODE_57,254,79,45,15,BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX
+ PUSHBUTTON "ctrl",SCAN_CODE_58,3,98,24,15,BS_PUSHLIKE|BS_AUTOCHECKBOX
+ PUSHBUTTON "v",SCAN_CODE_84,324,98,15,15,BS_ICON
+ PUSHBUTTON "ROS",SCAN_CODE_127,30,98,24,15,BS_ICON
+ PUSHBUTTON "alt",SCAN_CODE_60,57,98,24,15,BS_PUSHLIKE|BS_AUTOCHECKBOX
+ PUSHBUTTON "",SCAN_CODE_61,84,98,106,15 //space
+ PUSHBUTTON
"alt",SCAN_CODE_62,194,98,24,15,BS_PUSHLIKE|BS_AUTOCHECKBOX
+ PUSHBUTTON "ROS",SCAN_CODE_128,221,98,24,15,BS_ICON
+ PUSHBUTTON "menu",SCAN_CODE_129,248,98,24,15,BS_ICON
+ PUSHBUTTON
"ctrl",SCAN_CODE_64,275,98,24,15,BS_PUSHLIKE|BS_AUTOCHECKBOX
+ PUSHBUTTON "ins",SCAN_CODE_75,304,22,15,15
+ PUSHBUTTON "del",SCAN_CODE_76,304,41,15,15
+ PUSHBUTTON "hm",SCAN_CODE_80,324,22,15,15
+ PUSHBUTTON "end",SCAN_CODE_81,324,41,15,15
+ PUSHBUTTON "pup",SCAN_CODE_85,344,22,15,15
+ PUSHBUTTON "pdn",SCAN_CODE_86,344,41,15,15
+ PUSHBUTTON "<-",SCAN_CODE_79,304,98,15,15,BS_ICON
+ PUSHBUTTON "^",SCAN_CODE_83,324,79,15,15,BS_ICON
+ PUSHBUTTON "->",SCAN_CODE_89,344,98,15,15,BS_ICON
+ PUSHBUTTON "nlk",SCAN_CODE_90,364,22,15,15
+ PUSHBUTTON "7",SCAN_CODE_91,364,41,15,15
+ PUSHBUTTON "4",SCAN_CODE_92,364,60,15,15
+ PUSHBUTTON "1",SCAN_CODE_93,364,79,15,15
+ PUSHBUTTON "/",SCAN_CODE_95,384,22,15,15
+ PUSHBUTTON "8",SCAN_CODE_96,384,41,15,15
+ PUSHBUTTON "5",SCAN_CODE_97,384,60,15,15
+ PUSHBUTTON "2",SCAN_CODE_98,384,79,15,15
+ PUSHBUTTON "0",SCAN_CODE_99,364,98,34,15
+ PUSHBUTTON "*",SCAN_CODE_100,404,22,15,15
+ PUSHBUTTON "9",SCAN_CODE_101,404,41,15,15
+ PUSHBUTTON "6",SCAN_CODE_102,404,60,15,15
+ PUSHBUTTON "3",SCAN_CODE_103,404,79,15,15
+ PUSHBUTTON ".",SCAN_CODE_104,404,98,15,15
+ PUSHBUTTON "-",SCAN_CODE_105,424,22,15,15
+ PUSHBUTTON "+",SCAN_CODE_106,424,41,15,35
+ PUSHBUTTON "ent",SCAN_CODE_108,424,78,15,35
+ CTEXT "Num",IDC_STATIC,364,3,21,8
+ CONTROL
"",IDC_LED_NUM,"Static",SS_CENTER|SS_NOTIFY,372,15,4,3
+ CTEXT "Caps",IDC_STATIC,389,3,21,8
+ CONTROL
"",IDC_LED_CAPS,"Static",SS_CENTER|SS_NOTIFY,398,15,4,3
+ CTEXT "Scroll",IDC_STATIC,414,3,21,8
+ CONTROL
"",IDC_LED_SCROLL,"Static",SS_CENTER|SS_NOTIFY,424,15,4,3
+END
+
IDR_OSK_MENU MENU DISCARDABLE
BEGIN
POPUP "File"
@@ -136,8 +255,8 @@ BEGIN
POPUP "Keyboard"
BEGIN
- MENUITEM "Enhanced Keyboard", IDM_ENCHANCED_KB, CHECKED, GRAYED
- MENUITEM "Standard Keyboard", IDM_STANDARD_KB, GRAYED
+ MENUITEM "Enhanced Keyboard", IDM_ENHANCED_KB, CHECKED
+ MENUITEM "Standard Keyboard", IDM_STANDARD_KB
MENUITEM SEPARATOR
MENUITEM "Regular Layout", IDM_REG_LAYOUT, CHECKED, GRAYED
MENUITEM "Block Layout", IDM_BLOCK_LAYOUT, GRAYED
diff --git a/base/applications/osk/lang/de-DE.rc b/base/applications/osk/lang/de-DE.rc
index 3fa0d40a1c..6748444650 100644
--- a/base/applications/osk/lang/de-DE.rc
+++ b/base/applications/osk/lang/de-DE.rc
@@ -8,7 +8,7 @@
LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL
-MAIN_DIALOG DIALOGEX DISCARDABLE 0, 0, 608, 164
+MAIN_DIALOG_ENHANCED_KB DIALOGEX DISCARDABLE 0, 0, 608, 164
CAPTION "Bildschirmtastatur"
FONT 8, "MS Shell Dlg"
MENU IDR_OSK_MENU
@@ -128,6 +128,125 @@ BEGIN
CONTROL
"",IDC_LED_SCROLL,"Static",SS_CENTER|SS_NOTIFY,580,16,4,3
END
+MAIN_DIALOG_STANDARD_KB DIALOGEX DISCARDABLE 0, 0, 362, 115
+CAPTION "On screen keyboard"
+FONT 8, "MS Shell Dlg"
+MENU IDR_OSK_MENU
+STYLE WS_SYSMENU | WS_MINIMIZEBOX
+EXSTYLE WS_EX_TOPMOST | WS_EX_NOACTIVATE | WS_EX_APPWINDOW
+BEGIN
+ PUSHBUTTON "Esc",SCAN_CODE_110,3,3,15,15
+ PUSHBUTTON "F1",SCAN_CODE_112,43,3,15,15
+ PUSHBUTTON "F2",SCAN_CODE_113,63,3,15,15
+ PUSHBUTTON "F3",SCAN_CODE_114,83,3,15,15
+ PUSHBUTTON "F4",SCAN_CODE_115,103,3,15,15
+ PUSHBUTTON "F5",SCAN_CODE_116,123,3,15,15
+ PUSHBUTTON "F6",SCAN_CODE_117,143,3,15,15
+ PUSHBUTTON "F7",SCAN_CODE_118,183,3,15,15
+ PUSHBUTTON "F8",SCAN_CODE_119,203,3,15,15
+ PUSHBUTTON "F9",SCAN_CODE_120,223,3,15,15
+ PUSHBUTTON "F10",SCAN_CODE_121,243,3,15,15
+ PUSHBUTTON "F11",SCAN_CODE_122,263,3,15,15
+ PUSHBUTTON "F12",SCAN_CODE_123,283,3,15,15
+ PUSHBUTTON "Prn",SCAN_CODE_124,304,3,15,15
+ PUSHBUTTON "Stop",SCAN_CODE_125,324,3,15,15
+ PUSHBUTTON "Attn",SCAN_CODE_126,344,3,15,15
+ PUSHBUTTON "`",SCAN_CODE_1,3,22,15,15
+ PUSHBUTTON "1",SCAN_CODE_2,23,22,15,15
+ PUSHBUTTON "2",SCAN_CODE_3,43,22,15,15
+ PUSHBUTTON "3",SCAN_CODE_4,63,22,15,15
+ PUSHBUTTON "4",SCAN_CODE_5,83,22,15,15
+ PUSHBUTTON "5",SCAN_CODE_6,103,22,15,15
+ PUSHBUTTON "6",SCAN_CODE_7,123,22,15,15
+ PUSHBUTTON "7",SCAN_CODE_8,143,22,15,15
+ PUSHBUTTON "8",SCAN_CODE_9,163,22,15,15
+ PUSHBUTTON "9",SCAN_CODE_10,183,22,15,15
+ PUSHBUTTON "0",SCAN_CODE_11,203,22,15,15
+ PUSHBUTTON "-",SCAN_CODE_12,223,22,15,15
+ PUSHBUTTON "=",SCAN_CODE_13,243,22,15,15
+ PUSHBUTTON "<--",SCAN_CODE_15,263,22,36,15,BS_ICON
+ PUSHBUTTON "Tab",SCAN_CODE_16,3,41,35,15,BS_ICON
+ PUSHBUTTON "q",SCAN_CODE_17,42,41,15,15
+ PUSHBUTTON "w",SCAN_CODE_18,61,41,15,15
+ PUSHBUTTON "e",SCAN_CODE_19,80,41,15,15
+ PUSHBUTTON "r",SCAN_CODE_20,99,41,15,15
+ PUSHBUTTON "t",SCAN_CODE_21,118,41,15,15
+ PUSHBUTTON "y",SCAN_CODE_22,137,41,15,15
+ PUSHBUTTON "u",SCAN_CODE_23,156,41,15,15
+ PUSHBUTTON "i",SCAN_CODE_24,175,41,15,15
+ PUSHBUTTON "o",SCAN_CODE_25,194,41,15,15
+ PUSHBUTTON "p",SCAN_CODE_26,213,41,15,15
+ PUSHBUTTON "[",SCAN_CODE_27,232,41,15,15
+ PUSHBUTTON "]",SCAN_CODE_28,251,41,15,15
+ PUSHBUTTON "lock",SCAN_CODE_30,3,60,46,15,BS_ICON
+ PUSHBUTTON "a",SCAN_CODE_31,53,60,15,15
+ PUSHBUTTON "s",SCAN_CODE_32,72,60,15,15
+ PUSHBUTTON "d",SCAN_CODE_33,91,60,15,15
+ PUSHBUTTON "f",SCAN_CODE_34,110,60,15,15
+ PUSHBUTTON "g",SCAN_CODE_35,129,60,15,15
+ PUSHBUTTON "h",SCAN_CODE_36,148,60,15,15
+ PUSHBUTTON "j",SCAN_CODE_37,167,60,15,15
+ PUSHBUTTON "k",SCAN_CODE_38,186,60,15,15
+ PUSHBUTTON "l",SCAN_CODE_39,205,60,15,15
+ PUSHBUTTON ";",SCAN_CODE_40,224,60,15,15
+ PUSHBUTTON "'",SCAN_CODE_41,243,60,15,15
+ PUSHBUTTON "\\",SCAN_CODE_29,270,41,30,15
+ PUSHBUTTON "ret",SCAN_CODE_43,262,60,38,15,BS_ICON
+ PUSHBUTTON
"shift",SCAN_CODE_44,3,79,57,15,BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX
+ PUSHBUTTON "z",SCAN_CODE_46,64,79,15,15
+ PUSHBUTTON "x",SCAN_CODE_47,83,79,15,15
+ PUSHBUTTON "c",SCAN_CODE_48,102,79,15,15
+ PUSHBUTTON "v",SCAN_CODE_49,121,79,15,15
+ PUSHBUTTON "b",SCAN_CODE_50,140,79,15,15
+ PUSHBUTTON "n",SCAN_CODE_51,159,79,15,15
+ PUSHBUTTON "m",SCAN_CODE_52,178,79,15,15
+ PUSHBUTTON ",",SCAN_CODE_53,197,79,15,15
+ PUSHBUTTON ".",SCAN_CODE_54,216,79,15,15
+ PUSHBUTTON "/",SCAN_CODE_55,235,79,15,15
+ PUSHBUTTON
"shift",SCAN_CODE_57,254,79,45,15,BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX
+ PUSHBUTTON "ctrl",SCAN_CODE_58,3,98,24,15,BS_PUSHLIKE|BS_AUTOCHECKBOX
+ PUSHBUTTON "v",SCAN_CODE_84,324,98,15,15,BS_ICON
+ PUSHBUTTON "ROS",SCAN_CODE_127,30,98,24,15,BS_ICON
+ PUSHBUTTON "alt",SCAN_CODE_60,57,98,24,15,BS_PUSHLIKE|BS_AUTOCHECKBOX
+ PUSHBUTTON "",SCAN_CODE_61,84,98,106,15 //space
+ PUSHBUTTON
"alt",SCAN_CODE_62,194,98,24,15,BS_PUSHLIKE|BS_AUTOCHECKBOX
+ PUSHBUTTON "ROS",SCAN_CODE_128,221,98,24,15,BS_ICON
+ PUSHBUTTON "menu",SCAN_CODE_129,248,98,24,15,BS_ICON
+ PUSHBUTTON
"ctrl",SCAN_CODE_64,275,98,24,15,BS_PUSHLIKE|BS_AUTOCHECKBOX
+ PUSHBUTTON "ins",SCAN_CODE_75,304,22,15,15
+ PUSHBUTTON "del",SCAN_CODE_76,304,41,15,15
+ PUSHBUTTON "hm",SCAN_CODE_80,324,22,15,15
+ PUSHBUTTON "end",SCAN_CODE_81,324,41,15,15
+ PUSHBUTTON "pup",SCAN_CODE_85,344,22,15,15
+ PUSHBUTTON "pdn",SCAN_CODE_86,344,41,15,15
+ PUSHBUTTON "<-",SCAN_CODE_79,304,98,15,15,BS_ICON
+ PUSHBUTTON "^",SCAN_CODE_83,324,79,15,15,BS_ICON
+ PUSHBUTTON "->",SCAN_CODE_89,344,98,15,15,BS_ICON
+ PUSHBUTTON "nlk",SCAN_CODE_90,364,22,15,15
+ PUSHBUTTON "7",SCAN_CODE_91,364,41,15,15
+ PUSHBUTTON "4",SCAN_CODE_92,364,60,15,15
+ PUSHBUTTON "1",SCAN_CODE_93,364,79,15,15
+ PUSHBUTTON "/",SCAN_CODE_95,384,22,15,15
+ PUSHBUTTON "8",SCAN_CODE_96,384,41,15,15
+ PUSHBUTTON "5",SCAN_CODE_97,384,60,15,15
+ PUSHBUTTON "2",SCAN_CODE_98,384,79,15,15
+ PUSHBUTTON "0",SCAN_CODE_99,364,98,34,15
+ PUSHBUTTON "*",SCAN_CODE_100,404,22,15,15
+ PUSHBUTTON "9",SCAN_CODE_101,404,41,15,15
+ PUSHBUTTON "6",SCAN_CODE_102,404,60,15,15
+ PUSHBUTTON "3",SCAN_CODE_103,404,79,15,15
+ PUSHBUTTON ".",SCAN_CODE_104,404,98,15,15
+ PUSHBUTTON "-",SCAN_CODE_105,424,22,15,15
+ PUSHBUTTON "+",SCAN_CODE_106,424,41,15,35
+ PUSHBUTTON "ent",SCAN_CODE_108,424,78,15,35
+ CTEXT "Num",IDC_STATIC,364,3,21,8
+ CONTROL
"",IDC_LED_NUM,"Static",SS_CENTER|SS_NOTIFY,372,15,4,3
+ CTEXT "Caps",IDC_STATIC,389,3,21,8
+ CONTROL
"",IDC_LED_CAPS,"Static",SS_CENTER|SS_NOTIFY,398,15,4,3
+ CTEXT "Scroll",IDC_STATIC,414,3,21,8
+ CONTROL
"",IDC_LED_SCROLL,"Static",SS_CENTER|SS_NOTIFY,424,15,4,3
+END
+
IDR_OSK_MENU MENU DISCARDABLE
BEGIN
POPUP "File"
@@ -137,8 +256,8 @@ BEGIN
POPUP "Keyboard"
BEGIN
- MENUITEM "Enhanced Keyboard", IDM_ENCHANCED_KB, CHECKED, GRAYED
- MENUITEM "Standard Keyboard", IDM_STANDARD_KB, GRAYED
+ MENUITEM "Enhanced Keyboard", IDM_ENHANCED_KB, CHECKED
+ MENUITEM "Standard Keyboard", IDM_STANDARD_KB
MENUITEM SEPARATOR
MENUITEM "Regular Layout", IDM_REG_LAYOUT, CHECKED, GRAYED
MENUITEM "Block Layout", IDM_BLOCK_LAYOUT, GRAYED
diff --git a/base/applications/osk/lang/en-GB.rc b/base/applications/osk/lang/en-GB.rc
index fa849f3ff3..11f91b9b2f 100644
--- a/base/applications/osk/lang/en-GB.rc
+++ b/base/applications/osk/lang/en-GB.rc
@@ -8,7 +8,7 @@
LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_UK
-MAIN_DIALOG DIALOGEX DISCARDABLE 0, 0, 608, 164
+MAIN_DIALOG_ENHANCED_KB DIALOGEX DISCARDABLE 0, 0, 608, 164
CAPTION "On screen keyboard"
FONT 8, "MS Shell Dlg"
MENU IDR_OSK_MENU
@@ -128,6 +128,125 @@ BEGIN
CONTROL
"",IDC_LED_SCROLL,"Static",SS_CENTER|SS_NOTIFY,580,16,4,3
END
+MAIN_DIALOG_STANDARD_KB DIALOGEX DISCARDABLE 0, 0, 362, 115
+CAPTION "On screen keyboard"
+FONT 8, "MS Shell Dlg"
+MENU IDR_OSK_MENU
+STYLE WS_SYSMENU | WS_MINIMIZEBOX
+EXSTYLE WS_EX_TOPMOST | WS_EX_NOACTIVATE | WS_EX_APPWINDOW
+BEGIN
+ PUSHBUTTON "Esc",SCAN_CODE_110,3,3,15,15
+ PUSHBUTTON "F1",SCAN_CODE_112,43,3,15,15
+ PUSHBUTTON "F2",SCAN_CODE_113,63,3,15,15
+ PUSHBUTTON "F3",SCAN_CODE_114,83,3,15,15
+ PUSHBUTTON "F4",SCAN_CODE_115,103,3,15,15
+ PUSHBUTTON "F5",SCAN_CODE_116,123,3,15,15
+ PUSHBUTTON "F6",SCAN_CODE_117,143,3,15,15
+ PUSHBUTTON "F7",SCAN_CODE_118,183,3,15,15
+ PUSHBUTTON "F8",SCAN_CODE_119,203,3,15,15
+ PUSHBUTTON "F9",SCAN_CODE_120,223,3,15,15
+ PUSHBUTTON "F10",SCAN_CODE_121,243,3,15,15
+ PUSHBUTTON "F11",SCAN_CODE_122,263,3,15,15
+ PUSHBUTTON "F12",SCAN_CODE_123,283,3,15,15
+ PUSHBUTTON "Prn",SCAN_CODE_124,304,3,15,15
+ PUSHBUTTON "Stop",SCAN_CODE_125,324,3,15,15
+ PUSHBUTTON "Attn",SCAN_CODE_126,344,3,15,15
+ PUSHBUTTON "`",SCAN_CODE_1,3,22,15,15
+ PUSHBUTTON "1",SCAN_CODE_2,23,22,15,15
+ PUSHBUTTON "2",SCAN_CODE_3,43,22,15,15
+ PUSHBUTTON "3",SCAN_CODE_4,63,22,15,15
+ PUSHBUTTON "4",SCAN_CODE_5,83,22,15,15
+ PUSHBUTTON "5",SCAN_CODE_6,103,22,15,15
+ PUSHBUTTON "6",SCAN_CODE_7,123,22,15,15
+ PUSHBUTTON "7",SCAN_CODE_8,143,22,15,15
+ PUSHBUTTON "8",SCAN_CODE_9,163,22,15,15
+ PUSHBUTTON "9",SCAN_CODE_10,183,22,15,15
+ PUSHBUTTON "0",SCAN_CODE_11,203,22,15,15
+ PUSHBUTTON "-",SCAN_CODE_12,223,22,15,15
+ PUSHBUTTON "=",SCAN_CODE_13,243,22,15,15
+ PUSHBUTTON "<--",SCAN_CODE_15,263,22,36,15,BS_ICON
+ PUSHBUTTON "Tab",SCAN_CODE_16,3,41,35,15,BS_ICON
+ PUSHBUTTON "q",SCAN_CODE_17,42,41,15,15
+ PUSHBUTTON "w",SCAN_CODE_18,61,41,15,15
+ PUSHBUTTON "e",SCAN_CODE_19,80,41,15,15
+ PUSHBUTTON "r",SCAN_CODE_20,99,41,15,15
+ PUSHBUTTON "t",SCAN_CODE_21,118,41,15,15
+ PUSHBUTTON "y",SCAN_CODE_22,137,41,15,15
+ PUSHBUTTON "u",SCAN_CODE_23,156,41,15,15
+ PUSHBUTTON "i",SCAN_CODE_24,175,41,15,15
+ PUSHBUTTON "o",SCAN_CODE_25,194,41,15,15
+ PUSHBUTTON "p",SCAN_CODE_26,213,41,15,15
+ PUSHBUTTON "[",SCAN_CODE_27,232,41,15,15
+ PUSHBUTTON "]",SCAN_CODE_28,251,41,15,15
+ PUSHBUTTON "lock",SCAN_CODE_30,3,60,46,15,BS_ICON
+ PUSHBUTTON "a",SCAN_CODE_31,53,60,15,15
+ PUSHBUTTON "s",SCAN_CODE_32,72,60,15,15
+ PUSHBUTTON "d",SCAN_CODE_33,91,60,15,15
+ PUSHBUTTON "f",SCAN_CODE_34,110,60,15,15
+ PUSHBUTTON "g",SCAN_CODE_35,129,60,15,15
+ PUSHBUTTON "h",SCAN_CODE_36,148,60,15,15
+ PUSHBUTTON "j",SCAN_CODE_37,167,60,15,15
+ PUSHBUTTON "k",SCAN_CODE_38,186,60,15,15
+ PUSHBUTTON "l",SCAN_CODE_39,205,60,15,15
+ PUSHBUTTON ";",SCAN_CODE_40,224,60,15,15
+ PUSHBUTTON "'",SCAN_CODE_41,243,60,15,15
+ PUSHBUTTON "\\",SCAN_CODE_29,270,41,30,15
+ PUSHBUTTON "ret",SCAN_CODE_43,262,60,38,15,BS_ICON
+ PUSHBUTTON
"shift",SCAN_CODE_44,3,79,57,15,BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX
+ PUSHBUTTON "z",SCAN_CODE_46,64,79,15,15
+ PUSHBUTTON "x",SCAN_CODE_47,83,79,15,15
+ PUSHBUTTON "c",SCAN_CODE_48,102,79,15,15
+ PUSHBUTTON "v",SCAN_CODE_49,121,79,15,15
+ PUSHBUTTON "b",SCAN_CODE_50,140,79,15,15
+ PUSHBUTTON "n",SCAN_CODE_51,159,79,15,15
+ PUSHBUTTON "m",SCAN_CODE_52,178,79,15,15
+ PUSHBUTTON ",",SCAN_CODE_53,197,79,15,15
+ PUSHBUTTON ".",SCAN_CODE_54,216,79,15,15
+ PUSHBUTTON "/",SCAN_CODE_55,235,79,15,15
+ PUSHBUTTON
"shift",SCAN_CODE_57,254,79,45,15,BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX
+ PUSHBUTTON "ctrl",SCAN_CODE_58,3,98,24,15,BS_PUSHLIKE|BS_AUTOCHECKBOX
+ PUSHBUTTON "v",SCAN_CODE_84,324,98,15,15,BS_ICON
+ PUSHBUTTON "ROS",SCAN_CODE_127,30,98,24,15,BS_ICON
+ PUSHBUTTON "alt",SCAN_CODE_60,57,98,24,15,BS_PUSHLIKE|BS_AUTOCHECKBOX
+ PUSHBUTTON "",SCAN_CODE_61,84,98,106,15 //space
+ PUSHBUTTON
"alt",SCAN_CODE_62,194,98,24,15,BS_PUSHLIKE|BS_AUTOCHECKBOX
+ PUSHBUTTON "ROS",SCAN_CODE_128,221,98,24,15,BS_ICON
+ PUSHBUTTON "menu",SCAN_CODE_129,248,98,24,15,BS_ICON
+ PUSHBUTTON
"ctrl",SCAN_CODE_64,275,98,24,15,BS_PUSHLIKE|BS_AUTOCHECKBOX
+ PUSHBUTTON "ins",SCAN_CODE_75,304,22,15,15
+ PUSHBUTTON "del",SCAN_CODE_76,304,41,15,15
+ PUSHBUTTON "hm",SCAN_CODE_80,324,22,15,15
+ PUSHBUTTON "end",SCAN_CODE_81,324,41,15,15
+ PUSHBUTTON "pup",SCAN_CODE_85,344,22,15,15
+ PUSHBUTTON "pdn",SCAN_CODE_86,344,41,15,15
+ PUSHBUTTON "<-",SCAN_CODE_79,304,98,15,15,BS_ICON
+ PUSHBUTTON "^",SCAN_CODE_83,324,79,15,15,BS_ICON
+ PUSHBUTTON "->",SCAN_CODE_89,344,98,15,15,BS_ICON
+ PUSHBUTTON "nlk",SCAN_CODE_90,364,22,15,15
+ PUSHBUTTON "7",SCAN_CODE_91,364,41,15,15
+ PUSHBUTTON "4",SCAN_CODE_92,364,60,15,15
+ PUSHBUTTON "1",SCAN_CODE_93,364,79,15,15
+ PUSHBUTTON "/",SCAN_CODE_95,384,22,15,15
+ PUSHBUTTON "8",SCAN_CODE_96,384,41,15,15
+ PUSHBUTTON "5",SCAN_CODE_97,384,60,15,15
+ PUSHBUTTON "2",SCAN_CODE_98,384,79,15,15
+ PUSHBUTTON "0",SCAN_CODE_99,364,98,34,15
+ PUSHBUTTON "*",SCAN_CODE_100,404,22,15,15
+ PUSHBUTTON "9",SCAN_CODE_101,404,41,15,15
+ PUSHBUTTON "6",SCAN_CODE_102,404,60,15,15
+ PUSHBUTTON "3",SCAN_CODE_103,404,79,15,15
+ PUSHBUTTON ".",SCAN_CODE_104,404,98,15,15
+ PUSHBUTTON "-",SCAN_CODE_105,424,22,15,15
+ PUSHBUTTON "+",SCAN_CODE_106,424,41,15,35
+ PUSHBUTTON "ent",SCAN_CODE_108,424,78,15,35
+ CTEXT "Num",IDC_STATIC,364,3,21,8
+ CONTROL
"",IDC_LED_NUM,"Static",SS_CENTER|SS_NOTIFY,372,15,4,3
+ CTEXT "Caps",IDC_STATIC,389,3,21,8
+ CONTROL
"",IDC_LED_CAPS,"Static",SS_CENTER|SS_NOTIFY,398,15,4,3
+ CTEXT "Scroll",IDC_STATIC,414,3,21,8
+ CONTROL
"",IDC_LED_SCROLL,"Static",SS_CENTER|SS_NOTIFY,424,15,4,3
+END
+
IDR_OSK_MENU MENU DISCARDABLE
BEGIN
POPUP "File"
@@ -137,8 +256,8 @@ BEGIN
POPUP "Keyboard"
BEGIN
- MENUITEM "Enhanced Keyboard", IDM_ENCHANCED_KB, CHECKED, GRAYED
- MENUITEM "Standard Keyboard", IDM_STANDARD_KB, GRAYED
+ MENUITEM "Enhanced Keyboard", IDM_ENHANCED_KB, CHECKED
+ MENUITEM "Standard Keyboard", IDM_STANDARD_KB
MENUITEM SEPARATOR
MENUITEM "Regular Layout", IDM_REG_LAYOUT, CHECKED, GRAYED
MENUITEM "Block Layout", IDM_BLOCK_LAYOUT, GRAYED
diff --git a/base/applications/osk/lang/en-US.rc b/base/applications/osk/lang/en-US.rc
index 644e32cdf0..cabdadbc6a 100644
--- a/base/applications/osk/lang/en-US.rc
+++ b/base/applications/osk/lang/en-US.rc
@@ -8,7 +8,7 @@
LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
-MAIN_DIALOG DIALOGEX DISCARDABLE 0, 0, 463, 115
+MAIN_DIALOG_ENHANCED_KB DIALOGEX DISCARDABLE 0, 0, 463, 115
CAPTION "On screen keyboard"
FONT 8, "MS Shell Dlg"
MENU IDR_OSK_MENU
@@ -127,6 +127,125 @@ BEGIN
CONTROL
"",IDC_LED_SCROLL,"Static",SS_CENTER|SS_NOTIFY,443,15,4,3
END
+MAIN_DIALOG_STANDARD_KB DIALOGEX DISCARDABLE 0, 0, 362, 115
+CAPTION "On screen keyboard"
+FONT 8, "MS Shell Dlg"
+MENU IDR_OSK_MENU
+STYLE WS_SYSMENU | WS_MINIMIZEBOX
+EXSTYLE WS_EX_TOPMOST | WS_EX_NOACTIVATE | WS_EX_APPWINDOW
+BEGIN
+ PUSHBUTTON "Esc",SCAN_CODE_110,3,3,15,15
+ PUSHBUTTON "F1",SCAN_CODE_112,43,3,15,15
+ PUSHBUTTON "F2",SCAN_CODE_113,63,3,15,15
+ PUSHBUTTON "F3",SCAN_CODE_114,83,3,15,15
+ PUSHBUTTON "F4",SCAN_CODE_115,103,3,15,15
+ PUSHBUTTON "F5",SCAN_CODE_116,123,3,15,15
+ PUSHBUTTON "F6",SCAN_CODE_117,143,3,15,15
+ PUSHBUTTON "F7",SCAN_CODE_118,183,3,15,15
+ PUSHBUTTON "F8",SCAN_CODE_119,203,3,15,15
+ PUSHBUTTON "F9",SCAN_CODE_120,223,3,15,15
+ PUSHBUTTON "F10",SCAN_CODE_121,243,3,15,15
+ PUSHBUTTON "F11",SCAN_CODE_122,263,3,15,15
+ PUSHBUTTON "F12",SCAN_CODE_123,283,3,15,15
+ PUSHBUTTON "Prn",SCAN_CODE_124,304,3,15,15
+ PUSHBUTTON "Stop",SCAN_CODE_125,324,3,15,15
+ PUSHBUTTON "Attn",SCAN_CODE_126,344,3,15,15
+ PUSHBUTTON "`",SCAN_CODE_1,3,22,15,15
+ PUSHBUTTON "1",SCAN_CODE_2,23,22,15,15
+ PUSHBUTTON "2",SCAN_CODE_3,43,22,15,15
+ PUSHBUTTON "3",SCAN_CODE_4,63,22,15,15
+ PUSHBUTTON "4",SCAN_CODE_5,83,22,15,15
+ PUSHBUTTON "5",SCAN_CODE_6,103,22,15,15
+ PUSHBUTTON "6",SCAN_CODE_7,123,22,15,15
+ PUSHBUTTON "7",SCAN_CODE_8,143,22,15,15
+ PUSHBUTTON "8",SCAN_CODE_9,163,22,15,15
+ PUSHBUTTON "9",SCAN_CODE_10,183,22,15,15
+ PUSHBUTTON "0",SCAN_CODE_11,203,22,15,15
+ PUSHBUTTON "-",SCAN_CODE_12,223,22,15,15
+ PUSHBUTTON "=",SCAN_CODE_13,243,22,15,15
+ PUSHBUTTON "<--",SCAN_CODE_15,263,22,36,15,BS_ICON
+ PUSHBUTTON "Tab",SCAN_CODE_16,3,41,35,15,BS_ICON
+ PUSHBUTTON "q",SCAN_CODE_17,42,41,15,15
+ PUSHBUTTON "w",SCAN_CODE_18,61,41,15,15
+ PUSHBUTTON "e",SCAN_CODE_19,80,41,15,15
+ PUSHBUTTON "r",SCAN_CODE_20,99,41,15,15
+ PUSHBUTTON "t",SCAN_CODE_21,118,41,15,15
+ PUSHBUTTON "y",SCAN_CODE_22,137,41,15,15
+ PUSHBUTTON "u",SCAN_CODE_23,156,41,15,15
+ PUSHBUTTON "i",SCAN_CODE_24,175,41,15,15
+ PUSHBUTTON "o",SCAN_CODE_25,194,41,15,15
+ PUSHBUTTON "p",SCAN_CODE_26,213,41,15,15
+ PUSHBUTTON "[",SCAN_CODE_27,232,41,15,15
+ PUSHBUTTON "]",SCAN_CODE_28,251,41,15,15
+ PUSHBUTTON "lock",SCAN_CODE_30,3,60,46,15,BS_ICON
+ PUSHBUTTON "a",SCAN_CODE_31,53,60,15,15
+ PUSHBUTTON "s",SCAN_CODE_32,72,60,15,15
+ PUSHBUTTON "d",SCAN_CODE_33,91,60,15,15
+ PUSHBUTTON "f",SCAN_CODE_34,110,60,15,15
+ PUSHBUTTON "g",SCAN_CODE_35,129,60,15,15
+ PUSHBUTTON "h",SCAN_CODE_36,148,60,15,15
+ PUSHBUTTON "j",SCAN_CODE_37,167,60,15,15
+ PUSHBUTTON "k",SCAN_CODE_38,186,60,15,15
+ PUSHBUTTON "l",SCAN_CODE_39,205,60,15,15
+ PUSHBUTTON ";",SCAN_CODE_40,224,60,15,15
+ PUSHBUTTON "'",SCAN_CODE_41,243,60,15,15
+ PUSHBUTTON "\\",SCAN_CODE_29,270,41,30,15
+ PUSHBUTTON "ret",SCAN_CODE_43,262,60,38,15,BS_ICON
+ PUSHBUTTON
"shift",SCAN_CODE_44,3,79,57,15,BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX
+ PUSHBUTTON "z",SCAN_CODE_46,64,79,15,15
+ PUSHBUTTON "x",SCAN_CODE_47,83,79,15,15
+ PUSHBUTTON "c",SCAN_CODE_48,102,79,15,15
+ PUSHBUTTON "v",SCAN_CODE_49,121,79,15,15
+ PUSHBUTTON "b",SCAN_CODE_50,140,79,15,15
+ PUSHBUTTON "n",SCAN_CODE_51,159,79,15,15
+ PUSHBUTTON "m",SCAN_CODE_52,178,79,15,15
+ PUSHBUTTON ",",SCAN_CODE_53,197,79,15,15
+ PUSHBUTTON ".",SCAN_CODE_54,216,79,15,15
+ PUSHBUTTON "/",SCAN_CODE_55,235,79,15,15
+ PUSHBUTTON
"shift",SCAN_CODE_57,254,79,45,15,BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX
+ PUSHBUTTON "ctrl",SCAN_CODE_58,3,98,24,15,BS_PUSHLIKE|BS_AUTOCHECKBOX
+ PUSHBUTTON "v",SCAN_CODE_84,324,98,15,15,BS_ICON
+ PUSHBUTTON "ROS",SCAN_CODE_127,30,98,24,15,BS_ICON
+ PUSHBUTTON "alt",SCAN_CODE_60,57,98,24,15,BS_PUSHLIKE|BS_AUTOCHECKBOX
+ PUSHBUTTON "",SCAN_CODE_61,84,98,106,15 //space
+ PUSHBUTTON
"alt",SCAN_CODE_62,194,98,24,15,BS_PUSHLIKE|BS_AUTOCHECKBOX
+ PUSHBUTTON "ROS",SCAN_CODE_128,221,98,24,15,BS_ICON
+ PUSHBUTTON "menu",SCAN_CODE_129,248,98,24,15,BS_ICON
+ PUSHBUTTON
"ctrl",SCAN_CODE_64,275,98,24,15,BS_PUSHLIKE|BS_AUTOCHECKBOX
+ PUSHBUTTON "ins",SCAN_CODE_75,304,22,15,15
+ PUSHBUTTON "del",SCAN_CODE_76,304,41,15,15
+ PUSHBUTTON "hm",SCAN_CODE_80,324,22,15,15
+ PUSHBUTTON "end",SCAN_CODE_81,324,41,15,15
+ PUSHBUTTON "pup",SCAN_CODE_85,344,22,15,15
+ PUSHBUTTON "pdn",SCAN_CODE_86,344,41,15,15
+ PUSHBUTTON "<-",SCAN_CODE_79,304,98,15,15,BS_ICON
+ PUSHBUTTON "^",SCAN_CODE_83,324,79,15,15,BS_ICON
+ PUSHBUTTON "->",SCAN_CODE_89,344,98,15,15,BS_ICON
+ PUSHBUTTON "nlk",SCAN_CODE_90,364,22,15,15
+ PUSHBUTTON "7",SCAN_CODE_91,364,41,15,15
+ PUSHBUTTON "4",SCAN_CODE_92,364,60,15,15
+ PUSHBUTTON "1",SCAN_CODE_93,364,79,15,15
+ PUSHBUTTON "/",SCAN_CODE_95,384,22,15,15
+ PUSHBUTTON "8",SCAN_CODE_96,384,41,15,15
+ PUSHBUTTON "5",SCAN_CODE_97,384,60,15,15
+ PUSHBUTTON "2",SCAN_CODE_98,384,79,15,15
+ PUSHBUTTON "0",SCAN_CODE_99,364,98,34,15
+ PUSHBUTTON "*",SCAN_CODE_100,404,22,15,15
+ PUSHBUTTON "9",SCAN_CODE_101,404,41,15,15
+ PUSHBUTTON "6",SCAN_CODE_102,404,60,15,15
+ PUSHBUTTON "3",SCAN_CODE_103,404,79,15,15
+ PUSHBUTTON ".",SCAN_CODE_104,404,98,15,15
+ PUSHBUTTON "-",SCAN_CODE_105,424,22,15,15
+ PUSHBUTTON "+",SCAN_CODE_106,424,41,15,35
+ PUSHBUTTON "ent",SCAN_CODE_108,424,78,15,35
+ CTEXT "Num",IDC_STATIC,364,3,21,8
+ CONTROL
"",IDC_LED_NUM,"Static",SS_CENTER|SS_NOTIFY,372,15,4,3
+ CTEXT "Caps",IDC_STATIC,389,3,21,8
+ CONTROL
"",IDC_LED_CAPS,"Static",SS_CENTER|SS_NOTIFY,398,15,4,3
+ CTEXT "Scroll",IDC_STATIC,414,3,21,8
+ CONTROL
"",IDC_LED_SCROLL,"Static",SS_CENTER|SS_NOTIFY,424,15,4,3
+END
+
IDR_OSK_MENU MENU DISCARDABLE
BEGIN
POPUP "File"
@@ -136,8 +255,8 @@ BEGIN
POPUP "Keyboard"
BEGIN
- MENUITEM "Enhanced Keyboard", IDM_ENCHANCED_KB, CHECKED, GRAYED
- MENUITEM "Standard Keyboard", IDM_STANDARD_KB, GRAYED
+ MENUITEM "Enhanced Keyboard", IDM_ENHANCED_KB, CHECKED
+ MENUITEM "Standard Keyboard", IDM_STANDARD_KB
MENUITEM SEPARATOR
MENUITEM "Regular Layout", IDM_REG_LAYOUT, CHECKED, GRAYED
MENUITEM "Block Layout", IDM_BLOCK_LAYOUT, GRAYED
diff --git a/base/applications/osk/lang/es-ES.rc b/base/applications/osk/lang/es-ES.rc
index 41d8a188c2..4fc2284830 100644
--- a/base/applications/osk/lang/es-ES.rc
+++ b/base/applications/osk/lang/es-ES.rc
@@ -9,7 +9,7 @@
LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL
-MAIN_DIALOG DIALOGEX DISCARDABLE 0, 0, 608, 164
+MAIN_DIALOG_ENHANCED_KB DIALOGEX DISCARDABLE 0, 0, 608, 164
CAPTION "Teclado en pantalla"
FONT 8, "MS Shell Dlg"
MENU IDR_OSK_MENU
@@ -129,6 +129,125 @@ BEGIN
CONTROL
"",IDC_LED_SCROLL,"Static",SS_CENTER|SS_NOTIFY,580,16,4,3
END
+MAIN_DIALOG_STANDARD_KB DIALOGEX DISCARDABLE 0, 0, 362, 115
+CAPTION "On screen keyboard"
+FONT 8, "MS Shell Dlg"
+MENU IDR_OSK_MENU
+STYLE WS_SYSMENU | WS_MINIMIZEBOX
+EXSTYLE WS_EX_TOPMOST | WS_EX_NOACTIVATE | WS_EX_APPWINDOW
+BEGIN
+ PUSHBUTTON "Esc",SCAN_CODE_110,3,3,15,15
+ PUSHBUTTON "F1",SCAN_CODE_112,43,3,15,15
+ PUSHBUTTON "F2",SCAN_CODE_113,63,3,15,15
+ PUSHBUTTON "F3",SCAN_CODE_114,83,3,15,15
+ PUSHBUTTON "F4",SCAN_CODE_115,103,3,15,15
+ PUSHBUTTON "F5",SCAN_CODE_116,123,3,15,15
+ PUSHBUTTON "F6",SCAN_CODE_117,143,3,15,15
+ PUSHBUTTON "F7",SCAN_CODE_118,183,3,15,15
+ PUSHBUTTON "F8",SCAN_CODE_119,203,3,15,15
+ PUSHBUTTON "F9",SCAN_CODE_120,223,3,15,15
+ PUSHBUTTON "F10",SCAN_CODE_121,243,3,15,15
+ PUSHBUTTON "F11",SCAN_CODE_122,263,3,15,15
+ PUSHBUTTON "F12",SCAN_CODE_123,283,3,15,15
+ PUSHBUTTON "Prn",SCAN_CODE_124,304,3,15,15
+ PUSHBUTTON "Stop",SCAN_CODE_125,324,3,15,15
+ PUSHBUTTON "Attn",SCAN_CODE_126,344,3,15,15
+ PUSHBUTTON "`",SCAN_CODE_1,3,22,15,15
+ PUSHBUTTON "1",SCAN_CODE_2,23,22,15,15
+ PUSHBUTTON "2",SCAN_CODE_3,43,22,15,15
+ PUSHBUTTON "3",SCAN_CODE_4,63,22,15,15
+ PUSHBUTTON "4",SCAN_CODE_5,83,22,15,15
+ PUSHBUTTON "5",SCAN_CODE_6,103,22,15,15
+ PUSHBUTTON "6",SCAN_CODE_7,123,22,15,15
+ PUSHBUTTON "7",SCAN_CODE_8,143,22,15,15
+ PUSHBUTTON "8",SCAN_CODE_9,163,22,15,15
+ PUSHBUTTON "9",SCAN_CODE_10,183,22,15,15
+ PUSHBUTTON "0",SCAN_CODE_11,203,22,15,15
+ PUSHBUTTON "-",SCAN_CODE_12,223,22,15,15
+ PUSHBUTTON "=",SCAN_CODE_13,243,22,15,15
+ PUSHBUTTON "<--",SCAN_CODE_15,263,22,36,15,BS_ICON
+ PUSHBUTTON "Tab",SCAN_CODE_16,3,41,35,15,BS_ICON
+ PUSHBUTTON "q",SCAN_CODE_17,42,41,15,15
+ PUSHBUTTON "w",SCAN_CODE_18,61,41,15,15
+ PUSHBUTTON "e",SCAN_CODE_19,80,41,15,15
+ PUSHBUTTON "r",SCAN_CODE_20,99,41,15,15
+ PUSHBUTTON "t",SCAN_CODE_21,118,41,15,15
+ PUSHBUTTON "y",SCAN_CODE_22,137,41,15,15
+ PUSHBUTTON "u",SCAN_CODE_23,156,41,15,15
+ PUSHBUTTON "i",SCAN_CODE_24,175,41,15,15
+ PUSHBUTTON "o",SCAN_CODE_25,194,41,15,15
+ PUSHBUTTON "p",SCAN_CODE_26,213,41,15,15
+ PUSHBUTTON "[",SCAN_CODE_27,232,41,15,15
+ PUSHBUTTON "]",SCAN_CODE_28,251,41,15,15
+ PUSHBUTTON "lock",SCAN_CODE_30,3,60,46,15,BS_ICON
+ PUSHBUTTON "a",SCAN_CODE_31,53,60,15,15
+ PUSHBUTTON "s",SCAN_CODE_32,72,60,15,15
+ PUSHBUTTON "d",SCAN_CODE_33,91,60,15,15
+ PUSHBUTTON "f",SCAN_CODE_34,110,60,15,15
+ PUSHBUTTON "g",SCAN_CODE_35,129,60,15,15
+ PUSHBUTTON "h",SCAN_CODE_36,148,60,15,15
+ PUSHBUTTON "j",SCAN_CODE_37,167,60,15,15
+ PUSHBUTTON "k",SCAN_CODE_38,186,60,15,15
+ PUSHBUTTON "l",SCAN_CODE_39,205,60,15,15
+ PUSHBUTTON ";",SCAN_CODE_40,224,60,15,15
+ PUSHBUTTON "'",SCAN_CODE_41,243,60,15,15
+ PUSHBUTTON "\\",SCAN_CODE_29,270,41,30,15
+ PUSHBUTTON "ret",SCAN_CODE_43,262,60,38,15,BS_ICON
+ PUSHBUTTON
"shift",SCAN_CODE_44,3,79,57,15,BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX
+ PUSHBUTTON "z",SCAN_CODE_46,64,79,15,15
+ PUSHBUTTON "x",SCAN_CODE_47,83,79,15,15
+ PUSHBUTTON "c",SCAN_CODE_48,102,79,15,15
+ PUSHBUTTON "v",SCAN_CODE_49,121,79,15,15
+ PUSHBUTTON "b",SCAN_CODE_50,140,79,15,15
+ PUSHBUTTON "n",SCAN_CODE_51,159,79,15,15
+ PUSHBUTTON "m",SCAN_CODE_52,178,79,15,15
+ PUSHBUTTON ",",SCAN_CODE_53,197,79,15,15
+ PUSHBUTTON ".",SCAN_CODE_54,216,79,15,15
+ PUSHBUTTON "/",SCAN_CODE_55,235,79,15,15
+ PUSHBUTTON
"shift",SCAN_CODE_57,254,79,45,15,BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX
+ PUSHBUTTON "ctrl",SCAN_CODE_58,3,98,24,15,BS_PUSHLIKE|BS_AUTOCHECKBOX
+ PUSHBUTTON "v",SCAN_CODE_84,324,98,15,15,BS_ICON
+ PUSHBUTTON "ROS",SCAN_CODE_127,30,98,24,15,BS_ICON
+ PUSHBUTTON "alt",SCAN_CODE_60,57,98,24,15,BS_PUSHLIKE|BS_AUTOCHECKBOX
+ PUSHBUTTON "",SCAN_CODE_61,84,98,106,15 //space
+ PUSHBUTTON
"alt",SCAN_CODE_62,194,98,24,15,BS_PUSHLIKE|BS_AUTOCHECKBOX
+ PUSHBUTTON "ROS",SCAN_CODE_128,221,98,24,15,BS_ICON
+ PUSHBUTTON "menu",SCAN_CODE_129,248,98,24,15,BS_ICON
+ PUSHBUTTON
"ctrl",SCAN_CODE_64,275,98,24,15,BS_PUSHLIKE|BS_AUTOCHECKBOX
+ PUSHBUTTON "ins",SCAN_CODE_75,304,22,15,15
+ PUSHBUTTON "del",SCAN_CODE_76,304,41,15,15
+ PUSHBUTTON "hm",SCAN_CODE_80,324,22,15,15
+ PUSHBUTTON "end",SCAN_CODE_81,324,41,15,15
+ PUSHBUTTON "pup",SCAN_CODE_85,344,22,15,15
+ PUSHBUTTON "pdn",SCAN_CODE_86,344,41,15,15
+ PUSHBUTTON "<-",SCAN_CODE_79,304,98,15,15,BS_ICON
+ PUSHBUTTON "^",SCAN_CODE_83,324,79,15,15,BS_ICON
+ PUSHBUTTON "->",SCAN_CODE_89,344,98,15,15,BS_ICON
+ PUSHBUTTON "nlk",SCAN_CODE_90,364,22,15,15
+ PUSHBUTTON "7",SCAN_CODE_91,364,41,15,15
+ PUSHBUTTON "4",SCAN_CODE_92,364,60,15,15
+ PUSHBUTTON "1",SCAN_CODE_93,364,79,15,15
+ PUSHBUTTON "/",SCAN_CODE_95,384,22,15,15
+ PUSHBUTTON "8",SCAN_CODE_96,384,41,15,15
+ PUSHBUTTON "5",SCAN_CODE_97,384,60,15,15
+ PUSHBUTTON "2",SCAN_CODE_98,384,79,15,15
+ PUSHBUTTON "0",SCAN_CODE_99,364,98,34,15
+ PUSHBUTTON "*",SCAN_CODE_100,404,22,15,15
+ PUSHBUTTON "9",SCAN_CODE_101,404,41,15,15
+ PUSHBUTTON "6",SCAN_CODE_102,404,60,15,15
+ PUSHBUTTON "3",SCAN_CODE_103,404,79,15,15
+ PUSHBUTTON ".",SCAN_CODE_104,404,98,15,15
+ PUSHBUTTON "-",SCAN_CODE_105,424,22,15,15
+ PUSHBUTTON "+",SCAN_CODE_106,424,41,15,35
+ PUSHBUTTON "ent",SCAN_CODE_108,424,78,15,35
+ CTEXT "Num",IDC_STATIC,364,3,21,8
+ CONTROL
"",IDC_LED_NUM,"Static",SS_CENTER|SS_NOTIFY,372,15,4,3
+ CTEXT "Caps",IDC_STATIC,389,3,21,8
+ CONTROL
"",IDC_LED_CAPS,"Static",SS_CENTER|SS_NOTIFY,398,15,4,3
+ CTEXT "Scroll",IDC_STATIC,414,3,21,8
+ CONTROL
"",IDC_LED_SCROLL,"Static",SS_CENTER|SS_NOTIFY,424,15,4,3
+END
+
IDR_OSK_MENU MENU DISCARDABLE
BEGIN
POPUP "File"
@@ -138,8 +257,8 @@ BEGIN
POPUP "Keyboard"
BEGIN
- MENUITEM "Enhanced Keyboard", IDM_ENCHANCED_KB, CHECKED, GRAYED
- MENUITEM "Standard Keyboard", IDM_STANDARD_KB, GRAYED
+ MENUITEM "Enhanced Keyboard", IDM_ENHANCED_KB, CHECKED
+ MENUITEM "Standard Keyboard", IDM_STANDARD_KB
MENUITEM SEPARATOR
MENUITEM "Regular Layout", IDM_REG_LAYOUT, CHECKED, GRAYED
MENUITEM "Block Layout", IDM_BLOCK_LAYOUT, GRAYED
diff --git a/base/applications/osk/lang/et-EE.rc b/base/applications/osk/lang/et-EE.rc
index 139ecd9b6b..4de3166e29 100644
--- a/base/applications/osk/lang/et-EE.rc
+++ b/base/applications/osk/lang/et-EE.rc
@@ -8,7 +8,7 @@
LANGUAGE LANG_ESTONIAN, SUBLANG_DEFAULT
-MAIN_DIALOG DIALOGEX DISCARDABLE 0, 0, 463, 115
+MAIN_DIALOG_ENHANCED_KB DIALOGEX DISCARDABLE 0, 0, 463, 115
CAPTION "Ekraaniklaviatuur"
FONT 8, "MS Shell Dlg"
MENU IDR_OSK_MENU
@@ -127,6 +127,125 @@ BEGIN
CONTROL
"",IDC_LED_SCROLL,"Static",SS_CENTER|SS_NOTIFY,443,15,4,3
END
+MAIN_DIALOG_STANDARD_KB DIALOGEX DISCARDABLE 0, 0, 362, 115
+CAPTION "On screen keyboard"
+FONT 8, "MS Shell Dlg"
+MENU IDR_OSK_MENU
+STYLE WS_SYSMENU | WS_MINIMIZEBOX
+EXSTYLE WS_EX_TOPMOST | WS_EX_NOACTIVATE | WS_EX_APPWINDOW
+BEGIN
+ PUSHBUTTON "Esc",SCAN_CODE_110,3,3,15,15
+ PUSHBUTTON "F1",SCAN_CODE_112,43,3,15,15
+ PUSHBUTTON "F2",SCAN_CODE_113,63,3,15,15
+ PUSHBUTTON "F3",SCAN_CODE_114,83,3,15,15
+ PUSHBUTTON "F4",SCAN_CODE_115,103,3,15,15
+ PUSHBUTTON "F5",SCAN_CODE_116,123,3,15,15
+ PUSHBUTTON "F6",SCAN_CODE_117,143,3,15,15
+ PUSHBUTTON "F7",SCAN_CODE_118,183,3,15,15
+ PUSHBUTTON "F8",SCAN_CODE_119,203,3,15,15
+ PUSHBUTTON "F9",SCAN_CODE_120,223,3,15,15
+ PUSHBUTTON "F10",SCAN_CODE_121,243,3,15,15
+ PUSHBUTTON "F11",SCAN_CODE_122,263,3,15,15
+ PUSHBUTTON "F12",SCAN_CODE_123,283,3,15,15
+ PUSHBUTTON "Prn",SCAN_CODE_124,304,3,15,15
+ PUSHBUTTON "Stop",SCAN_CODE_125,324,3,15,15
+ PUSHBUTTON "Attn",SCAN_CODE_126,344,3,15,15
+ PUSHBUTTON "`",SCAN_CODE_1,3,22,15,15
+ PUSHBUTTON "1",SCAN_CODE_2,23,22,15,15
+ PUSHBUTTON "2",SCAN_CODE_3,43,22,15,15
+ PUSHBUTTON "3",SCAN_CODE_4,63,22,15,15
+ PUSHBUTTON "4",SCAN_CODE_5,83,22,15,15
+ PUSHBUTTON "5",SCAN_CODE_6,103,22,15,15
+ PUSHBUTTON "6",SCAN_CODE_7,123,22,15,15
+ PUSHBUTTON "7",SCAN_CODE_8,143,22,15,15
+ PUSHBUTTON "8",SCAN_CODE_9,163,22,15,15
+ PUSHBUTTON "9",SCAN_CODE_10,183,22,15,15
+ PUSHBUTTON "0",SCAN_CODE_11,203,22,15,15
+ PUSHBUTTON "-",SCAN_CODE_12,223,22,15,15
+ PUSHBUTTON "=",SCAN_CODE_13,243,22,15,15
+ PUSHBUTTON "<--",SCAN_CODE_15,263,22,36,15,BS_ICON
+ PUSHBUTTON "Tab",SCAN_CODE_16,3,41,35,15,BS_ICON
+ PUSHBUTTON "q",SCAN_CODE_17,42,41,15,15
+ PUSHBUTTON "w",SCAN_CODE_18,61,41,15,15
+ PUSHBUTTON "e",SCAN_CODE_19,80,41,15,15
+ PUSHBUTTON "r",SCAN_CODE_20,99,41,15,15
+ PUSHBUTTON "t",SCAN_CODE_21,118,41,15,15
+ PUSHBUTTON "y",SCAN_CODE_22,137,41,15,15
+ PUSHBUTTON "u",SCAN_CODE_23,156,41,15,15
+ PUSHBUTTON "i",SCAN_CODE_24,175,41,15,15
+ PUSHBUTTON "o",SCAN_CODE_25,194,41,15,15
+ PUSHBUTTON "p",SCAN_CODE_26,213,41,15,15
+ PUSHBUTTON "[",SCAN_CODE_27,232,41,15,15
+ PUSHBUTTON "]",SCAN_CODE_28,251,41,15,15
+ PUSHBUTTON "lock",SCAN_CODE_30,3,60,46,15,BS_ICON
+ PUSHBUTTON "a",SCAN_CODE_31,53,60,15,15
+ PUSHBUTTON "s",SCAN_CODE_32,72,60,15,15
+ PUSHBUTTON "d",SCAN_CODE_33,91,60,15,15
+ PUSHBUTTON "f",SCAN_CODE_34,110,60,15,15
+ PUSHBUTTON "g",SCAN_CODE_35,129,60,15,15
+ PUSHBUTTON "h",SCAN_CODE_36,148,60,15,15
+ PUSHBUTTON "j",SCAN_CODE_37,167,60,15,15
+ PUSHBUTTON "k",SCAN_CODE_38,186,60,15,15
+ PUSHBUTTON "l",SCAN_CODE_39,205,60,15,15
+ PUSHBUTTON ";",SCAN_CODE_40,224,60,15,15
+ PUSHBUTTON "'",SCAN_CODE_41,243,60,15,15
+ PUSHBUTTON "\\",SCAN_CODE_29,270,41,30,15
+ PUSHBUTTON "ret",SCAN_CODE_43,262,60,38,15,BS_ICON
+ PUSHBUTTON
"shift",SCAN_CODE_44,3,79,57,15,BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX
+ PUSHBUTTON "z",SCAN_CODE_46,64,79,15,15
+ PUSHBUTTON "x",SCAN_CODE_47,83,79,15,15
+ PUSHBUTTON "c",SCAN_CODE_48,102,79,15,15
+ PUSHBUTTON "v",SCAN_CODE_49,121,79,15,15
+ PUSHBUTTON "b",SCAN_CODE_50,140,79,15,15
+ PUSHBUTTON "n",SCAN_CODE_51,159,79,15,15
+ PUSHBUTTON "m",SCAN_CODE_52,178,79,15,15
+ PUSHBUTTON ",",SCAN_CODE_53,197,79,15,15
+ PUSHBUTTON ".",SCAN_CODE_54,216,79,15,15
+ PUSHBUTTON "/",SCAN_CODE_55,235,79,15,15
+ PUSHBUTTON
"shift",SCAN_CODE_57,254,79,45,15,BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX
+ PUSHBUTTON "ctrl",SCAN_CODE_58,3,98,24,15,BS_PUSHLIKE|BS_AUTOCHECKBOX
+ PUSHBUTTON "v",SCAN_CODE_84,324,98,15,15,BS_ICON
+ PUSHBUTTON "ROS",SCAN_CODE_127,30,98,24,15,BS_ICON
+ PUSHBUTTON "alt",SCAN_CODE_60,57,98,24,15,BS_PUSHLIKE|BS_AUTOCHECKBOX
+ PUSHBUTTON "",SCAN_CODE_61,84,98,106,15 //space
+ PUSHBUTTON
"alt",SCAN_CODE_62,194,98,24,15,BS_PUSHLIKE|BS_AUTOCHECKBOX
+ PUSHBUTTON "ROS",SCAN_CODE_128,221,98,24,15,BS_ICON
+ PUSHBUTTON "menu",SCAN_CODE_129,248,98,24,15,BS_ICON
+ PUSHBUTTON
"ctrl",SCAN_CODE_64,275,98,24,15,BS_PUSHLIKE|BS_AUTOCHECKBOX
+ PUSHBUTTON "ins",SCAN_CODE_75,304,22,15,15
+ PUSHBUTTON "del",SCAN_CODE_76,304,41,15,15
+ PUSHBUTTON "hm",SCAN_CODE_80,324,22,15,15
+ PUSHBUTTON "end",SCAN_CODE_81,324,41,15,15
+ PUSHBUTTON "pup",SCAN_CODE_85,344,22,15,15
+ PUSHBUTTON "pdn",SCAN_CODE_86,344,41,15,15
+ PUSHBUTTON "<-",SCAN_CODE_79,304,98,15,15,BS_ICON
+ PUSHBUTTON "^",SCAN_CODE_83,324,79,15,15,BS_ICON
+ PUSHBUTTON "->",SCAN_CODE_89,344,98,15,15,BS_ICON
+ PUSHBUTTON "nlk",SCAN_CODE_90,364,22,15,15
+ PUSHBUTTON "7",SCAN_CODE_91,364,41,15,15
+ PUSHBUTTON "4",SCAN_CODE_92,364,60,15,15
+ PUSHBUTTON "1",SCAN_CODE_93,364,79,15,15
+ PUSHBUTTON "/",SCAN_CODE_95,384,22,15,15
+ PUSHBUTTON "8",SCAN_CODE_96,384,41,15,15
+ PUSHBUTTON "5",SCAN_CODE_97,384,60,15,15
+ PUSHBUTTON "2",SCAN_CODE_98,384,79,15,15
+ PUSHBUTTON "0",SCAN_CODE_99,364,98,34,15
+ PUSHBUTTON "*",SCAN_CODE_100,404,22,15,15
+ PUSHBUTTON "9",SCAN_CODE_101,404,41,15,15
+ PUSHBUTTON "6",SCAN_CODE_102,404,60,15,15
+ PUSHBUTTON "3",SCAN_CODE_103,404,79,15,15
+ PUSHBUTTON ".",SCAN_CODE_104,404,98,15,15
+ PUSHBUTTON "-",SCAN_CODE_105,424,22,15,15
+ PUSHBUTTON "+",SCAN_CODE_106,424,41,15,35
+ PUSHBUTTON "ent",SCAN_CODE_108,424,78,15,35
+ CTEXT "Num",IDC_STATIC,364,3,21,8
+ CONTROL
"",IDC_LED_NUM,"Static",SS_CENTER|SS_NOTIFY,372,15,4,3
+ CTEXT "Caps",IDC_STATIC,389,3,21,8
+ CONTROL
"",IDC_LED_CAPS,"Static",SS_CENTER|SS_NOTIFY,398,15,4,3
+ CTEXT "Scroll",IDC_STATIC,414,3,21,8
+ CONTROL
"",IDC_LED_SCROLL,"Static",SS_CENTER|SS_NOTIFY,424,15,4,3
+END
+
IDR_OSK_MENU MENU DISCARDABLE
BEGIN
POPUP "File"
@@ -136,8 +255,8 @@ BEGIN
POPUP "Keyboard"
BEGIN
- MENUITEM "Enhanced Keyboard", IDM_ENCHANCED_KB, CHECKED, GRAYED
- MENUITEM "Standard Keyboard", IDM_STANDARD_KB, GRAYED
+ MENUITEM "Enhanced Keyboard", IDM_ENHANCED_KB, CHECKED
+ MENUITEM "Standard Keyboard", IDM_STANDARD_KB
MENUITEM SEPARATOR
MENUITEM "Regular Layout", IDM_REG_LAYOUT, CHECKED, GRAYED
MENUITEM "Block Layout", IDM_BLOCK_LAYOUT, GRAYED
diff --git a/base/applications/osk/lang/fr-CA.rc b/base/applications/osk/lang/fr-CA.rc
index 429156c4f5..27c2cc78fb 100644
--- a/base/applications/osk/lang/fr-CA.rc
+++ b/base/applications/osk/lang/fr-CA.rc
@@ -8,7 +8,7 @@
LANGUAGE LANG_FRENCH, SUBLANG_FRENCH_CANADIAN
-MAIN_DIALOG DIALOGEX DISCARDABLE 0, 0, 608, 164
+MAIN_DIALOG_ENHANCED_KB DIALOGEX DISCARDABLE 0, 0, 608, 164
CAPTION "Clavier visuel"
FONT 8, "MS Shell Dlg"
MENU IDR_OSK_MENU
@@ -128,6 +128,125 @@ BEGIN
CONTROL
"",IDC_LED_SCROLL,"Static",SS_CENTER|SS_NOTIFY,580,16,4,3
END
+MAIN_DIALOG_STANDARD_KB DIALOGEX DISCARDABLE 0, 0, 362, 115
+CAPTION "On screen keyboard"
+FONT 8, "MS Shell Dlg"
+MENU IDR_OSK_MENU
+STYLE WS_SYSMENU | WS_MINIMIZEBOX
+EXSTYLE WS_EX_TOPMOST | WS_EX_NOACTIVATE | WS_EX_APPWINDOW
+BEGIN
+ PUSHBUTTON "Esc",SCAN_CODE_110,3,3,15,15
+ PUSHBUTTON "F1",SCAN_CODE_112,43,3,15,15
+ PUSHBUTTON "F2",SCAN_CODE_113,63,3,15,15
+ PUSHBUTTON "F3",SCAN_CODE_114,83,3,15,15
+ PUSHBUTTON "F4",SCAN_CODE_115,103,3,15,15
+ PUSHBUTTON "F5",SCAN_CODE_116,123,3,15,15
+ PUSHBUTTON "F6",SCAN_CODE_117,143,3,15,15
+ PUSHBUTTON "F7",SCAN_CODE_118,183,3,15,15
+ PUSHBUTTON "F8",SCAN_CODE_119,203,3,15,15
+ PUSHBUTTON "F9",SCAN_CODE_120,223,3,15,15
+ PUSHBUTTON "F10",SCAN_CODE_121,243,3,15,15
+ PUSHBUTTON "F11",SCAN_CODE_122,263,3,15,15
+ PUSHBUTTON "F12",SCAN_CODE_123,283,3,15,15
+ PUSHBUTTON "Prn",SCAN_CODE_124,304,3,15,15
+ PUSHBUTTON "Stop",SCAN_CODE_125,324,3,15,15
+ PUSHBUTTON "Attn",SCAN_CODE_126,344,3,15,15
+ PUSHBUTTON "`",SCAN_CODE_1,3,22,15,15
+ PUSHBUTTON "1",SCAN_CODE_2,23,22,15,15
+ PUSHBUTTON "2",SCAN_CODE_3,43,22,15,15
+ PUSHBUTTON "3",SCAN_CODE_4,63,22,15,15
+ PUSHBUTTON "4",SCAN_CODE_5,83,22,15,15
+ PUSHBUTTON "5",SCAN_CODE_6,103,22,15,15
+ PUSHBUTTON "6",SCAN_CODE_7,123,22,15,15
+ PUSHBUTTON "7",SCAN_CODE_8,143,22,15,15
+ PUSHBUTTON "8",SCAN_CODE_9,163,22,15,15
+ PUSHBUTTON "9",SCAN_CODE_10,183,22,15,15
+ PUSHBUTTON "0",SCAN_CODE_11,203,22,15,15
+ PUSHBUTTON "-",SCAN_CODE_12,223,22,15,15
+ PUSHBUTTON "=",SCAN_CODE_13,243,22,15,15
+ PUSHBUTTON "<--",SCAN_CODE_15,263,22,36,15,BS_ICON
+ PUSHBUTTON "Tab",SCAN_CODE_16,3,41,35,15,BS_ICON
+ PUSHBUTTON "q",SCAN_CODE_17,42,41,15,15
+ PUSHBUTTON "w",SCAN_CODE_18,61,41,15,15
+ PUSHBUTTON "e",SCAN_CODE_19,80,41,15,15
+ PUSHBUTTON "r",SCAN_CODE_20,99,41,15,15
+ PUSHBUTTON "t",SCAN_CODE_21,118,41,15,15
+ PUSHBUTTON "y",SCAN_CODE_22,137,41,15,15
+ PUSHBUTTON "u",SCAN_CODE_23,156,41,15,15
+ PUSHBUTTON "i",SCAN_CODE_24,175,41,15,15
+ PUSHBUTTON "o",SCAN_CODE_25,194,41,15,15
+ PUSHBUTTON "p",SCAN_CODE_26,213,41,15,15
+ PUSHBUTTON "[",SCAN_CODE_27,232,41,15,15
+ PUSHBUTTON "]",SCAN_CODE_28,251,41,15,15
+ PUSHBUTTON "lock",SCAN_CODE_30,3,60,46,15,BS_ICON
+ PUSHBUTTON "a",SCAN_CODE_31,53,60,15,15
+ PUSHBUTTON "s",SCAN_CODE_32,72,60,15,15
+ PUSHBUTTON "d",SCAN_CODE_33,91,60,15,15
+ PUSHBUTTON "f",SCAN_CODE_34,110,60,15,15
+ PUSHBUTTON "g",SCAN_CODE_35,129,60,15,15
+ PUSHBUTTON "h",SCAN_CODE_36,148,60,15,15
+ PUSHBUTTON "j",SCAN_CODE_37,167,60,15,15
+ PUSHBUTTON "k",SCAN_CODE_38,186,60,15,15
+ PUSHBUTTON "l",SCAN_CODE_39,205,60,15,15
+ PUSHBUTTON ";",SCAN_CODE_40,224,60,15,15
+ PUSHBUTTON "'",SCAN_CODE_41,243,60,15,15
+ PUSHBUTTON "\\",SCAN_CODE_29,270,41,30,15
+ PUSHBUTTON "ret",SCAN_CODE_43,262,60,38,15,BS_ICON
+ PUSHBUTTON
"shift",SCAN_CODE_44,3,79,57,15,BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX
+ PUSHBUTTON "z",SCAN_CODE_46,64,79,15,15
+ PUSHBUTTON "x",SCAN_CODE_47,83,79,15,15
+ PUSHBUTTON "c",SCAN_CODE_48,102,79,15,15
+ PUSHBUTTON "v",SCAN_CODE_49,121,79,15,15
+ PUSHBUTTON "b",SCAN_CODE_50,140,79,15,15
+ PUSHBUTTON "n",SCAN_CODE_51,159,79,15,15
+ PUSHBUTTON "m",SCAN_CODE_52,178,79,15,15
+ PUSHBUTTON ",",SCAN_CODE_53,197,79,15,15
+ PUSHBUTTON ".",SCAN_CODE_54,216,79,15,15
+ PUSHBUTTON "/",SCAN_CODE_55,235,79,15,15
+ PUSHBUTTON
"shift",SCAN_CODE_57,254,79,45,15,BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX
+ PUSHBUTTON "ctrl",SCAN_CODE_58,3,98,24,15,BS_PUSHLIKE|BS_AUTOCHECKBOX
+ PUSHBUTTON "v",SCAN_CODE_84,324,98,15,15,BS_ICON
+ PUSHBUTTON "ROS",SCAN_CODE_127,30,98,24,15,BS_ICON
+ PUSHBUTTON "alt",SCAN_CODE_60,57,98,24,15,BS_PUSHLIKE|BS_AUTOCHECKBOX
+ PUSHBUTTON "",SCAN_CODE_61,84,98,106,15 //space
+ PUSHBUTTON
"alt",SCAN_CODE_62,194,98,24,15,BS_PUSHLIKE|BS_AUTOCHECKBOX
+ PUSHBUTTON "ROS",SCAN_CODE_128,221,98,24,15,BS_ICON
+ PUSHBUTTON "menu",SCAN_CODE_129,248,98,24,15,BS_ICON
+ PUSHBUTTON
"ctrl",SCAN_CODE_64,275,98,24,15,BS_PUSHLIKE|BS_AUTOCHECKBOX
+ PUSHBUTTON "ins",SCAN_CODE_75,304,22,15,15
+ PUSHBUTTON "del",SCAN_CODE_76,304,41,15,15
+ PUSHBUTTON "hm",SCAN_CODE_80,324,22,15,15
+ PUSHBUTTON "end",SCAN_CODE_81,324,41,15,15
+ PUSHBUTTON "pup",SCAN_CODE_85,344,22,15,15
+ PUSHBUTTON "pdn",SCAN_CODE_86,344,41,15,15
+ PUSHBUTTON "<-",SCAN_CODE_79,304,98,15,15,BS_ICON
+ PUSHBUTTON "^",SCAN_CODE_83,324,79,15,15,BS_ICON
+ PUSHBUTTON "->",SCAN_CODE_89,344,98,15,15,BS_ICON
+ PUSHBUTTON "nlk",SCAN_CODE_90,364,22,15,15
+ PUSHBUTTON "7",SCAN_CODE_91,364,41,15,15
+ PUSHBUTTON "4",SCAN_CODE_92,364,60,15,15
+ PUSHBUTTON "1",SCAN_CODE_93,364,79,15,15
+ PUSHBUTTON "/",SCAN_CODE_95,384,22,15,15
+ PUSHBUTTON "8",SCAN_CODE_96,384,41,15,15
+ PUSHBUTTON "5",SCAN_CODE_97,384,60,15,15
+ PUSHBUTTON "2",SCAN_CODE_98,384,79,15,15
+ PUSHBUTTON "0",SCAN_CODE_99,364,98,34,15
+ PUSHBUTTON "*",SCAN_CODE_100,404,22,15,15
+ PUSHBUTTON "9",SCAN_CODE_101,404,41,15,15
+ PUSHBUTTON "6",SCAN_CODE_102,404,60,15,15
+ PUSHBUTTON "3",SCAN_CODE_103,404,79,15,15
+ PUSHBUTTON ".",SCAN_CODE_104,404,98,15,15
+ PUSHBUTTON "-",SCAN_CODE_105,424,22,15,15
+ PUSHBUTTON "+",SCAN_CODE_106,424,41,15,35
+ PUSHBUTTON "ent",SCAN_CODE_108,424,78,15,35
+ CTEXT "Num",IDC_STATIC,364,3,21,8
+ CONTROL
"",IDC_LED_NUM,"Static",SS_CENTER|SS_NOTIFY,372,15,4,3
+ CTEXT "Caps",IDC_STATIC,389,3,21,8
+ CONTROL
"",IDC_LED_CAPS,"Static",SS_CENTER|SS_NOTIFY,398,15,4,3
+ CTEXT "Scroll",IDC_STATIC,414,3,21,8
+ CONTROL
"",IDC_LED_SCROLL,"Static",SS_CENTER|SS_NOTIFY,424,15,4,3
+END
+
IDR_OSK_MENU MENU DISCARDABLE
BEGIN
POPUP "File"
@@ -137,8 +256,8 @@ BEGIN
POPUP "Keyboard"
BEGIN
- MENUITEM "Enhanced Keyboard", IDM_ENCHANCED_KB, CHECKED, GRAYED
- MENUITEM "Standard Keyboard", IDM_STANDARD_KB, GRAYED
+ MENUITEM "Enhanced Keyboard", IDM_ENHANCED_KB, CHECKED
+ MENUITEM "Standard Keyboard", IDM_STANDARD_KB
MENUITEM SEPARATOR
MENUITEM "Regular Layout", IDM_REG_LAYOUT, CHECKED, GRAYED
MENUITEM "Block Layout", IDM_BLOCK_LAYOUT, GRAYED
diff --git a/base/applications/osk/lang/fr-FR.rc b/base/applications/osk/lang/fr-FR.rc
index 5057fa360c..eef680d01b 100644
--- a/base/applications/osk/lang/fr-FR.rc
+++ b/base/applications/osk/lang/fr-FR.rc
@@ -8,7 +8,7 @@
LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL
-MAIN_DIALOG DIALOGEX DISCARDABLE 0, 0, 608, 164
+MAIN_DIALOG_ENHANCED_KB DIALOGEX DISCARDABLE 0, 0, 608, 164
CAPTION "Clavier visuel"
FONT 8, "MS Shell Dlg"
MENU IDR_OSK_MENU
@@ -128,6 +128,125 @@ BEGIN
CONTROL
"",IDC_LED_SCROLL,"Static",SS_CENTER|SS_NOTIFY,580,16,4,3
END
+MAIN_DIALOG_STANDARD_KB DIALOGEX DISCARDABLE 0, 0, 362, 115
+CAPTION "On screen keyboard"
+FONT 8, "MS Shell Dlg"
+MENU IDR_OSK_MENU
+STYLE WS_SYSMENU | WS_MINIMIZEBOX
+EXSTYLE WS_EX_TOPMOST | WS_EX_NOACTIVATE | WS_EX_APPWINDOW
+BEGIN
+ PUSHBUTTON "Esc",SCAN_CODE_110,3,3,15,15
+ PUSHBUTTON "F1",SCAN_CODE_112,43,3,15,15
+ PUSHBUTTON "F2",SCAN_CODE_113,63,3,15,15
+ PUSHBUTTON "F3",SCAN_CODE_114,83,3,15,15
+ PUSHBUTTON "F4",SCAN_CODE_115,103,3,15,15
+ PUSHBUTTON "F5",SCAN_CODE_116,123,3,15,15
+ PUSHBUTTON "F6",SCAN_CODE_117,143,3,15,15
+ PUSHBUTTON "F7",SCAN_CODE_118,183,3,15,15
+ PUSHBUTTON "F8",SCAN_CODE_119,203,3,15,15
+ PUSHBUTTON "F9",SCAN_CODE_120,223,3,15,15
+ PUSHBUTTON "F10",SCAN_CODE_121,243,3,15,15
+ PUSHBUTTON "F11",SCAN_CODE_122,263,3,15,15
+ PUSHBUTTON "F12",SCAN_CODE_123,283,3,15,15
+ PUSHBUTTON "Prn",SCAN_CODE_124,304,3,15,15
+ PUSHBUTTON "Stop",SCAN_CODE_125,324,3,15,15
+ PUSHBUTTON "Attn",SCAN_CODE_126,344,3,15,15
+ PUSHBUTTON "`",SCAN_CODE_1,3,22,15,15
+ PUSHBUTTON "1",SCAN_CODE_2,23,22,15,15
+ PUSHBUTTON "2",SCAN_CODE_3,43,22,15,15
+ PUSHBUTTON "3",SCAN_CODE_4,63,22,15,15
+ PUSHBUTTON "4",SCAN_CODE_5,83,22,15,15
+ PUSHBUTTON "5",SCAN_CODE_6,103,22,15,15
+ PUSHBUTTON "6",SCAN_CODE_7,123,22,15,15
+ PUSHBUTTON "7",SCAN_CODE_8,143,22,15,15
+ PUSHBUTTON "8",SCAN_CODE_9,163,22,15,15
+ PUSHBUTTON "9",SCAN_CODE_10,183,22,15,15
+ PUSHBUTTON "0",SCAN_CODE_11,203,22,15,15
+ PUSHBUTTON "-",SCAN_CODE_12,223,22,15,15
+ PUSHBUTTON "=",SCAN_CODE_13,243,22,15,15
+ PUSHBUTTON "<--",SCAN_CODE_15,263,22,36,15,BS_ICON
+ PUSHBUTTON "Tab",SCAN_CODE_16,3,41,35,15,BS_ICON
+ PUSHBUTTON "q",SCAN_CODE_17,42,41,15,15
+ PUSHBUTTON "w",SCAN_CODE_18,61,41,15,15
+ PUSHBUTTON "e",SCAN_CODE_19,80,41,15,15
+ PUSHBUTTON "r",SCAN_CODE_20,99,41,15,15
+ PUSHBUTTON "t",SCAN_CODE_21,118,41,15,15
+ PUSHBUTTON "y",SCAN_CODE_22,137,41,15,15
+ PUSHBUTTON "u",SCAN_CODE_23,156,41,15,15
+ PUSHBUTTON "i",SCAN_CODE_24,175,41,15,15
+ PUSHBUTTON "o",SCAN_CODE_25,194,41,15,15
+ PUSHBUTTON "p",SCAN_CODE_26,213,41,15,15
+ PUSHBUTTON "[",SCAN_CODE_27,232,41,15,15
+ PUSHBUTTON "]",SCAN_CODE_28,251,41,15,15
+ PUSHBUTTON "lock",SCAN_CODE_30,3,60,46,15,BS_ICON
+ PUSHBUTTON "a",SCAN_CODE_31,53,60,15,15
+ PUSHBUTTON "s",SCAN_CODE_32,72,60,15,15
+ PUSHBUTTON "d",SCAN_CODE_33,91,60,15,15
+ PUSHBUTTON "f",SCAN_CODE_34,110,60,15,15
+ PUSHBUTTON "g",SCAN_CODE_35,129,60,15,15
+ PUSHBUTTON "h",SCAN_CODE_36,148,60,15,15
+ PUSHBUTTON "j",SCAN_CODE_37,167,60,15,15
+ PUSHBUTTON "k",SCAN_CODE_38,186,60,15,15
+ PUSHBUTTON "l",SCAN_CODE_39,205,60,15,15
+ PUSHBUTTON ";",SCAN_CODE_40,224,60,15,15
+ PUSHBUTTON "'",SCAN_CODE_41,243,60,15,15
+ PUSHBUTTON "\\",SCAN_CODE_29,270,41,30,15
+ PUSHBUTTON "ret",SCAN_CODE_43,262,60,38,15,BS_ICON
+ PUSHBUTTON
"shift",SCAN_CODE_44,3,79,57,15,BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX
+ PUSHBUTTON "z",SCAN_CODE_46,64,79,15,15
+ PUSHBUTTON "x",SCAN_CODE_47,83,79,15,15
+ PUSHBUTTON "c",SCAN_CODE_48,102,79,15,15
+ PUSHBUTTON "v",SCAN_CODE_49,121,79,15,15
+ PUSHBUTTON "b",SCAN_CODE_50,140,79,15,15
+ PUSHBUTTON "n",SCAN_CODE_51,159,79,15,15
+ PUSHBUTTON "m",SCAN_CODE_52,178,79,15,15
+ PUSHBUTTON ",",SCAN_CODE_53,197,79,15,15
+ PUSHBUTTON ".",SCAN_CODE_54,216,79,15,15
+ PUSHBUTTON "/",SCAN_CODE_55,235,79,15,15
+ PUSHBUTTON
"shift",SCAN_CODE_57,254,79,45,15,BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX
+ PUSHBUTTON "ctrl",SCAN_CODE_58,3,98,24,15,BS_PUSHLIKE|BS_AUTOCHECKBOX
+ PUSHBUTTON "v",SCAN_CODE_84,324,98,15,15,BS_ICON
+ PUSHBUTTON "ROS",SCAN_CODE_127,30,98,24,15,BS_ICON
+ PUSHBUTTON "alt",SCAN_CODE_60,57,98,24,15,BS_PUSHLIKE|BS_AUTOCHECKBOX
+ PUSHBUTTON "",SCAN_CODE_61,84,98,106,15 //space
+ PUSHBUTTON
"alt",SCAN_CODE_62,194,98,24,15,BS_PUSHLIKE|BS_AUTOCHECKBOX
+ PUSHBUTTON "ROS",SCAN_CODE_128,221,98,24,15,BS_ICON
+ PUSHBUTTON "menu",SCAN_CODE_129,248,98,24,15,BS_ICON
+ PUSHBUTTON
"ctrl",SCAN_CODE_64,275,98,24,15,BS_PUSHLIKE|BS_AUTOCHECKBOX
+ PUSHBUTTON "ins",SCAN_CODE_75,304,22,15,15
+ PUSHBUTTON "del",SCAN_CODE_76,304,41,15,15
+ PUSHBUTTON "hm",SCAN_CODE_80,324,22,15,15
+ PUSHBUTTON "end",SCAN_CODE_81,324,41,15,15
+ PUSHBUTTON "pup",SCAN_CODE_85,344,22,15,15
+ PUSHBUTTON "pdn",SCAN_CODE_86,344,41,15,15
+ PUSHBUTTON "<-",SCAN_CODE_79,304,98,15,15,BS_ICON
+ PUSHBUTTON "^",SCAN_CODE_83,324,79,15,15,BS_ICON
+ PUSHBUTTON "->",SCAN_CODE_89,344,98,15,15,BS_ICON
+ PUSHBUTTON "nlk",SCAN_CODE_90,364,22,15,15
+ PUSHBUTTON "7",SCAN_CODE_91,364,41,15,15
+ PUSHBUTTON "4",SCAN_CODE_92,364,60,15,15
+ PUSHBUTTON "1",SCAN_CODE_93,364,79,15,15
+ PUSHBUTTON "/",SCAN_CODE_95,384,22,15,15
+ PUSHBUTTON "8",SCAN_CODE_96,384,41,15,15
+ PUSHBUTTON "5",SCAN_CODE_97,384,60,15,15
+ PUSHBUTTON "2",SCAN_CODE_98,384,79,15,15
+ PUSHBUTTON "0",SCAN_CODE_99,364,98,34,15
+ PUSHBUTTON "*",SCAN_CODE_100,404,22,15,15
+ PUSHBUTTON "9",SCAN_CODE_101,404,41,15,15
+ PUSHBUTTON "6",SCAN_CODE_102,404,60,15,15
+ PUSHBUTTON "3",SCAN_CODE_103,404,79,15,15
+ PUSHBUTTON ".",SCAN_CODE_104,404,98,15,15
+ PUSHBUTTON "-",SCAN_CODE_105,424,22,15,15
+ PUSHBUTTON "+",SCAN_CODE_106,424,41,15,35
+ PUSHBUTTON "ent",SCAN_CODE_108,424,78,15,35
+ CTEXT "Num",IDC_STATIC,364,3,21,8
+ CONTROL
"",IDC_LED_NUM,"Static",SS_CENTER|SS_NOTIFY,372,15,4,3
+ CTEXT "Caps",IDC_STATIC,389,3,21,8
+ CONTROL
"",IDC_LED_CAPS,"Static",SS_CENTER|SS_NOTIFY,398,15,4,3
+ CTEXT "Scroll",IDC_STATIC,414,3,21,8
+ CONTROL
"",IDC_LED_SCROLL,"Static",SS_CENTER|SS_NOTIFY,424,15,4,3
+END
+
IDR_OSK_MENU MENU DISCARDABLE
BEGIN
POPUP "File"
@@ -137,8 +256,8 @@ BEGIN
POPUP "Keyboard"
BEGIN
- MENUITEM "Enhanced Keyboard", IDM_ENCHANCED_KB, CHECKED, GRAYED
- MENUITEM "Standard Keyboard", IDM_STANDARD_KB, GRAYED
+ MENUITEM "Enhanced Keyboard", IDM_ENHANCED_KB, CHECKED
+ MENUITEM "Standard Keyboard", IDM_STANDARD_KB
MENUITEM SEPARATOR
MENUITEM "Regular Layout", IDM_REG_LAYOUT, CHECKED, GRAYED
MENUITEM "Block Layout", IDM_BLOCK_LAYOUT, GRAYED
diff --git a/base/applications/osk/lang/he-IL.rc b/base/applications/osk/lang/he-IL.rc
index c91405bdea..5f1fa891c3 100644
--- a/base/applications/osk/lang/he-IL.rc
+++ b/base/applications/osk/lang/he-IL.rc
@@ -8,7 +8,7 @@
LANGUAGE LANG_HEBREW, SUBLANG_DEFAULT
-MAIN_DIALOG DIALOGEX DISCARDABLE 0, 0, 608, 164
+MAIN_DIALOG_ENHANCED_KB DIALOGEX DISCARDABLE 0, 0, 608, 164
CAPTION "לוח מקשים על התצוגה"
FONT 8, "MS Shell Dlg"
MENU IDR_OSK_MENU
@@ -127,6 +127,125 @@ BEGIN
CONTROL
"",IDC_LED_SCROLL,"Static",SS_CENTER|SS_NOTIFY,580,16,4,3
END
+MAIN_DIALOG_STANDARD_KB DIALOGEX DISCARDABLE 0, 0, 362, 115
+CAPTION "On screen keyboard"
+FONT 8, "MS Shell Dlg"
+MENU IDR_OSK_MENU
+STYLE WS_SYSMENU | WS_MINIMIZEBOX
+EXSTYLE WS_EX_TOPMOST | WS_EX_NOACTIVATE | WS_EX_APPWINDOW
+BEGIN
+ PUSHBUTTON "Esc",SCAN_CODE_110,3,3,15,15
+ PUSHBUTTON "F1",SCAN_CODE_112,43,3,15,15
+ PUSHBUTTON "F2",SCAN_CODE_113,63,3,15,15
+ PUSHBUTTON "F3",SCAN_CODE_114,83,3,15,15
+ PUSHBUTTON "F4",SCAN_CODE_115,103,3,15,15
+ PUSHBUTTON "F5",SCAN_CODE_116,123,3,15,15
+ PUSHBUTTON "F6",SCAN_CODE_117,143,3,15,15
+ PUSHBUTTON "F7",SCAN_CODE_118,183,3,15,15
+ PUSHBUTTON "F8",SCAN_CODE_119,203,3,15,15
+ PUSHBUTTON "F9",SCAN_CODE_120,223,3,15,15
+ PUSHBUTTON "F10",SCAN_CODE_121,243,3,15,15
+ PUSHBUTTON "F11",SCAN_CODE_122,263,3,15,15
+ PUSHBUTTON "F12",SCAN_CODE_123,283,3,15,15
+ PUSHBUTTON "Prn",SCAN_CODE_124,304,3,15,15
+ PUSHBUTTON "Stop",SCAN_CODE_125,324,3,15,15
+ PUSHBUTTON "Attn",SCAN_CODE_126,344,3,15,15
+ PUSHBUTTON "`",SCAN_CODE_1,3,22,15,15
+ PUSHBUTTON "1",SCAN_CODE_2,23,22,15,15
+ PUSHBUTTON "2",SCAN_CODE_3,43,22,15,15
+ PUSHBUTTON "3",SCAN_CODE_4,63,22,15,15
+ PUSHBUTTON "4",SCAN_CODE_5,83,22,15,15
+ PUSHBUTTON "5",SCAN_CODE_6,103,22,15,15
+ PUSHBUTTON "6",SCAN_CODE_7,123,22,15,15
+ PUSHBUTTON "7",SCAN_CODE_8,143,22,15,15
+ PUSHBUTTON "8",SCAN_CODE_9,163,22,15,15
+ PUSHBUTTON "9",SCAN_CODE_10,183,22,15,15
+ PUSHBUTTON "0",SCAN_CODE_11,203,22,15,15
+ PUSHBUTTON "-",SCAN_CODE_12,223,22,15,15
+ PUSHBUTTON "=",SCAN_CODE_13,243,22,15,15
+ PUSHBUTTON "<--",SCAN_CODE_15,263,22,36,15,BS_ICON
+ PUSHBUTTON "Tab",SCAN_CODE_16,3,41,35,15,BS_ICON
+ PUSHBUTTON "q",SCAN_CODE_17,42,41,15,15
+ PUSHBUTTON "w",SCAN_CODE_18,61,41,15,15
+ PUSHBUTTON "e",SCAN_CODE_19,80,41,15,15
+ PUSHBUTTON "r",SCAN_CODE_20,99,41,15,15
+ PUSHBUTTON "t",SCAN_CODE_21,118,41,15,15
+ PUSHBUTTON "y",SCAN_CODE_22,137,41,15,15
+ PUSHBUTTON "u",SCAN_CODE_23,156,41,15,15
+ PUSHBUTTON "i",SCAN_CODE_24,175,41,15,15
+ PUSHBUTTON "o",SCAN_CODE_25,194,41,15,15
+ PUSHBUTTON "p",SCAN_CODE_26,213,41,15,15
+ PUSHBUTTON "[",SCAN_CODE_27,232,41,15,15
+ PUSHBUTTON "]",SCAN_CODE_28,251,41,15,15
+ PUSHBUTTON "lock",SCAN_CODE_30,3,60,46,15,BS_ICON
+ PUSHBUTTON "a",SCAN_CODE_31,53,60,15,15
+ PUSHBUTTON "s",SCAN_CODE_32,72,60,15,15
+ PUSHBUTTON "d",SCAN_CODE_33,91,60,15,15
+ PUSHBUTTON "f",SCAN_CODE_34,110,60,15,15
+ PUSHBUTTON "g",SCAN_CODE_35,129,60,15,15
+ PUSHBUTTON "h",SCAN_CODE_36,148,60,15,15
+ PUSHBUTTON "j",SCAN_CODE_37,167,60,15,15
+ PUSHBUTTON "k",SCAN_CODE_38,186,60,15,15
+ PUSHBUTTON "l",SCAN_CODE_39,205,60,15,15
+ PUSHBUTTON ";",SCAN_CODE_40,224,60,15,15
+ PUSHBUTTON "'",SCAN_CODE_41,243,60,15,15
+ PUSHBUTTON "\\",SCAN_CODE_29,270,41,30,15
+ PUSHBUTTON "ret",SCAN_CODE_43,262,60,38,15,BS_ICON
+ PUSHBUTTON
"shift",SCAN_CODE_44,3,79,57,15,BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX
+ PUSHBUTTON "z",SCAN_CODE_46,64,79,15,15
+ PUSHBUTTON "x",SCAN_CODE_47,83,79,15,15
+ PUSHBUTTON "c",SCAN_CODE_48,102,79,15,15
+ PUSHBUTTON "v",SCAN_CODE_49,121,79,15,15
+ PUSHBUTTON "b",SCAN_CODE_50,140,79,15,15
+ PUSHBUTTON "n",SCAN_CODE_51,159,79,15,15
+ PUSHBUTTON "m",SCAN_CODE_52,178,79,15,15
+ PUSHBUTTON ",",SCAN_CODE_53,197,79,15,15
+ PUSHBUTTON ".",SCAN_CODE_54,216,79,15,15
+ PUSHBUTTON "/",SCAN_CODE_55,235,79,15,15
+ PUSHBUTTON
"shift",SCAN_CODE_57,254,79,45,15,BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX
+ PUSHBUTTON "ctrl",SCAN_CODE_58,3,98,24,15,BS_PUSHLIKE|BS_AUTOCHECKBOX
+ PUSHBUTTON "v",SCAN_CODE_84,324,98,15,15,BS_ICON
+ PUSHBUTTON "ROS",SCAN_CODE_127,30,98,24,15,BS_ICON
+ PUSHBUTTON "alt",SCAN_CODE_60,57,98,24,15,BS_PUSHLIKE|BS_AUTOCHECKBOX
+ PUSHBUTTON "",SCAN_CODE_61,84,98,106,15 //space
+ PUSHBUTTON
"alt",SCAN_CODE_62,194,98,24,15,BS_PUSHLIKE|BS_AUTOCHECKBOX
+ PUSHBUTTON "ROS",SCAN_CODE_128,221,98,24,15,BS_ICON
+ PUSHBUTTON "menu",SCAN_CODE_129,248,98,24,15,BS_ICON
+ PUSHBUTTON
"ctrl",SCAN_CODE_64,275,98,24,15,BS_PUSHLIKE|BS_AUTOCHECKBOX
+ PUSHBUTTON "ins",SCAN_CODE_75,304,22,15,15
+ PUSHBUTTON "del",SCAN_CODE_76,304,41,15,15
+ PUSHBUTTON "hm",SCAN_CODE_80,324,22,15,15
+ PUSHBUTTON "end",SCAN_CODE_81,324,41,15,15
+ PUSHBUTTON "pup",SCAN_CODE_85,344,22,15,15
+ PUSHBUTTON "pdn",SCAN_CODE_86,344,41,15,15
+ PUSHBUTTON "<-",SCAN_CODE_79,304,98,15,15,BS_ICON
+ PUSHBUTTON "^",SCAN_CODE_83,324,79,15,15,BS_ICON
+ PUSHBUTTON "->",SCAN_CODE_89,344,98,15,15,BS_ICON
+ PUSHBUTTON "nlk",SCAN_CODE_90,364,22,15,15
+ PUSHBUTTON "7",SCAN_CODE_91,364,41,15,15
+ PUSHBUTTON "4",SCAN_CODE_92,364,60,15,15
+ PUSHBUTTON "1",SCAN_CODE_93,364,79,15,15
+ PUSHBUTTON "/",SCAN_CODE_95,384,22,15,15
+ PUSHBUTTON "8",SCAN_CODE_96,384,41,15,15
+ PUSHBUTTON "5",SCAN_CODE_97,384,60,15,15
+ PUSHBUTTON "2",SCAN_CODE_98,384,79,15,15
+ PUSHBUTTON "0",SCAN_CODE_99,364,98,34,15
+ PUSHBUTTON "*",SCAN_CODE_100,404,22,15,15
+ PUSHBUTTON "9",SCAN_CODE_101,404,41,15,15
+ PUSHBUTTON "6",SCAN_CODE_102,404,60,15,15
+ PUSHBUTTON "3",SCAN_CODE_103,404,79,15,15
+ PUSHBUTTON ".",SCAN_CODE_104,404,98,15,15
+ PUSHBUTTON "-",SCAN_CODE_105,424,22,15,15
+ PUSHBUTTON "+",SCAN_CODE_106,424,41,15,35
+ PUSHBUTTON "ent",SCAN_CODE_108,424,78,15,35
+ CTEXT "Num",IDC_STATIC,364,3,21,8
+ CONTROL
"",IDC_LED_NUM,"Static",SS_CENTER|SS_NOTIFY,372,15,4,3
+ CTEXT "Caps",IDC_STATIC,389,3,21,8
+ CONTROL
"",IDC_LED_CAPS,"Static",SS_CENTER|SS_NOTIFY,398,15,4,3
+ CTEXT "Scroll",IDC_STATIC,414,3,21,8
+ CONTROL
"",IDC_LED_SCROLL,"Static",SS_CENTER|SS_NOTIFY,424,15,4,3
+END
+
IDR_OSK_MENU MENU DISCARDABLE
BEGIN
POPUP "File"
@@ -136,8 +255,8 @@ BEGIN
POPUP "Keyboard"
BEGIN
- MENUITEM "Enhanced Keyboard", IDM_ENCHANCED_KB, CHECKED, GRAYED
- MENUITEM "Standard Keyboard", IDM_STANDARD_KB, GRAYED
+ MENUITEM "Enhanced Keyboard", IDM_ENHANCED_KB, CHECKED
+ MENUITEM "Standard Keyboard", IDM_STANDARD_KB
MENUITEM SEPARATOR
MENUITEM "Regular Layout", IDM_REG_LAYOUT, CHECKED, GRAYED
MENUITEM "Block Layout", IDM_BLOCK_LAYOUT, GRAYED
diff --git a/base/applications/osk/lang/it-IT.rc b/base/applications/osk/lang/it-IT.rc
index 6e2c7921b2..0f614a1a98 100644
--- a/base/applications/osk/lang/it-IT.rc
+++ b/base/applications/osk/lang/it-IT.rc
@@ -8,7 +8,7 @@
LANGUAGE LANG_ITALIAN, SUBLANG_NEUTRAL
-MAIN_DIALOG DIALOGEX DISCARDABLE 0, 0, 463, 115
+MAIN_DIALOG_ENHANCED_KB DIALOGEX DISCARDABLE 0, 0, 463, 115
CAPTION "Tastiera a schermo"
FONT 8, "MS Shell Dlg"
MENU IDR_OSK_MENU
@@ -128,6 +128,125 @@ BEGIN
CONTROL
"",IDC_LED_SCROLL,"Static",SS_CENTER|SS_NOTIFY,443,15,4,3
END
+MAIN_DIALOG_STANDARD_KB DIALOGEX DISCARDABLE 0, 0, 362, 115
+CAPTION "On screen keyboard"
+FONT 8, "MS Shell Dlg"
+MENU IDR_OSK_MENU
+STYLE WS_SYSMENU | WS_MINIMIZEBOX
+EXSTYLE WS_EX_TOPMOST | WS_EX_NOACTIVATE | WS_EX_APPWINDOW
+BEGIN
+ PUSHBUTTON "Esc",SCAN_CODE_110,3,3,15,15
+ PUSHBUTTON "F1",SCAN_CODE_112,43,3,15,15
+ PUSHBUTTON "F2",SCAN_CODE_113,63,3,15,15
+ PUSHBUTTON "F3",SCAN_CODE_114,83,3,15,15
+ PUSHBUTTON "F4",SCAN_CODE_115,103,3,15,15
+ PUSHBUTTON "F5",SCAN_CODE_116,123,3,15,15
+ PUSHBUTTON "F6",SCAN_CODE_117,143,3,15,15
+ PUSHBUTTON "F7",SCAN_CODE_118,183,3,15,15
+ PUSHBUTTON "F8",SCAN_CODE_119,203,3,15,15
+ PUSHBUTTON "F9",SCAN_CODE_120,223,3,15,15
+ PUSHBUTTON "F10",SCAN_CODE_121,243,3,15,15
+ PUSHBUTTON "F11",SCAN_CODE_122,263,3,15,15
+ PUSHBUTTON "F12",SCAN_CODE_123,283,3,15,15
+ PUSHBUTTON "Prn",SCAN_CODE_124,304,3,15,15
+ PUSHBUTTON "Stop",SCAN_CODE_125,324,3,15,15
+ PUSHBUTTON "Attn",SCAN_CODE_126,344,3,15,15
+ PUSHBUTTON "`",SCAN_CODE_1,3,22,15,15
+ PUSHBUTTON "1",SCAN_CODE_2,23,22,15,15
+ PUSHBUTTON "2",SCAN_CODE_3,43,22,15,15
+ PUSHBUTTON "3",SCAN_CODE_4,63,22,15,15
+ PUSHBUTTON "4",SCAN_CODE_5,83,22,15,15
+ PUSHBUTTON "5",SCAN_CODE_6,103,22,15,15
+ PUSHBUTTON "6",SCAN_CODE_7,123,22,15,15
+ PUSHBUTTON "7",SCAN_CODE_8,143,22,15,15
+ PUSHBUTTON "8",SCAN_CODE_9,163,22,15,15
+ PUSHBUTTON "9",SCAN_CODE_10,183,22,15,15
+ PUSHBUTTON "0",SCAN_CODE_11,203,22,15,15
+ PUSHBUTTON "-",SCAN_CODE_12,223,22,15,15
+ PUSHBUTTON "=",SCAN_CODE_13,243,22,15,15
+ PUSHBUTTON "<--",SCAN_CODE_15,263,22,36,15,BS_ICON
+ PUSHBUTTON "Tab",SCAN_CODE_16,3,41,35,15,BS_ICON
+ PUSHBUTTON "q",SCAN_CODE_17,42,41,15,15
+ PUSHBUTTON "w",SCAN_CODE_18,61,41,15,15
+ PUSHBUTTON "e",SCAN_CODE_19,80,41,15,15
+ PUSHBUTTON "r",SCAN_CODE_20,99,41,15,15
+ PUSHBUTTON "t",SCAN_CODE_21,118,41,15,15
+ PUSHBUTTON "y",SCAN_CODE_22,137,41,15,15
+ PUSHBUTTON "u",SCAN_CODE_23,156,41,15,15
+ PUSHBUTTON "i",SCAN_CODE_24,175,41,15,15
+ PUSHBUTTON "o",SCAN_CODE_25,194,41,15,15
+ PUSHBUTTON "p",SCAN_CODE_26,213,41,15,15
+ PUSHBUTTON "[",SCAN_CODE_27,232,41,15,15
+ PUSHBUTTON "]",SCAN_CODE_28,251,41,15,15
+ PUSHBUTTON "lock",SCAN_CODE_30,3,60,46,15,BS_ICON
+ PUSHBUTTON "a",SCAN_CODE_31,53,60,15,15
+ PUSHBUTTON "s",SCAN_CODE_32,72,60,15,15
+ PUSHBUTTON "d",SCAN_CODE_33,91,60,15,15
+ PUSHBUTTON "f",SCAN_CODE_34,110,60,15,15
+ PUSHBUTTON "g",SCAN_CODE_35,129,60,15,15
+ PUSHBUTTON "h",SCAN_CODE_36,148,60,15,15
+ PUSHBUTTON "j",SCAN_CODE_37,167,60,15,15
+ PUSHBUTTON "k",SCAN_CODE_38,186,60,15,15
+ PUSHBUTTON "l",SCAN_CODE_39,205,60,15,15
+ PUSHBUTTON ";",SCAN_CODE_40,224,60,15,15
+ PUSHBUTTON "'",SCAN_CODE_41,243,60,15,15
+ PUSHBUTTON "\\",SCAN_CODE_29,270,41,30,15
+ PUSHBUTTON "ret",SCAN_CODE_43,262,60,38,15,BS_ICON
+ PUSHBUTTON
"shift",SCAN_CODE_44,3,79,57,15,BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX
+ PUSHBUTTON "z",SCAN_CODE_46,64,79,15,15
+ PUSHBUTTON "x",SCAN_CODE_47,83,79,15,15
+ PUSHBUTTON "c",SCAN_CODE_48,102,79,15,15
+ PUSHBUTTON "v",SCAN_CODE_49,121,79,15,15
+ PUSHBUTTON "b",SCAN_CODE_50,140,79,15,15
+ PUSHBUTTON "n",SCAN_CODE_51,159,79,15,15
+ PUSHBUTTON "m",SCAN_CODE_52,178,79,15,15
+ PUSHBUTTON ",",SCAN_CODE_53,197,79,15,15
+ PUSHBUTTON ".",SCAN_CODE_54,216,79,15,15
+ PUSHBUTTON "/",SCAN_CODE_55,235,79,15,15
+ PUSHBUTTON
"shift",SCAN_CODE_57,254,79,45,15,BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX
+ PUSHBUTTON "ctrl",SCAN_CODE_58,3,98,24,15,BS_PUSHLIKE|BS_AUTOCHECKBOX
+ PUSHBUTTON "v",SCAN_CODE_84,324,98,15,15,BS_ICON
+ PUSHBUTTON "ROS",SCAN_CODE_127,30,98,24,15,BS_ICON
+ PUSHBUTTON "alt",SCAN_CODE_60,57,98,24,15,BS_PUSHLIKE|BS_AUTOCHECKBOX
+ PUSHBUTTON "",SCAN_CODE_61,84,98,106,15 //space
+ PUSHBUTTON
"alt",SCAN_CODE_62,194,98,24,15,BS_PUSHLIKE|BS_AUTOCHECKBOX
+ PUSHBUTTON "ROS",SCAN_CODE_128,221,98,24,15,BS_ICON
+ PUSHBUTTON "menu",SCAN_CODE_129,248,98,24,15,BS_ICON
+ PUSHBUTTON
"ctrl",SCAN_CODE_64,275,98,24,15,BS_PUSHLIKE|BS_AUTOCHECKBOX
+ PUSHBUTTON "ins",SCAN_CODE_75,304,22,15,15
+ PUSHBUTTON "del",SCAN_CODE_76,304,41,15,15
+ PUSHBUTTON "hm",SCAN_CODE_80,324,22,15,15
+ PUSHBUTTON "end",SCAN_CODE_81,324,41,15,15
+ PUSHBUTTON "pup",SCAN_CODE_85,344,22,15,15
+ PUSHBUTTON "pdn",SCAN_CODE_86,344,41,15,15
+ PUSHBUTTON "<-",SCAN_CODE_79,304,98,15,15,BS_ICON
+ PUSHBUTTON "^",SCAN_CODE_83,324,79,15,15,BS_ICON
+ PUSHBUTTON "->",SCAN_CODE_89,344,98,15,15,BS_ICON
+ PUSHBUTTON "nlk",SCAN_CODE_90,364,22,15,15
+ PUSHBUTTON "7",SCAN_CODE_91,364,41,15,15
+ PUSHBUTTON "4",SCAN_CODE_92,364,60,15,15
+ PUSHBUTTON "1",SCAN_CODE_93,364,79,15,15
+ PUSHBUTTON "/",SCAN_CODE_95,384,22,15,15
+ PUSHBUTTON "8",SCAN_CODE_96,384,41,15,15
+ PUSHBUTTON "5",SCAN_CODE_97,384,60,15,15
+ PUSHBUTTON "2",SCAN_CODE_98,384,79,15,15
+ PUSHBUTTON "0",SCAN_CODE_99,364,98,34,15
+ PUSHBUTTON "*",SCAN_CODE_100,404,22,15,15
+ PUSHBUTTON "9",SCAN_CODE_101,404,41,15,15
+ PUSHBUTTON "6",SCAN_CODE_102,404,60,15,15
+ PUSHBUTTON "3",SCAN_CODE_103,404,79,15,15
+ PUSHBUTTON ".",SCAN_CODE_104,404,98,15,15
+ PUSHBUTTON "-",SCAN_CODE_105,424,22,15,15
+ PUSHBUTTON "+",SCAN_CODE_106,424,41,15,35
+ PUSHBUTTON "ent",SCAN_CODE_108,424,78,15,35
+ CTEXT "Num",IDC_STATIC,364,3,21,8
+ CONTROL
"",IDC_LED_NUM,"Static",SS_CENTER|SS_NOTIFY,372,15,4,3
+ CTEXT "Caps",IDC_STATIC,389,3,21,8
+ CONTROL
"",IDC_LED_CAPS,"Static",SS_CENTER|SS_NOTIFY,398,15,4,3
+ CTEXT "Scroll",IDC_STATIC,414,3,21,8
+ CONTROL
"",IDC_LED_SCROLL,"Static",SS_CENTER|SS_NOTIFY,424,15,4,3
+END
+
IDR_OSK_MENU MENU DISCARDABLE
BEGIN
POPUP "File"
@@ -137,8 +256,8 @@ IDR_OSK_MENU MENU DISCARDABLE
POPUP "Keyboard"
BEGIN
- MENUITEM "Enhanced Keyboard", IDM_ENCHANCED_KB, CHECKED, GRAYED
- MENUITEM "Standard Keyboard", IDM_STANDARD_KB, GRAYED
+ MENUITEM "Enhanced Keyboard", IDM_ENHANCED_KB, CHECKED
+ MENUITEM "Standard Keyboard", IDM_STANDARD_KB
MENUITEM SEPARATOR
MENUITEM "Regular Layout", IDM_REG_LAYOUT, CHECKED, GRAYED
MENUITEM "Block Layout", IDM_BLOCK_LAYOUT, GRAYED
diff --git a/base/applications/osk/lang/pl-PL.rc b/base/applications/osk/lang/pl-PL.rc
index 89244f0ac7..d5f7e2d30b 100644
--- a/base/applications/osk/lang/pl-PL.rc
+++ b/base/applications/osk/lang/pl-PL.rc
@@ -8,7 +8,7 @@
LANGUAGE LANG_POLISH, SUBLANG_NEUTRAL
-MAIN_DIALOG DIALOGEX DISCARDABLE 0, 0, 608, 164
+MAIN_DIALOG_ENHANCED_KB DIALOGEX DISCARDABLE 0, 0, 608, 164
CAPTION "Klawiatura Ekranowa"
FONT 8, "MS Shell Dlg"
MENU IDR_OSK_MENU
@@ -127,6 +127,125 @@ BEGIN
CONTROL
"",IDC_LED_SCROLL,"Static",SS_CENTER|SS_NOTIFY,580,16,4,3
END
+MAIN_DIALOG_STANDARD_KB DIALOGEX DISCARDABLE 0, 0, 362, 115
+CAPTION "On screen keyboard"
+FONT 8, "MS Shell Dlg"
+MENU IDR_OSK_MENU
+STYLE WS_SYSMENU | WS_MINIMIZEBOX
+EXSTYLE WS_EX_TOPMOST | WS_EX_NOACTIVATE | WS_EX_APPWINDOW
+BEGIN
+ PUSHBUTTON "Esc",SCAN_CODE_110,3,3,15,15
+ PUSHBUTTON "F1",SCAN_CODE_112,43,3,15,15
+ PUSHBUTTON "F2",SCAN_CODE_113,63,3,15,15
+ PUSHBUTTON "F3",SCAN_CODE_114,83,3,15,15
+ PUSHBUTTON "F4",SCAN_CODE_115,103,3,15,15
+ PUSHBUTTON "F5",SCAN_CODE_116,123,3,15,15
+ PUSHBUTTON "F6",SCAN_CODE_117,143,3,15,15
+ PUSHBUTTON "F7",SCAN_CODE_118,183,3,15,15
+ PUSHBUTTON "F8",SCAN_CODE_119,203,3,15,15
+ PUSHBUTTON "F9",SCAN_CODE_120,223,3,15,15
+ PUSHBUTTON "F10",SCAN_CODE_121,243,3,15,15
+ PUSHBUTTON "F11",SCAN_CODE_122,263,3,15,15
+ PUSHBUTTON "F12",SCAN_CODE_123,283,3,15,15
+ PUSHBUTTON "Prn",SCAN_CODE_124,304,3,15,15
+ PUSHBUTTON "Stop",SCAN_CODE_125,324,3,15,15
+ PUSHBUTTON "Attn",SCAN_CODE_126,344,3,15,15
+ PUSHBUTTON "`",SCAN_CODE_1,3,22,15,15
+ PUSHBUTTON "1",SCAN_CODE_2,23,22,15,15
+ PUSHBUTTON "2",SCAN_CODE_3,43,22,15,15
+ PUSHBUTTON "3",SCAN_CODE_4,63,22,15,15
+ PUSHBUTTON "4",SCAN_CODE_5,83,22,15,15
+ PUSHBUTTON "5",SCAN_CODE_6,103,22,15,15
+ PUSHBUTTON "6",SCAN_CODE_7,123,22,15,15
+ PUSHBUTTON "7",SCAN_CODE_8,143,22,15,15
+ PUSHBUTTON "8",SCAN_CODE_9,163,22,15,15
+ PUSHBUTTON "9",SCAN_CODE_10,183,22,15,15
+ PUSHBUTTON "0",SCAN_CODE_11,203,22,15,15
+ PUSHBUTTON "-",SCAN_CODE_12,223,22,15,15
+ PUSHBUTTON "=",SCAN_CODE_13,243,22,15,15
+ PUSHBUTTON "<--",SCAN_CODE_15,263,22,36,15,BS_ICON
+ PUSHBUTTON "Tab",SCAN_CODE_16,3,41,35,15,BS_ICON
+ PUSHBUTTON "q",SCAN_CODE_17,42,41,15,15
+ PUSHBUTTON "w",SCAN_CODE_18,61,41,15,15
+ PUSHBUTTON "e",SCAN_CODE_19,80,41,15,15
+ PUSHBUTTON "r",SCAN_CODE_20,99,41,15,15
+ PUSHBUTTON "t",SCAN_CODE_21,118,41,15,15
+ PUSHBUTTON "y",SCAN_CODE_22,137,41,15,15
+ PUSHBUTTON "u",SCAN_CODE_23,156,41,15,15
+ PUSHBUTTON "i",SCAN_CODE_24,175,41,15,15
+ PUSHBUTTON "o",SCAN_CODE_25,194,41,15,15
+ PUSHBUTTON "p",SCAN_CODE_26,213,41,15,15
+ PUSHBUTTON "[",SCAN_CODE_27,232,41,15,15
+ PUSHBUTTON "]",SCAN_CODE_28,251,41,15,15
+ PUSHBUTTON "lock",SCAN_CODE_30,3,60,46,15,BS_ICON
+ PUSHBUTTON "a",SCAN_CODE_31,53,60,15,15
+ PUSHBUTTON "s",SCAN_CODE_32,72,60,15,15
+ PUSHBUTTON "d",SCAN_CODE_33,91,60,15,15
+ PUSHBUTTON "f",SCAN_CODE_34,110,60,15,15
+ PUSHBUTTON "g",SCAN_CODE_35,129,60,15,15
+ PUSHBUTTON "h",SCAN_CODE_36,148,60,15,15
+ PUSHBUTTON "j",SCAN_CODE_37,167,60,15,15
+ PUSHBUTTON "k",SCAN_CODE_38,186,60,15,15
+ PUSHBUTTON "l",SCAN_CODE_39,205,60,15,15
+ PUSHBUTTON ";",SCAN_CODE_40,224,60,15,15
+ PUSHBUTTON "'",SCAN_CODE_41,243,60,15,15
+ PUSHBUTTON "\\",SCAN_CODE_29,270,41,30,15
+ PUSHBUTTON "ret",SCAN_CODE_43,262,60,38,15,BS_ICON
+ PUSHBUTTON
"shift",SCAN_CODE_44,3,79,57,15,BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX
+ PUSHBUTTON "z",SCAN_CODE_46,64,79,15,15
+ PUSHBUTTON "x",SCAN_CODE_47,83,79,15,15
+ PUSHBUTTON "c",SCAN_CODE_48,102,79,15,15
+ PUSHBUTTON "v",SCAN_CODE_49,121,79,15,15
+ PUSHBUTTON "b",SCAN_CODE_50,140,79,15,15
+ PUSHBUTTON "n",SCAN_CODE_51,159,79,15,15
+ PUSHBUTTON "m",SCAN_CODE_52,178,79,15,15
+ PUSHBUTTON ",",SCAN_CODE_53,197,79,15,15
+ PUSHBUTTON ".",SCAN_CODE_54,216,79,15,15
+ PUSHBUTTON "/",SCAN_CODE_55,235,79,15,15
+ PUSHBUTTON
"shift",SCAN_CODE_57,254,79,45,15,BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX
+ PUSHBUTTON "ctrl",SCAN_CODE_58,3,98,24,15,BS_PUSHLIKE|BS_AUTOCHECKBOX
+ PUSHBUTTON "v",SCAN_CODE_84,324,98,15,15,BS_ICON
+ PUSHBUTTON "ROS",SCAN_CODE_127,30,98,24,15,BS_ICON
+ PUSHBUTTON "alt",SCAN_CODE_60,57,98,24,15,BS_PUSHLIKE|BS_AUTOCHECKBOX
+ PUSHBUTTON "",SCAN_CODE_61,84,98,106,15 //space
+ PUSHBUTTON
"alt",SCAN_CODE_62,194,98,24,15,BS_PUSHLIKE|BS_AUTOCHECKBOX
+ PUSHBUTTON "ROS",SCAN_CODE_128,221,98,24,15,BS_ICON
+ PUSHBUTTON "menu",SCAN_CODE_129,248,98,24,15,BS_ICON
+ PUSHBUTTON
"ctrl",SCAN_CODE_64,275,98,24,15,BS_PUSHLIKE|BS_AUTOCHECKBOX
+ PUSHBUTTON "ins",SCAN_CODE_75,304,22,15,15
+ PUSHBUTTON "del",SCAN_CODE_76,304,41,15,15
+ PUSHBUTTON "hm",SCAN_CODE_80,324,22,15,15
+ PUSHBUTTON "end",SCAN_CODE_81,324,41,15,15
+ PUSHBUTTON "pup",SCAN_CODE_85,344,22,15,15
+ PUSHBUTTON "pdn",SCAN_CODE_86,344,41,15,15
+ PUSHBUTTON "<-",SCAN_CODE_79,304,98,15,15,BS_ICON
+ PUSHBUTTON "^",SCAN_CODE_83,324,79,15,15,BS_ICON
+ PUSHBUTTON "->",SCAN_CODE_89,344,98,15,15,BS_ICON
+ PUSHBUTTON "nlk",SCAN_CODE_90,364,22,15,15
+ PUSHBUTTON "7",SCAN_CODE_91,364,41,15,15
+ PUSHBUTTON "4",SCAN_CODE_92,364,60,15,15
+ PUSHBUTTON "1",SCAN_CODE_93,364,79,15,15
+ PUSHBUTTON "/",SCAN_CODE_95,384,22,15,15
+ PUSHBUTTON "8",SCAN_CODE_96,384,41,15,15
+ PUSHBUTTON "5",SCAN_CODE_97,384,60,15,15
+ PUSHBUTTON "2",SCAN_CODE_98,384,79,15,15
+ PUSHBUTTON "0",SCAN_CODE_99,364,98,34,15
+ PUSHBUTTON "*",SCAN_CODE_100,404,22,15,15
+ PUSHBUTTON "9",SCAN_CODE_101,404,41,15,15
+ PUSHBUTTON "6",SCAN_CODE_102,404,60,15,15
+ PUSHBUTTON "3",SCAN_CODE_103,404,79,15,15
+ PUSHBUTTON ".",SCAN_CODE_104,404,98,15,15
+ PUSHBUTTON "-",SCAN_CODE_105,424,22,15,15
+ PUSHBUTTON "+",SCAN_CODE_106,424,41,15,35
+ PUSHBUTTON "ent",SCAN_CODE_108,424,78,15,35
+ CTEXT "Num",IDC_STATIC,364,3,21,8
+ CONTROL
"",IDC_LED_NUM,"Static",SS_CENTER|SS_NOTIFY,372,15,4,3
+ CTEXT "Caps",IDC_STATIC,389,3,21,8
+ CONTROL
"",IDC_LED_CAPS,"Static",SS_CENTER|SS_NOTIFY,398,15,4,3
+ CTEXT "Scroll",IDC_STATIC,414,3,21,8
+ CONTROL
"",IDC_LED_SCROLL,"Static",SS_CENTER|SS_NOTIFY,424,15,4,3
+END
+
IDR_OSK_MENU MENU DISCARDABLE
BEGIN
POPUP "File"
@@ -136,8 +255,8 @@ BEGIN
POPUP "Keyboard"
BEGIN
- MENUITEM "Enhanced Keyboard", IDM_ENCHANCED_KB, CHECKED, GRAYED
- MENUITEM "Standard Keyboard", IDM_STANDARD_KB, GRAYED
+ MENUITEM "Enhanced Keyboard", IDM_ENHANCED_KB, CHECKED
+ MENUITEM "Standard Keyboard", IDM_STANDARD_KB
MENUITEM SEPARATOR
MENUITEM "Regular Layout", IDM_REG_LAYOUT, CHECKED, GRAYED
MENUITEM "Block Layout", IDM_BLOCK_LAYOUT, GRAYED
diff --git a/base/applications/osk/lang/ro-RO.rc b/base/applications/osk/lang/ro-RO.rc
index 379e54ee7e..57e1616d5e 100644
--- a/base/applications/osk/lang/ro-RO.rc
+++ b/base/applications/osk/lang/ro-RO.rc
@@ -9,7 +9,7 @@
LANGUAGE LANG_ROMANIAN, SUBLANG_DEFAULT
-MAIN_DIALOG DIALOGEX DISCARDABLE 0, 0, 463, 115
+MAIN_DIALOG_ENHANCED_KB DIALOGEX DISCARDABLE 0, 0, 463, 115
CAPTION "Tastatură virtuală"
FONT 8, "MS Shell Dlg"
MENU IDR_OSK_MENU
@@ -128,6 +128,125 @@ BEGIN
CONTROL
"",IDC_LED_SCROLL,"Static",SS_CENTER|SS_NOTIFY,443,15,4,3
END
+MAIN_DIALOG_STANDARD_KB DIALOGEX DISCARDABLE 0, 0, 362, 115
+CAPTION "On screen keyboard"
+FONT 8, "MS Shell Dlg"
+MENU IDR_OSK_MENU
+STYLE WS_SYSMENU | WS_MINIMIZEBOX
+EXSTYLE WS_EX_TOPMOST | WS_EX_NOACTIVATE | WS_EX_APPWINDOW
+BEGIN
+ PUSHBUTTON "Esc",SCAN_CODE_110,3,3,15,15
+ PUSHBUTTON "F1",SCAN_CODE_112,43,3,15,15
+ PUSHBUTTON "F2",SCAN_CODE_113,63,3,15,15
+ PUSHBUTTON "F3",SCAN_CODE_114,83,3,15,15
+ PUSHBUTTON "F4",SCAN_CODE_115,103,3,15,15
+ PUSHBUTTON "F5",SCAN_CODE_116,123,3,15,15
+ PUSHBUTTON "F6",SCAN_CODE_117,143,3,15,15
+ PUSHBUTTON "F7",SCAN_CODE_118,183,3,15,15
+ PUSHBUTTON "F8",SCAN_CODE_119,203,3,15,15
+ PUSHBUTTON "F9",SCAN_CODE_120,223,3,15,15
+ PUSHBUTTON "F10",SCAN_CODE_121,243,3,15,15
+ PUSHBUTTON "F11",SCAN_CODE_122,263,3,15,15
+ PUSHBUTTON "F12",SCAN_CODE_123,283,3,15,15
+ PUSHBUTTON "Prn",SCAN_CODE_124,304,3,15,15
+ PUSHBUTTON "Stop",SCAN_CODE_125,324,3,15,15
+ PUSHBUTTON "Attn",SCAN_CODE_126,344,3,15,15
+ PUSHBUTTON "`",SCAN_CODE_1,3,22,15,15
+ PUSHBUTTON "1",SCAN_CODE_2,23,22,15,15
+ PUSHBUTTON "2",SCAN_CODE_3,43,22,15,15
+ PUSHBUTTON "3",SCAN_CODE_4,63,22,15,15
+ PUSHBUTTON "4",SCAN_CODE_5,83,22,15,15
+ PUSHBUTTON "5",SCAN_CODE_6,103,22,15,15
+ PUSHBUTTON "6",SCAN_CODE_7,123,22,15,15
+ PUSHBUTTON "7",SCAN_CODE_8,143,22,15,15
+ PUSHBUTTON "8",SCAN_CODE_9,163,22,15,15
+ PUSHBUTTON "9",SCAN_CODE_10,183,22,15,15
+ PUSHBUTTON "0",SCAN_CODE_11,203,22,15,15
+ PUSHBUTTON "-",SCAN_CODE_12,223,22,15,15
+ PUSHBUTTON "=",SCAN_CODE_13,243,22,15,15
+ PUSHBUTTON "<--",SCAN_CODE_15,263,22,36,15,BS_ICON
+ PUSHBUTTON "Tab",SCAN_CODE_16,3,41,35,15,BS_ICON
+ PUSHBUTTON "q",SCAN_CODE_17,42,41,15,15
+ PUSHBUTTON "w",SCAN_CODE_18,61,41,15,15
+ PUSHBUTTON "e",SCAN_CODE_19,80,41,15,15
+ PUSHBUTTON "r",SCAN_CODE_20,99,41,15,15
+ PUSHBUTTON "t",SCAN_CODE_21,118,41,15,15
+ PUSHBUTTON "y",SCAN_CODE_22,137,41,15,15
+ PUSHBUTTON "u",SCAN_CODE_23,156,41,15,15
+ PUSHBUTTON "i",SCAN_CODE_24,175,41,15,15
+ PUSHBUTTON "o",SCAN_CODE_25,194,41,15,15
+ PUSHBUTTON "p",SCAN_CODE_26,213,41,15,15
+ PUSHBUTTON "[",SCAN_CODE_27,232,41,15,15
+ PUSHBUTTON "]",SCAN_CODE_28,251,41,15,15
+ PUSHBUTTON "lock",SCAN_CODE_30,3,60,46,15,BS_ICON
+ PUSHBUTTON "a",SCAN_CODE_31,53,60,15,15
+ PUSHBUTTON "s",SCAN_CODE_32,72,60,15,15
+ PUSHBUTTON "d",SCAN_CODE_33,91,60,15,15
+ PUSHBUTTON "f",SCAN_CODE_34,110,60,15,15
+ PUSHBUTTON "g",SCAN_CODE_35,129,60,15,15
+ PUSHBUTTON "h",SCAN_CODE_36,148,60,15,15
+ PUSHBUTTON "j",SCAN_CODE_37,167,60,15,15
+ PUSHBUTTON "k",SCAN_CODE_38,186,60,15,15
+ PUSHBUTTON "l",SCAN_CODE_39,205,60,15,15
+ PUSHBUTTON ";",SCAN_CODE_40,224,60,15,15
+ PUSHBUTTON "'",SCAN_CODE_41,243,60,15,15
+ PUSHBUTTON "\\",SCAN_CODE_29,270,41,30,15
+ PUSHBUTTON "ret",SCAN_CODE_43,262,60,38,15,BS_ICON
+ PUSHBUTTON
"shift",SCAN_CODE_44,3,79,57,15,BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX
+ PUSHBUTTON "z",SCAN_CODE_46,64,79,15,15
+ PUSHBUTTON "x",SCAN_CODE_47,83,79,15,15
+ PUSHBUTTON "c",SCAN_CODE_48,102,79,15,15
+ PUSHBUTTON "v",SCAN_CODE_49,121,79,15,15
+ PUSHBUTTON "b",SCAN_CODE_50,140,79,15,15
+ PUSHBUTTON "n",SCAN_CODE_51,159,79,15,15
+ PUSHBUTTON "m",SCAN_CODE_52,178,79,15,15
+ PUSHBUTTON ",",SCAN_CODE_53,197,79,15,15
+ PUSHBUTTON ".",SCAN_CODE_54,216,79,15,15
+ PUSHBUTTON "/",SCAN_CODE_55,235,79,15,15
+ PUSHBUTTON
"shift",SCAN_CODE_57,254,79,45,15,BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX
+ PUSHBUTTON "ctrl",SCAN_CODE_58,3,98,24,15,BS_PUSHLIKE|BS_AUTOCHECKBOX
+ PUSHBUTTON "v",SCAN_CODE_84,324,98,15,15,BS_ICON
+ PUSHBUTTON "ROS",SCAN_CODE_127,30,98,24,15,BS_ICON
+ PUSHBUTTON "alt",SCAN_CODE_60,57,98,24,15,BS_PUSHLIKE|BS_AUTOCHECKBOX
+ PUSHBUTTON "",SCAN_CODE_61,84,98,106,15 //space
+ PUSHBUTTON
"alt",SCAN_CODE_62,194,98,24,15,BS_PUSHLIKE|BS_AUTOCHECKBOX
+ PUSHBUTTON "ROS",SCAN_CODE_128,221,98,24,15,BS_ICON
+ PUSHBUTTON "menu",SCAN_CODE_129,248,98,24,15,BS_ICON
+ PUSHBUTTON
"ctrl",SCAN_CODE_64,275,98,24,15,BS_PUSHLIKE|BS_AUTOCHECKBOX
+ PUSHBUTTON "ins",SCAN_CODE_75,304,22,15,15
+ PUSHBUTTON "del",SCAN_CODE_76,304,41,15,15
+ PUSHBUTTON "hm",SCAN_CODE_80,324,22,15,15
+ PUSHBUTTON "end",SCAN_CODE_81,324,41,15,15
+ PUSHBUTTON "pup",SCAN_CODE_85,344,22,15,15
+ PUSHBUTTON "pdn",SCAN_CODE_86,344,41,15,15
+ PUSHBUTTON "<-",SCAN_CODE_79,304,98,15,15,BS_ICON
+ PUSHBUTTON "^",SCAN_CODE_83,324,79,15,15,BS_ICON
+ PUSHBUTTON "->",SCAN_CODE_89,344,98,15,15,BS_ICON
+ PUSHBUTTON "nlk",SCAN_CODE_90,364,22,15,15
+ PUSHBUTTON "7",SCAN_CODE_91,364,41,15,15
+ PUSHBUTTON "4",SCAN_CODE_92,364,60,15,15
+ PUSHBUTTON "1",SCAN_CODE_93,364,79,15,15
+ PUSHBUTTON "/",SCAN_CODE_95,384,22,15,15
+ PUSHBUTTON "8",SCAN_CODE_96,384,41,15,15
+ PUSHBUTTON "5",SCAN_CODE_97,384,60,15,15
+ PUSHBUTTON "2",SCAN_CODE_98,384,79,15,15
+ PUSHBUTTON "0",SCAN_CODE_99,364,98,34,15
+ PUSHBUTTON "*",SCAN_CODE_100,404,22,15,15
+ PUSHBUTTON "9",SCAN_CODE_101,404,41,15,15
+ PUSHBUTTON "6",SCAN_CODE_102,404,60,15,15
+ PUSHBUTTON "3",SCAN_CODE_103,404,79,15,15
+ PUSHBUTTON ".",SCAN_CODE_104,404,98,15,15
+ PUSHBUTTON "-",SCAN_CODE_105,424,22,15,15
+ PUSHBUTTON "+",SCAN_CODE_106,424,41,15,35
+ PUSHBUTTON "ent",SCAN_CODE_108,424,78,15,35
+ CTEXT "Num",IDC_STATIC,364,3,21,8
+ CONTROL
"",IDC_LED_NUM,"Static",SS_CENTER|SS_NOTIFY,372,15,4,3
+ CTEXT "Caps",IDC_STATIC,389,3,21,8
+ CONTROL
"",IDC_LED_CAPS,"Static",SS_CENTER|SS_NOTIFY,398,15,4,3
+ CTEXT "Scroll",IDC_STATIC,414,3,21,8
+ CONTROL
"",IDC_LED_SCROLL,"Static",SS_CENTER|SS_NOTIFY,424,15,4,3
+END
+
IDR_OSK_MENU MENU DISCARDABLE
BEGIN
POPUP "File"
@@ -137,8 +256,8 @@ BEGIN
POPUP "Keyboard"
BEGIN
- MENUITEM "Enhanced Keyboard", IDM_ENCHANCED_KB, CHECKED, GRAYED
- MENUITEM "Standard Keyboard", IDM_STANDARD_KB, GRAYED
+ MENUITEM "Enhanced Keyboard", IDM_ENHANCED_KB, CHECKED
+ MENUITEM "Standard Keyboard", IDM_STANDARD_KB
MENUITEM SEPARATOR
MENUITEM "Regular Layout", IDM_REG_LAYOUT, CHECKED, GRAYED
MENUITEM "Block Layout", IDM_BLOCK_LAYOUT, GRAYED
diff --git a/base/applications/osk/lang/ru-RU.rc b/base/applications/osk/lang/ru-RU.rc
index d4cdd6fef6..cbaafcf41b 100644
--- a/base/applications/osk/lang/ru-RU.rc
+++ b/base/applications/osk/lang/ru-RU.rc
@@ -8,7 +8,7 @@
LANGUAGE LANG_RUSSIAN, SUBLANG_NEUTRAL
-MAIN_DIALOG DIALOGEX DISCARDABLE 0, 0, 463, 115
+MAIN_DIALOG_ENHANCED_KB DIALOGEX DISCARDABLE 0, 0, 463, 115
CAPTION "Экранная клавиатура"
FONT 8, "MS Shell Dlg"
MENU IDR_OSK_MENU
@@ -127,6 +127,125 @@ BEGIN
CONTROL
"",IDC_LED_SCROLL,"Static",SS_CENTER|SS_NOTIFY,443,15,4,3
END
+MAIN_DIALOG_STANDARD_KB DIALOGEX DISCARDABLE 0, 0, 362, 115
+CAPTION "On screen keyboard"
+FONT 8, "MS Shell Dlg"
+MENU IDR_OSK_MENU
+STYLE WS_SYSMENU | WS_MINIMIZEBOX
+EXSTYLE WS_EX_TOPMOST | WS_EX_NOACTIVATE | WS_EX_APPWINDOW
+BEGIN
+ PUSHBUTTON "Esc",SCAN_CODE_110,3,3,15,15
+ PUSHBUTTON "F1",SCAN_CODE_112,43,3,15,15
+ PUSHBUTTON "F2",SCAN_CODE_113,63,3,15,15
+ PUSHBUTTON "F3",SCAN_CODE_114,83,3,15,15
+ PUSHBUTTON "F4",SCAN_CODE_115,103,3,15,15
+ PUSHBUTTON "F5",SCAN_CODE_116,123,3,15,15
+ PUSHBUTTON "F6",SCAN_CODE_117,143,3,15,15
+ PUSHBUTTON "F7",SCAN_CODE_118,183,3,15,15
+ PUSHBUTTON "F8",SCAN_CODE_119,203,3,15,15
+ PUSHBUTTON "F9",SCAN_CODE_120,223,3,15,15
+ PUSHBUTTON "F10",SCAN_CODE_121,243,3,15,15
+ PUSHBUTTON "F11",SCAN_CODE_122,263,3,15,15
+ PUSHBUTTON "F12",SCAN_CODE_123,283,3,15,15
+ PUSHBUTTON "Prn",SCAN_CODE_124,304,3,15,15
+ PUSHBUTTON "Stop",SCAN_CODE_125,324,3,15,15
+ PUSHBUTTON "Attn",SCAN_CODE_126,344,3,15,15
+ PUSHBUTTON "`",SCAN_CODE_1,3,22,15,15
+ PUSHBUTTON "1",SCAN_CODE_2,23,22,15,15
+ PUSHBUTTON "2",SCAN_CODE_3,43,22,15,15
+ PUSHBUTTON "3",SCAN_CODE_4,63,22,15,15
+ PUSHBUTTON "4",SCAN_CODE_5,83,22,15,15
+ PUSHBUTTON "5",SCAN_CODE_6,103,22,15,15
+ PUSHBUTTON "6",SCAN_CODE_7,123,22,15,15
+ PUSHBUTTON "7",SCAN_CODE_8,143,22,15,15
+ PUSHBUTTON "8",SCAN_CODE_9,163,22,15,15
+ PUSHBUTTON "9",SCAN_CODE_10,183,22,15,15
+ PUSHBUTTON "0",SCAN_CODE_11,203,22,15,15
+ PUSHBUTTON "-",SCAN_CODE_12,223,22,15,15
+ PUSHBUTTON "=",SCAN_CODE_13,243,22,15,15
+ PUSHBUTTON "<--",SCAN_CODE_15,263,22,36,15,BS_ICON
+ PUSHBUTTON "Tab",SCAN_CODE_16,3,41,35,15,BS_ICON
+ PUSHBUTTON "q",SCAN_CODE_17,42,41,15,15
+ PUSHBUTTON "w",SCAN_CODE_18,61,41,15,15
+ PUSHBUTTON "e",SCAN_CODE_19,80,41,15,15
+ PUSHBUTTON "r",SCAN_CODE_20,99,41,15,15
+ PUSHBUTTON "t",SCAN_CODE_21,118,41,15,15
+ PUSHBUTTON "y",SCAN_CODE_22,137,41,15,15
+ PUSHBUTTON "u",SCAN_CODE_23,156,41,15,15
+ PUSHBUTTON "i",SCAN_CODE_24,175,41,15,15
+ PUSHBUTTON "o",SCAN_CODE_25,194,41,15,15
+ PUSHBUTTON "p",SCAN_CODE_26,213,41,15,15
+ PUSHBUTTON "[",SCAN_CODE_27,232,41,15,15
+ PUSHBUTTON "]",SCAN_CODE_28,251,41,15,15
+ PUSHBUTTON "lock",SCAN_CODE_30,3,60,46,15,BS_ICON
+ PUSHBUTTON "a",SCAN_CODE_31,53,60,15,15
+ PUSHBUTTON "s",SCAN_CODE_32,72,60,15,15
+ PUSHBUTTON "d",SCAN_CODE_33,91,60,15,15
+ PUSHBUTTON "f",SCAN_CODE_34,110,60,15,15
+ PUSHBUTTON "g",SCAN_CODE_35,129,60,15,15
+ PUSHBUTTON "h",SCAN_CODE_36,148,60,15,15
+ PUSHBUTTON "j",SCAN_CODE_37,167,60,15,15
+ PUSHBUTTON "k",SCAN_CODE_38,186,60,15,15
+ PUSHBUTTON "l",SCAN_CODE_39,205,60,15,15
+ PUSHBUTTON ";",SCAN_CODE_40,224,60,15,15
+ PUSHBUTTON "'",SCAN_CODE_41,243,60,15,15
+ PUSHBUTTON "\\",SCAN_CODE_29,270,41,30,15
+ PUSHBUTTON "ret",SCAN_CODE_43,262,60,38,15,BS_ICON
+ PUSHBUTTON
"shift",SCAN_CODE_44,3,79,57,15,BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX
+ PUSHBUTTON "z",SCAN_CODE_46,64,79,15,15
+ PUSHBUTTON "x",SCAN_CODE_47,83,79,15,15
+ PUSHBUTTON "c",SCAN_CODE_48,102,79,15,15
+ PUSHBUTTON "v",SCAN_CODE_49,121,79,15,15
+ PUSHBUTTON "b",SCAN_CODE_50,140,79,15,15
+ PUSHBUTTON "n",SCAN_CODE_51,159,79,15,15
+ PUSHBUTTON "m",SCAN_CODE_52,178,79,15,15
+ PUSHBUTTON ",",SCAN_CODE_53,197,79,15,15
+ PUSHBUTTON ".",SCAN_CODE_54,216,79,15,15
+ PUSHBUTTON "/",SCAN_CODE_55,235,79,15,15
+ PUSHBUTTON
"shift",SCAN_CODE_57,254,79,45,15,BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX
+ PUSHBUTTON "ctrl",SCAN_CODE_58,3,98,24,15,BS_PUSHLIKE|BS_AUTOCHECKBOX
+ PUSHBUTTON "v",SCAN_CODE_84,324,98,15,15,BS_ICON
+ PUSHBUTTON "ROS",SCAN_CODE_127,30,98,24,15,BS_ICON
+ PUSHBUTTON "alt",SCAN_CODE_60,57,98,24,15,BS_PUSHLIKE|BS_AUTOCHECKBOX
+ PUSHBUTTON "",SCAN_CODE_61,84,98,106,15 //space
+ PUSHBUTTON
"alt",SCAN_CODE_62,194,98,24,15,BS_PUSHLIKE|BS_AUTOCHECKBOX
+ PUSHBUTTON "ROS",SCAN_CODE_128,221,98,24,15,BS_ICON
+ PUSHBUTTON "menu",SCAN_CODE_129,248,98,24,15,BS_ICON
+ PUSHBUTTON
"ctrl",SCAN_CODE_64,275,98,24,15,BS_PUSHLIKE|BS_AUTOCHECKBOX
+ PUSHBUTTON "ins",SCAN_CODE_75,304,22,15,15
+ PUSHBUTTON "del",SCAN_CODE_76,304,41,15,15
+ PUSHBUTTON "hm",SCAN_CODE_80,324,22,15,15
+ PUSHBUTTON "end",SCAN_CODE_81,324,41,15,15
+ PUSHBUTTON "pup",SCAN_CODE_85,344,22,15,15
+ PUSHBUTTON "pdn",SCAN_CODE_86,344,41,15,15
+ PUSHBUTTON "<-",SCAN_CODE_79,304,98,15,15,BS_ICON
+ PUSHBUTTON "^",SCAN_CODE_83,324,79,15,15,BS_ICON
+ PUSHBUTTON "->",SCAN_CODE_89,344,98,15,15,BS_ICON
+ PUSHBUTTON "nlk",SCAN_CODE_90,364,22,15,15
+ PUSHBUTTON "7",SCAN_CODE_91,364,41,15,15
+ PUSHBUTTON "4",SCAN_CODE_92,364,60,15,15
+ PUSHBUTTON "1",SCAN_CODE_93,364,79,15,15
+ PUSHBUTTON "/",SCAN_CODE_95,384,22,15,15
+ PUSHBUTTON "8",SCAN_CODE_96,384,41,15,15
+ PUSHBUTTON "5",SCAN_CODE_97,384,60,15,15
+ PUSHBUTTON "2",SCAN_CODE_98,384,79,15,15
+ PUSHBUTTON "0",SCAN_CODE_99,364,98,34,15
+ PUSHBUTTON "*",SCAN_CODE_100,404,22,15,15
+ PUSHBUTTON "9",SCAN_CODE_101,404,41,15,15
+ PUSHBUTTON "6",SCAN_CODE_102,404,60,15,15
+ PUSHBUTTON "3",SCAN_CODE_103,404,79,15,15
+ PUSHBUTTON ".",SCAN_CODE_104,404,98,15,15
+ PUSHBUTTON "-",SCAN_CODE_105,424,22,15,15
+ PUSHBUTTON "+",SCAN_CODE_106,424,41,15,35
+ PUSHBUTTON "ent",SCAN_CODE_108,424,78,15,35
+ CTEXT "Num",IDC_STATIC,364,3,21,8
+ CONTROL
"",IDC_LED_NUM,"Static",SS_CENTER|SS_NOTIFY,372,15,4,3
+ CTEXT "Caps",IDC_STATIC,389,3,21,8
+ CONTROL
"",IDC_LED_CAPS,"Static",SS_CENTER|SS_NOTIFY,398,15,4,3
+ CTEXT "Scroll",IDC_STATIC,414,3,21,8
+ CONTROL
"",IDC_LED_SCROLL,"Static",SS_CENTER|SS_NOTIFY,424,15,4,3
+END
+
IDR_OSK_MENU MENU DISCARDABLE
BEGIN
POPUP "File"
@@ -136,8 +255,8 @@ BEGIN
POPUP "Keyboard"
BEGIN
- MENUITEM "Enhanced Keyboard", IDM_ENCHANCED_KB, CHECKED, GRAYED
- MENUITEM "Standard Keyboard", IDM_STANDARD_KB, GRAYED
+ MENUITEM "Enhanced Keyboard", IDM_ENHANCED_KB, CHECKED
+ MENUITEM "Standard Keyboard", IDM_STANDARD_KB
MENUITEM SEPARATOR
MENUITEM "Regular Layout", IDM_REG_LAYOUT, CHECKED, GRAYED
MENUITEM "Block Layout", IDM_BLOCK_LAYOUT, GRAYED
diff --git a/base/applications/osk/lang/tr-TR.rc b/base/applications/osk/lang/tr-TR.rc
index c12958f67c..3ccca25ba1 100644
--- a/base/applications/osk/lang/tr-TR.rc
+++ b/base/applications/osk/lang/tr-TR.rc
@@ -8,7 +8,7 @@
LANGUAGE LANG_TURKISH, SUBLANG_DEFAULT
-MAIN_DIALOG DIALOGEX DISCARDABLE 0, 0, 608, 164
+MAIN_DIALOG_ENHANCED_KB DIALOGEX DISCARDABLE 0, 0, 608, 164
CAPTION "Ekran Klavyesi"
FONT 8, "MS Shell Dlg"
MENU IDR_OSK_MENU
@@ -127,6 +127,125 @@ BEGIN
CONTROL
"",IDC_LED_SCROLL,"Static",SS_CENTER|SS_NOTIFY,580,16,4,3
END
+MAIN_DIALOG_STANDARD_KB DIALOGEX DISCARDABLE 0, 0, 362, 115
+CAPTION "On screen keyboard"
+FONT 8, "MS Shell Dlg"
+MENU IDR_OSK_MENU
+STYLE WS_SYSMENU | WS_MINIMIZEBOX
+EXSTYLE WS_EX_TOPMOST | WS_EX_NOACTIVATE | WS_EX_APPWINDOW
+BEGIN
+ PUSHBUTTON "Esc",SCAN_CODE_110,3,3,15,15
+ PUSHBUTTON "F1",SCAN_CODE_112,43,3,15,15
+ PUSHBUTTON "F2",SCAN_CODE_113,63,3,15,15
+ PUSHBUTTON "F3",SCAN_CODE_114,83,3,15,15
+ PUSHBUTTON "F4",SCAN_CODE_115,103,3,15,15
+ PUSHBUTTON "F5",SCAN_CODE_116,123,3,15,15
+ PUSHBUTTON "F6",SCAN_CODE_117,143,3,15,15
+ PUSHBUTTON "F7",SCAN_CODE_118,183,3,15,15
+ PUSHBUTTON "F8",SCAN_CODE_119,203,3,15,15
+ PUSHBUTTON "F9",SCAN_CODE_120,223,3,15,15
+ PUSHBUTTON "F10",SCAN_CODE_121,243,3,15,15
+ PUSHBUTTON "F11",SCAN_CODE_122,263,3,15,15
+ PUSHBUTTON "F12",SCAN_CODE_123,283,3,15,15
+ PUSHBUTTON "Prn",SCAN_CODE_124,304,3,15,15
+ PUSHBUTTON "Stop",SCAN_CODE_125,324,3,15,15
+ PUSHBUTTON "Attn",SCAN_CODE_126,344,3,15,15
+ PUSHBUTTON "`",SCAN_CODE_1,3,22,15,15
+ PUSHBUTTON "1",SCAN_CODE_2,23,22,15,15
+ PUSHBUTTON "2",SCAN_CODE_3,43,22,15,15
+ PUSHBUTTON "3",SCAN_CODE_4,63,22,15,15
+ PUSHBUTTON "4",SCAN_CODE_5,83,22,15,15
+ PUSHBUTTON "5",SCAN_CODE_6,103,22,15,15
+ PUSHBUTTON "6",SCAN_CODE_7,123,22,15,15
+ PUSHBUTTON "7",SCAN_CODE_8,143,22,15,15
+ PUSHBUTTON "8",SCAN_CODE_9,163,22,15,15
+ PUSHBUTTON "9",SCAN_CODE_10,183,22,15,15
+ PUSHBUTTON "0",SCAN_CODE_11,203,22,15,15
+ PUSHBUTTON "-",SCAN_CODE_12,223,22,15,15
+ PUSHBUTTON "=",SCAN_CODE_13,243,22,15,15
+ PUSHBUTTON "<--",SCAN_CODE_15,263,22,36,15,BS_ICON
+ PUSHBUTTON "Tab",SCAN_CODE_16,3,41,35,15,BS_ICON
+ PUSHBUTTON "q",SCAN_CODE_17,42,41,15,15
+ PUSHBUTTON "w",SCAN_CODE_18,61,41,15,15
+ PUSHBUTTON "e",SCAN_CODE_19,80,41,15,15
+ PUSHBUTTON "r",SCAN_CODE_20,99,41,15,15
+ PUSHBUTTON "t",SCAN_CODE_21,118,41,15,15
+ PUSHBUTTON "y",SCAN_CODE_22,137,41,15,15
+ PUSHBUTTON "u",SCAN_CODE_23,156,41,15,15
+ PUSHBUTTON "i",SCAN_CODE_24,175,41,15,15
+ PUSHBUTTON "o",SCAN_CODE_25,194,41,15,15
+ PUSHBUTTON "p",SCAN_CODE_26,213,41,15,15
+ PUSHBUTTON "[",SCAN_CODE_27,232,41,15,15
+ PUSHBUTTON "]",SCAN_CODE_28,251,41,15,15
+ PUSHBUTTON "lock",SCAN_CODE_30,3,60,46,15,BS_ICON
+ PUSHBUTTON "a",SCAN_CODE_31,53,60,15,15
+ PUSHBUTTON "s",SCAN_CODE_32,72,60,15,15
+ PUSHBUTTON "d",SCAN_CODE_33,91,60,15,15
+ PUSHBUTTON "f",SCAN_CODE_34,110,60,15,15
+ PUSHBUTTON "g",SCAN_CODE_35,129,60,15,15
+ PUSHBUTTON "h",SCAN_CODE_36,148,60,15,15
+ PUSHBUTTON "j",SCAN_CODE_37,167,60,15,15
+ PUSHBUTTON "k",SCAN_CODE_38,186,60,15,15
+ PUSHBUTTON "l",SCAN_CODE_39,205,60,15,15
+ PUSHBUTTON ";",SCAN_CODE_40,224,60,15,15
+ PUSHBUTTON "'",SCAN_CODE_41,243,60,15,15
+ PUSHBUTTON "\\",SCAN_CODE_29,270,41,30,15
+ PUSHBUTTON "ret",SCAN_CODE_43,262,60,38,15,BS_ICON
+ PUSHBUTTON
"shift",SCAN_CODE_44,3,79,57,15,BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX
+ PUSHBUTTON "z",SCAN_CODE_46,64,79,15,15
+ PUSHBUTTON "x",SCAN_CODE_47,83,79,15,15
+ PUSHBUTTON "c",SCAN_CODE_48,102,79,15,15
+ PUSHBUTTON "v",SCAN_CODE_49,121,79,15,15
+ PUSHBUTTON "b",SCAN_CODE_50,140,79,15,15
+ PUSHBUTTON "n",SCAN_CODE_51,159,79,15,15
+ PUSHBUTTON "m",SCAN_CODE_52,178,79,15,15
+ PUSHBUTTON ",",SCAN_CODE_53,197,79,15,15
+ PUSHBUTTON ".",SCAN_CODE_54,216,79,15,15
+ PUSHBUTTON "/",SCAN_CODE_55,235,79,15,15
+ PUSHBUTTON
"shift",SCAN_CODE_57,254,79,45,15,BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX
+ PUSHBUTTON "ctrl",SCAN_CODE_58,3,98,24,15,BS_PUSHLIKE|BS_AUTOCHECKBOX
+ PUSHBUTTON "v",SCAN_CODE_84,324,98,15,15,BS_ICON
+ PUSHBUTTON "ROS",SCAN_CODE_127,30,98,24,15,BS_ICON
+ PUSHBUTTON "alt",SCAN_CODE_60,57,98,24,15,BS_PUSHLIKE|BS_AUTOCHECKBOX
+ PUSHBUTTON "",SCAN_CODE_61,84,98,106,15 //space
+ PUSHBUTTON
"alt",SCAN_CODE_62,194,98,24,15,BS_PUSHLIKE|BS_AUTOCHECKBOX
+ PUSHBUTTON "ROS",SCAN_CODE_128,221,98,24,15,BS_ICON
+ PUSHBUTTON "menu",SCAN_CODE_129,248,98,24,15,BS_ICON
+ PUSHBUTTON
"ctrl",SCAN_CODE_64,275,98,24,15,BS_PUSHLIKE|BS_AUTOCHECKBOX
+ PUSHBUTTON "ins",SCAN_CODE_75,304,22,15,15
+ PUSHBUTTON "del",SCAN_CODE_76,304,41,15,15
+ PUSHBUTTON "hm",SCAN_CODE_80,324,22,15,15
+ PUSHBUTTON "end",SCAN_CODE_81,324,41,15,15
+ PUSHBUTTON "pup",SCAN_CODE_85,344,22,15,15
+ PUSHBUTTON "pdn",SCAN_CODE_86,344,41,15,15
+ PUSHBUTTON "<-",SCAN_CODE_79,304,98,15,15,BS_ICON
+ PUSHBUTTON "^",SCAN_CODE_83,324,79,15,15,BS_ICON
+ PUSHBUTTON "->",SCAN_CODE_89,344,98,15,15,BS_ICON
+ PUSHBUTTON "nlk",SCAN_CODE_90,364,22,15,15
+ PUSHBUTTON "7",SCAN_CODE_91,364,41,15,15
+ PUSHBUTTON "4",SCAN_CODE_92,364,60,15,15
+ PUSHBUTTON "1",SCAN_CODE_93,364,79,15,15
+ PUSHBUTTON "/",SCAN_CODE_95,384,22,15,15
+ PUSHBUTTON "8",SCAN_CODE_96,384,41,15,15
+ PUSHBUTTON "5",SCAN_CODE_97,384,60,15,15
+ PUSHBUTTON "2",SCAN_CODE_98,384,79,15,15
+ PUSHBUTTON "0",SCAN_CODE_99,364,98,34,15
+ PUSHBUTTON "*",SCAN_CODE_100,404,22,15,15
+ PUSHBUTTON "9",SCAN_CODE_101,404,41,15,15
+ PUSHBUTTON "6",SCAN_CODE_102,404,60,15,15
+ PUSHBUTTON "3",SCAN_CODE_103,404,79,15,15
+ PUSHBUTTON ".",SCAN_CODE_104,404,98,15,15
+ PUSHBUTTON "-",SCAN_CODE_105,424,22,15,15
+ PUSHBUTTON "+",SCAN_CODE_106,424,41,15,35
+ PUSHBUTTON "ent",SCAN_CODE_108,424,78,15,35
+ CTEXT "Num",IDC_STATIC,364,3,21,8
+ CONTROL
"",IDC_LED_NUM,"Static",SS_CENTER|SS_NOTIFY,372,15,4,3
+ CTEXT "Caps",IDC_STATIC,389,3,21,8
+ CONTROL
"",IDC_LED_CAPS,"Static",SS_CENTER|SS_NOTIFY,398,15,4,3
+ CTEXT "Scroll",IDC_STATIC,414,3,21,8
+ CONTROL
"",IDC_LED_SCROLL,"Static",SS_CENTER|SS_NOTIFY,424,15,4,3
+END
+
IDR_OSK_MENU MENU DISCARDABLE
BEGIN
POPUP "File"
@@ -136,8 +255,8 @@ BEGIN
POPUP "Keyboard"
BEGIN
- MENUITEM "Enhanced Keyboard", IDM_ENCHANCED_KB, CHECKED, GRAYED
- MENUITEM "Standard Keyboard", IDM_STANDARD_KB, GRAYED
+ MENUITEM "Enhanced Keyboard", IDM_ENHANCED_KB, CHECKED
+ MENUITEM "Standard Keyboard", IDM_STANDARD_KB
MENUITEM SEPARATOR
MENUITEM "Regular Layout", IDM_REG_LAYOUT, CHECKED, GRAYED
MENUITEM "Block Layout", IDM_BLOCK_LAYOUT, GRAYED
diff --git a/base/applications/osk/lang/zh-CN.rc b/base/applications/osk/lang/zh-CN.rc
index f8deff18d4..da381ed815 100644
--- a/base/applications/osk/lang/zh-CN.rc
+++ b/base/applications/osk/lang/zh-CN.rc
@@ -11,7 +11,7 @@
LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED
-MAIN_DIALOG DIALOGEX DISCARDABLE 0, 0, 608, 164
+MAIN_DIALOG_ENHANCED_KB DIALOGEX DISCARDABLE 0, 0, 608, 164
CAPTION "屏幕键盘"
FONT 9, "宋体"
MENU IDR_OSK_MENU
@@ -130,6 +130,125 @@ BEGIN
CONTROL
"",IDC_LED_SCROLL,"Static",SS_CENTER|SS_NOTIFY,580,16,4,3
END
+MAIN_DIALOG_STANDARD_KB DIALOGEX DISCARDABLE 0, 0, 362, 115
+CAPTION "On screen keyboard"
+FONT 8, "MS Shell Dlg"
+MENU IDR_OSK_MENU
+STYLE WS_SYSMENU | WS_MINIMIZEBOX
+EXSTYLE WS_EX_TOPMOST | WS_EX_NOACTIVATE | WS_EX_APPWINDOW
+BEGIN
+ PUSHBUTTON "Esc",SCAN_CODE_110,3,3,15,15
+ PUSHBUTTON "F1",SCAN_CODE_112,43,3,15,15
+ PUSHBUTTON "F2",SCAN_CODE_113,63,3,15,15
+ PUSHBUTTON "F3",SCAN_CODE_114,83,3,15,15
+ PUSHBUTTON "F4",SCAN_CODE_115,103,3,15,15
+ PUSHBUTTON "F5",SCAN_CODE_116,123,3,15,15
+ PUSHBUTTON "F6",SCAN_CODE_117,143,3,15,15
+ PUSHBUTTON "F7",SCAN_CODE_118,183,3,15,15
+ PUSHBUTTON "F8",SCAN_CODE_119,203,3,15,15
+ PUSHBUTTON "F9",SCAN_CODE_120,223,3,15,15
+ PUSHBUTTON "F10",SCAN_CODE_121,243,3,15,15
+ PUSHBUTTON "F11",SCAN_CODE_122,263,3,15,15
+ PUSHBUTTON "F12",SCAN_CODE_123,283,3,15,15
+ PUSHBUTTON "Prn",SCAN_CODE_124,304,3,15,15
+ PUSHBUTTON "Stop",SCAN_CODE_125,324,3,15,15
+ PUSHBUTTON "Attn",SCAN_CODE_126,344,3,15,15
+ PUSHBUTTON "`",SCAN_CODE_1,3,22,15,15
+ PUSHBUTTON "1",SCAN_CODE_2,23,22,15,15
+ PUSHBUTTON "2",SCAN_CODE_3,43,22,15,15
+ PUSHBUTTON "3",SCAN_CODE_4,63,22,15,15
+ PUSHBUTTON "4",SCAN_CODE_5,83,22,15,15
+ PUSHBUTTON "5",SCAN_CODE_6,103,22,15,15
+ PUSHBUTTON "6",SCAN_CODE_7,123,22,15,15
+ PUSHBUTTON "7",SCAN_CODE_8,143,22,15,15
+ PUSHBUTTON "8",SCAN_CODE_9,163,22,15,15
+ PUSHBUTTON "9",SCAN_CODE_10,183,22,15,15
+ PUSHBUTTON "0",SCAN_CODE_11,203,22,15,15
+ PUSHBUTTON "-",SCAN_CODE_12,223,22,15,15
+ PUSHBUTTON "=",SCAN_CODE_13,243,22,15,15
+ PUSHBUTTON "<--",SCAN_CODE_15,263,22,36,15,BS_ICON
+ PUSHBUTTON "Tab",SCAN_CODE_16,3,41,35,15,BS_ICON
+ PUSHBUTTON "q",SCAN_CODE_17,42,41,15,15
+ PUSHBUTTON "w",SCAN_CODE_18,61,41,15,15
+ PUSHBUTTON "e",SCAN_CODE_19,80,41,15,15
+ PUSHBUTTON "r",SCAN_CODE_20,99,41,15,15
+ PUSHBUTTON "t",SCAN_CODE_21,118,41,15,15
+ PUSHBUTTON "y",SCAN_CODE_22,137,41,15,15
+ PUSHBUTTON "u",SCAN_CODE_23,156,41,15,15
+ PUSHBUTTON "i",SCAN_CODE_24,175,41,15,15
+ PUSHBUTTON "o",SCAN_CODE_25,194,41,15,15
+ PUSHBUTTON "p",SCAN_CODE_26,213,41,15,15
+ PUSHBUTTON "[",SCAN_CODE_27,232,41,15,15
+ PUSHBUTTON "]",SCAN_CODE_28,251,41,15,15
+ PUSHBUTTON "lock",SCAN_CODE_30,3,60,46,15,BS_ICON
+ PUSHBUTTON "a",SCAN_CODE_31,53,60,15,15
+ PUSHBUTTON "s",SCAN_CODE_32,72,60,15,15
+ PUSHBUTTON "d",SCAN_CODE_33,91,60,15,15
+ PUSHBUTTON "f",SCAN_CODE_34,110,60,15,15
+ PUSHBUTTON "g",SCAN_CODE_35,129,60,15,15
+ PUSHBUTTON "h",SCAN_CODE_36,148,60,15,15
+ PUSHBUTTON "j",SCAN_CODE_37,167,60,15,15
+ PUSHBUTTON "k",SCAN_CODE_38,186,60,15,15
+ PUSHBUTTON "l",SCAN_CODE_39,205,60,15,15
+ PUSHBUTTON ";",SCAN_CODE_40,224,60,15,15
+ PUSHBUTTON "'",SCAN_CODE_41,243,60,15,15
+ PUSHBUTTON "\\",SCAN_CODE_29,270,41,30,15
+ PUSHBUTTON "ret",SCAN_CODE_43,262,60,38,15,BS_ICON
+ PUSHBUTTON
"shift",SCAN_CODE_44,3,79,57,15,BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX
+ PUSHBUTTON "z",SCAN_CODE_46,64,79,15,15
+ PUSHBUTTON "x",SCAN_CODE_47,83,79,15,15
+ PUSHBUTTON "c",SCAN_CODE_48,102,79,15,15
+ PUSHBUTTON "v",SCAN_CODE_49,121,79,15,15
+ PUSHBUTTON "b",SCAN_CODE_50,140,79,15,15
+ PUSHBUTTON "n",SCAN_CODE_51,159,79,15,15
+ PUSHBUTTON "m",SCAN_CODE_52,178,79,15,15
+ PUSHBUTTON ",",SCAN_CODE_53,197,79,15,15
+ PUSHBUTTON ".",SCAN_CODE_54,216,79,15,15
+ PUSHBUTTON "/",SCAN_CODE_55,235,79,15,15
+ PUSHBUTTON
"shift",SCAN_CODE_57,254,79,45,15,BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX
+ PUSHBUTTON "ctrl",SCAN_CODE_58,3,98,24,15,BS_PUSHLIKE|BS_AUTOCHECKBOX
+ PUSHBUTTON "v",SCAN_CODE_84,324,98,15,15,BS_ICON
+ PUSHBUTTON "ROS",SCAN_CODE_127,30,98,24,15,BS_ICON
+ PUSHBUTTON "alt",SCAN_CODE_60,57,98,24,15,BS_PUSHLIKE|BS_AUTOCHECKBOX
+ PUSHBUTTON "",SCAN_CODE_61,84,98,106,15 //space
+ PUSHBUTTON
"alt",SCAN_CODE_62,194,98,24,15,BS_PUSHLIKE|BS_AUTOCHECKBOX
+ PUSHBUTTON "ROS",SCAN_CODE_128,221,98,24,15,BS_ICON
+ PUSHBUTTON "menu",SCAN_CODE_129,248,98,24,15,BS_ICON
+ PUSHBUTTON
"ctrl",SCAN_CODE_64,275,98,24,15,BS_PUSHLIKE|BS_AUTOCHECKBOX
+ PUSHBUTTON "ins",SCAN_CODE_75,304,22,15,15
+ PUSHBUTTON "del",SCAN_CODE_76,304,41,15,15
+ PUSHBUTTON "hm",SCAN_CODE_80,324,22,15,15
+ PUSHBUTTON "end",SCAN_CODE_81,324,41,15,15
+ PUSHBUTTON "pup",SCAN_CODE_85,344,22,15,15
+ PUSHBUTTON "pdn",SCAN_CODE_86,344,41,15,15
+ PUSHBUTTON "<-",SCAN_CODE_79,304,98,15,15,BS_ICON
+ PUSHBUTTON "^",SCAN_CODE_83,324,79,15,15,BS_ICON
+ PUSHBUTTON "->",SCAN_CODE_89,344,98,15,15,BS_ICON
+ PUSHBUTTON "nlk",SCAN_CODE_90,364,22,15,15
+ PUSHBUTTON "7",SCAN_CODE_91,364,41,15,15
+ PUSHBUTTON "4",SCAN_CODE_92,364,60,15,15
+ PUSHBUTTON "1",SCAN_CODE_93,364,79,15,15
+ PUSHBUTTON "/",SCAN_CODE_95,384,22,15,15
+ PUSHBUTTON "8",SCAN_CODE_96,384,41,15,15
+ PUSHBUTTON "5",SCAN_CODE_97,384,60,15,15
+ PUSHBUTTON "2",SCAN_CODE_98,384,79,15,15
+ PUSHBUTTON "0",SCAN_CODE_99,364,98,34,15
+ PUSHBUTTON "*",SCAN_CODE_100,404,22,15,15
+ PUSHBUTTON "9",SCAN_CODE_101,404,41,15,15
+ PUSHBUTTON "6",SCAN_CODE_102,404,60,15,15
+ PUSHBUTTON "3",SCAN_CODE_103,404,79,15,15
+ PUSHBUTTON ".",SCAN_CODE_104,404,98,15,15
+ PUSHBUTTON "-",SCAN_CODE_105,424,22,15,15
+ PUSHBUTTON "+",SCAN_CODE_106,424,41,15,35
+ PUSHBUTTON "ent",SCAN_CODE_108,424,78,15,35
+ CTEXT "Num",IDC_STATIC,364,3,21,8
+ CONTROL
"",IDC_LED_NUM,"Static",SS_CENTER|SS_NOTIFY,372,15,4,3
+ CTEXT "Caps",IDC_STATIC,389,3,21,8
+ CONTROL
"",IDC_LED_CAPS,"Static",SS_CENTER|SS_NOTIFY,398,15,4,3
+ CTEXT "Scroll",IDC_STATIC,414,3,21,8
+ CONTROL
"",IDC_LED_SCROLL,"Static",SS_CENTER|SS_NOTIFY,424,15,4,3
+END
+
IDR_OSK_MENU MENU DISCARDABLE
BEGIN
POPUP "File"
@@ -139,8 +258,8 @@ BEGIN
POPUP "Keyboard"
BEGIN
- MENUITEM "Enhanced Keyboard", IDM_ENCHANCED_KB, CHECKED, GRAYED
- MENUITEM "Standard Keyboard", IDM_STANDARD_KB, GRAYED
+ MENUITEM "Enhanced Keyboard", IDM_ENHANCED_KB, CHECKED
+ MENUITEM "Standard Keyboard", IDM_STANDARD_KB
MENUITEM SEPARATOR
MENUITEM "Regular Layout", IDM_REG_LAYOUT, CHECKED, GRAYED
MENUITEM "Block Layout", IDM_BLOCK_LAYOUT, GRAYED
diff --git a/base/applications/osk/lang/zh-TW.rc b/base/applications/osk/lang/zh-TW.rc
index 97e83a7f79..3ea417a631 100644
--- a/base/applications/osk/lang/zh-TW.rc
+++ b/base/applications/osk/lang/zh-TW.rc
@@ -10,7 +10,7 @@
LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_TRADITIONAL
-MAIN_DIALOG DIALOGEX DISCARDABLE 0, 0, 608, 164
+MAIN_DIALOG_ENHANCED_KB DIALOGEX DISCARDABLE 0, 0, 608, 164
CAPTION "螢幕鍵盤"
FONT 9, "新細明體"
MENU IDR_OSK_MENU
@@ -129,6 +129,125 @@ BEGIN
CONTROL
"",IDC_LED_SCROLL,"Static",SS_CENTER|SS_NOTIFY,580,16,4,3
END
+MAIN_DIALOG_STANDARD_KB DIALOGEX DISCARDABLE 0, 0, 362, 115
+CAPTION "On screen keyboard"
+FONT 8, "MS Shell Dlg"
+MENU IDR_OSK_MENU
+STYLE WS_SYSMENU | WS_MINIMIZEBOX
+EXSTYLE WS_EX_TOPMOST | WS_EX_NOACTIVATE | WS_EX_APPWINDOW
+BEGIN
+ PUSHBUTTON "Esc",SCAN_CODE_110,3,3,15,15
+ PUSHBUTTON "F1",SCAN_CODE_112,43,3,15,15
+ PUSHBUTTON "F2",SCAN_CODE_113,63,3,15,15
+ PUSHBUTTON "F3",SCAN_CODE_114,83,3,15,15
+ PUSHBUTTON "F4",SCAN_CODE_115,103,3,15,15
+ PUSHBUTTON "F5",SCAN_CODE_116,123,3,15,15
+ PUSHBUTTON "F6",SCAN_CODE_117,143,3,15,15
+ PUSHBUTTON "F7",SCAN_CODE_118,183,3,15,15
+ PUSHBUTTON "F8",SCAN_CODE_119,203,3,15,15
+ PUSHBUTTON "F9",SCAN_CODE_120,223,3,15,15
+ PUSHBUTTON "F10",SCAN_CODE_121,243,3,15,15
+ PUSHBUTTON "F11",SCAN_CODE_122,263,3,15,15
+ PUSHBUTTON "F12",SCAN_CODE_123,283,3,15,15
+ PUSHBUTTON "Prn",SCAN_CODE_124,304,3,15,15
+ PUSHBUTTON "Stop",SCAN_CODE_125,324,3,15,15
+ PUSHBUTTON "Attn",SCAN_CODE_126,344,3,15,15
+ PUSHBUTTON "`",SCAN_CODE_1,3,22,15,15
+ PUSHBUTTON "1",SCAN_CODE_2,23,22,15,15
+ PUSHBUTTON "2",SCAN_CODE_3,43,22,15,15
+ PUSHBUTTON "3",SCAN_CODE_4,63,22,15,15
+ PUSHBUTTON "4",SCAN_CODE_5,83,22,15,15
+ PUSHBUTTON "5",SCAN_CODE_6,103,22,15,15
+ PUSHBUTTON "6",SCAN_CODE_7,123,22,15,15
+ PUSHBUTTON "7",SCAN_CODE_8,143,22,15,15
+ PUSHBUTTON "8",SCAN_CODE_9,163,22,15,15
+ PUSHBUTTON "9",SCAN_CODE_10,183,22,15,15
+ PUSHBUTTON "0",SCAN_CODE_11,203,22,15,15
+ PUSHBUTTON "-",SCAN_CODE_12,223,22,15,15
+ PUSHBUTTON "=",SCAN_CODE_13,243,22,15,15
+ PUSHBUTTON "<--",SCAN_CODE_15,263,22,36,15,BS_ICON
+ PUSHBUTTON "Tab",SCAN_CODE_16,3,41,35,15,BS_ICON
+ PUSHBUTTON "q",SCAN_CODE_17,42,41,15,15
+ PUSHBUTTON "w",SCAN_CODE_18,61,41,15,15
+ PUSHBUTTON "e",SCAN_CODE_19,80,41,15,15
+ PUSHBUTTON "r",SCAN_CODE_20,99,41,15,15
+ PUSHBUTTON "t",SCAN_CODE_21,118,41,15,15
+ PUSHBUTTON "y",SCAN_CODE_22,137,41,15,15
+ PUSHBUTTON "u",SCAN_CODE_23,156,41,15,15
+ PUSHBUTTON "i",SCAN_CODE_24,175,41,15,15
+ PUSHBUTTON "o",SCAN_CODE_25,194,41,15,15
+ PUSHBUTTON "p",SCAN_CODE_26,213,41,15,15
+ PUSHBUTTON "[",SCAN_CODE_27,232,41,15,15
+ PUSHBUTTON "]",SCAN_CODE_28,251,41,15,15
+ PUSHBUTTON "lock",SCAN_CODE_30,3,60,46,15,BS_ICON
+ PUSHBUTTON "a",SCAN_CODE_31,53,60,15,15
+ PUSHBUTTON "s",SCAN_CODE_32,72,60,15,15
+ PUSHBUTTON "d",SCAN_CODE_33,91,60,15,15
+ PUSHBUTTON "f",SCAN_CODE_34,110,60,15,15
+ PUSHBUTTON "g",SCAN_CODE_35,129,60,15,15
+ PUSHBUTTON "h",SCAN_CODE_36,148,60,15,15
+ PUSHBUTTON "j",SCAN_CODE_37,167,60,15,15
+ PUSHBUTTON "k",SCAN_CODE_38,186,60,15,15
+ PUSHBUTTON "l",SCAN_CODE_39,205,60,15,15
+ PUSHBUTTON ";",SCAN_CODE_40,224,60,15,15
+ PUSHBUTTON "'",SCAN_CODE_41,243,60,15,15
+ PUSHBUTTON "\\",SCAN_CODE_29,270,41,30,15
+ PUSHBUTTON "ret",SCAN_CODE_43,262,60,38,15,BS_ICON
+ PUSHBUTTON
"shift",SCAN_CODE_44,3,79,57,15,BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX
+ PUSHBUTTON "z",SCAN_CODE_46,64,79,15,15
+ PUSHBUTTON "x",SCAN_CODE_47,83,79,15,15
+ PUSHBUTTON "c",SCAN_CODE_48,102,79,15,15
+ PUSHBUTTON "v",SCAN_CODE_49,121,79,15,15
+ PUSHBUTTON "b",SCAN_CODE_50,140,79,15,15
+ PUSHBUTTON "n",SCAN_CODE_51,159,79,15,15
+ PUSHBUTTON "m",SCAN_CODE_52,178,79,15,15
+ PUSHBUTTON ",",SCAN_CODE_53,197,79,15,15
+ PUSHBUTTON ".",SCAN_CODE_54,216,79,15,15
+ PUSHBUTTON "/",SCAN_CODE_55,235,79,15,15
+ PUSHBUTTON
"shift",SCAN_CODE_57,254,79,45,15,BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX
+ PUSHBUTTON "ctrl",SCAN_CODE_58,3,98,24,15,BS_PUSHLIKE|BS_AUTOCHECKBOX
+ PUSHBUTTON "v",SCAN_CODE_84,324,98,15,15,BS_ICON
+ PUSHBUTTON "ROS",SCAN_CODE_127,30,98,24,15,BS_ICON
+ PUSHBUTTON "alt",SCAN_CODE_60,57,98,24,15,BS_PUSHLIKE|BS_AUTOCHECKBOX
+ PUSHBUTTON "",SCAN_CODE_61,84,98,106,15 //space
+ PUSHBUTTON
"alt",SCAN_CODE_62,194,98,24,15,BS_PUSHLIKE|BS_AUTOCHECKBOX
+ PUSHBUTTON "ROS",SCAN_CODE_128,221,98,24,15,BS_ICON
+ PUSHBUTTON "menu",SCAN_CODE_129,248,98,24,15,BS_ICON
+ PUSHBUTTON
"ctrl",SCAN_CODE_64,275,98,24,15,BS_PUSHLIKE|BS_AUTOCHECKBOX
+ PUSHBUTTON "ins",SCAN_CODE_75,304,22,15,15
+ PUSHBUTTON "del",SCAN_CODE_76,304,41,15,15
+ PUSHBUTTON "hm",SCAN_CODE_80,324,22,15,15
+ PUSHBUTTON "end",SCAN_CODE_81,324,41,15,15
+ PUSHBUTTON "pup",SCAN_CODE_85,344,22,15,15
+ PUSHBUTTON "pdn",SCAN_CODE_86,344,41,15,15
+ PUSHBUTTON "<-",SCAN_CODE_79,304,98,15,15,BS_ICON
+ PUSHBUTTON "^",SCAN_CODE_83,324,79,15,15,BS_ICON
+ PUSHBUTTON "->",SCAN_CODE_89,344,98,15,15,BS_ICON
+ PUSHBUTTON "nlk",SCAN_CODE_90,364,22,15,15
+ PUSHBUTTON "7",SCAN_CODE_91,364,41,15,15
+ PUSHBUTTON "4",SCAN_CODE_92,364,60,15,15
+ PUSHBUTTON "1",SCAN_CODE_93,364,79,15,15
+ PUSHBUTTON "/",SCAN_CODE_95,384,22,15,15
+ PUSHBUTTON "8",SCAN_CODE_96,384,41,15,15
+ PUSHBUTTON "5",SCAN_CODE_97,384,60,15,15
+ PUSHBUTTON "2",SCAN_CODE_98,384,79,15,15
+ PUSHBUTTON "0",SCAN_CODE_99,364,98,34,15
+ PUSHBUTTON "*",SCAN_CODE_100,404,22,15,15
+ PUSHBUTTON "9",SCAN_CODE_101,404,41,15,15
+ PUSHBUTTON "6",SCAN_CODE_102,404,60,15,15
+ PUSHBUTTON "3",SCAN_CODE_103,404,79,15,15
+ PUSHBUTTON ".",SCAN_CODE_104,404,98,15,15
+ PUSHBUTTON "-",SCAN_CODE_105,424,22,15,15
+ PUSHBUTTON "+",SCAN_CODE_106,424,41,15,35
+ PUSHBUTTON "ent",SCAN_CODE_108,424,78,15,35
+ CTEXT "Num",IDC_STATIC,364,3,21,8
+ CONTROL
"",IDC_LED_NUM,"Static",SS_CENTER|SS_NOTIFY,372,15,4,3
+ CTEXT "Caps",IDC_STATIC,389,3,21,8
+ CONTROL
"",IDC_LED_CAPS,"Static",SS_CENTER|SS_NOTIFY,398,15,4,3
+ CTEXT "Scroll",IDC_STATIC,414,3,21,8
+ CONTROL
"",IDC_LED_SCROLL,"Static",SS_CENTER|SS_NOTIFY,424,15,4,3
+END
+
IDR_OSK_MENU MENU DISCARDABLE
BEGIN
POPUP "File"
@@ -138,8 +257,8 @@ BEGIN
POPUP "Keyboard"
BEGIN
- MENUITEM "Enhanced Keyboard", IDM_ENCHANCED_KB, CHECKED, GRAYED
- MENUITEM "Standard Keyboard", IDM_STANDARD_KB, GRAYED
+ MENUITEM "Enhanced Keyboard", IDM_ENHANCED_KB, CHECKED
+ MENUITEM "Standard Keyboard", IDM_STANDARD_KB
MENUITEM SEPARATOR
MENUITEM "Regular Layout", IDM_REG_LAYOUT, CHECKED, GRAYED
MENUITEM "Block Layout", IDM_BLOCK_LAYOUT, GRAYED
diff --git a/base/applications/osk/main.c b/base/applications/osk/main.c
index ffb01a25d4..72cee21f30 100644
--- a/base/applications/osk/main.c
+++ b/base/applications/osk/main.c
@@ -143,8 +143,19 @@ int OSK_DlgInitDialog(HWND hDlg)
/* Save handle */
Globals.hMainWnd = hDlg;
- /* Load the settings from the registry hive */
- LoadDataFromRegistry();
+ /* Check the checked menu item before displaying the modal box */
+ if (Globals.bIsEnhancedKeyboard)
+ {
+ /* Enhanced keyboard dialog chosen, set the respective menu item as checked */
+ CheckMenuItem(GetMenu(hDlg), IDM_ENHANCED_KB, MF_BYCOMMAND | MF_CHECKED);
+ CheckMenuItem(GetMenu(hDlg), IDM_STANDARD_KB, MF_BYCOMMAND | MF_UNCHECKED);
+ }
+ else
+ {
+ /* Standard keyboard dialog chosen, set the respective menu item as checked */
+ CheckMenuItem(GetMenu(hDlg), IDM_STANDARD_KB, MF_BYCOMMAND | MF_CHECKED);
+ CheckMenuItem(GetMenu(hDlg), IDM_ENHANCED_KB, MF_BYCOMMAND | MF_UNCHECKED);
+ }
/* Set the application's icon */
hIcon = LoadImageW(Globals.hInstance, MAKEINTRESOURCEW(IDI_OSK), IMAGE_ICON, 0, 0,
LR_SHARED | LR_DEFAULTSIZE);
@@ -197,12 +208,6 @@ int OSK_DlgInitDialog(HWND hDlg)
/* Set a timer for periodics tasks */
Globals.iTimer = SetTimer(hDlg, 0, 200, NULL);
- /* If the member of the struct (bShowWarning) is set then display the dialog box */
- if (Globals.bShowWarning)
- {
- DialogBoxW(Globals.hInstance, MAKEINTRESOURCEW(IDD_WARNINGDIALOG_OSK),
Globals.hMainWnd, OSK_WarningProc);
- }
-
return TRUE;
}
@@ -441,6 +446,58 @@ INT_PTR APIENTRY OSK_DlgProc(HWND hDlg, UINT msg, WPARAM wParam,
LPARAM lParam)
break;
}
+ case IDM_ENHANCED_KB:
+ {
+ if (!Globals.bIsEnhancedKeyboard)
+ {
+ /*
+ The user attempted to switch to enhanced keyboard dialog
type.
+ Set the member value as TRUE, destroy the dialog and save the
data configuration into the registry.
+ */
+ Globals.bIsEnhancedKeyboard = TRUE;
+ EndDialog(hDlg, FALSE);
+ SaveDataToRegistry();
+
+ /* Change the condition of enhanced keyboard item menu to checked
*/
+ CheckMenuItem(GetMenu(hDlg), IDM_ENHANCED_KB, MF_BYCOMMAND |
MF_CHECKED);
+ CheckMenuItem(GetMenu(hDlg), IDM_STANDARD_KB, MF_BYCOMMAND |
MF_UNCHECKED);
+
+ /* Finally, display the dialog modal box with the enhanced
keyboard dialog */
+ DialogBoxW(Globals.hInstance,
+ MAKEINTRESOURCEW(MAIN_DIALOG_ENHANCED_KB),
+ GetDesktopWindow(),
+ OSK_DlgProc);
+ }
+
+ break;
+ }
+
+ case IDM_STANDARD_KB:
+ {
+ if (Globals.bIsEnhancedKeyboard)
+ {
+ /*
+ The user attempted to switch to standard keyboard dialog
type.
+ Set the member value as FALSE, destroy the dialog and save
the data configuration into the registry.
+ */
+ Globals.bIsEnhancedKeyboard = FALSE;
+ EndDialog(hDlg, FALSE);
+ SaveDataToRegistry();
+
+ /* Change the condition of standard keyboard item menu to checked
*/
+ CheckMenuItem(GetMenu(hDlg), IDM_ENHANCED_KB, MF_BYCOMMAND |
MF_UNCHECKED);
+ CheckMenuItem(GetMenu(hDlg), IDM_STANDARD_KB, MF_BYCOMMAND |
MF_CHECKED);
+
+ /* Finally, display the dialog modal box with the standard
keyboard dialog */
+ DialogBoxW(Globals.hInstance,
+ MAKEINTRESOURCEW(MAIN_DIALOG_STANDARD_KB),
+ GetDesktopWindow(),
+ OSK_DlgProc);
+ }
+
+ break;
+ }
+
case IDM_ABOUT:
{
OSK_About();
@@ -471,6 +528,7 @@ int WINAPI wWinMain(HINSTANCE hInstance,
int show)
{
HANDLE hMutex;
+ INT LayoutResource;
UNREFERENCED_PARAMETER(prev);
UNREFERENCED_PARAMETER(cmdline);
@@ -479,6 +537,25 @@ int WINAPI wWinMain(HINSTANCE hInstance,
ZeroMemory(&Globals, sizeof(Globals));
Globals.hInstance = hInstance;
+ /* Load the settings from the registry hive */
+ LoadDataFromRegistry();
+
+ /* If the member of the struct (bShowWarning) is set then display the dialog box */
+ if (Globals.bShowWarning)
+ {
+ DialogBoxW(Globals.hInstance, MAKEINTRESOURCEW(IDD_WARNINGDIALOG_OSK),
Globals.hMainWnd, OSK_WarningProc);
+ }
+
+ /* Before initializing the dialog execution, check if the chosen keyboard type is
standard or enhanced */
+ if (Globals.bIsEnhancedKeyboard)
+ {
+ LayoutResource = MAIN_DIALOG_ENHANCED_KB;
+ }
+ else
+ {
+ LayoutResource = MAIN_DIALOG_STANDARD_KB;
+ }
+
/* Rry to open a mutex for a single instance */
hMutex = OpenMutexW(MUTEX_ALL_ACCESS, FALSE, L"osk");
@@ -487,8 +564,9 @@ int WINAPI wWinMain(HINSTANCE hInstance,
/* Mutex doesn�t exist. This is the first instance so create the mutex. */
hMutex = CreateMutexW(NULL, FALSE, L"osk");
+ /* Create the modal box based on the configuration registry */
DialogBoxW(hInstance,
- MAKEINTRESOURCEW(MAIN_DIALOG),
+ MAKEINTRESOURCEW(LayoutResource),
GetDesktopWindow(),
OSK_DlgProc);
diff --git a/base/applications/osk/main.h b/base/applications/osk/main.h
index 67f08b26d8..a399abadd2 100644
--- a/base/applications/osk/main.h
+++ b/base/applications/osk/main.h
@@ -24,6 +24,7 @@ typedef struct
/* FIXME: To be deleted when ReactOS will support WS_EX_NOACTIVATE */
HWND hActiveWnd;
BOOL bShowWarning;
+ BOOL bIsEnhancedKeyboard;
} OSK_GLOBALS;
/* DEFINES ********************************************************************/
diff --git a/base/applications/osk/osk_res.h b/base/applications/osk/osk_res.h
index d62777efdc..03fdffc9a7 100644
--- a/base/applications/osk/osk_res.h
+++ b/base/applications/osk/osk_res.h
@@ -6,51 +6,52 @@
* PROGRAMMERS: Denis ROBERT
*/
-#define MAIN_DIALOG 2000
+#define MAIN_DIALOG_ENHANCED_KB 2000
+#define MAIN_DIALOG_STANDARD_KB 2001
-#define IDC_LED_NUM 100
-#define IDC_LED_CAPS 101
-#define IDC_LED_SCROLL 102
-#define IDC_SHOWWARNINGCHECK 103
+#define IDC_LED_NUM 100
+#define IDC_LED_CAPS 101
+#define IDC_LED_SCROLL 102
+#define IDC_SHOWWARNINGCHECK 103
-#define IDI_OSK 200
-#define IDI_BACK 201
-#define IDI_TAB 202
-#define IDI_CAPS_LOCK 203
-#define IDI_RETURN 204
-#define IDI_SHIFT 205
-#define IDI_REACTOS 206
-#define IDI_MENU 207
-#define IDI_HOME 208
-#define IDI_PG_UP 209
-#define IDI_PG_DOWN 210
-#define IDI_LEFT 211
-#define IDI_TOP 212
-#define IDI_RIGHT 213
-#define IDI_BOTTOM 214
+#define IDI_OSK 200
+#define IDI_BACK 201
+#define IDI_TAB 202
+#define IDI_CAPS_LOCK 203
+#define IDI_RETURN 204
+#define IDI_SHIFT 205
+#define IDI_REACTOS 206
+#define IDI_MENU 207
+#define IDI_HOME 208
+#define IDI_PG_UP 209
+#define IDI_PG_DOWN 210
+#define IDI_LEFT 211
+#define IDI_TOP 212
+#define IDI_RIGHT 213
+#define IDI_BOTTOM 214
-#define IDR_OSK_MENU 600
-#define IDM_EXIT 601
-#define IDM_STANDARD_KB 602
-#define IDM_ENCHANCED_KB 603
-#define IDM_REG_LAYOUT 604
-#define IDM_BLOCK_LAYOUT 605
-#define IDM_101_KEYS 606
-#define IDM_102_KEYS 607
-#define IDM_106_KEYS 608
-#define IDM_ON_TOP 609
-#define IDM_CLICK_SOUND 610
-#define IDM_TYPE_MODE 611
-#define IDM_FONT 612
-#define IDM_HELP_TOPICS 613
-#define IDM_ABOUT 614
+#define IDR_OSK_MENU 600
+#define IDM_EXIT 601
+#define IDM_STANDARD_KB 602
+#define IDM_ENHANCED_KB 603
+#define IDM_REG_LAYOUT 604
+#define IDM_BLOCK_LAYOUT 605
+#define IDM_101_KEYS 606
+#define IDM_102_KEYS 607
+#define IDM_106_KEYS 608
+#define IDM_ON_TOP 609
+#define IDM_CLICK_SOUND 610
+#define IDM_TYPE_MODE 611
+#define IDM_FONT 612
+#define IDM_HELP_TOPICS 613
+#define IDM_ABOUT 614
-#define IDD_WARNINGDIALOG_OSK 215
+#define IDD_WARNINGDIALOG_OSK 215
-#define STRING_OSK 500
-#define STRING_AUTHORS 501
+#define STRING_OSK 500
+#define STRING_AUTHORS 501
-#define IDC_STATIC -1
+#define IDC_STATIC -1
/* Scan codes by key number */
diff --git a/base/applications/osk/settings.c b/base/applications/osk/settings.c
index 33f8893d57..fa21d67d3a 100644
--- a/base/applications/osk/settings.c
+++ b/base/applications/osk/settings.c
@@ -16,11 +16,12 @@ BOOL LoadDataFromRegistry()
{
HKEY hKey;
LONG lResult;
- DWORD dwData;
+ DWORD dwShowWarningData, dwLayout;
DWORD cbData = sizeof(DWORD);
- /* Set the structure member to TRUE */
+ /* Set the structure members to TRUE */
Globals.bShowWarning = TRUE;
+ Globals.bIsEnhancedKeyboard = TRUE;
/* Open the key, so that we can query it */
lResult = RegOpenKeyExW(HKEY_CURRENT_USER,
@@ -40,7 +41,7 @@ BOOL LoadDataFromRegistry()
L"ShowWarning",
0,
0,
- (BYTE *)&dwData,
+ (BYTE *)&dwShowWarningData,
&cbData);
if (lResult != ERROR_SUCCESS)
@@ -51,7 +52,25 @@ BOOL LoadDataFromRegistry()
}
/* Load the data value (it can be either FALSE or TRUE depending on the data itself)
*/
- Globals.bShowWarning = (dwData != 0);
+ Globals.bShowWarning = (dwShowWarningData != 0);
+
+ /* Query the key */
+ lResult = RegQueryValueExW(hKey,
+ L"IsEnhancedKeyboard",
+ 0,
+ 0,
+ (BYTE *)&dwLayout,
+ &cbData);
+
+ if (lResult != ERROR_SUCCESS)
+ {
+ /* Bail out and return FALSE if we fail */
+ RegCloseKey(hKey);
+ return FALSE;
+ }
+
+ /* Load the dialog layout value */
+ Globals.bIsEnhancedKeyboard = (dwLayout != 0);
/* If we're here then we succeed, close the key and return TRUE */
RegCloseKey(hKey);
@@ -62,7 +81,7 @@ BOOL SaveDataToRegistry()
{
HKEY hKey;
LONG lResult;
- DWORD dwData;
+ DWORD dwShowWarningData, dwLayout;
/* If no key has been made, create one */
lResult = RegCreateKeyExW(HKEY_CURRENT_USER,
@@ -82,14 +101,31 @@ BOOL SaveDataToRegistry()
}
/* The data value of the subkey will be appended to the warning dialog switch */
- dwData = Globals.bShowWarning;
+ dwShowWarningData = Globals.bShowWarning;
lResult = RegSetValueExW(hKey,
L"ShowWarning",
0,
REG_DWORD,
- (BYTE *)&dwData,
- sizeof(dwData));
+ (BYTE *)&dwShowWarningData,
+ sizeof(dwShowWarningData));
+
+ if (lResult != ERROR_SUCCESS)
+ {
+ /* Bail out and return FALSE if we fail */
+ RegCloseKey(hKey);
+ return FALSE;
+ }
+
+ /* The value will be appended to the layout dialog */
+ dwLayout = Globals.bIsEnhancedKeyboard;
+
+ lResult = RegSetValueExW(hKey,
+ L"IsEnhancedKeyboard",
+ 0,
+ REG_DWORD,
+ (BYTE *)&dwLayout,
+ sizeof(dwLayout));
if (lResult != ERROR_SUCCESS)
{
2048
days inactive
2048
days old
0 comments
1 participants
participants (1)
-
Bișoc George