Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-08-13 06:37:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

- Don't stop processing the keyboard layouts, when no "Keyboard Layouts\Substitudes" key exists (WinXP's input.dll behaves the same way).

Browse source 
Now input.dll already shows us the current selected keyboard layout under ROS :-)
- Make the dialogs a bit wider, so all captions (at least of the german dialog) are shown.
- Fix indentation

svn path=/trunk/; revision=31675
This commit is contained in:
Colin Finck 2008-01-08 21:17:24 +00:00
parent b578852e42
commit 211c9fad23
9 changed files with 1910 additions and 1907 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
reactos/dll/cpl/input/lang/bg-BG.rc
View file

@ -3,19 +3,19 @@ LANGUAGE LANG_BULGARIAN, SUBLANG_DEFAULT
IDD_PROPPAGESETTINGS DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT
STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION
CAPTION "Íàñòðîéêè"
FONT 8, "MS Shell Dlg", 0, 0, 0x0
FONT 8, "MS Shell Dlg"
BEGIN
GROUPBOX "Поздразбиран език на въвеждане", -1, 7,7,231,53
GROUPBOX "Поздразбиран език на въвеждане", -1, 7,7,237,53
LTEXT "Èçáåðåòå êëàâèàòóðíàòà óðåäáà, êîÿòî äà ñå èçïîëçâà ïðè âêëþ÷âàíå íà êîìïþòúðà.",-1,14,18,220,17
COMBOBOX IDC_DEFAULT_INPUT_LANG, 14, 40, 218, 46, CBS_DROPDOWNLIST | CBS_SORT
GROUPBOX "&Сложени услуги", -1, 7,65,231,115
GROUPBOX "&Сложени услуги", -1, 7,65,237,115
LTEXT "Èçáåðåòå óñëóãè çà âñÿêè åçèê íà âúâåæäàíå, ïîêàçàí â ñïèñúêà. Èçïîëçâàéòå „Äîáàâÿíå è ïðåìàõâàíå”, çà äà ïðîìåíèòå ñïèñúêà.",-1,14,75,220,17
CONTROL "TEXT", IDC_KEYLAYOUT_TREE, "SysTreeView32", WS_BORDER | WS_VSCROLL | WS_TABSTOP | 0x00000034, 14, 96, 160, 78
PUSHBUTTON "&Прилагане на подразбираните", IDC_SET_DEFAULT, 179, 106, 53, 14
PUSHBUTTON "&Добавяне...", IDC_ADD_BUTTON, 179, 124, 53, 14
PUSHBUTTON "Пре&махване...", IDC_REMOVE_BUTTON, 179, 142, 53, 14
PUSHBUTTON "&Свойства...", IDC_PROP_BUTTON, 179, 160, 53, 14
GROUPBOX "Предпочитания", -1, 7,185,231,36
PUSHBUTTON "&Прилагане на подразбираните", IDC_SET_DEFAULT, 179, 106, 59, 14
PUSHBUTTON "&Добавяне...", IDC_ADD_BUTTON, 179, 124, 59, 14
PUSHBUTTON "Пре&махване...", IDC_REMOVE_BUTTON, 179, 142, 59, 14
PUSHBUTTON "&Свойства...", IDC_PROP_BUTTON, 179, 160, 59, 14
GROUPBOX "Предпочитания", -1, 7,185,237,36
PUSHBUTTON "Åçèêîâà &ëåíòà...", IDC_LANG_BAR_BUTTON, 14, 198, 70, 14
PUSHBUTTON "Íàñòðîéêà íà &êëàâèøèòå...", IDC_KEY_SETTINGS_BUTTON, 90, 198, 70, 14
END

20
reactos/dll/cpl/input/lang/de-DE.rc
View file

@ -3,21 +3,21 @@ LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL
IDD_PROPPAGESETTINGS DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT
STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION
CAPTION "Einstellungen"
FONT 8, "MS Shell Dlg", 0, 0, 0x0
FONT 8, "MS Shell Dlg"
BEGIN
GROUPBOX "&Standard Eingabesprache", -1, 7,7,231,53
GROUPBOX "&Standard-Eingabesprache", -1, 7,7,237,53
LTEXT "Wählen Sie eine der installieren Sprachen aus, die Sie beim Einschalten des PCs nutzen wollen ",-1,14,18,220,17
COMBOBOX IDC_DEFAULT_INPUT_LANG, 14, 40, 218, 46, CBS_DROPDOWNLIST | CBS_SORT
GROUPBOX "Installierte &Dienste", -1, 7,65,231,115
LTEXT "Wählen Sie die Dienste, die Sie für jede Eingabesprache in der Liste sehen wollen. Nutzen Sie die ""Hinzufügen"" und ""Entfernen"" Schaltflächen um diese Liste zu bearbeiten.",-1,14,75,220,17
GROUPBOX "Installierte &Dienste", -1, 7,65,237,115
LTEXT "Wählen Sie die Dienste für jede Eingabesprache.\nVerwenden Sie die Schaltflächen ""Hinzufügen"" und ""Entfernen"".",-1,14,75,220,17
CONTROL "TEXT", IDC_KEYLAYOUT_TREE, "SysTreeView32", WS_BORDER | WS_VSCROLL | WS_TABSTOP | 0x00000034, 14, 96, 160, 78
PUSHBUTTON "&Als Standard setzen", IDC_SET_DEFAULT, 179, 106, 53, 14
PUSHBUTTON "&Hinzufügen...", IDC_ADD_BUTTON, 179, 124, 53, 14
PUSHBUTTON "Ent&fernen...", IDC_REMOVE_BUTTON, 179, 142, 53, 14
PUSHBUTTON "&Eigenschaften...", IDC_PROP_BUTTON, 179, 160, 53, 14
GROUPBOX "&Einstellungen", -1, 7,185,231,36
PUSHBUTTON "&Als Standard", IDC_SET_DEFAULT, 179, 106, 59, 14
PUSHBUTTON "&Hinzufügen...", IDC_ADD_BUTTON, 179, 124, 59, 14
PUSHBUTTON "Ent&fernen...", IDC_REMOVE_BUTTON, 179, 142, 59, 14
PUSHBUTTON "&Eigenschaften...", IDC_PROP_BUTTON, 179, 160, 59, 14
GROUPBOX "&Einstellungen", -1, 7,185,237,36
PUSHBUTTON "Sprach&leiste...", IDC_LANG_BAR_BUTTON, 14, 198, 70, 14
PUSHBUTTON "&Tasteneinstellungen...", IDC_KEY_SETTINGS_BUTTON, 90, 198, 70, 14
PUSHBUTTON "&Tastatur...", IDC_KEY_SETTINGS_BUTTON, 90, 198, 70, 14
END
IDD_PROPPAGEADVANCED DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT

18
reactos/dll/cpl/input/lang/en-US.rc
View file

@ -3,19 +3,19 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
IDD_PROPPAGESETTINGS DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT
STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION
CAPTION "Settings"
FONT 8, "MS Shell Dlg", 0, 0, 0x0
FONT 8, "MS Shell Dlg"
BEGIN
GROUPBOX "Default input language", -1, 7,7,231,53
GROUPBOX "Default input language", -1, 7,7,237,53
LTEXT "Select one of the installed input languages to use when you start your computer.",-1,14,18,220,17
COMBOBOX IDC_DEFAULT_INPUT_LANG, 14, 40, 218, 46, CBS_DROPDOWNLIST | CBS_SORT
GROUPBOX "&Installed services", -1, 7,65,231,115
LTEXT "Select the services that you want for each input language shown in the list. Use the Add and Remove buttons to modify this list.",-1,14,75,220,17
GROUPBOX "&Installed services", -1, 7,65,237,115
LTEXT "Select the services that you want for each input language shown in the list.\nUse the Add and Remove buttons to modify this list.",-1,14,75,220,17
CONTROL "TEXT", IDC_KEYLAYOUT_TREE, "SysTreeView32", WS_BORDER | WS_VSCROLL | WS_TABSTOP | 0x00000034, 14, 96, 160, 78
PUSHBUTTON "&Set Default", IDC_SET_DEFAULT, 179, 106, 53, 14
PUSHBUTTON "A&dd...", IDC_ADD_BUTTON, 179, 124, 53, 14
PUSHBUTTON "&Remove...", IDC_REMOVE_BUTTON, 179, 142, 53, 14
PUSHBUTTON "&Properties...", IDC_PROP_BUTTON, 179, 160, 53, 14
GROUPBOX "Preferences", -1, 7,185,231,36
PUSHBUTTON "&Set Default", IDC_SET_DEFAULT, 179, 106, 59, 14
PUSHBUTTON "A&dd...", IDC_ADD_BUTTON, 179, 124, 59, 14
PUSHBUTTON "&Remove...", IDC_REMOVE_BUTTON, 179, 142, 59, 14
PUSHBUTTON "&Properties...", IDC_PROP_BUTTON, 179, 160, 59, 14
GROUPBOX "Preferences", -1, 7,185,237,36
PUSHBUTTON "Language &Bar...", IDC_LANG_BAR_BUTTON, 14, 198, 70, 14
PUSHBUTTON "&Key Settings...", IDC_KEY_SETTINGS_BUTTON, 90, 198, 70, 14
END

18
reactos/dll/cpl/input/lang/fr-FR.rc
View file

@ -3,19 +3,19 @@ LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL
IDD_PROPPAGESETTINGS DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT
STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION
CAPTION "Paramètres"
FONT 8, "MS Shell Dlg", 0, 0, 0x0
FONT 8, "MS Shell Dlg"
BEGIN
GROUPBOX "Langue de saisie par défaut", -1, 7,7,231,53
GROUPBOX "Langue de saisie par défaut", -1, 7,7,237,53
LTEXT "Sélectionnez une des langues de saisie installées pour l'utiliser quand vous allumez votre ordinateur.",-1,14,18,220,17
COMBOBOX IDC_DEFAULT_INPUT_LANG, 14, 40, 218, 46, CBS_DROPDOWNLIST | CBS_SORT
GROUPBOX "Services &installés", -1, 7,65,231,115
LTEXT "Sélectionnez les services que vous voulez pour chaque langue de saisie affichée dans la liste. Utilisez les boutons Ajouter et Supprimer pour modifier cette liste.",-1,14,75,220,17
GROUPBOX "Services &installés", -1, 7,65,237,115
LTEXT "Sélectionnez les services que vous voulez pour chaque langue de saisie affichée dans la liste.\nUtilisez les boutons Ajouter et Supprimer pour modifier cette liste.",-1,14,75,220,17
CONTROL "TEXT", IDC_KEYLAYOUT_TREE, "SysTreeView32", WS_BORDER | WS_VSCROLL | WS_TABSTOP | 0x00000034, 14, 96, 160, 78
PUSHBUTTON "Définir par défaut", IDC_SET_DEFAULT, 179, 106, 53, 14
PUSHBUTTON "Ajouter...", IDC_ADD_BUTTON, 179, 124, 53, 14
PUSHBUTTON "Supp&rimer...", IDC_REMOVE_BUTTON, 179, 142, 53, 14
PUSHBUTTON "&Propriétés...", IDC_PROP_BUTTON, 179, 160, 53, 14
GROUPBOX "Préférences", -1, 7,185,231,36
PUSHBUTTON "Définir par défaut", IDC_SET_DEFAULT, 179, 106, 59, 14
PUSHBUTTON "Ajouter...", IDC_ADD_BUTTON, 179, 124, 59, 14
PUSHBUTTON "Supp&rimer...", IDC_REMOVE_BUTTON, 179, 142, 59, 14
PUSHBUTTON "&Propriétés...", IDC_PROP_BUTTON, 179, 160, 59, 14
GROUPBOX "Préférences", -1, 7,185,237,36
PUSHBUTTON "&Barre de langue...", IDC_LANG_BAR_BUTTON, 14, 198, 70, 14
PUSHBUTTON "Paramètres des touches...", IDC_KEY_SETTINGS_BUTTON, 90, 198, 70, 14
END

18
reactos/dll/cpl/input/lang/pl-PL.rc
View file

@ -10,19 +10,19 @@ LANGUAGE LANG_POLISH, SUBLANG_DEFAULT
IDD_PROPPAGESETTINGS DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT
STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION
CAPTION "Ustawienia"
FONT 8, "MS Shell Dlg", 0, 0, 0x0
FONT 8, "MS Shell Dlg"
BEGIN
GROUPBOX "Język domyślny", -1, 7,7,231,53
GROUPBOX "Język domyślny", -1, 7,7,237,53
LTEXT "Wybierz co najmniej jeden z zainstalowanych języków do użycia na twoim komputerze.",-1,14,18,220,17
COMBOBOX IDC_DEFAULT_INPUT_LANG, 14, 40, 218, 46, CBS_DROPDOWNLIST | CBS_SORT
GROUPBOX "&Zainstalowane usługi", -1, 7,65,231,115
LTEXT "Wybierz usługi dla każdego z zainstalowanych języków na liście. Użyj przycisków Dodaj i Usuń aby zmodyfikować liste.",-1,14,75,220,17
GROUPBOX "&Zainstalowane usługi", -1, 7,65,237,115
LTEXT "Wybierz usługi dla każdego z zainstalowanych języków na liście.\nUżyj przycisków Dodaj i Usuń aby zmodyfikować liste.",-1,14,75,220,17
CONTROL "TEXT", IDC_KEYLAYOUT_TREE, "SysTreeView32", WS_BORDER | WS_VSCROLL | WS_TABSTOP | 0x00000034, 14, 96, 160, 78
PUSHBUTTON "&Domyślny", IDC_SET_DEFAULT, 179, 106, 53, 14
PUSHBUTTON "D&odaj...", IDC_ADD_BUTTON, 179, 124, 53, 14
PUSHBUTTON "&Usuń...", IDC_REMOVE_BUTTON, 179, 142, 53, 14
PUSHBUTTON "&Właściwości", IDC_PROP_BUTTON, 179, 160, 53, 14
GROUPBOX "Ustawienia", -1, 7,185,231,36
PUSHBUTTON "&Domyślny", IDC_SET_DEFAULT, 179, 106, 59, 14
PUSHBUTTON "D&odaj...", IDC_ADD_BUTTON, 179, 124, 59, 14
PUSHBUTTON "&Usuń...", IDC_REMOVE_BUTTON, 179, 142, 59, 14
PUSHBUTTON "&Właściwości", IDC_PROP_BUTTON, 179, 160, 59, 14
GROUPBOX "Ustawienia", -1, 7,185,237,36
PUSHBUTTON "&Pasek Języków...", IDC_LANG_BAR_BUTTON, 14, 198, 70, 14
PUSHBUTTON "&Ustawienia klawiszy...", IDC_KEY_SETTINGS_BUTTON, 90, 198, 70, 14
END

18
reactos/dll/cpl/input/lang/ru-RU.rc
View file

@ -5,19 +5,19 @@ LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT
IDD_PROPPAGESETTINGS DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT
STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION
CAPTION "Óñòàíîâêè"
FONT 8, "MS Shell Dlg", 0, 0, 0x0
FONT 8, "MS Shell Dlg"
BEGIN
GROUPBOX "Основной язык ввода", -1, 7,7,231,53
GROUPBOX "Основной язык ввода", -1, 7,7,237,53
LTEXT "Âûáåðèòå îäèí îñíîâíîé ÿçûê ââîäà ïðè âêëþ÷åíèè êîìïüþòåðà.",-1,14,18,220,17
COMBOBOX IDC_DEFAULT_INPUT_LANG, 14, 40, 218, 46, CBS_DROPDOWNLIST | CBS_SORT
GROUPBOX "Ус&тановленные сервисы", -1, 7,65,231,115
LTEXT "Выберите сервис который вы хотите для каждого языка отображонного в листе. Используя клавиши добавление и исключение для изменения листа.",-1,14,75,220,17
GROUPBOX "Ус&тановленные сервисы", -1, 7,65,237,115
LTEXT "Выберите сервис который вы хотите для каждого языка отображонного в листе.\nИспользуя клавиши добавление и исключение для изменения листа.",-1,14,75,220,17
CONTROL "TEXT", IDC_KEYLAYOUT_TREE, "SysTreeView32", WS_BORDER | WS_VSCROLL | WS_TABSTOP | 0x00000034, 14, 96, 160, 78
PUSHBUTTON "&Установить по умолчанию", IDC_SET_DEFAULT, 179, 106, 53, 14
PUSHBUTTON "&Добавить...", IDC_ADD_BUTTON, 179, 124, 53, 14
PUSHBUTTON "&Исключить...", IDC_REMOVE_BUTTON, 179, 142, 53, 14
PUSHBUTTON "&Свойства...", IDC_PROP_BUTTON, 179, 160, 53, 14
GROUPBOX "Свойства", -1, 7,185,231,36
PUSHBUTTON "&Установить по умолчанию", IDC_SET_DEFAULT, 179, 106, 59, 14
PUSHBUTTON "&Добавить...", IDC_ADD_BUTTON, 179, 124, 59, 14
PUSHBUTTON "&Исключить...", IDC_REMOVE_BUTTON, 179, 142, 59, 14
PUSHBUTTON "&Свойства...", IDC_PROP_BUTTON, 179, 160, 59, 14
GROUPBOX "Свойства", -1, 7,185,237,36
PUSHBUTTON "ßçûêîâàÿ ïàíåëü...", IDC_LANG_BAR_BUTTON, 14, 198, 70, 14
PUSHBUTTON "Óñòàíîâêè êëàâèø...", IDC_KEY_SETTINGS_BUTTON, 90, 198, 70, 14
END

18
reactos/dll/cpl/input/lang/uk-UA.rc
View file

@ -11,19 +11,19 @@ LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT
IDD_PROPPAGESETTINGS DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT
STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION
CAPTION "Ïàðàìåòðè"
FONT 8, "MS Shell Dlg", 0, 0, 0x0
FONT 8, "MS Shell Dlg"
BEGIN
GROUPBOX "Мова вводу за замовчуванням", -1, 7,7,231,53
GROUPBOX "Мова вводу за замовчуванням", -1, 7,7,237,53
LTEXT "Âèáåð³òü îäíó ç óñòàíîâëåíèõ ìîâ ââîäó, ÿêà âèêîðèñòîâóâàòèìåòüñÿ ïðè çàïóñêó êîìï'þòåðà.",-1,14,18,220,17
COMBOBOX IDC_DEFAULT_INPUT_LANG, 14, 40, 218, 46, CBS_DROPDOWNLIST | CBS_SORT
GROUPBOX "Установлені служби", -1, 7,65,231,115
LTEXT "Виберіть потрібні служби для кожної мови вводу зі списку. Змінити список можна за допомогою кнопок ""Додати"" та ""Видалити"".",-1,14,75,220,17
GROUPBOX "Установлені служби", -1, 7,65,237,115
LTEXT "Виберіть потрібні служби для кожної мови вводу зі списку.\nЗмінити список можна за допомогою кнопок ""Додати"" та ""Видалити"".",-1,14,75,220,17
CONTROL "Òåêñò", IDC_KEYLAYOUT_TREE, "SysTreeView32", WS_BORDER | WS_VSCROLL | WS_TABSTOP | 0x00000034, 14, 96, 160, 78
PUSHBUTTON "Замов&чування", IDC_SET_DEFAULT, 179, 106, 53, 14
PUSHBUTTON "&Додати...", IDC_ADD_BUTTON, 179, 124, 53, 14
PUSHBUTTON "В&идалити...", IDC_REMOVE_BUTTON, 179, 142, 53, 14
PUSHBUTTON "В&ластивості...", IDC_PROP_BUTTON, 179, 160, 53, 14
GROUPBOX "Настройка", -1, 7,185,231,36
PUSHBUTTON "Замов&чування", IDC_SET_DEFAULT, 179, 106, 59, 14
PUSHBUTTON "&Додати...", IDC_ADD_BUTTON, 179, 124, 59, 14
PUSHBUTTON "В&идалити...", IDC_REMOVE_BUTTON, 179, 142, 59, 14
PUSHBUTTON "В&ластивості...", IDC_PROP_BUTTON, 179, 160, 59, 14
GROUPBOX "Настройка", -1, 7,185,237,36
PUSHBUTTON "&Ìîâíà ïàíåëü...", IDC_LANG_BAR_BUTTON, 14, 198, 70, 14
PUSHBUTTON "&Ïàðàìåòðè êëàâ³àòóðè...", IDC_KEY_SETTINGS_BUTTON, 90, 198, 70, 14
END

3
reactos/dll/cpl/input/resource.h
View file

@ -2,7 +2,7 @@
#define __CPL_RESOURCE_H
/* metrics */
#define PROPSHEETWIDTH 246
#define PROPSHEETWIDTH 252
#define PROPSHEETHEIGHT 228
#define PROPSHEETPADDING 6
#define SYSTEM_COLUMN (0 * PROPSHEETPADDING)
@ -88,6 +88,7 @@
#define IDS_HRD_REC 9
#define IDS_OFF_ADV_TXT_SRV 10
#define IDS_WHATS_THIS 11
/* Layouts */
#define IDS_US_LAYOUT 5000
#define IDS_BELGIAN_LAYOUT 5001

14
reactos/dll/cpl/input/settings.c
View file

@ -174,16 +174,18 @@ InitDefaultLangList(HWND hWnd)
/* FIXME: If it is established more than one English layouts of the keyboard it is incorrectly determined Lang */
GetLocaleInfo(Lcid, LOCALE_SLANGUAGE, (LPTSTR)Lang, sizeof(Lang));
if (RegOpenKeyEx(HKEY_CURRENT_USER, L"Keyboard Layout\\Substitutes", 0, KEY_QUERY_VALUE, &hSubKey) != ERROR_SUCCESS)
return FALSE;
if (RegOpenKeyEx(HKEY_CURRENT_USER, L"Keyboard Layout\\Substitutes", 0, KEY_QUERY_VALUE, &hSubKey) == ERROR_SUCCESS)
{
dwBufLen = BUFSIZE;
TCHAR szLOName[BUFSIZE], szBuf[BUFSIZE];
LONG Ret;
HTREEITEM hRoot = 0, hKeyBrd = 0, hParent;
Ret = RegQueryValueEx(hSubKey,(LPCTSTR)szPreload,NULL,NULL,(LPBYTE)szSub,&dwBufLen);
if (Ret == ERROR_SUCCESS) _tcscpy(szPreload, szSub);
if (Ret == ERROR_SUCCESS)
_tcscpy(szPreload, szSub);
}
TCHAR szLOName[BUFSIZE], szBuf[BUFSIZE];
HTREEITEM hRoot = 0, hKeyBrd = 0, hParent;
GetLayoutName(szPreload,szLOName);