[tretiakov] 25890: Move primary language selection from Input Locale page to General page.
Author: tretiakov Date: Fri Feb 23 12:35:32 2007 New Revision: 25890
URL: http://svn.reactos.org/svn/reactos?rev=25890&view=rev Log: Move primary language selection from Input Locale page to General page.
Added: trunk/reactos/dll/cpl/intl/generalp.c - copied, changed from r25798, trunk/reactos/dll/cpl/intl/locale.c trunk/reactos/dll/cpl/intl/inplocale.c - copied, changed from r25798, trunk/reactos/dll/cpl/intl/general.c Removed: trunk/reactos/dll/cpl/intl/general.c trunk/reactos/dll/cpl/intl/locale.c Modified: trunk/reactos/dll/cpl/intl/Fr.rc trunk/reactos/dll/cpl/intl/Ja.rc trunk/reactos/dll/cpl/intl/cz.rc trunk/reactos/dll/cpl/intl/de.rc trunk/reactos/dll/cpl/intl/en.rc trunk/reactos/dll/cpl/intl/es.rc trunk/reactos/dll/cpl/intl/hu.rc trunk/reactos/dll/cpl/intl/intl.c trunk/reactos/dll/cpl/intl/intl.h trunk/reactos/dll/cpl/intl/intl.rbuild trunk/reactos/dll/cpl/intl/it.rc trunk/reactos/dll/cpl/intl/nl.rc trunk/reactos/dll/cpl/intl/ru.rc trunk/reactos/dll/cpl/intl/sv.rc trunk/reactos/dll/cpl/intl/uk.rc
Modified: trunk/reactos/dll/cpl/intl/Fr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/Fr.rc?rev=2589... ============================================================================== --- trunk/reactos/dll/cpl/intl/Fr.rc (original) +++ trunk/reactos/dll/cpl/intl/Fr.rc Fri Feb 23 12:35:32 2007 @@ -7,7 +7,10 @@ CAPTION "Général" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Page de propriétés 1",-1,73,74,90,8 + GROUPBOX "Langue principale", -1, 8, 11, 228, 74 + ICON IDC_FLAGS, IDC_ICON1, 12, 26, 21, 20, SS_ICON + LTEXT "Sélectionnez la langue principale que vous voulez utiliser:", -1, 38, 25, 193, 22 + COMBOBOX IDC_LANGUAGELIST, 39, 49, 191, 83, CBS_DROPDOWNLIST | CBS_SORT | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL END
@@ -86,10 +89,7 @@ CAPTION "Langues" FONT 8, "MS Shell Dlg" BEGIN - GROUPBOX "Langue principale", -1, 8, 11, 228, 74 - ICON IDC_FLAGS, IDC_ICON1, 12, 26, 21, 20, SS_ICON - LTEXT "Sélectionnez la langue principale que vous voulez utiliser:", -1, 38, 25, 193, 22 - COMBOBOX IDC_LANGUAGELIST, 39, 49, 191, 83, CBS_DROPDOWNLIST | CBS_SORT | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL + END
Modified: trunk/reactos/dll/cpl/intl/Ja.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/Ja.rc?rev=2589... ============================================================================== --- trunk/reactos/dll/cpl/intl/Ja.rc (original) +++ trunk/reactos/dll/cpl/intl/Ja.rc Fri Feb 23 12:35:32 2007 @@ -5,7 +5,10 @@ CAPTION "SÊ" FONT 9, "MS UI Gothic" BEGIN - LTEXT "Property Page 1",-1,73,74,90,8 + GROUPBOX "gp¾ê", -1, 8, 11, 228, 74 + ICON IDC_FLAGS, IDC_ICON1, 12, 26, 21, 20, SS_ICON + LTEXT "gpµ½¢¾êÆnæÝèðIðµÄ¾³¢:", -1, 38, 25, 193, 22 + COMBOBOX IDC_LANGUAGELIST, 39, 49, 191, 83, CBS_DROPDOWNLIST | CBS_SORT | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL END
@@ -83,10 +86,7 @@ CAPTION "ü;ê" FONT 9, "MS UI Gothic" BEGIN - GROUPBOX "gp¾ê", -1, 8, 11, 228, 74 - ICON IDC_FLAGS, IDC_ICON1, 12, 26, 21, 20, SS_ICON - LTEXT "gpµ½¢¾êÆnæÝèðIðµÄ¾³¢:", -1, 38, 25, 193, 22 - COMBOBOX IDC_LANGUAGELIST, 39, 49, 191, 83, CBS_DROPDOWNLIST | CBS_SORT | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL + END
Modified: trunk/reactos/dll/cpl/intl/cz.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/cz.rc?rev=2589... ============================================================================== --- trunk/reactos/dll/cpl/intl/cz.rc (original) +++ trunk/reactos/dll/cpl/intl/cz.rc Fri Feb 23 12:35:32 2007 @@ -7,7 +7,10 @@ CAPTION "Obecné nastavení" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Property Page 1",-1,73,74,90,8 + GROUPBOX "Výchozí jazyk", -1, 8, 11, 228, 74 + ICON IDC_FLAGS, IDC_ICON1, 12, 26, 21, 20, SS_ICON + LTEXT "Vyberte jazyk, ve kterém bude systém zobrazovat dialogy a hláení:", -1, 38, 25, 193, 22 + COMBOBOX IDC_LANGUAGELIST, 39, 49, 191, 83, CBS_DROPDOWNLIST | CBS_SORT | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL END
@@ -85,10 +88,7 @@ CAPTION "Jazyky" FONT 8, "MS Shell Dlg" BEGIN - GROUPBOX "Výchozí jazyk", -1, 8, 11, 228, 74 - ICON IDC_FLAGS, IDC_ICON1, 12, 26, 21, 20, SS_ICON - LTEXT "Vyberte jazyk, ve kterém bude systém zobrazovat dialogy a hláení:", -1, 38, 25, 193, 22 - COMBOBOX IDC_LANGUAGELIST, 39, 49, 191, 83, CBS_DROPDOWNLIST | CBS_SORT | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL + END
Modified: trunk/reactos/dll/cpl/intl/de.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/de.rc?rev=2589... ============================================================================== --- trunk/reactos/dll/cpl/intl/de.rc (original) +++ trunk/reactos/dll/cpl/intl/de.rc Fri Feb 23 12:35:32 2007 @@ -7,7 +7,10 @@ CAPTION "Allgemein" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Property Page 1",-1,73,74,90,8 + GROUPBOX "Standardsprache", -1, 8, 11, 228, 74 + ICON IDC_FLAGS, IDC_ICON1, 12, 26, 21, 20, SS_ICON + LTEXT "Wählen Sie eine Sprache und Region aus welche Sie benutzen wollen:", -1, 38, 25, 193, 22 + COMBOBOX IDC_LANGUAGELIST, 39, 49, 191, 83, CBS_DROPDOWNLIST | CBS_SORT | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL END
@@ -85,10 +88,7 @@ CAPTION "Regionale Einstellungen" FONT 8, "MS Shell Dlg" BEGIN - GROUPBOX "Standardsprache", -1, 8, 11, 228, 74 - ICON IDC_FLAGS, IDC_ICON1, 12, 26, 21, 20, SS_ICON - LTEXT "Wählen Sie eine Sprache und Region aus welche Sie benutzen wollen:", -1, 38, 25, 193, 22 - COMBOBOX IDC_LANGUAGELIST, 39, 49, 191, 83, CBS_DROPDOWNLIST | CBS_SORT | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL + END
Modified: trunk/reactos/dll/cpl/intl/en.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/en.rc?rev=2589... ============================================================================== --- trunk/reactos/dll/cpl/intl/en.rc (original) +++ trunk/reactos/dll/cpl/intl/en.rc Fri Feb 23 12:35:32 2007 @@ -7,7 +7,10 @@ CAPTION "General" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Property Page 1",-1,73,74,90,8 + GROUPBOX "Primary language", -1, 8, 11, 228, 74 + ICON IDC_FLAGS, IDC_ICON1, 12, 26, 21, 20, SS_ICON + LTEXT "Select the primary language and region you want to use:", -1, 38, 25, 193, 22 + COMBOBOX IDC_LANGUAGELIST, 39, 49, 191, 83, CBS_DROPDOWNLIST | CBS_SORT | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL END
@@ -86,10 +89,7 @@ CAPTION "Input Locale" FONT 8, "MS Shell Dlg" BEGIN - GROUPBOX "Primary language", -1, 8, 11, 228, 74 - ICON IDC_FLAGS, IDC_ICON1, 12, 26, 21, 20, SS_ICON - LTEXT "Select the primary language and region you want to use:", -1, 38, 25, 193, 22 - COMBOBOX IDC_LANGUAGELIST, 39, 49, 191, 83, CBS_DROPDOWNLIST | CBS_SORT | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL + LTEXT "Input Locale Page",-1,73,74,90,8 END
Modified: trunk/reactos/dll/cpl/intl/es.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/es.rc?rev=2589... ============================================================================== --- trunk/reactos/dll/cpl/intl/es.rc (original) +++ trunk/reactos/dll/cpl/intl/es.rc Fri Feb 23 12:35:32 2007 @@ -11,7 +11,10 @@ CAPTION "General" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Property Page 1",-1,73,74,90,8 + GROUPBOX "Lenguaje Primario", -1, 8, 11, 228, 74 + ICON IDC_FLAGS, IDC_ICON1, 12, 26, 21, 20, SS_ICON + LTEXT "Seleccione el lenguaje primario y la región que desea usar:", -1, 38, 25, 193, 22 + COMBOBOX IDC_LANGUAGELIST, 39, 49, 191, 83, CBS_DROPDOWNLIST | CBS_SORT | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL END
@@ -90,10 +93,7 @@ CAPTION "Localidad" FONT 8, "MS Shell Dlg" BEGIN - GROUPBOX "Lenguaje Primario", -1, 8, 11, 228, 74 - ICON IDC_FLAGS, IDC_ICON1, 12, 26, 21, 20, SS_ICON - LTEXT "Seleccione el lenguaje primario y la región que desea usar:", -1, 38, 25, 193, 22 - COMBOBOX IDC_LANGUAGELIST, 39, 49, 191, 83, CBS_DROPDOWNLIST | CBS_SORT | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL + END
Removed: trunk/reactos/dll/cpl/intl/general.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/general.c?rev=... ============================================================================== --- trunk/reactos/dll/cpl/intl/general.c (original) +++ trunk/reactos/dll/cpl/intl/general.c (removed) @@ -1,51 +1,0 @@ -/* - * ReactOS - * Copyright (C) 2004 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. - */ -/* $Id$ - * - * PROJECT: ReactOS International Control Panel - * FILE: lib/cpl/intl/general.c - * PURPOSE: General property page - * PROGRAMMER: Eric Kohl - */ - -#include <windows.h> -#include <commctrl.h> -#include <prsht.h> -#include <cpl.h> - -#include "intl.h" -#include "resource.h" - - -/* Property page dialog callback */ -INT_PTR CALLBACK -GeneralPageProc(HWND hwndDlg, - UINT uMsg, - WPARAM wParam, - LPARAM lParam) -{ - switch(uMsg) - { - case WM_INITDIALOG: - break; - } - return FALSE; -} - -/* EOF */
Copied: trunk/reactos/dll/cpl/intl/generalp.c (from r25798, trunk/reactos/dll/cpl/intl/locale.c) URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/generalp.c?p2=... ============================================================================== --- trunk/reactos/dll/cpl/intl/locale.c (original) +++ trunk/reactos/dll/cpl/intl/generalp.c Fri Feb 23 12:35:32 2007 @@ -19,8 +19,8 @@ /* $Id$ * * PROJECT: ReactOS International Control Panel - * FILE: lib/cpl/intl/locale.c - * PURPOSE: Locale property page + * FILE: lib/cpl/intl/generalp.c + * PURPOSE: General property page * PROGRAMMER: Eric Kohl * Klemens Friedl * Aleksey Bragin @@ -176,7 +176,7 @@
/* Property page dialog callback */ INT_PTR CALLBACK -LocalePageProc(HWND hwndDlg, +GeneralPageProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam)
Modified: trunk/reactos/dll/cpl/intl/hu.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/hu.rc?rev=2589... ============================================================================== --- trunk/reactos/dll/cpl/intl/hu.rc (original) +++ trunk/reactos/dll/cpl/intl/hu.rc Fri Feb 23 12:35:32 2007 @@ -6,7 +6,10 @@ CAPTION "Általános" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "1. tulajdonságlap",-1,73,74,90,8 + GROUPBOX "Elsõdleges nyelv", -1, 8, 11, 228, 74 + ICON IDC_FLAGS, IDC_ICON1, 12, 26, 21, 20, SS_ICON + LTEXT "Válassza ki azt a nyelvet és földrajzi helyet, amit használni akar:", -1, 38, 25, 193, 22 + COMBOBOX IDC_LANGUAGELIST, 39, 49, 191, 83, CBS_DROPDOWNLIST | CBS_SORT | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL END
@@ -85,10 +88,7 @@ CAPTION "Hely megadása" FONT 8, "MS Shell Dlg" BEGIN - GROUPBOX "Elsõdleges nyelv", -1, 8, 11, 228, 74 - ICON IDC_FLAGS, IDC_ICON1, 12, 26, 21, 20, SS_ICON - LTEXT "Válassza ki azt a nyelvet és földrajzi helyet, amit használni akar:", -1, 38, 25, 193, 22 - COMBOBOX IDC_LANGUAGELIST, 39, 49, 191, 83, CBS_DROPDOWNLIST | CBS_SORT | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL + END
Copied: trunk/reactos/dll/cpl/intl/inplocale.c (from r25798, trunk/reactos/dll/cpl/intl/general.c) URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/inplocale.c?p2... ============================================================================== --- trunk/reactos/dll/cpl/intl/general.c (original) +++ trunk/reactos/dll/cpl/intl/inplocale.c Fri Feb 23 12:35:32 2007 @@ -19,8 +19,8 @@ /* $Id$ * * PROJECT: ReactOS International Control Panel - * FILE: lib/cpl/intl/general.c - * PURPOSE: General property page + * FILE: lib/cpl/intl/inplocale.c + * PURPOSE: Input Locale property page * PROGRAMMER: Eric Kohl */
@@ -35,7 +35,7 @@
/* Property page dialog callback */ INT_PTR CALLBACK -GeneralPageProc(HWND hwndDlg, +InpLocalePageProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam)
Modified: trunk/reactos/dll/cpl/intl/intl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/intl.c?rev=258... ============================================================================== --- trunk/reactos/dll/cpl/intl/intl.c (original) +++ trunk/reactos/dll/cpl/intl/intl.c Fri Feb 23 12:35:32 2007 @@ -156,7 +156,7 @@ InitPropSheetPage(&psp[2], IDD_CURRENCYPAGE, CurrencyPageProc); InitPropSheetPage(&psp[3], IDD_TIMEPAGE, TimePageProc); InitPropSheetPage(&psp[4], IDD_DATEPAGE, DatePageProc); - InitPropSheetPage(&psp[5], IDD_LOCALEPAGE, LocalePageProc); + InitPropSheetPage(&psp[5], IDD_LOCALEPAGE, InpLocalePageProc);
return (LONG)(PropertySheet(&psh) != -1); }
Modified: trunk/reactos/dll/cpl/intl/intl.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/intl.h?rev=258... ============================================================================== --- trunk/reactos/dll/cpl/intl/intl.h (original) +++ trunk/reactos/dll/cpl/intl/intl.h Fri Feb 23 12:35:32 2007 @@ -36,7 +36,7 @@
/* locale.c */ INT_PTR CALLBACK -LocalePageProc(HWND hwndDlg, +InpLocalePageProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam);
Modified: trunk/reactos/dll/cpl/intl/intl.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/intl.rbuild?re... ============================================================================== --- trunk/reactos/dll/cpl/intl/intl.rbuild (original) +++ trunk/reactos/dll/cpl/intl/intl.rbuild Fri Feb 23 12:35:32 2007 @@ -15,9 +15,9 @@ <library>msvcrt</library> <file>currency.c</file> <file>date.c</file> - <file>general.c</file> + <file>generalp.c</file> <file>intl.c</file> - <file>locale.c</file> + <file>inplocale.c</file> <file>numbers.c</file> <file>time.c</file> <file>intl.rc</file>
Modified: trunk/reactos/dll/cpl/intl/it.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/it.rc?rev=2589... ============================================================================== --- trunk/reactos/dll/cpl/intl/it.rc (original) +++ trunk/reactos/dll/cpl/intl/it.rc Fri Feb 23 12:35:32 2007 @@ -8,7 +8,10 @@ CAPTION "Generale" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Pagina delle proprietà 1",-1,73,74,90,8 + GROUPBOX "Lingua principale", -1, 8, 11, 228, 74 + ICON IDC_FLAGS, IDC_ICON1, 12, 26, 21, 20, SS_ICON + LTEXT "Scegli la lingua principale e le opzioni regionali che intendi usare:", -1, 38, 25, 193, 22 + COMBOBOX IDC_LANGUAGELIST, 39, 49, 191, 83, CBS_DROPDOWNLIST | CBS_SORT | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL END
@@ -87,10 +90,7 @@ CAPTION "Input Locale" FONT 8, "MS Shell Dlg" BEGIN - GROUPBOX "Lingua principale", -1, 8, 11, 228, 74 - ICON IDC_FLAGS, IDC_ICON1, 12, 26, 21, 20, SS_ICON - LTEXT "Scegli la lingua principale e le opzioni regionali che intendi usare:", -1, 38, 25, 193, 22 - COMBOBOX IDC_LANGUAGELIST, 39, 49, 191, 83, CBS_DROPDOWNLIST | CBS_SORT | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL + END
Removed: trunk/reactos/dll/cpl/intl/locale.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/locale.c?rev=2... ============================================================================== --- trunk/reactos/dll/cpl/intl/locale.c (original) +++ trunk/reactos/dll/cpl/intl/locale.c (removed) @@ -1,237 +1,0 @@ -/* - * ReactOS - * Copyright (C) 2004, 2005 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. - */ -/* $Id$ - * - * PROJECT: ReactOS International Control Panel - * FILE: lib/cpl/intl/locale.c - * PURPOSE: Locale property page - * PROGRAMMER: Eric Kohl - * Klemens Friedl - * Aleksey Bragin - */ - -#define WINVER 0x0501 - -#include <windows.h> -#include <commctrl.h> -#include <cpl.h> - -#include <stdio.h> - -#include "intl.h" -#include "resource.h" - -HWND hList; - -BOOL CALLBACK LocalesEnumProc( - LPTSTR lpLocale // locale id -) -{ - LCID lcid; - TCHAR lang[255]; - int index; - - //swscanf(lpLocale, L"%lx", &lcid); // maybe use wcstoul? - lcid = wcstoul(lpLocale, NULL, 16); - - GetLocaleInfo(lcid, LOCALE_SLANGUAGE, lang, sizeof(lang)); - - index = SendMessageW(hList, - CB_ADDSTRING, - 0, - (LPARAM)lang); - - SendMessageW(hList, - CB_SETITEMDATA, - index, - (LPARAM)lcid); - - return TRUE; -} - - -static VOID -CreateLanguagesList(HWND hwnd) -{ - TCHAR langSel[255]; - - hList = hwnd; - EnumSystemLocalesW(LocalesEnumProc, LCID_SUPPORTED); - - // Select current locale - GetLocaleInfo(GetUserDefaultLCID(), LOCALE_SLANGUAGE, langSel, sizeof(langSel)); // or should it be System and not user? - - SendMessageW(hList, - CB_SELECTSTRING, - -1, - (LPARAM)langSel); -} - -// Sets new locale -void SetNewLocale(LCID lcid) -{ - // HKCU\Control Panel\International\Locale = 0409 (type=0) - // HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Language","Default",0x00000000,"0409" (type=0) - // HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Language","InstallLanguage",0x00000000,"0409" (type=0) - - // Set locale - HKEY localeKey; - HKEY langKey; - DWORD ret; - TCHAR value[9]; - DWORD valuesize; - WCHAR ACPPage[9]; - WCHAR OEMPage[9]; - - ret = GetLocaleInfoW(MAKELCID(lcid, SORT_DEFAULT), LOCALE_IDEFAULTCODEPAGE, (WORD*)OEMPage, sizeof(OEMPage)); - if (ret == 0) - { - MessageBoxW(NULL, L"Problem reading OEM code page", L"Big Problem", MB_OK); - return; - } - - GetLocaleInfoW(MAKELCID(lcid, SORT_DEFAULT), LOCALE_IDEFAULTANSICODEPAGE, (WORD*)ACPPage, sizeof(ACPPage)); - if (ret == 0) - { - MessageBoxW(NULL, L"Problem reading ANSI code page", L"Big Problem", MB_OK); - return; - } - - ret = RegOpenKeyW(HKEY_CURRENT_USER, L"Control Panel\International", &localeKey); - - if (ret != ERROR_SUCCESS) - { - // some serious error - MessageBoxW(NULL, L"Problem opening HKCU\Control Panel\International key", L"Big Problem", MB_OK); - return; - } - - wsprintf(value, L"%04X", (DWORD)lcid); - valuesize = (wcslen(value) + 1) * sizeof(WCHAR); - - RegSetValueExW(localeKey, L"Locale", 0, REG_SZ, (BYTE *)value, valuesize); - RegCloseKey(localeKey); - - ret = RegOpenKeyW(HKEY_USERS, L".DEFAULT\Control Panel\International", &localeKey); - - if (ret != ERROR_SUCCESS) - { - // some serious error - MessageBoxW(NULL, L"Problem opening HKU\.DEFAULT\Control Panel\International key", L"Big Problem", MB_OK); - return; - } - - wsprintf(value, L"%04X", (DWORD)lcid); - valuesize = (wcslen(value) + 1) * sizeof(WCHAR); - - RegSetValueExW(localeKey, L"Locale", 0, REG_SZ, (BYTE *)value, valuesize); - RegCloseKey(localeKey); - - // Set language - ret = RegOpenKeyW(HKEY_LOCAL_MACHINE, L"SYSTEM\CurrentControlSet\Control\NLS\Language", &langKey); - - if (ret != ERROR_SUCCESS) - { - MessageBoxW(NULL, L"Problem opening HKLM\SYSTEM\CurrentControlSet\Control\NLS\Language key", L"Big Problem", MB_OK); - return; - } - - RegSetValueExW(langKey, L"Default", 0, REG_SZ, (BYTE *)value, valuesize ); - RegSetValueExW(langKey, L"InstallLanguage", 0, REG_SZ, (BYTE *)value, valuesize ); - - RegCloseKey(langKey); - - - // Set language - ret = RegOpenKeyW(HKEY_LOCAL_MACHINE, L"SYSTEM\CurrentControlSet\Control\NLS\CodePage", &langKey); - - if (ret != ERROR_SUCCESS) - { - MessageBoxW(NULL, L"Problem opening HKLM\SYSTEM\CurrentControlSet\Control\NLS\CodePage key", L"Big Problem", MB_OK); - return; - } - - RegSetValueExW(langKey, L"OEMCP", 0, REG_SZ, (BYTE *)OEMPage, (wcslen(OEMPage) +1 ) * sizeof(WCHAR) ); - RegSetValueExW(langKey, L"ACP", 0, REG_SZ, (BYTE *)ACPPage, (wcslen(ACPPage) +1 ) * sizeof(WCHAR) ); - - RegCloseKey(langKey); - -} - -/* Property page dialog callback */ -INT_PTR CALLBACK -LocalePageProc(HWND hwndDlg, - UINT uMsg, - WPARAM wParam, - LPARAM lParam) -{ - switch(uMsg) - { - case WM_INITDIALOG: - CreateLanguagesList(GetDlgItem(hwndDlg, IDC_LANGUAGELIST)); - break; - case WM_COMMAND: - switch (LOWORD(wParam)) - { - case IDC_LANGUAGELIST: - if (HIWORD(wParam) == CBN_SELCHANGE) - { - PropSheet_Changed(GetParent(hwndDlg), hwndDlg); - } - break; - } - break; - - case WM_NOTIFY: - { - LPNMHDR lpnm = (LPNMHDR)lParam; - if (lpnm->code == (UINT)PSN_APPLY) - { - // Apply changes - LCID NewLcid; - int iCurSel; - - // Acquire new value - iCurSel = SendMessageW(hList, - CB_GETCURSEL, - 0, - 0); - if (iCurSel == CB_ERR) - break; - - NewLcid = SendMessageW(hList, - CB_GETITEMDATA, - iCurSel, - 0); - - if (NewLcid == (LCID)CB_ERR) - break; - - - // Actually set new locale - SetNewLocale(NewLcid); - } - } - break; - } - return FALSE; -} - - -/* EOF */
Modified: trunk/reactos/dll/cpl/intl/nl.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/nl.rc?rev=2589... ============================================================================== --- trunk/reactos/dll/cpl/intl/nl.rc (original) +++ trunk/reactos/dll/cpl/intl/nl.rc Fri Feb 23 12:35:32 2007 @@ -7,7 +7,10 @@ CAPTION "Algemeen" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Property Page 1",-1,73,74,90,8 + GROUPBOX "Eerste taal", -1, 8, 11, 228, 74 + ICON IDC_FLAGS, IDC_ICON1, 12, 26, 21, 20, SS_ICON + LTEXT "Selecteer uw eerste taal en regio die u wilt gebruiken:", -1, 38, 25, 193, 22 + COMBOBOX IDC_LANGUAGELIST, 39, 49, 191, 83, CBS_DROPDOWNLIST | CBS_SORT | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL END
@@ -86,10 +89,7 @@ CAPTION "Invoer" FONT 8, "MS Shell Dlg" BEGIN - GROUPBOX "Eerste taal", -1, 8, 11, 228, 74 - ICON IDC_FLAGS, IDC_ICON1, 12, 26, 21, 20, SS_ICON - LTEXT "Selecteer uw eerste taal en regio die u wilt gebruiken:", -1, 38, 25, 193, 22 - COMBOBOX IDC_LANGUAGELIST, 39, 49, 191, 83, CBS_DROPDOWNLIST | CBS_SORT | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL + END
Modified: trunk/reactos/dll/cpl/intl/ru.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/ru.rc?rev=2589... ============================================================================== --- trunk/reactos/dll/cpl/intl/ru.rc (original) +++ trunk/reactos/dll/cpl/intl/ru.rc Fri Feb 23 12:35:32 2007 @@ -7,7 +7,10 @@ CAPTION "Îáùèå" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Âêëàäêà 1",-1,73,74,90,8 + GROUPBOX "Îñíîâíîé ÿçûê", -1, 8, 11, 228, 74 + ICON IDC_FLAGS, IDC_ICON1, 12, 26, 21, 20, SS_ICON + LTEXT "Âûáåðèòå îñíîâíîé ÿçûê è ðåãèîí, êîòîðûé âû õîòèòå èñïîëüçîâàòü:", -1, 38, 25, 193, 22 + COMBOBOX IDC_LANGUAGELIST, 39, 49, 191, 83, CBS_DROPDOWNLIST | CBS_SORT | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL END
@@ -86,10 +89,7 @@ CAPTION "ßçûêè è ðàñêëàäêè" FONT 8, "MS Shell Dlg" BEGIN - GROUPBOX "Îñíîâíîé ÿçûê", -1, 8, 11, 228, 74 - ICON IDC_FLAGS, IDC_ICON1, 12, 26, 21, 20, SS_ICON - LTEXT "Âûáåðèòå îñíîâíîé ÿçûê è ðåãèîí, êîòîðûé âû õîòèòå èñïîëüçîâàòü:", -1, 38, 25, 193, 22 - COMBOBOX IDC_LANGUAGELIST, 39, 49, 191, 83, CBS_DROPDOWNLIST | CBS_SORT | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL + END
Modified: trunk/reactos/dll/cpl/intl/sv.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/sv.rc?rev=2589... ============================================================================== --- trunk/reactos/dll/cpl/intl/sv.rc (original) +++ trunk/reactos/dll/cpl/intl/sv.rc Fri Feb 23 12:35:32 2007 @@ -8,7 +8,10 @@ CAPTION "Generellt" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Property Page 1",-1,73,74,90,8 + GROUPBOX "Primärt språk", -1, 8, 11, 228, 74 + ICON IDC_FLAGS, IDC_ICON1, 12, 26, 21, 20, SS_ICON + LTEXT "Välj det språk och den region du vill använda:", -1, 38, 25, 193, 22 + COMBOBOX IDC_LANGUAGELIST, 39, 49, 191, 83, CBS_DROPDOWNLIST | CBS_SORT | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL END
@@ -87,10 +90,7 @@ CAPTION "Inmatningsspråk" FONT 8, "MS Shell Dlg" BEGIN - GROUPBOX "Primärt språk", -1, 8, 11, 228, 74 - ICON IDC_FLAGS, IDC_ICON1, 12, 26, 21, 20, SS_ICON - LTEXT "Välj det språk och den region du vill använda:", -1, 38, 25, 193, 22 - COMBOBOX IDC_LANGUAGELIST, 39, 49, 191, 83, CBS_DROPDOWNLIST | CBS_SORT | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL + END
Modified: trunk/reactos/dll/cpl/intl/uk.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/uk.rc?rev=2589... ============================================================================== --- trunk/reactos/dll/cpl/intl/uk.rc (original) +++ trunk/reactos/dll/cpl/intl/uk.rc Fri Feb 23 12:35:32 2007 @@ -14,7 +14,10 @@ FONT 8, "MS Shell Dlg" EXSTYLE DS_SHELLFONT BEGIN - LTEXT "Âêëàäêà âëàñòèâîñòåé 1",-1,73,74,90,8 + GROUPBOX "Îñíîâíà ìîâà", -1, 8, 11, 228, 74 + ICON IDC_FLAGS, IDC_ICON1, 12, 26, 21, 20, SS_ICON + LTEXT "Âèáåð³òü ïåðâèííó ìîâó ³ ðåã³îí, ÿêèé âè áàæàºòå âèêîðèñòîâóâàòè:", -1, 38, 25, 193, 22 + COMBOBOX IDC_LANGUAGELIST, 39, 49, 191, 83, CBS_DROPDOWNLIST | CBS_SORT | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL END
@@ -93,10 +96,7 @@ CAPTION "Ìîâè ³ ðîçêëàäêè" FONT 8, "MS Shell Dlg" BEGIN - GROUPBOX "Îñíîâíà ìîâà", -1, 8, 11, 228, 74 - ICON IDC_FLAGS, IDC_ICON1, 12, 26, 21, 20, SS_ICON - LTEXT "Âèáåð³òü ïåðâèííó ìîâó ³ ðåã³îí, ÿêèé âè áàæàºòå âèêîðèñòîâóâàòè:", -1, 38, 25, 193, 22 - COMBOBOX IDC_LANGUAGELIST, 39, 49, 191, 83, CBS_DROPDOWNLIST | CBS_SORT | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL + END
-
tretiakov＠svn.reactos.org