Fix indentation (TABs --> Spaces).

Use BEGIN and END instead of { and } in resource scripts.

svn path=/trunk/; revision=29706
This commit is contained in:
Eric Kohl 2007-10-20 11:08:23 +00:00
parent 4c94f55c72
commit 47fe787a9e
14 changed files with 769 additions and 753 deletions

View file

@ -137,13 +137,12 @@ AddDlgProc(HWND hDlg,
switch (message)
{
case WM_INITDIALOG:
{
CreateLanguagesList(GetDlgItem(hDlg, IDC_INPUT_LANGUAGE_COMBO));
CreateKeyboardLayoutList(GetDlgItem(hDlg, IDC_KEYBOARD_LAYOUT_COMBO));
SelectCurrentLayout(GetDlgItem(hDlg, IDC_KEYBOARD_LAYOUT_COMBO));
}
break;
case WM_COMMAND:
{
switch (LOWORD(wParam))
{
case IDC_INPUT_LANGUAGE_COMBO:
@ -152,14 +151,13 @@ AddDlgProc(HWND hDlg,
SelectCurrentLayout(GetDlgItem(hDlg, IDC_KEYBOARD_LAYOUT_COMBO));
}
break;
case IDOK:
case IDOK:
break;
case IDCANCEL:
EndDialog(hDlg,LOWORD(wParam));
EndDialog(hDlg, LOWORD(wParam));
return TRUE;
break;
}
}
break;
}

View file

@ -41,16 +41,17 @@
/* Property page dialog callback */
INT_PTR CALLBACK
AdvancedPageProc(HWND hwndDlg,UINT uMsg,WPARAM wParam,LPARAM lParam)
AdvancedPageProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam)
{
UNREFERENCED_PARAMETER(lParam);
UNREFERENCED_PARAMETER(wParam);
UNREFERENCED_PARAMETER(hwndDlg);
switch(uMsg)
switch (uMsg)
{
case WM_INITDIALOG:
break;
case WM_COMMAND:
switch (LOWORD(wParam))
{

View file

@ -50,21 +50,18 @@ ChangeKeySeqDlgProc(HWND hDlg,
switch (message)
{
case WM_INITDIALOG:
{
break;
}
case WM_COMMAND:
{
switch (LOWORD(wParam))
{
case IDOK:
break;
break;
case IDCANCEL:
EndDialog(hDlg,LOWORD(wParam));
EndDialog(hDlg, LOWORD(wParam));
break;
}
}
break;
}

View file

@ -50,6 +50,7 @@ APPLET Applets[NUM_APPLETS] =
{IDI_CPLSYSTEM, IDS_CPLSYSTEMNAME, IDS_CPLSYSTEMDESCRIPTION, SystemApplet}
};
VOID
InitPropSheetPage(PROPSHEETPAGE *psp, WORD idDlg, DLGPROC DlgProc)
{
@ -102,7 +103,7 @@ CPlApplet(HWND hwndCPl, UINT uMsg, LPARAM lParam1, LPARAM lParam2)
UNREFERENCED_PARAMETER(hwndCPl);
i = (DWORD)lParam1;
switch(uMsg)
switch (uMsg)
{
case CPL_INIT:
return TRUE;
@ -131,13 +132,15 @@ BOOL WINAPI
DllMain(HINSTANCE hinstDLL, DWORD dwReason, LPVOID lpvReserved)
{
UNREFERENCED_PARAMETER(lpvReserved);
switch(dwReason)
switch (dwReason)
{
case DLL_PROCESS_ATTACH:
case DLL_THREAD_ATTACH:
hApplet = hinstDLL;
break;
}
return TRUE;
}

View file

@ -62,22 +62,20 @@ InputLangPropDlgProc(HWND hDlg,
switch (message)
{
case WM_INITDIALOG:
{
CreateKeyboardLayoutList(GetDlgItem(hDlg, IDC_KEYBOARD_LAYOUT_IME_COMBO));
SelectKeyboardLayout(GetDlgItem(hDlg, IDC_KEYBOARD_LAYOUT_IME_COMBO));
}
break;
case WM_COMMAND:
{
switch (LOWORD(wParam))
{
case IDOK:
break;
case IDCANCEL:
EndDialog(hDlg,LOWORD(wParam));
break;
}
}
break;
}

View file

@ -50,11 +50,9 @@ KeySettingsDlgProc(HWND hDlg,
switch (message)
{
case WM_INITDIALOG:
{
break;
}
case WM_COMMAND:
{
switch (LOWORD(wParam))
{
case IDC_CHANGE_KEY_SEQ_BUTTON:
@ -63,14 +61,14 @@ KeySettingsDlgProc(HWND hDlg,
hDlg,
ChangeKeySeqDlgProc);
break;
case IDOK:
case IDOK:
break;
case IDCANCEL:
EndDialog(hDlg,LOWORD(wParam));
EndDialog(hDlg, LOWORD(wParam));
break;
}
}
break;
}

View file

@ -114,7 +114,7 @@ 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"
{
BEGIN
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
@ -127,13 +127,13 @@ FONT 8, "MS Shell Dlg"
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
}
END
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"
{
BEGIN
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
@ -144,13 +144,13 @@ FONT 8, "MS Shell Dlg"
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
}
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"
{
BEGIN
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
@ -164,13 +164,13 @@ FONT 8, "MS Shell Dlg"
AUTORADIOBUTTON "Left A&LT", 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
}
END
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"
{
BEGIN
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
@ -186,13 +186,13 @@ FONT 8, "MS Shell Dlg"
AUTORADIOBUTTON "Left A&LT", 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
}
END
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"
{
BEGIN
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
@ -208,13 +208,13 @@ FONT 8, "MS Shell Dlg"
AUTORADIOBUTTON "Left A&LT", 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
}
END
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"
{
BEGIN
LTEXT "", 1240, 16, 5, 250, 10
GROUPBOX "", -1, 12, 17, 184, 48
AUTOCHECKBOX "&Enable Key Sequence", 1249, 17, 17, 85, 8
@ -227,7 +227,13 @@ FONT 8, "MS Shell Dlg"
COMBOBOX 1236, 127, 34, 46, 48, CBS_DROPDOWNLIST | WS_VSCROLL
DEFPUSHBUTTON "OK", IDOK, 212, 25, 50, 14
PUSHBUTTON "Cancel", IDCANCEL, 212, 47, 50, 14
}
END
STRINGTABLE
BEGIN
IDS_CPLSYSTEMNAME "Textdienste und Eingabesprachen"
IDS_CPLSYSTEMDESCRIPTION "Ändert die Einstellungen der Texteingabe einer Sprache."
END
STRINGTABLE
BEGIN
@ -235,8 +241,6 @@ BEGIN
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"
IDS_BELGIAN_LAYOUT, "Belgisch (Punkt)"
IDS_BELGIAN_FRENCH_LAYOUT, "Belgisch (Wallonisch)"

View file

@ -82,7 +82,7 @@ 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"
{
BEGIN
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
@ -95,13 +95,13 @@ FONT 8, "MS Shell Dlg"
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
}
END
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"
{
BEGIN
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
@ -112,7 +112,7 @@ FONT 8, "MS Shell Dlg"
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
}
END
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
@ -137,7 +137,7 @@ 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"
{
BEGIN
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
@ -151,13 +151,13 @@ FONT 8, "MS Shell Dlg"
AUTORADIOBUTTON "Left A&LT", 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
}
END
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"
{
BEGIN
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
@ -173,13 +173,13 @@ FONT 8, "MS Shell Dlg"
AUTORADIOBUTTON "Left A&LT", 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
}
END
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"
{
BEGIN
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
@ -195,13 +195,13 @@ FONT 8, "MS Shell Dlg"
AUTORADIOBUTTON "Left A&LT", 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
}
END
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"
{
BEGIN
LTEXT "", 1240, 16, 5, 250, 10
GROUPBOX "", -1, 12, 17, 184, 48
AUTOCHECKBOX "&Enable Key Sequence", 1249, 17, 17, 85, 8
@ -214,7 +214,7 @@ FONT 8, "MS Shell Dlg"
COMBOBOX 1236, 127, 34, 46, 48, CBS_DROPDOWNLIST | WS_VSCROLL
DEFPUSHBUTTON "OK", IDOK, 212, 25, 50, 14
PUSHBUTTON "Cancel", IDCANCEL, 212, 47, 50, 14
}
END
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
@ -229,15 +229,18 @@ BEGIN
PUSHBUTTON "Cancel", IDCANCEL, 169, 53, 52, 14
END
STRINGTABLE
BEGIN
IDS_CPLSYSTEMNAME "Text Services and Input Languages"
IDS_CPLSYSTEMDESCRIPTION "Customizes settings for text input of languages."
END
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"
IDS_BELGIAN_LAYOUT, "Belgian (Period)"
IDS_BELGIAN_FRENCH_LAYOUT, "Belgian French"

View file

@ -114,7 +114,7 @@ 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 "Ajouter une langue de saisie"
FONT 8, "MS Shell Dlg"
{
BEGIN
LTEXT "Langue de sa&isie:", -1, 7, 7, 61, 10
COMBOBOX IDC_INPUT_LANG_COMBO, 7, 17, 105, 60, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL
AUTOCHECKBOX "Configuration clavier/IME:", IDC_KEYBOARD_LO_CHECKBOX, 37, 36, 110, 10
@ -127,13 +127,13 @@ FONT 8, "MS Shell Dlg"
COMBOBOX IDC_MORE_TEXT_SERV_COMBO, 49, 134, 200, 60, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL
DEFPUSHBUTTON "OK", IDOK, 146, 155, 50, 14
PUSHBUTTON "Annuler", IDCANCEL, 199, 155, 50, 14
}
END
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 "Ajouter une langue de saisie"
FONT 8, "MS Shell Dlg"
{
BEGIN
LTEXT "Langue de sa&isie:", -1, 7, 7, 61, 10
COMBOBOX IDC_INPUT_LANG_COMBO, 7, 17, 105, 60, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL
AUTOCHECKBOX "Configuration clavier/IME:", IDC_KEYBOARD_LO_CHECKBOX, 37, 36, 110, 10
@ -144,13 +144,13 @@ FONT 8, "MS Shell Dlg"
COMBOBOX IDC_SPEECH_COMBO, 49, 105, 200, 60, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL
DEFPUSHBUTTON "OK", IDOK, 146, 126, 50, 14
PUSHBUTTON "Annuler", IDCANCEL, 199, 126, 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 "Changer la séquence de touche"
FONT 8, "MS Shell Dlg"
{
BEGIN
GROUPBOX "", -1, 9, 5, 209, 60
AUTOCHECKBOX "Échanger le&s langues de saisie", IDC_SWITCH_INPUT_LANG_CHECKBOX, 15, 15, 90, 12
LTEXT "SHIFT", -1, 73, 37, 27, 12
@ -164,13 +164,13 @@ FONT 8, "MS Shell Dlg"
AUTORADIOBUTTON "A&LT gauche", IDC_LAYOUT_LEFTALT_RADIOBTN, 135, 45, 40, 12, NOT WS_TABSTOP
DEFPUSHBUTTON "OK", IDOK, 227, 18, 50, 14
PUSHBUTTON "Annuler", IDCANCEL, 227, 44, 50, 14
}
END
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 "Changer la séquence de touche"
FONT 8, "MS Shell Dlg"
{
BEGIN
GROUPBOX "", -1, 9, 5, 174, 110
AUTOCHECKBOX "Échanger le&s langues de saisie", IDC_SWITCH_INPUT_LANG_CHECKBOX, 15, 15, 90, 12
LTEXT "SHIFT", -1, 73, 37, 27, 12
@ -186,13 +186,13 @@ FONT 8, "MS Shell Dlg"
AUTORADIOBUTTON "A&LT gauche", IDC_LAYOUT_LEFTALT_RADIOBTN, 29, 95, 40, 12, NOT WS_TABSTOP
DEFPUSHBUTTON "OK", IDOK, 192, 25, 50, 14
PUSHBUTTON "Annuler", IDCANCEL, 192, 47, 50, 14
}
END
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 "Changer la séquence de touche"
FONT 8, "MS Shell Dlg"
{
BEGIN
GROUPBOX "", -1, 9, 5, 174, 110
AUTOCHECKBOX "Échanger le&s langues de saisie", IDC_SWITCH_INPUT_LANG_CHECKBOX, 15, 15, 90, 12
LTEXT "SHIFT", -1, 73, 37, 27, 12
@ -208,13 +208,13 @@ FONT 8, "MS Shell Dlg"
AUTORADIOBUTTON "A&LT gauche", IDC_LAYOUT_LEFTALT_RADIOBTN, 29, 95, 40, 12, NOT WS_TABSTOP
DEFPUSHBUTTON "OK", IDOK, 192, 25, 50, 14
PUSHBUTTON "Annuler", IDCANCEL, 192, 47, 50, 14
}
END
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 "Changer la séquence de touche"
FONT 8, "MS Shell Dlg"
{
BEGIN
LTEXT "", 1240, 16, 5, 250, 10
GROUPBOX "", -1, 12, 17, 184, 48
AUTOCHECKBOX "Activ&er la séquence de touche", 1249, 17, 17, 85, 8
@ -227,7 +227,13 @@ FONT 8, "MS Shell Dlg"
COMBOBOX 1236, 127, 34, 46, 48, CBS_DROPDOWNLIST | WS_VSCROLL
DEFPUSHBUTTON "OK", IDOK, 212, 25, 50, 14
PUSHBUTTON "Annuler", IDCANCEL, 212, 47, 50, 14
}
END
STRINGTABLE
BEGIN
IDS_CPLSYSTEMNAME "Services texte et langue de saisie"
IDS_CPLSYSTEMDESCRIPTION "Personnalise les paramètres pour la langue de saisie de texte."
END
/* FIXME : To improve/complete */
/* FIXME : À améliorer/compléter */
@ -237,8 +243,6 @@ BEGIN
IDS_SELECTED_LANGUAGE "Anglais (États-Unis)"
//Selected keyboard layout on "Add Input language"
IDS_SELECTED_LAYOUT, "États-Unis-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"
IDS_BELGIAN_LAYOUT, "Belge (Period)"
IDS_BELGIAN_FRENCH_LAYOUT, "Belge Français"

View file

@ -122,7 +122,7 @@ 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 "Äîäàâàííÿ ìîâè ââîäó"
FONT 8, "MS Shell Dlg"
{
BEGIN
LTEXT "&Ìîâà ââîäó:", -1, 7, 7, 61, 10
COMBOBOX IDC_INPUT_LANG_COMBO, 7, 17, 105, 60, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL
AUTOCHECKBOX "&Ðîçêëàäêà êëàâ³àòóðè àáî çàñ³á ââîäó (IME):", IDC_KEYBOARD_LO_CHECKBOX, 37, 36, 110, 10
@ -135,13 +135,13 @@ FONT 8, "MS Shell Dlg"
COMBOBOX IDC_MORE_TEXT_SERV_COMBO, 49, 134, 200, 60, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL
DEFPUSHBUTTON "OK", IDOK, 146, 155, 50, 14
PUSHBUTTON "Ñêàñóâàòè", IDCANCEL, 199, 155, 50, 14
}
END
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 "Äîäàâàííÿ ìîâè ââîäó"
FONT 8, "MS Shell Dlg"
{
BEGIN
LTEXT "&Ìîâà ââîäó:", -1, 7, 7, 61, 10
COMBOBOX IDC_INPUT_LANG_COMBO, 7, 17, 105, 60, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL
AUTOCHECKBOX "&Ðîçêëàäêà êëàâ³àòóðè àáî çàñ³á ââîäó (IME):", IDC_KEYBOARD_LO_CHECKBOX, 37, 36, 110, 10
@ -152,13 +152,13 @@ FONT 8, "MS Shell Dlg"
COMBOBOX IDC_SPEECH_COMBO, 49, 105, 200, 60, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL
DEFPUSHBUTTON "OK", IDOK, 146, 126, 50, 14
PUSHBUTTON "Ñêàñóâàòè", IDCANCEL, 199, 126, 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 "Çì³íà ñïîëó÷åííÿ êëàâ³ø"
FONT 8, "MS Shell Dlg"
{
BEGIN
GROUPBOX "", -1, 9, 5, 209, 60
AUTOCHECKBOX "&Ïåðåêëþ÷àòè ìîâè ââîäó", IDC_SWITCH_INPUT_LANG_CHECKBOX, 15, 15, 90, 12
LTEXT "SHIFT", -1, 73, 37, 27, 12
@ -172,13 +172,13 @@ FONT 8, "MS Shell Dlg"
AUTORADIOBUTTON "ALT &çë³âà", IDC_LAYOUT_LEFTALT_RADIOBTN, 135, 45, 40, 12, NOT WS_TABSTOP
DEFPUSHBUTTON "OK", IDOK, 227, 18, 50, 14
PUSHBUTTON "Ñêàñóâàòè", IDCANCEL, 227, 44, 50, 14
}
END
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 "Çì³íà ñïîëó÷åííÿ êëàâ³ø"
FONT 8, "MS Shell Dlg"
{
BEGIN
GROUPBOX "", -1, 9, 5, 174, 110
AUTOCHECKBOX "&Ïåðåêëþ÷àòè ìîâè ââîäó", IDC_SWITCH_INPUT_LANG_CHECKBOX, 15, 15, 90, 12
LTEXT "SHIFT", -1, 73, 37, 27, 12
@ -194,13 +194,13 @@ FONT 8, "MS Shell Dlg"
AUTORADIOBUTTON "ALT &çë³âà", IDC_LAYOUT_LEFTALT_RADIOBTN, 29, 95, 40, 12, NOT WS_TABSTOP
DEFPUSHBUTTON "OK", IDOK, 192, 25, 50, 14
PUSHBUTTON "Ñêàñóâàòè", IDCANCEL, 192, 47, 50, 14
}
END
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 "Çì³íà ñïîëó÷åííÿ êëàâ³ø"
FONT 8, "MS Shell Dlg"
{
BEGIN
GROUPBOX "", -1, 9, 5, 174, 110
AUTOCHECKBOX "&Ïåðåêëþ÷àòè ìîâè ââîäó", IDC_SWITCH_INPUT_LANG_CHECKBOX, 15, 15, 90, 12
LTEXT "SHIFT", -1, 73, 37, 27, 12
@ -216,13 +216,13 @@ FONT 8, "MS Shell Dlg"
AUTORADIOBUTTON "ALT &çë³âà", IDC_LAYOUT_LEFTALT_RADIOBTN, 29, 95, 40, 12, NOT WS_TABSTOP
DEFPUSHBUTTON "OK", IDOK, 192, 25, 50, 14
PUSHBUTTON "Ñêàñóâàòè", IDCANCEL, 192, 47, 50, 14
}
END
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 "Çì³íà ñïîëó÷åííÿ êëàâ³ø"
FONT 8, "MS Shell Dlg"
{
BEGIN
LTEXT "", 1240, 16, 5, 250, 10
GROUPBOX "", -1, 12, 17, 184, 48
AUTOCHECKBOX "&Âèêîðèñòîâóâàòè ñïîëó÷åííÿ êëàâ³ø", 1249, 17, 17, 85, 8
@ -235,7 +235,14 @@ FONT 8, "MS Shell Dlg"
COMBOBOX 1236, 127, 34, 46, 48, CBS_DROPDOWNLIST | WS_VSCROLL
DEFPUSHBUTTON "OK", IDOK, 212, 25, 50, 14
PUSHBUTTON "Ñêàñóâàòè", IDCANCEL, 212, 47, 50, 14
}
END
STRINGTABLE
BEGIN
IDS_CPLSYSTEMNAME "Ìîâè òà ñëóæáè òåêñòîâîãî ââîäó"
IDS_CPLSYSTEMDESCRIPTION "Íàëàøòîâóº ïàðàìåòðè äëÿ òåêñòîâîãî ââîäó."
END
STRINGTABLE
BEGIN
@ -243,8 +250,6 @@ BEGIN
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, "ÑØÀ"
IDS_BELGIAN_LAYOUT, "Áåëüã³éñüêà (³ç êðàïêîþ)"
IDS_BELGIAN_FRENCH_LAYOUT, "Ôðàíöóçüêà (Áåëüã³ÿ)"

View file

@ -50,21 +50,18 @@ LangBarDlgProc(HWND hDlg,
switch (message)
{
case WM_INITDIALOG:
{
break;
}
case WM_COMMAND:
{
switch (LOWORD(wParam))
{
case IDOK:
break;
break;
case IDCANCEL:
EndDialog(hDlg,LOWORD(wParam));
EndDialog(hDlg, LOWORD(wParam));
break;
}
}
break;
}

View file

@ -46,18 +46,20 @@ CreateKeyboardLayoutList(HWND hWnd)
int Index;
UINT loIndex;
for ( loIndex = BEGIN_LAYOUT; loIndex <= END_LAYOUT; 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,

View file

@ -56,6 +56,7 @@ CreateDefaultLangList(HWND hWnd)
{
return FALSE;
}
RegQueryInfoKey(hKey,NULL,NULL,NULL,NULL,NULL,NULL,&cValues,NULL,NULL,NULL,NULL);
if (cValues)
@ -96,6 +97,7 @@ INT_PTR CALLBACK
SettingPageProc(HWND hwndDlg,UINT uMsg,WPARAM wParam,LPARAM lParam)
{
UNREFERENCED_PARAMETER(lParam);
switch (uMsg)
{
case WM_INITDIALOG:
@ -111,24 +113,28 @@ SettingPageProc(HWND hwndDlg,UINT uMsg,WPARAM wParam,LPARAM lParam)
hwndDlg,
LangBarDlgProc);
break;
case IDC_KEY_SETTINGS_BUTTON:
DialogBox(hApplet,
MAKEINTRESOURCE(IDD_KEYSETTINGS),
hwndDlg,
KeySettingsDlgProc);
break;
case IDC_ADD_BUTTON:
DialogBox(hApplet,
MAKEINTRESOURCE(IDD_ADD),
hwndDlg,
AddDlgProc);
break;
case IDC_PROP_BUTTON:
DialogBox(hApplet,
MAKEINTRESOURCE(IDD_INPUT_LANG_PROP),
hwndDlg,
InputLangPropDlgProc);
break;
case IDC_DEFAULT_INPUT_LANG:
if (HIWORD(wParam) == CBN_SELCHANGE)
{