[fireball] 29416: Dmitry Chapyshev <lentind@yandex.ru> - Add some more dialogs to input.dll, and even some functionality, but it still needs a lot of work. - Add input.dll and systeminfo.exe to the bootcd
6 Oct
2007
6 Oct
'07
11:47 a.m.
Author: fireball
Date: Sat Oct 6 15:47:06 2007
New Revision: 29416
URL: http://svn.reactos.org/svn/reactos?rev=29416&view=rev
Log:
Dmitry Chapyshev <lentind(a)yandex.ru>
- Add some more dialogs to input.dll, and even some functionality, but it still needs a
lot of work.
- Add input.dll and systeminfo.exe to the bootcd
Added:
trunk/reactos/dll/cpl/input/misc.c (with props)
Modified:
trunk/reactos/boot/bootdata/packages/reactos.dff
trunk/reactos/dll/cpl/input/add.c
trunk/reactos/dll/cpl/input/advanced.c
trunk/reactos/dll/cpl/input/changekeyseq.c
trunk/reactos/dll/cpl/input/input.c
trunk/reactos/dll/cpl/input/input.h
trunk/reactos/dll/cpl/input/input.rbuild
trunk/reactos/dll/cpl/input/input.rc
trunk/reactos/dll/cpl/input/inputlangprop.c
trunk/reactos/dll/cpl/input/keysettings.c
trunk/reactos/dll/cpl/input/lang/de-DE.rc
trunk/reactos/dll/cpl/input/lang/en-US.rc
trunk/reactos/dll/cpl/input/lang/fr-FR.rc
trunk/reactos/dll/cpl/input/lang/uk-UA.rc
trunk/reactos/dll/cpl/input/langbar.c
trunk/reactos/dll/cpl/input/resource.h
trunk/reactos/dll/cpl/input/settings.c
Modified: trunk/reactos/boot/bootdata/packages/reactos.dff
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/packages/rea…
==============================================================================
--- trunk/reactos/boot/bootdata/packages/reactos.dff (original)
+++ trunk/reactos/boot/bootdata/packages/reactos.dff Sat Oct 6 15:47:06 2007
@@ -113,6 +113,7 @@
dll\cpl\powercfg\powercfg.cpl 1
dll\cpl\sysdm\sysdm.cpl 1
dll\cpl\timedate\timedate.cpl 1
+dll\cpl\input\input.dll 1
dll\directx\dinput\dinput.dll 1
dll\directx\dinput8\dinput8.dll 1
@@ -482,6 +483,7 @@
modules\rosapps\roshttpd\roshttpd.exe 1 optional
modules\rosapps\screenshot\screenshot.exe 1 optional
modules\rosapps\sysutils\chkdsk\chkdsk.exe 1 optional
+modules\rosapps\sysutils\systeminfo\systeminfo.exe 1 optional
modules\rosapps\sysutils\chklib\chklib.exe 1 optional
modules\rosapps\sysutils\ctm\ctm.exe 1 optional
modules\rosapps\sysutils\kill\kill.exe 1 optional
Modified: trunk/reactos/dll/cpl/input/add.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/input/add.c?rev=29…
==============================================================================
--- trunk/reactos/dll/cpl/input/add.c (original)
+++ trunk/reactos/dll/cpl/input/add.c Sat Oct 6 15:47:06 2007
@@ -18,10 +18,10 @@
*/
/*
*
- * PROJECT: input.dll
- * FILE: dll/win32/input/add.c
- * PURPOSE: input.dll
- * PROGRAMMER: Dmitry Chapyshev (lentind(a)yandex.ru)
+ * PROJECT: input.dll
+ * FILE: dll/win32/input/add.c
+ * PURPOSE: input.dll
+ * PROGRAMMER: Dmitry Chapyshev (lentind(a)yandex.ru)
* UPDATE HISTORY:
* 06-09-2007 Created
*/
@@ -39,6 +39,93 @@
#include "resource.h"
#include "input.h"
+HWND hLanguageList;
+
+/*struct LangAndLayout
+{
+ TCHAR Lang;
+ TCHAR Layout;
+ TCHAR SubLayout;
+} VarLang[133];
+
+char *SubLang[133] = {}
+
+VOID CreateLangStruct(VOID)
+{
+ UINT Count;
+ TCHAR Layout[256];
+
+ for(Count = 0; Count < END_LAYOUT - BEGIN_LAYOUT; Count++)
+ {
+ LoadString(hApplet,
+ Count,
+ Layout,
+ sizeof(Layout) / sizeof(TCHAR));
+ strcpy(VarLang[Count].Layout,Layout);
+ }
+}*/
+
+/* Language enumerate procedure */
+BOOL
+CALLBACK
+LanguagesEnumProc(LPTSTR lpLanguage)
+{
+ LCID Lcid;
+ TCHAR Lang[1024];
+ int Index;
+
+ Lcid = wcstoul(lpLanguage, NULL, 16);
+
+ GetLocaleInfo(Lcid, LOCALE_SLANGUAGE, Lang, sizeof(Lang));
+ Index = (int) SendMessage(hLanguageList,
+ CB_ADDSTRING,
+ 0,
+ (LPARAM)Lang);
+
+ SendMessage(hLanguageList,
+ CB_SETITEMDATA,
+ Index,
+ (LPARAM)Lcid);
+
+ return TRUE;
+}
+
+/* Enumerate all installed language identifiers */
+static
+VOID
+CreateLanguagesList(HWND hWnd)
+{
+ TCHAR LangSel[256];
+ hLanguageList = hWnd;
+ EnumSystemLocales(LanguagesEnumProc, LCID_INSTALLED);
+
+ LoadString(hApplet,
+ IDS_SELECTED_LANGUAGE,
+ LangSel,
+ sizeof(LangSel) / sizeof(TCHAR));
+
+ SendMessage(hLanguageList,
+ CB_SELECTSTRING,
+ (WPARAM) -1,
+ (LPARAM)LangSel);
+}
+
+static
+VOID
+SelectCurrentLayout(HWND hWnd)
+{
+ TCHAR Layout[256];
+
+ LoadString(hApplet,
+ IDS_SELECTED_LAYOUT,
+ Layout,
+ sizeof(Layout) / sizeof(TCHAR));
+ SendMessage(hWnd,
+ CB_SELECTSTRING,
+ (WPARAM) -1,
+ (LPARAM)Layout);
+}
+
INT_PTR CALLBACK
AddDlgProc(HWND hDlg,
UINT message,
@@ -51,15 +138,28 @@
{
case WM_INITDIALOG:
{
-
+ CreateLanguagesList(GetDlgItem(hDlg, IDC_INPUT_LANGUAGE_COMBO));
+ CreateKeyboardLayoutList(GetDlgItem(hDlg, IDC_KEYBOARD_LAYOUT_COMBO));
+ SelectCurrentLayout(GetDlgItem(hDlg, IDC_KEYBOARD_LAYOUT_COMBO));
}
case WM_COMMAND:
{
- if ((LOWORD(wParam) == IDOK) || (LOWORD(wParam) == IDCANCEL))
- {
- EndDialog(hDlg,LOWORD(wParam));
- return TRUE;
- }
+ switch (LOWORD(wParam))
+ {
+ case IDC_INPUT_LANGUAGE_COMBO:
+ if (HIWORD(wParam) == CBN_SELCHANGE)
+ {
+ SelectCurrentLayout(GetDlgItem(hDlg, IDC_KEYBOARD_LAYOUT_COMBO));
+ }
+ break;
+ case IDOK:
+
+ break;
+ case IDCANCEL:
+ EndDialog(hDlg,LOWORD(wParam));
+ return TRUE;
+ break;
+ }
}
break;
}
Modified: trunk/reactos/dll/cpl/input/advanced.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/input/advanced.c?r…
==============================================================================
--- trunk/reactos/dll/cpl/input/advanced.c (original)
+++ trunk/reactos/dll/cpl/input/advanced.c Sat Oct 6 15:47:06 2007
@@ -18,10 +18,10 @@
*/
/*
*
- * PROJECT: input.dll
- * FILE: dll/win32/input/advanced.c
- * PURPOSE: input.dll
- * PROGRAMMER: Dmitry Chapyshev (lentind(a)yandex.ru)
+ * PROJECT: input.dll
+ * FILE: dll/win32/input/advanced.c
+ * PURPOSE: input.dll
+ * PROGRAMMER: Dmitry Chapyshev (lentind(a)yandex.ru)
* UPDATE HISTORY:
* 06-09-2007 Created
*/
@@ -49,7 +49,17 @@
switch(uMsg)
{
case WM_INITDIALOG:
- break;
+
+ break;
+ case WM_COMMAND:
+ switch (LOWORD(wParam))
+ {
+ case IDC_SUPPORT_ADV_SERV_CHECKBOX:
+ case IDC_TURNOFF_ADV_TXTSERV_CHECKBOX:
+ PropSheet_Changed(GetParent(hwndDlg), hwndDlg);
+ break;
+ }
+ break;
}
return FALSE;
Modified: trunk/reactos/dll/cpl/input/changekeyseq.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/input/changekeyseq…
==============================================================================
--- trunk/reactos/dll/cpl/input/changekeyseq.c (original)
+++ trunk/reactos/dll/cpl/input/changekeyseq.c Sat Oct 6 15:47:06 2007
@@ -18,10 +18,10 @@
*/
/*
*
- * PROJECT: input.dll
- * FILE: dll/win32/input/changekeyseq.c
- * PURPOSE: input.dll
- * PROGRAMMER: Dmitry Chapyshev (lentind(a)yandex.ru)
+ * PROJECT: input.dll
+ * FILE: dll/win32/input/changekeyseq.c
+ * PURPOSE: input.dll
+ * PROGRAMMER: Dmitry Chapyshev (lentind(a)yandex.ru)
* UPDATE HISTORY:
* 06-09-2007 Created
*/
Modified: trunk/reactos/dll/cpl/input/input.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/input/input.c?rev=…
==============================================================================
--- trunk/reactos/dll/cpl/input/input.c (original)
+++ trunk/reactos/dll/cpl/input/input.c Sat Oct 6 15:47:06 2007
@@ -18,10 +18,10 @@
*/
/*
*
- * PROJECT: input.dll
- * FILE: dll/win32/input/input.c
- * PURPOSE: input.dll
- * PROGRAMMER: Dmitry Chapyshev (lentind(a)yandex.ru)
+ * PROJECT: input.dll
+ * FILE: dll/win32/input/input.c
+ * PURPOSE: input.dll
+ * PROGRAMMER: Dmitry Chapyshev (lentind(a)yandex.ru)
* UPDATE HISTORY:
* 06-09-2007 Created
*/
Modified: trunk/reactos/dll/cpl/input/input.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/input/input.h?rev=…
==============================================================================
--- trunk/reactos/dll/cpl/input/input.h (original)
+++ trunk/reactos/dll/cpl/input/input.h Sat Oct 6 15:47:06 2007
@@ -12,6 +12,9 @@
} APPLET, *PAPPLET;
extern HINSTANCE hApplet;
+
+#define BEGIN_LAYOUT 5000
+#define END_LAYOUT 5133
/* input.c */
VOID
@@ -45,6 +48,10 @@
INT_PTR CALLBACK
InputLangPropDlgProc(HWND hDlg,UINT message,WPARAM wParam,LPARAM lParam);
+/* misc.c */
+VOID
+CreateKeyboardLayoutList(HWND hWnd);
+
void ShowLastWin32Error(HWND hWndOwner);
#endif /* __CPL_INPUT_H */
Modified: trunk/reactos/dll/cpl/input/input.rbuild
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/input/input.rbuild…
==============================================================================
--- trunk/reactos/dll/cpl/input/input.rbuild (original)
+++ trunk/reactos/dll/cpl/input/input.rbuild Sat Oct 6 15:47:06 2007
@@ -1,6 +1,6 @@
<?xml version="1.0"?>
<!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
-<module name="input" type="win32dll" extension=".dll"
baseaddress="${BASEADDRESS_INPUT}" installbase="system32"
installname="input.dll">
+<module name="input" type="win32dll" extension=".cpl"
baseaddress="${BASEADDRESS_INPUT}" installbase="system32"
installname="input.cpl">
<importlibrary definition="input.def" />
<include base="input">.</include>
<define name="UNICODE" />
@@ -22,5 +22,6 @@
<file>add.c</file>
<file>changekeyseq.c</file>
<file>inputlangprop.c</file>
+ <file>misc.c</file>
<file>input.rc</file>
</module>
Modified: trunk/reactos/dll/cpl/input/input.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/input/input.rc?rev…
==============================================================================
--- trunk/reactos/dll/cpl/input/input.rc (original)
+++ trunk/reactos/dll/cpl/input/input.rc Sat Oct 6 15:47:06 2007
@@ -21,4 +21,6 @@
IDI_KEY_SHORT_ICO ICON "resources/keyboard-shortcuts.ico"
IDI_INFO_ICO ICON "resources/information.ico"
+LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
+
#include "rsrc.rc"
Modified: trunk/reactos/dll/cpl/input/inputlangprop.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/input/inputlangpro…
==============================================================================
--- trunk/reactos/dll/cpl/input/inputlangprop.c (original)
+++ trunk/reactos/dll/cpl/input/inputlangprop.c Sat Oct 6 15:47:06 2007
@@ -18,10 +18,10 @@
*/
/*
*
- * PROJECT: input.dll
- * FILE: dll/win32/input/inputlangprop.c
- * PURPOSE: input.dll
- * PROGRAMMER: Dmitry Chapyshev (lentind(a)yandex.ru)
+ * PROJECT: input.dll
+ * FILE: dll/win32/input/inputlangprop.c
+ * PURPOSE: input.dll
+ * PROGRAMMER: Dmitry Chapyshev (lentind(a)yandex.ru)
* UPDATE HISTORY:
* 06-09-2007 Created
*/
@@ -39,6 +39,18 @@
#include "resource.h"
#include "input.h"
+static
+VOID
+SelectKeyboardLayout(HWND hWnd)
+{
+ TCHAR Layout[256];
+
+ SendMessage(hWnd,
+ CB_SELECTSTRING,
+ (WPARAM) -1,
+ (LPARAM)Layout);
+}
+
INT_PTR CALLBACK
InputLangPropDlgProc(HWND hDlg,
UINT message,
@@ -51,7 +63,8 @@
{
case WM_INITDIALOG:
{
-
+ CreateKeyboardLayoutList(GetDlgItem(hDlg, IDC_KEYBOARD_LAYOUT_IME_COMBO));
+ SelectKeyboardLayout(GetDlgItem(hDlg, IDC_KEYBOARD_LAYOUT_IME_COMBO));
}
case WM_COMMAND:
{
Modified: trunk/reactos/dll/cpl/input/keysettings.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/input/keysettings.…
==============================================================================
--- trunk/reactos/dll/cpl/input/keysettings.c (original)
+++ trunk/reactos/dll/cpl/input/keysettings.c Sat Oct 6 15:47:06 2007
@@ -18,10 +18,10 @@
*/
/*
*
- * PROJECT: input.dll
- * FILE: dll/win32/input/keysettings.c
- * PURPOSE: input.dll
- * PROGRAMMER: Dmitry Chapyshev (lentind(a)yandex.ru)
+ * PROJECT: input.dll
+ * FILE: dll/win32/input/keysettings.c
+ * PURPOSE: input.dll
+ * PROGRAMMER: Dmitry Chapyshev (lentind(a)yandex.ru)
* UPDATE HISTORY:
* 06-09-2007 Created
*/
Modified: trunk/reactos/dll/cpl/input/lang/de-DE.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/input/lang/de-DE.r…
==============================================================================
--- trunk/reactos/dll/cpl/input/lang/de-DE.rc (original)
+++ trunk/reactos/dll/cpl/input/lang/de-DE.rc Sat Oct 6 15:47:06 2007
@@ -71,14 +71,14 @@
FONT 8, "MS Shell Dlg"
BEGIN
LTEXT "&Eingabesprache:", -1, 7, 7, 61, 10
- COMBOBOX IDC_INPUT_LANGUAGE_COMBO, 7, 17, 212, 60, CBS_DROPDOWNLIST | CBS_SORT |
WS_VSCROLL
+ COMBOBOX IDC_INPUT_LANGUAGE_COMBO, 7, 17, 212, 110, CBS_DROPDOWNLIST | CBS_SORT |
WS_VSCROLL
LTEXT "&Tastaturlayout/IME:", -1, 7, 36, 110, 10
- COMBOBOX IDC_KEYBOARD_LAYOUT_COMBO, 7, 47, 212, 60, CBS_DROPDOWNLIST | CBS_SORT |
WS_VSCROLL
+ COMBOBOX IDC_KEYBOARD_LAYOUT_COMBO, 7, 47, 212, 110, CBS_DROPDOWNLIST | CBS_SORT |
WS_VSCROLL
DEFPUSHBUTTON "OK", IDOK, 116, 68, 50, 14
PUSHBUTTON "Abbrechen", IDCANCEL, 169, 68, 50, 14
END
-IDD_CHANGE_KEY_SEQ DIALOG 5, 100, 269, 78
+IDD_CHANGE_KEY_SEQ2 DIALOG 5, 100, 269, 78
STYLE DS_SETFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_3DLOOK | DS_CONTEXTHELP |
WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION
CAPTION "Tastenkombination ändern"
FONT 8, "MS Shell Dlg"
@@ -110,8 +110,131 @@
PUSHBUTTON "Abbrechen", IDCANCEL, 169, 53, 52, 14
END
+IDD_ADD2 DIALOG 20, 20, 257, 176
+STYLE DS_SETFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_3DLOOK | DS_CONTEXTHELP |
WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION
+CAPTION "Add Input Language"
+FONT 8, "MS Shell Dlg"
+{
+ LTEXT "&Input language:", -1, 7, 7, 61, 10
+ COMBOBOX IDC_INPUT_LANG_COMBO, 7, 17, 105, 60, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL
+ AUTOCHECKBOX "&Keyboard layout/IME:", IDC_KEYBOARD_LO_CHECKBOX, 37, 36,
110, 10
+ COMBOBOX IDC_KEYBOARD_LO_COMBO, 49, 47, 200, 60, CBS_DROPDOWNLIST | CBS_SORT |
WS_VSCROLL
+ AUTOCHECKBOX "&Handwriting recognition:", IDC_HANDWRITING_REC_CHECKBOX,
37, 65, 110, 10
+ COMBOBOX IDC_HANDWRITING_REC_COMBO, 49, 76, 200, 60, CBS_DROPDOWNLIST | CBS_SORT |
WS_VSCROLL
+ AUTOCHECKBOX "&Speech:", IDC_SPEECH_CHECKBOX, 37, 94, 110, 10
+ COMBOBOX IDC_SPEECH_COMBO, 49, 105, 200, 60, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL
+ AUTOCHECKBOX "&More Text Services:", IDC_MORE_TEXT_SERV_CHECKBOX, 37, 123,
110, 10
+ COMBOBOX IDC_MORE_TEXT_SERV_COMBO, 49, 134, 200, 60, CBS_DROPDOWNLIST | CBS_SORT |
WS_VSCROLL
+ DEFPUSHBUTTON "OK", IDOK, 146, 155, 50, 14
+ PUSHBUTTON "Cancel", IDCANCEL, 199, 155, 50, 14
+}
+
+IDD_ADD3 DIALOG 20, 20, 257, 147
+STYLE DS_SETFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_3DLOOK | DS_CONTEXTHELP |
WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION
+CAPTION "Add Input Language"
+FONT 8, "MS Shell Dlg"
+{
+ LTEXT "&Input language:", -1, 7, 7, 61, 10
+ COMBOBOX IDC_INPUT_LANG_COMBO, 7, 17, 105, 60, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL
+ AUTOCHECKBOX "&Keyboard layout/IME:", IDC_KEYBOARD_LO_CHECKBOX, 37, 36,
110, 10
+ COMBOBOX IDC_KEYBOARD_LO_COMBO, 49, 47, 200, 60, CBS_DROPDOWNLIST | CBS_SORT |
WS_VSCROLL
+ AUTOCHECKBOX "&Handwriting recognition:", IDC_HANDWRITING_REC_CHECKBOX,
37, 65, 110, 10
+ COMBOBOX IDC_HANDWRITING_REC_COMBO, 49, 76, 200, 60, CBS_DROPDOWNLIST | CBS_SORT |
WS_VSCROLL
+ AUTOCHECKBOX "&Speech:", IDC_SPEECH_CHECKBOX, 37, 94, 110, 10
+ COMBOBOX IDC_SPEECH_COMBO, 49, 105, 200, 60, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL
+ DEFPUSHBUTTON "OK", IDOK, 146, 126, 50, 14
+ PUSHBUTTON "Cancel", IDCANCEL, 199, 126, 50, 14
+}
+
+IDD_CHANGE_KEY_SEQ DIALOG 5, 100, 285, 74
+STYLE DS_SETFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_3DLOOK | DS_CONTEXTHELP |
WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION
+CAPTION "Change Key Sequence"
+FONT 8, "MS Shell Dlg"
+{
+ GROUPBOX "", -1, 9, 5, 209, 60
+ AUTOCHECKBOX "&Switch input languages", IDC_SWITCH_INPUT_LANG_CHECKBOX,
15, 15, 90, 12
+ LTEXT "SHIFT", -1, 73, 37, 27, 12
+ CTEXT "+", -1, 62, 37, 8, 9
+ AUTORADIOBUTTON "&CTRL", IDC_INLANG_CTRL_RADIOBTN, 29, 31, 30, 11,
WS_GROUP
+ AUTORADIOBUTTON "Left &ALT", IDC_INLANG_LEFTALT_RADIOBTN, 29, 45, 40, 12,
NOT WS_TABSTOP
+ AUTOCHECKBOX "S&witch keyboard layouts", IDC_SWITCH_KEYBOARD_LO_CHECKBOX,
121, 15, 90, 12
+ LTEXT "SHIFT", -1, 179, 37, 27, 12
+ CTEXT "+", -1, 168, 37, 8, 9
+ AUTORADIOBUTTON "C&TRL", IDC_LAYOUT_CTRL_RADIOBTN, 135, 31, 30, 11,
WS_GROUP
+ AUTORADIOBUTTON "Left A<", IDC_LAYOUT_LEFTALT_RADIOBTN, 135, 45, 40, 12,
NOT WS_TABSTOP
+ DEFPUSHBUTTON "OK", IDOK, 227, 18, 50, 14
+ PUSHBUTTON "Cancel", IDCANCEL, 227, 44, 50, 14
+}
+
+IDD_CHANGE_KEY_SEQ3 DIALOG 5, 100, 249, 125
+STYLE DS_SETFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_3DLOOK | DS_CONTEXTHELP |
WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION
+CAPTION "Change Key Sequence"
+FONT 8, "MS Shell Dlg"
+{
+ GROUPBOX "", -1, 9, 5, 174, 110
+ AUTOCHECKBOX "&Switch input languages", IDC_SWITCH_INPUT_LANG_CHECKBOX,
15, 15, 90, 12
+ LTEXT "SHIFT", -1, 73, 37, 27, 12
+ CTEXT "+", -1, 62, 37, 8, 9
+ AUTORADIOBUTTON "&CTRL", IDC_INLANG_CTRL_RADIOBTN, 29, 31, 30, 11,
WS_GROUP
+ AUTORADIOBUTTON "Left &ALT", IDC_INLANG_LEFTALT_RADIOBTN, 29, 45, 40, 12,
NOT WS_TABSTOP
+ AUTOCHECKBOX "S&witch keyboard layouts", IDC_SWITCH_KEYBOARD_LO_CHECKBOX,
15, 65, 90, 12
+ LTEXT "SHIFT", -1, 73, 87, 27, 12
+ CTEXT "+", -1, 62, 87, 8, 9
+ CONTROL "", IDC_CKS_BUTTON, "BUTTON", BS_OWNERDRAW, 96, 77, 13, 33
+ AUTORADIOBUTTON "&Grave Accent ( ` )", IDC_GRAVE_ACCENT_RADIOBTN, 110, 87,
69, 10, WS_GROUP
+ AUTORADIOBUTTON "C&TRL", IDC_LAYOUT_CTRL_RADIOBTN, 29, 81, 30, 11, NOT
WS_TABSTOP
+ AUTORADIOBUTTON "Left A<", IDC_LAYOUT_LEFTALT_RADIOBTN, 29, 95, 40, 12,
NOT WS_TABSTOP
+ DEFPUSHBUTTON "OK", IDOK, 192, 25, 50, 14
+ PUSHBUTTON "Cancel", IDCANCEL, 192, 47, 50, 14
+}
+
+IDD_CHANGE_KEY_SEQ4 DIALOG 5, 100, 249, 125
+STYLE DS_SETFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_3DLOOK | DS_CONTEXTHELP |
WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION
+CAPTION "Change Key Sequence"
+FONT 8, "MS Shell Dlg"
+{
+ GROUPBOX "", -1, 9, 5, 174, 110
+ AUTOCHECKBOX "&Switch input languages", IDC_SWITCH_INPUT_LANG_CHECKBOX,
15, 15, 90, 12
+ LTEXT "SHIFT", -1, 73, 37, 27, 12
+ CTEXT "+", -1, 62, 37, 8, 9
+ CONTROL "", IDC_CKS_BUTTON, "BUTTON", BS_OWNERDRAW, 96, 27, 13, 33
+ AUTORADIOBUTTON "&Grave Accent ( ` )", IDC_GRAVE_ACCENT_RADIOBTN, 110, 37,
69, 10, WS_GROUP
+ AUTORADIOBUTTON "&CTRL", IDC_INLANG_CTRL_RADIOBTN, 29, 31, 30, 11, NOT
WS_TABSTOP
+ AUTORADIOBUTTON "Left &ALT", IDC_INLANG_LEFTALT_RADIOBTN, 29, 45, 40, 12,
NOT WS_TABSTOP
+ AUTOCHECKBOX "S&witch keyboard layouts", IDC_SWITCH_KEYBOARD_LO_CHECKBOX,
15, 65, 90, 12
+ LTEXT "SHIFT", -1, 73, 87, 27, 12
+ CTEXT "+", -1, 62, 87, 8, 9
+ AUTORADIOBUTTON "C&TRL", IDC_LAYOUT_CTRL_RADIOBTN, 29, 81, 30, 11,
WS_GROUP
+ AUTORADIOBUTTON "Left A<", IDC_LAYOUT_LEFTALT_RADIOBTN, 29, 95, 40, 12,
NOT WS_TABSTOP
+ DEFPUSHBUTTON "OK", IDOK, 192, 25, 50, 14
+ PUSHBUTTON "Cancel", IDCANCEL, 192, 47, 50, 14
+}
+
+IDD_CHANGE_KEY_SEQ5 DIALOG 5, 100, 269, 78
+STYLE DS_SETFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_3DLOOK | DS_CONTEXTHELP |
WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION
+CAPTION "Change Key Sequence"
+FONT 8, "MS Shell Dlg"
+{
+ LTEXT "", 1240, 16, 5, 250, 10
+ GROUPBOX "", -1, 12, 17, 184, 48
+ AUTOCHECKBOX "&Enable Key Sequence", 1249, 17, 17, 85, 8
+ CTEXT "SHIFT", -1, 68, 37, 27, 12
+ CTEXT "+", -1, 57, 37, 8, 9
+ CTEXT "+", -1, 98, 37, 8, 10
+ AUTORADIOBUTTON "&CTRL", -1, 24, 31, 30, 11, WS_GROUP
+ AUTORADIOBUTTON "Left &ALT", -1, 24, 45, 40, 12, NOT WS_TABSTOP
+ LTEXT "&Key:", -1, 110, 37, 14, 10
+ COMBOBOX 1236, 127, 34, 46, 48, CBS_DROPDOWNLIST | WS_VSCROLL
+ DEFPUSHBUTTON "OK", IDOK, 212, 25, 50, 14
+ PUSHBUTTON "Cancel", IDCANCEL, 212, 47, 50, 14
+}
+
STRINGTABLE
BEGIN
+ //Selected language on "Add Input language"
+ IDS_SELECTED_LANGUAGE "English (United States)"
+ //Selected keyboard layout on "Add Input language"
+ IDS_SELECTED_LAYOUT, "United States-Dvorak"
IDS_CPLSYSTEMNAME "Textdienste und Eingabesprachen"
IDS_CPLSYSTEMDESCRIPTION "Ändert die Einstellungen der Texteingabe einer
Sprache."
IDS_US_LAYOUT, "US"
Modified: trunk/reactos/dll/cpl/input/lang/en-US.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/input/lang/en-US.r…
==============================================================================
--- trunk/reactos/dll/cpl/input/lang/en-US.rc (original)
+++ trunk/reactos/dll/cpl/input/lang/en-US.rc Sat Oct 6 15:47:06 2007
@@ -71,14 +71,50 @@
FONT 8, "MS Shell Dlg"
BEGIN
LTEXT "&Input language:", -1, 7, 7, 61, 10
- COMBOBOX IDC_INPUT_LANGUAGE_COMBO, 7, 17, 212, 60, CBS_DROPDOWNLIST | CBS_SORT |
WS_VSCROLL
+ COMBOBOX IDC_INPUT_LANGUAGE_COMBO, 7, 17, 212, 110, CBS_DROPDOWNLIST | CBS_SORT |
WS_VSCROLL
LTEXT "&Keyboard layout/IME:", -1, 7, 36, 110, 10
- COMBOBOX IDC_KEYBOARD_LAYOUT_COMBO, 7, 47, 212, 60, CBS_DROPDOWNLIST | CBS_SORT |
WS_VSCROLL
+ COMBOBOX IDC_KEYBOARD_LAYOUT_COMBO, 7, 47, 212, 110, CBS_DROPDOWNLIST | CBS_SORT |
WS_VSCROLL
DEFPUSHBUTTON "OK", IDOK, 116, 68, 50, 14
PUSHBUTTON "Cancel", IDCANCEL, 169, 68, 50, 14
END
-IDD_CHANGE_KEY_SEQ DIALOG 5, 100, 269, 78
+IDD_ADD2 DIALOG 20, 20, 257, 176
+STYLE DS_SETFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_3DLOOK | DS_CONTEXTHELP |
WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION
+CAPTION "Add Input Language"
+FONT 8, "MS Shell Dlg"
+{
+ LTEXT "&Input language:", -1, 7, 7, 61, 10
+ COMBOBOX IDC_INPUT_LANG_COMBO, 7, 17, 105, 60, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL
+ AUTOCHECKBOX "&Keyboard layout/IME:", IDC_KEYBOARD_LO_CHECKBOX, 37, 36,
110, 10
+ COMBOBOX IDC_KEYBOARD_LO_COMBO, 49, 47, 200, 60, CBS_DROPDOWNLIST | CBS_SORT |
WS_VSCROLL
+ AUTOCHECKBOX "&Handwriting recognition:", IDC_HANDWRITING_REC_CHECKBOX,
37, 65, 110, 10
+ COMBOBOX IDC_HANDWRITING_REC_COMBO, 49, 76, 200, 60, CBS_DROPDOWNLIST | CBS_SORT |
WS_VSCROLL
+ AUTOCHECKBOX "&Speech:", IDC_SPEECH_CHECKBOX, 37, 94, 110, 10
+ COMBOBOX IDC_SPEECH_COMBO, 49, 105, 200, 60, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL
+ AUTOCHECKBOX "&More Text Services:", IDC_MORE_TEXT_SERV_CHECKBOX, 37, 123,
110, 10
+ COMBOBOX IDC_MORE_TEXT_SERV_COMBO, 49, 134, 200, 60, CBS_DROPDOWNLIST | CBS_SORT |
WS_VSCROLL
+ DEFPUSHBUTTON "OK", IDOK, 146, 155, 50, 14
+ PUSHBUTTON "Cancel", IDCANCEL, 199, 155, 50, 14
+}
+
+IDD_ADD3 DIALOG 20, 20, 257, 147
+STYLE DS_SETFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_3DLOOK | DS_CONTEXTHELP |
WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION
+CAPTION "Add Input Language"
+FONT 8, "MS Shell Dlg"
+{
+ LTEXT "&Input language:", -1, 7, 7, 61, 10
+ COMBOBOX IDC_INPUT_LANG_COMBO, 7, 17, 105, 60, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL
+ AUTOCHECKBOX "&Keyboard layout/IME:", IDC_KEYBOARD_LO_CHECKBOX, 37, 36,
110, 10
+ COMBOBOX IDC_KEYBOARD_LO_COMBO, 49, 47, 200, 60, CBS_DROPDOWNLIST | CBS_SORT |
WS_VSCROLL
+ AUTOCHECKBOX "&Handwriting recognition:", IDC_HANDWRITING_REC_CHECKBOX,
37, 65, 110, 10
+ COMBOBOX IDC_HANDWRITING_REC_COMBO, 49, 76, 200, 60, CBS_DROPDOWNLIST | CBS_SORT |
WS_VSCROLL
+ AUTOCHECKBOX "&Speech:", IDC_SPEECH_CHECKBOX, 37, 94, 110, 10
+ COMBOBOX IDC_SPEECH_COMBO, 49, 105, 200, 60, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL
+ DEFPUSHBUTTON "OK", IDOK, 146, 126, 50, 14
+ PUSHBUTTON "Cancel", IDCANCEL, 199, 126, 50, 14
+}
+
+IDD_CHANGE_KEY_SEQ2 DIALOG 5, 100, 269, 78
STYLE DS_SETFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_3DLOOK | DS_CONTEXTHELP |
WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION
CAPTION "Change Key Sequence"
FONT 8, "MS Shell Dlg"
@@ -97,6 +133,89 @@
PUSHBUTTON "Cancel", IDCANCEL, 212, 47, 50, 14
END
+IDD_CHANGE_KEY_SEQ DIALOG 5, 100, 285, 74
+STYLE DS_SETFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_3DLOOK | DS_CONTEXTHELP |
WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION
+CAPTION "Change Key Sequence"
+FONT 8, "MS Shell Dlg"
+{
+ GROUPBOX "", -1, 9, 5, 209, 60
+ AUTOCHECKBOX "&Switch input languages", IDC_SWITCH_INPUT_LANG_CHECKBOX,
15, 15, 90, 12
+ LTEXT "SHIFT", -1, 73, 37, 27, 12
+ CTEXT "+", -1, 62, 37, 8, 9
+ AUTORADIOBUTTON "&CTRL", IDC_INLANG_CTRL_RADIOBTN, 29, 31, 30, 11,
WS_GROUP
+ AUTORADIOBUTTON "Left &ALT", IDC_INLANG_LEFTALT_RADIOBTN, 29, 45, 40, 12,
NOT WS_TABSTOP
+ AUTOCHECKBOX "S&witch keyboard layouts", IDC_SWITCH_KEYBOARD_LO_CHECKBOX,
121, 15, 90, 12
+ LTEXT "SHIFT", -1, 179, 37, 27, 12
+ CTEXT "+", -1, 168, 37, 8, 9
+ AUTORADIOBUTTON "C&TRL", IDC_LAYOUT_CTRL_RADIOBTN, 135, 31, 30, 11,
WS_GROUP
+ AUTORADIOBUTTON "Left A<", IDC_LAYOUT_LEFTALT_RADIOBTN, 135, 45, 40, 12,
NOT WS_TABSTOP
+ DEFPUSHBUTTON "OK", IDOK, 227, 18, 50, 14
+ PUSHBUTTON "Cancel", IDCANCEL, 227, 44, 50, 14
+}
+
+IDD_CHANGE_KEY_SEQ3 DIALOG 5, 100, 249, 125
+STYLE DS_SETFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_3DLOOK | DS_CONTEXTHELP |
WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION
+CAPTION "Change Key Sequence"
+FONT 8, "MS Shell Dlg"
+{
+ GROUPBOX "", -1, 9, 5, 174, 110
+ AUTOCHECKBOX "&Switch input languages", IDC_SWITCH_INPUT_LANG_CHECKBOX,
15, 15, 90, 12
+ LTEXT "SHIFT", -1, 73, 37, 27, 12
+ CTEXT "+", -1, 62, 37, 8, 9
+ AUTORADIOBUTTON "&CTRL", IDC_INLANG_CTRL_RADIOBTN, 29, 31, 30, 11,
WS_GROUP
+ AUTORADIOBUTTON "Left &ALT", IDC_INLANG_LEFTALT_RADIOBTN, 29, 45, 40, 12,
NOT WS_TABSTOP
+ AUTOCHECKBOX "S&witch keyboard layouts", IDC_SWITCH_KEYBOARD_LO_CHECKBOX,
15, 65, 90, 12
+ LTEXT "SHIFT", -1, 73, 87, 27, 12
+ CTEXT "+", -1, 62, 87, 8, 9
+ CONTROL "", IDC_CKS_BUTTON, "BUTTON", BS_OWNERDRAW, 96, 77, 13, 33
+ AUTORADIOBUTTON "&Grave Accent ( ` )", IDC_GRAVE_ACCENT_RADIOBTN, 110, 87,
69, 10, WS_GROUP
+ AUTORADIOBUTTON "C&TRL", IDC_LAYOUT_CTRL_RADIOBTN, 29, 81, 30, 11, NOT
WS_TABSTOP
+ AUTORADIOBUTTON "Left A<", IDC_LAYOUT_LEFTALT_RADIOBTN, 29, 95, 40, 12,
NOT WS_TABSTOP
+ DEFPUSHBUTTON "OK", IDOK, 192, 25, 50, 14
+ PUSHBUTTON "Cancel", IDCANCEL, 192, 47, 50, 14
+}
+
+IDD_CHANGE_KEY_SEQ4 DIALOG 5, 100, 249, 125
+STYLE DS_SETFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_3DLOOK | DS_CONTEXTHELP |
WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION
+CAPTION "Change Key Sequence"
+FONT 8, "MS Shell Dlg"
+{
+ GROUPBOX "", -1, 9, 5, 174, 110
+ AUTOCHECKBOX "&Switch input languages", IDC_SWITCH_INPUT_LANG_CHECKBOX,
15, 15, 90, 12
+ LTEXT "SHIFT", -1, 73, 37, 27, 12
+ CTEXT "+", -1, 62, 37, 8, 9
+ CONTROL "", IDC_CKS_BUTTON, "BUTTON", BS_OWNERDRAW, 96, 27, 13, 33
+ AUTORADIOBUTTON "&Grave Accent ( ` )", IDC_GRAVE_ACCENT_RADIOBTN, 110, 37,
69, 10, WS_GROUP
+ AUTORADIOBUTTON "&CTRL", IDC_INLANG_CTRL_RADIOBTN, 29, 31, 30, 11, NOT
WS_TABSTOP
+ AUTORADIOBUTTON "Left &ALT", IDC_INLANG_LEFTALT_RADIOBTN, 29, 45, 40, 12,
NOT WS_TABSTOP
+ AUTOCHECKBOX "S&witch keyboard layouts", IDC_SWITCH_KEYBOARD_LO_CHECKBOX,
15, 65, 90, 12
+ LTEXT "SHIFT", -1, 73, 87, 27, 12
+ CTEXT "+", -1, 62, 87, 8, 9
+ AUTORADIOBUTTON "C&TRL", IDC_LAYOUT_CTRL_RADIOBTN, 29, 81, 30, 11,
WS_GROUP
+ AUTORADIOBUTTON "Left A<", IDC_LAYOUT_LEFTALT_RADIOBTN, 29, 95, 40, 12,
NOT WS_TABSTOP
+ DEFPUSHBUTTON "OK", IDOK, 192, 25, 50, 14
+ PUSHBUTTON "Cancel", IDCANCEL, 192, 47, 50, 14
+}
+
+IDD_CHANGE_KEY_SEQ5 DIALOG 5, 100, 269, 78
+STYLE DS_SETFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_3DLOOK | DS_CONTEXTHELP |
WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION
+CAPTION "Change Key Sequence"
+FONT 8, "MS Shell Dlg"
+{
+ LTEXT "", 1240, 16, 5, 250, 10
+ GROUPBOX "", -1, 12, 17, 184, 48
+ AUTOCHECKBOX "&Enable Key Sequence", 1249, 17, 17, 85, 8
+ CTEXT "SHIFT", -1, 68, 37, 27, 12
+ CTEXT "+", -1, 57, 37, 8, 9
+ CTEXT "+", -1, 98, 37, 8, 10
+ AUTORADIOBUTTON "&CTRL", -1, 24, 31, 30, 11, WS_GROUP
+ AUTORADIOBUTTON "Left &ALT", -1, 24, 45, 40, 12, NOT WS_TABSTOP
+ LTEXT "&Key:", -1, 110, 37, 14, 10
+ COMBOBOX 1236, 127, 34, 46, 48, CBS_DROPDOWNLIST | WS_VSCROLL
+ DEFPUSHBUTTON "OK", IDOK, 212, 25, 50, 14
+ PUSHBUTTON "Cancel", IDCANCEL, 212, 47, 50, 14
+}
+
IDD_INPUT_LANG_PROP DIALOG 20, 20, 227, 75
STYLE DS_SETFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_3DLOOK | DS_CONTEXTHELP |
WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION
CAPTION "Input language Properties"
@@ -112,6 +231,11 @@
STRINGTABLE
BEGIN
+ //Selected language on "Add Input language"
+ IDS_SELECTED_LANGUAGE "English (United States)"
+ //Selected keyboard layout on "Add Input language"
+ IDS_SELECTED_LAYOUT, "United States-Dvorak"
+
IDS_CPLSYSTEMNAME "Text Services and Input Languages"
IDS_CPLSYSTEMDESCRIPTION "Customizes settings for text input of
languages."
IDS_US_LAYOUT, "US"
Modified: trunk/reactos/dll/cpl/input/lang/fr-FR.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/input/lang/fr-FR.r…
==============================================================================
--- trunk/reactos/dll/cpl/input/lang/fr-FR.rc (original)
+++ trunk/reactos/dll/cpl/input/lang/fr-FR.rc Sat Oct 6 15:47:06 2007
@@ -71,14 +71,14 @@
FONT 8, "MS Shell Dlg"
BEGIN
LTEXT "Langue de sa&isie:", -1, 7, 7, 61, 10
- COMBOBOX IDC_INPUT_LANGUAGE_COMBO, 7, 17, 212, 60, CBS_DROPDOWNLIST | CBS_SORT |
WS_VSCROLL
+ COMBOBOX IDC_INPUT_LANGUAGE_COMBO, 7, 17, 212, 110, CBS_DROPDOWNLIST | CBS_SORT |
WS_VSCROLL
LTEXT "Configuration du clavier/IME:", -1, 7, 36, 110, 10
- COMBOBOX IDC_KEYBOARD_LAYOUT_COMBO, 7, 47, 212, 60, CBS_DROPDOWNLIST | CBS_SORT |
WS_VSCROLL
+ COMBOBOX IDC_KEYBOARD_LAYOUT_COMBO, 7, 47, 212, 110, CBS_DROPDOWNLIST | CBS_SORT |
WS_VSCROLL
DEFPUSHBUTTON "OK", IDOK, 116, 68, 50, 14
PUSHBUTTON "Annuler", IDCANCEL, 169, 68, 50, 14
END
-IDD_CHANGE_KEY_SEQ DIALOG 5, 100, 269, 78
+IDD_CHANGE_KEY_SEQ2 DIALOG 5, 100, 269, 78
STYLE DS_SETFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_3DLOOK | DS_CONTEXTHELP |
WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION
CAPTION "Changer la séquence de touches"
FONT 8, "MS Shell Dlg"
@@ -110,10 +110,133 @@
PUSHBUTTON "Annuler", IDCANCEL, 169, 53, 52, 14
END
+IDD_ADD2 DIALOG 20, 20, 257, 176
+STYLE DS_SETFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_3DLOOK | DS_CONTEXTHELP |
WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION
+CAPTION "Add Input Language"
+FONT 8, "MS Shell Dlg"
+{
+ LTEXT "&Input language:", -1, 7, 7, 61, 10
+ COMBOBOX IDC_INPUT_LANG_COMBO, 7, 17, 105, 60, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL
+ AUTOCHECKBOX "&Keyboard layout/IME:", IDC_KEYBOARD_LO_CHECKBOX, 37, 36,
110, 10
+ COMBOBOX IDC_KEYBOARD_LO_COMBO, 49, 47, 200, 60, CBS_DROPDOWNLIST | CBS_SORT |
WS_VSCROLL
+ AUTOCHECKBOX "&Handwriting recognition:", IDC_HANDWRITING_REC_CHECKBOX,
37, 65, 110, 10
+ COMBOBOX IDC_HANDWRITING_REC_COMBO, 49, 76, 200, 60, CBS_DROPDOWNLIST | CBS_SORT |
WS_VSCROLL
+ AUTOCHECKBOX "&Speech:", IDC_SPEECH_CHECKBOX, 37, 94, 110, 10
+ COMBOBOX IDC_SPEECH_COMBO, 49, 105, 200, 60, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL
+ AUTOCHECKBOX "&More Text Services:", IDC_MORE_TEXT_SERV_CHECKBOX, 37, 123,
110, 10
+ COMBOBOX IDC_MORE_TEXT_SERV_COMBO, 49, 134, 200, 60, CBS_DROPDOWNLIST | CBS_SORT |
WS_VSCROLL
+ DEFPUSHBUTTON "OK", IDOK, 146, 155, 50, 14
+ PUSHBUTTON "Cancel", IDCANCEL, 199, 155, 50, 14
+}
+
+IDD_ADD3 DIALOG 20, 20, 257, 147
+STYLE DS_SETFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_3DLOOK | DS_CONTEXTHELP |
WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION
+CAPTION "Add Input Language"
+FONT 8, "MS Shell Dlg"
+{
+ LTEXT "&Input language:", -1, 7, 7, 61, 10
+ COMBOBOX IDC_INPUT_LANG_COMBO, 7, 17, 105, 60, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL
+ AUTOCHECKBOX "&Keyboard layout/IME:", IDC_KEYBOARD_LO_CHECKBOX, 37, 36,
110, 10
+ COMBOBOX IDC_KEYBOARD_LO_COMBO, 49, 47, 200, 60, CBS_DROPDOWNLIST | CBS_SORT |
WS_VSCROLL
+ AUTOCHECKBOX "&Handwriting recognition:", IDC_HANDWRITING_REC_CHECKBOX,
37, 65, 110, 10
+ COMBOBOX IDC_HANDWRITING_REC_COMBO, 49, 76, 200, 60, CBS_DROPDOWNLIST | CBS_SORT |
WS_VSCROLL
+ AUTOCHECKBOX "&Speech:", IDC_SPEECH_CHECKBOX, 37, 94, 110, 10
+ COMBOBOX IDC_SPEECH_COMBO, 49, 105, 200, 60, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL
+ DEFPUSHBUTTON "OK", IDOK, 146, 126, 50, 14
+ PUSHBUTTON "Cancel", IDCANCEL, 199, 126, 50, 14
+}
+
+IDD_CHANGE_KEY_SEQ DIALOG 5, 100, 285, 74
+STYLE DS_SETFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_3DLOOK | DS_CONTEXTHELP |
WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION
+CAPTION "Change Key Sequence"
+FONT 8, "MS Shell Dlg"
+{
+ GROUPBOX "", -1, 9, 5, 209, 60
+ AUTOCHECKBOX "&Switch input languages", IDC_SWITCH_INPUT_LANG_CHECKBOX,
15, 15, 90, 12
+ LTEXT "SHIFT", -1, 73, 37, 27, 12
+ CTEXT "+", -1, 62, 37, 8, 9
+ AUTORADIOBUTTON "&CTRL", IDC_INLANG_CTRL_RADIOBTN, 29, 31, 30, 11,
WS_GROUP
+ AUTORADIOBUTTON "Left &ALT", IDC_INLANG_LEFTALT_RADIOBTN, 29, 45, 40, 12,
NOT WS_TABSTOP
+ AUTOCHECKBOX "S&witch keyboard layouts", IDC_SWITCH_KEYBOARD_LO_CHECKBOX,
121, 15, 90, 12
+ LTEXT "SHIFT", -1, 179, 37, 27, 12
+ CTEXT "+", -1, 168, 37, 8, 9
+ AUTORADIOBUTTON "C&TRL", IDC_LAYOUT_CTRL_RADIOBTN, 135, 31, 30, 11,
WS_GROUP
+ AUTORADIOBUTTON "Left A<", IDC_LAYOUT_LEFTALT_RADIOBTN, 135, 45, 40, 12,
NOT WS_TABSTOP
+ DEFPUSHBUTTON "OK", IDOK, 227, 18, 50, 14
+ PUSHBUTTON "Cancel", IDCANCEL, 227, 44, 50, 14
+}
+
+IDD_CHANGE_KEY_SEQ3 DIALOG 5, 100, 249, 125
+STYLE DS_SETFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_3DLOOK | DS_CONTEXTHELP |
WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION
+CAPTION "Change Key Sequence"
+FONT 8, "MS Shell Dlg"
+{
+ GROUPBOX "", -1, 9, 5, 174, 110
+ AUTOCHECKBOX "&Switch input languages", IDC_SWITCH_INPUT_LANG_CHECKBOX,
15, 15, 90, 12
+ LTEXT "SHIFT", -1, 73, 37, 27, 12
+ CTEXT "+", -1, 62, 37, 8, 9
+ AUTORADIOBUTTON "&CTRL", IDC_INLANG_CTRL_RADIOBTN, 29, 31, 30, 11,
WS_GROUP
+ AUTORADIOBUTTON "Left &ALT", IDC_INLANG_LEFTALT_RADIOBTN, 29, 45, 40, 12,
NOT WS_TABSTOP
+ AUTOCHECKBOX "S&witch keyboard layouts", IDC_SWITCH_KEYBOARD_LO_CHECKBOX,
15, 65, 90, 12
+ LTEXT "SHIFT", -1, 73, 87, 27, 12
+ CTEXT "+", -1, 62, 87, 8, 9
+ CONTROL "", IDC_CKS_BUTTON, "BUTTON", BS_OWNERDRAW, 96, 77, 13, 33
+ AUTORADIOBUTTON "&Grave Accent ( ` )", IDC_GRAVE_ACCENT_RADIOBTN, 110, 87,
69, 10, WS_GROUP
+ AUTORADIOBUTTON "C&TRL", IDC_LAYOUT_CTRL_RADIOBTN, 29, 81, 30, 11, NOT
WS_TABSTOP
+ AUTORADIOBUTTON "Left A<", IDC_LAYOUT_LEFTALT_RADIOBTN, 29, 95, 40, 12,
NOT WS_TABSTOP
+ DEFPUSHBUTTON "OK", IDOK, 192, 25, 50, 14
+ PUSHBUTTON "Cancel", IDCANCEL, 192, 47, 50, 14
+}
+
+IDD_CHANGE_KEY_SEQ4 DIALOG 5, 100, 249, 125
+STYLE DS_SETFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_3DLOOK | DS_CONTEXTHELP |
WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION
+CAPTION "Change Key Sequence"
+FONT 8, "MS Shell Dlg"
+{
+ GROUPBOX "", -1, 9, 5, 174, 110
+ AUTOCHECKBOX "&Switch input languages", IDC_SWITCH_INPUT_LANG_CHECKBOX,
15, 15, 90, 12
+ LTEXT "SHIFT", -1, 73, 37, 27, 12
+ CTEXT "+", -1, 62, 37, 8, 9
+ CONTROL "", IDC_CKS_BUTTON, "BUTTON", BS_OWNERDRAW, 96, 27, 13, 33
+ AUTORADIOBUTTON "&Grave Accent ( ` )", IDC_GRAVE_ACCENT_RADIOBTN, 110, 37,
69, 10, WS_GROUP
+ AUTORADIOBUTTON "&CTRL", IDC_INLANG_CTRL_RADIOBTN, 29, 31, 30, 11, NOT
WS_TABSTOP
+ AUTORADIOBUTTON "Left &ALT", IDC_INLANG_LEFTALT_RADIOBTN, 29, 45, 40, 12,
NOT WS_TABSTOP
+ AUTOCHECKBOX "S&witch keyboard layouts", IDC_SWITCH_KEYBOARD_LO_CHECKBOX,
15, 65, 90, 12
+ LTEXT "SHIFT", -1, 73, 87, 27, 12
+ CTEXT "+", -1, 62, 87, 8, 9
+ AUTORADIOBUTTON "C&TRL", IDC_LAYOUT_CTRL_RADIOBTN, 29, 81, 30, 11,
WS_GROUP
+ AUTORADIOBUTTON "Left A<", IDC_LAYOUT_LEFTALT_RADIOBTN, 29, 95, 40, 12,
NOT WS_TABSTOP
+ DEFPUSHBUTTON "OK", IDOK, 192, 25, 50, 14
+ PUSHBUTTON "Cancel", IDCANCEL, 192, 47, 50, 14
+}
+
+IDD_CHANGE_KEY_SEQ5 DIALOG 5, 100, 269, 78
+STYLE DS_SETFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_3DLOOK | DS_CONTEXTHELP |
WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION
+CAPTION "Change Key Sequence"
+FONT 8, "MS Shell Dlg"
+{
+ LTEXT "", 1240, 16, 5, 250, 10
+ GROUPBOX "", -1, 12, 17, 184, 48
+ AUTOCHECKBOX "&Enable Key Sequence", 1249, 17, 17, 85, 8
+ CTEXT "SHIFT", -1, 68, 37, 27, 12
+ CTEXT "+", -1, 57, 37, 8, 9
+ CTEXT "+", -1, 98, 37, 8, 10
+ AUTORADIOBUTTON "&CTRL", -1, 24, 31, 30, 11, WS_GROUP
+ AUTORADIOBUTTON "Left &ALT", -1, 24, 45, 40, 12, NOT WS_TABSTOP
+ LTEXT "&Key:", -1, 110, 37, 14, 10
+ COMBOBOX 1236, 127, 34, 46, 48, CBS_DROPDOWNLIST | WS_VSCROLL
+ DEFPUSHBUTTON "OK", IDOK, 212, 25, 50, 14
+ PUSHBUTTON "Cancel", IDCANCEL, 212, 47, 50, 14
+}
+
/* FIXME : To improve/complete */
/* FIXME : À améliorer/compléter */
STRINGTABLE
BEGIN
+ //Selected language on "Add Input language"
+ IDS_SELECTED_LANGUAGE "English (United States)"
+ //Selected keyboard layout on "Add Input language"
+ IDS_SELECTED_LAYOUT, "United States-Dvorak"
IDS_CPLSYSTEMNAME "Services texte et langue de saisie"
IDS_CPLSYSTEMDESCRIPTION "Personnalise les paramètres pour la langue de saisie
de texte."
IDS_US_LAYOUT, "US"
Modified: trunk/reactos/dll/cpl/input/lang/uk-UA.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/input/lang/uk-UA.r…
==============================================================================
--- trunk/reactos/dll/cpl/input/lang/uk-UA.rc (original)
+++ trunk/reactos/dll/cpl/input/lang/uk-UA.rc Sat Oct 6 15:47:06 2007
@@ -79,14 +79,14 @@
FONT 8, "MS Shell Dlg"
BEGIN
LTEXT "&Ìîâà ââîäó:", -1, 7, 7, 61, 10
- COMBOBOX IDC_INPUT_LANGUAGE_COMBO, 7, 17, 212, 60, CBS_DROPDOWNLIST | CBS_SORT |
WS_VSCROLL
+ COMBOBOX IDC_INPUT_LANGUAGE_COMBO, 7, 17, 212, 110, CBS_DROPDOWNLIST | CBS_SORT |
WS_VSCROLL
LTEXT "&Ðîçêëàäêà êëàâ³àòóðè àáî çàñ³á ââîäó (IME):", -1, 7, 36, 110,
10
- COMBOBOX IDC_KEYBOARD_LAYOUT_COMBO, 7, 47, 212, 60, CBS_DROPDOWNLIST | CBS_SORT |
WS_VSCROLL
+ COMBOBOX IDC_KEYBOARD_LAYOUT_COMBO, 7, 47, 212, 110, CBS_DROPDOWNLIST | CBS_SORT |
WS_VSCROLL
DEFPUSHBUTTON "OK", IDOK, 116, 68, 50, 14
PUSHBUTTON "Ñêàñóâàòè", IDCANCEL, 169, 68, 50, 14
END
-IDD_CHANGE_KEY_SEQ DIALOG 5, 100, 269, 78
+IDD_CHANGE_KEY_SEQ2 DIALOG 5, 100, 269, 78
STYLE DS_SETFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_3DLOOK | DS_CONTEXTHELP |
WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION
CAPTION "Çì³íà ñïîëó÷åííÿ êëàâ³ø"
FONT 8, "MS Shell Dlg"
@@ -118,8 +118,131 @@
PUSHBUTTON "Ñêàñóâàòè", IDCANCEL, 169, 53, 52, 14
END
+IDD_ADD2 DIALOG 20, 20, 257, 176
+STYLE DS_SETFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_3DLOOK | DS_CONTEXTHELP |
WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION
+CAPTION "Add Input Language"
+FONT 8, "MS Shell Dlg"
+{
+ LTEXT "&Input language:", -1, 7, 7, 61, 10
+ COMBOBOX IDC_INPUT_LANG_COMBO, 7, 17, 105, 60, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL
+ AUTOCHECKBOX "&Keyboard layout/IME:", IDC_KEYBOARD_LO_CHECKBOX, 37, 36,
110, 10
+ COMBOBOX IDC_KEYBOARD_LO_COMBO, 49, 47, 200, 60, CBS_DROPDOWNLIST | CBS_SORT |
WS_VSCROLL
+ AUTOCHECKBOX "&Handwriting recognition:", IDC_HANDWRITING_REC_CHECKBOX,
37, 65, 110, 10
+ COMBOBOX IDC_HANDWRITING_REC_COMBO, 49, 76, 200, 60, CBS_DROPDOWNLIST | CBS_SORT |
WS_VSCROLL
+ AUTOCHECKBOX "&Speech:", IDC_SPEECH_CHECKBOX, 37, 94, 110, 10
+ COMBOBOX IDC_SPEECH_COMBO, 49, 105, 200, 60, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL
+ AUTOCHECKBOX "&More Text Services:", IDC_MORE_TEXT_SERV_CHECKBOX, 37, 123,
110, 10
+ COMBOBOX IDC_MORE_TEXT_SERV_COMBO, 49, 134, 200, 60, CBS_DROPDOWNLIST | CBS_SORT |
WS_VSCROLL
+ DEFPUSHBUTTON "OK", IDOK, 146, 155, 50, 14
+ PUSHBUTTON "Cancel", IDCANCEL, 199, 155, 50, 14
+}
+
+IDD_ADD3 DIALOG 20, 20, 257, 147
+STYLE DS_SETFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_3DLOOK | DS_CONTEXTHELP |
WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION
+CAPTION "Add Input Language"
+FONT 8, "MS Shell Dlg"
+{
+ LTEXT "&Input language:", -1, 7, 7, 61, 10
+ COMBOBOX IDC_INPUT_LANG_COMBO, 7, 17, 105, 60, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL
+ AUTOCHECKBOX "&Keyboard layout/IME:", IDC_KEYBOARD_LO_CHECKBOX, 37, 36,
110, 10
+ COMBOBOX IDC_KEYBOARD_LO_COMBO, 49, 47, 200, 60, CBS_DROPDOWNLIST | CBS_SORT |
WS_VSCROLL
+ AUTOCHECKBOX "&Handwriting recognition:", IDC_HANDWRITING_REC_CHECKBOX,
37, 65, 110, 10
+ COMBOBOX IDC_HANDWRITING_REC_COMBO, 49, 76, 200, 60, CBS_DROPDOWNLIST | CBS_SORT |
WS_VSCROLL
+ AUTOCHECKBOX "&Speech:", IDC_SPEECH_CHECKBOX, 37, 94, 110, 10
+ COMBOBOX IDC_SPEECH_COMBO, 49, 105, 200, 60, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL
+ DEFPUSHBUTTON "OK", IDOK, 146, 126, 50, 14
+ PUSHBUTTON "Cancel", IDCANCEL, 199, 126, 50, 14
+}
+
+IDD_CHANGE_KEY_SEQ DIALOG 5, 100, 285, 74
+STYLE DS_SETFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_3DLOOK | DS_CONTEXTHELP |
WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION
+CAPTION "Change Key Sequence"
+FONT 8, "MS Shell Dlg"
+{
+ GROUPBOX "", -1, 9, 5, 209, 60
+ AUTOCHECKBOX "&Switch input languages", IDC_SWITCH_INPUT_LANG_CHECKBOX,
15, 15, 90, 12
+ LTEXT "SHIFT", -1, 73, 37, 27, 12
+ CTEXT "+", -1, 62, 37, 8, 9
+ AUTORADIOBUTTON "&CTRL", IDC_INLANG_CTRL_RADIOBTN, 29, 31, 30, 11,
WS_GROUP
+ AUTORADIOBUTTON "Left &ALT", IDC_INLANG_LEFTALT_RADIOBTN, 29, 45, 40, 12,
NOT WS_TABSTOP
+ AUTOCHECKBOX "S&witch keyboard layouts", IDC_SWITCH_KEYBOARD_LO_CHECKBOX,
121, 15, 90, 12
+ LTEXT "SHIFT", -1, 179, 37, 27, 12
+ CTEXT "+", -1, 168, 37, 8, 9
+ AUTORADIOBUTTON "C&TRL", IDC_LAYOUT_CTRL_RADIOBTN, 135, 31, 30, 11,
WS_GROUP
+ AUTORADIOBUTTON "Left A<", IDC_LAYOUT_LEFTALT_RADIOBTN, 135, 45, 40, 12,
NOT WS_TABSTOP
+ DEFPUSHBUTTON "OK", IDOK, 227, 18, 50, 14
+ PUSHBUTTON "Cancel", IDCANCEL, 227, 44, 50, 14
+}
+
+IDD_CHANGE_KEY_SEQ3 DIALOG 5, 100, 249, 125
+STYLE DS_SETFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_3DLOOK | DS_CONTEXTHELP |
WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION
+CAPTION "Change Key Sequence"
+FONT 8, "MS Shell Dlg"
+{
+ GROUPBOX "", -1, 9, 5, 174, 110
+ AUTOCHECKBOX "&Switch input languages", IDC_SWITCH_INPUT_LANG_CHECKBOX,
15, 15, 90, 12
+ LTEXT "SHIFT", -1, 73, 37, 27, 12
+ CTEXT "+", -1, 62, 37, 8, 9
+ AUTORADIOBUTTON "&CTRL", IDC_INLANG_CTRL_RADIOBTN, 29, 31, 30, 11,
WS_GROUP
+ AUTORADIOBUTTON "Left &ALT", IDC_INLANG_LEFTALT_RADIOBTN, 29, 45, 40, 12,
NOT WS_TABSTOP
+ AUTOCHECKBOX "S&witch keyboard layouts", IDC_SWITCH_KEYBOARD_LO_CHECKBOX,
15, 65, 90, 12
+ LTEXT "SHIFT", -1, 73, 87, 27, 12
+ CTEXT "+", -1, 62, 87, 8, 9
+ CONTROL "", IDC_CKS_BUTTON, "BUTTON", BS_OWNERDRAW, 96, 77, 13, 33
+ AUTORADIOBUTTON "&Grave Accent ( ` )", IDC_GRAVE_ACCENT_RADIOBTN, 110, 87,
69, 10, WS_GROUP
+ AUTORADIOBUTTON "C&TRL", IDC_LAYOUT_CTRL_RADIOBTN, 29, 81, 30, 11, NOT
WS_TABSTOP
+ AUTORADIOBUTTON "Left A<", IDC_LAYOUT_LEFTALT_RADIOBTN, 29, 95, 40, 12,
NOT WS_TABSTOP
+ DEFPUSHBUTTON "OK", IDOK, 192, 25, 50, 14
+ PUSHBUTTON "Cancel", IDCANCEL, 192, 47, 50, 14
+}
+
+IDD_CHANGE_KEY_SEQ4 DIALOG 5, 100, 249, 125
+STYLE DS_SETFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_3DLOOK | DS_CONTEXTHELP |
WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION
+CAPTION "Change Key Sequence"
+FONT 8, "MS Shell Dlg"
+{
+ GROUPBOX "", -1, 9, 5, 174, 110
+ AUTOCHECKBOX "&Switch input languages", IDC_SWITCH_INPUT_LANG_CHECKBOX,
15, 15, 90, 12
+ LTEXT "SHIFT", -1, 73, 37, 27, 12
+ CTEXT "+", -1, 62, 37, 8, 9
+ CONTROL "", IDC_CKS_BUTTON, "BUTTON", BS_OWNERDRAW, 96, 27, 13, 33
+ AUTORADIOBUTTON "&Grave Accent ( ` )", IDC_GRAVE_ACCENT_RADIOBTN, 110, 37,
69, 10, WS_GROUP
+ AUTORADIOBUTTON "&CTRL", IDC_INLANG_CTRL_RADIOBTN, 29, 31, 30, 11, NOT
WS_TABSTOP
+ AUTORADIOBUTTON "Left &ALT", IDC_INLANG_LEFTALT_RADIOBTN, 29, 45, 40, 12,
NOT WS_TABSTOP
+ AUTOCHECKBOX "S&witch keyboard layouts", IDC_SWITCH_KEYBOARD_LO_CHECKBOX,
15, 65, 90, 12
+ LTEXT "SHIFT", -1, 73, 87, 27, 12
+ CTEXT "+", -1, 62, 87, 8, 9
+ AUTORADIOBUTTON "C&TRL", IDC_LAYOUT_CTRL_RADIOBTN, 29, 81, 30, 11,
WS_GROUP
+ AUTORADIOBUTTON "Left A<", IDC_LAYOUT_LEFTALT_RADIOBTN, 29, 95, 40, 12,
NOT WS_TABSTOP
+ DEFPUSHBUTTON "OK", IDOK, 192, 25, 50, 14
+ PUSHBUTTON "Cancel", IDCANCEL, 192, 47, 50, 14
+}
+
+IDD_CHANGE_KEY_SEQ5 DIALOG 5, 100, 269, 78
+STYLE DS_SETFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_3DLOOK | DS_CONTEXTHELP |
WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION
+CAPTION "Change Key Sequence"
+FONT 8, "MS Shell Dlg"
+{
+ LTEXT "", 1240, 16, 5, 250, 10
+ GROUPBOX "", -1, 12, 17, 184, 48
+ AUTOCHECKBOX "&Enable Key Sequence", 1249, 17, 17, 85, 8
+ CTEXT "SHIFT", -1, 68, 37, 27, 12
+ CTEXT "+", -1, 57, 37, 8, 9
+ CTEXT "+", -1, 98, 37, 8, 10
+ AUTORADIOBUTTON "&CTRL", -1, 24, 31, 30, 11, WS_GROUP
+ AUTORADIOBUTTON "Left &ALT", -1, 24, 45, 40, 12, NOT WS_TABSTOP
+ LTEXT "&Key:", -1, 110, 37, 14, 10
+ COMBOBOX 1236, 127, 34, 46, 48, CBS_DROPDOWNLIST | WS_VSCROLL
+ DEFPUSHBUTTON "OK", IDOK, 212, 25, 50, 14
+ PUSHBUTTON "Cancel", IDCANCEL, 212, 47, 50, 14
+}
+
STRINGTABLE
BEGIN
+ //Selected language on "Add Input language"
+ IDS_SELECTED_LANGUAGE "English (United States)"
+ //Selected keyboard layout on "Add Input language"
+ IDS_SELECTED_LAYOUT, "United States-Dvorak"
IDS_CPLSYSTEMNAME "Ìîâè òà ñëóæáè òåêñòîâîãî ââîäó"
IDS_CPLSYSTEMDESCRIPTION "Íàëàøòîâóº ïàðàìåòðè äëÿ òåêñòîâîãî ââîäó."
IDS_US_LAYOUT, "ÑØÀ"
Modified: trunk/reactos/dll/cpl/input/langbar.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/input/langbar.c?re…
==============================================================================
--- trunk/reactos/dll/cpl/input/langbar.c (original)
+++ trunk/reactos/dll/cpl/input/langbar.c Sat Oct 6 15:47:06 2007
@@ -18,10 +18,10 @@
*/
/*
*
- * PROJECT: input.dll
- * FILE: dll/win32/input/langbar.c
- * PURPOSE: input.dll
- * PROGRAMMER: Dmitry Chapyshev (lentind(a)yandex.ru)
+ * PROJECT: input.dll
+ * FILE: dll/win32/input/langbar.c
+ * PURPOSE: input.dll
+ * PROGRAMMER: Dmitry Chapyshev (lentind(a)yandex.ru)
* UPDATE HISTORY:
* 06-09-2007 Created
*/
Added: trunk/reactos/dll/cpl/input/misc.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/input/misc.c?rev=2…
==============================================================================
--- trunk/reactos/dll/cpl/input/misc.c (added)
+++ trunk/reactos/dll/cpl/input/misc.c Sat Oct 6 15:47:06 2007
@@ -1,0 +1,69 @@
+/*
+ * ReactOS
+ * Copyright (C) 2007 ReactOS Team
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+/*
+ *
+ * PROJECT: input.dll
+ * FILE: dll/win32/input/misc.c
+ * PURPOSE: input.dll
+ * PROGRAMMER: Dmitry Chapyshev (lentind(a)yandex.ru)
+ * UPDATE HISTORY:
+ * 06-09-2007 Created
+ */
+
+#include <windows.h>
+#include <commctrl.h>
+#include <cpl.h>
+
+#include <stdlib.h>
+#include <stdio.h>
+#include <stdarg.h>
+#include <tchar.h>
+#include <process.h>
+
+#include "resource.h"
+#include "input.h"
+
+VOID
+CreateKeyboardLayoutList(HWND hWnd)
+{
+ TCHAR Layout[256];
+ int Index;
+ UINT loIndex;
+
+ for ( loIndex = BEGIN_LAYOUT; loIndex <= END_LAYOUT; loIndex++ )
+ {
+ LoadString(hApplet,
+ loIndex,
+ Layout,
+ sizeof(Layout) / sizeof(TCHAR));
+ if (strlen((char*)Layout) > 0)
+ {
+ Index = (int) SendMessage(hWnd,
+ CB_INSERTSTRING,
+ 0,
+ (LPARAM)Layout);
+ SendMessage(hWnd,
+ CB_SETITEMDATA,
+ Index,
+ (LPARAM)loIndex);
+ }
+ }
+}
+
+/* EOF */
Propchange: trunk/reactos/dll/cpl/input/misc.c
------------------------------------------------------------------------------
svn:eol-style = native
Modified: trunk/reactos/dll/cpl/input/resource.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/input/resource.h?r…
==============================================================================
--- trunk/reactos/dll/cpl/input/resource.h (original)
+++ trunk/reactos/dll/cpl/input/resource.h Sat Oct 6 15:47:06 2007
@@ -18,12 +18,18 @@
/* IDD */
#define IDD_PROPPAGESETTINGS 500
-#define IDD_PROPPAGEADVANCED 501
-#define IDD_LANGBAR 502
-#define IDD_KEYSETTINGS 503
-#define IDD_ADD 504
-#define IDD_CHANGE_KEY_SEQ 505
-#define IDD_INPUT_LANG_PROP 506
+#define IDD_ADD3 501
+#define IDD_INPUT_LANG_PROP 502
+#define IDD_CHANGE_KEY_SEQ 503
+#define IDD_CHANGE_KEY_SEQ4 504
+#define IDD_CHANGE_KEY_SEQ5 505
+#define IDD_CHANGE_KEY_SEQ2 506
+#define IDD_ADD 507
+#define IDD_CHANGE_KEY_SEQ3 508
+#define IDD_ADD2 509
+#define IDD_KEYSETTINGS 510
+#define IDD_LANGBAR 511
+#define IDD_PROPPAGEADVANCED 512
/* IDC */
#define IDC_DEFAULT_INPUT_LANG 150
@@ -52,6 +58,23 @@
#define IDC_ALT_CHECKBOX 173
#define IDC_CKEY_COMBOBOX 174
#define IDC_KEYBOARD_LAYOUT_IME_COMBO 175
+#define IDC_SWITCH_INPUT_LANG_CHECKBOX 176
+#define IDC_INLANG_CTRL_RADIOBTN 177
+#define IDC_INLANG_LEFTALT_RADIOBTN 178
+#define IDC_SWITCH_KEYBOARD_LO_CHECKBOX 179
+#define IDC_LAYOUT_CTRL_RADIOBTN 180
+#define IDC_LAYOUT_LEFTALT_RADIOBTN 181
+#define IDC_INPUT_LANG_COMBO 182
+#define IDC_KEYBOARD_LO_CHECKBOX 183
+#define IDC_KEYBOARD_LO_COMBO 184
+#define IDC_HANDWRITING_REC_CHECKBOX 185
+#define IDC_HANDWRITING_REC_COMBO 186
+#define IDC_SPEECH_CHECKBOX 187
+#define IDC_SPEECH_COMBO 188
+#define IDC_MORE_TEXT_SERV_CHECKBOX 189
+#define IDC_MORE_TEXT_SERV_COMBO 190
+#define IDC_CKS_BUTTON 191
+#define IDC_GRAVE_ACCENT_RADIOBTN 192
/* IDS */
#define IDS_CPLSYSTEMNAME 1
@@ -188,6 +211,9 @@
#define IDS_DIVEHI_PHONETIC_LAYOUT 5132
#define IDS_DIVEHI_TYPEWRITER_LAYOUT 5133
+#define IDS_SELECTED_LAYOUT 6000
+#define IDS_SELECTED_LANGUAGE 6001
+
#endif /* __CPL_RESOURCE_H */
/* EOF */
Modified: trunk/reactos/dll/cpl/input/settings.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/input/settings.c?r…
==============================================================================
--- trunk/reactos/dll/cpl/input/settings.c (original)
+++ trunk/reactos/dll/cpl/input/settings.c Sat Oct 6 15:47:06 2007
@@ -18,10 +18,10 @@
*/
/*
*
- * PROJECT: input.dll
- * FILE: dll/win32/input/settings.c
- * PURPOSE: input.dll
- * PROGRAMMER: Dmitry Chapyshev (lentind(a)yandex.ru)
+ * PROJECT: input.dll
+ * FILE: dll/win32/input/settings.c
+ * PURPOSE: input.dll
+ * PROGRAMMER: Dmitry Chapyshev (lentind(a)yandex.ru)
* UPDATE HISTORY:
* 06-09-2007 Created
*/
@@ -39,6 +39,58 @@
#include "resource.h"
#include "input.h"
+#define BUFSIZE 80
+
+static
+BOOL
+CreateDefaultLangList(HWND hWnd)
+{
+ HKEY hKey;
+ char szPreload[BUFSIZE],szCount[BUFSIZE],Lang[BUFSIZE];
+ DWORD dwBufLen = BUFSIZE, dwBufCLen = BUFSIZE, cValues;
+ LONG lRet;
+ int Count;
+ LCID Lcid;
+
+ if(RegOpenKeyEx(HKEY_CURRENT_USER, TEXT("Keyboard Layout\\Preload"), 0,
KEY_QUERY_VALUE, &hKey) != ERROR_SUCCESS)
+ {
+ return FALSE;
+ }
+
RegQueryInfoKey(hKey,NULL,NULL,NULL,NULL,NULL,NULL,&cValues,NULL,NULL,NULL,NULL);
+
+ if (cValues)
+ {
+ for (Count = 0; Count < cValues; Count++)
+ {
+ szCount[0] = '\0';
+ lRet =
RegEnumValue(hKey,Count,(LPTSTR)szCount,&dwBufCLen,NULL,NULL,NULL,NULL);
+
+ sprintf(szCount,"%d",Count + 1);
+ RegQueryValueEx(hKey,(LPTSTR)szCount,NULL,NULL,(LPBYTE)szPreload,&dwBufLen);
+
+ Lcid = wcstoul((LPTSTR)szPreload, NULL, 16);
+ GetLocaleInfo(Lcid, LOCALE_SLANGUAGE, (LPTSTR)Lang, sizeof(Lang));
+
+ SendMessage(hWnd,
+ CB_INSERTSTRING,
+ 0,
+ (LPARAM)Lang);
+ if (Count == 0)
+ {
+ SendMessage(hWnd,
+ CB_SELECTSTRING,
+ (WPARAM) -1,
+ (LPARAM)Lang);
+ }
+ }
+
+ }
+
+ RegCloseKey(hKey);
+
+ return TRUE;
+}
+
/* Property page dialog callback */
INT_PTR CALLBACK
SettingPageProc(HWND hwndDlg,UINT uMsg,WPARAM wParam,LPARAM lParam)
@@ -47,8 +99,8 @@
switch (uMsg)
{
case WM_INITDIALOG:
-
- break;
+ CreateDefaultLangList(GetDlgItem(hwndDlg, IDC_DEFAULT_INPUT_LANG));
+ break;
case WM_COMMAND:
switch (LOWORD(wParam))
@@ -77,6 +129,12 @@
hwndDlg,
InputLangPropDlgProc);
break;
+ case IDC_DEFAULT_INPUT_LANG:
+ if (HIWORD(wParam) == CBN_SELCHANGE)
+ {
+ PropSheet_Changed(GetParent(hwndDlg), hwndDlg);
+ }
+ break;
}
break;
}
6222
days inactive
6222
days old
0 comments
1 participants
participants (1)
-
fireball＠svn.reactos.org