Ros-diffs

ros-diffs@reactos.org

81390 discussions

[reactos] 01/01: [KERNEL32] Implement SetFileCompletionNotificationModes Call native Nt* function to do the actual work, similarly to as it done in Wine: https://source.winehq.org/git/wine.git/blob/530c1839603bd3caa1b9d17fe458b5bd341ccfc9:/dlls/kernel32/file.c#l258. Also add/fix some declarations in internal kernel32/public ndk neaders, to fix compilation. CORE-17821
by Oleg Dubinskiy 23 Oct '21

23 Oct '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=334ab0f2a5f547118e7a8… commit 334ab0f2a5f547118e7a8f63291a69ffaac88101 Author: Oleg Dubinskiy <oleg.dubinskij2013(a)yandex.ua> AuthorDate: Wed Oct 20 01:22:29 2021 +0300 Commit: George Bișoc <george.bisoc(a)reactos.org> CommitDate: Sat Oct 23 16:19:22 2021 +0200 [KERNEL32] Implement SetFileCompletionNotificationModes Call native Nt* function to do the actual work, similarly to as it done in Wine: https://source.winehq.org/git/wine.git/blob/530c1839603bd3caa1b9d17fe458b5b…. Also add/fix some declarations in internal kernel32/public ndk neaders, to fix compilation. CORE-17821 --- dll/win32/kernel32/client/file/iocompl.c | 25 +++++++++++++++++++++---- dll/win32/kernel32/k32.h | 1 + sdk/include/ndk/iotypes.h | 7 ++++++- 3 files changed, 28 insertions(+), 5 deletions(-) diff --git a/dll/win32/kernel32/client/file/iocompl.c b/dll/win32/kernel32/client/file/iocompl.c index 656ffd93d6d..0d2546be50d 100644 --- a/dll/win32/kernel32/client/file/iocompl.c +++ b/dll/win32/kernel32/client/file/iocompl.c @@ -3,7 +3,8 @@ * PROJECT: ReactOS system libraries * FILE: dll/win32/kernel32/client/file/iocompl.c * PURPOSE: Io Completion functions - * PROGRAMMER: Ariadne ( ariadne(a)xs4all.nl) + * PROGRAMMERS: Ariadne (ariadne(a)xs4all.nl) + * Oleg Dubinskiy (oleg.dubinskij2013(a)yandex.ua) * UPDATE HISTORY: * Created 01/11/98 */ @@ -23,21 +24,37 @@ #endif /* - * @unimplemented + * @implemented */ BOOL WINAPI SetFileCompletionNotificationModes(IN HANDLE FileHandle, IN UCHAR Flags) { + NTSTATUS Status; + FILE_IO_COMPLETION_NOTIFICATION_INFORMATION FileInformation; + IO_STATUS_BLOCK IoStatusBlock; + if (Flags & ~(FILE_SKIP_COMPLETION_PORT_ON_SUCCESS | FILE_SKIP_SET_EVENT_ON_HANDLE)) { SetLastError(ERROR_INVALID_PARAMETER); return FALSE; } - UNIMPLEMENTED; - return FALSE; + FileInformation.Flags = Flags; + + Status = NtSetInformationFile(FileHandle, + &IoStatusBlock, + &FileInformation, + sizeof(FileInformation), + FileIoCompletionNotificationInformation); + if (!NT_SUCCESS(Status)) + { + BaseSetLastNTError(Status); + return FALSE; + } + + return TRUE; } /* diff --git a/dll/win32/kernel32/k32.h b/dll/win32/kernel32/k32.h index 604953680d7..ec2543a4f00 100644 --- a/dll/win32/kernel32/k32.h +++ b/dll/win32/kernel32/k32.h @@ -35,6 +35,7 @@ #include <ndk/cmfuncs.h> #include <ndk/exfuncs.h> #include <ndk/iofuncs.h> +#include <ndk/iotypes.h> #include <ndk/kdtypes.h> #include <ndk/kefuncs.h> #include <ndk/ldrfuncs.h> diff --git a/sdk/include/ndk/iotypes.h b/sdk/include/ndk/iotypes.h index ace4d6fc7a2..2faf128ee97 100644 --- a/sdk/include/ndk/iotypes.h +++ b/sdk/include/ndk/iotypes.h @@ -323,8 +323,8 @@ typedef enum _FILE_INFORMATION_CLASS FileIdFullDirectoryInformation, FileValidDataLengthInformation, FileShortNameInformation, -#if (NTDDI_VERSION >= NTDDI_VISTA) FileIoCompletionNotificationInformation, +#if (NTDDI_VERSION >= NTDDI_VISTA) FileIoStatusBlockRangeInformation, FileIoPriorityHintInformation, FileSfioReserveInformation, @@ -604,6 +604,11 @@ typedef struct _FILE_COMPLETION_INFORMATION PVOID Key; } FILE_COMPLETION_INFORMATION, *PFILE_COMPLETION_INFORMATION; +typedef struct _FILE_IO_COMPLETION_NOTIFICATION_INFORMATION +{ + ULONG Flags; +} FILE_IO_COMPLETION_NOTIFICATION_INFORMATION, *PFILE_IO_COMPLETION_NOTIFICATION_INFORMATION; + typedef struct _FILE_LINK_INFORMATION { BOOLEAN ReplaceIfExists;

1 0

[reactos] 01/01: [NTDLL_APITEST] Free the allocated memory block when we're done
by George Bișoc 23 Oct '21

23 Oct '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=fe0415a4ba76bd59ba9ff… commit fe0415a4ba76bd59ba9ff1b0b4cd7e15ee100623 Author: George Bișoc <george.bisoc(a)reactos.org> AuthorDate: Sat Oct 23 09:58:50 2021 +0200 Commit: George Bișoc <george.bisoc(a)reactos.org> CommitDate: Sat Oct 23 09:58:50 2021 +0200 [NTDLL_APITEST] Free the allocated memory block when we're done This fixes a memory leak where we allocate a buffer for token statistics with RtlAllocateHeap routine but we never free it afterwards. --- modules/rostests/apitests/ntdll/NtDuplicateToken.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/modules/rostests/apitests/ntdll/NtDuplicateToken.c b/modules/rostests/apitests/ntdll/NtDuplicateToken.c index fa03d3b8a80..fb357f58bb4 100644 --- a/modules/rostests/apitests/ntdll/NtDuplicateToken.c +++ b/modules/rostests/apitests/ntdll/NtDuplicateToken.c @@ -153,7 +153,11 @@ DuplicateTokenAsEffective(VOID) trace("Number of privileges of effective only token -- %lu\n", TokenStats->PrivilegeCount); trace("Number of groups of effective only token -- %lu\n", TokenStats->GroupCount); - /* We finished our tests, close the handles now */ + /* + * We finished our tests, free the memory + * block and close the handles now. + */ + RtlFreeHeap(RtlGetProcessHeap(), 0, TokenStats); CloseHandle(TokenHandle), CloseHandle(DuplicatedTokenHandle); }

1 0

[reactos] 01/01: [OSK] On Screen Keyboard overhaul
by Baruch Rutman 23 Oct '21

23 Oct '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=a1faa1cc6d6aade97b19b… commit a1faa1cc6d6aade97b19b06cbd903ddf3a4bc6eb Author: Baruch Rutman <peterooch(a)gmail.com> AuthorDate: Wed Aug 11 22:36:30 2021 +0300 Commit: George Bișoc <george.bisoc(a)reactos.org> CommitDate: Sat Oct 23 09:45:46 2021 +0200 [OSK] On Screen Keyboard overhaul Primary changes: Convert from dialog to an ordinary window, placing buttons according to data in keyboard.c Character button text is now according to selected keyboard layout instead of system language. Buttons will update* automatically when there is a layout switch (and when shift/capslock are pressed). (Updating is most reliable when the keyboard is focused) Removed keyboard dialog templates from resource files, they live on in keyboard.c Secondary changes: Support for font change, currently saved in registry is facename and height. Additional registry load/save functions for strings to facilitate above change. --- base/applications/osk/CMakeLists.txt | 3 +- base/applications/osk/keyboard.c | 251 +++++++++++++ base/applications/osk/lang/ar-DZ.rc | 259 +------------ base/applications/osk/lang/cs-CZ.rc | 259 +------------ base/applications/osk/lang/de-DE.rc | 260 +------------ base/applications/osk/lang/en-GB.rc | 260 +------------ base/applications/osk/lang/en-US.rc | 259 +------------ base/applications/osk/lang/es-ES.rc | 260 +------------ base/applications/osk/lang/et-EE.rc | 259 +------------ base/applications/osk/lang/fr-CA.rc | 260 +------------ base/applications/osk/lang/fr-FR.rc | 260 +------------ base/applications/osk/lang/he-IL.rc | 259 +------------ base/applications/osk/lang/id-ID.rc | 259 +------------ base/applications/osk/lang/it-IT.rc | 261 +------------ base/applications/osk/lang/pl-PL.rc | 259 +------------ base/applications/osk/lang/ro-RO.rc | 259 +------------ base/applications/osk/lang/ru-RU.rc | 259 +------------ base/applications/osk/lang/tr-TR.rc | 261 +------------ base/applications/osk/lang/zh-CN.rc | 259 +------------ base/applications/osk/lang/zh-TW.rc | 259 +------------ base/applications/osk/main.c | 689 +++++++++++++++++++++++------------ base/applications/osk/osk_res.h | 23 +- base/applications/osk/precomp.h | 84 ++++- base/applications/osk/settings.c | 156 ++++++-- 24 files changed, 1253 insertions(+), 4624 deletions(-) diff --git a/base/applications/osk/CMakeLists.txt b/base/applications/osk/CMakeLists.txt index 293eba14b50..b3171bfb3ea 100644 --- a/base/applications/osk/CMakeLists.txt +++ b/base/applications/osk/CMakeLists.txt @@ -1,5 +1,6 @@ list(APPEND SOURCE + keyboard.c main.c settings.c precomp.h) @@ -8,6 +9,6 @@ file(GLOB osk_rc_deps res/*.*) add_rc_deps(osk.rc ${osk_rc_deps}) add_executable(osk ${SOURCE} osk.rc) set_module_type(osk win32gui UNICODE) -add_importlibs(osk comdlg32 uxtheme winmm shell32 user32 gdi32 advapi32 comctl32 msvcrt kernel32 ntdll) +add_importlibs(osk comdlg32 winmm shell32 user32 gdi32 advapi32 comctl32 msvcrt kernel32 ntdll) add_pch(osk precomp.h SOURCE) add_cd_file(TARGET osk DESTINATION reactos/system32 FOR all) diff --git a/base/applications/osk/keyboard.c b/base/applications/osk/keyboard.c new file mode 100644 index 00000000000..8c57a5201b1 --- /dev/null +++ b/base/applications/osk/keyboard.c @@ -0,0 +1,251 @@ +/* + * PROJECT: ReactOS On-Screen Keyboard + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: Keyboard layout data. + * COPYRIGHT: Baruch Rutman (peterooch at gmail dot com) + * + * This is partialy based on the original en-US dialog templates. + */ +#include "precomp.h" + +KEY EnhancedKeyboardKeys[] = +{ + {L"Esc", SCAN_CODE_110, 4, 4, 28, 28, 0, FALSE}, + {L"F1", SCAN_CODE_112, 68, 4, 28, 28, 0, FALSE}, + {L"F2", SCAN_CODE_113, 100, 4, 28, 28, 0, FALSE}, + {L"F3", SCAN_CODE_114, 132, 4, 28, 28, 0, FALSE}, + {L"F4", SCAN_CODE_115, 164, 4, 28, 28, 0, FALSE}, + {L"F5", SCAN_CODE_116, 228, 4, 28, 28, 0, FALSE}, + {L"F6", SCAN_CODE_117, 260, 4, 28, 28, 0, FALSE}, + {L"F7", SCAN_CODE_118, 292, 4, 28, 28, 0, FALSE}, + {L"F8", SCAN_CODE_119, 324, 4, 28, 28, 0, FALSE}, + {L"F9", SCAN_CODE_120, 388, 4, 28, 28, 0, FALSE}, + {L"F10", SCAN_CODE_121, 420, 4, 28, 28, 0, FALSE}, + {L"F11", SCAN_CODE_122, 452, 4, 28, 28, 0, FALSE}, + {L"F12", SCAN_CODE_123, 484, 4, 28, 28, 0, FALSE}, + {L"Prn", SCAN_CODE_124, 516, 4, 28, 28, 0, FALSE}, + {L"Stop", SCAN_CODE_125, 548, 4, 28, 28, 0, FALSE}, + {L"Attn", SCAN_CODE_126, 580, 4, 28, 28, 0, FALSE}, + {L"`", SCAN_CODE_1, 4, 35, 28, 28, 0, TRUE}, + {L"1", SCAN_CODE_2, 36, 35, 28, 28, 0, TRUE}, + {L"2", SCAN_CODE_3, 68, 35, 28, 28, 0, TRUE}, + {L"3", SCAN_CODE_4, 100, 35, 28, 28, 0, TRUE}, + {L"4", SCAN_CODE_5, 132, 35, 28, 28, 0, TRUE}, + {L"5", SCAN_CODE_6, 164, 35, 28, 28, 0, TRUE}, + {L"6", SCAN_CODE_7, 196, 35, 28, 28, 0, TRUE}, + {L"7", SCAN_CODE_8, 228, 35, 28, 28, 0, TRUE}, + {L"8", SCAN_CODE_9, 260, 35, 28, 28, 0, TRUE}, + {L"9", SCAN_CODE_10, 292, 35, 28, 28, 0, TRUE}, + {L"0", SCAN_CODE_11, 324, 35, 28, 28, 0, TRUE}, + {L"-", SCAN_CODE_12, 356, 35, 28, 28, 0, TRUE}, + {L"=", SCAN_CODE_13, 388, 35, 28, 28, 0, TRUE}, + {L"<--", SCAN_CODE_15, 420, 35, 92, 28, BS_ICON, FALSE}, + {L"Tab", SCAN_CODE_16, 4, 65, 60, 28, BS_ICON, FALSE}, + {L"q", SCAN_CODE_17, 67, 65, 28, 28, 0, TRUE}, + {L"w", SCAN_CODE_18, 97, 65, 28, 28, 0, TRUE}, + {L"e", SCAN_CODE_19, 128, 65, 28, 28, 0, TRUE}, + {L"r", SCAN_CODE_20, 158, 65, 28, 28, 0, TRUE}, + {L"t", SCAN_CODE_21, 188, 65, 28, 28, 0, TRUE}, + {L"y", SCAN_CODE_22, 219, 65, 28, 28, 0, TRUE}, + {L"u", SCAN_CODE_23, 249, 65, 28, 28, 0, TRUE}, + {L"i", SCAN_CODE_24, 280, 65, 28, 28, 0, TRUE}, + {L"o", SCAN_CODE_25, 310, 65, 28, 28, 0, TRUE}, + {L"p", SCAN_CODE_26, 340, 65, 28, 28, 0, TRUE}, + {L"[", SCAN_CODE_27, 371, 65, 28, 28, 0, TRUE}, + {L"]", SCAN_CODE_28, 401, 65, 28, 28, 0, TRUE}, + {L"lock", SCAN_CODE_30, 4, 96, 78, 28, BS_ICON, FALSE}, + {L"a", SCAN_CODE_31, 84, 96, 28, 28, 0, TRUE}, + {L"s", SCAN_CODE_32, 115, 96, 28, 28, 0, TRUE}, + {L"d", SCAN_CODE_33, 145, 96, 28, 28, 0, TRUE}, + {L"f", SCAN_CODE_34, 176, 96, 28, 28, 0, TRUE}, + {L"g", SCAN_CODE_35, 206, 96, 28, 28, 0, TRUE}, + {L"h", SCAN_CODE_36, 236, 96, 28, 28, 0, TRUE}, + {L"j", SCAN_CODE_37, 267, 96, 28, 28, 0, TRUE}, + {L"k", SCAN_CODE_38, 297, 96, 28, 28, 0, TRUE}, + {L"l", SCAN_CODE_39, 328, 96, 28, 28, 0, TRUE}, + {L";", SCAN_CODE_40, 358, 96, 28, 28, 0, TRUE}, + {L"'", SCAN_CODE_41, 388, 96, 28, 28, 0, TRUE}, + {L"\\", SCAN_CODE_29, 432, 65, 80, 28, 0, TRUE}, + {L"ret", SCAN_CODE_43, 419, 96, 93, 28, BS_ICON, FALSE}, + {L"shift", SCAN_CODE_44, 4, 126, 95, 28, BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX, FALSE}, + {L"z", SCAN_CODE_46, 102, 126, 28, 28, 0, TRUE}, + {L"x", SCAN_CODE_47, 132, 126, 28, 28, 0, TRUE}, + {L"c", SCAN_CODE_48, 163, 126, 28, 28, 0, TRUE}, + {L"v", SCAN_CODE_49, 193, 126, 28, 28, 0, TRUE}, + {L"b", SCAN_CODE_50, 224, 126, 28, 28, 0, TRUE}, + {L"n", SCAN_CODE_51, 254, 126, 28, 28, 0, TRUE}, + {L"m", SCAN_CODE_52, 284, 126, 28, 28, 0, TRUE}, + {L",", SCAN_CODE_53, 315, 126, 28, 28, 0, TRUE}, + {L".", SCAN_CODE_54, 345, 126, 28, 28, 0, TRUE}, + {L"/", SCAN_CODE_55, 376, 126, 28, 28, 0, TRUE}, + {L"shift", SCAN_CODE_57, 406, 126, 106, 28, BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX, FALSE}, + {L"ctrl", SCAN_CODE_58, 4, 156, 43, 28, BS_PUSHLIKE|BS_AUTOCHECKBOX, FALSE}, + {L"v", SCAN_CODE_84, 548, 156, 28, 28, BS_ICON, FALSE}, + {L"ROS", SCAN_CODE_127, 48, 156, 43, 28, BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX, FALSE}, + {L"alt", SCAN_CODE_60, 91, 156, 43, 28, BS_PUSHLIKE|BS_AUTOCHECKBOX, FALSE}, + {L"", SCAN_CODE_61, 134, 156, 204, 28, 0, FALSE}, + {L"alt", SCAN_CODE_62, 340, 156, 43, 28, BS_PUSHLIKE|BS_AUTOCHECKBOX, FALSE}, + {L"ROS", SCAN_CODE_128, 384, 156, 43, 28, BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX, FALSE}, + {L"menu", SCAN_CODE_129, 427, 156, 43, 28, BS_ICON, FALSE}, + {L"ctrl", SCAN_CODE_64, 470, 156, 42, 28, BS_PUSHLIKE|BS_AUTOCHECKBOX, FALSE}, + {L"ins", SCAN_CODE_75, 516, 35, 28, 28, 0, FALSE}, + {L"del", SCAN_CODE_76, 516, 65, 28, 28, 0, FALSE}, + {L"hm", SCAN_CODE_80, 548, 35, 28, 28, BS_ICON, FALSE}, + {L"end", SCAN_CODE_81, 548, 65, 28, 28, 0, FALSE}, + {L"pup", SCAN_CODE_85, 580, 35, 28, 28, BS_ICON, FALSE}, + {L"pdn", SCAN_CODE_86, 580, 65, 28, 28, BS_ICON, FALSE}, + {L"<-", SCAN_CODE_79, 516, 156, 28, 28, BS_ICON, FALSE}, + {L"^", SCAN_CODE_83, 548, 126, 28, 28, BS_ICON, FALSE}, + {L"->", SCAN_CODE_89, 580, 156, 28, 28, BS_ICON, FALSE}, + {L"nlk", SCAN_CODE_90, 612, 35, 28, 28, 0, FALSE}, + {L"7", SCAN_CODE_91, 612, 65, 28, 28, 0, FALSE}, + {L"4", SCAN_CODE_92, 612, 96, 28, 28, 0, FALSE}, + {L"1", SCAN_CODE_93, 612, 126, 28, 28, 0, FALSE}, + {L"/", SCAN_CODE_95, 644, 35, 28, 28, 0, FALSE}, + {L"8", SCAN_CODE_96, 644, 65, 28, 28, 0, FALSE}, + {L"5", SCAN_CODE_97, 644, 96, 28, 28, 0, FALSE}, + {L"2", SCAN_CODE_98, 644, 126, 28, 28, 0, FALSE}, + {L"0", SCAN_CODE_99, 612, 156, 60, 28, 0, FALSE}, + {L"*", SCAN_CODE_100, 676, 35, 28, 28, 0, FALSE}, + {L"9", SCAN_CODE_101, 676, 65, 28, 28, 0, FALSE}, + {L"6", SCAN_CODE_102, 676, 96, 28, 28, 0, FALSE}, + {L"3", SCAN_CODE_103, 676, 126, 28, 28, 0, FALSE}, + {L".", SCAN_CODE_104, 676, 156, 28, 28, 0, FALSE}, + {L"-", SCAN_CODE_105, 708, 35, 28, 28, 0, FALSE}, + {L"+", SCAN_CODE_106, 708, 65, 28, 59, 0, FALSE}, + {L"ent", SCAN_CODE_108, 708, 126, 28, 58, 0, FALSE}, +}; + +KEY StandardKeyboardKeys[] = +{ + {L"Esc", SCAN_CODE_110, 4, 4, 28, 28, 0, FALSE}, + {L"F1", SCAN_CODE_112, 68, 4, 28, 28, 0, FALSE}, + {L"F2", SCAN_CODE_113, 100, 4, 28, 28, 0, FALSE}, + {L"F3", SCAN_CODE_114, 132, 4, 28, 28, 0, FALSE}, + {L"F4", SCAN_CODE_115, 164, 4, 28, 28, 0, FALSE}, + {L"F5", SCAN_CODE_116, 196, 4, 28, 28, 0, FALSE}, + {L"F6", SCAN_CODE_117, 228, 4, 28, 28, 0, FALSE}, + {L"F7", SCAN_CODE_118, 292, 4, 28, 28, 0, FALSE}, + {L"F8", SCAN_CODE_119, 324, 4, 28, 28, 0, FALSE}, + {L"F9", SCAN_CODE_120, 356, 4, 28, 28, 0, FALSE}, + {L"F10", SCAN_CODE_121, 388, 4, 28, 28, 0, FALSE}, + {L"F11", SCAN_CODE_122, 420, 4, 28, 28, 0, FALSE}, + {L"F12", SCAN_CODE_123, 452, 4, 28, 28, 0, FALSE}, + {L"Prn", SCAN_CODE_124, 486, 4, 28, 28, 0, FALSE}, + {L"Stop", SCAN_CODE_125, 518, 4, 28, 28, 0, FALSE}, + {L"Attn", SCAN_CODE_126, 550, 4, 28, 28, 0, FALSE}, + {L"`", SCAN_CODE_1, 4, 35, 28, 28, 0, TRUE}, + {L"1", SCAN_CODE_2, 36, 35, 28, 28, 0, TRUE}, + {L"2", SCAN_CODE_3, 68, 35, 28, 28, 0, TRUE}, + {L"3", SCAN_CODE_4, 100, 35, 28, 28, 0, TRUE}, + {L"4", SCAN_CODE_5, 132, 35, 28, 28, 0, TRUE}, + {L"5", SCAN_CODE_6, 164, 35, 28, 28, 0, TRUE}, + {L"6", SCAN_CODE_7, 196, 35, 28, 28, 0, TRUE}, + {L"7", SCAN_CODE_8, 228, 35, 28, 28, 0, TRUE}, + {L"8", SCAN_CODE_9, 260, 35, 28, 28, 0, TRUE}, + {L"9", SCAN_CODE_10, 292, 35, 28, 28, 0, TRUE}, + {L"0", SCAN_CODE_11, 324, 35, 28, 28, 0, TRUE}, + {L"-", SCAN_CODE_12, 356, 35, 28, 28, 0, TRUE}, + {L"=", SCAN_CODE_13, 388, 35, 28, 28, 0, TRUE}, + {L"<--", SCAN_CODE_15, 420, 35, 63, 28, BS_ICON, FALSE}, + {L"Tab", SCAN_CODE_16, 4, 65, 60, 28, BS_ICON, FALSE}, + {L"q", SCAN_CODE_17, 67, 65, 28, 28, 0, TRUE}, + {L"w", SCAN_CODE_18, 97, 65, 28, 28, 0, TRUE}, + {L"e", SCAN_CODE_19, 128, 65, 28, 28, 0, TRUE}, + {L"r", SCAN_CODE_20, 158, 65, 28, 28, 0, TRUE}, + {L"t", SCAN_CODE_21, 188, 65, 28, 28, 0, TRUE}, + {L"y", SCAN_CODE_22, 219, 65, 28, 28, 0, TRUE}, + {L"u", SCAN_CODE_23, 249, 65, 28, 28, 0, TRUE}, + {L"i", SCAN_CODE_24, 280, 65, 28, 28, 0, TRUE}, + {L"o", SCAN_CODE_25, 310, 65, 28, 28, 0, TRUE}, + {L"p", SCAN_CODE_26, 340, 65, 28, 28, 0, TRUE}, + {L"[", SCAN_CODE_27, 371, 65, 28, 28, 0, TRUE}, + {L"]", SCAN_CODE_28, 401, 65, 28, 28, 0, TRUE}, + {L"lock", SCAN_CODE_30, 4, 96, 78, 28, BS_ICON, FALSE}, + {L"a", SCAN_CODE_31, 84, 96, 28, 28, 0, TRUE}, + {L"s", SCAN_CODE_32, 115, 96, 28, 28, 0, TRUE}, + {L"d", SCAN_CODE_33, 145, 96, 28, 28, 0, TRUE}, + {L"f", SCAN_CODE_34, 176, 96, 28, 28, 0, TRUE}, + {L"g", SCAN_CODE_35, 206, 96, 28, 28, 0, TRUE}, + {L"h", SCAN_CODE_36, 236, 96, 28, 28, 0, TRUE}, + {L"j", SCAN_CODE_37, 267, 96, 28, 28, 0, TRUE}, + {L"k", SCAN_CODE_38, 297, 96, 28, 28, 0, TRUE}, + {L"l", SCAN_CODE_39, 328, 96, 28, 28, 0, TRUE}, + {L";", SCAN_CODE_40, 358, 96, 28, 28, 0, TRUE}, + {L"'", SCAN_CODE_41, 388, 96, 28, 28, 0, TRUE}, + {L"\\", SCAN_CODE_29, 432, 65, 51, 28, 0, TRUE}, + {L"ret", SCAN_CODE_43, 419, 96, 64, 28, BS_ICON, FALSE}, + {L"shift", SCAN_CODE_44, 4, 126, 96, 28, BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX, FALSE}, + {L"z", SCAN_CODE_46, 102, 126, 28, 28, 0, TRUE}, + {L"x", SCAN_CODE_47, 132, 126, 28, 28, 0, TRUE}, + {L"c", SCAN_CODE_48, 163, 126, 28, 28, 0, TRUE}, + {L"v", SCAN_CODE_49, 193, 126, 28, 28, 0, TRUE}, + {L"b", SCAN_CODE_50, 224, 126, 28, 28, 0, TRUE}, + {L"n", SCAN_CODE_51, 254, 126, 28, 28, 0, TRUE}, + {L"m", SCAN_CODE_52, 284, 126, 28, 28, 0, TRUE}, + {L",", SCAN_CODE_53, 315, 126, 28, 28, 0, TRUE}, + {L".", SCAN_CODE_54, 345, 126, 28, 28, 0, TRUE}, + {L"/", SCAN_CODE_55, 376, 126, 28, 28, 0, TRUE}, + {L"shift", SCAN_CODE_57, 406, 126, 77, 28, BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX, FALSE}, + {L"ctrl", SCAN_CODE_58, 4, 156, 43, 28, BS_PUSHLIKE|BS_AUTOCHECKBOX, FALSE}, + {L"v", SCAN_CODE_84, 518, 156, 28, 28, BS_ICON, FALSE}, + {L"ROS", SCAN_CODE_127, 48, 156, 43, 28, BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX, FALSE}, + {L"alt", SCAN_CODE_60, 91, 156, 43, 28, BS_PUSHLIKE|BS_AUTOCHECKBOX, FALSE}, + {L"", SCAN_CODE_61, 134, 156, 174, 28, 0, FALSE}, + {L"alt", SCAN_CODE_62, 310, 156, 43, 28, BS_PUSHLIKE|BS_AUTOCHECKBOX, FALSE}, + {L"ROS", SCAN_CODE_128, 353, 156, 43, 28, BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX, FALSE}, + {L"menu", SCAN_CODE_129, 396, 156, 43, 28, BS_ICON, FALSE}, + {L"ctrl", SCAN_CODE_64, 440, 156, 43, 28, BS_PUSHLIKE|BS_AUTOCHECKBOX, FALSE}, + {L"ins", SCAN_CODE_75, 486, 35, 28, 28, 0, FALSE}, + {L"del", SCAN_CODE_76, 486, 65, 28, 28, 0, FALSE}, + {L"hm", SCAN_CODE_80, 518, 35, 28, 28, BS_ICON, FALSE}, + {L"end", SCAN_CODE_81, 518, 65, 28, 28, 0, FALSE}, + {L"pup", SCAN_CODE_85, 550, 35, 28, 28, BS_ICON, FALSE}, + {L"pdn", SCAN_CODE_86, 550, 65, 28, 28, BS_ICON, FALSE}, + {L"<-", SCAN_CODE_79, 486, 156, 28, 28, BS_ICON, FALSE}, + {L"^", SCAN_CODE_83, 518, 126, 28, 28, BS_ICON, FALSE}, + {L"->", SCAN_CODE_89, 550, 156, 28, 28, BS_ICON, FALSE}, + {L"nlk", SCAN_CODE_90, 582, 35, 28, 28, 0, FALSE}, + {L"7", SCAN_CODE_91, 582, 65, 28, 28, 0, FALSE}, + {L"4", SCAN_CODE_92, 582, 96, 28, 28, 0, FALSE}, + {L"1", SCAN_CODE_93, 582, 126, 28, 28, 0, FALSE}, + {L"/", SCAN_CODE_95, 614, 35, 28, 28, 0, FALSE}, + {L"8", SCAN_CODE_96, 614, 65, 28, 28, 0, FALSE}, + {L"5", SCAN_CODE_97, 614, 96, 28, 28, 0, FALSE}, + {L"2", SCAN_CODE_98, 614, 126, 28, 28, 0, FALSE}, + {L"0", SCAN_CODE_99, 582, 156, 60, 28, 0, FALSE}, + {L"*", SCAN_CODE_100, 646, 35, 28, 28, 0, FALSE}, + {L"9", SCAN_CODE_101, 646, 65, 28, 28, 0, FALSE}, + {L"6", SCAN_CODE_102, 646, 96, 28, 28, 0, FALSE}, + {L"3", SCAN_CODE_103, 646, 126, 28, 28, 0, FALSE}, + {L".", SCAN_CODE_104, 646, 156, 28, 28, 0, FALSE}, + {L"-", SCAN_CODE_105, 678, 35, 28, 28, 0, FALSE}, + {L"+", SCAN_CODE_106, 678, 65, 28, 59, 0, FALSE}, + {L"ent", SCAN_CODE_108, 678, 126, 28, 58, 0, FALSE}, +}; + +KEYBOARD_STRUCT EnhancedKeyboard = +{ + EnhancedKeyboardKeys, + _countof(EnhancedKeyboardKeys), + { 746, 193 }, + { 620, 6 }, + { 40, 15 }, + 40, + { 628, 25 }, + { 7, 5 }, + 40 +}; + +KEYBOARD_STRUCT StandardKeyboard = +{ + StandardKeyboardKeys, + _countof(StandardKeyboardKeys), + { 586, 193 }, + { 588, 6 }, + { 40, 15 }, + 40, + { 596, 25 }, + { 7, 5 }, + 40 +}; diff --git a/base/applications/osk/lang/ar-DZ.rc b/base/applications/osk/lang/ar-DZ.rc index f537b582395..458a7dd2645 100644 --- a/base/applications/osk/lang/ar-DZ.rc +++ b/base/applications/osk/lang/ar-DZ.rc @@ -8,244 +8,6 @@ LANGUAGE LANG_ARABIC, SUBLANG_DEFAULT -MAIN_DIALOG_ENHANCED_KB DIALOGEX DISCARDABLE 0, 0, 608, 164 -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,23,22 - PUSHBUTTON "F1",SCAN_CODE_112,48,3,23,22 - PUSHBUTTON "F2",SCAN_CODE_113,75,3,23,22 - PUSHBUTTON "F3",SCAN_CODE_114,101,3,23,22 - PUSHBUTTON "F4",SCAN_CODE_115,128,3,23,22 - PUSHBUTTON "F5",SCAN_CODE_116,173,3,23,22 - PUSHBUTTON "F6",SCAN_CODE_117,199,3,23,22 - PUSHBUTTON "F7",SCAN_CODE_118,225,3,23,22 - PUSHBUTTON "F8",SCAN_CODE_119,251,3,23,22 - PUSHBUTTON "F9",SCAN_CODE_120,296,3,23,22 - PUSHBUTTON "F10",SCAN_CODE_121,323,3,23,22 - PUSHBUTTON "F11",SCAN_CODE_122,350,3,23,22 - PUSHBUTTON "F12",SCAN_CODE_123,377,3,23,22 - PUSHBUTTON "Prn",SCAN_CODE_124,411,3,23,22 - PUSHBUTTON "Stop",SCAN_CODE_125,438,3,23,22 - PUSHBUTTON "Attn",SCAN_CODE_126,465,3,23,22 - PUSHBUTTON "ذ",SCAN_CODE_1,3,35,23,22 - PUSHBUTTON "1",SCAN_CODE_2,30,35,23,22 - PUSHBUTTON "2",SCAN_CODE_3,57,35,23,22 - PUSHBUTTON "3",SCAN_CODE_4,84,35,23,22 - PUSHBUTTON "4",SCAN_CODE_5,111,35,23,22 - PUSHBUTTON "5",SCAN_CODE_6,138,35,23,22 - PUSHBUTTON "6",SCAN_CODE_7,165,35,23,22 - PUSHBUTTON "7",SCAN_CODE_8,192,35,23,22 - PUSHBUTTON "8",SCAN_CODE_9,219,35,23,22 - PUSHBUTTON "9",SCAN_CODE_10,246,35,23,22 - PUSHBUTTON "0",SCAN_CODE_11,273,35,23,22 - PUSHBUTTON "-",SCAN_CODE_12,300,35,23,22 - PUSHBUTTON "=",SCAN_CODE_13,327,35,23,22 - PUSHBUTTON "<--",SCAN_CODE_15,354,35,47,22,BS_ICON - PUSHBUTTON "Tab",SCAN_CODE_16,3,61,35,22,BS_ICON - PUSHBUTTON "ض",SCAN_CODE_17,42,61,23,22 - PUSHBUTTON "ص",SCAN_CODE_18,69,61,23,22 - PUSHBUTTON "ث",SCAN_CODE_19,96,61,23,22 - PUSHBUTTON "ق",SCAN_CODE_20,123,61,23,22 - PUSHBUTTON "ف",SCAN_CODE_21,150,61,23,22 - PUSHBUTTON "غ",SCAN_CODE_22,177,61,23,22 - PUSHBUTTON "ع",SCAN_CODE_23,204,61,23,22 - PUSHBUTTON "ه",SCAN_CODE_24,231,61,23,22 - PUSHBUTTON "خ",SCAN_CODE_25,258,61,23,22 - PUSHBUTTON "ح",SCAN_CODE_26,285,61,23,22 - PUSHBUTTON "ج",SCAN_CODE_27,312,61,23,22 - PUSHBUTTON "د",SCAN_CODE_28,339,61,23,22 - PUSHBUTTON "\\",SCAN_CODE_29,366,61,35,22 - PUSHBUTTON "Verr maj",SCAN_CODE_30,3,87,46,22,BS_ICON - PUSHBUTTON "ش",SCAN_CODE_31,53,87,23,22 - PUSHBUTTON "س",SCAN_CODE_32,80,87,23,22 - PUSHBUTTON "ي",SCAN_CODE_33,107,87,23,22 - PUSHBUTTON "ب",SCAN_CODE_34,134,87,23,22 - PUSHBUTTON "ل",SCAN_CODE_35,161,87,23,22 - PUSHBUTTON "ا",SCAN_CODE_36,188,87,23,22 - PUSHBUTTON "ت",SCAN_CODE_37,215,87,23,22 - PUSHBUTTON "ن",SCAN_CODE_38,242,87,23,22 - PUSHBUTTON "م",SCAN_CODE_39,269,87,23,22 - PUSHBUTTON "ك",SCAN_CODE_40,296,87,23,22 - PUSHBUTTON "ط",SCAN_CODE_41,323,87,23,22 - PUSHBUTTON "ret",SCAN_CODE_43,350,87,51,22,BS_ICON - PUSHBUTTON "shift",SCAN_CODE_44,3,113,57,22,BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX - PUSHBUTTON "ئ",SCAN_CODE_46,64,113,23,22 - PUSHBUTTON "ء",SCAN_CODE_47,91,113,23,22 - PUSHBUTTON "ؤ",SCAN_CODE_48,118,113,23,22 - PUSHBUTTON "ر",SCAN_CODE_49,145,113,23,22 - PUSHBUTTON "ﻻ",SCAN_CODE_50,172,113,23,22 - PUSHBUTTON "ﻯ",SCAN_CODE_51,199,113,23,22 - PUSHBUTTON "ﺓ",SCAN_CODE_52,226,113,23,22 - PUSHBUTTON "و",SCAN_CODE_53,253,113,23,22 - PUSHBUTTON "ز",SCAN_CODE_54,280,113,23,22 - PUSHBUTTON "ظ",SCAN_CODE_55,307,113,23,22 - PUSHBUTTON "shift",SCAN_CODE_57,334,113,67,22,BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX - PUSHBUTTON "ctrl",SCAN_CODE_58,3,139,41,22,BS_PUSHLIKE|BS_AUTOCHECKBOX - PUSHBUTTON "ROS",SCAN_CODE_127,48,139,30,22,BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX - PUSHBUTTON "alt",SCAN_CODE_60,82,139,30,22,BS_PUSHLIKE|BS_AUTOCHECKBOX - PUSHBUTTON "",SCAN_CODE_61,116,139,143,22 - PUSHBUTTON "alt gr",SCAN_CODE_62,264,139,30,22,BS_PUSHLIKE|BS_AUTOCHECKBOX - PUSHBUTTON "ROS",SCAN_CODE_128,298,139,30,22,BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX - PUSHBUTTON "menu",SCAN_CODE_129,332,139,30,22,BS_ICON - PUSHBUTTON "ctrl",SCAN_CODE_64,366,139,35,22,BS_PUSHLIKE|BS_AUTOCHECKBOX - PUSHBUTTON "ins",SCAN_CODE_75,411,35,23,22 - PUSHBUTTON "del",SCAN_CODE_76,411,61,23,22 - PUSHBUTTON "home",SCAN_CODE_80,438,35,23,22,BS_ICON - PUSHBUTTON "end",SCAN_CODE_81,438,61,23,22 - PUSHBUTTON "pg AR",SCAN_CODE_85,465,35,23,22,BS_ICON - PUSHBUTTON "pg AV",SCAN_CODE_86,465,61,23,22,BS_ICON - PUSHBUTTON "<-",SCAN_CODE_79,411,139,23,22,BS_ICON - PUSHBUTTON "^",SCAN_CODE_83,438,113,23,22,BS_ICON - PUSHBUTTON "v",SCAN_CODE_84,438,139,23,22,BS_ICON - PUSHBUTTON "->",SCAN_CODE_89,465,139,23,22,BS_ICON - PUSHBUTTON "num",SCAN_CODE_90,500,35,23,22 - PUSHBUTTON "7",SCAN_CODE_91,500,61,23,22 - PUSHBUTTON "4",SCAN_CODE_92,500,87,23,22 - PUSHBUTTON "1",SCAN_CODE_93,500,113,23,22 - PUSHBUTTON "/",SCAN_CODE_95,527,35,23,22 - PUSHBUTTON "8",SCAN_CODE_96,527,61,23,22 - PUSHBUTTON "5",SCAN_CODE_97,527,87,23,22 - PUSHBUTTON "2",SCAN_CODE_98,527,113,23,22 - PUSHBUTTON "0",SCAN_CODE_99,500,139,50,22 - PUSHBUTTON "*",SCAN_CODE_100,554,35,23,22 - PUSHBUTTON "9",SCAN_CODE_101,554,61,23,22 - PUSHBUTTON "6",SCAN_CODE_102,554,87,23,22 - PUSHBUTTON "3",SCAN_CODE_103,554,113,23,22 - PUSHBUTTON ".",SCAN_CODE_104,554,139,23,22 - PUSHBUTTON "-",SCAN_CODE_105,581,35,23,22 - PUSHBUTTON "+",SCAN_CODE_106,581,61,23,48 - PUSHBUTTON "ent",SCAN_CODE_108,581,113,23,48 - CTEXT "Num",IDC_STATIC,510,4,21,8 - CONTROL "",IDC_LED_NUM,"Static",SS_CENTER|SS_NOTIFY,518,16,4,3 - CTEXT "Caps",IDC_STATIC,540,4,21,8 - CONTROL "",IDC_LED_CAPS,"Static",SS_CENTER|SS_NOTIFY,548,16,4,3 - CTEXT "Scroll",IDC_STATIC,572,4,21,8 - 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|BS_PUSHLIKE|BS_AUTOCHECKBOX - 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|BS_PUSHLIKE|BS_AUTOCHECKBOX - 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" @@ -274,7 +36,7 @@ BEGIN MENUITEM SEPARATOR MENUITEM "&Typing Mode...", IDM_TYPE_MODE, GRAYED MENUITEM SEPARATOR - MENUITEM "&Font...", IDM_FONT, GRAYED + MENUITEM "&Font...", IDM_FONT END POPUP "Help" @@ -299,8 +61,23 @@ END STRINGTABLE BEGIN - STRING_OSK "On-Screen Keyboard" - STRING_AUTHORS "Copyright Denis Robert" + IDS_OSK "On-Screen Keyboard" + IDS_AUTHORS "Copyright Denis Robert" + IDS_NUMLOCK "Num" + IDS_CAPSLOCK "Caps" + IDS_SCROLLLOCK "Scroll" + /* Make sure the text fits onto the buttons */ + IDS_ESCAPE "Esc" + IDS_PRN "Prn" + IDS_STOP "Stop" + IDS_ATTN "Attn" + IDS_INSERT "ins" + IDS_NUMLOCKKEY "nlk" + IDS_DELETE "del" + IDS_END "end" + IDS_CTRL "ctrl" + IDS_LEFTALT "alt" + IDS_RIGHTALT "alt" END /* EOF */ diff --git a/base/applications/osk/lang/cs-CZ.rc b/base/applications/osk/lang/cs-CZ.rc index a873fce0264..b6b45b3eb44 100644 --- a/base/applications/osk/lang/cs-CZ.rc +++ b/base/applications/osk/lang/cs-CZ.rc @@ -8,244 +8,6 @@ LANGUAGE LANG_CZECH, SUBLANG_DEFAULT -MAIN_DIALOG_ENHANCED_KB DIALOGEX DISCARDABLE 0, 0, 608, 164 -CAPTION "Klávesnice na obrazovce" -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,23,22 - PUSHBUTTON "F1",SCAN_CODE_112,48,3,23,22 - PUSHBUTTON "F2",SCAN_CODE_113,75,3,23,22 - PUSHBUTTON "F3",SCAN_CODE_114,101,3,23,22 - PUSHBUTTON "F4",SCAN_CODE_115,128,3,23,22 - PUSHBUTTON "F5",SCAN_CODE_116,173,3,23,22 - PUSHBUTTON "F6",SCAN_CODE_117,199,3,23,22 - PUSHBUTTON "F7",SCAN_CODE_118,225,3,23,22 - PUSHBUTTON "F8",SCAN_CODE_119,251,3,23,22 - PUSHBUTTON "F9",SCAN_CODE_120,296,3,23,22 - PUSHBUTTON "F10",SCAN_CODE_121,323,3,23,22 - PUSHBUTTON "F11",SCAN_CODE_122,350,3,23,22 - PUSHBUTTON "F12",SCAN_CODE_123,377,3,23,22 - PUSHBUTTON "Prn",SCAN_CODE_124,411,3,23,22 - PUSHBUTTON "Stop",SCAN_CODE_125,438,3,23,22 - PUSHBUTTON "Attn",SCAN_CODE_126,465,3,23,22 - PUSHBUTTON "`",SCAN_CODE_1,3,35,23,22 - PUSHBUTTON "1",SCAN_CODE_2,30,35,23,22 - PUSHBUTTON "2",SCAN_CODE_3,57,35,23,22 - PUSHBUTTON "3",SCAN_CODE_4,84,35,23,22 - PUSHBUTTON "4",SCAN_CODE_5,111,35,23,22 - PUSHBUTTON "5",SCAN_CODE_6,138,35,23,22 - PUSHBUTTON "6",SCAN_CODE_7,165,35,23,22 - PUSHBUTTON "7",SCAN_CODE_8,192,35,23,22 - PUSHBUTTON "8",SCAN_CODE_9,219,35,23,22 - PUSHBUTTON "9",SCAN_CODE_10,246,35,23,22 - PUSHBUTTON "0",SCAN_CODE_11,273,35,23,22 - PUSHBUTTON "-",SCAN_CODE_12,300,35,23,22 - PUSHBUTTON "=",SCAN_CODE_13,327,35,23,22 - PUSHBUTTON "<--",SCAN_CODE_15,354,35,47,22,BS_ICON - PUSHBUTTON "Tab",SCAN_CODE_16,3,61,35,22,BS_ICON - PUSHBUTTON "Q",SCAN_CODE_17,42,61,23,22 - PUSHBUTTON "W",SCAN_CODE_18,69,61,23,22 - PUSHBUTTON "E",SCAN_CODE_19,96,61,23,22 - PUSHBUTTON "R",SCAN_CODE_20,123,61,23,22 - PUSHBUTTON "T",SCAN_CODE_21,150,61,23,22 - PUSHBUTTON "Y",SCAN_CODE_22,177,61,23,22 - PUSHBUTTON "U",SCAN_CODE_23,204,61,23,22 - PUSHBUTTON "I",SCAN_CODE_24,231,61,23,22 - PUSHBUTTON "O",SCAN_CODE_25,258,61,23,22 - PUSHBUTTON "P",SCAN_CODE_26,285,61,23,22 - PUSHBUTTON "[",SCAN_CODE_27,312,61,23,22 - PUSHBUTTON "]",SCAN_CODE_28,339,61,23,22 - PUSHBUTTON "\\",SCAN_CODE_29,366,61,35,22 - PUSHBUTTON "Caps Lock",SCAN_CODE_30,3,87,46,22,BS_ICON - PUSHBUTTON "A",SCAN_CODE_31,53,87,23,22 - PUSHBUTTON "S",SCAN_CODE_32,80,87,23,22 - PUSHBUTTON "D",SCAN_CODE_33,107,87,23,22 - PUSHBUTTON "F",SCAN_CODE_34,134,87,23,22 - PUSHBUTTON "G",SCAN_CODE_35,161,87,23,22 - PUSHBUTTON "H",SCAN_CODE_36,188,87,23,22 - PUSHBUTTON "J",SCAN_CODE_37,215,87,23,22 - PUSHBUTTON "K",SCAN_CODE_38,242,87,23,22 - PUSHBUTTON "L",SCAN_CODE_39,269,87,23,22 - PUSHBUTTON ";",SCAN_CODE_40,296,87,23,22 - PUSHBUTTON "'",SCAN_CODE_41,323,87,23,22 - PUSHBUTTON "ret",SCAN_CODE_43,350,87,51,22,BS_ICON - PUSHBUTTON "shift",SCAN_CODE_44,3,113,57,22,BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX - PUSHBUTTON "Z",SCAN_CODE_46,64,113,23,22 - PUSHBUTTON "X",SCAN_CODE_47,91,113,23,22 - PUSHBUTTON "C",SCAN_CODE_48,118,113,23,22 - PUSHBUTTON "V",SCAN_CODE_49,145,113,23,22 - PUSHBUTTON "B",SCAN_CODE_50,172,113,23,22 - PUSHBUTTON "N",SCAN_CODE_51,199,113,23,22 - PUSHBUTTON "M",SCAN_CODE_52,226,113,23,22 - PUSHBUTTON ",",SCAN_CODE_53,253,113,23,22 - PUSHBUTTON ".",SCAN_CODE_54,280,113,23,22 - PUSHBUTTON "/",SCAN_CODE_55,307,113,23,22 - PUSHBUTTON "shift",SCAN_CODE_57,334,113,67,22,BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX - PUSHBUTTON "ctrl",SCAN_CODE_58,3,139,41,22,BS_PUSHLIKE|BS_AUTOCHECKBOX - PUSHBUTTON "ROS",SCAN_CODE_127,48,139,30,22,BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX - PUSHBUTTON "alt",SCAN_CODE_60,82,139,30,22,BS_PUSHLIKE|BS_AUTOCHECKBOX - PUSHBUTTON "",SCAN_CODE_61,116,139,143,22 - PUSHBUTTON "alt gr",SCAN_CODE_62,264,139,30,22,BS_PUSHLIKE|BS_AUTOCHECKBOX - PUSHBUTTON "ROS",SCAN_CODE_128,298,139,30,22,BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX - PUSHBUTTON "menu",SCAN_CODE_129,332,139,30,22,BS_ICON - PUSHBUTTON "ctrl",SCAN_CODE_64,366,139,35,22,BS_PUSHLIKE|BS_AUTOCHECKBOX - PUSHBUTTON "ins",SCAN_CODE_75,411,35,23,22 - PUSHBUTTON "del",SCAN_CODE_76,411,61,23,22 - PUSHBUTTON "home",SCAN_CODE_80,438,35,23,22,BS_ICON - PUSHBUTTON "end",SCAN_CODE_81,438,61,23,22 - PUSHBUTTON "pg up",SCAN_CODE_85,465,35,23,22,BS_ICON - PUSHBUTTON "pg down",SCAN_CODE_86,465,61,23,22,BS_ICON - PUSHBUTTON "<-",SCAN_CODE_79,411,139,23,22,BS_ICON - PUSHBUTTON "^",SCAN_CODE_83,438,113,23,22,BS_ICON - PUSHBUTTON "v",SCAN_CODE_84,438,139,23,22,BS_ICON - PUSHBUTTON "->",SCAN_CODE_89,465,139,23,22,BS_ICON - PUSHBUTTON "num",SCAN_CODE_90,500,35,23,22 - PUSHBUTTON "7",SCAN_CODE_91,500,61,23,22 - PUSHBUTTON "4",SCAN_CODE_92,500,87,23,22 - PUSHBUTTON "1",SCAN_CODE_93,500,113,23,22 - PUSHBUTTON "/",SCAN_CODE_95,527,35,23,22 - PUSHBUTTON "8",SCAN_CODE_96,527,61,23,22 - PUSHBUTTON "5",SCAN_CODE_97,527,87,23,22 - PUSHBUTTON "2",SCAN_CODE_98,527,113,23,22 - PUSHBUTTON "0",SCAN_CODE_99,500,139,50,22 - PUSHBUTTON "*",SCAN_CODE_100,554,35,23,22 - PUSHBUTTON "9",SCAN_CODE_101,554,61,23,22 - PUSHBUTTON "6",SCAN_CODE_102,554,87,23,22 - PUSHBUTTON "3",SCAN_CODE_103,554,113,23,22 - PUSHBUTTON ".",SCAN_CODE_104,554,139,23,22 - PUSHBUTTON "-",SCAN_CODE_105,581,35,23,22 - PUSHBUTTON "+",SCAN_CODE_106,581,61,23,48 - PUSHBUTTON "ent",SCAN_CODE_108,581,113,23,48 - CTEXT "Num",IDC_STATIC,510,4,21,8 - CONTROL "",IDC_LED_NUM,"Static",SS_CENTER|SS_NOTIFY,518,16,4,3 - CTEXT "Caps",IDC_STATIC,540,4,21,8 - CONTROL "",IDC_LED_CAPS,"Static",SS_CENTER|SS_NOTIFY,548,16,4,3 - CTEXT "Scroll",IDC_STATIC,572,4,21,8 - 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|BS_PUSHLIKE|BS_AUTOCHECKBOX - 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|BS_PUSHLIKE|BS_AUTOCHECKBOX - 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" @@ -274,7 +36,7 @@ BEGIN MENUITEM SEPARATOR MENUITEM "&Typing Mode...", IDM_TYPE_MODE, GRAYED MENUITEM SEPARATOR - MENUITEM "&Font...", IDM_FONT, GRAYED + MENUITEM "&Font...", IDM_FONT END POPUP "Help" @@ -299,8 +61,23 @@ END STRINGTABLE BEGIN - STRING_OSK "On-Screen Keyboard" - STRING_AUTHORS "Copyright Denis Robert" + IDS_OSK "On-Screen Keyboard" + IDS_AUTHORS "Copyright Denis Robert" + IDS_NUMLOCK "Num" + IDS_CAPSLOCK "Caps" + IDS_SCROLLLOCK "Scroll" + /* Make sure the text fits onto the buttons */ + IDS_ESCAPE "Esc" + IDS_PRN "Prn" + IDS_STOP "Stop" + IDS_ATTN "Attn" + IDS_INSERT "ins" + IDS_NUMLOCKKEY "nlk" + IDS_DELETE "del" + IDS_END "end" + IDS_CTRL "ctrl" + IDS_LEFTALT "alt" + IDS_RIGHTALT "alt" END /* EOF */ diff --git a/base/applications/osk/lang/de-DE.rc b/base/applications/osk/lang/de-DE.rc index 83c7b760e09..357de8326bc 100644 --- a/base/applications/osk/lang/de-DE.rc +++ b/base/applications/osk/lang/de-DE.rc @@ -8,245 +8,6 @@ LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL -MAIN_DIALOG_ENHANCED_KB DIALOGEX DISCARDABLE 0, 0, 608, 164 -CAPTION "Bildschirmtastatur" -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,23,22 - PUSHBUTTON "F1",SCAN_CODE_112,48,3,23,22 - PUSHBUTTON "F2",SCAN_CODE_113,75,3,23,22 - PUSHBUTTON "F3",SCAN_CODE_114,101,3,23,22 - PUSHBUTTON "F4",SCAN_CODE_115,128,3,23,22 - PUSHBUTTON "F5",SCAN_CODE_116,173,3,23,22 - PUSHBUTTON "F6",SCAN_CODE_117,199,3,23,22 - PUSHBUTTON "F7",SCAN_CODE_118,225,3,23,22 - PUSHBUTTON "F8",SCAN_CODE_119,251,3,23,22 - PUSHBUTTON "F9",SCAN_CODE_120,296,3,23,22 - PUSHBUTTON "F10",SCAN_CODE_121,323,3,23,22 - PUSHBUTTON "F11",SCAN_CODE_122,350,3,23,22 - PUSHBUTTON "F12",SCAN_CODE_123,377,3,23,22 - PUSHBUTTON "Druck",SCAN_CODE_124,411,3,23,22 - PUSHBUTTON "Rollen",SCAN_CODE_125,438,3,23,22 - PUSHBUTTON "Pause",SCAN_CODE_126,465,3,23,22 - PUSHBUTTON "^",SCAN_CODE_1,3,35,23,22 - PUSHBUTTON "1",SCAN_CODE_2,30,35,23,22 - PUSHBUTTON "2",SCAN_CODE_3,57,35,23,22 - PUSHBUTTON "3",SCAN_CODE_4,84,35,23,22 - PUSHBUTTON "4",SCAN_CODE_5,111,35,23,22 - PUSHBUTTON "5",SCAN_CODE_6,138,35,23,22 - PUSHBUTTON "6",SCAN_CODE_7,165,35,23,22 - PUSHBUTTON "7",SCAN_CODE_8,192,35,23,22 - PUSHBUTTON "8",SCAN_CODE_9,219,35,23,22 - PUSHBUTTON "9",SCAN_CODE_10,246,35,23,22 - PUSHBUTTON "0",SCAN_CODE_11,273,35,23,22 - PUSHBUTTON "ß",SCAN_CODE_12,300,35,23,22 - PUSHBUTTON "´",SCAN_CODE_13,327,35,23,22 - PUSHBUTTON "<--",SCAN_CODE_15,354,35,47,22,BS_ICON - PUSHBUTTON "Tab",SCAN_CODE_16,3,61,35,22,BS_ICON - PUSHBUTTON "Q",SCAN_CODE_17,42,61,23,22 - PUSHBUTTON "W",SCAN_CODE_18,69,61,23,22 - PUSHBUTTON "E",SCAN_CODE_19,96,61,23,22 - PUSHBUTTON "R",SCAN_CODE_20,123,61,23,22 - PUSHBUTTON "T",SCAN_CODE_21,150,61,23,22 - PUSHBUTTON "Z",SCAN_CODE_22,177,61,23,22 - PUSHBUTTON "U",SCAN_CODE_23,204,61,23,22 - PUSHBUTTON "I",SCAN_CODE_24,231,61,23,22 - PUSHBUTTON "O",SCAN_CODE_25,258,61,23,22 - PUSHBUTTON "P",SCAN_CODE_26,285,61,23,22 - PUSHBUTTON "Ü",SCAN_CODE_27,312,61,23,22 - PUSHBUTTON "+",SCAN_CODE_28,339,61,23,22 - PUSHBUTTON "Feststell",SCAN_CODE_30,3,87,46,22,BS_ICON - PUSHBUTTON "A",SCAN_CODE_31,53,87,23,22 - PUSHBUTTON "S",SCAN_CODE_32,80,87,23,22 - PUSHBUTTON "D",SCAN_CODE_33,107,87,23,22 - PUSHBUTTON "F",SCAN_CODE_34,134,87,23,22 - PUSHBUTTON "G",SCAN_CODE_35,161,87,23,22 - PUSHBUTTON "H",SCAN_CODE_36,188,87,23,22 - PUSHBUTTON "J",SCAN_CODE_37,215,87,23,22 - PUSHBUTTON "K",SCAN_CODE_38,242,87,23,22 - PUSHBUTTON "L",SCAN_CODE_39,269,87,23,22 - PUSHBUTTON "Ö",SCAN_CODE_40,296,87,23,22 - PUSHBUTTON "Ä",SCAN_CODE_41,323,87,23,22 - PUSHBUTTON "#",SCAN_CODE_42,350,87,23,22 - PUSHBUTTON "Enter",SCAN_CODE_43,377,61,23,48,BS_ICON - PUSHBUTTON "Umsch",SCAN_CODE_44,3,113,30,22,BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX - PUSHBUTTON "<",SCAN_CODE_45,37,113,23,22 - PUSHBUTTON "Y",SCAN_CODE_46,64,113,23,22 - PUSHBUTTON "X",SCAN_CODE_47,91,113,23,22 - PUSHBUTTON "C",SCAN_CODE_48,118,113,23,22 - PUSHBUTTON "V",SCAN_CODE_49,145,113,23,22 - PUSHBUTTON "B",SCAN_CODE_50,172,113,23,22 - PUSHBUTTON "N",SCAN_CODE_51,199,113,23,22 - PUSHBUTTON "M",SCAN_CODE_52,226,113,23,22 - PUSHBUTTON ",",SCAN_CODE_53,253,113,23,22 - PUSHBUTTON ".",SCAN_CODE_54,280,113,23,22 - PUSHBUTTON "-",SCAN_CODE_55,307,113,23,22 - PUSHBUTTON "Umsch",SCAN_CODE_57,334,113,67,22,BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX - PUSHBUTTON "Strg",SCAN_CODE_58,3,139,41,22,BS_PUSHLIKE|BS_AUTOCHECKBOX - PUSHBUTTON "ROS",SCAN_CODE_127,48,139,30,22,BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX - PUSHBUTTON "Alt",SCAN_CODE_60,82,139,30,22,BS_PUSHLIKE|BS_AUTOCHECKBOX - PUSHBUTTON "",SCAN_CODE_61,116,139,143,22 - PUSHBUTTON "Alt Gr",SCAN_CODE_62,264,139,30,22,BS_PUSHLIKE|BS_AUTOCHECKBOX - PUSHBUTTON "ROS",SCAN_CODE_128,298,139,30,22,BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX - PUSHBUTTON "Menü",SCAN_CODE_129,332,139,30,22,BS_ICON - PUSHBUTTON "Strg",SCAN_CODE_64,366,139,35,22,BS_PUSHLIKE|BS_AUTOCHECKBOX - PUSHBUTTON "Einfg",SCAN_CODE_75,411,35,23,22 - PUSHBUTTON "Entf",SCAN_CODE_76,411,61,23,22 - PUSHBUTTON "Pos1",SCAN_CODE_80,438,35,23,22,BS_ICON - PUSHBUTTON "Ende",SCAN_CODE_81,438,61,23,22 - PUSHBUTTON "Bild auf",SCAN_CODE_85,465,35,23,22,BS_ICON - PUSHBUTTON "Bild ab",SCAN_CODE_86,465,61,23,22,BS_ICON - PUSHBUTTON "<-",SCAN_CODE_79,411,139,23,22,BS_ICON - PUSHBUTTON "^",SCAN_CODE_83,438,113,23,22,BS_ICON - PUSHBUTTON "v",SCAN_CODE_84,438,139,23,22,BS_ICON - PUSHBUTTON "->",SCAN_CODE_89,465,139,23,22,BS_ICON - PUSHBUTTON "Num",SCAN_CODE_90,500,35,23,22 - PUSHBUTTON "7",SCAN_CODE_91,500,61,23,22 - PUSHBUTTON "4",SCAN_CODE_92,500,87,23,22 - PUSHBUTTON "1",SCAN_CODE_93,500,113,23,22 - PUSHBUTTON "/",SCAN_CODE_95,527,35,23,22 - PUSHBUTTON "8",SCAN_CODE_96,527,61,23,22 - PUSHBUTTON "5",SCAN_CODE_97,527,87,23,22 - PUSHBUTTON "2",SCAN_CODE_98,527,113,23,22 - PUSHBUTTON "0",SCAN_CODE_99,500,139,50,22 - PUSHBUTTON "*",SCAN_CODE_100,554,35,23,22 - PUSHBUTTON "9",SCAN_CODE_101,554,61,23,22 - PUSHBUTTON "6",SCAN_CODE_102,554,87,23,22 - PUSHBUTTON "3",SCAN_CODE_103,554,113,23,22 - PUSHBUTTON ",",SCAN_CODE_104,554,139,23,22 - PUSHBUTTON "-",SCAN_CODE_105,581,35,23,22 - PUSHBUTTON "+",SCAN_CODE_106,581,61,23,48 - PUSHBUTTON "Enter",SCAN_CODE_108,581,113,23,48 - CTEXT "Num",IDC_STATIC,510,4,21,8 - CONTROL "",IDC_LED_NUM,"Static",SS_CENTER|SS_NOTIFY,518,16,4,3 - CTEXT "Caps",IDC_STATIC,540,4,21,8 - CONTROL "",IDC_LED_CAPS,"Static",SS_CENTER|SS_NOTIFY,548,16,4,3 - CTEXT "Rollen",IDC_STATIC,572,4,21,8 - 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 "Bildschirmtastatur" -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 "Druck",SCAN_CODE_124,304,3,15,15 - PUSHBUTTON "Stop",SCAN_CODE_125,324,3,15,15 - PUSHBUTTON "Pause",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 "z",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 "feststell",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 "enter",SCAN_CODE_43,262,60,38,15,BS_ICON - PUSHBUTTON "umsch",SCAN_CODE_44,3,79,57,15,BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX - PUSHBUTTON "y",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 "umsch",SCAN_CODE_57,254,79,45,15,BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX - PUSHBUTTON "strg",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|BS_PUSHLIKE|BS_AUTOCHECKBOX - PUSHBUTTON "alt",SCAN_CODE_60,57,98,24,15,BS_PUSHLIKE|BS_AUTOCHECKBOX - PUSHBUTTON "",SCAN_CODE_61,84,98,106,15 //space - PUSHBUTTON "alt gr",SCAN_CODE_62,194,98,24,15,BS_PUSHLIKE|BS_AUTOCHECKBOX - PUSHBUTTON "ROS",SCAN_CODE_128,221,98,24,15,BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX - PUSHBUTTON "menü",SCAN_CODE_129,248,98,24,15,BS_ICON - PUSHBUTTON "strg",SCAN_CODE_64,275,98,24,15,BS_PUSHLIKE|BS_AUTOCHECKBOX - PUSHBUTTON "einfg",SCAN_CODE_75,304,22,15,15 - PUSHBUTTON "entf",SCAN_CODE_76,304,41,15,15 - PUSHBUTTON "pos1",SCAN_CODE_80,324,22,15,15 - PUSHBUTTON "ende",SCAN_CODE_81,324,41,15,15 - PUSHBUTTON "bild auf",SCAN_CODE_85,344,22,15,15 - PUSHBUTTON "bild ab",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 "num",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 "enter",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 "Rollen",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 "Datei" @@ -275,7 +36,7 @@ BEGIN MENUITEM SEPARATOR MENUITEM "Eingabemodus...", IDM_TYPE_MODE, GRAYED MENUITEM SEPARATOR - MENUITEM "&Schriftart...", IDM_FONT, GRAYED + MENUITEM "&Schriftart...", IDM_FONT END POPUP "Hilfe" @@ -300,8 +61,23 @@ END STRINGTABLE BEGIN - STRING_OSK "Bildschirmtastatur" - STRING_AUTHORS "Copyright Denis Robert" + IDS_OSK "Bildschirmtastatur" + IDS_AUTHORS "Copyright Denis Robert" + IDS_NUMLOCK "Num" + IDS_CAPSLOCK "Caps" + IDS_SCROLLLOCK "Scroll" + /* Make sure the text fits onto the buttons */ + IDS_ESCAPE "Esc" + IDS_PRN "Prn" + IDS_STOP "Stop" + IDS_ATTN "Attn" + IDS_INSERT "ins" + IDS_NUMLOCKKEY "nlk" + IDS_DELETE "del" + IDS_END "end" + IDS_CTRL "ctrl" + IDS_LEFTALT "alt" + IDS_RIGHTALT "alt" END /* EOF */ diff --git a/base/applications/osk/lang/en-GB.rc b/base/applications/osk/lang/en-GB.rc index dc0fc5b81c4..7f9fd716a9b 100644 --- a/base/applications/osk/lang/en-GB.rc +++ b/base/applications/osk/lang/en-GB.rc @@ -8,245 +8,6 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_UK -MAIN_DIALOG_ENHANCED_KB DIALOGEX DISCARDABLE 0, 0, 608, 164 -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 "Ech",SCAN_CODE_110,3,3,23,22 - PUSHBUTTON "F1",SCAN_CODE_112,48,3,23,22 - PUSHBUTTON "F2",SCAN_CODE_113,75,3,23,22 - PUSHBUTTON "F3",SCAN_CODE_114,101,3,23,22 - PUSHBUTTON "F4",SCAN_CODE_115,128,3,23,22 - PUSHBUTTON "F5",SCAN_CODE_116,173,3,23,22 - PUSHBUTTON "F6",SCAN_CODE_117,199,3,23,22 - PUSHBUTTON "F7",SCAN_CODE_118,225,3,23,22 - PUSHBUTTON "F8",SCAN_CODE_119,251,3,23,22 - PUSHBUTTON "F9",SCAN_CODE_120,296,3,23,22 - PUSHBUTTON "F10",SCAN_CODE_121,323,3,23,22 - PUSHBUTTON "F11",SCAN_CODE_122,350,3,23,22 - PUSHBUTTON "F12",SCAN_CODE_123,377,3,23,22 - PUSHBUTTON "Prn",SCAN_CODE_124,411,3,23,22 - PUSHBUTTON "Stop",SCAN_CODE_125,438,3,23,22 - PUSHBUTTON "Attn",SCAN_CODE_126,465,3,23,22 - PUSHBUTTON "|",SCAN_CODE_1,3,35,23,22 - PUSHBUTTON "1",SCAN_CODE_2,30,35,23,22 - PUSHBUTTON "2",SCAN_CODE_3,57,35,23,22 - PUSHBUTTON "3",SCAN_CODE_4,84,35,23,22 - PUSHBUTTON "4",SCAN_CODE_5,111,35,23,22 - PUSHBUTTON "5",SCAN_CODE_6,138,35,23,22 - PUSHBUTTON "6",SCAN_CODE_7,165,35,23,22 - PUSHBUTTON "7",SCAN_CODE_8,192,35,23,22 - PUSHBUTTON "8",SCAN_CODE_9,219,35,23,22 - PUSHBUTTON "9",SCAN_CODE_10,246,35,23,22 - PUSHBUTTON "0",SCAN_CODE_11,273,35,23,22 - PUSHBUTTON "-",SCAN_CODE_12,300,35,23,22 - PUSHBUTTON "=",SCAN_CODE_13,327,35,23,22 - PUSHBUTTON "<--",SCAN_CODE_15,354,35,47,22,BS_ICON - PUSHBUTTON "Tab",SCAN_CODE_16,3,61,35,22,BS_ICON - PUSHBUTTON "Q",SCAN_CODE_17,42,61,23,22 - PUSHBUTTON "W",SCAN_CODE_18,69,61,23,22 - PUSHBUTTON "E",SCAN_CODE_19,96,61,23,22 - PUSHBUTTON "R",SCAN_CODE_20,123,61,23,22 - PUSHBUTTON "T",SCAN_CODE_21,150,61,23,22 - PUSHBUTTON "Y",SCAN_CODE_22,177,61,23,22 - PUSHBUTTON "U",SCAN_CODE_23,204,61,23,22 - PUSHBUTTON "I",SCAN_CODE_24,231,61,23,22 - PUSHBUTTON "O",SCAN_CODE_25,258,61,23,22 - PUSHBUTTON "P",SCAN_CODE_26,285,61,23,22 - PUSHBUTTON "[",SCAN_CODE_27,312,61,23,22 - PUSHBUTTON "]",SCAN_CODE_28,339,61,23,22 - PUSHBUTTON "Caps Lock",SCAN_CODE_30,3,87,46,22,BS_ICON - PUSHBUTTON "A",SCAN_CODE_31,53,87,23,22 - PUSHBUTTON "S",SCAN_CODE_32,80,87,23,22 - PUSHBUTTON "D",SCAN_CODE_33,107,87,23,22 - PUSHBUTTON "F",SCAN_CODE_34,134,87,23,22 - PUSHBUTTON "G",SCAN_CODE_35,161,87,23,22 - PUSHBUTTON "H",SCAN_CODE_36,188,87,23,22 - PUSHBUTTON "J",SCAN_CODE_37,215,87,23,22 - PUSHBUTTON "K",SCAN_CODE_38,242,87,23,22 - PUSHBUTTON "L",SCAN_CODE_39,269,87,23,22 - PUSHBUTTON ";",SCAN_CODE_40,296,87,23,22 - PUSHBUTTON "'",SCAN_CODE_41,323,87,23,22 - PUSHBUTTON "#",SCAN_CODE_42,350,87,23,22 - PUSHBUTTON "ret",SCAN_CODE_43,377,61,23,48,BS_ICON - PUSHBUTTON "Shift",SCAN_CODE_44,3,113,30,22,BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX - PUSHBUTTON "\\",SCAN_CODE_45,37,113,23,22 - PUSHBUTTON "Z",SCAN_CODE_46,64,113,23,22 - PUSHBUTTON "X",SCAN_CODE_47,91,113,23,22 - PUSHBUTTON "C",SCAN_CODE_48,118,113,23,22 - PUSHBUTTON "V",SCAN_CODE_49,145,113,23,22 - PUSHBUTTON "B",SCAN_CODE_50,172,113,23,22 - PUSHBUTTON "N",SCAN_CODE_51,199,113,23,22 - PUSHBUTTON "M",SCAN_CODE_52,226,113,23,22 - PUSHBUTTON ",",SCAN_CODE_53,253,113,23,22 - PUSHBUTTON ".",SCAN_CODE_54,280,113,23,22 - PUSHBUTTON "/",SCAN_CODE_55,307,113,23,22 - PUSHBUTTON "Shift",SCAN_CODE_57,334,113,67,22,BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX - PUSHBUTTON "ctrl",SCAN_CODE_58,3,139,41,22,BS_PUSHLIKE|BS_AUTOCHECKBOX - PUSHBUTTON "ROS",SCAN_CODE_127,48,139,30,22,BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX - PUSHBUTTON "alt",SCAN_CODE_60,82,139,30,22,BS_PUSHLIKE|BS_AUTOCHECKBOX - PUSHBUTTON "",SCAN_CODE_61,116,139,143,22 - PUSHBUTTON "alt gr",SCAN_CODE_62,264,139,30,22,BS_PUSHLIKE|BS_AUTOCHECKBOX - PUSHBUTTON "ROS",SCAN_CODE_128,298,139,30,22,BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX - PUSHBUTTON "menu",SCAN_CODE_129,332,139,30,22,BS_ICON - PUSHBUTTON "ctrl",SCAN_CODE_64,366,139,35,22,BS_PUSHLIKE|BS_AUTOCHECKBOX - PUSHBUTTON "ins",SCAN_CODE_75,411,35,23,22 - PUSHBUTTON "can",SCAN_CODE_76,411,61,23,22 - PUSHBUTTON "home",SCAN_CODE_80,438,35,23,22,BS_ICON - PUSHBUTTON "End",SCAN_CODE_81,438,61,23,22 - PUSHBUTTON "pg up",SCAN_CODE_85,465,35,23,22,BS_ICON - PUSHBUTTON "pg down",SCAN_CODE_86,465,61,23,22,BS_ICON - PUSHBUTTON "<-",SCAN_CODE_79,411,139,23,22,BS_ICON - PUSHBUTTON "^",SCAN_CODE_83,438,113,23,22,BS_ICON - PUSHBUTTON "v",SCAN_CODE_84,438,139,23,22,BS_ICON - PUSHBUTTON "->",SCAN_CODE_89,465,139,23,22,BS_ICON - PUSHBUTTON "num",SCAN_CODE_90,500,35,23,22 - PUSHBUTTON "7",SCAN_CODE_91,500,61,23,22 - PUSHBUTTON "4",SCAN_CODE_92,500,87,23,22 - PUSHBUTTON "1",SCAN_CODE_93,500,113,23,22 - PUSHBUTTON "/",SCAN_CODE_95,527,35,23,22 - PUSHBUTTON "8",SCAN_CODE_96,527,61,23,22 - PUSHBUTTON "5",SCAN_CODE_97,527,87,23,22 - PUSHBUTTON "2",SCAN_CODE_98,527,113,23,22 - PUSHBUTTON "0",SCAN_CODE_99,500,139,50,22 - PUSHBUTTON "*",SCAN_CODE_100,554,35,23,22 - PUSHBUTTON "9",SCAN_CODE_101,554,61,23,22 - PUSHBUTTON "6",SCAN_CODE_102,554,87,23,22 - PUSHBUTTON "3",SCAN_CODE_103,554,113,23,22 - PUSHBUTTON ".",SCAN_CODE_104,554,139,23,22 - PUSHBUTTON "-",SCAN_CODE_105,581,35,23,22 - PUSHBUTTON "+",SCAN_CODE_106,581,61,23,48 - PUSHBUTTON "ent",SCAN_CODE_108,581,113,23,48 - CTEXT "Num",IDC_STATIC,510,4,21,8 - CONTROL "",IDC_LED_NUM,"Static",SS_CENTER|SS_NOTIFY,518,16,4,3 - CTEXT "Caps",IDC_STATIC,540,4,21,8 - CONTROL "",IDC_LED_CAPS,"Static",SS_CENTER|SS_NOTIFY,548,16,4,3 - CTEXT "Scroll",IDC_STATIC,572,4,21,8 - 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|BS_PUSHLIKE|BS_AUTOCHECKBOX - 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|BS_PUSHLIKE|BS_AUTOCHECKBOX - 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" @@ -275,7 +36,7 @@ BEGIN MENUITEM SEPARATOR MENUITEM "&Typing Mode...", IDM_TYPE_MODE, GRAYED MENUITEM SEPARATOR - MENUITEM "&Font...", IDM_FONT, GRAYED + MENUITEM "&Font...", IDM_FONT END POPUP "Help" @@ -300,8 +61,23 @@ END STRINGTABLE BEGIN - STRING_OSK "On-Screen Keyboard" - STRING_AUTHORS "Copyright Denis Robert" + IDS_OSK "On-Screen Keyboard" + IDS_AUTHORS "Copyright Denis Robert" + IDS_NUMLOCK "Num" + IDS_CAPSLOCK "Caps" + IDS_SCROLLLOCK "Scroll" + /* Make sure the text fits onto the buttons */ + IDS_ESCAPE "Esc" + IDS_PRN "Prn" + IDS_STOP "Stop" + IDS_ATTN "Attn" + IDS_INSERT "ins" + IDS_NUMLOCKKEY "nlk" + IDS_DELETE "del" + IDS_END "end" + IDS_CTRL "ctrl" + IDS_LEFTALT "alt" + IDS_RIGHTALT "alt" END /* EOF */ diff --git a/base/applications/osk/lang/en-US.rc b/base/applications/osk/lang/en-US.rc index 412ead788fb..2a6f9c54331 100644 --- a/base/applications/osk/lang/en-US.rc +++ b/base/applications/osk/lang/en-US.rc @@ -8,244 +8,6 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US -MAIN_DIALOG_ENHANCED_KB DIALOGEX DISCARDABLE 0, 0, 463, 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,143,3,15,15 - PUSHBUTTON "F6",SCAN_CODE_117,163,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,243,3,15,15 - PUSHBUTTON "F10",SCAN_CODE_121,263,3,15,15 - PUSHBUTTON "F11",SCAN_CODE_122,283,3,15,15 - PUSHBUTTON "F12",SCAN_CODE_123,303,3,15,15 - PUSHBUTTON "Prn",SCAN_CODE_124,323,3,15,15 - PUSHBUTTON "Stop",SCAN_CODE_125,343,3,15,15 - PUSHBUTTON "Attn",SCAN_CODE_126,363,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,55,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,48,15 - PUSHBUTTON "ret",SCAN_CODE_43,262,60,56,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,64,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,343,98,15,15,BS_ICON - PUSHBUTTON "ROS",SCAN_CODE_127,30,98,24,15,BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX - PUSHBUTTON "alt",SCAN_CODE_60,57,98,24,15,BS_PUSHLIKE|BS_AUTOCHECKBOX - PUSHBUTTON "",SCAN_CODE_61,84,98,125,15 //space - PUSHBUTTON "alt",SCAN_CODE_62,213,98,24,15,BS_PUSHLIKE|BS_AUTOCHECKBOX - PUSHBUTTON "ROS",SCAN_CODE_128,240,98,24,15,BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX - PUSHBUTTON "menu",SCAN_CODE_129,267,98,24,15,BS_ICON - PUSHBUTTON "ctrl",SCAN_CODE_64,294,98,24,15,BS_PUSHLIKE|BS_AUTOCHECKBOX - PUSHBUTTON "ins",SCAN_CODE_75,323,22,15,15 - PUSHBUTTON "del",SCAN_CODE_76,323,41,15,15 - PUSHBUTTON "hm",SCAN_CODE_80,343,22,15,15 - PUSHBUTTON "end",SCAN_CODE_81,343,41,15,15 - PUSHBUTTON "pup",SCAN_CODE_85,363,22,15,15 - PUSHBUTTON "pdn",SCAN_CODE_86,363,41,15,15 - PUSHBUTTON "<-",SCAN_CODE_79,323,98,15,15,BS_ICON - PUSHBUTTON "^",SCAN_CODE_83,343,79,15,15,BS_ICON - PUSHBUTTON "->",SCAN_CODE_89,363,98,15,15,BS_ICON - PUSHBUTTON "nlk",SCAN_CODE_90,383,22,15,15 - PUSHBUTTON "7",SCAN_CODE_91,383,41,15,15 - PUSHBUTTON "4",SCAN_CODE_92,383,60,15,15 - PUSHBUTTON "1",SCAN_CODE_93,383,79,15,15 - PUSHBUTTON "/",SCAN_CODE_95,403,22,15,15 - PUSHBUTTON "8",SCAN_CODE_96,403,41,15,15 - PUSHBUTTON "5",SCAN_CODE_97,403,60,15,15 - PUSHBUTTON "2",SCAN_CODE_98,403,79,15,15 - PUSHBUTTON "0",SCAN_CODE_99,383,98,34,15 - PUSHBUTTON "*",SCAN_CODE_100,423,22,15,15 - PUSHBUTTON "9",SCAN_CODE_101,423,41,15,15 - PUSHBUTTON "6",SCAN_CODE_102,423,60,15,15 - PUSHBUTTON "3",SCAN_CODE_103,423,79,15,15 - PUSHBUTTON ".",SCAN_CODE_104,423,98,15,15 - PUSHBUTTON "-",SCAN_CODE_105,443,22,15,15 - PUSHBUTTON "+",SCAN_CODE_106,443,41,15,35 - PUSHBUTTON "ent",SCAN_CODE_108,443,78,15,35 - CTEXT "Num",IDC_STATIC,383,3,21,8 - CONTROL "",IDC_LED_NUM,"Static",SS_CENTER|SS_NOTIFY,391,15,4,3 - CTEXT "Caps",IDC_STATIC,408,3,21,8 - CONTROL "",IDC_LED_CAPS,"Static",SS_CENTER|SS_NOTIFY,417,15,4,3 - CTEXT "Scroll",IDC_STATIC,433,3,21,8 - 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|BS_PUSHLIKE|BS_AUTOCHECKBOX - 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|BS_PUSHLIKE|BS_AUTOCHECKBOX - 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" @@ -274,7 +36,7 @@ BEGIN MENUITEM SEPARATOR MENUITEM "&Typing Mode...", IDM_TYPE_MODE, GRAYED MENUITEM SEPARATOR - MENUITEM "&Font...", IDM_FONT, GRAYED + MENUITEM "&Font...", IDM_FONT END POPUP "Help" @@ -299,8 +61,23 @@ END STRINGTABLE BEGIN - STRING_OSK "On-Screen Keyboard" - STRING_AUTHORS "Copyright Denis Robert" + IDS_OSK "On-Screen Keyboard" + IDS_AUTHORS "Copyright Denis Robert" + IDS_NUMLOCK "Num" + IDS_CAPSLOCK "Caps" + IDS_SCROLLLOCK "Scroll" + /* Make sure the text fits onto the buttons */ + IDS_ESCAPE "Esc" + IDS_PRN "Prn" + IDS_STOP "Stop" + IDS_ATTN "Attn" + IDS_INSERT "ins" + IDS_NUMLOCKKEY "nlk" + IDS_DELETE "del" + IDS_END "end" + IDS_CTRL "ctrl" + IDS_LEFTALT "alt" + IDS_RIGHTALT "alt" END /* EOF */ diff --git a/base/applications/osk/lang/es-ES.rc b/base/applications/osk/lang/es-ES.rc index a88f5754384..27e2072880c 100644 --- a/base/applications/osk/lang/es-ES.rc +++ b/base/applications/osk/lang/es-ES.rc @@ -10,245 +10,6 @@ LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL -MAIN_DIALOG_ENHANCED_KB DIALOGEX DISCARDABLE 0, 0, 608, 164 -CAPTION "Teclado en Pantalla" -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,23,22 - PUSHBUTTON "F1",SCAN_CODE_112,48,3,23,22 - PUSHBUTTON "F2",SCAN_CODE_113,75,3,23,22 - PUSHBUTTON "F3",SCAN_CODE_114,101,3,23,22 - PUSHBUTTON "F4",SCAN_CODE_115,128,3,23,22 - PUSHBUTTON "F5",SCAN_CODE_116,173,3,23,22 - PUSHBUTTON "F6",SCAN_CODE_117,199,3,23,22 - PUSHBUTTON "F7",SCAN_CODE_118,225,3,23,22 - PUSHBUTTON "F8",SCAN_CODE_119,251,3,23,22 - PUSHBUTTON "F9",SCAN_CODE_120,296,3,23,22 - PUSHBUTTON "F10",SCAN_CODE_121,323,3,23,22 - PUSHBUTTON "F11",SCAN_CODE_122,350,3,23,22 - PUSHBUTTON "F12",SCAN_CODE_123,377,3,23,22 - PUSHBUTTON "imp",SCAN_CODE_124,411,3,23,22 - PUSHBUTTON "lck",SCAN_CODE_125,438,3,23,22 - PUSHBUTTON "pau",SCAN_CODE_126,465,3,23,22 - PUSHBUTTON "°",SCAN_CODE_1,3,35,23,22 - PUSHBUTTON "1",SCAN_CODE_2,30,35,23,22 - PUSHBUTTON "2",SCAN_CODE_3,57,35,23,22 - PUSHBUTTON "3",SCAN_CODE_4,84,35,23,22 - PUSHBUTTON "4",SCAN_CODE_5,111,35,23,22 - PUSHBUTTON "5",SCAN_CODE_6,138,35,23,22 - PUSHBUTTON "6",SCAN_CODE_7,165,35,23,22 - PUSHBUTTON "7",SCAN_CODE_8,192,35,23,22 - PUSHBUTTON "8",SCAN_CODE_9,219,35,23,22 - PUSHBUTTON "9",SCAN_CODE_10,246,35,23,22 - PUSHBUTTON "0",SCAN_CODE_11,273,35,23,22 - PUSHBUTTON "'",SCAN_CODE_12,300,35,23,22 - PUSHBUTTON "¡",SCAN_CODE_13,327,35,23,22 - PUSHBUTTON "<--",SCAN_CODE_15,354,35,47,22,BS_ICON - PUSHBUTTON "Tab",SCAN_CODE_16,3,61,35,22,BS_ICON - PUSHBUTTON "Q",SCAN_CODE_17,42,61,23,22 - PUSHBUTTON "W",SCAN_CODE_18,69,61,23,22 - PUSHBUTTON "E",SCAN_CODE_19,96,61,23,22 - PUSHBUTTON "R",SCAN_CODE_20,123,61,23,22 - PUSHBUTTON "T",SCAN_CODE_21,150,61,23,22 - PUSHBUTTON "Y",SCAN_CODE_22,177,61,23,22 - PUSHBUTTON "U",SCAN_CODE_23,204,61,23,22 - PUSHBUTTON "I",SCAN_CODE_24,231,61,23,22 - PUSHBUTTON "O",SCAN_CODE_25,258,61,23,22 - PUSHBUTTON "P",SCAN_CODE_26,285,61,23,22 - PUSHBUTTON "`",SCAN_CODE_27,312,61,23,22 - PUSHBUTTON "+",SCAN_CODE_28,339,61,23,22 - PUSHBUTTON "Verr maj",SCAN_CODE_30,3,87,46,22,BS_ICON - PUSHBUTTON "A",SCAN_CODE_31,53,87,23,22 - PUSHBUTTON "S",SCAN_CODE_32,80,87,23,22 - PUSHBUTTON "D",SCAN_CODE_33,107,87,23,22 - PUSHBUTTON "F",SCAN_CODE_34,134,87,23,22 - PUSHBUTTON "G",SCAN_CODE_35,161,87,23,22 - PUSHBUTTON "H",SCAN_CODE_36,188,87,23,22 - PUSHBUTTON "J",SCAN_CODE_37,215,87,23,22 - PUSHBUTTON "K",SCAN_CODE_38,242,87,23,22 - PUSHBUTTON "L",SCAN_CODE_39,269,87,23,22 - PUSHBUTTON "Ñ",SCAN_CODE_40,296,87,23,22 - PUSHBUTTON ",",SCAN_CODE_41,323,87,23,22 - PUSHBUTTON "ç",SCAN_CODE_42,350,87,23,22 - PUSHBUTTON "ret",SCAN_CODE_43,377,61,23,48,BS_ICON - PUSHBUTTON "maj",SCAN_CODE_44,3,113,30,22,BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX - PUSHBUTTON "<",SCAN_CODE_45,37,113,23,22 - PUSHBUTTON "Z",SCAN_CODE_46,64,113,23,22 - PUSHBUTTON "X",SCAN_CODE_47,91,113,23,22 - PUSHBUTTON "C",SCAN_CODE_48,118,113,23,22 - PUSHBUTTON "V",SCAN_CODE_49,145,113,23,22 - PUSHBUTTON "B",SCAN_CODE_50,172,113,23,22 - PUSHBUTTON "N",SCAN_CODE_51,199,113,23,22 - PUSHBUTTON "M",SCAN_CODE_52,226,113,23,22 - PUSHBUTTON ",",SCAN_CODE_53,253,113,23,22 - PUSHBUTTON ".",SCAN_CODE_54,280,113,23,22 - PUSHBUTTON "-",SCAN_CODE_55,307,113,23,22 - PUSHBUTTON "maj",SCAN_CODE_57,334,113,67,22,BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX - PUSHBUTTON "ctrl",SCAN_CODE_58,3,139,41,22,BS_PUSHLIKE|BS_AUTOCHECKBOX - PUSHBUTTON "ROS",SCAN_CODE_127,48,139,30,22,BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX - PUSHBUTTON "alt",SCAN_CODE_60,82,139,30,22,BS_PUSHLIKE|BS_AUTOCHECKBOX - PUSHBUTTON "",SCAN_CODE_61,116,139,143,22 - PUSHBUTTON "alt gr",SCAN_CODE_62,264,139,30,22,BS_PUSHLIKE|BS_AUTOCHECKBOX - PUSHBUTTON "ROS",SCAN_CODE_128,298,139,30,22,BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX - PUSHBUTTON "menú",SCAN_CODE_129,332,139,30,22,BS_ICON - PUSHBUTTON "ctrl",SCAN_CODE_64,366,139,35,22,BS_PUSHLIKE|BS_AUTOCHECKBOX - PUSHBUTTON "ins",SCAN_CODE_75,411,35,23,22 - PUSHBUTTON "sup",SCAN_CODE_76,411,61,23,22 - PUSHBUTTON "ini",SCAN_CODE_80,438,35,23,22,BS_ICON - PUSHBUTTON "fin",SCAN_CODE_81,438,61,23,22 - PUSHBUTTON "Re pág",SCAN_CODE_85,465,35,23,22,BS_ICON - PUSHBUTTON "Av pág",SCAN_CODE_86,465,61,23,22,BS_ICON - PUSHBUTTON "<-",SCAN_CODE_79,411,139,23,22,BS_ICON - PUSHBUTTON "^",SCAN_CODE_83,438,113,23,22,BS_ICON - PUSHBUTTON "v",SCAN_CODE_84,438,139,23,22,BS_ICON - PUSHBUTTON "->",SCAN_CODE_89,465,139,23,22,BS_ICON - PUSHBUTTON "num",SCAN_CODE_90,500,35,23,22 - PUSHBUTTON "7",SCAN_CODE_91,500,61,23,22 - PUSHBUTTON "4",SCAN_CODE_92,500,87,23,22 - PUSHBUTTON "1",SCAN_CODE_93,500,113,23,22 - PUSHBUTTON "/",SCAN_CODE_95,527,35,23,22 - PUSHBUTTON "8",SCAN_CODE_96,527,61,23,22 - PUSHBUTTON "5",SCAN_CODE_97,527,87,23,22 - PUSHBUTTON "2",SCAN_CODE_98,527,113,23,22 - PUSHBUTTON "0",SCAN_CODE_99,500,139,50,22 - PUSHBUTTON "*",SCAN_CODE_100,554,35,23,22 - PUSHBUTTON "9",SCAN_CODE_101,554,61,23,22 - PUSHBUTTON "6",SCAN_CODE_102,554,87,23,22 - PUSHBUTTON "3",SCAN_CODE_103,554,113,23,22 - PUSHBUTTON ".",SCAN_CODE_104,554,139,23,22 - PUSHBUTTON "-",SCAN_CODE_105,581,35,23,22 - PUSHBUTTON "+",SCAN_CODE_106,581,61,23,48 - PUSHBUTTON "ent",SCAN_CODE_108,581,113,23,48 - CTEXT "Num.",IDC_STATIC,510,4,21,8 - CONTROL "",IDC_LED_NUM,"Static",SS_CENTER|SS_NOTIFY,518,16,4,3 - CTEXT "May.",IDC_STATIC,540,4,21,8 - CONTROL "",IDC_LED_CAPS,"Static",SS_CENTER|SS_NOTIFY,548,16,4,3 - CTEXT "Desp.",IDC_STATIC,572,4,21,8 - 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 "Teclado en Pantalla" -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 "bloq",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|BS_PUSHLIKE|BS_AUTOCHECKBOX - 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|BS_PUSHLIKE|BS_AUTOCHECKBOX - 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 "supr",SCAN_CODE_76,304,41,15,15 - PUSHBUTTON "ini",SCAN_CODE_80,324,22,15,15 - PUSHBUTTON "fin",SCAN_CODE_81,324,41,15,15 - PUSHBUTTON "ReP",SCAN_CODE_85,344,22,15,15 - PUSHBUTTON "AvP",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 "bln",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 "int",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 "Mayús",IDC_STATIC,389,3,21,8 - CONTROL "",IDC_LED_CAPS,"Static",SS_CENTER|SS_NOTIFY,398,15,4,3 - CTEXT "Bl. Desp",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 "Archivo" @@ -277,7 +38,7 @@ BEGIN MENUITEM SEPARATOR MENUITEM "&Modo de Escritura...", IDM_TYPE_MODE, GRAYED MENUITEM SEPARATOR - MENUITEM "&Fuente...", IDM_FONT, GRAYED + MENUITEM "&Fuente...", IDM_FONT END POPUP "Ayuda" @@ -302,8 +63,23 @@ END STRINGTABLE BEGIN - STRING_OSK "Teclado en Pantalla" - STRING_AUTHORS "Copyright Denis Robert" + IDS_OSK "Teclado en Pantalla" + IDS_AUTHORS "Copyright Denis Robert" + IDS_NUMLOCK "Num" + IDS_CAPSLOCK "Caps" + IDS_SCROLLLOCK "Scroll" + /* Make sure the text fits onto the buttons */ + IDS_ESCAPE "Esc" + IDS_PRN "Prn" + IDS_STOP "Stop" + IDS_ATTN "Attn" + IDS_INSERT "ins" + IDS_NUMLOCKKEY "nlk" + IDS_DELETE "del" + IDS_END "end" + IDS_CTRL "ctrl" + IDS_LEFTALT "alt" + IDS_RIGHTALT "alt" END /* EOF */ diff --git a/base/applications/osk/lang/et-EE.rc b/base/applications/osk/lang/et-EE.rc index d2dddd6599a..1d1e85110a2 100644 --- a/base/applications/osk/lang/et-EE.rc +++ b/base/applications/osk/lang/et-EE.rc @@ -8,244 +8,6 @@ LANGUAGE LANG_ESTONIAN, SUBLANG_DEFAULT -MAIN_DIALOG_ENHANCED_KB DIALOGEX DISCARDABLE 0, 0, 463, 115 -CAPTION "Ekraaniklaviatuur" -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,143,3,15,15 - PUSHBUTTON "F6",SCAN_CODE_117,163,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,243,3,15,15 - PUSHBUTTON "F10",SCAN_CODE_121,263,3,15,15 - PUSHBUTTON "F11",SCAN_CODE_122,283,3,15,15 - PUSHBUTTON "F12",SCAN_CODE_123,303,3,15,15 - PUSHBUTTON "Prn",SCAN_CODE_124,323,3,15,15 - PUSHBUTTON "Stop",SCAN_CODE_125,343,3,15,15 - PUSHBUTTON "Attn",SCAN_CODE_126,363,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,55,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,48,15 - PUSHBUTTON "ret",SCAN_CODE_43,262,60,56,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,64,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,343,98,15,15,BS_ICON - PUSHBUTTON "ROS",SCAN_CODE_127,30,98,24,15,BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX - PUSHBUTTON "alt",SCAN_CODE_60,57,98,24,15,BS_PUSHLIKE|BS_AUTOCHECKBOX - PUSHBUTTON "",SCAN_CODE_61,84,98,125,15 //space - PUSHBUTTON "alt",SCAN_CODE_62,213,98,24,15,BS_PUSHLIKE|BS_AUTOCHECKBOX - PUSHBUTTON "ROS",SCAN_CODE_128,240,98,24,15,BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX - PUSHBUTTON "menu",SCAN_CODE_129,267,98,24,15,BS_ICON - PUSHBUTTON "ctrl",SCAN_CODE_64,294,98,24,15,BS_PUSHLIKE|BS_AUTOCHECKBOX - PUSHBUTTON "ins",SCAN_CODE_75,323,22,15,15 - PUSHBUTTON "del",SCAN_CODE_76,323,41,15,15 - PUSHBUTTON "hm",SCAN_CODE_80,343,22,15,15 - PUSHBUTTON "end",SCAN_CODE_81,343,41,15,15 - PUSHBUTTON "pup",SCAN_CODE_85,363,22,15,15 - PUSHBUTTON "pdn",SCAN_CODE_86,363,41,15,15 - PUSHBUTTON "<-",SCAN_CODE_79,323,98,15,15,BS_ICON - PUSHBUTTON "^",SCAN_CODE_83,343,79,15,15,BS_ICON - PUSHBUTTON "->",SCAN_CODE_89,363,98,15,15,BS_ICON - PUSHBUTTON "nlk",SCAN_CODE_90,383,22,15,15 - PUSHBUTTON "7",SCAN_CODE_91,383,41,15,15 - PUSHBUTTON "4",SCAN_CODE_92,383,60,15,15 - PUSHBUTTON "1",SCAN_CODE_93,383,79,15,15 - PUSHBUTTON "/",SCAN_CODE_95,403,22,15,15 - PUSHBUTTON "8",SCAN_CODE_96,403,41,15,15 - PUSHBUTTON "5",SCAN_CODE_97,403,60,15,15 - PUSHBUTTON "2",SCAN_CODE_98,403,79,15,15 - PUSHBUTTON "0",SCAN_CODE_99,383,98,34,15 - PUSHBUTTON "*",SCAN_CODE_100,423,22,15,15 - PUSHBUTTON "9",SCAN_CODE_101,423,41,15,15 - PUSHBUTTON "6",SCAN_CODE_102,423,60,15,15 - PUSHBUTTON "3",SCAN_CODE_103,423,79,15,15 - PUSHBUTTON ".",SCAN_CODE_104,423,98,15,15 - PUSHBUTTON "-",SCAN_CODE_105,443,22,15,15 - PUSHBUTTON "+",SCAN_CODE_106,443,41,15,35 - PUSHBUTTON "ent",SCAN_CODE_108,443,78,15,35 - CTEXT "Num",IDC_STATIC,383,3,21,8 - CONTROL "",IDC_LED_NUM,"Static",SS_CENTER|SS_NOTIFY,391,15,4,3 - CTEXT "Caps",IDC_STATIC,408,3,21,8 - CONTROL "",IDC_LED_CAPS,"Static",SS_CENTER|SS_NOTIFY,417,15,4,3 - CTEXT "Scroll",IDC_STATIC,433,3,21,8 - 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|BS_PUSHLIKE|BS_AUTOCHECKBOX - 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|BS_PUSHLIKE|BS_AUTOCHECKBOX - 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" @@ -274,7 +36,7 @@ BEGIN MENUITEM SEPARATOR MENUITEM "&Typing Mode...", IDM_TYPE_MODE, GRAYED MENUITEM SEPARATOR - MENUITEM "&Font...", IDM_FONT, GRAYED + MENUITEM "&Font...", IDM_FONT END POPUP "Help" @@ -299,8 +61,23 @@ END STRINGTABLE BEGIN - STRING_OSK "On-Screen Keyboard" - STRING_AUTHORS "Copyright Denis Robert" + IDS_OSK "On-Screen Keyboard" + IDS_AUTHORS "Copyright Denis Robert" + IDS_NUMLOCK "Num" + IDS_CAPSLOCK "Caps" + IDS_SCROLLLOCK "Scroll" + /* Make sure the text fits onto the buttons */ + IDS_ESCAPE "Esc" + IDS_PRN "Prn" + IDS_STOP "Stop" + IDS_ATTN "Attn" + IDS_INSERT "ins" + IDS_NUMLOCKKEY "nlk" + IDS_DELETE "del" + IDS_END "end" + IDS_CTRL "ctrl" + IDS_LEFTALT "alt" + IDS_RIGHTALT "alt" END /* EOF */ diff --git a/base/applications/osk/lang/fr-CA.rc b/base/applications/osk/lang/fr-CA.rc index 4a2fd0e9a67..74801b5c33e 100644 --- a/base/applications/osk/lang/fr-CA.rc +++ b/base/applications/osk/lang/fr-CA.rc @@ -8,245 +8,6 @@ LANGUAGE LANG_FRENCH, SUBLANG_FRENCH_CANADIAN -MAIN_DIALOG_ENHANCED_KB DIALOGEX DISCARDABLE 0, 0, 463, 115 -CAPTION "Clavier visuel" -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 "ech",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,143,3,15,15 - PUSHBUTTON "F6",SCAN_CODE_117,163,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,243,3,15,15 - PUSHBUTTON "F10",SCAN_CODE_121,263,3,15,15 - PUSHBUTTON "F11",SCAN_CODE_122,283,3,15,15 - PUSHBUTTON "F12",SCAN_CODE_123,303,3,15,15 - PUSHBUTTON "imp",SCAN_CODE_124,323,3,15,15 - PUSHBUTTON "arr",SCAN_CODE_125,343,3,15,15 - PUSHBUTTON "att",SCAN_CODE_126,363,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,55,15,BS_ICON - PUSHBUTTON "Tab",SCAN_CODE_16,3,41,48,15,BS_ICON - PUSHBUTTON "Q",SCAN_CODE_17,55,41,15,15 - PUSHBUTTON "W",SCAN_CODE_18,74,41,15,15 - PUSHBUTTON "E",SCAN_CODE_19,93,41,15,15 - PUSHBUTTON "R",SCAN_CODE_20,112,41,15,15 - PUSHBUTTON "T",SCAN_CODE_21,131,41,15,15 - PUSHBUTTON "Y",SCAN_CODE_22,150,41,15,15 - PUSHBUTTON "U",SCAN_CODE_23,169,41,15,15 - PUSHBUTTON "I",SCAN_CODE_24,188,41,15,15 - PUSHBUTTON "O",SCAN_CODE_25,207,41,15,15 - PUSHBUTTON "P",SCAN_CODE_26,227,41,15,15 - PUSHBUTTON "^",SCAN_CODE_27,248,41,15,15 - PUSHBUTTON "¨",SCAN_CODE_28,270,41,15,15 - PUSHBUTTON "Verr maj",SCAN_CODE_30,3,60,48,15,BS_ICON - PUSHBUTTON "A",SCAN_CODE_31,55,60,15,15 - PUSHBUTTON "S",SCAN_CODE_32,74,60,15,15 - PUSHBUTTON "D",SCAN_CODE_33,93,60,15,15 - PUSHBUTTON "F",SCAN_CODE_34,112,60,15,15 - PUSHBUTTON "G",SCAN_CODE_35,131,60,15,15 - PUSHBUTTON "H",SCAN_CODE_36,150,60,15,15 - PUSHBUTTON "J",SCAN_CODE_37,169,60,15,15 - PUSHBUTTON "K",SCAN_CODE_38,188,60,15,15 - PUSHBUTTON "L",SCAN_CODE_39,207,60,15,15 - PUSHBUTTON ";",SCAN_CODE_40,227,60,15,15 - PUSHBUTTON "`",SCAN_CODE_41,248,60,15,15 - PUSHBUTTON "<",SCAN_CODE_42,270,60,15,15 - PUSHBUTTON "ret",SCAN_CODE_43,291,41,27,34,BS_ICON - PUSHBUTTON "maj",SCAN_CODE_44,3,79,37,15,BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX - PUSHBUTTON "«",SCAN_CODE_45,43,79,15,15 - 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 "maj",SCAN_CODE_57,254,79,64,15,BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX - PUSHBUTTON "ctrl",SCAN_CODE_58,3,98,24,15,BS_PUSHLIKE|BS_AUTOCHECKBOX - PUSHBUTTON "ROS",SCAN_CODE_127,30,98,24,15,BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX - PUSHBUTTON "alt",SCAN_CODE_60,57,98,24,15,BS_PUSHLIKE|BS_AUTOCHECKBOX - PUSHBUTTON "",SCAN_CODE_61,84,98,125,15 - PUSHBUTTON "alt gr",SCAN_CODE_62,213,98,24,15,BS_PUSHLIKE|BS_AUTOCHECKBOX - PUSHBUTTON "ROS",SCAN_CODE_128,240,98,24,15,BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX - PUSHBUTTON "menu",SCAN_CODE_129,267,98,24,15,BS_ICON - PUSHBUTTON "ctrl",SCAN_CODE_64,294,98,24,15,BS_PUSHLIKE|BS_AUTOCHECKBOX - PUSHBUTTON "ins",SCAN_CODE_75,323,22,15,15 - PUSHBUTTON "sup",SCAN_CODE_76,323,41,15,15 - PUSHBUTTON "home",SCAN_CODE_80,343,22,15,15,BS_ICON - PUSHBUTTON "fin",SCAN_CODE_81,343,41,15,15 - PUSHBUTTON "pg AR",SCAN_CODE_85,363,22,15,15,BS_ICON - PUSHBUTTON "pg AV",SCAN_CODE_86,363,41,15,15,BS_ICON - PUSHBUTTON "<-",SCAN_CODE_79,323,98,15,15,BS_ICON - PUSHBUTTON "^",SCAN_CODE_83,343,79,15,15,BS_ICON - PUSHBUTTON "v",SCAN_CODE_84,343,98,15,15,BS_ICON - PUSHBUTTON "->",SCAN_CODE_89,363,98,15,15,BS_ICON - PUSHBUTTON "num",SCAN_CODE_90,383,22,15,15 - PUSHBUTTON "7",SCAN_CODE_91,383,41,15,15 - PUSHBUTTON "4",SCAN_CODE_92,383,60,15,15 - PUSHBUTTON "1",SCAN_CODE_93,383,79,15,15 - PUSHBUTTON "/",SCAN_CODE_95,403,22,15,15 - PUSHBUTTON "8",SCAN_CODE_96,403,41,15,15 - PUSHBUTTON "5",SCAN_CODE_97,403,60,15,15 - PUSHBUTTON "2",SCAN_CODE_98,403,79,15,15 - PUSHBUTTON "0",SCAN_CODE_99,383,98,34,15 - PUSHBUTTON "*",SCAN_CODE_100,423,22,15,15 - PUSHBUTTON "9",SCAN_CODE_101,423,41,15,15 - PUSHBUTTON "6",SCAN_CODE_102,423,60,15,15 - PUSHBUTTON "3",SCAN_CODE_103,423,79,15,15 - PUSHBUTTON ".",SCAN_CODE_104,423,98,15,15 - PUSHBUTTON "-",SCAN_CODE_105,443,22,15,15 - PUSHBUTTON "+",SCAN_CODE_106,443,41,15,35 - PUSHBUTTON "ent",SCAN_CODE_108,443,78,15,35 - CTEXT "Num",IDC_STATIC,383,3,21,8 - CONTROL "",IDC_LED_NUM,"Static",SS_CENTER|SS_NOTIFY,391,15,4,3 - CTEXT "Caps",IDC_STATIC,408,3,21,8 - CONTROL "",IDC_LED_CAPS,"Static",SS_CENTER|SS_NOTIFY,417,15,4,3 - CTEXT "Scroll",IDC_STATIC,433,3,21,8 - 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|BS_PUSHLIKE|BS_AUTOCHECKBOX - 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|BS_PUSHLIKE|BS_AUTOCHECKBOX - 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" @@ -275,7 +36,7 @@ BEGIN MENUITEM SEPARATOR MENUITEM "&Typing Mode...", IDM_TYPE_MODE, GRAYED MENUITEM SEPARATOR - MENUITEM "&Font...", IDM_FONT, GRAYED + MENUITEM "&Font...", IDM_FONT END POPUP "Help" @@ -300,8 +61,23 @@ END STRINGTABLE BEGIN - STRING_OSK "On-Screen Keyboard" - STRING_AUTHORS "Copyright Denis Robert" + IDS_OSK "On-Screen Keyboard" + IDS_AUTHORS "Copyright Denis Robert" + IDS_NUMLOCK "Num" + IDS_CAPSLOCK "Caps" + IDS_SCROLLLOCK "Scroll" + /* Make sure the text fits onto the buttons */ + IDS_ESCAPE "Esc" + IDS_PRN "Prn" + IDS_STOP "Stop" + IDS_ATTN "Attn" + IDS_INSERT "ins" + IDS_NUMLOCKKEY "nlk" + IDS_DELETE "del" + IDS_END "end" + IDS_CTRL "ctrl" + IDS_LEFTALT "alt" + IDS_RIGHTALT "alt" END /* EOF */ diff --git a/base/applications/osk/lang/fr-FR.rc b/base/applications/osk/lang/fr-FR.rc index 987757e0daa..fecb5285be3 100644 --- a/base/applications/osk/lang/fr-FR.rc +++ b/base/applications/osk/lang/fr-FR.rc @@ -8,245 +8,6 @@ LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL -MAIN_DIALOG_ENHANCED_KB DIALOGEX DISCARDABLE 0, 0, 463, 115 -CAPTION "Clavier visuel" -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 "ech",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,143,3,15,15 - PUSHBUTTON "F6",SCAN_CODE_117,163,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,243,3,15,15 - PUSHBUTTON "F10",SCAN_CODE_121,263,3,15,15 - PUSHBUTTON "F11",SCAN_CODE_122,283,3,15,15 - PUSHBUTTON "F12",SCAN_CODE_123,303,3,15,15 - PUSHBUTTON "imp",SCAN_CODE_124,323,3,15,15 - PUSHBUTTON "arr",SCAN_CODE_125,343,3,15,15 - PUSHBUTTON "att",SCAN_CODE_126,363,3,15,15 - PUSHBUTTON "²",SCAN_CODE_1,3,22,15,15 - PUSHBUTTON "&&",SCAN_CODE_2,23,22,15,15 - PUSHBUTTON "é",SCAN_CODE_3,43,22,15,15 - PUSHBUTTON """",SCAN_CODE_4,63,22,15,15 - PUSHBUTTON "'",SCAN_CODE_5,83,22,15,15 - PUSHBUTTON "(",SCAN_CODE_6,103,22,15,15 - PUSHBUTTON "-",SCAN_CODE_7,123,22,15,15 - PUSHBUTTON "è",SCAN_CODE_8,143,22,15,15 - PUSHBUTTON "_",SCAN_CODE_9,163,22,15,15 - PUSHBUTTON "ç",SCAN_CODE_10,183,22,15,15 - PUSHBUTTON "à",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,55,15,BS_ICON - PUSHBUTTON "Tab",SCAN_CODE_16,3,41,48,15,BS_ICON - PUSHBUTTON "A",SCAN_CODE_17,55,41,15,15 - PUSHBUTTON "Z",SCAN_CODE_18,74,41,15,15 - PUSHBUTTON "E",SCAN_CODE_19,93,41,15,15 - PUSHBUTTON "R",SCAN_CODE_20,112,41,15,15 - PUSHBUTTON "T",SCAN_CODE_21,131,41,15,15 - PUSHBUTTON "Y",SCAN_CODE_22,150,41,15,15 - PUSHBUTTON "U",SCAN_CODE_23,169,41,15,15 - PUSHBUTTON "I",SCAN_CODE_24,188,41,15,15 - PUSHBUTTON "O",SCAN_CODE_25,207,41,15,15 - PUSHBUTTON "P",SCAN_CODE_26,227,41,15,15 - PUSHBUTTON "^",SCAN_CODE_27,248,41,15,15 - PUSHBUTTON "$",SCAN_CODE_28,270,41,15,15 - PUSHBUTTON "Verr maj",SCAN_CODE_30,3,60,48,15,BS_ICON - PUSHBUTTON "Q",SCAN_CODE_31,55,60,15,15 - PUSHBUTTON "S",SCAN_CODE_32,74,60,15,15 - PUSHBUTTON "D",SCAN_CODE_33,93,60,15,15 - PUSHBUTTON "F",SCAN_CODE_34,112,60,15,15 - PUSHBUTTON "G",SCAN_CODE_35,131,60,15,15 - PUSHBUTTON "H",SCAN_CODE_36,150,60,15,15 - PUSHBUTTON "J",SCAN_CODE_37,169,60,15,15 - PUSHBUTTON "K",SCAN_CODE_38,188,60,15,15 - PUSHBUTTON "L",SCAN_CODE_39,207,60,15,15 - PUSHBUTTON "M",SCAN_CODE_40,227,60,15,15 - PUSHBUTTON "ù",SCAN_CODE_41,248,60,15,15 - PUSHBUTTON "*",SCAN_CODE_42,270,60,15,15 - PUSHBUTTON "ret",SCAN_CODE_43,291,41,27,34,BS_ICON - PUSHBUTTON "maj",SCAN_CODE_44,3,79,37,15,BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX - PUSHBUTTON "<",SCAN_CODE_45,43,79,15,15 - PUSHBUTTON "W",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 ",",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 "maj",SCAN_CODE_57,254,79,64,15,BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX - PUSHBUTTON "ctrl",SCAN_CODE_58,3,98,24,15,BS_PUSHLIKE|BS_AUTOCHECKBOX - PUSHBUTTON "ROS",SCAN_CODE_127,30,98,24,15,BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX - PUSHBUTTON "alt",SCAN_CODE_60,57,98,24,15,BS_PUSHLIKE|BS_AUTOCHECKBOX - PUSHBUTTON "",SCAN_CODE_61,84,98,125,15 - PUSHBUTTON "alt gr",SCAN_CODE_62,213,98,24,15,BS_PUSHLIKE|BS_AUTOCHECKBOX - PUSHBUTTON "ROS",SCAN_CODE_128,240,98,24,15,BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX - PUSHBUTTON "menu",SCAN_CODE_129,267,98,24,15,BS_ICON - PUSHBUTTON "ctrl",SCAN_CODE_64,294,98,24,15,BS_PUSHLIKE|BS_AUTOCHECKBOX - PUSHBUTTON "ins",SCAN_CODE_75,323,22,15,15 - PUSHBUTTON "sup",SCAN_CODE_76,323,41,15,15 - PUSHBUTTON "home",SCAN_CODE_80,343,22,15,15,BS_ICON - PUSHBUTTON "fin",SCAN_CODE_81,343,41,15,15 - PUSHBUTTON "pg AR",SCAN_CODE_85,363,22,15,15,BS_ICON - PUSHBUTTON "pg AV",SCAN_CODE_86,363,41,15,15,BS_ICON - PUSHBUTTON "<-",SCAN_CODE_79,323,98,15,15,BS_ICON - PUSHBUTTON "^",SCAN_CODE_83,343,79,15,15,BS_ICON - PUSHBUTTON "v",SCAN_CODE_84,343,98,15,15,BS_ICON - PUSHBUTTON "->",SCAN_CODE_89,363,98,15,15,BS_ICON - PUSHBUTTON "num",SCAN_CODE_90,383,22,15,15 - PUSHBUTTON "7",SCAN_CODE_91,383,41,15,15 - PUSHBUTTON "4",SCAN_CODE_92,383,60,15,15 - PUSHBUTTON "1",SCAN_CODE_93,383,79,15,15 - PUSHBUTTON "/",SCAN_CODE_95,403,22,15,15 - PUSHBUTTON "8",SCAN_CODE_96,403,41,15,15 - PUSHBUTTON "5",SCAN_CODE_97,403,60,15,15 - PUSHBUTTON "2",SCAN_CODE_98,403,79,15,15 - PUSHBUTTON "0",SCAN_CODE_99,383,98,34,15 - PUSHBUTTON "*",SCAN_CODE_100,423,22,15,15 - PUSHBUTTON "9",SCAN_CODE_101,423,41,15,15 - PUSHBUTTON "6",SCAN_CODE_102,423,60,15,15 - PUSHBUTTON "3",SCAN_CODE_103,423,79,15,15 - PUSHBUTTON ".",SCAN_CODE_104,423,98,15,15 - PUSHBUTTON "-",SCAN_CODE_105,443,22,15,15 - PUSHBUTTON "+",SCAN_CODE_106,443,41,15,35 - PUSHBUTTON "ent",SCAN_CODE_108,443,78,15,35 - CTEXT "Num",IDC_STATIC,383,3,21,8 - CONTROL "",IDC_LED_NUM,"Static",SS_CENTER|SS_NOTIFY,391,15,4,3 - CTEXT "Caps",IDC_STATIC,408,3,21,8 - CONTROL "",IDC_LED_CAPS,"Static",SS_CENTER|SS_NOTIFY,417,15,4,3 - CTEXT "Scroll",IDC_STATIC,433,3,21,8 - 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|BS_PUSHLIKE|BS_AUTOCHECKBOX - 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|BS_PUSHLIKE|BS_AUTOCHECKBOX - 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" @@ -275,7 +36,7 @@ BEGIN MENUITEM SEPARATOR MENUITEM "&Typing Mode...", IDM_TYPE_MODE, GRAYED MENUITEM SEPARATOR - MENUITEM "&Font...", IDM_FONT, GRAYED + MENUITEM "&Font...", IDM_FONT END POPUP "Help" @@ -300,8 +61,23 @@ END STRINGTABLE BEGIN - STRING_OSK "On-Screen Keyboard" - STRING_AUTHORS "Copyright Denis Robert" + IDS_OSK "On-Screen Keyboard" + IDS_AUTHORS "Copyright Denis Robert" + IDS_NUMLOCK "Num" + IDS_CAPSLOCK "Caps" + IDS_SCROLLLOCK "Scroll" + /* Make sure the text fits onto the buttons */ + IDS_ESCAPE "Esc" + IDS_PRN "Prn" + IDS_STOP "Stop" + IDS_ATTN "Attn" + IDS_INSERT "ins" + IDS_NUMLOCKKEY "nlk" + IDS_DELETE "del" + IDS_END "end" + IDS_CTRL "ctrl" + IDS_LEFTALT "alt" + IDS_RIGHTALT "alt" END /* EOF */ diff --git a/base/applications/osk/lang/he-IL.rc b/base/applications/osk/lang/he-IL.rc index 0fe7d60e9a9..f831262f503 100644 --- a/base/applications/osk/lang/he-IL.rc +++ b/base/applications/osk/lang/he-IL.rc @@ -8,244 +8,6 @@ LANGUAGE LANG_HEBREW, SUBLANG_DEFAULT -MAIN_DIALOG_ENHANCED_KB DIALOGEX DISCARDABLE 0, 0, 608, 164 -CAPTION "לוח מקשים על התצוגה" -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,23,22 - PUSHBUTTON "F1",SCAN_CODE_112,48,3,23,22 - PUSHBUTTON "F2",SCAN_CODE_113,75,3,23,22 - PUSHBUTTON "F3",SCAN_CODE_114,101,3,23,22 - PUSHBUTTON "F4",SCAN_CODE_115,128,3,23,22 - PUSHBUTTON "F5",SCAN_CODE_116,173,3,23,22 - PUSHBUTTON "F6",SCAN_CODE_117,199,3,23,22 - PUSHBUTTON "F7",SCAN_CODE_118,225,3,23,22 - PUSHBUTTON "F8",SCAN_CODE_119,251,3,23,22 - PUSHBUTTON "F9",SCAN_CODE_120,296,3,23,22 - PUSHBUTTON "F10",SCAN_CODE_121,323,3,23,22 - PUSHBUTTON "F11",SCAN_CODE_122,350,3,23,22 - PUSHBUTTON "F12",SCAN_CODE_123,377,3,23,22 - PUSHBUTTON "Prn",SCAN_CODE_124,411,3,23,22 - PUSHBUTTON "Stop",SCAN_CODE_125,438,3,23,22 - PUSHBUTTON "Attn",SCAN_CODE_126,465,3,23,22 - PUSHBUTTON "`",SCAN_CODE_1,3,35,23,22 - PUSHBUTTON "1",SCAN_CODE_2,30,35,23,22 - PUSHBUTTON "2",SCAN_CODE_3,57,35,23,22 - PUSHBUTTON "3",SCAN_CODE_4,84,35,23,22 - PUSHBUTTON "4",SCAN_CODE_5,111,35,23,22 - PUSHBUTTON "5",SCAN_CODE_6,138,35,23,22 - PUSHBUTTON "6",SCAN_CODE_7,165,35,23,22 - PUSHBUTTON "7",SCAN_CODE_8,192,35,23,22 - PUSHBUTTON "8",SCAN_CODE_9,219,35,23,22 - PUSHBUTTON "9",SCAN_CODE_10,246,35,23,22 - PUSHBUTTON "0",SCAN_CODE_11,273,35,23,22 - PUSHBUTTON "-",SCAN_CODE_12,300,35,23,22 - PUSHBUTTON "=",SCAN_CODE_13,327,35,23,22 - PUSHBUTTON "<--",SCAN_CODE_15,354,35,47,22,BS_ICON - PUSHBUTTON "Tab",SCAN_CODE_16,3,61,35,22,BS_ICON - PUSHBUTTON "/",SCAN_CODE_17,42,61,23,22 - PUSHBUTTON "'",SCAN_CODE_18,69,61,23,22 - PUSHBUTTON "ק",SCAN_CODE_19,96,61,23,22 - PUSHBUTTON "ר",SCAN_CODE_20,123,61,23,22 - PUSHBUTTON "א",SCAN_CODE_21,150,61,23,22 - PUSHBUTTON "ט",SCAN_CODE_22,177,61,23,22 - PUSHBUTTON "ו",SCAN_CODE_23,204,61,23,22 - PUSHBUTTON "ן",SCAN_CODE_24,231,61,23,22 - PUSHBUTTON "ם",SCAN_CODE_25,258,61,23,22 - PUSHBUTTON "פ",SCAN_CODE_26,285,61,23,22 - PUSHBUTTON "[",SCAN_CODE_27,312,61,23,22 - PUSHBUTTON "]",SCAN_CODE_28,339,61,23,22 - PUSHBUTTON "\\",SCAN_CODE_29,366,61,35,22 - PUSHBUTTON "Caps Lock",SCAN_CODE_30,3,87,46,22,BS_ICON - PUSHBUTTON "ש",SCAN_CODE_31,53,87,23,22 - PUSHBUTTON "ד",SCAN_CODE_32,80,87,23,22 - PUSHBUTTON "ג",SCAN_CODE_33,107,87,23,22 - PUSHBUTTON "כ",SCAN_CODE_34,134,87,23,22 - PUSHBUTTON "ע",SCAN_CODE_35,161,87,23,22 - PUSHBUTTON "י",SCAN_CODE_36,188,87,23,22 - PUSHBUTTON "ח",SCAN_CODE_37,215,87,23,22 - PUSHBUTTON "ל",SCAN_CODE_38,242,87,23,22 - PUSHBUTTON "ך",SCAN_CODE_39,269,87,23,22 - PUSHBUTTON "ף",SCAN_CODE_40,296,87,23,22 - PUSHBUTTON ",",SCAN_CODE_41,323,87,23,22 - PUSHBUTTON "ret",SCAN_CODE_43,350,87,51,22,BS_ICON - PUSHBUTTON "shift",SCAN_CODE_44,3,113,57,22,BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX - PUSHBUTTON "ז",SCAN_CODE_46,64,113,23,22 - PUSHBUTTON "ס",SCAN_CODE_47,91,113,23,22 - PUSHBUTTON "ב",SCAN_CODE_48,118,113,23,22 - PUSHBUTTON "ה",SCAN_CODE_49,145,113,23,22 - PUSHBUTTON "נ",SCAN_CODE_50,172,113,23,22 - PUSHBUTTON "מ",SCAN_CODE_51,199,113,23,22 - PUSHBUTTON "צ",SCAN_CODE_52,226,113,23,22 - PUSHBUTTON "ת",SCAN_CODE_53,253,113,23,22 - PUSHBUTTON "ץ",SCAN_CODE_54,280,113,23,22 - PUSHBUTTON ".",SCAN_CODE_55,307,113,23,22 - PUSHBUTTON "shift",SCAN_CODE_57,334,113,67,22,BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX - PUSHBUTTON "ctrl",SCAN_CODE_58,3,139,41,22,BS_PUSHLIKE|BS_AUTOCHECKBOX - PUSHBUTTON "ROS",SCAN_CODE_127,48,139,30,22,BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX - PUSHBUTTON "alt",SCAN_CODE_60,82,139,30,22,BS_PUSHLIKE|BS_AUTOCHECKBOX - PUSHBUTTON "",SCAN_CODE_61,116,139,143,22 - PUSHBUTTON "alt gr",SCAN_CODE_62,264,139,30,22,BS_PUSHLIKE|BS_AUTOCHECKBOX - PUSHBUTTON "ROS",SCAN_CODE_128,298,139,30,22,BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX - PUSHBUTTON "menu",SCAN_CODE_129,332,139,30,22,BS_ICON - PUSHBUTTON "ctrl",SCAN_CODE_64,366,139,35,22,BS_PUSHLIKE|BS_AUTOCHECKBOX - PUSHBUTTON "ins",SCAN_CODE_75,411,35,23,22 - PUSHBUTTON "del",SCAN_CODE_76,411,61,23,22 - PUSHBUTTON "home",SCAN_CODE_80,438,35,23,22,BS_ICON - PUSHBUTTON "end",SCAN_CODE_81,438,61,23,22 - PUSHBUTTON "pg up",SCAN_CODE_85,465,35,23,22,BS_ICON - PUSHBUTTON "pg down",SCAN_CODE_86,465,61,23,22,BS_ICON - PUSHBUTTON "<-",SCAN_CODE_79,411,139,23,22,BS_ICON - PUSHBUTTON "^",SCAN_CODE_83,438,113,23,22,BS_ICON - PUSHBUTTON "v",SCAN_CODE_84,438,139,23,22,BS_ICON - PUSHBUTTON "->",SCAN_CODE_89,465,139,23,22,BS_ICON - PUSHBUTTON "num",SCAN_CODE_90,500,35,23,22 - PUSHBUTTON "7",SCAN_CODE_91,500,61,23,22 - PUSHBUTTON "4",SCAN_CODE_92,500,87,23,22 - PUSHBUTTON "1",SCAN_CODE_93,500,113,23,22 - PUSHBUTTON "/",SCAN_CODE_95,527,35,23,22 - PUSHBUTTON "8",SCAN_CODE_96,527,61,23,22 - PUSHBUTTON "5",SCAN_CODE_97,527,87,23,22 - PUSHBUTTON "2",SCAN_CODE_98,527,113,23,22 - PUSHBUTTON "0",SCAN_CODE_99,500,139,50,22 - PUSHBUTTON "*",SCAN_CODE_100,554,35,23,22 - PUSHBUTTON "9",SCAN_CODE_101,554,61,23,22 - PUSHBUTTON "6",SCAN_CODE_102,554,87,23,22 - PUSHBUTTON "3",SCAN_CODE_103,554,113,23,22 - PUSHBUTTON ".",SCAN_CODE_104,554,139,23,22 - PUSHBUTTON "-",SCAN_CODE_105,581,35,23,22 - PUSHBUTTON "+",SCAN_CODE_106,581,61,23,48 - PUSHBUTTON "ent",SCAN_CODE_108,581,113,23,48 - CTEXT "Num",IDC_STATIC,510,4,21,8 - CONTROL "",IDC_LED_NUM,"Static",SS_CENTER|SS_NOTIFY,518,16,4,3 - CTEXT "Caps",IDC_STATIC,540,4,21,8 - CONTROL "",IDC_LED_CAPS,"Static",SS_CENTER|SS_NOTIFY,548,16,4,3 - CTEXT "Scroll",IDC_STATIC,572,4,21,8 - 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|BS_PUSHLIKE|BS_AUTOCHECKBOX - 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|BS_PUSHLIKE|BS_AUTOCHECKBOX - 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" @@ -274,7 +36,7 @@ BEGIN MENUITEM SEPARATOR MENUITEM "&Typing Mode...", IDM_TYPE_MODE, GRAYED MENUITEM SEPARATOR - MENUITEM "&Font...", IDM_FONT, GRAYED + MENUITEM "&Font...", IDM_FONT END POPUP "Help" @@ -299,8 +61,23 @@ END STRINGTABLE BEGIN - STRING_OSK "On-Screen Keyboard" - STRING_AUTHORS "Copyright Denis Robert" + IDS_OSK "On-Screen Keyboard" + IDS_AUTHORS "Copyright Denis Robert" + IDS_NUMLOCK "Num" + IDS_CAPSLOCK "Caps" + IDS_SCROLLLOCK "Scroll" + /* Make sure the text fits onto the buttons */ + IDS_ESCAPE "Esc" + IDS_PRN "Prn" + IDS_STOP "Stop" + IDS_ATTN "Attn" + IDS_INSERT "ins" + IDS_NUMLOCKKEY "nlk" + IDS_DELETE "del" + IDS_END "end" + IDS_CTRL "ctrl" + IDS_LEFTALT "alt" + IDS_RIGHTALT "alt" END /* EOF */ diff --git a/base/applications/osk/lang/id-ID.rc b/base/applications/osk/lang/id-ID.rc index 4de8d491cfa..ae174e1705e 100644 --- a/base/applications/osk/lang/id-ID.rc +++ b/base/applications/osk/lang/id-ID.rc @@ -8,244 +8,6 @@ LANGUAGE LANG_INDONESIAN, SUBLANG_DEFAULT -MAIN_DIALOG_ENHANCED_KB DIALOGEX DISCARDABLE 0, 0, 463, 115 -CAPTION "Papan ketik layar" -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,143,3,15,15 - PUSHBUTTON "F6",SCAN_CODE_117,163,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,243,3,15,15 - PUSHBUTTON "F10",SCAN_CODE_121,263,3,15,15 - PUSHBUTTON "F11",SCAN_CODE_122,283,3,15,15 - PUSHBUTTON "F12",SCAN_CODE_123,303,3,15,15 - PUSHBUTTON "Prn",SCAN_CODE_124,323,3,15,15 - PUSHBUTTON "Stop",SCAN_CODE_125,343,3,15,15 - PUSHBUTTON "Attn",SCAN_CODE_126,363,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,55,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,48,15 - PUSHBUTTON "ret",SCAN_CODE_43,262,60,56,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,64,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,343,98,15,15,BS_ICON - PUSHBUTTON "ROS",SCAN_CODE_127,30,98,24,15,BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX - PUSHBUTTON "alt",SCAN_CODE_60,57,98,24,15,BS_PUSHLIKE|BS_AUTOCHECKBOX - PUSHBUTTON "",SCAN_CODE_61,84,98,125,15 //space - PUSHBUTTON "alt",SCAN_CODE_62,213,98,24,15,BS_PUSHLIKE|BS_AUTOCHECKBOX - PUSHBUTTON "ROS",SCAN_CODE_128,240,98,24,15,BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX - PUSHBUTTON "menu",SCAN_CODE_129,267,98,24,15,BS_ICON - PUSHBUTTON "ctrl",SCAN_CODE_64,294,98,24,15,BS_PUSHLIKE|BS_AUTOCHECKBOX - PUSHBUTTON "ins",SCAN_CODE_75,323,22,15,15 - PUSHBUTTON "del",SCAN_CODE_76,323,41,15,15 - PUSHBUTTON "hm",SCAN_CODE_80,343,22,15,15 - PUSHBUTTON "end",SCAN_CODE_81,343,41,15,15 - PUSHBUTTON "pup",SCAN_CODE_85,363,22,15,15 - PUSHBUTTON "pdn",SCAN_CODE_86,363,41,15,15 - PUSHBUTTON "<-",SCAN_CODE_79,323,98,15,15,BS_ICON - PUSHBUTTON "^",SCAN_CODE_83,343,79,15,15,BS_ICON - PUSHBUTTON "->",SCAN_CODE_89,363,98,15,15,BS_ICON - PUSHBUTTON "nlk",SCAN_CODE_90,383,22,15,15 - PUSHBUTTON "7",SCAN_CODE_91,383,41,15,15 - PUSHBUTTON "4",SCAN_CODE_92,383,60,15,15 - PUSHBUTTON "1",SCAN_CODE_93,383,79,15,15 - PUSHBUTTON "/",SCAN_CODE_95,403,22,15,15 - PUSHBUTTON "8",SCAN_CODE_96,403,41,15,15 - PUSHBUTTON "5",SCAN_CODE_97,403,60,15,15 - PUSHBUTTON "2",SCAN_CODE_98,403,79,15,15 - PUSHBUTTON "0",SCAN_CODE_99,383,98,34,15 - PUSHBUTTON "*",SCAN_CODE_100,423,22,15,15 - PUSHBUTTON "9",SCAN_CODE_101,423,41,15,15 - PUSHBUTTON "6",SCAN_CODE_102,423,60,15,15 - PUSHBUTTON "3",SCAN_CODE_103,423,79,15,15 - PUSHBUTTON ".",SCAN_CODE_104,423,98,15,15 - PUSHBUTTON "-",SCAN_CODE_105,443,22,15,15 - PUSHBUTTON "+",SCAN_CODE_106,443,41,15,35 - PUSHBUTTON "ent",SCAN_CODE_108,443,78,15,35 - CTEXT "Num",IDC_STATIC,383,3,21,8 - CONTROL "",IDC_LED_NUM,"Static",SS_CENTER|SS_NOTIFY,391,15,4,3 - CTEXT "Caps",IDC_STATIC,408,3,21,8 - CONTROL "",IDC_LED_CAPS,"Static",SS_CENTER|SS_NOTIFY,417,15,4,3 - CTEXT "Scroll",IDC_STATIC,433,3,21,8 - 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 "Papan ketik layar" -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|BS_PUSHLIKE|BS_AUTOCHECKBOX - 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|BS_PUSHLIKE|BS_AUTOCHECKBOX - 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 "Be&rkas" @@ -274,7 +36,7 @@ BEGIN MENUITEM SEPARATOR MENUITEM "Mode &Mengetik...", IDM_TYPE_MODE, GRAYED MENUITEM SEPARATOR - MENUITEM "&Fon...", IDM_FONT, GRAYED + MENUITEM "&Fon...", IDM_FONT END POPUP "&Bantuan" @@ -299,8 +61,23 @@ END STRINGTABLE BEGIN - STRING_OSK "Papan Ketik Layar" - STRING_AUTHORS "Hak Cipta Denis Robert" + IDS_OSK "Papan Ketik Layar" + IDS_AUTHORS "Hak Cipta Denis Robert" + IDS_NUMLOCK "Num" + IDS_CAPSLOCK "Caps" + IDS_SCROLLLOCK "Scroll" + /* Make sure the text fits onto the buttons */ + IDS_ESCAPE "Esc" + IDS_PRN "Prn" + IDS_STOP "Stop" + IDS_ATTN "Attn" + IDS_INSERT "ins" + IDS_NUMLOCKKEY "nlk" + IDS_DELETE "del" + IDS_END "end" + IDS_CTRL "ctrl" + IDS_LEFTALT "alt" + IDS_RIGHTALT "alt" END /* EOF */ diff --git a/base/applications/osk/lang/it-IT.rc b/base/applications/osk/lang/it-IT.rc index fa45a353b11..1f449cab0f4 100644 --- a/base/applications/osk/lang/it-IT.rc +++ b/base/applications/osk/lang/it-IT.rc @@ -8,246 +8,6 @@ LANGUAGE LANG_ITALIAN, SUBLANG_NEUTRAL -MAIN_DIALOG_ENHANCED_KB DIALOGEX DISCARDABLE 0, 0, 463, 115 -CAPTION "Tastiera a schermo" -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,143,3,15,15 - PUSHBUTTON "F6",SCAN_CODE_117,163,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,243,3,15,15 - PUSHBUTTON "F10",SCAN_CODE_121,263,3,15,15 - PUSHBUTTON "F11",SCAN_CODE_122,283,3,15,15 - PUSHBUTTON "F12",SCAN_CODE_123,303,3,15,15 - PUSHBUTTON "Imp",SCAN_CODE_124,323,3,15,15 - PUSHBUTTON "Arr",SCAN_CODE_125,343,3,15,15 - PUSHBUTTON "Attn",SCAN_CODE_126,363,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,55,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 "Verr maj",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_42,243,60,15,15 - PUSHBUTTON "ret",SCAN_CODE_43,262,60,56,15,BS_ICON - PUSHBUTTON "Shift",SCAN_CODE_44,3,79,57,15,BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX - PUSHBUTTON "Z",SCAN_CODE_45,64,79,15,15 - PUSHBUTTON "<",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,64,15,BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX - PUSHBUTTON "ctrl",SCAN_CODE_58,3,98,24,15,BS_PUSHLIKE|BS_AUTOCHECKBOX - PUSHBUTTON "ROS",SCAN_CODE_127,30,98,24,15,BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX - PUSHBUTTON "alt",SCAN_CODE_60,57,98,24,15,BS_PUSHLIKE|BS_AUTOCHECKBOX - PUSHBUTTON "",SCAN_CODE_61,84,98,125,15 - PUSHBUTTON "alt gr",SCAN_CODE_62,57,98,24,15,BS_PUSHLIKE|BS_AUTOCHECKBOX - PUSHBUTTON "ROS",SCAN_CODE_128,240,98,24,15,BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX - PUSHBUTTON "menu",SCAN_CODE_129,267,98,24,15,BS_ICON - PUSHBUTTON "ctrl",SCAN_CODE_64,294,98,24,15,BS_PUSHLIKE|BS_AUTOCHECKBOX - PUSHBUTTON "ins",SCAN_CODE_75,323,22,15,15 - PUSHBUTTON "del",SCAN_CODE_76,323,41,15,15 - PUSHBUTTON "home",SCAN_CODE_80,343,22,15,15,BS_ICON - PUSHBUTTON "fin",SCAN_CODE_81,343,41,15,15 - PUSHBUTTON "pg up",SCAN_CODE_85,363,22,15,15,BS_ICON - PUSHBUTTON "pg down",SCAN_CODE_86,363,41,15,15,BS_ICON - PUSHBUTTON "<-",SCAN_CODE_79,323,98,15,15,BS_ICON - PUSHBUTTON "^",SCAN_CODE_83,343,79,15,15,BS_ICON - PUSHBUTTON "v",SCAN_CODE_84,343,98,15,15,BS_ICON - PUSHBUTTON "->",SCAN_CODE_89,363,98,15,15,BS_ICON - PUSHBUTTON "num",SCAN_CODE_90,383,22,15,15 - PUSHBUTTON "7",SCAN_CODE_91,383,41,15,15 - PUSHBUTTON "4",SCAN_CODE_92,383,60,15,15 - PUSHBUTTON "1",SCAN_CODE_93,383,79,15,15 - PUSHBUTTON "/",SCAN_CODE_95,403,22,15,15 - PUSHBUTTON "8",SCAN_CODE_96,403,41,15,15 - PUSHBUTTON "5",SCAN_CODE_97,403,60,15,15 - PUSHBUTTON "2",SCAN_CODE_98,403,79,15,15 - PUSHBUTTON "0",SCAN_CODE_99,383,98,34,15 - PUSHBUTTON "*",SCAN_CODE_100,423,22,15,15 - PUSHBUTTON "9",SCAN_CODE_101,423,41,15,15 - PUSHBUTTON "6",SCAN_CODE_102,423,60,15,15 - PUSHBUTTON "3",SCAN_CODE_103,423,79,15,15 - PUSHBUTTON ".",SCAN_CODE_104,423,98,15,15 - PUSHBUTTON "-",SCAN_CODE_105,443,22,15,15 - PUSHBUTTON "+",SCAN_CODE_106,443,41,15,35 - PUSHBUTTON "ent",SCAN_CODE_108,443,78,15,35 - CTEXT "Num",IDC_STATIC,383,3,21,8 - CONTROL "",IDC_LED_NUM,"Static",SS_CENTER|SS_NOTIFY,391,15,4,3 - CTEXT "Caps",IDC_STATIC,408,3,21,8 - CONTROL "",IDC_LED_CAPS,"Static",SS_CENTER|SS_NOTIFY,417,15,4,3 - CTEXT "Scroll",IDC_STATIC,433,3,21,8 - 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 "Tastiera a schermo" -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,143,3,15,15 - PUSHBUTTON "F6",SCAN_CODE_117,163,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,243,3,15,15 - PUSHBUTTON "F10",SCAN_CODE_121,263,3,15,15 - PUSHBUTTON "F11",SCAN_CODE_122,283,3,15,15 - PUSHBUTTON "F12",SCAN_CODE_123,303,3,15,15 - PUSHBUTTON "Imp",SCAN_CODE_124,323,3,15,15 - PUSHBUTTON "Arr",SCAN_CODE_125,343,3,15,15 - PUSHBUTTON "Attn",SCAN_CODE_126,363,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,55,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 "Verr maj",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_42,243,60,15,15 - PUSHBUTTON "ret",SCAN_CODE_43,262,60,56,15,BS_ICON - PUSHBUTTON "Shift",SCAN_CODE_44,3,79,57,15,BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX - PUSHBUTTON "Z",SCAN_CODE_45,64,79,15,15 - PUSHBUTTON "<",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,64,15,BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX - PUSHBUTTON "ctrl",SCAN_CODE_58,3,98,24,15,BS_PUSHLIKE|BS_AUTOCHECKBOX - PUSHBUTTON "ROS",SCAN_CODE_127,30,98,24,15,BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX - PUSHBUTTON "alt",SCAN_CODE_60,57,98,24,15,BS_PUSHLIKE|BS_AUTOCHECKBOX - PUSHBUTTON "",SCAN_CODE_61,84,98,125,15 - PUSHBUTTON "alt gr",SCAN_CODE_62,57,98,24,15,BS_PUSHLIKE|BS_AUTOCHECKBOX - PUSHBUTTON "ROS",SCAN_CODE_128,240,98,24,15,BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX - PUSHBUTTON "menu",SCAN_CODE_129,267,98,24,15,BS_ICON - PUSHBUTTON "ctrl",SCAN_CODE_64,294,98,24,15,BS_PUSHLIKE|BS_AUTOCHECKBOX - PUSHBUTTON "ins",SCAN_CODE_75,323,22,15,15 - PUSHBUTTON "del",SCAN_CODE_76,323,41,15,15 - PUSHBUTTON "home",SCAN_CODE_80,343,22,15,15,BS_ICON - PUSHBUTTON "fin",SCAN_CODE_81,343,41,15,15 - PUSHBUTTON "pg up",SCAN_CODE_85,363,22,15,15,BS_ICON - PUSHBUTTON "pg down",SCAN_CODE_86,363,41,15,15,BS_ICON - PUSHBUTTON "<-",SCAN_CODE_79,323,98,15,15,BS_ICON - PUSHBUTTON "^",SCAN_CODE_83,343,79,15,15,BS_ICON - PUSHBUTTON "v",SCAN_CODE_84,343,98,15,15,BS_ICON - PUSHBUTTON "->",SCAN_CODE_89,363,98,15,15,BS_ICON - PUSHBUTTON "num",SCAN_CODE_90,383,22,15,15 - PUSHBUTTON "7",SCAN_CODE_91,383,41,15,15 - PUSHBUTTON "4",SCAN_CODE_92,383,60,15,15 - PUSHBUTTON "1",SCAN_CODE_93,383,79,15,15 - PUSHBUTTON "/",SCAN_CODE_95,403,22,15,15 - PUSHBUTTON "8",SCAN_CODE_96,403,41,15,15 - PUSHBUTTON "5",SCAN_CODE_97,403,60,15,15 - PUSHBUTTON "2",SCAN_CODE_98,403,79,15,15 - PUSHBUTTON "0",SCAN_CODE_99,383,98,34,15 - PUSHBUTTON "*",SCAN_CODE_100,423,22,15,15 - PUSHBUTTON "9",SCAN_CODE_101,423,41,15,15 - PUSHBUTTON "6",SCAN_CODE_102,423,60,15,15 - PUSHBUTTON "3",SCAN_CODE_103,423,79,15,15 - PUSHBUTTON ".",SCAN_CODE_104,423,98,15,15 - PUSHBUTTON "-",SCAN_CODE_105,443,22,15,15 - PUSHBUTTON "+",SCAN_CODE_106,443,41,15,35 - PUSHBUTTON "ent",SCAN_CODE_108,443,78,15,35 - CTEXT "Num",IDC_STATIC,383,3,21,8 - CONTROL "",IDC_LED_NUM,"Static",SS_CENTER|SS_NOTIFY,391,15,4,3 - CTEXT "Caps",IDC_STATIC,408,3,21,8 - CONTROL "",IDC_LED_CAPS,"Static",SS_CENTER|SS_NOTIFY,417,15,4,3 - CTEXT "Scroll",IDC_STATIC,433,3,21,8 - CONTROL "",IDC_LED_SCROLL,"Static",SS_CENTER|SS_NOTIFY,443,15,4,3 -END - IDR_OSK_MENU MENU DISCARDABLE BEGIN POPUP "File" @@ -276,7 +36,7 @@ BEGIN MENUITEM SEPARATOR MENUITEM "&Modalità di scrittura...", IDM_TYPE_MODE, GRAYED MENUITEM SEPARATOR - MENUITEM "&Tipo di carattere...", IDM_FONT, GRAYED + MENUITEM "&Tipo di carattere...", IDM_FONT END POPUP "Aiuto" @@ -301,8 +61,23 @@ END STRINGTABLE BEGIN - STRING_OSK "Tastiera a schermo" - STRING_AUTHORS "Diritti d'autore Denis Robert" + IDS_OSK "Tastiera a schermo" + IDS_AUTHORS "Diritti d'autore Denis Robert" + IDS_NUMLOCK "Num" + IDS_CAPSLOCK "Caps" + IDS_SCROLLLOCK "Scroll" + /* Make sure the text fits onto the buttons */ + IDS_ESCAPE "Esc" + IDS_PRN "Prn" + IDS_STOP "Stop" + IDS_ATTN "Attn" + IDS_INSERT "ins" + IDS_NUMLOCKKEY "nlk" + IDS_DELETE "del" + IDS_END "end" + IDS_CTRL "ctrl" + IDS_LEFTALT "alt" + IDS_RIGHTALT "alt" END /* EOF */ diff --git a/base/applications/osk/lang/pl-PL.rc b/base/applications/osk/lang/pl-PL.rc index c128976e309..fb584a41db1 100644 --- a/base/applications/osk/lang/pl-PL.rc +++ b/base/applications/osk/lang/pl-PL.rc @@ -8,244 +8,6 @@ LANGUAGE LANG_POLISH, SUBLANG_NEUTRAL -MAIN_DIALOG_ENHANCED_KB DIALOGEX DISCARDABLE 0, 0, 608, 164 -CAPTION "Klawiatura Ekranowa" -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,23,22 - PUSHBUTTON "F1",SCAN_CODE_112,48,3,23,22 - PUSHBUTTON "F2",SCAN_CODE_113,75,3,23,22 - PUSHBUTTON "F3",SCAN_CODE_114,101,3,23,22 - PUSHBUTTON "F4",SCAN_CODE_115,128,3,23,22 - PUSHBUTTON "F5",SCAN_CODE_116,173,3,23,22 - PUSHBUTTON "F6",SCAN_CODE_117,199,3,23,22 - PUSHBUTTON "F7",SCAN_CODE_118,225,3,23,22 - PUSHBUTTON "F8",SCAN_CODE_119,251,3,23,22 - PUSHBUTTON "F9",SCAN_CODE_120,296,3,23,22 - PUSHBUTTON "F10",SCAN_CODE_121,323,3,23,22 - PUSHBUTTON "F11",SCAN_CODE_122,350,3,23,22 - PUSHBUTTON "F12",SCAN_CODE_123,377,3,23,22 - PUSHBUTTON "Prn",SCAN_CODE_124,411,3,23,22 - PUSHBUTTON "Stop",SCAN_CODE_125,438,3,23,22 - PUSHBUTTON "Attn",SCAN_CODE_126,465,3,23,22 - PUSHBUTTON "`",SCAN_CODE_1,3,35,23,22 - PUSHBUTTON "1",SCAN_CODE_2,30,35,23,22 - PUSHBUTTON "2",SCAN_CODE_3,57,35,23,22 - PUSHBUTTON "3",SCAN_CODE_4,84,35,23,22 - PUSHBUTTON "4",SCAN_CODE_5,111,35,23,22 - PUSHBUTTON "5",SCAN_CODE_6,138,35,23,22 - PUSHBUTTON "6",SCAN_CODE_7,165,35,23,22 - PUSHBUTTON "7",SCAN_CODE_8,192,35,23,22 - PUSHBUTTON "8",SCAN_CODE_9,219,35,23,22 - PUSHBUTTON "9",SCAN_CODE_10,246,35,23,22 - PUSHBUTTON "0",SCAN_CODE_11,273,35,23,22 - PUSHBUTTON "-",SCAN_CODE_12,300,35,23,22 - PUSHBUTTON "=",SCAN_CODE_13,327,35,23,22 - PUSHBUTTON "<--",SCAN_CODE_15,354,35,47,22,BS_ICON - PUSHBUTTON "Tab",SCAN_CODE_16,3,61,35,22,BS_ICON - PUSHBUTTON "Q",SCAN_CODE_17,42,61,23,22 - PUSHBUTTON "W",SCAN_CODE_18,69,61,23,22 - PUSHBUTTON "E",SCAN_CODE_19,96,61,23,22 - PUSHBUTTON "R",SCAN_CODE_20,123,61,23,22 - PUSHBUTTON "T",SCAN_CODE_21,150,61,23,22 - PUSHBUTTON "Y",SCAN_CODE_22,177,61,23,22 - PUSHBUTTON "U",SCAN_CODE_23,204,61,23,22 - PUSHBUTTON "I",SCAN_CODE_24,231,61,23,22 - PUSHBUTTON "O",SCAN_CODE_25,258,61,23,22 - PUSHBUTTON "P",SCAN_CODE_26,285,61,23,22 - PUSHBUTTON "[",SCAN_CODE_27,312,61,23,22 - PUSHBUTTON "]",SCAN_CODE_28,339,61,23,22 - PUSHBUTTON "\\",SCAN_CODE_29,366,61,35,22 - PUSHBUTTON "Caps Lock",SCAN_CODE_30,3,87,46,22,BS_ICON - PUSHBUTTON "A",SCAN_CODE_31,53,87,23,22 - PUSHBUTTON "S",SCAN_CODE_32,80,87,23,22 - PUSHBUTTON "D",SCAN_CODE_33,107,87,23,22 - PUSHBUTTON "F",SCAN_CODE_34,134,87,23,22 - PUSHBUTTON "G",SCAN_CODE_35,161,87,23,22 - PUSHBUTTON "H",SCAN_CODE_36,188,87,23,22 - PUSHBUTTON "J",SCAN_CODE_37,215,87,23,22 - PUSHBUTTON "K",SCAN_CODE_38,242,87,23,22 - PUSHBUTTON "L",SCAN_CODE_39,269,87,23,22 - PUSHBUTTON ";",SCAN_CODE_40,296,87,23,22 - PUSHBUTTON "'",SCAN_CODE_41,323,87,23,22 - PUSHBUTTON "ret",SCAN_CODE_43,350,87,51,22,BS_ICON - PUSHBUTTON "shift",SCAN_CODE_44,3,113,57,22,BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX - PUSHBUTTON "Z",SCAN_CODE_46,64,113,23,22 - PUSHBUTTON "X",SCAN_CODE_47,91,113,23,22 - PUSHBUTTON "C",SCAN_CODE_48,118,113,23,22 - PUSHBUTTON "V",SCAN_CODE_49,145,113,23,22 - PUSHBUTTON "B",SCAN_CODE_50,172,113,23,22 - PUSHBUTTON "N",SCAN_CODE_51,199,113,23,22 - PUSHBUTTON "M",SCAN_CODE_52,226,113,23,22 - PUSHBUTTON ",",SCAN_CODE_53,253,113,23,22 - PUSHBUTTON ".",SCAN_CODE_54,280,113,23,22 - PUSHBUTTON "/",SCAN_CODE_55,307,113,23,22 - PUSHBUTTON "shift",SCAN_CODE_57,334,113,67,22,BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX - PUSHBUTTON "ctrl",SCAN_CODE_58,3,139,41,22,BS_PUSHLIKE|BS_AUTOCHECKBOX - PUSHBUTTON "ROS",SCAN_CODE_127,48,139,30,22,BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX - PUSHBUTTON "alt",SCAN_CODE_60,82,139,30,22,BS_PUSHLIKE|BS_AUTOCHECKBOX - PUSHBUTTON "",SCAN_CODE_61,116,139,143,22 - PUSHBUTTON "alt gr",SCAN_CODE_62,264,139,30,22,BS_PUSHLIKE|BS_AUTOCHECKBOX - PUSHBUTTON "ROS",SCAN_CODE_128,298,139,30,22,BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX - PUSHBUTTON "menu",SCAN_CODE_129,332,139,30,22,BS_ICON - PUSHBUTTON "ctrl",SCAN_CODE_64,366,139,35,22,BS_PUSHLIKE|BS_AUTOCHECKBOX - PUSHBUTTON "ins",SCAN_CODE_75,411,35,23,22 - PUSHBUTTON "del",SCAN_CODE_76,411,61,23,22 - PUSHBUTTON "home",SCAN_CODE_80,438,35,23,22,BS_ICON - PUSHBUTTON "end",SCAN_CODE_81,438,61,23,22 - PUSHBUTTON "pg AR",SCAN_CODE_85,465,35,23,22,BS_ICON - PUSHBUTTON "pg AV",SCAN_CODE_86,465,61,23,22,BS_ICON - PUSHBUTTON "<-",SCAN_CODE_79,411,139,23,22,BS_ICON - PUSHBUTTON "^",SCAN_CODE_83,438,113,23,22,BS_ICON - PUSHBUTTON "v",SCAN_CODE_84,438,139,23,22,BS_ICON - PUSHBUTTON "->",SCAN_CODE_89,465,139,23,22,BS_ICON - PUSHBUTTON "num",SCAN_CODE_90,500,35,23,22 - PUSHBUTTON "7",SCAN_CODE_91,500,61,23,22 - PUSHBUTTON "4",SCAN_CODE_92,500,87,23,22 - PUSHBUTTON "1",SCAN_CODE_93,500,113,23,22 - PUSHBUTTON "/",SCAN_CODE_95,527,35,23,22 - PUSHBUTTON "8",SCAN_CODE_96,527,61,23,22 - PUSHBUTTON "5",SCAN_CODE_97,527,87,23,22 - PUSHBUTTON "2",SCAN_CODE_98,527,113,23,22 - PUSHBUTTON "0",SCAN_CODE_99,500,139,50,22 - PUSHBUTTON "*",SCAN_CODE_100,554,35,23,22 - PUSHBUTTON "9",SCAN_CODE_101,554,61,23,22 - PUSHBUTTON "6",SCAN_CODE_102,554,87,23,22 - PUSHBUTTON "3",SCAN_CODE_103,554,113,23,22 - PUSHBUTTON ".",SCAN_CODE_104,554,139,23,22 - PUSHBUTTON "-",SCAN_CODE_105,581,35,23,22 - PUSHBUTTON "+",SCAN_CODE_106,581,61,23,48 - PUSHBUTTON "ent",SCAN_CODE_108,581,113,23,48 - CTEXT "Num",IDC_STATIC,510,4,21,8 - CONTROL "",IDC_LED_NUM,"Static",SS_CENTER|SS_NOTIFY,518,16,4,3 - CTEXT "Caps",IDC_STATIC,540,4,21,8 - CONTROL "",IDC_LED_CAPS,"Static",SS_CENTER|SS_NOTIFY,548,16,4,3 - CTEXT "Scroll",IDC_STATIC,572,4,21,8 - 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 "Klawiatura ekranowa" -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|BS_PUSHLIKE|BS_AUTOCHECKBOX - 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|BS_PUSHLIKE|BS_AUTOCHECKBOX - 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 "Pl&ik" @@ -274,7 +36,7 @@ BEGIN MENUITEM SEPARATOR MENUITEM "&Tryb wpisywania...", IDM_TYPE_MODE, GRAYED MENUITEM SEPARATOR - MENUITEM "&Czcionka...", IDM_FONT, GRAYED + MENUITEM "&Czcionka...", IDM_FONT END POPUP "Pomo&c" @@ -299,8 +61,23 @@ END STRINGTABLE BEGIN - STRING_OSK "Klawiatura ekranowa" - STRING_AUTHORS "Copyright Denis Robert" + IDS_OSK "Klawiatura ekranowa" + IDS_AUTHORS "Copyright Denis Robert" + IDS_NUMLOCK "Num" + IDS_CAPSLOCK "Caps" + IDS_SCROLLLOCK "Scroll" + /* Make sure the text fits onto the buttons */ + IDS_ESCAPE "Esc" + IDS_PRN "Prn" + IDS_STOP "Stop" + IDS_ATTN "Attn" + IDS_INSERT "ins" + IDS_NUMLOCKKEY "nlk" + IDS_DELETE "del" + IDS_END "end" + IDS_CTRL "ctrl" + IDS_LEFTALT "alt" + IDS_RIGHTALT "alt" END /* EOF */ diff --git a/base/applications/osk/lang/ro-RO.rc b/base/applications/osk/lang/ro-RO.rc index 9e0bba88685..e7faada2b3f 100644 --- a/base/applications/osk/lang/ro-RO.rc +++ b/base/applications/osk/lang/ro-RO.rc @@ -9,244 +9,6 @@ LANGUAGE LANG_ROMANIAN, SUBLANG_DEFAULT -MAIN_DIALOG_ENHANCED_KB DIALOGEX DISCARDABLE 0, 0, 463, 115 -CAPTION "Tastatură virtuală" -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,143,3,15,15 - PUSHBUTTON "F6",SCAN_CODE_117,163,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,243,3,15,15 - PUSHBUTTON "F10",SCAN_CODE_121,263,3,15,15 - PUSHBUTTON "F11",SCAN_CODE_122,283,3,15,15 - PUSHBUTTON "F12",SCAN_CODE_123,303,3,15,15 - PUSHBUTTON "Prn",SCAN_CODE_124,323,3,15,15 - PUSHBUTTON "Stop",SCAN_CODE_125,343,3,15,15 - PUSHBUTTON "Attn",SCAN_CODE_126,363,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,55,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 "\\",SCAN_CODE_29,270,41,48,15 - PUSHBUTTON "Fix cap",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 "ret",SCAN_CODE_43,262,60,56,15,BS_ICON - PUSHBUTTON "schimb",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 "schimb",SCAN_CODE_57,254,79,64,15,BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX - PUSHBUTTON "ctrl",SCAN_CODE_58,3,98,24,15,BS_PUSHLIKE|BS_AUTOCHECKBOX - PUSHBUTTON "ROS",SCAN_CODE_127,30,98,24,15,BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX - PUSHBUTTON "alt",SCAN_CODE_60,57,98,24,15,BS_PUSHLIKE|BS_AUTOCHECKBOX - PUSHBUTTON "",SCAN_CODE_61,84,98,125,15 - PUSHBUTTON "alt gr",SCAN_CODE_62,213,98,24,15,BS_PUSHLIKE|BS_AUTOCHECKBOX - PUSHBUTTON "ROS",SCAN_CODE_128,240,98,24,15,BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX - PUSHBUTTON "meniu",SCAN_CODE_129,267,98,24,15,BS_ICON - PUSHBUTTON "ctrl",SCAN_CODE_64,294,98,24,15,BS_PUSHLIKE|BS_AUTOCHECKBOX - PUSHBUTTON "ins",SCAN_CODE_75,323,22,15,15 - PUSHBUTTON "ștg",SCAN_CODE_76,323,41,15,15 - PUSHBUTTON "init",SCAN_CODE_80,343,22,15,15 - PUSHBUTTON "fin",SCAN_CODE_81,343,41,15,15 - PUSHBUTTON "pg sus",SCAN_CODE_85,363,22,15,15,BS_ICON - PUSHBUTTON "pg jos",SCAN_CODE_86,363,41,15,15,BS_ICON - PUSHBUTTON "<-",SCAN_CODE_79,323,98,15,15,BS_ICON - PUSHBUTTON "^",SCAN_CODE_83,343,79,15,15,BS_ICON - PUSHBUTTON "v",SCAN_CODE_84,343,98,15,15,BS_ICON - PUSHBUTTON "->",SCAN_CODE_89,363,98,15,15,BS_ICON - PUSHBUTTON "num",SCAN_CODE_90,383,22,15,15 - PUSHBUTTON "7",SCAN_CODE_91,383,41,15,15 - PUSHBUTTON "4",SCAN_CODE_92,383,60,15,15 - PUSHBUTTON "1",SCAN_CODE_93,383,79,15,15 - PUSHBUTTON "/",SCAN_CODE_95,403,22,15,15 - PUSHBUTTON "8",SCAN_CODE_96,403,41,15,15 - PUSHBUTTON "5",SCAN_CODE_97,403,60,15,15 - PUSHBUTTON "2",SCAN_CODE_98,403,79,15,15 - PUSHBUTTON "0",SCAN_CODE_99,383,98,34,15 - PUSHBUTTON "*",SCAN_CODE_100,423,22,15,15 - PUSHBUTTON "9",SCAN_CODE_101,423,41,15,15 - PUSHBUTTON "6",SCAN_CODE_102,423,60,15,15 - PUSHBUTTON "3",SCAN_CODE_103,423,79,15,15 - PUSHBUTTON ".",SCAN_CODE_104,423,98,15,15 - PUSHBUTTON "-",SCAN_CODE_105,443,22,15,15 - PUSHBUTTON "+",SCAN_CODE_106,443,41,15,35 - PUSHBUTTON "intr",SCAN_CODE_108,443,78,15,35 - CTEXT "Num",IDC_STATIC,383,3,21,8 - CONTROL "",IDC_LED_NUM,"Static",SS_CENTER|SS_NOTIFY,391,15,4,3 - CTEXT "Cap",IDC_STATIC,408,3,21,8 - CONTROL "",IDC_LED_CAPS,"Static",SS_CENTER|SS_NOTIFY,417,15,4,3 - CTEXT "Derul",IDC_STATIC,433,3,21,8 - 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 "Tastatură virtuală" -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,143,3,15,15 - PUSHBUTTON "F6",SCAN_CODE_117,163,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,243,3,15,15 - PUSHBUTTON "F10",SCAN_CODE_121,263,3,15,15 - PUSHBUTTON "F11",SCAN_CODE_122,283,3,15,15 - PUSHBUTTON "F12",SCAN_CODE_123,303,3,15,15 - PUSHBUTTON "Prn",SCAN_CODE_124,323,3,15,15 - PUSHBUTTON "Stop",SCAN_CODE_125,343,3,15,15 - PUSHBUTTON "Attn",SCAN_CODE_126,363,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,55,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 "\\",SCAN_CODE_29,270,41,48,15 - PUSHBUTTON "Fix cap",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 "ret",SCAN_CODE_43,262,60,56,15,BS_ICON - PUSHBUTTON "schimb",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 "schimb",SCAN_CODE_57,254,79,64,15,BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX - PUSHBUTTON "ctrl",SCAN_CODE_58,3,98,24,15,BS_PUSHLIKE|BS_AUTOCHECKBOX - PUSHBUTTON "ROS",SCAN_CODE_127,30,98,24,15,BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX - PUSHBUTTON "alt",SCAN_CODE_60,57,98,24,15,BS_PUSHLIKE|BS_AUTOCHECKBOX - PUSHBUTTON "",SCAN_CODE_61,84,98,125,15 - PUSHBUTTON "alt gr",SCAN_CODE_62,213,98,24,15,BS_PUSHLIKE|BS_AUTOCHECKBOX - PUSHBUTTON "ROS",SCAN_CODE_128,240,98,24,15,BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX - PUSHBUTTON "meniu",SCAN_CODE_129,267,98,24,15,BS_ICON - PUSHBUTTON "ctrl",SCAN_CODE_64,294,98,24,15,BS_PUSHLIKE|BS_AUTOCHECKBOX - PUSHBUTTON "ins",SCAN_CODE_75,323,22,15,15 - PUSHBUTTON "ștg",SCAN_CODE_76,323,41,15,15 - PUSHBUTTON "init",SCAN_CODE_80,343,22,15,15 - PUSHBUTTON "fin",SCAN_CODE_81,343,41,15,15 - PUSHBUTTON "pg sus",SCAN_CODE_85,363,22,15,15,BS_ICON - PUSHBUTTON "pg jos",SCAN_CODE_86,363,41,15,15,BS_ICON - PUSHBUTTON "<-",SCAN_CODE_79,323,98,15,15,BS_ICON - PUSHBUTTON "^",SCAN_CODE_83,343,79,15,15,BS_ICON - PUSHBUTTON "v",SCAN_CODE_84,343,98,15,15,BS_ICON - PUSHBUTTON "->",SCAN_CODE_89,363,98,15,15,BS_ICON - PUSHBUTTON "num",SCAN_CODE_90,383,22,15,15 - PUSHBUTTON "7",SCAN_CODE_91,383,41,15,15 - PUSHBUTTON "4",SCAN_CODE_92,383,60,15,15 - PUSHBUTTON "1",SCAN_CODE_93,383,79,15,15 - PUSHBUTTON "/",SCAN_CODE_95,403,22,15,15 - PUSHBUTTON "8",SCAN_CODE_96,403,41,15,15 - PUSHBUTTON "5",SCAN_CODE_97,403,60,15,15 - PUSHBUTTON "2",SCAN_CODE_98,403,79,15,15 - PUSHBUTTON "0",SCAN_CODE_99,383,98,34,15 - PUSHBUTTON "*",SCAN_CODE_100,423,22,15,15 - PUSHBUTTON "9",SCAN_CODE_101,423,41,15,15 - PUSHBUTTON "6",SCAN_CODE_102,423,60,15,15 - PUSHBUTTON "3",SCAN_CODE_103,423,79,15,15 - PUSHBUTTON ".",SCAN_CODE_104,423,98,15,15 - PUSHBUTTON "-",SCAN_CODE_105,443,22,15,15 - PUSHBUTTON "+",SCAN_CODE_106,443,41,15,35 - PUSHBUTTON "intr",SCAN_CODE_108,443,78,15,35 - CTEXT "Num",IDC_STATIC,383,3,21,8 - CONTROL "",IDC_LED_NUM,"Static",SS_CENTER|SS_NOTIFY,391,15,4,3 - CTEXT "Cap",IDC_STATIC,408,3,21,8 - CONTROL "",IDC_LED_CAPS,"Static",SS_CENTER|SS_NOTIFY,417,15,4,3 - CTEXT "Derul",IDC_STATIC,433,3,21,8 - CONTROL "",IDC_LED_SCROLL,"Static",SS_CENTER|SS_NOTIFY,443,15,4,3 -END - IDR_OSK_MENU MENU DISCARDABLE BEGIN POPUP "Fișier" @@ -275,7 +37,7 @@ BEGIN MENUITEM SEPARATOR MENUITEM "&Mod tastare...", IDM_TYPE_MODE, GRAYED MENUITEM SEPARATOR - MENUITEM "&Font...", IDM_FONT, GRAYED + MENUITEM "&Font...", IDM_FONT END POPUP "Ajutor" @@ -300,8 +62,23 @@ END STRINGTABLE BEGIN - STRING_OSK "Tastatură virtuală" - STRING_AUTHORS "Drepturi de autor Denis Robert" + IDS_OSK "Tastatură virtuală" + IDS_AUTHORS "Drepturi de autor Denis Robert" + IDS_NUMLOCK "Num" + IDS_CAPSLOCK "Caps" + IDS_SCROLLLOCK "Scroll" + /* Make sure the text fits onto the buttons */ + IDS_ESCAPE "Esc" + IDS_PRN "Prn" + IDS_STOP "Stop" + IDS_ATTN "Attn" + IDS_INSERT "ins" + IDS_NUMLOCKKEY "nlk" + IDS_DELETE "del" + IDS_END "end" + IDS_CTRL "ctrl" + IDS_LEFTALT "alt" + IDS_RIGHTALT "alt" END /* EOF */ diff --git a/base/applications/osk/lang/ru-RU.rc b/base/applications/osk/lang/ru-RU.rc index e4f6a4fa125..49331bf89d7 100644 --- a/base/applications/osk/lang/ru-RU.rc +++ b/base/applications/osk/lang/ru-RU.rc @@ -8,244 +8,6 @@ LANGUAGE LANG_RUSSIAN, SUBLANG_NEUTRAL -MAIN_DIALOG_ENHANCED_KB DIALOGEX DISCARDABLE 0, 0, 463, 115 -CAPTION "Экранная клавиатура" -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,143,3,15,15 - PUSHBUTTON "F6",SCAN_CODE_117,163,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,243,3,15,15 - PUSHBUTTON "F10",SCAN_CODE_121,263,3,15,15 - PUSHBUTTON "F11",SCAN_CODE_122,283,3,15,15 - PUSHBUTTON "F12",SCAN_CODE_123,303,3,15,15 - PUSHBUTTON "Prn",SCAN_CODE_124,323,3,15,15 - PUSHBUTTON "Stop",SCAN_CODE_125,343,3,15,15 - PUSHBUTTON "Attn",SCAN_CODE_126,363,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,55,15,BS_ICON - PUSHBUTTON "Tab",SCAN_CODE_16,3,41,35,15,BS_ICON - PUSHBUTTON "й",SCAN_CODE_17,42,41,15,15 - PUSHBUTTON "ц",SCAN_CODE_18,61,41,15,15 - PUSHBUTTON "у",SCAN_CODE_19,80,41,15,15 - PUSHBUTTON "к",SCAN_CODE_20,99,41,15,15 - PUSHBUTTON "е",SCAN_CODE_21,118,41,15,15 - PUSHBUTTON "н",SCAN_CODE_22,137,41,15,15 - PUSHBUTTON "г",SCAN_CODE_23,156,41,15,15 - PUSHBUTTON "ш",SCAN_CODE_24,175,41,15,15 - PUSHBUTTON "щ",SCAN_CODE_25,194,41,15,15 - PUSHBUTTON "з",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 "ф",SCAN_CODE_31,53,60,15,15 - PUSHBUTTON "ы",SCAN_CODE_32,72,60,15,15 - PUSHBUTTON "в",SCAN_CODE_33,91,60,15,15 - PUSHBUTTON "а",SCAN_CODE_34,110,60,15,15 - PUSHBUTTON "п",SCAN_CODE_35,129,60,15,15 - PUSHBUTTON "р",SCAN_CODE_36,148,60,15,15 - PUSHBUTTON "о",SCAN_CODE_37,167,60,15,15 - PUSHBUTTON "л",SCAN_CODE_38,186,60,15,15 - PUSHBUTTON "д",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_42,270,41,48,15 - PUSHBUTTON "ret",SCAN_CODE_43,262,60,56,15,BS_ICON - PUSHBUTTON "shift",SCAN_CODE_44,3,79,57,15,BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX - PUSHBUTTON "я",SCAN_CODE_46,64,79,15,15 - PUSHBUTTON "ч",SCAN_CODE_47,83,79,15,15 - PUSHBUTTON "с",SCAN_CODE_48,102,79,15,15 - PUSHBUTTON "м",SCAN_CODE_49,121,79,15,15 - PUSHBUTTON "и",SCAN_CODE_50,140,79,15,15 - PUSHBUTTON "т",SCAN_CODE_51,159,79,15,15 - PUSHBUTTON "ь",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,64,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,343,98,15,15,BS_ICON - PUSHBUTTON "ROS",SCAN_CODE_127,30,98,24,15,BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX - PUSHBUTTON "alt",SCAN_CODE_60,57,98,24,15,BS_PUSHLIKE|BS_AUTOCHECKBOX - PUSHBUTTON "",SCAN_CODE_61,84,98,125,15 //space - PUSHBUTTON "alt",SCAN_CODE_62,213,98,24,15,BS_PUSHLIKE|BS_AUTOCHECKBOX - PUSHBUTTON "ROS",SCAN_CODE_128,240,98,24,15,BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX - PUSHBUTTON "menu",SCAN_CODE_129,267,98,24,15,BS_ICON - PUSHBUTTON "ctrl",SCAN_CODE_64,294,98,24,15,BS_PUSHLIKE|BS_AUTOCHECKBOX - PUSHBUTTON "ins",SCAN_CODE_75,323,22,15,15 - PUSHBUTTON "del",SCAN_CODE_76,323,41,15,15 - PUSHBUTTON "hm",SCAN_CODE_80,343,22,15,15 - PUSHBUTTON "end",SCAN_CODE_81,343,41,15,15 - PUSHBUTTON "pup",SCAN_CODE_85,363,22,15,15 - PUSHBUTTON "pdn",SCAN_CODE_86,363,41,15,15 - PUSHBUTTON "<-",SCAN_CODE_79,323,98,15,15,BS_ICON - PUSHBUTTON "^",SCAN_CODE_83,343,79,15,15,BS_ICON - PUSHBUTTON "->",SCAN_CODE_89,363,98,15,15,BS_ICON - PUSHBUTTON "nlk",SCAN_CODE_90,383,22,15,15 - PUSHBUTTON "7",SCAN_CODE_91,383,41,15,15 - PUSHBUTTON "4",SCAN_CODE_92,383,60,15,15 - PUSHBUTTON "1",SCAN_CODE_93,383,79,15,15 - PUSHBUTTON "/",SCAN_CODE_95,403,22,15,15 - PUSHBUTTON "8",SCAN_CODE_96,403,41,15,15 - PUSHBUTTON "5",SCAN_CODE_97,403,60,15,15 - PUSHBUTTON "2",SCAN_CODE_98,403,79,15,15 - PUSHBUTTON "0",SCAN_CODE_99,383,98,34,15 - PUSHBUTTON "*",SCAN_CODE_100,423,22,15,15 - PUSHBUTTON "9",SCAN_CODE_101,423,41,15,15 - PUSHBUTTON "6",SCAN_CODE_102,423,60,15,15 - PUSHBUTTON "3",SCAN_CODE_103,423,79,15,15 - PUSHBUTTON ".",SCAN_CODE_104,423,98,15,15 - PUSHBUTTON "-",SCAN_CODE_105,443,22,15,15 - PUSHBUTTON "+",SCAN_CODE_106,443,41,15,35 - PUSHBUTTON "ent",SCAN_CODE_108,443,78,15,35 - CTEXT "Num",IDC_STATIC,383,3,21,8 - CONTROL "",IDC_LED_NUM,"Static",SS_CENTER|SS_NOTIFY,391,15,4,3 - CTEXT "Caps",IDC_STATIC,408,3,21,8 - CONTROL "",IDC_LED_CAPS,"Static",SS_CENTER|SS_NOTIFY,417,15,4,3 - CTEXT "Scroll",IDC_STATIC,433,3,21,8 - 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|BS_PUSHLIKE|BS_AUTOCHECKBOX - 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|BS_PUSHLIKE|BS_AUTOCHECKBOX - 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" @@ -274,7 +36,7 @@ BEGIN MENUITEM SEPARATOR MENUITEM "&Typing Mode...", IDM_TYPE_MODE, GRAYED MENUITEM SEPARATOR - MENUITEM "&Font...", IDM_FONT, GRAYED + MENUITEM "&Font...", IDM_FONT END POPUP "Help" @@ -299,8 +61,23 @@ END STRINGTABLE BEGIN - STRING_OSK "On-Screen Keyboard" - STRING_AUTHORS "Copyright Denis Robert" + IDS_OSK "On-Screen Keyboard" + IDS_AUTHORS "Copyright Denis Robert" + IDS_NUMLOCK "Num" + IDS_CAPSLOCK "Caps" + IDS_SCROLLLOCK "Scroll" + /* Make sure the text fits onto the buttons */ + IDS_ESCAPE "Esc" + IDS_PRN "Prn" + IDS_STOP "Stop" + IDS_ATTN "Attn" + IDS_INSERT "ins" + IDS_NUMLOCKKEY "nlk" + IDS_DELETE "del" + IDS_END "end" + IDS_CTRL "ctrl" + IDS_LEFTALT "alt" + IDS_RIGHTALT "alt" END /* EOF */ diff --git a/base/applications/osk/lang/tr-TR.rc b/base/applications/osk/lang/tr-TR.rc index 3e0a2095f3d..ca27a1913b6 100644 --- a/base/applications/osk/lang/tr-TR.rc +++ b/base/applications/osk/lang/tr-TR.rc @@ -8,244 +8,6 @@ LANGUAGE LANG_TURKISH, SUBLANG_DEFAULT -MAIN_DIALOG_ENHANCED_KB DIALOGEX DISCARDABLE 0, 0, 608, 164 -CAPTION "Ekran Klavyesi" -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,23,22 - PUSHBUTTON "F1",SCAN_CODE_112,48,3,23,22 - PUSHBUTTON "F2",SCAN_CODE_113,75,3,23,22 - PUSHBUTTON "F3",SCAN_CODE_114,101,3,23,22 - PUSHBUTTON "F4",SCAN_CODE_115,128,3,23,22 - PUSHBUTTON "F5",SCAN_CODE_116,173,3,23,22 - PUSHBUTTON "F6",SCAN_CODE_117,199,3,23,22 - PUSHBUTTON "F7",SCAN_CODE_118,225,3,23,22 - PUSHBUTTON "F8",SCAN_CODE_119,251,3,23,22 - PUSHBUTTON "F9",SCAN_CODE_120,296,3,23,22 - PUSHBUTTON "F10",SCAN_CODE_121,323,3,23,22 - PUSHBUTTON "F11",SCAN_CODE_122,350,3,23,22 - PUSHBUTTON "F12",SCAN_CODE_123,377,3,23,22 - PUSHBUTTON "Prn",SCAN_CODE_124,411,3,23,22 - PUSHBUTTON "Stop",SCAN_CODE_125,438,3,23,22 - PUSHBUTTON "Attn",SCAN_CODE_126,465,3,23,22 - PUSHBUTTON """",SCAN_CODE_1,3,35,23,22 - PUSHBUTTON "1",SCAN_CODE_2,30,35,23,22 - PUSHBUTTON "2",SCAN_CODE_3,57,35,23,22 - PUSHBUTTON "3",SCAN_CODE_4,84,35,23,22 - PUSHBUTTON "4",SCAN_CODE_5,111,35,23,22 - PUSHBUTTON "5",SCAN_CODE_6,138,35,23,22 - PUSHBUTTON "6",SCAN_CODE_7,165,35,23,22 - PUSHBUTTON "7",SCAN_CODE_8,192,35,23,22 - PUSHBUTTON "8",SCAN_CODE_9,219,35,23,22 - PUSHBUTTON "9",SCAN_CODE_10,246,35,23,22 - PUSHBUTTON "0",SCAN_CODE_11,273,35,23,22 - PUSHBUTTON "*",SCAN_CODE_12,300,35,23,22 - PUSHBUTTON "-",SCAN_CODE_13,327,35,23,22 - PUSHBUTTON "<--",SCAN_CODE_15,354,35,47,22,BS_ICON - PUSHBUTTON "Tab",SCAN_CODE_16,3,61,35,22,BS_ICON - PUSHBUTTON "Q",SCAN_CODE_17,42,61,23,22 - PUSHBUTTON "W",SCAN_CODE_18,69,61,23,22 - PUSHBUTTON "E",SCAN_CODE_19,96,61,23,22 - PUSHBUTTON "R",SCAN_CODE_20,123,61,23,22 - PUSHBUTTON "T",SCAN_CODE_21,150,61,23,22 - PUSHBUTTON "Y",SCAN_CODE_22,177,61,23,22 - PUSHBUTTON "U",SCAN_CODE_23,204,61,23,22 - PUSHBUTTON "I",SCAN_CODE_24,231,61,23,22 - PUSHBUTTON "O",SCAN_CODE_25,258,61,23,22 - PUSHBUTTON "P",SCAN_CODE_26,285,61,23,22 - PUSHBUTTON "Ğ",SCAN_CODE_27,312,61,23,22 - PUSHBUTTON "Ü",SCAN_CODE_28,339,61,23,22 - PUSHBUTTON ",",SCAN_CODE_29,366,61,35,22 - PUSHBUTTON "Lock",SCAN_CODE_30,3,87,46,22,BS_ICON - PUSHBUTTON "A",SCAN_CODE_31,53,87,23,22 - PUSHBUTTON "S",SCAN_CODE_32,80,87,23,22 - PUSHBUTTON "D",SCAN_CODE_33,107,87,23,22 - PUSHBUTTON "F",SCAN_CODE_34,134,87,23,22 - PUSHBUTTON "G",SCAN_CODE_35,161,87,23,22 - PUSHBUTTON "H",SCAN_CODE_36,188,87,23,22 - PUSHBUTTON "J",SCAN_CODE_37,215,87,23,22 - PUSHBUTTON "K",SCAN_CODE_38,242,87,23,22 - PUSHBUTTON "L",SCAN_CODE_39,269,87,23,22 - PUSHBUTTON "Ş",SCAN_CODE_40,296,87,23,22 - PUSHBUTTON "İ",SCAN_CODE_41,323,87,23,22 - PUSHBUTTON "Ret",SCAN_CODE_43,350,87,51,22,BS_ICON - PUSHBUTTON "Shift",SCAN_CODE_44,3,113,57,22,BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX - PUSHBUTTON "Z",SCAN_CODE_46,64,113,23,22 - PUSHBUTTON "X",SCAN_CODE_47,91,113,23,22 - PUSHBUTTON "C",SCAN_CODE_48,118,113,23,22 - PUSHBUTTON "V",SCAN_CODE_49,145,113,23,22 - PUSHBUTTON "B",SCAN_CODE_50,172,113,23,22 - PUSHBUTTON "N",SCAN_CODE_51,199,113,23,22 - PUSHBUTTON "M",SCAN_CODE_52,226,113,23,22 - PUSHBUTTON "Ö",SCAN_CODE_53,253,113,23,22 - PUSHBUTTON "Ç",SCAN_CODE_54,280,113,23,22 - PUSHBUTTON ".",SCAN_CODE_55,307,113,23,22 - PUSHBUTTON "Shift",SCAN_CODE_57,334,113,67,22,BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX - PUSHBUTTON "Ctrl",SCAN_CODE_58,3,139,41,22,BS_PUSHLIKE|BS_AUTOCHECKBOX - PUSHBUTTON "ROS",SCAN_CODE_127,48,139,30,22,BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX - PUSHBUTTON "Alt",SCAN_CODE_60,82,139,30,22,BS_PUSHLIKE|BS_AUTOCHECKBOX - PUSHBUTTON "",SCAN_CODE_61,116,139,143,22 - PUSHBUTTON "Alt",SCAN_CODE_62,264,139,30,22,BS_PUSHLIKE|BS_AUTOCHECKBOX - PUSHBUTTON "ROS",SCAN_CODE_128,298,139,30,22,BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX - PUSHBUTTON "Menü",SCAN_CODE_129,332,139,30,22,BS_ICON - PUSHBUTTON "Ctrl",SCAN_CODE_64,366,139,35,22,BS_PUSHLIKE|BS_AUTOCHECKBOX - PUSHBUTTON "Ins",SCAN_CODE_75,411,35,23,22 - PUSHBUTTON "Del",SCAN_CODE_76,411,61,23,22 - PUSHBUTTON "Home",SCAN_CODE_80,438,35,23,22,BS_ICON - PUSHBUTTON "End",SCAN_CODE_81,438,61,23,22 - PUSHBUTTON "PgUp",SCAN_CODE_85,465,35,23,22,BS_ICON - PUSHBUTTON "PgDn",SCAN_CODE_86,465,61,23,22,BS_ICON - PUSHBUTTON "<-",SCAN_CODE_79,411,139,23,22,BS_ICON - PUSHBUTTON "^",SCAN_CODE_83,438,113,23,22,BS_ICON - PUSHBUTTON "v",SCAN_CODE_84,438,139,23,22,BS_ICON - PUSHBUTTON "->",SCAN_CODE_89,465,139,23,22,BS_ICON - PUSHBUTTON "Nlk",SCAN_CODE_90,500,35,23,22 - PUSHBUTTON "7",SCAN_CODE_91,500,61,23,22 - PUSHBUTTON "4",SCAN_CODE_92,500,87,23,22 - PUSHBUTTON "1",SCAN_CODE_93,500,113,23,22 - PUSHBUTTON "/",SCAN_CODE_95,527,35,23,22 - PUSHBUTTON "8",SCAN_CODE_96,527,61,23,22 - PUSHBUTTON "5",SCAN_CODE_97,527,87,23,22 - PUSHBUTTON "2",SCAN_CODE_98,527,113,23,22 - PUSHBUTTON "0",SCAN_CODE_99,500,139,50,22 - PUSHBUTTON "*",SCAN_CODE_100,554,35,23,22 - PUSHBUTTON "9",SCAN_CODE_101,554,61,23,22 - PUSHBUTTON "6",SCAN_CODE_102,554,87,23,22 - PUSHBUTTON "3",SCAN_CODE_103,554,113,23,22 - PUSHBUTTON ".",SCAN_CODE_104,554,139,23,22 - PUSHBUTTON "-",SCAN_CODE_105,581,35,23,22 - PUSHBUTTON "+",SCAN_CODE_106,581,61,23,48 - PUSHBUTTON "Enter",SCAN_CODE_108,581,113,23,48 - CTEXT "Num",IDC_STATIC,510,4,21,8 - CONTROL "",IDC_LED_NUM,"Static",SS_CENTER|SS_NOTIFY,518,16,4,3 - CTEXT "Caps",IDC_STATIC,540,4,21,8 - CONTROL "",IDC_LED_CAPS,"Static",SS_CENTER|SS_NOTIFY,548,16,4,3 - CTEXT "Scroll",IDC_STATIC,572,4,21,8 - 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 "Ekran Klavyesi" -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|BS_PUSHLIKE|BS_AUTOCHECKBOX - 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|BS_PUSHLIKE|BS_AUTOCHECKBOX - 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 "Dosya" @@ -274,7 +36,7 @@ BEGIN MENUITEM SEPARATOR MENUITEM "&Yazma modu...", IDM_TYPE_MODE, GRAYED MENUITEM SEPARATOR - MENUITEM "&Font...", IDM_FONT, GRAYED + MENUITEM "&Font...", IDM_FONT END POPUP "Yardım" @@ -298,9 +60,24 @@ BEGIN END STRINGTABLE -BEGIN - STRING_OSK "Ekran Klavyesi" - STRING_AUTHORS "Telif Hakkı: Denis Robert" +BEGIN + IDS_OSK "Ekran Klavyesi" + IDS_AUTHORS "Telif Hakkı: Denis Robert" + IDS_NUMLOCK "Num" + IDS_CAPSLOCK "Caps" + IDS_SCROLLLOCK "Scroll" + /* Make sure the text fits onto the buttons */ + IDS_ESCAPE "Esc" + IDS_PRN "Prn" + IDS_STOP "Stop" + IDS_ATTN "Attn" + IDS_INSERT "ins" + IDS_NUMLOCKKEY "nlk" + IDS_DELETE "del" + IDS_END "end" + IDS_CTRL "ctrl" + IDS_LEFTALT "alt" + IDS_RIGHTALT "alt" END /* EOF */ diff --git a/base/applications/osk/lang/zh-CN.rc b/base/applications/osk/lang/zh-CN.rc index 9bd7e0769cf..77b3b2a262f 100644 --- a/base/applications/osk/lang/zh-CN.rc +++ b/base/applications/osk/lang/zh-CN.rc @@ -12,244 +12,6 @@ LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED -MAIN_DIALOG_ENHANCED_KB DIALOGEX DISCARDABLE 0, 0, 608, 164 -CAPTION "屏幕键盘" -FONT 9, "宋体" -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,23,22 - PUSHBUTTON "F1",SCAN_CODE_112,48,3,23,22 - PUSHBUTTON "F2",SCAN_CODE_113,75,3,23,22 - PUSHBUTTON "F3",SCAN_CODE_114,101,3,23,22 - PUSHBUTTON "F4",SCAN_CODE_115,128,3,23,22 - PUSHBUTTON "F5",SCAN_CODE_116,173,3,23,22 - PUSHBUTTON "F6",SCAN_CODE_117,199,3,23,22 - PUSHBUTTON "F7",SCAN_CODE_118,225,3,23,22 - PUSHBUTTON "F8",SCAN_CODE_119,251,3,23,22 - PUSHBUTTON "F9",SCAN_CODE_120,296,3,23,22 - PUSHBUTTON "F10",SCAN_CODE_121,323,3,23,22 - PUSHBUTTON "F11",SCAN_CODE_122,350,3,23,22 - PUSHBUTTON "F12",SCAN_CODE_123,377,3,23,22 - PUSHBUTTON "Prn",SCAN_CODE_124,411,3,23,22 - PUSHBUTTON "Stop",SCAN_CODE_125,438,3,23,22 - PUSHBUTTON "Attn",SCAN_CODE_126,465,3,23,22 - PUSHBUTTON "`",SCAN_CODE_1,3,35,23,22 - PUSHBUTTON "1",SCAN_CODE_2,30,35,23,22 - PUSHBUTTON "2",SCAN_CODE_3,57,35,23,22 - PUSHBUTTON "3",SCAN_CODE_4,84,35,23,22 - PUSHBUTTON "4",SCAN_CODE_5,111,35,23,22 - PUSHBUTTON "5",SCAN_CODE_6,138,35,23,22 - PUSHBUTTON "6",SCAN_CODE_7,165,35,23,22 - PUSHBUTTON "7",SCAN_CODE_8,192,35,23,22 - PUSHBUTTON "8",SCAN_CODE_9,219,35,23,22 - PUSHBUTTON "9",SCAN_CODE_10,246,35,23,22 - PUSHBUTTON "0",SCAN_CODE_11,273,35,23,22 - PUSHBUTTON "-",SCAN_CODE_12,300,35,23,22 - PUSHBUTTON "=",SCAN_CODE_13,327,35,23,22 - PUSHBUTTON "<--",SCAN_CODE_15,354,35,47,22,BS_ICON - PUSHBUTTON "Tab",SCAN_CODE_16,3,61,35,22,BS_ICON - PUSHBUTTON "Q",SCAN_CODE_17,42,61,23,22 - PUSHBUTTON "W",SCAN_CODE_18,69,61,23,22 - PUSHBUTTON "E",SCAN_CODE_19,96,61,23,22 - PUSHBUTTON "R",SCAN_CODE_20,123,61,23,22 - PUSHBUTTON "T",SCAN_CODE_21,150,61,23,22 - PUSHBUTTON "Y",SCAN_CODE_22,177,61,23,22 - PUSHBUTTON "U",SCAN_CODE_23,204,61,23,22 - PUSHBUTTON "I",SCAN_CODE_24,231,61,23,22 - PUSHBUTTON "O",SCAN_CODE_25,258,61,23,22 - PUSHBUTTON "P",SCAN_CODE_26,285,61,23,22 - PUSHBUTTON "[",SCAN_CODE_27,312,61,23,22 - PUSHBUTTON "]",SCAN_CODE_28,339,61,23,22 - PUSHBUTTON "\\",SCAN_CODE_29,366,61,35,22 - PUSHBUTTON "Caps Lock",SCAN_CODE_30,3,87,46,22,BS_ICON - PUSHBUTTON "A",SCAN_CODE_31,53,87,23,22 - PUSHBUTTON "S",SCAN_CODE_32,80,87,23,22 - PUSHBUTTON "D",SCAN_CODE_33,107,87,23,22 - PUSHBUTTON "F",SCAN_CODE_34,134,87,23,22 - PUSHBUTTON "G",SCAN_CODE_35,161,87,23,22 - PUSHBUTTON "H",SCAN_CODE_36,188,87,23,22 - PUSHBUTTON "J",SCAN_CODE_37,215,87,23,22 - PUSHBUTTON "K",SCAN_CODE_38,242,87,23,22 - PUSHBUTTON "L",SCAN_CODE_39,269,87,23,22 - PUSHBUTTON ";",SCAN_CODE_40,296,87,23,22 - PUSHBUTTON "'",SCAN_CODE_41,323,87,23,22 - PUSHBUTTON "ret",SCAN_CODE_43,350,87,51,22,BS_ICON - PUSHBUTTON "shift",SCAN_CODE_44,3,113,57,22,BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX - PUSHBUTTON "Z",SCAN_CODE_46,64,113,23,22 - PUSHBUTTON "X",SCAN_CODE_47,91,113,23,22 - PUSHBUTTON "C",SCAN_CODE_48,118,113,23,22 - PUSHBUTTON "V",SCAN_CODE_49,145,113,23,22 - PUSHBUTTON "B",SCAN_CODE_50,172,113,23,22 - PUSHBUTTON "N",SCAN_CODE_51,199,113,23,22 - PUSHBUTTON "M",SCAN_CODE_52,226,113,23,22 - PUSHBUTTON ",",SCAN_CODE_53,253,113,23,22 - PUSHBUTTON ".",SCAN_CODE_54,280,113,23,22 - PUSHBUTTON "/",SCAN_CODE_55,307,113,23,22 - PUSHBUTTON "shift",SCAN_CODE_57,334,113,67,22,BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX - PUSHBUTTON "ctrl",SCAN_CODE_58,3,139,41,22,BS_PUSHLIKE|BS_AUTOCHECKBOX - PUSHBUTTON "ROS",SCAN_CODE_127,48,139,30,22,BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX - PUSHBUTTON "alt",SCAN_CODE_60,82,139,30,22,BS_PUSHLIKE|BS_AUTOCHECKBOX - PUSHBUTTON "",SCAN_CODE_61,116,139,143,22 - PUSHBUTTON "alt gr",SCAN_CODE_62,264,139,30,22,BS_PUSHLIKE|BS_AUTOCHECKBOX - PUSHBUTTON "ROS",SCAN_CODE_128,298,139,30,22,BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX - PUSHBUTTON "menu",SCAN_CODE_129,332,139,30,22,BS_ICON - PUSHBUTTON "ctrl",SCAN_CODE_64,366,139,35,22,BS_PUSHLIKE|BS_AUTOCHECKBOX - PUSHBUTTON "ins",SCAN_CODE_75,411,35,23,22 - PUSHBUTTON "del",SCAN_CODE_76,411,61,23,22 - PUSHBUTTON "home",SCAN_CODE_80,438,35,23,22,BS_ICON - PUSHBUTTON "end",SCAN_CODE_81,438,61,23,22 - PUSHBUTTON "pg up",SCAN_CODE_85,465,35,23,22,BS_ICON - PUSHBUTTON "pg down",SCAN_CODE_86,465,61,23,22,BS_ICON - PUSHBUTTON "<-",SCAN_CODE_79,411,139,23,22,BS_ICON - PUSHBUTTON "^",SCAN_CODE_83,438,113,23,22,BS_ICON - PUSHBUTTON "v",SCAN_CODE_84,438,139,23,22,BS_ICON - PUSHBUTTON "->",SCAN_CODE_89,465,139,23,22,BS_ICON - PUSHBUTTON "num",SCAN_CODE_90,500,35,23,22 - PUSHBUTTON "7",SCAN_CODE_91,500,61,23,22 - PUSHBUTTON "4",SCAN_CODE_92,500,87,23,22 - PUSHBUTTON "1",SCAN_CODE_93,500,113,23,22 - PUSHBUTTON "/",SCAN_CODE_95,527,35,23,22 - PUSHBUTTON "8",SCAN_CODE_96,527,61,23,22 - PUSHBUTTON "5",SCAN_CODE_97,527,87,23,22 - PUSHBUTTON "2",SCAN_CODE_98,527,113,23,22 - PUSHBUTTON "0",SCAN_CODE_99,500,139,50,22 - PUSHBUTTON "*",SCAN_CODE_100,554,35,23,22 - PUSHBUTTON "9",SCAN_CODE_101,554,61,23,22 - PUSHBUTTON "6",SCAN_CODE_102,554,87,23,22 - PUSHBUTTON "3",SCAN_CODE_103,554,113,23,22 - PUSHBUTTON ".",SCAN_CODE_104,554,139,23,22 - PUSHBUTTON "-",SCAN_CODE_105,581,35,23,22 - PUSHBUTTON "+",SCAN_CODE_106,581,61,23,48 - PUSHBUTTON "ent",SCAN_CODE_108,581,113,23,48 - CTEXT "Num",IDC_STATIC,510,4,21,8 - CONTROL "",IDC_LED_NUM,"Static",SS_CENTER|SS_NOTIFY,518,16,4,3 - CTEXT "Caps",IDC_STATIC,540,4,21,8 - CONTROL "",IDC_LED_CAPS,"Static",SS_CENTER|SS_NOTIFY,548,16,4,3 - CTEXT "Scroll",IDC_STATIC,572,4,21,8 - CONTROL "",IDC_LED_SCROLL,"Static",SS_CENTER|SS_NOTIFY,580,16,4,3 -END ... 1854 lines suppressed ...

1 0

[reactos] 01/01: [IMM32] Remove old code of Imm32StrToUInt and Imm32UIntToStr
by Katayama Hirofumi MZ 23 Oct '21

23 Oct '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=9455defbd36e5590c395f… commit 9455defbd36e5590c395f080e163c71f4be7d3e0 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Sat Oct 23 12:13:19 2021 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Sat Oct 23 12:13:19 2021 +0900 [IMM32] Remove old code of Imm32StrToUInt and Imm32UIntToStr CORE-11700 --- dll/win32/imm32/utils.c | 17 ----------------- 1 file changed, 17 deletions(-) diff --git a/dll/win32/imm32/utils.c b/dll/win32/imm32/utils.c index 3cf198096a6..e035fec3ed2 100644 --- a/dll/win32/imm32/utils.c +++ b/dll/win32/imm32/utils.c @@ -19,7 +19,6 @@ HANDLE g_hImm32Heap = NULL; HRESULT APIENTRY Imm32StrToUInt(LPCWSTR pszText, LPDWORD pdwValue, ULONG nBase) { -#if 1 NTSTATUS Status; UNICODE_STRING UnicodeString; RtlInitUnicodeString(&UnicodeString, pszText); @@ -27,17 +26,11 @@ Imm32StrToUInt(LPCWSTR pszText, LPDWORD pdwValue, ULONG nBase) if (!NT_SUCCESS(Status)) return E_FAIL; return S_OK; -#else - LPWSTR endptr; - *pdwValue = wcstoul(pszText, &endptr, nBase); - return (*endptr ? E_FAIL : S_OK); -#endif } HRESULT APIENTRY Imm32UIntToStr(DWORD dwValue, ULONG nBase, LPWSTR pszBuff, USHORT cchBuff) { -#if 1 NTSTATUS Status; UNICODE_STRING UnicodeString; UnicodeString.Buffer = pszBuff; @@ -46,16 +39,6 @@ Imm32UIntToStr(DWORD dwValue, ULONG nBase, LPWSTR pszBuff, USHORT cchBuff) if (!NT_SUCCESS(Status)) return E_FAIL; return S_OK; -#else - LPCWSTR pszFormat; - if (nBase == 16) - pszFormat = L"%lX"; - else if (nBase == 10) - pszFormat = L"%lu"; - else - return E_INVALIDARG; - return StringCchPrintfW(pszBuff, cchBuff, pszFormat, dwValue); -#endif } BOOL WINAPI Imm32IsImcAnsi(HIMC hIMC)

1 0

[reactos] 01/01: [WIN32SS:NTUSER] Make sure to hold User Global Lock before manipulating desktops. (#4053)
by Hermès Bélusca-Maïto 22 Oct '21

22 Oct '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=5891ab2bfd8bc3d91c4e9… commit 5891ab2bfd8bc3d91c4e9d8fc30d27393d9c60b1 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Tue Oct 19 23:09:16 2021 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Fri Oct 22 21:44:56 2021 +0200 [WIN32SS:NTUSER] Make sure to hold User Global Lock before manipulating desktops. (#4053) --- win32ss/user/ntuser/desktop.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/win32ss/user/ntuser/desktop.c b/win32ss/user/ntuser/desktop.c index 84cac5fb47b..4d8f2956b44 100644 --- a/win32ss/user/ntuser/desktop.c +++ b/win32ss/user/ntuser/desktop.c @@ -561,6 +561,8 @@ IntResolveDesktop( BOOLEAN bInteractive = FALSE; BOOLEAN bAccessAllowed = FALSE; + ASSERT(UserIsEnteredExclusive()); + ASSERT(phWinSta); ASSERT(phDesktop); ASSERT(DesktopPath); @@ -2329,6 +2331,8 @@ IntCreateDesktop( TRACE("Enter IntCreateDesktop\n"); + ASSERT(UserIsEnteredExclusive()); + ASSERT(phDesktop); *phDesktop = NULL; @@ -2808,7 +2812,7 @@ NtUserResolveDesktop( if (!NT_SUCCESS(Status)) return NULL; - // UserEnterShared(); + UserEnterExclusive(); _SEH2_TRY { @@ -2863,7 +2867,7 @@ NtUserResolveDesktop( ReleaseCapturedUnicodeString(&CapturedDesktopPath, UserMode); Quit: - // UserLeave(); + UserLeave(); /* Dereference the process object */ ObDereferenceObject(Process);

1 0

[reactos] 01/01: [WIN32SS:NTUSER] Few formatting fixes.
by Hermès Bélusca-Maïto 22 Oct '21

22 Oct '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=6b7b0f0c7e7fdd14ff551… commit 6b7b0f0c7e7fdd14ff551c2198ecb3671458c0fc Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Tue Oct 19 23:02:02 2021 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Fri Oct 22 21:44:52 2021 +0200 [WIN32SS:NTUSER] Few formatting fixes. --- win32ss/user/ntuser/desktop.c | 42 ++++++++++++++++++------------------ win32ss/user/ntuser/window.c | 2 +- win32ss/user/user32/windows/window.c | 10 ++++----- 3 files changed, 27 insertions(+), 27 deletions(-) diff --git a/win32ss/user/ntuser/desktop.c b/win32ss/user/ntuser/desktop.c index eae7a8b2ef2..84cac5fb47b 100644 --- a/win32ss/user/ntuser/desktop.c +++ b/win32ss/user/ntuser/desktop.c @@ -1209,13 +1209,12 @@ IntValidateDesktopHandle( { NTSTATUS Status; - Status = ObReferenceObjectByHandle( - Desktop, - DesiredAccess, - ExDesktopObjectType, - AccessMode, - (PVOID*)Object, - NULL); + Status = ObReferenceObjectByHandle(Desktop, + DesiredAccess, + ExDesktopObjectType, + AccessMode, + (PVOID*)Object, + NULL); TRACE("IntValidateDesktopHandle: handle:0x%p obj:0x%p access:0x%x Status:0x%lx\n", Desktop, *Object, DesiredAccess, Status); @@ -1319,7 +1318,7 @@ IntSetFocusMessageQueue(PUSER_MESSAGE_QUEUE NewQueue) { gpqForeground = NULL; ERR("ptiLastInput is CLEARED!!\n"); - ptiLastInput = NULL; // ReactOS hacks,,,, should check for process death. + ptiLastInput = NULL; // ReactOS hacks... should check for process death. } } @@ -1570,12 +1569,10 @@ UserRedrawDesktop(VOID) Window = UserGetDesktopWindow(); Rgn = IntSysCreateRectpRgnIndirect(&Window->rcWindow); - IntInvalidateWindows( Window, - Rgn, - RDW_FRAME | - RDW_ERASE | - RDW_INVALIDATE | - RDW_ALLCHILDREN); + IntInvalidateWindows(Window, + Rgn, + RDW_FRAME | RDW_ERASE | + RDW_INVALIDATE | RDW_ALLCHILDREN); REGION_Delete(Rgn); } @@ -2448,7 +2445,7 @@ IntCreateDesktop( pdesk->spwndMessage = pWnd; pWnd->fnid = FNID_MESSAGEWND; - /* Now,,, + /* Now... if !(WinStaObject->Flags & WSF_NOIO) is (not set) for desktop input output mode (see wiki) Create Tooltip. Saved in DesktopObject->spwndTooltip. Tooltip dwExStyle: WS_EX_TOOLWINDOW|WS_EX_TOPMOST @@ -2646,11 +2643,11 @@ NtUserOpenInputDesktop( HDESK hdesk; UserEnterExclusive(); - TRACE("Enter NtUserOpenInputDesktop gpdeskInputDesktop 0x%p\n",gpdeskInputDesktop); + TRACE("Enter NtUserOpenInputDesktop gpdeskInputDesktop 0x%p\n", gpdeskInputDesktop); hdesk = UserOpenInputDesktop(dwFlags, fInherit, dwDesiredAccess); - TRACE("NtUserOpenInputDesktop returning 0x%p\n",hdesk); + TRACE("NtUserOpenInputDesktop returning 0x%p\n", hdesk); UserLeave(); return hdesk; } @@ -2714,7 +2711,7 @@ NtUserCloseDesktop(HDESK hDesktop) RETURN(TRUE); CLEANUP: - TRACE("Leave NtUserCloseDesktop, ret=%i\n",_ret_); + TRACE("Leave NtUserCloseDesktop, ret=%i\n", _ret_); UserLeave(); END_CLEANUP; } @@ -2738,10 +2735,13 @@ BOOL APIENTRY NtUserPaintDesktop(HDC hDC) { BOOL Ret; + UserEnterExclusive(); TRACE("Enter NtUserPaintDesktop\n"); + Ret = IntPaintDesktop(hDC); - TRACE("Leave NtUserPaintDesktop, ret=%i\n",Ret); + + TRACE("Leave NtUserPaintDesktop, ret=%i\n", Ret); UserLeave(); return Ret; } @@ -2966,13 +2966,13 @@ NtUserSwitchDesktop(HDESK hdesk) /* Show the new desktop window */ co_IntShowDesktop(pdesk, UserGetSystemMetrics(SM_CXSCREEN), UserGetSystemMetrics(SM_CYSCREEN), bRedrawDesktop); - TRACE("SwitchDesktop gpdeskInputDesktop 0x%p\n",gpdeskInputDesktop); + TRACE("SwitchDesktop gpdeskInputDesktop 0x%p\n", gpdeskInputDesktop); ObDereferenceObject(pdesk); RETURN(TRUE); CLEANUP: - TRACE("Leave NtUserSwitchDesktop, ret=%i\n",_ret_); + TRACE("Leave NtUserSwitchDesktop, ret=%i\n", _ret_); UserLeave(); END_CLEANUP; } diff --git a/win32ss/user/ntuser/window.c b/win32ss/user/ntuser/window.c index 016eb89d955..d7877395159 100644 --- a/win32ss/user/ntuser/window.c +++ b/win32ss/user/ntuser/window.c @@ -739,7 +739,7 @@ IntGetWindowProc(PWND pWnd, PCLS Class; WNDPROC gcpd, Ret = 0; - ASSERT(UserIsEnteredExclusive() == TRUE); + ASSERT(UserIsEnteredExclusive()); Class = pWnd->pcls; diff --git a/win32ss/user/user32/windows/window.c b/win32ss/user/user32/windows/window.c index d414259515c..078e496a0ea 100644 --- a/win32ss/user/user32/windows/window.c +++ b/win32ss/user/user32/windows/window.c @@ -150,20 +150,20 @@ RtlFreeLargeString( DWORD FASTCALL -RtlGetExpWinVer( HMODULE hModule ) +RtlGetExpWinVer(HMODULE hModule) { DWORD dwMajorVersion = 3; // Set default to Windows 3.10. DWORD dwMinorVersion = 10; PIMAGE_NT_HEADERS pinth; - if ( hModule && !LOWORD( ((ULONG_PTR)hModule) )) + if (hModule && !LOWORD((ULONG_PTR)hModule)) { - pinth = RtlImageNtHeader( hModule ); - if ( pinth ) + pinth = RtlImageNtHeader(hModule); + if (pinth) { dwMajorVersion = pinth->OptionalHeader.MajorSubsystemVersion; - if ( dwMajorVersion == 1 ) + if (dwMajorVersion == 1) { dwMajorVersion = 3; }

1 0

[reactos] 01/01: [SDK] Allow ARM64 MSVC to complete configuration (#4045)
by Justin Miller 22 Oct '21

22 Oct '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=be223b9de7a194cc114ca… commit be223b9de7a194cc114ca70c6fd323d0e38ac298 Author: Justin Miller <justinmiller100(a)gmail.com> AuthorDate: Fri Oct 22 08:52:32 2021 -0700 Commit: GitHub <noreply(a)github.com> CommitDate: Fri Oct 22 18:52:32 2021 +0300 [SDK] Allow ARM64 MSVC to complete configuration (#4045) - Add some of the missing CMake adjustments to continue the configure and compile process with ARM64 MSVC - Created quick stubs for the functions in SDK needed to finish the configuration process - Put in an ARM64 option for spec2def CORE-17518 CORE-17615 --- CMakeLists.txt | 3 +++ sdk/cmake/msvc.cmake | 7 ++++++- sdk/include/psdk/windows.h | 4 +++- sdk/include/reactos/msvctarget.h | 7 +++++++ sdk/include/xdk/ntbasedef.h | 2 +- sdk/lib/crt/except/arm64/chkstk_asm.s | 19 +++++++++++++++++++ sdk/lib/crt/except/except.cmake | 2 ++ sdk/lib/crt/math/arm64/atan2.s | 16 ++++++++++++++++ sdk/lib/crt/math/math.cmake | 2 ++ sdk/tools/spec2def/spec2def.c | 8 +++++--- 10 files changed, 64 insertions(+), 6 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 8ccebb71c66..f02a6023eae 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -267,6 +267,9 @@ Enable this if the module uses typeid or dynamic_cast. You will probably need to if(SARCH STREQUAL "omap3-zoom2") add_definitions(-D_ZOOM2_) endif() + elseif(ARCH STREQUAL "arm64") + # GNU tools refer to arm64 as aarch64 + add_definitions(-D_ARM64_ -D__arm64__ -D__aarch64__ -D_WIN64) endif() # Other diff --git a/sdk/cmake/msvc.cmake b/sdk/cmake/msvc.cmake index d284cae91a5..8377e717739 100644 --- a/sdk/cmake/msvc.cmake +++ b/sdk/cmake/msvc.cmake @@ -256,6 +256,8 @@ function(set_subsystem MODULE SUBSYSTEM) target_link_options(${MODULE} PRIVATE "/SUBSYSTEM:${_subsystem},5.02") elseif(ARCH STREQUAL "arm") target_link_options(${MODULE} PRIVATE "/SUBSYSTEM:${_subsystem},6.02") + elseif(ARCH STREQUAL "arm64") + target_link_options(${MODULE} PRIVATE "/SUBSYSTEM:${_subsystem},6.04") else() target_link_options(${MODULE} PRIVATE "/SUBSYSTEM:${_subsystem},5.01") endif() @@ -363,6 +365,9 @@ if(ARCH STREQUAL "amd64") elseif(ARCH STREQUAL "arm") add_definitions(/D__arm__) set(SPEC2DEF_ARCH arm) +elseif(ARCH STREQUAL "arm64") + add_definitions(/D__arm64__) + set(SPEC2DEF_ARCH arm64) else() set(SPEC2DEF_ARCH i386) endif() @@ -440,7 +445,7 @@ function(CreateBootSectorTarget _target_name _asm_file _binary_file _base_addres COMMAND ${CMAKE_C_COMPILER} /nologo ${_no_std_includes_flag} /I${REACTOS_SOURCE_DIR}/sdk/include/asm /I${REACTOS_BINARY_DIR}/sdk/include/asm ${_includes} ${_defines} /D__ASM__ /D_USE_ML /EP /c ${_asm_file} > ${_temp_file} DEPENDS ${_asm_file}) - if(ARCH STREQUAL "arm") + if(ARCH STREQUAL "arm" OR ARCH STREQUAL "arm64") set(_asm16_command ${CMAKE_ASM16_COMPILER} -nologo -o ${_object_file} ${_temp_file}) else() set(_asm16_command ${CMAKE_ASM16_COMPILER} /nologo /Cp /Fo${_object_file} /c /Ta ${_temp_file}) diff --git a/sdk/include/psdk/windows.h b/sdk/include/psdk/windows.h index 67b25150b2e..347b164c33d 100644 --- a/sdk/include/psdk/windows.h +++ b/sdk/include/psdk/windows.h @@ -18,7 +18,7 @@ #endif #if !defined(_X86_) && !defined(_AMD64_) && !defined(_IA64_) && !defined(_ALPHA_) && \ - !defined(_ARM_) && !defined(_PPC_) && !defined(_MIPS_) && !defined(_68K_) && !defined(_SH_) + !defined(_ARM_) && !defined(_ARM64_) && !defined(_PPC_) && !defined(_MIPS_) && !defined(_68K_) && !defined(_SH_) #if defined(_M_AMD64) || defined(__x86_64__) #define _AMD64_ @@ -30,6 +30,8 @@ #define _ALPHA_ #elif defined(_M_ARM) || defined(__arm__) #define _ARM_ +#elif defined(_M_ARM64) || defined(__arm64__) || defined(__aarch64__) +#define _ARM64_ #elif defined(_M_PPC) || defined(__powerpc__) #define _PPC_ #elif defined(_M_MRX000) || defined(__mips__) diff --git a/sdk/include/reactos/msvctarget.h b/sdk/include/reactos/msvctarget.h index 6b2241f3016..3b54ee66eaf 100644 --- a/sdk/include/reactos/msvctarget.h +++ b/sdk/include/reactos/msvctarget.h @@ -26,6 +26,13 @@ #if !defined(_M_ARM) #define _M_ARM 1 #endif +#elif defined(__arm64__) + #if !defined(_ARM64_) + #define _ARM64_ 1 + #endif + #if !defined(_M_ARM64) + #define _M_ARM64 1 + #endif #elif defined(__ia64__) #if !defined(_IA64_) #define _IA64_ 1 diff --git a/sdk/include/xdk/ntbasedef.h b/sdk/include/xdk/ntbasedef.h index 0071d7352e9..753bfd0f1b5 100644 --- a/sdk/include/xdk/ntbasedef.h +++ b/sdk/include/xdk/ntbasedef.h @@ -119,7 +119,7 @@ #if defined(_AMD64_) || defined(_X86_) #define PROBE_ALIGNMENT(_s) TYPE_ALIGNMENT($ULONG) -#elif defined(_IA64_) || defined(_ARM_) +#elif defined(_IA64_) || defined(_ARM_) || defined(_ARM64_) #define PROBE_ALIGNMENT(_s) max((TYPE_ALIGNMENT(_s), TYPE_ALIGNMENT($ULONG)) #elif !defined(RC_INVOKED) #error "Unknown architecture" diff --git a/sdk/lib/crt/except/arm64/chkstk_asm.s b/sdk/lib/crt/except/arm64/chkstk_asm.s new file mode 100644 index 00000000000..ada72aeb331 --- /dev/null +++ b/sdk/lib/crt/except/arm64/chkstk_asm.s @@ -0,0 +1,19 @@ + +/* INCLUDES ******************************************************************/ + +/* We need one of these first! */ +/* #include <kxarm64.h> */ + +/* CODE **********************************************************************/ + TEXTAREA + + LEAF_ENTRY __chkstk + /* TODO: add an assert fail call, as this is unimplemented */ + LEAF_END __chkstk + + LEAF_ENTRY __alloca_probe + /* TODO: add an assert fail call, as this is unimplemented */ + LEAF_END __alloca_probe + + END +/* EOF */ diff --git a/sdk/lib/crt/except/except.cmake b/sdk/lib/crt/except/except.cmake index c135c2309e7..418bbcdeb9b 100644 --- a/sdk/lib/crt/except/except.cmake +++ b/sdk/lib/crt/except/except.cmake @@ -64,6 +64,8 @@ elseif(ARCH STREQUAL "amd64") list(APPEND CHKSTK_ASM_SOURCE except/amd64/chkstk_ms.s) elseif(ARCH STREQUAL "arm") list(APPEND CHKSTK_ASM_SOURCE except/arm/chkstk_asm.s) +elseif(ARCH STREQUAL "arm64") + list(APPEND CHKSTK_ASM_SOURCE except/arm64/chkstk_asm.s) endif() add_asm_files(chkstk_lib_asm ${CHKSTK_ASM_SOURCE}) diff --git a/sdk/lib/crt/math/arm64/atan2.s b/sdk/lib/crt/math/arm64/atan2.s new file mode 100644 index 00000000000..f5848fab3f9 --- /dev/null +++ b/sdk/lib/crt/math/arm64/atan2.s @@ -0,0 +1,16 @@ + +/* INCLUDES ******************************************************************/ + +/* We need one of these first! */ +/* #include <kxarm64.h> */ + +/* CODE **********************************************************************/ + + TEXTAREA + + LEAF_ENTRY atan2 + /* TODO: add an assert fail call, as this is unimplemented */ + LEAF_END atan2 + + END +/* EOF */ diff --git a/sdk/lib/crt/math/math.cmake b/sdk/lib/crt/math/math.cmake index a534fc8832e..fcf9e5eecdf 100644 --- a/sdk/lib/crt/math/math.cmake +++ b/sdk/lib/crt/math/math.cmake @@ -185,6 +185,8 @@ elseif(ARCH STREQUAL "amd64") list(APPEND ATAN2_ASM_SOURCE math/amd64/atan2.S) elseif(ARCH STREQUAL "arm") list(APPEND ATAN2_ASM_SOURCE math/arm/atan2.s) +elseif(ARCH STREQUAL "arm64") + list(APPEND ATAN2_ASM_SOURCE math/arm64/atan2.s) endif() add_asm_files(atan2_asm ${ATAN2_ASM_SOURCE}) diff --git a/sdk/tools/spec2def/spec2def.c b/sdk/tools/spec2def/spec2def.c index e5c452d0512..ee50fe01f35 100644 --- a/sdk/tools/spec2def/spec2def.c +++ b/sdk/tools/spec2def/spec2def.c @@ -57,6 +57,7 @@ enum _ARCH ARCH_AMD64, ARCH_IA64, ARCH_ARM, + ARCH_ARM64, ARCH_PPC }; @@ -449,7 +450,7 @@ OutputHeader_asmstub(FILE *file, char *libname) { fprintf(file, ".code\n"); } - else if (giArch == ARCH_ARM) + else if (giArch == ARCH_ARM || giArch == ARCH_ARM64) { fprintf(file, " AREA |.text|,ALIGN=2,CODE,READONLY\n\n"); } @@ -458,7 +459,7 @@ OutputHeader_asmstub(FILE *file, char *libname) void Output_stublabel(FILE *fileDest, char* pszSymbolName) { - if (giArch == ARCH_ARM) + if (giArch == ARCH_ARM || giArch == ARCH_ARM64) { fprintf(fileDest, "\tEXPORT |%s| [FUNC]\n|%s|\n", @@ -1405,7 +1406,7 @@ void usage(void) " -n=<name> name of the dll\n" " --implib generate a def file for an import library\n" " --no-private-warnings suppress warnings about symbols that should be -private\n" - " -a=<arch> set architecture to <arch> (i386, x86_64, arm)\n" + " -a=<arch> set architecture to <arch> (i386, x86_64, arm, arm64)\n" " --with-tracing generate wine-like \"+relay\" trace trampolines (needs -s)\n"); } @@ -1494,6 +1495,7 @@ int main(int argc, char *argv[]) else if (strcasecmp(pszArchString, "x86_64") == 0) giArch = ARCH_AMD64; else if (strcasecmp(pszArchString, "ia64") == 0) giArch = ARCH_IA64; else if (strcasecmp(pszArchString, "arm") == 0) giArch = ARCH_ARM; + else if (strcasecmp(pszArchString, "arm64") == 0) giArch = ARCH_ARM64; else if (strcasecmp(pszArchString, "ppc") == 0) giArch = ARCH_PPC; if ((giArch == ARCH_AMD64) || (giArch == ARCH_IA64))

1 0

[reactos] 01/01: [GITHUB] build.yml: Update LLVM version to 13 (#4054)
by Serge Gautherie 22 Oct '21

22 Oct '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=4b0249e98a7d5893f4570… commit 4b0249e98a7d5893f4570f48dea9ce24bc12cf02 Author: Serge Gautherie <32623169+SergeGautherie(a)users.noreply.github.com> AuthorDate: Fri Oct 22 17:17:06 2021 +0200 Commit: GitHub <noreply(a)github.com> CommitDate: Fri Oct 22 18:17:06 2021 +0300 [GITHUB] build.yml: Update LLVM version to 13 (#4054) --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 2ccb6da912a..54fd58b7893 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -34,7 +34,7 @@ jobs: - name: Install LLVM if: ${{ matrix.compiler == 'clang' }} run: | - export LLVM_VERSION=12 + export LLVM_VERSION=13 wget https://apt.llvm.org/llvm.sh chmod +x llvm.sh sudo ./llvm.sh $LLVM_VERSION

1 0

[reactos] 01/01: [ADVAPI32] Fix several corner cases in RegOpenKey* functions
by Eric Kohl 21 Oct '21

21 Oct '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=1ade494a70757b32202f1… commit 1ade494a70757b32202f13b50c86160fd3b56280 Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Thu Oct 21 14:45:56 2021 +0200 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Thu Oct 21 14:45:56 2021 +0200 [ADVAPI32] Fix several corner cases in RegOpenKey* functions This fixes the remaining RegOpenKey* tests. --- dll/win32/advapi32/reg/reg.c | 30 +++++++++++++++++------------- 1 file changed, 17 insertions(+), 13 deletions(-) diff --git a/dll/win32/advapi32/reg/reg.c b/dll/win32/advapi32/reg/reg.c index 3d739fb9d4f..9beecc99d2c 100644 --- a/dll/win32/advapi32/reg/reg.c +++ b/dll/win32/advapi32/reg/reg.c @@ -3264,12 +3264,7 @@ RegOpenKeyA(HKEY hKey, if (!phkResult) return ERROR_INVALID_PARAMETER; - if (!hKey && lpSubKey && phkResult) - { - return ERROR_INVALID_HANDLE; - } - - if (!lpSubKey || !*lpSubKey) + if (!hKey && !lpSubKey) { *phkResult = hKey; return ERROR_SUCCESS; @@ -3303,12 +3298,7 @@ RegOpenKeyW(HKEY hKey, if (!phkResult) return ERROR_INVALID_PARAMETER; - if (!hKey && lpSubKey && phkResult) - { - return ERROR_INVALID_HANDLE; - } - - if (!lpSubKey || !*lpSubKey) + if (!hKey && !lpSubKey) { *phkResult = hKey; return ERROR_SUCCESS; @@ -3383,6 +3373,17 @@ RegOpenKeyExW(HKEY hKey, return ERROR_INVALID_PARAMETER; } + if (!hKey && lpSubKey && phkResult) + { + return ERROR_INVALID_HANDLE; + } + + if (IsPredefKey(hKey) && (!lpSubKey || !*lpSubKey)) + { + *phkResult = hKey; + return ERROR_SUCCESS; + } + Status = MapDefaultKey(&KeyHandle, hKey); if (!NT_SUCCESS(Status)) { @@ -3399,7 +3400,10 @@ RegOpenKeyExW(HKEY hKey, if (ulOptions & REG_OPTION_OPEN_LINK) Attributes |= OBJ_OPENLINK; - RtlInitUnicodeString(&SubKeyString, lpSubKey ? lpSubKey : L""); + if (lpSubKey == NULL || wcscmp(lpSubKey, L"\\") == 0) + RtlInitUnicodeString(&SubKeyString, L""); + else + RtlInitUnicodeString(&SubKeyString, lpSubKey); InitializeObjectAttributes(&ObjectAttributes, &SubKeyString,

1 0

[reactos] 01/01: [IMM32] Rewrite ImmInstallIMEW (#4044)
by Katayama Hirofumi MZ 21 Oct '21

21 Oct '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=a37d9a4e14115b850e00f… commit a37d9a4e14115b850e00f67889ee9ee7c4be7766 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Thu Oct 21 10:28:04 2021 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Thu Oct 21 10:28:04 2021 +0900 [IMM32] Rewrite ImmInstallIMEW (#4044) - Add Imm32StrToUInt and Imm32UIntToStr helper functions. - Add Imm32LoadImeVerInfo, Imm32GetRegImes, Imm32WriteRegIme, Imm32GetNextHKL, Imm32CopyFile helper functions. - Add REG_IME structure for registered IMEs. - Rewrite ImmInstallIMEW function. - Improve ImmLoadLayout and Imm32LoadImeInfo functions. CORE-11700 --- dll/win32/imm32/ime.c | 169 ++++++++++++++++-- dll/win32/imm32/imm.c | 143 ++++----------- dll/win32/imm32/precomp.h | 16 ++ dll/win32/imm32/utils.c | 436 ++++++++++++++++++++++++++++++++++++++++++++++ win32ss/include/ntuser.h | 2 +- 5 files changed, 642 insertions(+), 124 deletions(-) diff --git a/dll/win32/imm32/ime.c b/dll/win32/imm32/ime.c index 9ae6115fe49..cfe0b66754e 100644 --- a/dll/win32/imm32/ime.c +++ b/dll/win32/imm32/ime.c @@ -152,6 +152,7 @@ BOOL APIENTRY Imm32LoadImeInfo(PIMEINFOEX pImeInfoEx, PIMEDPI pImeDpi) WCHAR szPath[MAX_PATH]; HINSTANCE hIME; FARPROC fn; + BOOL ret = FALSE; if (!Imm32GetSystemLibraryPath(szPath, _countof(szPath), pImeInfoEx->wszImeFile)) return FALSE; @@ -172,27 +173,46 @@ BOOL APIENTRY Imm32LoadImeInfo(PIMEINFOEX pImeInfoEx, PIMEDPI pImeDpi) do { \ fn = GetProcAddress(hIME, #name); \ if (fn) pImeDpi->name = (FN_##name)fn; \ - else if (!(optional)) goto Failed; \ + else if (!(optional)) { \ + ERR("'%s' not found in the IME module '%s'.\n", #name, debugstr_w(szPath)); \ + goto Failed; \ + } \ } while (0); #include "imetable.h" #undef DEFINE_IME_ENTRY - if (!Imm32InquireIme(pImeDpi)) + if (Imm32InquireIme(pImeDpi)) + { + ret = TRUE; + } + else { - ERR("Imm32LoadImeInfo: Imm32InquireIme failed\n"); - goto Failed; + ERR("Imm32InquireIme failed\n"); +Failed: + ret = FALSE; + FreeLibrary(pImeDpi->hInst); + pImeDpi->hInst = NULL; } - if (pImeInfoEx->fLoadFlag) - return TRUE; + if (pImeInfoEx->fLoadFlag == 0) + { + if (ret) + { + C_ASSERT(sizeof(pImeInfoEx->wszUIClass) == sizeof(pImeDpi->szUIClass)); + pImeInfoEx->ImeInfo = pImeDpi->ImeInfo; + RtlCopyMemory(pImeInfoEx->wszUIClass, pImeDpi->szUIClass, + sizeof(pImeInfoEx->wszUIClass)); + pImeInfoEx->fLoadFlag = 2; + } + else + { + pImeInfoEx->fLoadFlag = 1; + } - NtUserSetImeOwnerWindow(pImeInfoEx, TRUE); - return TRUE; + NtUserSetImeInfoEx(pImeInfoEx); + } -Failed: - FreeLibrary(pImeDpi->hInst); - pImeDpi->hInst = NULL; - return FALSE; + return ret; } PIMEDPI APIENTRY Ime32LoadImeDpi(HKL hKL, BOOL bLock) @@ -475,6 +495,127 @@ Quit: return ret; } +/*********************************************************************** + * ImmInstallIMEA (IMM32.@) + */ +HKL WINAPI ImmInstallIMEA(LPCSTR lpszIMEFileName, LPCSTR lpszLayoutText) +{ + HKL hKL = NULL; + LPWSTR pszFileNameW = NULL, pszLayoutTextW = NULL; + + TRACE("(%s, %s)\n", debugstr_a(lpszIMEFileName), debugstr_a(lpszLayoutText)); + + pszFileNameW = Imm32WideFromAnsi(lpszIMEFileName); + if (!pszFileNameW) + goto Quit; + + pszLayoutTextW = Imm32WideFromAnsi(lpszLayoutText); + if (!pszLayoutTextW) + goto Quit; + + hKL = ImmInstallIMEW(pszFileNameW, pszLayoutTextW); + +Quit: + Imm32HeapFree(pszFileNameW); + Imm32HeapFree(pszLayoutTextW); + return hKL; +} + +/*********************************************************************** + * ImmInstallIMEW (IMM32.@) + */ +HKL WINAPI ImmInstallIMEW(LPCWSTR lpszIMEFileName, LPCWSTR lpszLayoutText) +{ + WCHAR szImeFileName[MAX_PATH], szImeDestPath[MAX_PATH], szImeKey[20]; + IMEINFOEX InfoEx; + LPWSTR pchFilePart; + UINT iLayout, cLayouts; + HKL hNewKL; + WORD wLangID; + PREG_IME pLayouts = NULL; + + TRACE("(%s, %s)\n", debugstr_w(lpszIMEFileName), debugstr_w(lpszLayoutText)); + + GetFullPathNameW(lpszIMEFileName, _countof(szImeFileName), szImeFileName, &pchFilePart); + CharUpperW(szImeFileName); + if (!pchFilePart) + return NULL; + + /* Load the IME version info */ + InfoEx.hkl = hNewKL = NULL; + StringCchCopyW(InfoEx.wszImeFile, _countof(InfoEx.wszImeFile), pchFilePart); + if (Imm32LoadImeVerInfo(&InfoEx) && InfoEx.hkl) + wLangID = LOWORD(InfoEx.hkl); + else + return NULL; + + /* Get the IME layouts from registry */ + cLayouts = Imm32GetRegImes(NULL, 0); + if (cLayouts) + { + pLayouts = Imm32HeapAlloc(0, cLayouts * sizeof(REG_IME)); + if (!pLayouts || !Imm32GetRegImes(pLayouts, cLayouts)) + { + Imm32HeapFree(pLayouts); + return NULL; + } + + for (iLayout = 0; iLayout < cLayouts; ++iLayout) + { + if (lstrcmpiW(pLayouts[iLayout].szFileName, pchFilePart) == 0) + { + if (wLangID != LOWORD(pLayouts[iLayout].hKL)) + goto Quit; /* The language is different */ + + hNewKL = pLayouts[iLayout].hKL; /* Found */ + break; + } + } + } + + /* If the IME for the specified filename is valid, then unload it now */ + /* FIXME: ImmGetImeInfoEx is broken */ + if (ImmGetImeInfoEx(&InfoEx, 3, pchFilePart) && + !UnloadKeyboardLayout(InfoEx.hkl)) + { + hNewKL = NULL; + goto Quit; + } + + Imm32GetSystemLibraryPath(szImeDestPath, _countof(szImeDestPath), pchFilePart); + CharUpperW(szImeDestPath); + + /* If the source and the destination pathnames were different, then copy the IME file */ + if (lstrcmpiW(szImeFileName, szImeDestPath) != 0 && + !Imm32CopyFile(szImeFileName, szImeDestPath)) + { + hNewKL = NULL; + goto Quit; + } + + if (hNewKL == NULL) + hNewKL = Imm32GetNextHKL(cLayouts, pLayouts, wLangID); + + if (hNewKL) + { + /* Write the IME layout to registry */ + if (Imm32WriteRegIme(hNewKL, pchFilePart, lpszLayoutText)) + { + /* Load the keyboard layout */ + Imm32UIntToStr((DWORD)(DWORD_PTR)hNewKL, 16, szImeKey, _countof(szImeKey)); + hNewKL = LoadKeyboardLayoutW(szImeKey, KLF_REPLACELANG); + } + else + { + hNewKL = NULL; + } + } + +Quit: + Imm32HeapFree(pLayouts); + return hNewKL; +} + /*********************************************************************** * ImmIsIME (IMM32.@) */ @@ -482,7 +623,8 @@ BOOL WINAPI ImmIsIME(HKL hKL) { IMEINFOEX info; TRACE("(%p)\n", hKL); - return !!ImmGetImeInfoEx(&info, ImeInfoExImeWindow, &hKL); + /* FIXME: ImmGetImeInfoEx is broken */ + return !!ImmGetImeInfoEx(&info, 1, &hKL); } /*********************************************************************** @@ -542,6 +684,7 @@ ImmGetImeInfoEx(PIMEINFOEX pImeInfoEx, IMEINFOEXCLASS SearchType, PVOID pvSearch BOOL bDisabled = FALSE; HKL hKL; + /* FIXME: broken */ switch (SearchType) { case ImeInfoExKeyboardLayout: diff --git a/dll/win32/imm32/imm.c b/dll/win32/imm32/imm.c index f4fa021b619..c21c5a23567 100644 --- a/dll/win32/imm32/imm.c +++ b/dll/win32/imm32/imm.c @@ -51,54 +51,64 @@ BOOL WINAPI ImmRegisterClient(PSHAREDINFO ptr, HINSTANCE hMod) /*********************************************************************** * ImmLoadLayout (IMM32.@) */ -HKL WINAPI ImmLoadLayout(HKL hKL, PIMEINFOEX pImeInfoEx) +BOOL WINAPI ImmLoadLayout(HKL hKL, PIMEINFOEX pImeInfoEx) { DWORD cbData; - UNICODE_STRING UnicodeString; HKEY hLayoutKey = NULL, hLayoutsKey = NULL; LONG error; - NTSTATUS Status; WCHAR szLayout[MAX_PATH]; TRACE("(%p, %p)\n", hKL, pImeInfoEx); if (IS_IME_HKL(hKL) || !Imm32IsCiceroMode() || Imm32Is16BitMode()) { - UnicodeString.Buffer = szLayout; - UnicodeString.MaximumLength = sizeof(szLayout); - Status = RtlIntegerToUnicodeString((DWORD_PTR)hKL, 16, &UnicodeString); - if (!NT_SUCCESS(Status)) - return NULL; + Imm32UIntToStr((DWORD)(DWORD_PTR)hKL, 16, szLayout, _countof(szLayout)); error = RegOpenKeyW(HKEY_LOCAL_MACHINE, REGKEY_KEYBOARD_LAYOUTS, &hLayoutsKey); if (error) - return NULL; + { + ERR("RegOpenKeyW: 0x%08lX\n", error); + return FALSE; + } error = RegOpenKeyW(hLayoutsKey, szLayout, &hLayoutKey); + if (error) + { + ERR("RegOpenKeyW: 0x%08lX\n", error); + RegCloseKey(hLayoutsKey); + return FALSE; + } } else { error = RegOpenKeyW(HKEY_LOCAL_MACHINE, REGKEY_IMM, &hLayoutKey); - } - - if (error) - { - ERR("RegOpenKeyW error: 0x%08lX\n", error); - hKL = NULL; - } - else - { - cbData = sizeof(pImeInfoEx->wszImeFile); - error = RegQueryValueExW(hLayoutKey, L"Ime File", 0, 0, - (LPBYTE)pImeInfoEx->wszImeFile, &cbData); if (error) - hKL = NULL; + { + ERR("RegOpenKeyW: 0x%08lX\n", error); + return FALSE; + } } + cbData = sizeof(pImeInfoEx->wszImeFile); + error = RegQueryValueExW(hLayoutKey, L"Ime File", 0, 0, + (LPBYTE)pImeInfoEx->wszImeFile, &cbData); + pImeInfoEx->wszImeFile[_countof(pImeInfoEx->wszImeFile) - 1] = 0; + RegCloseKey(hLayoutKey); if (hLayoutsKey) RegCloseKey(hLayoutsKey); - return hKL; + + pImeInfoEx->fLoadFlag = 0; + + if (error) + { + ERR("RegQueryValueExW: 0x%08lX\n", error); + pImeInfoEx->hkl = NULL; + return FALSE; + } + + pImeInfoEx->hkl = hKL; + return Imm32LoadImeVerInfo(pImeInfoEx); } /*********************************************************************** @@ -476,10 +486,6 @@ BOOL WINAPI ImmActivateLayout(HKL hKL) return TRUE; } -static const WCHAR szImeFileW[] = {'I','m','e',' ','F','i','l','e',0}; -static const WCHAR szLayoutTextW[] = {'L','a','y','o','u','t',' ','T','e','x','t',0}; -static const WCHAR szImeRegFmt[] = {'S','y','s','t','e','m','\\','C','u','r','r','e','n','t','C','o','n','t','r','o','l','S','e','t','\\','C','o','n','t','r','o','l','\\','K','e','y','b','o','a','r','d',' ','L','a','y','o','u','t','s','\\','%','0','8','l','x',0}; - static VOID APIENTRY Imm32CiceroSetActiveContext(HIMC hIMC, BOOL fActive, HWND hWnd, HKL hKL) { FIXME("We have to do something\n"); @@ -1015,89 +1021,6 @@ BOOL WINAPI CtfImmIsCiceroEnabled(VOID) return Imm32IsCiceroMode(); } -/*********************************************************************** - * ImmInstallIMEA (IMM32.@) - */ -HKL WINAPI ImmInstallIMEA(LPCSTR lpszIMEFileName, LPCSTR lpszLayoutText) -{ - HKL hKL = NULL; - LPWSTR pszFileNameW = NULL, pszLayoutTextW = NULL; - - TRACE("(%s, %s)\n", debugstr_a(lpszIMEFileName), debugstr_a(lpszLayoutText)); - - pszFileNameW = Imm32WideFromAnsi(lpszIMEFileName); - if (pszFileNameW == NULL) - goto Quit; - - pszLayoutTextW = Imm32WideFromAnsi(lpszLayoutText); - if (pszLayoutTextW == NULL) - goto Quit; - - hKL = ImmInstallIMEW(pszFileNameW, pszLayoutTextW); - -Quit: - Imm32HeapFree(pszFileNameW); - Imm32HeapFree(pszLayoutTextW); - return hKL; -} - -/*********************************************************************** - * ImmInstallIMEW (IMM32.@) - */ -HKL WINAPI ImmInstallIMEW(LPCWSTR lpszIMEFileName, LPCWSTR lpszLayoutText) -{ - INT lcid = GetUserDefaultLCID(); - INT count; - HKL hkl; - DWORD rc; - HKEY hkey; - WCHAR regKey[ARRAY_SIZE(szImeRegFmt)+8]; - - TRACE ("(%s, %s):\n", debugstr_w(lpszIMEFileName), - debugstr_w(lpszLayoutText)); - - /* Start with 2. e001 will be blank and so default to the wine internal IME */ - count = 2; - - while (count < 0xfff) - { - DWORD disposition = 0; - - hkl = (HKL)MAKELPARAM( lcid, 0xe000 | count ); - wsprintfW( regKey, szImeRegFmt, (ULONG_PTR)hkl); - - rc = RegCreateKeyExW(HKEY_LOCAL_MACHINE, regKey, 0, NULL, 0, KEY_WRITE, NULL, &hkey, &disposition); - if (rc == ERROR_SUCCESS && disposition == REG_CREATED_NEW_KEY) - break; - else if (rc == ERROR_SUCCESS) - RegCloseKey(hkey); - - count++; - } - - if (count == 0xfff) - { - WARN("Unable to find slot to install IME\n"); - return 0; - } - - if (rc == ERROR_SUCCESS) - { - rc = RegSetValueExW(hkey, szImeFileW, 0, REG_SZ, (const BYTE*)lpszIMEFileName, - (lstrlenW(lpszIMEFileName) + 1) * sizeof(WCHAR)); - if (rc == ERROR_SUCCESS) - rc = RegSetValueExW(hkey, szLayoutTextW, 0, REG_SZ, (const BYTE*)lpszLayoutText, - (lstrlenW(lpszLayoutText) + 1) * sizeof(WCHAR)); - RegCloseKey(hkey); - return hkl; - } - else - { - WARN("Unable to set IME registry values\n"); - return 0; - } -} - /*********************************************************************** * ImmLockIMC(IMM32.@) * diff --git a/dll/win32/imm32/precomp.h b/dll/win32/imm32/precomp.h index 584defc5501..285ab70b8d1 100644 --- a/dll/win32/imm32/precomp.h +++ b/dll/win32/imm32/precomp.h @@ -24,6 +24,7 @@ #include <winnls.h> #include <winreg.h> #include <winnls32.h> +#include <winver.h> #include <imm.h> #include <ddk/imm.h> @@ -61,6 +62,13 @@ #define ROUNDUP4(n) (((n) + 3) & ~3) /* DWORD alignment */ +typedef struct REG_IME +{ + HKL hKL; + WCHAR szImeKey[20]; /* "E0XXYYYY": "E0XX" is the device handle. "YYYY" is a LANGID. */ + WCHAR szFileName[80]; /* The IME module filename */ +} REG_IME, *PREG_IME; + extern HMODULE g_hImm32Inst; extern RTL_CRITICAL_SECTION g_csImeDpi; extern PIMEDPI g_pImeDpiList; @@ -139,3 +147,11 @@ DWORD APIENTRY Imm32ReconvertAnsiFromWide(LPRECONVERTSTRING pDest, const RECONVERTSTRING *pSrc, UINT uCodePage); DWORD APIENTRY Imm32ReconvertWideFromAnsi(LPRECONVERTSTRING pDest, const RECONVERTSTRING *pSrc, UINT uCodePage); + +HRESULT APIENTRY Imm32StrToUInt(LPCWSTR pszText, LPDWORD pdwValue, ULONG nBase); +HRESULT APIENTRY Imm32UIntToStr(DWORD dwValue, ULONG nBase, LPWSTR pszBuff, USHORT cchBuff); +BOOL APIENTRY Imm32LoadImeVerInfo(PIMEINFOEX pImeInfoEx); +UINT APIENTRY Imm32GetRegImes(PREG_IME pLayouts, UINT cLayouts); +BOOL APIENTRY Imm32WriteRegIme(HKL hKL, LPCWSTR pchFilePart, LPCWSTR pszLayout); +HKL APIENTRY Imm32GetNextHKL(UINT cKLs, const REG_IME *pLayouts, WORD wLangID); +BOOL APIENTRY Imm32CopyFile(LPWSTR pszOldFile, LPCWSTR pszNewFile); diff --git a/dll/win32/imm32/utils.c b/dll/win32/imm32/utils.c index abbe5717bc9..3cf198096a6 100644 --- a/dll/win32/imm32/utils.c +++ b/dll/win32/imm32/utils.c @@ -16,6 +16,48 @@ WINE_DEFAULT_DEBUG_CHANNEL(imm); HANDLE g_hImm32Heap = NULL; +HRESULT APIENTRY +Imm32StrToUInt(LPCWSTR pszText, LPDWORD pdwValue, ULONG nBase) +{ +#if 1 + NTSTATUS Status; + UNICODE_STRING UnicodeString; + RtlInitUnicodeString(&UnicodeString, pszText); + Status = RtlUnicodeStringToInteger(&UnicodeString, nBase, pdwValue); + if (!NT_SUCCESS(Status)) + return E_FAIL; + return S_OK; +#else + LPWSTR endptr; + *pdwValue = wcstoul(pszText, &endptr, nBase); + return (*endptr ? E_FAIL : S_OK); +#endif +} + +HRESULT APIENTRY +Imm32UIntToStr(DWORD dwValue, ULONG nBase, LPWSTR pszBuff, USHORT cchBuff) +{ +#if 1 + NTSTATUS Status; + UNICODE_STRING UnicodeString; + UnicodeString.Buffer = pszBuff; + UnicodeString.MaximumLength = cchBuff * sizeof(WCHAR); + Status = RtlIntegerToUnicodeString(dwValue, nBase, &UnicodeString); + if (!NT_SUCCESS(Status)) + return E_FAIL; + return S_OK; +#else + LPCWSTR pszFormat; + if (nBase == 16) + pszFormat = L"%lX"; + else if (nBase == 10) + pszFormat = L"%lu"; + else + return E_INVALIDARG; + return StringCchPrintfW(pszBuff, cchBuff, pszFormat, dwValue); +#endif +} + BOOL WINAPI Imm32IsImcAnsi(HIMC hIMC) { BOOL ret; @@ -484,6 +526,400 @@ Imm32ReconvertAnsiFromWide(LPRECONVERTSTRING pDest, const RECONVERTSTRING *pSrc, return cbDest; } +typedef BOOL (WINAPI *FN_GetFileVersionInfoW)(LPCWSTR, DWORD, DWORD, LPVOID); +typedef DWORD (WINAPI *FN_GetFileVersionInfoSizeW)(LPCWSTR, LPDWORD); +typedef BOOL (WINAPI *FN_VerQueryValueW)(LPCVOID, LPCWSTR, LPVOID*, PUINT); + +static FN_GetFileVersionInfoW s_fnGetFileVersionInfoW = NULL; +static FN_GetFileVersionInfoSizeW s_fnGetFileVersionInfoSizeW = NULL; +static FN_VerQueryValueW s_fnVerQueryValueW = NULL; + +static BOOL APIENTRY Imm32LoadImeFixedInfo(PIMEINFOEX pInfoEx, LPCVOID pVerInfo) +{ + UINT cbFixed = 0; + VS_FIXEDFILEINFO *pFixed; + if (!s_fnVerQueryValueW(pVerInfo, L"\\", (LPVOID*)&pFixed, &cbFixed) || !cbFixed) + return FALSE; + + /* NOTE: The IME module must contain a version info of input method driver. */ + if (pFixed->dwFileType != VFT_DRV || pFixed->dwFileSubtype != VFT2_DRV_INPUTMETHOD) + return FALSE; + + pInfoEx->dwProdVersion = pFixed->dwProductVersionMS; + pInfoEx->dwImeWinVersion = 0x40000; + return TRUE; +} + +static LPWSTR APIENTRY +Imm32GetVerInfoValue(LPCVOID pVerInfo, LPWSTR pszKey, DWORD cchKey, LPCWSTR pszName) +{ + size_t cchExtra; + LPWSTR pszValue; + UINT cbValue = 0; + + StringCchLengthW(pszKey, cchKey, &cchExtra); + + StringCchCatW(pszKey, cchKey, pszName); + s_fnVerQueryValueW(pVerInfo, pszKey, (LPVOID*)&pszValue, &cbValue); + pszKey[cchExtra] = 0; + + return (cbValue ? pszValue : NULL); +} + +BOOL APIENTRY Imm32LoadImeLangAndDesc(PIMEINFOEX pInfoEx, LPCVOID pVerInfo) +{ + BOOL ret; + WCHAR szKey[80]; + LPWSTR pszDesc; + LPWORD pw; + UINT cbData; + LANGID LangID; + + /* Getting the version info. See VerQueryValue */ + ret = s_fnVerQueryValueW(pVerInfo, L"\\VarFileInfo\\Translation", (LPVOID*)&pw, &cbData); + if (!ret || !cbData) + return FALSE; + + if (pInfoEx->hkl == NULL) + pInfoEx->hkl = (HKL)(DWORD_PTR)*pw; /* This is an invalid HKL */ + + /* Try the current language and the Unicode codepage (0x04B0) */ + LangID = LANGIDFROMLCID(GetThreadLocale()); + StringCchPrintfW(szKey, _countof(szKey), L"\\StringFileInfo\\%04X04B0\\", LangID); + pszDesc = Imm32GetVerInfoValue(pVerInfo, szKey, _countof(szKey), L"FileDescription"); + if (!pszDesc) + { + /* Retry the language and codepage of the IME module */ + StringCchPrintfW(szKey, _countof(szKey), L"\\StringFileInfo\\%04X%04X\\", pw[0], pw[1]); + pszDesc = Imm32GetVerInfoValue(pVerInfo, szKey, _countof(szKey), L"FileDescription"); + } + + /* The description */ + if (pszDesc) + StringCchCopyW(pInfoEx->wszImeDescription, _countof(pInfoEx->wszImeDescription), pszDesc); + else + pInfoEx->wszImeDescription[0] = 0; + + return TRUE; +} + +BOOL APIENTRY Imm32LoadImeVerInfo(PIMEINFOEX pImeInfoEx) +{ + HINSTANCE hinstVersion; + BOOL ret = FALSE, bLoaded = FALSE; + WCHAR szPath[MAX_PATH]; + LPVOID pVerInfo; + DWORD cbVerInfo, dwHandle; + + /* Load version.dll to use the version info API */ + Imm32GetSystemLibraryPath(szPath, _countof(szPath), L"version.dll"); + hinstVersion = GetModuleHandleW(szPath); + if (!hinstVersion) + { + hinstVersion = LoadLibraryW(szPath); + if (!hinstVersion) + return FALSE; + bLoaded = TRUE; + } + +#define GET_FN(name) do { \ + s_fn##name = (FN_##name)GetProcAddress(hinstVersion, #name); \ + if (!s_fn##name) goto Quit; \ +} while (0) + GET_FN(GetFileVersionInfoW); + GET_FN(GetFileVersionInfoSizeW); + GET_FN(VerQueryValueW); +#undef GET_FN + + /* The path of the IME module */ + Imm32GetSystemLibraryPath(szPath, _countof(szPath), pImeInfoEx->wszImeFile); + + cbVerInfo = s_fnGetFileVersionInfoSizeW(szPath, &dwHandle); + if (!cbVerInfo) + goto Quit; + + pVerInfo = Imm32HeapAlloc(0, cbVerInfo); + if (!pVerInfo) + goto Quit; + + /* Load the version info of the IME module */ + if (s_fnGetFileVersionInfoW(szPath, dwHandle, cbVerInfo, pVerInfo) && + Imm32LoadImeFixedInfo(pImeInfoEx, pVerInfo)) + { + ret = Imm32LoadImeLangAndDesc(pImeInfoEx, pVerInfo); + } + + Imm32HeapFree(pVerInfo); + +Quit: + if (bLoaded) + FreeLibrary(hinstVersion); + return ret; +} + +HKL APIENTRY Imm32GetNextHKL(UINT cKLs, const REG_IME *pLayouts, WORD wLangID) +{ + UINT iKL, wID, wLow = 0xE0FF, wHigh = 0xE01F, wNextID = 0; + + for (iKL = 0; iKL < cKLs; ++iKL) + { + wHigh = max(wHigh, HIWORD(pLayouts[iKL].hKL)); + wLow = min(wLow, HIWORD(pLayouts[iKL].hKL)); + } + + if (wHigh < 0xE0FF) + { + wNextID = wHigh + 1; + } + else if (wLow > 0xE001) + { + wNextID = wLow - 1; + } + else + { + for (wID = 0xE020; wID <= 0xE0FF; ++wID) + { + for (iKL = 0; iKL < cKLs; ++iKL) + { + if (LOWORD(pLayouts[iKL].hKL) == wLangID && + HIWORD(pLayouts[iKL].hKL) == wID) + { + break; + } + } + + if (iKL >= cKLs) + break; + } + + if (wID <= 0xE0FF) + wNextID = wID; + } + + if (!wNextID) + return NULL; + + return (HKL)(DWORD_PTR)MAKELONG(wLangID, wNextID); +} + +UINT APIENTRY Imm32GetRegImes(PREG_IME pLayouts, UINT cLayouts) +{ + HKEY hkeyLayouts, hkeyIME; + WCHAR szImeFileName[80], szImeKey[20]; + UINT iKey, nCount; + DWORD cbData; + LONG lError; + ULONG Value; + HKL hKL; + + /* Open the registry keyboard layouts */ + lError = RegOpenKeyW(HKEY_LOCAL_MACHINE, REGKEY_KEYBOARD_LAYOUTS, &hkeyLayouts); + if (lError != ERROR_SUCCESS) + return 0; + + for (iKey = nCount = 0; ; ++iKey) + { + /* Get the key name */ + lError = RegEnumKeyW(hkeyLayouts, iKey, szImeKey, _countof(szImeKey)); + if (lError != ERROR_SUCCESS) + break; + + if (szImeKey[0] != L'E' && szImeKey[0] != L'e') + continue; /* Not an IME layout */ + + if (pLayouts == NULL) /* for counting only */ + { + ++nCount; + continue; + } + + if (cLayouts <= nCount) + break; + + lError = RegOpenKeyW(hkeyLayouts, szImeKey, &hkeyIME); /* Open the IME key */ + if (lError != ERROR_SUCCESS) + break; + + /* Load the "Ime File" value */ + szImeFileName[0] = 0; + cbData = sizeof(szImeFileName); + RegQueryValueExW(hkeyIME, L"Ime File", NULL, NULL, (LPBYTE)szImeFileName, &cbData); + szImeFileName[_countof(szImeFileName) - 1] = 0; + + RegCloseKey(hkeyIME); + + if (!szImeFileName[0]) + break; + + Imm32StrToUInt(szImeKey, &Value, 16); + hKL = (HKL)(DWORD_PTR)Value; + if (!IS_IME_HKL(hKL)) + break; + + /* Store the IME key and the IME filename */ + pLayouts[nCount].hKL = hKL; + StringCchCopyW(pLayouts[nCount].szImeKey, _countof(pLayouts[nCount].szImeKey), szImeKey); + CharUpperW(szImeFileName); + StringCchCopyW(pLayouts[nCount].szFileName, _countof(pLayouts[nCount].szFileName), + szImeFileName); + ++nCount; + } + + RegCloseKey(hkeyLayouts); + return nCount; +} + +BOOL APIENTRY Imm32WriteRegIme(HKL hKL, LPCWSTR pchFilePart, LPCWSTR pszLayout) +{ + UINT iPreload; + HKEY hkeyLayouts, hkeyIME, hkeyPreload; + WCHAR szImeKey[20], szPreloadNumber[20], szPreloadKey[20], szImeFileName[80]; + DWORD cbData; + LANGID LangID; + LONG lError; + LPCWSTR pszLayoutFile; + + /* Open the registry keyboard layouts */ + lError = RegOpenKeyW(HKEY_LOCAL_MACHINE, REGKEY_KEYBOARD_LAYOUTS, &hkeyLayouts); + if (lError != ERROR_SUCCESS) + return FALSE; + + /* Get the IME key from hKL */ + Imm32UIntToStr((DWORD)(DWORD_PTR)hKL, 16, szImeKey, _countof(szImeKey)); + + /* Create a registry IME key */ + lError = RegCreateKeyW(hkeyLayouts, szImeKey, &hkeyIME); + if (lError != ERROR_SUCCESS) + goto Failure; + + /* Write "Ime File" */ + cbData = (wcslen(pchFilePart) + 1) * sizeof(WCHAR); + lError = RegSetValueExW(hkeyIME, L"Ime File", 0, REG_SZ, (LPBYTE)pchFilePart, cbData); + if (lError != ERROR_SUCCESS) + goto Failure; + + /* Write "Layout Text" */ + cbData = (wcslen(pszLayout) + 1) * sizeof(WCHAR); + lError = RegSetValueExW(hkeyIME, L"Layout Text", 0, REG_SZ, (LPBYTE)pszLayout, cbData); + if (lError != ERROR_SUCCESS) + goto Failure; + + /* Choose "Layout File" from hKL */ + LangID = LOWORD(hKL); + switch (LOBYTE(LangID)) + { + case LANG_JAPANESE: pszLayoutFile = L"kbdjpn.dll"; break; + case LANG_KOREAN: pszLayoutFile = L"kbdkor.dll"; break; + default: pszLayoutFile = L"kbdus.dll"; break; + } + StringCchCopyW(szImeFileName, _countof(szImeFileName), pszLayoutFile); + + /* Write "Layout File" */ + cbData = (wcslen(szImeFileName) + 1) * sizeof(WCHAR); + lError = RegSetValueExW(hkeyIME, L"Layout File", 0, REG_SZ, (LPBYTE)szImeFileName, cbData); + if (lError != ERROR_SUCCESS) + goto Failure; + + RegCloseKey(hkeyIME); + RegCloseKey(hkeyLayouts); + + /* Create "Preload" key */ + RegCreateKeyW(HKEY_CURRENT_USER, L"Keyboard Layout\\Preload", &hkeyPreload); + +#define MAX_PRELOAD 0x400 + for (iPreload = 1; iPreload < MAX_PRELOAD; ++iPreload) + { + Imm32UIntToStr(iPreload, 10, szPreloadNumber, _countof(szPreloadNumber)); + + /* Load the key of the preload number */ + cbData = sizeof(szPreloadKey); + lError = RegQueryValueExW(hkeyPreload, szPreloadNumber, NULL, NULL, + (LPBYTE)szPreloadKey, &cbData); + szPreloadKey[_countof(szPreloadKey) - 1] = 0; + + if (lError != ERROR_SUCCESS || lstrcmpiW(szImeKey, szPreloadKey) == 0) + break; /* Found an empty room or the same key */ + } + + if (iPreload >= MAX_PRELOAD) /* Not found */ + { + RegCloseKey(hkeyPreload); + return FALSE; + } +#undef MAX_PRELOAD + + /* Write the IME key to the preload number */ + cbData = (wcslen(szImeKey) + 1) * sizeof(WCHAR); + lError = RegSetValueExW(hkeyPreload, szPreloadNumber, 0, REG_SZ, (LPBYTE)szImeKey, cbData); + RegCloseKey(hkeyPreload); + return lError == ERROR_SUCCESS; + +Failure: + RegCloseKey(hkeyIME); + RegDeleteKeyW(hkeyLayouts, szImeKey); + RegCloseKey(hkeyLayouts); + return FALSE; +} + +typedef INT (WINAPI *FN_LZOpenFileW)(LPWSTR, LPOFSTRUCT, WORD); +typedef LONG (WINAPI *FN_LZCopy)(INT, INT); +typedef VOID (WINAPI *FN_LZClose)(INT); + +BOOL APIENTRY Imm32CopyFile(LPWSTR pszOldFile, LPCWSTR pszNewFile) +{ + BOOL ret = FALSE, bLoaded = FALSE; + HMODULE hinstLZ32; + WCHAR szLZ32Path[MAX_PATH]; + CHAR szDestA[MAX_PATH]; + OFSTRUCT OFStruct; + FN_LZOpenFileW fnLZOpenFileW; + FN_LZCopy fnLZCopy; + FN_LZClose fnLZClose; + HFILE hfDest, hfSrc; + + /* Load LZ32.dll for copying/decompressing file */ + Imm32GetSystemLibraryPath(szLZ32Path, _countof(szLZ32Path), L"LZ32"); + hinstLZ32 = GetModuleHandleW(szLZ32Path); + if (!hinstLZ32) + { + hinstLZ32 = LoadLibraryW(szLZ32Path); + if (!hinstLZ32) + return FALSE; + bLoaded = TRUE; + } + +#define GET_FN(name) do { \ + fn##name = (FN_##name)GetProcAddress(hinstLZ32, #name); \ + if (!fn##name) goto Quit; \ +} while (0) + GET_FN(LZOpenFileW); + GET_FN(LZCopy); + GET_FN(LZClose); +#undef GET_FN + + if (!WideCharToMultiByte(CP_ACP, 0, pszNewFile, -1, szDestA, _countof(szDestA), NULL, NULL)) + goto Quit; + szDestA[_countof(szDestA) - 1] = 0; + + hfSrc = fnLZOpenFileW(pszOldFile, &OFStruct, OF_READ); + if (hfSrc < 0) + goto Quit; + + hfDest = OpenFile(szDestA, &OFStruct, OF_CREATE); + if (hfDest != HFILE_ERROR) + { + ret = (fnLZCopy(hfSrc, hfDest) >= 0); + _lclose(hfDest); + } + + fnLZClose(hfSrc); + +Quit: + if (bLoaded) + FreeLibrary(hinstLZ32); + return ret; +} + /*********************************************************************** * CtfImmIsTextFrameServiceDisabled(IMM32.@) */ diff --git a/win32ss/include/ntuser.h b/win32ss/include/ntuser.h index eb5fb285a79..38076513db2 100644 --- a/win32ss/include/ntuser.h +++ b/win32ss/include/ntuser.h @@ -1183,7 +1183,7 @@ typedef struct tagIMEINFOEX }; } IMEINFOEX, *PIMEINFOEX; -typedef enum IMEINFOEXCLASS +typedef enum IMEINFOEXCLASS /* unconfirmed: buggy */ { ImeInfoExKeyboardLayout, ImeInfoExImeWindow,

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs