Ros-diffs September 2007

ros-diffs@reactos.org

19 participants
589 discussions

[ekohl] 28998: - Enumerate short and long date formats. - Use the currently selected locale id instead of LOCALE_USER_DEFAULT.
by ekohl＠svn.reactos.org 10 Sep '07

10 Sep '07

Author: ekohl Date: Tue Sep 11 02:16:01 2007 New Revision: 28998 URL: http://svn.reactos.org/svn/reactos?rev=28998&view=rev Log: - Enumerate short and long date formats. - Use the currently selected locale id instead of LOCALE_USER_DEFAULT. Modified: trunk/reactos/dll/cpl/intl/date.c Modified: trunk/reactos/dll/cpl/intl/date.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/date.c?rev=28… ============================================================================== --- trunk/reactos/dll/cpl/intl/date.c (original) +++ trunk/reactos/dll/cpl/intl/date.c Tue Sep 11 02:16:01 2007 @@ -35,12 +35,12 @@ /* GLOBALS ******************************************************************/ #define YEAR_STR_MAX_SIZE 4 -#define MAX_SHORT_FMT_SAMPLES 5 -#define MAX_LONG_FMT_SAMPLES 2 #define MAX_SHRT_DATE_SEPARATORS 3 #define STD_DATE_SEP _T(".") #define YEAR_DIFF (99) #define MAX_YEAR (9999) + +static HWND hwndEnum = NULL; /* FUNCTIONS ****************************************************************/ @@ -91,7 +91,7 @@ /* Setted up short date separator to registry */ static BOOL -SetShortDateSep(HWND hwndDlg) +SetShortDateSep(HWND hwndDlg, LCID lcid) { TCHAR szShortDateSep[MAX_SAMPLES_STR_SIZE]; INT nSepStrSize; @@ -119,14 +119,14 @@ } /* Save date separator */ - SetLocaleInfo(LOCALE_USER_DEFAULT, LOCALE_SDATE, szShortDateSep); + SetLocaleInfo(lcid, LOCALE_SDATE, szShortDateSep); return TRUE; } /* Setted up short date format to registry */ static BOOL -SetShortDateFormat(HWND hwndDlg) +SetShortDateFormat(HWND hwndDlg, LCID lcid) { TCHAR szShortDateFmt[MAX_SAMPLES_STR_SIZE]; TCHAR szShortDateSep[MAX_SAMPLES_STR_SIZE]; @@ -186,14 +186,14 @@ free(pszResultStr); /* Save short date format */ - SetLocaleInfo(LOCALE_USER_DEFAULT, LOCALE_SSHORTDATE, szShortDateFmt); + SetLocaleInfo(lcid, LOCALE_SSHORTDATE, szShortDateFmt); return TRUE; } /* Setted up long date format to registry */ static BOOL -SetLongDateFormat(HWND hwndDlg) +SetLongDateFormat(HWND hwndDlg, LCID lcid) { TCHAR szLongDateFmt[MAX_SAMPLES_STR_SIZE]; BOOL OpenApostFlg = FALSE; @@ -238,14 +238,14 @@ } /* Save short date format */ - SetLocaleInfo(LOCALE_USER_DEFAULT, LOCALE_SLONGDATE, szLongDateFmt); + SetLocaleInfo(lcid, LOCALE_SLONGDATE, szLongDateFmt); return TRUE; } /* Init short date separator control box */ static VOID -InitShortDateSepSamples(HWND hwndDlg) +InitShortDateSepSamples(HWND hwndDlg, LCID lcid) { LPTSTR ShortDateSepSamples[MAX_SHRT_DATE_SEPARATORS] = { @@ -258,7 +258,7 @@ INT nRetCode; /* Get current short date separator */ - GetLocaleInfo(LOCALE_USER_DEFAULT, + GetLocaleInfo(lcid, LOCALE_SDATE, szShortDateSep, MAX_SAMPLES_STR_SIZE); @@ -274,7 +274,7 @@ { SendMessageW(GetDlgItem(hwndDlg, IDC_SHRTDATESEP_COMBO), CB_ADDSTRING, - nCBIndex, + 0, (LPARAM)ShortDateSepSamples[nCBIndex]); } @@ -289,7 +289,7 @@ { SendMessage(GetDlgItem(hwndDlg, IDC_SHRTDATESEP_COMBO), CB_ADDSTRING, - MAX_SHRT_DATE_SEPARATORS+1, + 0, (LPARAM)szShortDateSep); SendMessageW(GetDlgItem(hwndDlg, IDC_SHRTDATESEP_COMBO), CB_SELECTSTRING, @@ -298,24 +298,26 @@ } } +static BOOL CALLBACK +ShortDateFormatEnumProc(LPTSTR lpTimeFormatString) +{ + SendMessage(hwndEnum, + CB_ADDSTRING, + 0, + (LPARAM)lpTimeFormatString); + + return TRUE; +} + /* Init short date control box */ VOID -InitShortDateCB(HWND hwndDlg) -{ - LPTSTR ShortDateFmtSamples[MAX_SHORT_FMT_SAMPLES] = - { - _T("dd.MM.yyyy"), - _T("dd.MM.yy"), - _T("d.M.yy"), - _T("dd/MM/yy"), - _T("yyyy-MM-dd") - }; +InitShortDateCB(HWND hwndDlg, LCID lcid) +{ TCHAR szShortDateFmt[MAX_SAMPLES_STR_SIZE]; - INT nCBIndex; INT nRetCode; /* Get current short date format */ - GetLocaleInfo(LOCALE_USER_DEFAULT, + GetLocaleInfo(lcid, LOCALE_SSHORTDATE, szShortDateFmt, MAX_SAMPLES_STR_SIZE); @@ -326,14 +328,9 @@ (WPARAM)0, (LPARAM)0); - /* Create standart list of date formats */ - for (nCBIndex = 0; nCBIndex < MAX_SHORT_FMT_SAMPLES; nCBIndex++) - { - SendMessage(GetDlgItem(hwndDlg, IDC_SHRTDATEFMT_COMBO), - CB_ADDSTRING, - nCBIndex, - (LPARAM)ShortDateFmtSamples[nCBIndex]); - } + /* Enumerate short date formats */ + hwndEnum = GetDlgItem(hwndDlg, IDC_SHRTDATEFMT_COMBO); + EnumDateFormats(ShortDateFormatEnumProc, lcid, DATE_SHORTDATE); /* Set current item to value from registry */ nRetCode = SendMessage(GetDlgItem(hwndDlg, IDC_SHRTDATEFMT_COMBO), @@ -346,7 +343,7 @@ { SendMessage(GetDlgItem(hwndDlg, IDC_SHRTDATEFMT_COMBO), CB_ADDSTRING, - MAX_SHORT_FMT_SAMPLES+1, + 0, (LPARAM)szShortDateFmt); SendMessage(GetDlgItem(hwndDlg, IDC_SHRTDATEFMT_COMBO), CB_SELECTSTRING, @@ -357,20 +354,13 @@ /* Init long date control box */ static VOID -InitLongDateCB(HWND hwndDlg) -{ - /* Where this data stored? */ - LPTSTR LongDateFmtSamples[MAX_LONG_FMT_SAMPLES] = - { - _T("d MMMM yyyy 'y.'"), - _T("dd MMMM yyyy 'y.'") - }; +InitLongDateCB(HWND hwndDlg, LCID lcid) +{ TCHAR szLongDateFmt[MAX_SAMPLES_STR_SIZE]; - INT nCBIndex; INT nRetCode; /* Get current long date format */ - GetLocaleInfo(LOCALE_USER_DEFAULT, + GetLocaleInfo(lcid, LOCALE_SLONGDATE, szLongDateFmt, MAX_SAMPLES_STR_SIZE); @@ -381,14 +371,9 @@ (WPARAM)0, (LPARAM)0); - /* Create standart list of date formats */ - for (nCBIndex = 0; nCBIndex < MAX_LONG_FMT_SAMPLES; nCBIndex++) - { - SendMessage(GetDlgItem(hwndDlg, IDC_LONGDATEFMT_COMBO), - CB_ADDSTRING, - nCBIndex, - (LPARAM)LongDateFmtSamples[nCBIndex]); - } + /* Enumerate short long formats */ + hwndEnum = GetDlgItem(hwndDlg, IDC_LONGDATEFMT_COMBO); + EnumDateFormats(ShortDateFormatEnumProc, lcid, DATE_LONGDATE); /* Set current item to value from registry */ nRetCode = SendMessage(GetDlgItem(hwndDlg, IDC_LONGDATEFMT_COMBO), @@ -401,7 +386,7 @@ { SendMessage(GetDlgItem(hwndDlg, IDC_LONGDATEFMT_COMBO), CB_ADDSTRING, - MAX_LONG_FMT_SAMPLES+1, + 0, (LPARAM)szLongDateFmt); SendMessage(GetDlgItem(hwndDlg, IDC_LONGDATEFMT_COMBO), CB_SELECTSTRING, @@ -412,7 +397,7 @@ /* Set up max date value to registry */ static VOID -SetMaxDate(HWND hwndDlg) +SetMaxDate(HWND hwndDlg, LCID lcid) { TCHAR szMaxDateVal[YEAR_STR_MAX_SIZE]; HWND hWndYearSpin; @@ -430,7 +415,7 @@ _itot(nSpinVal, szMaxDateVal, DECIMAL_RADIX); /* Save max date value */ - SetCalendarInfo(LOCALE_USER_DEFAULT, + SetCalendarInfo(lcid, CAL_GREGORIAN, 48 , /* CAL_ITWODIGITYEARMAX */ (LPCTSTR)&szMaxDateVal); @@ -438,11 +423,11 @@ /* Get max date value from registry set */ static INT -GetMaxDate(VOID) +GetMaxDate(LCID lcid) { INT nMaxDateVal; - GetCalendarInfo(LOCALE_USER_DEFAULT, + GetCalendarInfo(lcid, CAL_GREGORIAN, CAL_ITWODIGITYEARMAX | CAL_RETURN_NUMBER, NULL, @@ -478,7 +463,7 @@ /* Init spin control */ static VOID -InitMinMaxDateSpin(HWND hwndDlg) +InitMinMaxDateSpin(HWND hwndDlg, LCID lcid) { TCHAR OutBuffer[YEAR_STR_MAX_SIZE]; HWND hWndYearSpin; @@ -486,14 +471,14 @@ hWndYearSpin = GetDlgItem(hwndDlg, IDC_SCR_MAX_YEAR); /* Init max date value */ - wsprintf(OutBuffer, _T("%04d"), (DWORD)GetMaxDate()); + wsprintf(OutBuffer, _T("%04d"), (DWORD)GetMaxDate(lcid)); SendMessage(GetDlgItem(hwndDlg, IDC_SECONDYEAR_EDIT), WM_SETTEXT, 0, (LPARAM)OutBuffer); /* Init min date value */ - wsprintf(OutBuffer, _T("%04d"), (DWORD)GetMaxDate()-YEAR_DIFF); + wsprintf(OutBuffer, _T("%04d"), (DWORD)GetMaxDate(lcid) - YEAR_DIFF); SendMessage(GetDlgItem(hwndDlg, IDC_FIRSTYEAR_EDIT), WM_SETTEXT, 0, @@ -510,7 +495,7 @@ SendMessage(hWndYearSpin, UDM_SETPOS, 0, - MAKELONG(GetMaxDate(),0)); + MAKELONG(GetMaxDate(lcid),0)); } /* Update all date locale samples */ @@ -542,16 +527,19 @@ { PGLOBALDATA pGlobalData; + pGlobalData = (PGLOBALDATA)GetWindowLongPtr(hwndDlg, DWLP_USER); + switch (uMsg) { case WM_INITDIALOG: pGlobalData = (PGLOBALDATA)((LPPROPSHEETPAGE)lParam)->lParam; - - InitMinMaxDateSpin(hwndDlg); + SetWindowLongPtr(hwndDlg, DWLP_USER, (LONG_PTR)pGlobalData); + + InitMinMaxDateSpin(hwndDlg, pGlobalData->lcid); UpdateDateLocaleSamples(hwndDlg, pGlobalData->lcid); - InitShortDateCB(hwndDlg); - InitLongDateCB(hwndDlg); - InitShortDateSepSamples(hwndDlg); + InitShortDateCB(hwndDlg, pGlobalData->lcid); + InitLongDateCB(hwndDlg, pGlobalData->lcid); + InitShortDateSepSamples(hwndDlg, pGlobalData->lcid); /* TODO: Add other calendar types */ break; @@ -595,14 +583,14 @@ /* If push apply button */ if (lpnm->code == (UINT)PSN_APPLY) { - SetMaxDate(hwndDlg); - if(!SetShortDateSep(hwndDlg)) break; - if(!SetShortDateFormat(hwndDlg)) break; - if(!SetLongDateFormat(hwndDlg)) break; - InitShortDateCB(hwndDlg); + SetMaxDate(hwndDlg, pGlobalData->lcid); + if(!SetShortDateSep(hwndDlg, pGlobalData->lcid)) break; + if(!SetShortDateFormat(hwndDlg, pGlobalData->lcid)) break; + if(!SetLongDateFormat(hwndDlg, pGlobalData->lcid)) break; + InitShortDateCB(hwndDlg, pGlobalData->lcid); /* FIXME: */ //Sleep(15); - UpdateDateLocaleSamples(hwndDlg, LOCALE_USER_DEFAULT); + UpdateDateLocaleSamples(hwndDlg, pGlobalData->lcid); } } break;

1 0

[ekohl] 28997: Add missing definitions of EnumDateFormats.
by ekohl＠svn.reactos.org 10 Sep '07

10 Sep '07

Author: ekohl Date: Tue Sep 11 02:13:52 2007 New Revision: 28997 URL: http://svn.reactos.org/svn/reactos?rev=28997&view=rev Log: Add missing definitions of EnumDateFormats. Modified: trunk/reactos/include/psdk/winnls.h Modified: trunk/reactos/include/psdk/winnls.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/winnls.h?rev=… ============================================================================== --- trunk/reactos/include/psdk/winnls.h (original) +++ trunk/reactos/include/psdk/winnls.h Tue Sep 11 02:13:52 2007 @@ -637,6 +637,7 @@ typedef LPNUMBERFMTW LPNUMBERFMT; #define CompareString CompareStringW #define EnumCalendarInfo EnumCalendarInfoW +#define EnumDateFormats EnumDateFormatsW #define EnumSystemCodePages EnumSystemCodePagesW #define EnumSystemLocales EnumSystemLocalesW #define EnumTimeFormats EnumTimeFormatsW @@ -679,6 +680,7 @@ typedef LPNUMBERFMTA LPNUMBERFMT; #define CompareString CompareStringA #define EnumCalendarInfo EnumCalendarInfoA +#define EnumDateFormats EnumDateFormatsA #define EnumSystemCodePages EnumSystemCodePagesA #define EnumSystemLocales EnumSystemLocalesA #define EnumTimeFormats EnumTimeFormatsA

1 0

[ekohl] 28996: - Enumerate time formats. - The user must able to change the locale id. Move it into a global structure. - User the selected locale id instead of LOCALE_USER_DEFAULT.
by ekohl＠svn.reactos.org 10 Sep '07

10 Sep '07

Author: ekohl Date: Tue Sep 11 00:46:27 2007 New Revision: 28996 URL: http://svn.reactos.org/svn/reactos?rev=28996&view=rev Log: - Enumerate time formats. - The user must able to change the locale id. Move it into a global structure. - User the selected locale id instead of LOCALE_USER_DEFAULT. Modified: trunk/reactos/dll/cpl/intl/currency.c trunk/reactos/dll/cpl/intl/date.c trunk/reactos/dll/cpl/intl/generalp.c trunk/reactos/dll/cpl/intl/intl.h trunk/reactos/dll/cpl/intl/misc.c trunk/reactos/dll/cpl/intl/sort.c trunk/reactos/dll/cpl/intl/time.c Modified: trunk/reactos/dll/cpl/intl/currency.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/currency.c?re… ============================================================================== --- trunk/reactos/dll/cpl/intl/currency.c (original) +++ trunk/reactos/dll/cpl/intl/currency.c Tue Sep 11 00:46:27 2007 @@ -301,7 +301,7 @@ static BOOL SetCurrencyDigNum(HWND hwndDlg) { - TCHAR szFieldDigNumSamples[MAX_FIELD_DIG_SAMPLES][MAX_SAMPLES_STR_SIZE]= + LPTSTR szFieldDigNumSamples[MAX_FIELD_DIG_SAMPLES]= { _T("0;0"), _T("3;0"), Modified: trunk/reactos/dll/cpl/intl/date.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/date.c?rev=28… ============================================================================== --- trunk/reactos/dll/cpl/intl/date.c (original) +++ trunk/reactos/dll/cpl/intl/date.c Tue Sep 11 00:46:27 2007 @@ -540,11 +540,15 @@ WPARAM wParam, LPARAM lParam) { + PGLOBALDATA pGlobalData; + switch (uMsg) { case WM_INITDIALOG: + pGlobalData = (PGLOBALDATA)((LPPROPSHEETPAGE)lParam)->lParam; + InitMinMaxDateSpin(hwndDlg); - UpdateDateLocaleSamples(hwndDlg, LOCALE_USER_DEFAULT); + UpdateDateLocaleSamples(hwndDlg, pGlobalData->lcid); InitShortDateCB(hwndDlg); InitLongDateCB(hwndDlg); InitShortDateSepSamples(hwndDlg); Modified: trunk/reactos/dll/cpl/intl/generalp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/generalp.c?re… ============================================================================== --- trunk/reactos/dll/cpl/intl/generalp.c (original) +++ trunk/reactos/dll/cpl/intl/generalp.c Tue Sep 11 00:46:27 2007 @@ -235,6 +235,7 @@ } /* Location enumerate procedure */ +#if 0 BOOL CALLBACK LocationsEnumProc(GEOID gId) @@ -255,12 +256,14 @@ return TRUE; } +#endif /* Enumerate all system locations identifiers */ static VOID CreateLocationsList(HWND hWnd) { +#if 0 GEOID userGeoID; TCHAR loc[MAX_STR_SIZE]; @@ -280,6 +283,7 @@ CB_SELECTSTRING, (WPARAM) -1, (LPARAM)loc); +#endif } DWORD Modified: trunk/reactos/dll/cpl/intl/intl.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/intl.h?rev=28… ============================================================================== --- trunk/reactos/dll/cpl/intl/intl.h (original) +++ trunk/reactos/dll/cpl/intl/intl.h Tue Sep 11 00:46:27 2007 @@ -13,6 +13,11 @@ UINT idDescription; APPLET_PROC AppletProc; } APPLET, *PAPPLET; + +typedef struct _GLOBALDATA +{ + LCID lcid; +} GLOBALDATA, *PGLOBALDATA; extern HINSTANCE hApplet; extern DWORD IsUnattendedSetupEnabled; Modified: trunk/reactos/dll/cpl/intl/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/misc.c?rev=28… ============================================================================== --- trunk/reactos/dll/cpl/intl/misc.c (original) +++ trunk/reactos/dll/cpl/intl/misc.c Tue Sep 11 00:46:27 2007 @@ -175,7 +175,7 @@ static VOID -InitPropSheetPage(PROPSHEETPAGE *psp, WORD idDlg, DLGPROC DlgProc, LCID lcid) +InitPropSheetPage(PROPSHEETPAGE *psp, WORD idDlg, DLGPROC DlgProc, PGLOBALDATA pGlobalData) { ZeroMemory(psp, sizeof(PROPSHEETPAGE)); psp->dwSize = sizeof(PROPSHEETPAGE); @@ -183,7 +183,7 @@ psp->hInstance = hApplet; psp->pszTemplate = MAKEINTRESOURCE(idDlg); psp->pfnDlgProc = DlgProc; - psp->lParam = (LPARAM)lcid; + psp->lParam = (LPARAM)pGlobalData; } @@ -194,9 +194,15 @@ { PROPSHEETPAGE PsPage[NUM_SHEETS + 1]; PROPSHEETHEADER psh; + PGLOBALDATA pGlobalData; TCHAR Caption[MAX_STR_SIZE]; + INT ret; LoadString(hApplet, IDS_CUSTOMIZE_TITLE, Caption, sizeof(Caption) / sizeof(TCHAR)); + + pGlobalData = (PGLOBALDATA)malloc(sizeof(GLOBALDATA)); + + pGlobalData->lcid = lcid; ZeroMemory(&psh, sizeof(PROPSHEETHEADER)); psh.dwSize = sizeof(PROPSHEETHEADER); @@ -209,18 +215,22 @@ psh.nStartPage = 0; psh.ppsp = PsPage; - InitPropSheetPage(&PsPage[0], IDD_NUMBERSPAGE, NumbersPageProc, lcid); - InitPropSheetPage(&PsPage[1], IDD_CURRENCYPAGE, CurrencyPageProc, lcid); - InitPropSheetPage(&PsPage[2], IDD_TIMEPAGE, TimePageProc, lcid); - InitPropSheetPage(&PsPage[3], IDD_DATEPAGE, DatePageProc, lcid); + InitPropSheetPage(&PsPage[0], IDD_NUMBERSPAGE, NumbersPageProc, pGlobalData); + InitPropSheetPage(&PsPage[1], IDD_CURRENCYPAGE, CurrencyPageProc, pGlobalData); + InitPropSheetPage(&PsPage[2], IDD_TIMEPAGE, TimePageProc, pGlobalData); + InitPropSheetPage(&PsPage[3], IDD_DATEPAGE, DatePageProc, pGlobalData); if (IsSortPageNeeded(lcid)) { psh.nPages++; - InitPropSheetPage(&PsPage[4], IDD_SORTPAGE, SortPageProc, lcid); - } - - return (LONG)(PropertySheet(&psh) != -1); + InitPropSheetPage(&PsPage[4], IDD_SORTPAGE, SortPageProc, pGlobalData); + } + + ret = PropertySheet(&psh); + + free(pGlobalData); + + return (LONG)(ret != -1); } /* EOF */ Modified: trunk/reactos/dll/cpl/intl/sort.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/sort.c?rev=28… ============================================================================== --- trunk/reactos/dll/cpl/intl/sort.c (original) +++ trunk/reactos/dll/cpl/intl/sort.c Tue Sep 11 00:46:27 2007 @@ -156,14 +156,17 @@ WPARAM wParam, LPARAM lParam) { + PGLOBALDATA pGlobalData; + + pGlobalData = (PGLOBALDATA)GetWindowLongPtr(hwndDlg, DWLP_USER); + switch (uMsg) { case WM_INITDIALOG: - { - LCID lcid = (LCID)((LPPROPSHEETPAGE)lParam)->lParam; - - CreateSortList(GetDlgItem(hwndDlg, IDC_SORTLIST_COMBO), lcid); - } + pGlobalData = (PGLOBALDATA)((LPPROPSHEETPAGE)lParam)->lParam; + SetWindowLongPtr(hwndDlg, DWLP_USER, (LONG_PTR)pGlobalData); + + CreateSortList(GetDlgItem(hwndDlg, IDC_SORTLIST_COMBO), pGlobalData->lcid); break; case WM_COMMAND: @@ -172,6 +175,28 @@ case IDC_SORTLIST_COMBO: if (HIWORD(wParam) == CBN_SELCHANGE) { + LCID NewLcid; + INT iCurSel; + + iCurSel = SendDlgItemMessage(hwndDlg, + IDC_SORTLIST_COMBO, + CB_GETCURSEL, + 0, + 0); + if (iCurSel == CB_ERR) + break; + + NewLcid = SendDlgItemMessage(hwndDlg, + IDC_SORTLIST_COMBO, + CB_GETITEMDATA, + iCurSel, + 0); + if (NewLcid == (LCID)CB_ERR) + break; + + /* Save the new LCID */ + pGlobalData->lcid = NewLcid; + PropSheet_Changed(GetParent(hwndDlg), hwndDlg); } break; @@ -179,34 +204,9 @@ break; case WM_NOTIFY: + if (((LPNMHDR)lParam)->code == (UINT)PSN_APPLY) { - LPNMHDR lpnm = (LPNMHDR)lParam; - - if (lpnm->code == (UINT)PSN_APPLY) - { - - LCID NewLcid; - INT iCurSel; - - iCurSel = SendDlgItemMessage(hwndDlg, - IDC_SORTLIST_COMBO, - CB_GETCURSEL, - 0, - 0); - if (iCurSel == CB_ERR) - break; - - NewLcid = SendDlgItemMessage(hwndDlg, - IDC_SORTLIST_COMBO, - CB_GETITEMDATA, - iCurSel, - 0); - if (NewLcid == (LCID)CB_ERR) - break; -#if 0 - /* FIXME: Set locale ID */ -#endif - } + /* FIXME: Set locale ID: pGlobalData->lcid */ } break; } Modified: trunk/reactos/dll/cpl/intl/time.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/time.c?rev=28… ============================================================================== --- trunk/reactos/dll/cpl/intl/time.c (original) +++ trunk/reactos/dll/cpl/intl/time.c Tue Sep 11 00:46:27 2007 @@ -31,22 +31,26 @@ #include "intl.h" #include "resource.h" -/* - * TODO: - * - Enumerate available time formats (use EnumTimeFormats) - */ +static HWND hwndEnum = NULL; + +static BOOL CALLBACK +TimeFormatEnumProc(LPTSTR lpTimeFormatString) +{ + SendMessage(hwndEnum, + CB_ADDSTRING, + 0, + (LPARAM)lpTimeFormatString); + + return TRUE; +} static VOID -UpdateTimeSample(HWND hWnd) +UpdateTimeSample(HWND hWnd, LCID lcid) { - TCHAR InBuffer[80]; - TCHAR OutBuffer[80]; - - GetLocaleInfo(LOCALE_USER_DEFAULT, LOCALE_STIMEFORMAT, InBuffer, 80); - - GetTimeFormat(LOCALE_USER_DEFAULT, 0, NULL, InBuffer, OutBuffer, 80); - - SendMessage(hWnd, WM_SETTEXT, 0, (LPARAM)OutBuffer); + TCHAR szBuffer[80]; + + GetTimeFormat(lcid, 0, NULL, NULL, szBuffer, 80); + SendMessage(hWnd, WM_SETTEXT, 0, (LPARAM)szBuffer); } @@ -57,36 +61,41 @@ WPARAM wParam, LPARAM lParam) { - switch (uMsg) - { - case WM_INITDIALOG: - { - TCHAR Buffer[80]; - int nLen; + PGLOBALDATA pGlobalData; + + pGlobalData = (PGLOBALDATA)GetWindowLongPtr(hwndDlg, DWLP_USER); + + switch (uMsg) + { + case WM_INITDIALOG: + { + TCHAR Buffer[80]; + int nLen; + + pGlobalData = (PGLOBALDATA)((LPPROPSHEETPAGE)lParam)->lParam; + SetWindowLongPtr(hwndDlg, DWLP_USER, (LONG_PTR)pGlobalData); /* Update the time format sample */ - UpdateTimeSample(GetDlgItem(hwndDlg, IDC_TIMESAMPLE)); + UpdateTimeSample(GetDlgItem(hwndDlg, IDC_TIMESAMPLE), pGlobalData->lcid); /* Get the time format (max. 80 characters) */ SendMessage(GetDlgItem(hwndDlg, IDC_TIMEFORMAT), CB_LIMITTEXT, 80, 0); - /* FIXME: add available time formats to the list */ - - GetLocaleInfo(LOCALE_USER_DEFAULT, LOCALE_STIMEFORMAT, Buffer, 80); + /* Add available time formats to the list */ + hwndEnum = GetDlgItem(hwndDlg, IDC_TIMEFORMAT); + EnumTimeFormats(TimeFormatEnumProc, pGlobalData->lcid, 0); + + GetLocaleInfo(pGlobalData->lcid, LOCALE_STIMEFORMAT, Buffer, 80); SendMessage(GetDlgItem(hwndDlg, IDC_TIMEFORMAT), - CB_ADDSTRING, - 0, - (LPARAM)Buffer); - SendMessage(GetDlgItem(hwndDlg, IDC_TIMEFORMAT), - CB_SETCURSEL, - 0, /* index */ - 0); + CB_SELECTSTRING, + -1, + (LPARAM)Buffer); /* Get the time separator (max. 4 characters) */ SendMessage(GetDlgItem(hwndDlg, IDC_TIMESEPARATOR), CB_LIMITTEXT, 4, 0); - GetLocaleInfo(LOCALE_USER_DEFAULT, LOCALE_STIME, Buffer, 80); + GetLocaleInfo(pGlobalData->lcid, LOCALE_STIME, Buffer, 80); SendMessage(GetDlgItem(hwndDlg, IDC_TIMESEPARATOR), CB_ADDSTRING, 0, @@ -99,7 +108,7 @@ /* Get the AM symbol (max. 9 characters) */ SendMessage(GetDlgItem(hwndDlg, IDC_TIMEAMSYMBOL), CB_LIMITTEXT, 9, 0); - nLen = GetLocaleInfo(LOCALE_USER_DEFAULT, LOCALE_S1159, Buffer, 80); + nLen = GetLocaleInfo(pGlobalData->lcid, LOCALE_S1159, Buffer, 80); SendMessage(GetDlgItem(hwndDlg, IDC_TIMEAMSYMBOL), CB_ADDSTRING, 0, @@ -119,7 +128,7 @@ /* Get the PM symbol (max. 9 characters) */ SendMessage(GetDlgItem(hwndDlg, IDC_TIMEPMSYMBOL), CB_LIMITTEXT, 9, 0); - nLen = GetLocaleInfo(LOCALE_USER_DEFAULT, LOCALE_S2359, Buffer, 80); + nLen = GetLocaleInfo(pGlobalData->lcid, LOCALE_S2359, Buffer, 80); SendMessage(GetDlgItem(hwndDlg, IDC_TIMEPMSYMBOL), CB_ADDSTRING, 0, @@ -168,14 +177,14 @@ CB_GETCURSEL, 0, 0); SendMessage(GetDlgItem(hwndDlg, IDC_TIMEFORMAT), CB_GETLBTEXT, (WPARAM)nIndex, (LPARAM)Buffer); - SetLocaleInfo(LOCALE_USER_DEFAULT, LOCALE_STIMEFORMAT, Buffer); + SetLocaleInfo(pGlobalData->lcid, LOCALE_STIMEFORMAT, Buffer); /* Set time separator */ nIndex = SendMessage(GetDlgItem(hwndDlg, IDC_TIMESEPARATOR), CB_GETCURSEL, 0, 0); SendMessage(GetDlgItem(hwndDlg, IDC_TIMESEPARATOR), CB_GETLBTEXT, (WPARAM)nIndex, (LPARAM)Buffer); - SetLocaleInfo(LOCALE_USER_DEFAULT, LOCALE_STIME, Buffer); + SetLocaleInfo(pGlobalData->lcid, LOCALE_STIME, Buffer); /* Set the AM symbol */ nIndex = SendMessage(GetDlgItem(hwndDlg, IDC_TIMEAMSYMBOL), @@ -184,11 +193,11 @@ { SendMessage(GetDlgItem(hwndDlg, IDC_TIMEAMSYMBOL), CB_GETLBTEXT, (WPARAM)nIndex, (LPARAM)Buffer); - SetLocaleInfo(LOCALE_USER_DEFAULT, LOCALE_S1159, Buffer); + SetLocaleInfo(pGlobalData->lcid, LOCALE_S1159, Buffer); } else { - SetLocaleInfo(LOCALE_USER_DEFAULT, LOCALE_S1159, _T("")); + SetLocaleInfo(pGlobalData->lcid, LOCALE_S1159, _T("")); } /* Set the PM symbol */ @@ -198,21 +207,21 @@ { SendMessage(GetDlgItem(hwndDlg, IDC_TIMEPMSYMBOL), CB_GETLBTEXT, (WPARAM)nIndex, (LPARAM)Buffer); - SetLocaleInfo(LOCALE_USER_DEFAULT, LOCALE_S2359, Buffer); + SetLocaleInfo(pGlobalData->lcid, LOCALE_S2359, Buffer); } else { - SetLocaleInfo(LOCALE_USER_DEFAULT, LOCALE_S2359, _T("")); + SetLocaleInfo(pGlobalData->lcid, LOCALE_S2359, _T("")); } /* Update the time format sample */ - UpdateTimeSample(GetDlgItem(hwndDlg, IDC_TIMESAMPLE)); + UpdateTimeSample(GetDlgItem(hwndDlg, IDC_TIMESAMPLE), pGlobalData->lcid); } } break; - } - - return FALSE; + } + + return FALSE; } /* EOF */

1 0

[ekohl] 28995: - Change the currently selected locale id instead of LOCALE_USER_DEFAULT. - Let the user choose between 0 and 9 fractional digits. - Fix a typo: SendMesssgeW --> SendMessage.
by ekohl＠svn.reactos.org 10 Sep '07

10 Sep '07

Author: ekohl Date: Tue Sep 11 00:40:27 2007 New Revision: 28995 URL: http://svn.reactos.org/svn/reactos?rev=28995&view=rev Log: - Change the currently selected locale id instead of LOCALE_USER_DEFAULT. - Let the user choose between 0 and 9 fractional digits. - Fix a typo: SendMesssgeW --> SendMessage. Modified: trunk/reactos/dll/cpl/intl/numbers.c Modified: trunk/reactos/dll/cpl/intl/numbers.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/numbers.c?rev… ============================================================================== --- trunk/reactos/dll/cpl/intl/numbers.c (original) +++ trunk/reactos/dll/cpl/intl/numbers.c Tue Sep 11 00:40:27 2007 @@ -35,7 +35,7 @@ #define SAMPLE_NUMBER _T("123456789") #define SAMPLE_NEG_NUMBER _T("-123456789") #define MAX_NUM_SEP_SAMPLES 2 -#define MAX_FRAC_NUM_SAMPLES 9 +#define MAX_FRAC_NUM_SAMPLES 10 #define MAX_FIELD_SEP_SAMPLES 1 #define MAX_FIELD_DIG_SAMPLES 3 #define MAX_NEG_SIGN_SAMPLES 1 @@ -44,17 +44,34 @@ #define MAX_LIST_SEP_SAMPLES 1 #define MAX_UNITS_SYS_SAMPLES 2 +static LPTSTR lpNumSepSamples[MAX_NUM_SEP_SAMPLES] = + {_T(","), _T(".")}; +static LPTSTR lpFieldSepSamples[MAX_FIELD_SEP_SAMPLES] = + {_T(" ")}; +static LPTSTR lpFieldDigNumSamples[MAX_FIELD_DIG_SAMPLES] = + {_T("0;0"), _T("3;0"), _T("3;2;0")}; +static LPTSTR lpNegSignSamples[MAX_NEG_SIGN_SAMPLES] = + {_T("-")}; +static LPTSTR lpNegNumFmtSamples[MAX_NEG_NUMBERS_SAMPLES] = + {_T("(1,1)"), _T("-1,1"), _T("- 1,1"), _T("1,1-"), _T("1,1 -")}; +static LPTSTR lpLeadNumFmtSamples[MAX_LEAD_ZEROES_SAMPLES] = + {_T(",7"), _T("0,7")}; +static LPTSTR lpListSepSamples[MAX_LIST_SEP_SAMPLES] = + {_T(";")}; +static LPTSTR lpUnitsSysSamples[MAX_UNITS_SYS_SAMPLES] = + {_T("Metrics"), _T("Americans")}; + + /* Init num decimal separator control box */ static VOID -InitNumDecimalSepCB(HWND hwndDlg) -{ - LPTSTR lpNumSepSamples[MAX_NUM_SEP_SAMPLES] = {_T(","), _T(".")}; +InitNumDecimalSepCB(HWND hwndDlg, LCID lcid) +{ TCHAR szNumSep[MAX_SAMPLES_STR_SIZE]; INT nCBIndex; INT nRetCode; /* Get current decimal separator */ - GetLocaleInfo(LOCALE_USER_DEFAULT, + GetLocaleInfo(lcid, LOCALE_SDECIMAL, szNumSep, MAX_SAMPLES_STR_SIZE); @@ -96,7 +113,7 @@ /* Init number of fractional symbols control box */ static VOID -InitNumOfFracSymbCB(HWND hwndDlg) +InitNumOfFracSymbCB(HWND hwndDlg, LCID lcid) { TCHAR szFracNum[MAX_SAMPLES_STR_SIZE]; TCHAR szFracCount[MAX_SAMPLES_STR_SIZE]; @@ -104,7 +121,7 @@ INT nRetCode; /* Get current number of fractional symbols */ - GetLocaleInfo(LOCALE_USER_DEFAULT, + GetLocaleInfo(lcid, LOCALE_IDIGITS, szFracNum, MAX_SAMPLES_STR_SIZE); @@ -136,15 +153,14 @@ /* Init field separator control box */ static VOID -InitNumFieldSepCB(HWND hwndDlg) -{ - LPTSTR lpFieldSepSamples[MAX_FIELD_SEP_SAMPLES] = {_T(" ")}; +InitNumFieldSepCB(HWND hwndDlg, LCID lcid) +{ TCHAR szFieldSep[MAX_SAMPLES_STR_SIZE]; INT nCBIndex; INT nRetCode; /* Get current field separator */ - GetLocaleInfo(LOCALE_USER_DEFAULT, + GetLocaleInfo(lcid, LOCALE_STHOUSAND, szFieldSep, MAX_SAMPLES_STR_SIZE); @@ -186,22 +202,15 @@ /* Init number of digidts in field control box */ static VOID -InitFieldDigNumCB(HWND hwndDlg) -{ - LPTSTR lpFieldDigNumSamples[MAX_FIELD_DIG_SAMPLES] = - { - _T("0;0"), - _T("3;0"), - _T("3;2;0") - }; - +InitFieldDigNumCB(HWND hwndDlg, LCID lcid) +{ TCHAR szFieldDigNum[MAX_SAMPLES_STR_SIZE]; LPTSTR pszFieldDigNumSmpl; INT nCBIndex; INT nRetCode; /* Get current field digits num */ - GetLocaleInfo(LOCALE_USER_DEFAULT, + GetLocaleInfo(lcid, LOCALE_SGROUPING, szFieldDigNum, MAX_SAMPLES_STR_SIZE); @@ -217,10 +226,10 @@ { pszFieldDigNumSmpl = InsSpacesFmt(SAMPLE_NUMBER, lpFieldDigNumSamples[nCBIndex]); - SendMessageW(GetDlgItem(hwndDlg, IDC_NUMBERSDGROUPING), - CB_ADDSTRING, - nCBIndex, - (LPARAM)pszFieldDigNumSmpl); + SendMessage(GetDlgItem(hwndDlg, IDC_NUMBERSDGROUPING), + CB_ADDSTRING, + nCBIndex, + (LPARAM)pszFieldDigNumSmpl); free(pszFieldDigNumSmpl); } @@ -249,15 +258,14 @@ /* Init negative sign control box */ static VOID -InitNegSignCB(HWND hwndDlg) -{ - LPTSTR lpNegSignSamples[MAX_NEG_SIGN_SAMPLES] = {_T("-")}; +InitNegSignCB(HWND hwndDlg, LCID lcid) +{ TCHAR szNegSign[MAX_SAMPLES_STR_SIZE]; INT nCBIndex; INT nRetCode; /* Get current negative sign */ - GetLocaleInfoW(LOCALE_USER_DEFAULT, + GetLocaleInfoW(lcid, LOCALE_SNEGATIVESIGN, szNegSign, MAX_SAMPLES_STR_SIZE); @@ -299,17 +307,8 @@ /* Init negative numbers format control box */ static VOID -InitNegNumFmtCB(HWND hwndDlg) -{ - LPTSTR lpNegNumFmtSamples[MAX_NEG_NUMBERS_SAMPLES] = - { - _T("(1,1)"), - _T("-1,1"), - _T("- 1,1"), - _T("1,1-"), - _T("1,1 -") - }; - +InitNegNumFmtCB(HWND hwndDlg, LCID lcid) +{ TCHAR szNegNumFmt[MAX_SAMPLES_STR_SIZE]; TCHAR szNumSep[MAX_SAMPLES_STR_SIZE]; TCHAR szNegSign[MAX_SAMPLES_STR_SIZE]; @@ -319,7 +318,7 @@ INT nRetCode; /* Get current negative numbers format */ - GetLocaleInfo(LOCALE_USER_DEFAULT, + GetLocaleInfo(lcid, LOCALE_INEGNUMBER, szNegNumFmt, MAX_SAMPLES_STR_SIZE); @@ -331,13 +330,13 @@ (LPARAM)0); /* Get current decimal separator */ - GetLocaleInfo(LOCALE_USER_DEFAULT, + GetLocaleInfo(lcid, LOCALE_SDECIMAL, szNumSep, MAX_SAMPLES_STR_SIZE); /* Get current negative sign */ - GetLocaleInfo(LOCALE_USER_DEFAULT, + GetLocaleInfo(lcid, LOCALE_SNEGATIVESIGN, szNegSign, MAX_SAMPLES_STR_SIZE); @@ -371,14 +370,8 @@ /* Init leading zeroes control box */ static VOID -InitLeadingZeroesCB(HWND hwndDlg) -{ - LPTSTR lpLeadNumFmtSamples[MAX_LEAD_ZEROES_SAMPLES] = - { - _T(",7"), - _T("0,7") - }; - +InitLeadingZeroesCB(HWND hwndDlg, LCID lcid) +{ TCHAR szLeadNumFmt[MAX_SAMPLES_STR_SIZE]; TCHAR szNumSep[MAX_SAMPLES_STR_SIZE]; LPTSTR pszResultStr; @@ -386,7 +379,7 @@ INT nRetCode; /* Get current leading zeroes format */ - GetLocaleInfo(LOCALE_USER_DEFAULT, + GetLocaleInfo(lcid, LOCALE_ILZERO, szLeadNumFmt, MAX_SAMPLES_STR_SIZE); @@ -398,7 +391,7 @@ (LPARAM)0); /* Get current decimal separator */ - GetLocaleInfo(LOCALE_USER_DEFAULT, + GetLocaleInfo(lcid, LOCALE_SDECIMAL, szNumSep, MAX_SAMPLES_STR_SIZE); @@ -424,15 +417,15 @@ } static VOID -InitListSepCB(HWND hwndDlg) -{ - LPTSTR lpListSepSamples[MAX_LIST_SEP_SAMPLES] = {_T(";")}; +InitListSepCB(HWND hwndDlg, + LCID lcid) +{ TCHAR szListSep[MAX_SAMPLES_STR_SIZE]; INT nCBIndex; INT nRetCode; /* Get current list separator */ - GetLocaleInfo(LOCALE_USER_DEFAULT, + GetLocaleInfo(lcid, LOCALE_SLIST, szListSep, MAX_SAMPLES_STR_SIZE); @@ -473,21 +466,15 @@ } /* Init system of units control box */ -VOID -InitUnitsSysCB(HWND hwndDlg) -{ - LPTSTR lpUnitsSysSamples[MAX_UNITS_SYS_SAMPLES] = - { - _T("Metrics"), - _T("Americans") - }; - +static VOID +InitUnitsSysCB(HWND hwndDlg, + LCID lcid) +{ TCHAR szUnitsSys[MAX_SAMPLES_STR_SIZE]; INT nCBIndex; - INT nRetCode; /* Get current system of units */ - GetLocaleInfo(LOCALE_USER_DEFAULT, + GetLocaleInfo(lcid, LOCALE_IMEASURE, szUnitsSys, MAX_SAMPLES_STR_SIZE); @@ -503,26 +490,26 @@ { SendMessage(GetDlgItem(hwndDlg, IDC_NUMBERSMEASSYS), CB_ADDSTRING, - nCBIndex, + 0, //nCBIndex, (LPARAM)lpUnitsSysSamples[nCBIndex]); } /* Set current item to value from registry */ - nRetCode = SendMessage(GetDlgItem(hwndDlg, IDC_NUMBERSMEASSYS), - CB_SETCURSEL, - (WPARAM)_ttoi(szUnitsSys), - (LPARAM)0); + SendMessage(GetDlgItem(hwndDlg, IDC_NUMBERSMEASSYS), + CB_SETCURSEL, + (WPARAM)_ttoi(szUnitsSys), + (LPARAM)0); } /* Update all numbers locale samples */ static VOID UpdateNumSamples(HWND hwndDlg, - LCID lcidLocale) + LCID lcid) { TCHAR OutBuffer[MAX_FMT_SIZE]; /* Get positive number format sample */ - GetNumberFormat(lcidLocale, + GetNumberFormat(lcid, 0, SAMPLE_NUMBER, NULL, @@ -535,7 +522,7 @@ (LPARAM)OutBuffer); /* Get positive number format sample */ - GetNumberFormat(lcidLocale, + GetNumberFormat(lcid, 0, SAMPLE_NEG_NUMBER, NULL, @@ -550,7 +537,8 @@ /* Set num decimal separator */ static BOOL -SetNumDecimalSep(HWND hwndDlg) +SetNumDecimalSep(HWND hwndDlg, + LCID lcid) { TCHAR szDecimalSep[MAX_SAMPLES_STR_SIZE]; @@ -561,14 +549,15 @@ (LPARAM)szDecimalSep); /* Save decimal separator */ - SetLocaleInfo(LOCALE_USER_DEFAULT, LOCALE_SDECIMAL, szDecimalSep); + SetLocaleInfo(lcid, LOCALE_SDECIMAL, szDecimalSep); return TRUE; } /* Set number of fractional symbols */ static BOOL -SetFracSymNum(HWND hwndDlg) +SetFracSymNum(HWND hwndDlg, + LCID lcid) { TCHAR szFracSymNum[MAX_SAMPLES_STR_SIZE]; INT nCurrSel; @@ -583,14 +572,15 @@ _itot(nCurrSel, szFracSymNum, DECIMAL_RADIX); /* Save number of fractional symbols */ - SetLocaleInfo(LOCALE_USER_DEFAULT, LOCALE_IDIGITS, szFracSymNum); + SetLocaleInfo(lcid, LOCALE_IDIGITS, szFracSymNum); return TRUE; } /* Set field separator */ static BOOL -SetNumFieldSep(HWND hwndDlg) +SetNumFieldSep(HWND hwndDlg, + LCID lcid) { TCHAR szFieldSep[MAX_SAMPLES_STR_SIZE]; @@ -601,22 +591,16 @@ (LPARAM)szFieldSep); /* Save field separator */ - SetLocaleInfo(LOCALE_USER_DEFAULT, LOCALE_STHOUSAND, szFieldSep); + SetLocaleInfo(lcid, LOCALE_STHOUSAND, szFieldSep); return TRUE; } /* Set number of digidts in field */ static BOOL -SetFieldDigNum(HWND hwndDlg) -{ - LPTSTR lpFieldDigNumSamples[MAX_FIELD_DIG_SAMPLES] = - { - _T("0;0"), - _T("3;0"), - _T("3;2;0") - }; - +SetFieldDigNum(HWND hwndDlg, + LCID lcid) +{ INT nCurrSel; /* Get setted number of digidts in field */ @@ -626,14 +610,15 @@ (LPARAM)0); /* Save number of digidts in field */ - SetLocaleInfo(LOCALE_USER_DEFAULT, LOCALE_SGROUPING, lpFieldDigNumSamples[nCurrSel]); + SetLocaleInfo(lcid, LOCALE_SGROUPING, lpFieldDigNumSamples[nCurrSel]); return TRUE; } /* Set negative sign */ static BOOL -SetNumNegSign(HWND hwndDlg) +SetNumNegSign(HWND hwndDlg, + LCID lcid) { TCHAR szNegSign[MAX_SAMPLES_STR_SIZE]; @@ -644,14 +629,15 @@ (LPARAM)szNegSign); /* Save negative sign */ - SetLocaleInfo(LOCALE_USER_DEFAULT, LOCALE_SNEGATIVESIGN, szNegSign); + SetLocaleInfo(lcid, LOCALE_SNEGATIVESIGN, szNegSign); return TRUE; } /* Set negative sum format */ static BOOL -SetNegSumFmt(HWND hwndDlg) +SetNegSumFmt(HWND hwndDlg, + LCID lcid) { TCHAR szNegSumFmt[MAX_SAMPLES_STR_SIZE]; INT nCurrSel; @@ -666,14 +652,15 @@ _itot(nCurrSel, szNegSumFmt,DECIMAL_RADIX); /* Save negative sum format */ - SetLocaleInfo(LOCALE_USER_DEFAULT, LOCALE_INEGNUMBER, szNegSumFmt); + SetLocaleInfo(lcid, LOCALE_INEGNUMBER, szNegSumFmt); return TRUE; } /* Set leading zero */ static BOOL -SetNumLeadZero(HWND hwndDlg) +SetNumLeadZero(HWND hwndDlg, + LCID lcid) { TCHAR szLeadZero[MAX_SAMPLES_STR_SIZE]; INT nCurrSel; @@ -688,14 +675,15 @@ _itot(nCurrSel, szLeadZero, DECIMAL_RADIX); /* Save leading zero format */ - SetLocaleInfo(LOCALE_USER_DEFAULT, LOCALE_ILZERO, szLeadZero); + SetLocaleInfo(lcid, LOCALE_ILZERO, szLeadZero); return TRUE; } /* Set elements list separator */ static BOOL -SetNumListSep(HWND hwndDlg) +SetNumListSep(HWND hwndDlg, + LCID lcid) { TCHAR szListSep[MAX_SAMPLES_STR_SIZE]; @@ -706,14 +694,15 @@ (LPARAM)szListSep); /* Save list separator */ - SetLocaleInfo(LOCALE_USER_DEFAULT, LOCALE_SLIST, szListSep); + SetLocaleInfo(lcid, LOCALE_SLIST, szListSep); return TRUE; } /* Set units system */ static BOOL -SetNumUnitsSys(HWND hwndDlg) +SetNumUnitsSys(HWND hwndDlg, + LCID lcid) { TCHAR szUnitsSys[MAX_SAMPLES_STR_SIZE]; INT nCurrSel; @@ -728,7 +717,7 @@ _itot(nCurrSel, szUnitsSys, DECIMAL_RADIX); /* Save units system */ - SetLocaleInfo(LOCALE_USER_DEFAULT, LOCALE_IMEASURE, szUnitsSys); + SetLocaleInfo(lcid, LOCALE_IMEASURE, szUnitsSys); return TRUE; } @@ -736,69 +725,88 @@ /* Property page dialog callback */ INT_PTR CALLBACK NumbersPageProc(HWND hwndDlg, - UINT uMsg, - WPARAM wParam, - LPARAM lParam) -{ - switch (uMsg) - { - case WM_INITDIALOG: - { - InitNumDecimalSepCB(hwndDlg); - InitNumOfFracSymbCB(hwndDlg); - InitNumFieldSepCB(hwndDlg); - InitFieldDigNumCB(hwndDlg); - InitNegSignCB(hwndDlg); - InitNegNumFmtCB(hwndDlg); - InitLeadingZeroesCB(hwndDlg); - InitListSepCB(hwndDlg); - InitUnitsSysCB(hwndDlg); - UpdateNumSamples(hwndDlg, LOCALE_USER_DEFAULT); - } - break; - case WM_COMMAND: - { - switch (LOWORD(wParam)) - { - case IDC_NUMBERDSYMBOL: - case IDC_NUMBERSNDIGDEC: - case IDC_NUMBERSDIGITGRSYM: - case IDC_NUMBERSDGROUPING: - case IDC_NUMBERSNSIGNSYM: - case IDC_NUMBERSNNUMFORMAT: - case IDC_NUMBERSDISPLEADZER: - case IDC_NUMBERSLSEP: - case IDC_NUMBERSMEASSYS: - if (HIWORD(wParam) == CBN_SELCHANGE || HIWORD(wParam) == CBN_EDITCHANGE) + UINT uMsg, + WPARAM wParam, + LPARAM lParam) +{ + PGLOBALDATA pGlobalData; + + pGlobalData = (PGLOBALDATA)GetWindowLongPtr(hwndDlg, DWLP_USER); + + switch (uMsg) + { + case WM_INITDIALOG: + pGlobalData = (PGLOBALDATA)((LPPROPSHEETPAGE)lParam)->lParam; + SetWindowLongPtr(hwndDlg, DWLP_USER, (LONG_PTR)pGlobalData); + + InitNumDecimalSepCB(hwndDlg, pGlobalData->lcid); + InitNumOfFracSymbCB(hwndDlg, pGlobalData->lcid); + InitNumFieldSepCB(hwndDlg, pGlobalData->lcid); + InitFieldDigNumCB(hwndDlg, pGlobalData->lcid); + InitNegSignCB(hwndDlg, pGlobalData->lcid); + InitNegNumFmtCB(hwndDlg, pGlobalData->lcid); + InitLeadingZeroesCB(hwndDlg, pGlobalData->lcid); + InitListSepCB(hwndDlg, pGlobalData->lcid); + InitUnitsSysCB(hwndDlg, pGlobalData->lcid); + UpdateNumSamples(hwndDlg, pGlobalData->lcid); + break; + + case WM_COMMAND: + switch (LOWORD(wParam)) { - /* Set "Apply" button enabled */ - PropSheet_Changed(GetParent(hwndDlg), hwndDlg); + case IDC_NUMBERDSYMBOL: + case IDC_NUMBERSNDIGDEC: + case IDC_NUMBERSDIGITGRSYM: + case IDC_NUMBERSDGROUPING: + case IDC_NUMBERSNSIGNSYM: + case IDC_NUMBERSNNUMFORMAT: + case IDC_NUMBERSDISPLEADZER: + case IDC_NUMBERSLSEP: + case IDC_NUMBERSMEASSYS: + if (HIWORD(wParam) == CBN_SELCHANGE || HIWORD(wParam) == CBN_EDITCHANGE) + { + /* Set "Apply" button enabled */ + PropSheet_Changed(GetParent(hwndDlg), hwndDlg); + } } - } - } - break; - case WM_NOTIFY: - { - LPNMHDR lpnm = (LPNMHDR)lParam; - /* If push apply button */ - if (lpnm->code == (UINT)PSN_APPLY) - { - if(!SetNumDecimalSep(hwndDlg)) break; - if (!SetFracSymNum(hwndDlg)) break; - if (!SetNumFieldSep(hwndDlg)) break; - if (!SetFieldDigNum(hwndDlg)) break; - if (!SetNumNegSign(hwndDlg)) break; - if (!SetNegSumFmt(hwndDlg)) break; - if (!SetNumLeadZero(hwndDlg)) break; - if (!SetNumListSep(hwndDlg)) break; - if (!SetNumUnitsSys(hwndDlg)) break; - - UpdateNumSamples(hwndDlg, LOCALE_USER_DEFAULT); - } - } - break; - } - return FALSE; + break; + + case WM_NOTIFY: + /* If push apply button */ + if (((LPNMHDR)lParam)->code == (UINT)PSN_APPLY) + { + if (!SetNumDecimalSep(hwndDlg, pGlobalData->lcid)) + break; + + if (!SetFracSymNum(hwndDlg, pGlobalData->lcid)) + break; + + if (!SetNumFieldSep(hwndDlg, pGlobalData->lcid)) + break; + + if (!SetFieldDigNum(hwndDlg, pGlobalData->lcid)) + break; + + if (!SetNumNegSign(hwndDlg, pGlobalData->lcid)) + break; + + if (!SetNegSumFmt(hwndDlg, pGlobalData->lcid)) + break; + + if (!SetNumLeadZero(hwndDlg, pGlobalData->lcid)) + break; + + if (!SetNumListSep(hwndDlg, pGlobalData->lcid)) + break; + + if (!SetNumUnitsSys(hwndDlg, pGlobalData->lcid)) + break; + + UpdateNumSamples(hwndDlg, pGlobalData->lcid); + } + break; + } + return FALSE; } /* EOF */

1 0

[cfinck] 28994: Hey everyone, here is the 0.3.3 Release :-)
by cfinck＠svn.reactos.org 10 Sep '07

10 Sep '07

Author: cfinck Date: Mon Sep 10 21:30:41 2007 New Revision: 28994 URL: http://svn.reactos.org/svn/reactos?rev=28994&view=rev Log: Hey everyone, here is the 0.3.3 Release :-) Modified: branches/ros-branch-0_3_3-new/reactos/include/reactos/version.h Modified: branches/ros-branch-0_3_3-new/reactos/include/reactos/version.h URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3-new/reactos/in… ============================================================================== --- branches/ros-branch-0_3_3-new/reactos/include/reactos/version.h (original) +++ branches/ros-branch-0_3_3-new/reactos/include/reactos/version.h Mon Sep 10 21:30:41 2007 @@ -22,7 +22,7 @@ #define KERNEL_VERSION_PATCH_LEVEL 3 /* KERNEL_VERSION_BUILD_TYPE is L"SVN", L"RC1", L"RC2" or L"RELEASE" */ -#define KERNEL_VERSION_BUILD_TYPE L"RC2" +#define KERNEL_VERSION_BUILD_TYPE L"RELEASE" #endif

1 0

[fireball] 28993: - Separate creating partitions objects into a different function (CreatePartitionsObject()). - Slightly improve the logic of accessing the partitions list.
by fireball＠svn.reactos.org 10 Sep '07

10 Sep '07

Author: fireball Date: Mon Sep 10 20:25:48 2007 New Revision: 28993 URL: http://svn.reactos.org/svn/reactos?rev=28993&view=rev Log: - Separate creating partitions objects into a different function (CreatePartitionsObject()). - Slightly improve the logic of accessing the partitions list. Modified: trunk/reactos/drivers/storage/class/disk/disk.c Modified: trunk/reactos/drivers/storage/class/disk/disk.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/class/disk… ============================================================================== --- trunk/reactos/drivers/storage/class/disk/disk.c (original) +++ trunk/reactos/drivers/storage/class/disk/disk.c Mon Sep 10 20:25:48 2007 @@ -28,6 +28,12 @@ #define ExAllocatePool(a,b) ExAllocatePoolWithTag(a,b,'DscS') #endif +typedef enum { + NotInitialized, + Initializing, + Initialized +} PARTITION_LIST_STATE; + // // Disk device data // @@ -100,10 +106,16 @@ // // DriveNotReady - inidicates that the this device is currenly not ready - // beacasue there is no media in the device. + // because there is no media in the device. // BOOLEAN DriveNotReady; + + // + // State of PartitionList initialization + // + + PARTITION_LIST_STATE PartitionListState; } DISK_DATA, *PDISK_DATA; @@ -270,6 +282,13 @@ IN PCLASS_INIT_DATA InitData ); +NTSTATUS +STDCALL +CreatePartitionDeviceObjects( + IN PDEVICE_OBJECT PhysicalDeviceObject, + IN PUNICODE_STRING RegistryPath + ); + VOID STDCALL UpdateDeviceObjects( @@ -628,30 +647,21 @@ CCHAR ntNameBuffer[MAXIMUM_FILENAME_LENGTH]; STRING ntNameString; UNICODE_STRING ntUnicodeString; - ULONG partitionNumber = 0; OBJECT_ATTRIBUTES objectAttributes; HANDLE handle; NTSTATUS status; PDEVICE_OBJECT deviceObject = NULL; PDEVICE_OBJECT physicalDevice; PDISK_GEOMETRY diskGeometry = NULL; - PDRIVE_LAYOUT_INFORMATION partitionList; PDEVICE_EXTENSION deviceExtension = NULL; PDEVICE_EXTENSION physicalDeviceExtension; - PDISK_DATA diskData; - ULONG bytesPerSector; - UCHAR sectorShift; UCHAR pathId = LunInfo->PathId; UCHAR targetId = LunInfo->TargetId; UCHAR lun = LunInfo->Lun; BOOLEAN writeCache; PVOID senseData = NULL; ULONG srbFlags; - ULONG dmByteSkew = 0; - PULONG dmSkew; - BOOLEAN dmActive = FALSE; ULONG timeOut = 0; - ULONG numberListElements = 0; BOOLEAN srbListInitialized = FALSE; @@ -995,19 +1005,88 @@ deviceObject->Flags &= ~DO_VERIFY_VOLUME; } - // - // Set up sector size fields. - // - // Stack variables will be used to update - // the partition device extensions. - // - // The device extension field SectorShift is - // used to calculate sectors in I/O transfers. - // - // The DiskGeometry structure is used to service - // IOCTls used by the format utility. - // - + status = CreatePartitionDeviceObjects(deviceObject, RegistryPath); + + if (NT_SUCCESS(status)) + return STATUS_SUCCESS; + + +CreateDiskDeviceObjectsExit: + + // + // Release the device since an error occurred. + // + + ScsiClassClaimDevice(PortDeviceObject, + LunInfo, + TRUE, + NULL); + + if (diskGeometry != NULL) { + ExFreePool(diskGeometry); + } + + if (senseData != NULL) { + ExFreePool(senseData); + } + + if (deviceObject != NULL) { + + if (srbListInitialized) { + ExDeleteNPagedLookasideList(&deviceExtension->SrbLookasideListHead); + } + + IoDeleteDevice(deviceObject); + } + + // + // Delete directory and return. + // + + if (!NT_SUCCESS(status)) { + ZwMakeTemporaryObject(handle); + } + + ZwClose(handle); + + return(status); + +} // end CreateDiskDeviceObjects() + + +NTSTATUS +STDCALL +CreatePartitionDeviceObjects( + IN PDEVICE_OBJECT PhysicalDeviceObject, + IN PUNICODE_STRING RegistryPath + ) +{ + CCHAR ntNameBuffer[MAXIMUM_FILENAME_LENGTH]; + ULONG partitionNumber = 0; + NTSTATUS status; + PDEVICE_OBJECT deviceObject = NULL; + PDISK_GEOMETRY diskGeometry = NULL; + PDRIVE_LAYOUT_INFORMATION partitionList = NULL; + PDEVICE_EXTENSION deviceExtension; + PDEVICE_EXTENSION physicalDeviceExtension; + PCLASS_INIT_DATA initData = NULL; + PDISK_DATA diskData; + PDISK_DATA physicalDiskData; + ULONG bytesPerSector; + UCHAR sectorShift; + ULONG srbFlags; + ULONG dmByteSkew = 0; + PULONG dmSkew; + BOOLEAN dmActive = FALSE; + ULONG numberListElements = 0; + + + // + // Get physical device geometry information for partition table reads. + // + + physicalDeviceExtension = PhysicalDeviceObject->DeviceExtension; + diskGeometry = physicalDeviceExtension->DiskGeometry; bytesPerSector = diskGeometry->BytesPerSector; // @@ -1023,13 +1102,14 @@ bytesPerSector = diskGeometry->BytesPerSector = 512; } - sectorShift = deviceExtension->SectorShift; + sectorShift = physicalDeviceExtension->SectorShift; // // Set pointer to disk data area that follows device extension. // - diskData = (PDISK_DATA)(deviceExtension + 1); + diskData = (PDISK_DATA)(physicalDeviceExtension + 1); + diskData->PartitionListState = Initializing; // // Determine is DM Driver is loaded on an IDE drive that is @@ -1037,8 +1117,8 @@ // an Atapi device is sharing the controller with an IDE disk. // - HalExamineMBR(deviceExtension->DeviceObject, - deviceExtension->DiskGeometry->BytesPerSector, + HalExamineMBR(PhysicalDeviceObject, + physicalDeviceExtension->DiskGeometry->BytesPerSector, (ULONG)0x54, (PVOID)&dmSkew); @@ -1050,9 +1130,9 @@ // to be skewed by *dmSkew sectors aka DMByteSkew. // - deviceExtension->DMSkew = *dmSkew; - deviceExtension->DMActive = TRUE; - deviceExtension->DMByteSkew = deviceExtension->DMSkew * bytesPerSector; + physicalDeviceExtension->DMSkew = *dmSkew; + physicalDeviceExtension->DMActive = TRUE; + physicalDeviceExtension->DMByteSkew = physicalDeviceExtension->DMSkew * bytesPerSector; // // Save away the infomation that we need, since this deviceExtension will soon be @@ -1060,7 +1140,7 @@ // dmActive = TRUE; - dmByteSkew = deviceExtension->DMByteSkew; + dmByteSkew = physicalDeviceExtension->DMByteSkew; } @@ -1068,8 +1148,8 @@ // Create objects for all the partitions on the device. // - status = IoReadPartitionTable(deviceObject, - deviceExtension->DiskGeometry->BytesPerSector, + status = IoReadPartitionTable(PhysicalDeviceObject, + physicalDeviceExtension->DiskGeometry->BytesPerSector, TRUE, (PVOID)&partitionList); @@ -1078,9 +1158,9 @@ // then fix up the partition list to make it look like there is one // zero length partition. // - + DPRINT1("IoReadPartitionTable() status: 0x%08X\n", status); if ((!NT_SUCCESS(status) || partitionList->PartitionCount == 0) && - deviceObject->Characteristics & FILE_REMOVABLE_MEDIA) { + PhysicalDeviceObject->Characteristics & FILE_REMOVABLE_MEDIA) { if (!NT_SUCCESS(status)) { @@ -1136,28 +1216,53 @@ if (!diskData->Signature) { - if (!CalculateMbrCheckSum(deviceExtension, + if (!CalculateMbrCheckSum(physicalDeviceExtension, &diskData->MbrCheckSum)) { DebugPrint((1, "SCSIDISK: Can't calculate MBR checksum for disk %x\n", - deviceExtension->DeviceNumber)); + physicalDeviceExtension->DeviceNumber)); } else { DebugPrint((2, "SCSIDISK: MBR checksum for disk %x is %x\n", - deviceExtension->DeviceNumber, + physicalDeviceExtension->DeviceNumber, diskData->MbrCheckSum)); } } - // // Check the registry and determine if the BIOS knew about this drive. If // it did then update the geometry with the BIOS information. // - UpdateGeometry(deviceExtension); + UpdateGeometry(physicalDeviceExtension); + + srbFlags = physicalDeviceExtension->SrbFlags; + + initData = ExAllocatePool(NonPagedPool, sizeof(CLASS_INIT_DATA)); + if (!initData) + { + DebugPrint((1, + "Disk.CreatePartionDeviceObjects - Allocation of initData failed\n")); + + status = STATUS_INSUFFICIENT_RESOURCES; + goto CreatePartitionDeviceObjectsExit; + } + + RtlZeroMemory(initData, sizeof(CLASS_INIT_DATA)); + + initData->InitializationDataSize = sizeof(CLASS_INIT_DATA); + initData->DeviceExtensionSize = DEVICE_EXTENSION_SIZE; + initData->DeviceType = FILE_DEVICE_DISK; + initData->DeviceCharacteristics = PhysicalDeviceObject->Characteristics; + initData->ClassError = physicalDeviceExtension->ClassError; + initData->ClassReadWriteVerification = physicalDeviceExtension->ClassReadWriteVerification; + initData->ClassFindDevices = physicalDeviceExtension->ClassFindDevices; + initData->ClassDeviceControl = physicalDeviceExtension->ClassDeviceControl; + initData->ClassShutdownFlush = physicalDeviceExtension->ClassShutdownFlush; + initData->ClassCreateClose = physicalDeviceExtension->ClassCreateClose; + initData->ClassStartIo = physicalDeviceExtension->ClassStartIo; // // Create device objects for the device partitions (if any). @@ -1178,18 +1283,18 @@ sprintf(ntNameBuffer, "\\Device\\Harddisk%lu\\Partition%lu", - *DeviceCount, + physicalDeviceExtension->DeviceNumber, partitionNumber + 1); DebugPrint((2, "CreateDiskDeviceObjects: Create device object %s\n", ntNameBuffer)); - status = ScsiClassCreateDeviceObject(DriverObject, + status = ScsiClassCreateDeviceObject(PhysicalDeviceObject->DriverObject, ntNameBuffer, - physicalDevice, + PhysicalDeviceObject, &deviceObject, - InitData); + initData); if (!NT_SUCCESS(status)) { @@ -1214,7 +1319,7 @@ deviceObject->Flags &= ~DO_DEVICE_INITIALIZING; } - deviceObject->StackSize = (CCHAR)PortDeviceObject->StackSize + 1; + deviceObject->StackSize = (CCHAR)physicalDeviceExtension->PortDeviceObject->StackSize + 1; // // Set up device extension fields. @@ -1264,16 +1369,15 @@ // Copy port device object pointer to device extension. // - deviceExtension->PortDeviceObject = PortDeviceObject; - deviceExtension->PortNumber = (UCHAR)PortNumber; + deviceExtension->PortDeviceObject = physicalDeviceExtension->PortDeviceObject; // // Set the alignment requirements for the device based on the // host adapter requirements // - if (PortDeviceObject->AlignmentRequirement > deviceObject->AlignmentRequirement) { - deviceObject->AlignmentRequirement = PortDeviceObject->AlignmentRequirement; + if (physicalDeviceExtension->PortDeviceObject->AlignmentRequirement > deviceObject->AlignmentRequirement) { + deviceObject->AlignmentRequirement = physicalDeviceExtension->PortDeviceObject->AlignmentRequirement; } @@ -1297,8 +1401,8 @@ // Set the sense-data pointer in the device extension. // - deviceExtension->SenseData = senseData; - deviceExtension->PortCapabilities = PortCapabilities; + deviceExtension->SenseData = physicalDeviceExtension->SenseData; + deviceExtension->PortCapabilities = physicalDeviceExtension->PortCapabilities; deviceExtension->DiskGeometry = diskGeometry; diskData->PartitionOrdinal = diskData->PartitionNumber = partitionNumber + 1; diskData->PartitionType = partitionList->PartitionEntry[partitionNumber].PartitionType; @@ -1310,16 +1414,16 @@ deviceExtension->StartingOffset = partitionList->PartitionEntry[partitionNumber].StartingOffset; deviceExtension->PartitionLength = partitionList->PartitionEntry[partitionNumber].PartitionLength; diskData->HiddenSectors = partitionList->PartitionEntry[partitionNumber].HiddenSectors; - deviceExtension->PortNumber = (UCHAR)PortNumber; - deviceExtension->PathId = pathId; - deviceExtension->TargetId = targetId; - deviceExtension->Lun = lun; + deviceExtension->PortNumber = physicalDeviceExtension->PortNumber; + deviceExtension->PathId = physicalDeviceExtension->PathId; + deviceExtension->TargetId = physicalDeviceExtension->TargetId; + deviceExtension->Lun = physicalDeviceExtension->Lun; // // Check for removable media support. // - if (((PINQUIRYDATA)LunInfo->InquiryData)->RemovableMedia) { + if (PhysicalDeviceObject->Characteristics & FILE_REMOVABLE_MEDIA) { deviceObject->Characteristics |= FILE_REMOVABLE_MEDIA; } @@ -1327,7 +1431,7 @@ // Set timeout value in seconds. // - deviceExtension->TimeOutValue = SCSI_DISK_TIMEOUT; + deviceExtension->TimeOutValue = physicalDeviceExtension->TimeOutValue; deviceExtension->DiskGeometry->BytesPerSector = bytesPerSector; deviceExtension->SectorShift = sectorShift; deviceExtension->DeviceObject = deviceObject; @@ -1344,54 +1448,27 @@ } else { - DebugPrint((1, - "CreateDiskDeviceObjects: IoReadPartitionTable failed\n")); +CreatePartitionDeviceObjectsExit: + + if (partitionList) { + ExFreePool(partitionList); + } + if (initData) { + ExFreePool(initData); + } + + return status; } // end if...else + + physicalDiskData = (PDISK_DATA)(physicalDeviceExtension + 1); + physicalDiskData->PartitionListState = Initialized; + return(STATUS_SUCCESS); -CreateDiskDeviceObjectsExit: - - // - // Release the device since an error occurred. - // - - ScsiClassClaimDevice(PortDeviceObject, - LunInfo, - TRUE, - NULL); - - if (diskGeometry != NULL) { - ExFreePool(diskGeometry); - } - - if (senseData != NULL) { - ExFreePool(senseData); - } - - if (deviceObject != NULL) { - - if (srbListInitialized) { - ExDeleteNPagedLookasideList(&deviceExtension->SrbLookasideListHead); - } - - IoDeleteDevice(deviceObject); - } - - // - // Delete directory and return. - // - - if (!NT_SUCCESS(status)) { - ZwMakeTemporaryObject(handle); - } - - ZwClose(handle); - - return(status); - -} // end CreateDiskDeviceObjects() + +} // end CreatePartitionDeviceObjects() NTSTATUS @@ -1937,6 +2014,12 @@ } case IOCTL_DISK_GET_DRIVE_GEOMETRY: + { + + PDEVICE_EXTENSION physicalDeviceExtension; + PDISK_DATA physicalDiskData; + BOOLEAN removable = FALSE; + BOOLEAN listInitialized = FALSE; if ( irpStack->Parameters.DeviceIoControl.OutputBufferLength < sizeof( DISK_GEOMETRY ) ) { @@ -1945,14 +2028,26 @@ break; } - if (DeviceObject->Characteristics & FILE_REMOVABLE_MEDIA) { - + status = STATUS_SUCCESS; + + physicalDeviceExtension = deviceExtension->PhysicalDevice->DeviceExtension; + physicalDiskData = (PDISK_DATA)(physicalDeviceExtension + 1); + + removable = (BOOLEAN)DeviceObject->Characteristics & FILE_REMOVABLE_MEDIA; + listInitialized = (physicalDiskData->PartitionListState == Initialized); + + if (removable || (!listInitialized)) + { // // Issue ReadCapacity to update device extension // with information for current media. // status = ScsiClassReadDriveCapacity(deviceExtension->PhysicalDevice); + + } + + if (removable) { if (!NT_SUCCESS(status)) { @@ -1970,20 +2065,33 @@ // diskData->DriveNotReady = FALSE; - } - - // - // Copy drive geometry information from device extension. - // - - RtlMoveMemory(Irp->AssociatedIrp.SystemBuffer, - deviceExtension->DiskGeometry, - sizeof(DISK_GEOMETRY)); - - status = STATUS_SUCCESS; - Irp->IoStatus.Information = sizeof(DISK_GEOMETRY); + + } else if (NT_SUCCESS(status)) { + + // ReadDriveCapacity was allright, create Partition Objects + + if (physicalDiskData->PartitionListState == NotInitialized) { + status = CreatePartitionDeviceObjects(deviceExtension->PhysicalDevice, NULL); + } + } + + if (NT_SUCCESS(status)) { + + // + // Copy drive geometry information from device extension. + // + + RtlMoveMemory(Irp->AssociatedIrp.SystemBuffer, + deviceExtension->DiskGeometry, + sizeof(DISK_GEOMETRY)); + + status = STATUS_SUCCESS; + Irp->IoStatus.Information = sizeof(DISK_GEOMETRY); + } break; + + } case IOCTL_DISK_VERIFY:

1 0

[ekohl] 28992: Add missing quotation mark and enable the german translation again.
by ekohl＠svn.reactos.org 10 Sep '07

10 Sep '07

Author: ekohl Date: Mon Sep 10 17:31:48 2007 New Revision: 28992 URL: http://svn.reactos.org/svn/reactos?rev=28992&view=rev Log: Add missing quotation mark and enable the german translation again. Modified: trunk/reactos/dll/cpl/input/input.rc trunk/reactos/dll/cpl/input/lang/de-DE.rc 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 Mon Sep 10 17:31:48 2007 @@ -25,6 +25,6 @@ * a neutral version. This is to get localized bitmaps for example. */ -//#include "lang/de-DE.rc" +#include "lang/de-DE.rc" #include "lang/en-US.rc" #include "lang/uk-UA.rc" 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 Mon Sep 10 17:31:48 2007 @@ -25,7 +25,7 @@ CAPTION "Erweitert" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - GROUPBOX Kompatibilitäts-Konfiguration", -1, 7,7,231,60 + GROUPBOX "Kompatibilitäts-Konfiguration", -1, 7,7,231,60 AUTOCHECKBOX "&Erweiterte Textdienste in allen Programmen verwenden.", IDC_SUPPORT_ADV_SERV_CHECKBOX, 14, 19, 210, 10, WS_GROUP LTEXT "Aktivieren Sie diese Funktion, um alle Erweiterten Textdienste in Notepad und anderen Programmen zu aktivieren, die normalerweise keine Sprach- und Handschrifterkennung oder andere Erweiterte Textdienste unterstützen.",-1,14,33,220,25 GROUPBOX "Systemkonfiguration", -1, 7,74,231,60

1 0

[hpoussin] 28991: Fix File::GetFullPath()
by hpoussin＠svn.reactos.org 10 Sep '07

10 Sep '07

Author: hpoussin Date: Mon Sep 10 17:20:32 2007 New Revision: 28991 URL: http://svn.reactos.org/svn/reactos?rev=28991&view=rev Log: Fix File::GetFullPath() Modified: trunk/reactos/tools/rbuild/module.cpp Modified: trunk/reactos/tools/rbuild/module.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/module.cpp?re… ============================================================================== --- trunk/reactos/tools/rbuild/module.cpp (original) +++ trunk/reactos/tools/rbuild/module.cpp Mon Sep 10 17:20:32 2007 @@ -1256,11 +1256,26 @@ std::string File::GetFullPath () const { - // TODO FIXME take care of file.directory? return a full path? + string directory ( "" ); + switch ( file.directory ) + { + case SourceDirectory: + break; + case IntermediateDirectory: + directory = Environment::GetIntermediatePath () + sSep; + break; + default: + throw InvalidOperationException ( __FILE__, + __LINE__, + "Invalid directory %d.", + file.directory ); + } + if ( file.relative_path.length () > 0 ) - return file.relative_path + sSep + file.name; - else - return file.name; + directory += file.relative_path + sSep; + + + return directory + file.name; }

1 0

[hpoussin] 28990: Continue rbuild cleanup (File class)
by hpoussin＠svn.reactos.org 10 Sep '07

10 Sep '07

Author: hpoussin Date: Mon Sep 10 17:13:16 2007 New Revision: 28990 URL: http://svn.reactos.org/svn/reactos?rev=28990&view=rev Log: Continue rbuild cleanup (File class) Modified: trunk/reactos/tools/rbuild/automaticdependency.cpp trunk/reactos/tools/rbuild/backend/codeblocks/codeblocks.cpp trunk/reactos/tools/rbuild/backend/devcpp/devcpp.cpp trunk/reactos/tools/rbuild/backend/devcpp/devcpp.h trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp trunk/reactos/tools/rbuild/backend/msbuild/msbuild.cpp trunk/reactos/tools/rbuild/backend/msvc/msvc.cpp trunk/reactos/tools/rbuild/backend/msvc/msvcmaker.cpp trunk/reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp trunk/reactos/tools/rbuild/compilationunit.cpp trunk/reactos/tools/rbuild/compilationunitsupportcode.cpp trunk/reactos/tools/rbuild/module.cpp trunk/reactos/tools/rbuild/rbuild.h trunk/reactos/tools/rbuild/wineresource.cpp Modified: trunk/reactos/tools/rbuild/automaticdependency.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/automaticdepe… ============================================================================== --- trunk/reactos/tools/rbuild/automaticdependency.cpp (original) +++ trunk/reactos/tools/rbuild/automaticdependency.cpp Mon Sep 10 17:13:16 2007 @@ -321,7 +321,8 @@ if ( module.pch != NULL ) { - File *file = new File ( module.pch->file.relative_path + sSep + module.pch->file.name , false, "", true ); + const FileLocation& pch = module.pch->file; + File *file = new File ( pch.directory, pch.relative_path, pch.name , false, "", true ); files.push_back ( file ); } } @@ -541,7 +542,7 @@ for ( size_t fi = 0; fi < files.size (); fi++ ) { File& file = *files[fi]; - string normalizedFilename = NormalizeFilename ( file.name ); + string normalizedFilename = NormalizeFilename ( file.GetFullPath () ); SourceFile* sourceFile = RetrieveFromCache ( normalizedFilename ); if ( sourceFile != NULL ) Modified: trunk/reactos/tools/rbuild/backend/codeblocks/codeblocks.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/codeb… ============================================================================== --- trunk/reactos/tools/rbuild/backend/codeblocks/codeblocks.cpp (original) +++ trunk/reactos/tools/rbuild/backend/codeblocks/codeblocks.cpp Mon Sep 10 17:13:16 2007 @@ -251,7 +251,7 @@ const vector<File*>& files = data.files; for ( i = 0; i < files.size (); i++ ) { - string file = files[i]->name; + string file = files[i]->file.relative_path + sSep + files[i]->file.name; string::size_type pos = file.find_last_of ("\\"); if ( pos != string::npos ) file.erase ( 0, pos+1 ); @@ -418,7 +418,8 @@ const vector<File*>& files = data.files; for ( i = 0; i < files.size(); i++ ) { - string file = string(".") + &files[i]->name[cbproj_path.size()]; + string fullpath = files[i]->file.relative_path + sSep + files[i]->file.name; + string file = string(".") + &fullpath[cbproj_path.size()]; if ( !stricmp ( Right(file,3).c_str(), ".rc" ) ) resource_files.push_back ( file ); Modified: trunk/reactos/tools/rbuild/backend/devcpp/devcpp.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/devcp… ============================================================================== --- trunk/reactos/tools/rbuild/backend/devcpp/devcpp.cpp (original) +++ trunk/reactos/tools/rbuild/backend/devcpp/devcpp.cpp Mon Sep 10 17:13:16 2007 @@ -133,7 +133,7 @@ { File &file = *module.non_if_data.files[k]; - ProcessFile(file.name); + ProcessFile( file.file.relative_path + sSep + file.file.name ); } } } @@ -149,7 +149,7 @@ return true; } -void DevCppBackend::ProcessFile(string &filepath) +void DevCppBackend::ProcessFile(string filepath) { // Remove the .\ at the start of the filenames if ((filepath[0] == '.') && (filepath[1] == '\\')) filepath.erase(0, 2); Modified: trunk/reactos/tools/rbuild/backend/devcpp/devcpp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/devcp… ============================================================================== --- trunk/reactos/tools/rbuild/backend/devcpp/devcpp.h (original) +++ trunk/reactos/tools/rbuild/backend/devcpp/devcpp.h Mon Sep 10 17:13:16 2007 @@ -45,7 +45,7 @@ private: void ProcessModules(); - void ProcessFile(std::string &filename); + void ProcessFile(std::string filename); bool CheckFolderAdded(std::string &folder); void AddFolders(std::string &folder); Modified: trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/mingw… ============================================================================== --- trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp (original) +++ trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp Mon Sep 10 17:13:16 2007 @@ -336,7 +336,7 @@ for ( size_t i = 0; i < compilationUnit.files.size (); i++ ) { File& file = *compilationUnit.files[i]; - sourceFiles.push_back ( NormalizeFilename ( file.name ) ); + sourceFiles.push_back ( strFile ( &file.file ) ); } return v2s ( sourceFiles, 10 ); } @@ -354,7 +354,7 @@ bool MingwModuleHandler::IsGeneratedFile ( const File& file ) const { - string extension = GetExtension ( file.name ); + string extension = GetExtension ( file.file.name ); return ( extension == ".spec" || extension == ".SPEC" ); } @@ -3533,10 +3533,9 @@ void MingwTestModuleHandler::GetModuleSpecificCompilationUnits ( vector<CompilationUnit*>& compilationUnits ) { - string basePath = "$(INTERMEDIATE)" + sSep + module.output->relative_path; - compilationUnits.push_back ( new CompilationUnit ( new File ( basePath + sSep + "_hooks.c", false, "", false ) ) ); - compilationUnits.push_back ( new CompilationUnit ( new File ( basePath + sSep + "_stubs.S", false, "", false ) ) ); - compilationUnits.push_back ( new CompilationUnit ( new File ( basePath + sSep + "_startup.c", false, "", false ) ) ); + compilationUnits.push_back ( new CompilationUnit ( new File ( IntermediateDirectory, module.output->relative_path + sSep + "..", module.name + "_hooks.c", false, "", false ) ) ); + compilationUnits.push_back ( new CompilationUnit ( new File ( IntermediateDirectory, module.output->relative_path + sSep + "..", module.name + "_stubs.S", false, "", false ) ) ); + compilationUnits.push_back ( new CompilationUnit ( new File ( IntermediateDirectory, module.output->relative_path + sSep + "..", module.name + "_startup.c", false, "", false ) ) ); } void Modified: trunk/reactos/tools/rbuild/backend/msbuild/msbuild.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/msbui… ============================================================================== --- trunk/reactos/tools/rbuild/backend/msbuild/msbuild.cpp (original) +++ trunk/reactos/tools/rbuild/backend/msbuild/msbuild.cpp Mon Sep 10 17:13:16 2007 @@ -113,8 +113,7 @@ const vector<File*>& files = data.files; for ( i = 0; i < files.size(); i++ ) { - string file = &files[i]->name[proj_path.size()+1]; - source_files.push_back ( file ); + source_files.push_back ( files[i]->file.name ); } const vector<Include*>& incs = data.includes; for ( i = 0; i < incs.size(); i++ ) Modified: trunk/reactos/tools/rbuild/backend/msvc/msvc.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/msvc/… ============================================================================== --- trunk/reactos/tools/rbuild/backend/msvc/msvc.cpp (original) +++ trunk/reactos/tools/rbuild/backend/msvc/msvc.cpp Mon Sep 10 17:13:16 2007 @@ -337,7 +337,7 @@ const vector<File*>& files = data.files; for ( i = 0; i < files.size (); i++ ) { - string file = files[i]->name; + string file = files[i]->file.relative_path + sSep + files[i]->file.name; string::size_type pos = file.find_last_of (DEF_SSEP); if ( pos != string::npos ) file.erase ( 0, pos+1 ); Modified: trunk/reactos/tools/rbuild/backend/msvc/msvcmaker.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/msvc/… ============================================================================== --- trunk/reactos/tools/rbuild/backend/msvc/msvcmaker.cpp (original) +++ trunk/reactos/tools/rbuild/backend/msvc/msvcmaker.cpp Mon Sep 10 17:13:16 2007 @@ -102,8 +102,8 @@ const vector<File*>& files = data.files; for ( i = 0; i < files.size(); i++ ) { - // TODO FIXME - do we want the full path of the file here? - string file = string(".") + &files[i]->name[dsp_path.size()]; + // TODO FIXME - do we want only the name of the file here? + string file = files[i]->file.name; source_files.push_back ( file ); if ( !stricmp ( Right(file,2).c_str(), ".c" ) ) Modified: trunk/reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/msvc/… ============================================================================== --- trunk/reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp (original) +++ trunk/reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp Mon Sep 10 17:13:16 2007 @@ -157,8 +157,8 @@ const vector<File*>& files = data.files; for ( i = 0; i < files.size(); i++ ) { - // TODO FIXME - do we want the full path of the file here? - string file = string(".") + &files[i]->name[vcproj_path.size()]; + // TODO FIXME - do we want only the name of the file here? + string file = files[i]->file.name; if ( !stricmp ( Right(file,3).c_str(), ".rc" ) ) resource_files.push_back ( file ); Modified: trunk/reactos/tools/rbuild/compilationunit.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/compilationun… ============================================================================== --- trunk/reactos/tools/rbuild/compilationunit.cpp (original) +++ trunk/reactos/tools/rbuild/compilationunit.cpp Mon Sep 10 17:13:16 2007 @@ -28,8 +28,8 @@ module(NULL), node(NULL) { - local_name = file->name; - name = file->name; + local_name = file->file.name; + name = file->file.relative_path + sSep + file->file.name; files.push_back ( file ); } @@ -67,7 +67,7 @@ if ( files.size () != 1 ) return false; File* file = files[0]; - string extension = GetExtension ( file->name ); + string extension = GetExtension ( file->file.name ); return ( extension == ".spec" || extension == ".SPEC" ); } @@ -78,7 +78,7 @@ for ( i = 0; i < files.size (); i++ ) { File& file = *files[i]; - string fileExtension = GetExtension ( file.name ); + string fileExtension = GetExtension ( file.file.name ); if ( !stricmp ( fileExtension.c_str (), extension.c_str () ) ) return true; } @@ -106,28 +106,7 @@ } File* file = files[0]; - - DirectoryLocation directory; - if ( file->path_prefix.length () == 0 ) - directory = SourceDirectory; - else if ( file->path_prefix == "$(INTERMEDIATE)" ) - directory = IntermediateDirectory; - else - throw InvalidOperationException ( __FILE__, - __LINE__, - "Invalid path prefix '%s'", - file->path_prefix.c_str () ); - - size_t pos = file->name.find_last_of ( "/\\" ); - assert ( pos != string::npos ); - string relative_path = file->name.substr ( 0, pos ); - string name = file->name.substr ( pos + 1 ); - if ( relative_path.compare ( 0, 15, "$(INTERMEDIATE)") == 0 ) - { - directory = IntermediateDirectory; - relative_path.erase ( 0, 16 ); - } - return new FileLocation ( directory, relative_path, name ); + return new FileLocation ( file->file ); } std::string Modified: trunk/reactos/tools/rbuild/compilationunitsupportcode.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/compilationun… ============================================================================== --- trunk/reactos/tools/rbuild/compilationunitsupportcode.cpp (original) +++ trunk/reactos/tools/rbuild/compilationunitsupportcode.cpp Mon Sep 10 17:13:16 2007 @@ -86,7 +86,7 @@ for ( size_t i = 0; i < compilationUnit.files.size () ; i++ ) { File& file = *compilationUnit.files[i]; - s = s + sprintf ( s, "#include <%s>\n", ChangeSeparator ( file.name, '\\', '/' ).c_str () ); + s = s + sprintf ( s, "#include <%s/%s>\n", ChangeSeparator ( file.file.relative_path, '\\', '/' ).c_str (), file.file.name.c_str () ); } s = s + sprintf ( s, "\n" ); Modified: trunk/reactos/tools/rbuild/module.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/module.cpp?re… ============================================================================== --- trunk/reactos/tools/rbuild/module.cpp (original) +++ trunk/reactos/tools/rbuild/module.cpp Mon Sep 10 17:13:16 2007 @@ -538,7 +538,7 @@ for ( i = 0; i < node.subElements.size(); i++ ) { ParseContext parseContext; - ProcessXMLSubElement ( *node.subElements[i], output->relative_path, "", parseContext ); + ProcessXMLSubElement ( *node.subElements[i], SourceDirectory, output->relative_path, parseContext ); } for ( i = 0; i < invocations.size(); i++ ) invocations[i]->ProcessXML (); @@ -561,15 +561,15 @@ void Module::ProcessXMLSubElement ( const XMLElement& e, - const string& path, - const string& path_prefix, + DirectoryLocation directory, + const string& relative_path, ParseContext& parseContext ) { If* pOldIf = parseContext.ifData; CompilationUnit* pOldCompilationUnit = parseContext.compilationUnit; bool subs_invalid = false; - string subpath ( path ); - string subpath_prefix ( "" ); + string subpath ( relative_path ); + DirectoryLocation subdirectory = SourceDirectory; if ( e.name == "file" && e.value.size () > 0 ) { bool first = false; @@ -600,8 +600,9 @@ else if ( !stricmp ( ext.c_str(), ".cxx" ) ) cplusplus = true; } - File* pFile = new File ( FixSeparator ( path + cSep + e.value ), - path_prefix, + File* pFile = new File ( directory, + relative_path, + e.value, first, switches, false ); @@ -644,9 +645,9 @@ if ( root ) { if ( root->value == "intermediate" ) - subpath_prefix = "$(INTERMEDIATE)"; + subdirectory = IntermediateDirectory; else if ( root->value == "output" ) - subpath_prefix = "$(OUTPUT)"; + subdirectory = OutputDirectory; else { throw InvalidAttributeValueException ( @@ -655,7 +656,7 @@ root->value ); } } - subpath = GetSubPath ( this->project, e.location, path, att->value ); + subpath = GetSubPath ( this->project, e.location, relative_path, att->value ); } else if ( e.name == "include" ) { @@ -802,14 +803,14 @@ if ( pos == string::npos ) { pch = new PchFile ( - e, *this, FileLocation ( SourceDirectory, path, e.value ) ); + e, *this, FileLocation ( SourceDirectory, relative_path, e.value ) ); } else { string dir = e.value.substr ( 0, pos ); string name = e.value.substr ( pos + 1); pch = new PchFile ( - e, *this, FileLocation ( SourceDirectory, path + sSep + dir, name ) ); + e, *this, FileLocation ( SourceDirectory, relative_path + sSep + dir, name ) ); } subs_invalid = true; } @@ -846,7 +847,7 @@ e.name.c_str() ); } for ( size_t i = 0; i < e.subElements.size (); i++ ) - ProcessXMLSubElement ( *e.subElements[i], subpath, subpath_prefix, parseContext ); + ProcessXMLSubElement ( *e.subElements[i], subdirectory, subpath, parseContext ); parseContext.ifData = pOldIf; parseContext.compilationUnit = pOldCompilationUnit; } @@ -1233,12 +1234,13 @@ } -File::File ( const string& _name, +File::File ( DirectoryLocation directory, + const string& relative_path, + const string& name, bool _first, - std::string _switches, + const string& _switches, bool _isPreCompiledHeader ) - : name(_name), - path_prefix(""), + : file ( directory, relative_path, name ), first(_first), switches(_switches), isPreCompiledHeader(_isPreCompiledHeader) @@ -1246,19 +1248,6 @@ } -File::File ( const string& _name, - const string& _path_prefix, - bool _first, - std::string _switches, - bool _isPreCompiledHeader ) - : name(_name), - path_prefix(_path_prefix), - first(_first), - switches(_switches), - isPreCompiledHeader(_isPreCompiledHeader) -{ -} - void File::ProcessXML() { @@ -1267,10 +1256,11 @@ std::string File::GetFullPath () const { - if ( path_prefix.length () > 0 ) - return path_prefix + sSep + name; - else - return name; + // TODO FIXME take care of file.directory? return a full path? + if ( file.relative_path.length () > 0 ) + return file.relative_path + sSep + file.name; + else + return file.name; } Modified: trunk/reactos/tools/rbuild/rbuild.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/rbuild.h?rev=… ============================================================================== --- trunk/reactos/tools/rbuild/rbuild.h (original) +++ trunk/reactos/tools/rbuild/rbuild.h Mon Sep 10 17:13:16 2007 @@ -309,6 +309,20 @@ OutputDirectory, InstallDirectory, TemporaryDirectory, +}; + +class FileLocation +{ +public: + DirectoryLocation directory; + std::string relative_path; + std::string name; + + FileLocation ( const DirectoryLocation directory, + const std::string& relative_path, + const std::string& name ); + + FileLocation ( const FileLocation& other ); }; class Module @@ -377,8 +391,8 @@ std::string GetDefaultModuleBaseaddress () const; std::string entrypoint; void ProcessXMLSubElement ( const XMLElement& e, - const std::string& path, - const std::string& path_prefix, + DirectoryLocation directory, + const std::string& relative_path, ParseContext& parseContext ); }; @@ -435,21 +449,16 @@ class File { public: - std::string name; - std::string path_prefix; + FileLocation file; bool first; std::string switches; bool isPreCompiledHeader; - File ( const std::string& _name, + File ( DirectoryLocation directory, + const std::string& relative_path, + const std::string& name, bool _first, - std::string _switches, - bool _isPreCompiledHeader ); - - File ( const std::string& _name, - const std::string& _path_prefix, - bool _first, - std::string _switches, + const std::string& _switches, bool _isPreCompiledHeader ); void ProcessXML(); @@ -829,21 +838,6 @@ }; -class FileLocation -{ -public: - DirectoryLocation directory; - std::string relative_path; - std::string name; - - FileLocation ( const DirectoryLocation directory, - const std::string& relative_path, - const std::string& name ); - - FileLocation ( const FileLocation& other ); -}; - - class CDFile : public XmlNode { public: Modified: trunk/reactos/tools/rbuild/wineresource.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/wineresource.… ============================================================================== --- trunk/reactos/tools/rbuild/wineresource.cpp (original) +++ trunk/reactos/tools/rbuild/wineresource.cpp Mon Sep 10 17:13:16 2007 @@ -37,7 +37,7 @@ bool WineResource::IsSpecFile ( const File& file ) { - string extension = GetExtension ( file.name ); + string extension = GetExtension ( file.file.name ); if ( extension == ".spec" || extension == ".SPEC" ) return true; return false; @@ -58,7 +58,7 @@ bool WineResource::IsResourceFile ( const File& file ) { - string extension = GetExtension ( file.name ); + string extension = GetExtension ( file.file.name ); if ( extension == ".rc" || extension == ".RC" ) return true; return false; @@ -71,7 +71,7 @@ for ( size_t i = 0; i < files.size (); i++ ) { if ( IsResourceFile ( *files[i] ) ) - return files[i]->name; + return files[i]->file.relative_path + sSep + files[i]->file.name; } return ""; }

1 0

[hpoussin] 28989: Disable german resource file as it breaks build
by hpoussin＠svn.reactos.org 10 Sep '07

10 Sep '07

Author: hpoussin Date: Mon Sep 10 17:00:42 2007 New Revision: 28989 URL: http://svn.reactos.org/svn/reactos?rev=28989&view=rev Log: Disable german resource file as it breaks build Modified: trunk/reactos/dll/cpl/input/input.rc trunk/reactos/dll/cpl/input/lang/de-DE.rc (contents, props changed) trunk/reactos/dll/cpl/input/lang/uk-UA.rc (contents, props changed) 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 Mon Sep 10 17:00:42 2007 @@ -25,6 +25,6 @@ * a neutral version. This is to get localized bitmaps for example. */ -#include "lang/de-DE.rc" +//#include "lang/de-DE.rc" #include "lang/en-US.rc" #include "lang/uk-UA.rc" 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 Mon Sep 10 17:00:42 2007 @@ -1,247 +1,247 @@ -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 -BEGIN - GROUPBOX "&Standard Eingabesprache", -1, 7,7,231,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 - 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 - 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 "Sprach&leiste...", IDC_LANG_BAR_BUTTON, 14, 198, 70, 14 - PUSHBUTTON "&Tasteneinstellungen...", IDC_KEY_SETTINGS_BUTTON, 90, 198, 70, 14 -END - -IDD_PROPPAGEADVANCED DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT -STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Erweitert" -FONT 8, "MS Shell Dlg", 0, 0, 0x0 -BEGIN - GROUPBOX Kompatibilitäts-Konfiguration", -1, 7,7,231,60 - AUTOCHECKBOX "&Erweiterte Textdienste in allen Programmen verwenden.", IDC_SUPPORT_ADV_SERV_CHECKBOX, 14, 19, 210, 10, WS_GROUP - LTEXT "Aktivieren Sie diese Funktion, um alle Erweiterten Textdienste in Notepad und anderen Programmen zu aktivieren, die normalerweise keine Sprach- und Handschrifterkennung oder andere Erweiterte Textdienste unterstützen.",-1,14,33,220,25 - GROUPBOX "Systemkonfiguration", -1, 7,74,231,60 - AUTOCHECKBOX "Erweiterte Textdienste d&eaktivieren", IDC_TURNOFF_ADV_TXTSERV_CHECKBOX, 14, 86, 210, 10, WS_GROUP - LTEXT "Wählen Sie diese Option, um alle Erweiterten Textdienste in allen Programmen zu deaktivieren. Dies ist für Ostasiatische Sprachen nicht empfohlen, da somit die Sprachleiste geschlossen wird.",-1,14,100,220,25 -END - -IDD_LANGBAR DIALOG 20, 20, 240, 120 -STYLE DS_SETFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_3DLOOK | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION -CAPTION "Sprachleisten-Einstellungen" -FONT 8, "MS Shell Dlg" -{ - GROUPBOX "", -1, 7, 7, 226, 85 - AUTOCHECKBOX "&Die Sprachleiste auf dem Desktop anzeigen", IDC_LANGBAR_ON_DESK_CHECKBOX, 17, 17, 210, 10, WS_GROUP - AUTOCHECKBOX "Die Sprachleis&te transparent anzeigen wenn inaktiv", IDC_LANGBAR_TRANSP_INACT_CHECKBOX, 17, 32, 210, 10 - AUTOCHECKBOX "Weitere Sprachleistenicons anzeigen", IDC_ADDIT_LANGBAR_ICON_NOTIFYAREA_CHECKBOX, 17, 47, 210, 10 - AUTOCHECKBOX "T&extlabels in der Sprachleiste anzeiegen", IDC_TEXTLABEL_ON_LANGBAR_CHECKBOX, 17, 62, 210, 10 - AUTOCHECKBOX "E&rweiterte Textdienste deaktivieren", IDC_OFF_ADVAN_TEXTSERV_CHECKBOX, 17, 77, 200, 10 - DEFPUSHBUTTON "OK", IDOK, 129, 99, 50, 14 - PUSHBUTTON "Abbrechen", IDCANCEL, 182, 99, 50, 14 -} - -IDD_KEYSETTINGS DIALOG 0, 0, 272, 163 -STYLE DS_SETFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_3DLOOK | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION -CAPTION "Erweiterte Tasteneinstellungen" -FONT 8, "MS Shell Dlg" -{ - GROUPBOX "Um Caps Lock zu deaktivieren", -1, 7, 7, 258, 26 - AUTORADIOBUTTON "Caps &Lock Taste drücken", IDC_PRESS_CAPSLOCK_KEY_RADIOBTN, 14, 17, 120, 11, WS_GROUP - AUTORADIOBUTTON "&Shift Taste drücken", IDC_PRESS_SHIFT_KEY_RADIOBTN, 144, 17, 120, 11, NOT WS_TABSTOP - GROUPBOX "Schnelltasten für Eingabesprachen", -1, 7, 37, 258, 95 - LTEXT "Aktion", -1, 14, 47, 60, 9 - RTEXT "Tasten&kombination", -1, 177, 47, 79, 9 - LISTBOX IDC_KEY_LISTBOX, 14, 57, 244, 52, LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP - PUSHBUTTON "Tastenkombination änder&n...", IDC_CHANGE_KEY_SEQ_BUTTON, 152, 113, 106, 14, WS_GROUP - DEFPUSHBUTTON "OK", IDOK, 66, 140, 70, 14 - PUSHBUTTON "Abbrechen", IDCANCEL, 146, 140, 70, 14 -} - -IDD_ADD DIALOG 20, 20, 227, 90 -STYLE DS_SETFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_3DLOOK | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION -CAPTION "Eingabesprache hinzufügen" -FONT 8, "MS Shell Dlg" -{ - LTEXT "&Eingabesprache:", -1, 7, 7, 61, 10 - COMBOBOX IDC_INPUT_LANGUAGE_COMBO, 7, 17, 212, 60, 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 - DEFPUSHBUTTON "OK", IDOK, 116, 68, 50, 14 - PUSHBUTTON "Abbrechen", IDCANCEL, 169, 68, 50, 14 -} - -IDD_CHANGE_KEY_SEQ 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" -{ - LTEXT "", -1, 16, 5, 250, 10 - GROUPBOX "", -1, 12, 17, 184, 48 - AUTOCHECKBOX "Tastenkombination aktivi&eren", IDC_ENABLE_KEY_SEQ_CHECKBOX, 17, 17, 85, 8 - CTEXT "SHIFT", -1, 68, 37, 27, 12 - CTEXT "+", -1, 57, 37, 8, 9 - CTEXT "+", -1, 98, 37, 8, 10 - CHECKBOX "&STRG", IDC_CTRL_CHECKBOX, 24, 31, 30, 11, NOT WS_TABSTOP - CHECKBOX "&ALT", IDC_ALT_CHECKBOX, 24, 45, 40, 12, NOT WS_TABSTOP - LTEXT "&Taste:", -1, 110, 37, 14, 10 - COMBOBOX IDC_CKEY_COMBOBOX, 127, 34, 46, 48, CBS_DROPDOWNLIST | WS_VSCROLL - DEFPUSHBUTTON "OK", IDOK, 212, 25, 50, 14 - PUSHBUTTON "Abbrechen", 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 "Eingabesprache Einstellungen" -FONT 8, "MS Shell Dlg" -{ - LTEXT "Eingabesprache:", -1, 7, 7, 61, 8 - LTEXT "", -1, 73, 7, 129, 8 - LTEXT "&Tastaturlayout/IME:", -1, 7, 21, 110, 10 - COMBOBOX IDC_KEYBOARD_LAYOUT_IME_COMBO, 7, 32, 212, 60, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL - DEFPUSHBUTTON "OK", IDOK, 116, 53, 52, 14 - PUSHBUTTON "Abbrechen", IDCANCEL, 169, 53, 52, 14 -} - -STRINGTABLE -BEGIN - IDS_CPLSYSTEMNAME "Textdienste und Eingabesprachen" - IDS_CPLSYSTEMDESCRIPTION "Ändert die Einstellungen der Texteingabe einer Sprache." - IDS_US_LAYOUT, "US" - IDS_BELGIAN_LAYOUT, "Belgian (Period)" - IDS_BELGIAN_FRENCH_LAYOUT, "Belgian French" - IDS_PORTUGUESE_BRAZILIAN_ABNT_LAYOUT, "Portuguese (Brazilian ABNT)" - IDS_CANADIAN_FRENCH_LAYOUT, "Canadian French" - IDS_CANADIAN_FRENCH_LEGACY_LAYOUT, "Canadian French (Legacy)" - IDS_DANISH_LAYOUT, "Danish" - IDS_DUTCH_LAYOUT, "Dutch" - IDS_FINNISH_LAYOUT, "Finnish" - IDS_FRENCH_LAYOUT, "French" - IDS_GERMAN_LAYOUT, "German" - IDS_GERMAN_IBM_LAYOUT, "German (IBM)" - IDS_ICELANDIC_LAYOUT, "Icelandic" - IDS_IRISH_LAYOUT, "Irish" - IDS_ITALIAN_LAYOUT, "Italian" - IDS_ITALIAN_142_LAYOUT, "Italian (142)" - IDS_LATIN_AMERICAN_LAYOUT, "Latin American" - IDS_NORWEGIAN_LAYOUT, "Norwegian" - IDS_PORTUGUESE_LAYOUT, "Portuguese" - IDS_SPANISH_LAYOUT, "Spanish" - IDS_SPANISH_VARIANTION_LAYOUT, "Spanish Variation" - IDS_SWEDISH_LAYOUT, "Swedish" - IDS_SWISS_FRENCH_LAYOUT, "Swiss French" - IDS_SWISS_GERMAN_LAYOUT, "Swiss German" - IDS_UNITED_KINGDOM_LAYOUT, "United Kingdom" - IDS_UNITED_STATES_INTERNATIONAL_LAYOUT, "United States-International" - IDS_UNITED_STATES_DVORAK_FOR_LEFT_HAND_LAYOUT, "United States-Dvorak for left hand" - IDS_UNITED_STATES_DVORAK_FOR_RIGHT_HAND_LAYOUT, "United States-Dvorak for right hand" - IDS_ALBANIAN_LAYOUT, "Albanian" - IDS_CROATIAN_LAYOUT, "Croatian" - IDS_CZECH_LAYOUT, "Czech" - IDS_CZECH_QWERTY_LAYOUT, "Czech (QWERTY)" - IDS_HUNGARIAN_LAYOUT, "Hungarian" - IDS_HUNGARIAN_101_KEY_LAYOUT, "Hungarian 101-key" - IDS_POLISH_LAYOUT, "Polish (Programmers)" - IDS_POLISH_214_LAYOUT, "Polish (214)" - IDS_ROMANIAN_LAYOUT, "Romanian" - IDS_SERBIAN_LATIN_LAYOUT, "Serbian (Latin)" - IDS_SLOVAK_LAYOUT, "Slovak" - IDS_SLOVAK_QWERTY_LAYOUT, "Slovak (QWERTY)" - IDS_SLOVENIAN_LAYOUT, "Slovenian" - IDS_ESTONIAN_LAYOUT, "Estonian" - IDS_LATVIAN_LAYOUT, "Latvian" - IDS_LATVIAN_QWERTY_LAYOUT, "Latvian (QWERTY)" - IDS_LITHUANIAN_IBM_LAYOUT, "Lithuanian IBM" - IDS_GREEK_LAYOUT, "Greek" - IDS_GREEK_LATIN_LAYOUT, "Greek Latin" - IDS_GREEK_220_LAYOUT, "Greek (220)" - IDS_GREEK_319_LAYOUT, "Greek (319)" - IDS_GREEK_220_LATIN_LAYOUT, "Greek (220) Latin" - IDS_GREEK_319_LATIN_LAYOUT, "Greek (319) Latin" - IDS_BELARUSIAN_LAYOUT, "Belarusian" - IDS_BULGARIAN_LAYOUT, "Bulgarian" - IDS_BULGARIAN_LATIN_LAYOUT, "Bulgarian (Latin)" - IDS_RUSSIAN_LAYOUT, "Russian" - IDS_RUSSIAN_TYPEWRITER_LAYOUT, "Russian (Typewriter)" - IDS_SERBIAN_CYRILLIC_LAYOUT, "Serbian (Cyrillic)" - IDS_UKRAINIAN_LAYOUT, "Ukrainian" - IDS_TURKISH_F_LAYOUT, "Turkish F" - IDS_TURKISH_Q_LAYOUT, "Turkish Q" - IDS_JAPANESE_LAYOUT, "Japanese" - IDS_JAPANESE_INPUT_SYSTEM_MSIME2002_LAYOUT, "Japanese Input System (MS-IME2002)" - IDS_KOREAN_LAYOUT, "Korean" - IDS_KOREAN_INPUT_SYSTEM_MSIME2002_LAYOUT, "Korean Input System (MS-IME2002)" - IDS_CHINESE_TRADITIONAL_USKEYBOARD_LAYOUT, "Chinese (Traditional) - US Keyboard" - IDS_CHINESE_TRADITIONAL_PHONETIC_LAYOUT, "Chinese (Traditional) - Phonetic" - IDS_CHINESE_TRADITIONAL_CHANGJIE_LAYOUT, "Chinese (Traditional) - ChangJie" - IDS_CHINESE_TRADITIONAL_BIG5CODE_LAYOUT, "Chinese (Traditional) - Big5 Code" - IDS_CHINESE_TRADITIONAL_DAYI_LAYOUT, "Chinese (Traditional) - DaYi" - IDS_CHINESE_TRADITIONAL_UNICODE_LAYOUT, "Chinese (Traditional) - Unicode" - IDS_CHINESE_TRADITIONAL_ALPHANUMERIC_LAYOUT, "Chinese (Traditional) - Alphanumeric" - IDS_CHINESE_SIMPLIFIED_USKEYBOARD_LAYOUT, "Chinese (Simplified) - US Keyboard" - IDS_CHINESE_SIMPLIFIED_QUANPIN_LAYOUT, "Chinese (Simplified) - QuanPin" - IDS_CHINESE_SIMPLIFIED_SHUANGPIN_LAYOUT, "Chinese (Simplified) - ShuangPin" - IDS_CHINESE_SIMPLIFIED_ZHENGMA_LAYOUT, "Chinese (Simplified) - ZhengMa" - IDS_CHINESE_SIMPLIFIED_NEIMA_LAYOUT, "Chinese (Simplified) - NeiMa" - IDS_THAI_KEDMANEE_LAYOUT, "Thai Kedmanee" - IDS_THAI_PATTACHOTE_LAYOUT, "Thai Pattachote" - IDS_THAI_KEDMANEE_NONSHIFTLOCK_LAYOUT, "Thai Kedmanee (non-ShiftLock)" - IDS_THAI_PATTACHOTE_NONSHIFTLOCK_LAYOUT, "Thai Pattachote (non-ShiftLock)" - IDS_HEBREW_LAYOUT, "Hebrew" - IDS_ARABIC_101_LAYOUT, "Arabic (101)" - IDS_ARABIC_102_LAYOUT, "Arabic (102)" - IDS_ARABIC_102_AZERTY_LAYOUT, "Arabic (102) AZERTY" - IDS_CZECH_PROGRAMMERS_LAYOUT, "Czech Programmers" - IDS_LITHUANIAN_LAYOUT, "Lithuanian" - IDS_BELGIAN_COMMA_LAYOUT, "Belgian (Comma)" - IDS_CHINESE_TRADITIONAL_NEWPHONETIC_LAYOUT, "Chinese (Traditional) - New Phonetic" - IDS_CHINESE_SIMPLIFIED_MSPINYINIME30_LAYOUT, "Chinese (Simplified) - Microsoft Pinyin IME 3.0" - IDS_UNITED_STATES_DVIRAK_LAYOUT, "United States-Dvorak" - IDS_CHINESE_TRADITIONAL_NEWCHANGJIE_LAYOUT, "Chinese (Traditional) - New ChangJie" - IDS_ASSAMESE_LAYOUT, "Assamese" - IDS_BENGALI_LAYOUT, "Bengali" - IDS_DEVANAGARI_INSCRIPT_LAYOUT, "Devanagari - INSCRIPT" - IDS_GUJARATI_LAYOUT, "Gujarati" - IDS_KANNADA_LAYOUT, "Kannada" - IDS_MALAYALAM_LAYOUT, "Malayalam" - IDS_ORIYA_LAYOUT, "Oriya" - IDS_PUNJABI_LAYOUT, "Punjabi" - IDS_TAMIL_LAYOUT, "Tamil" - IDS_TELUGU_LAYOUT, "Telugu" - IDS_MARATHI_LAYOUT, "Marathi" - IDS_HINDI_TRADITIONAL_LAYOUT, "Hindi Traditional" - IDS_CANTONESE_PHONETIC_LAYOUT, "Cantonese Phonetic" - IDS_FAEROESE_LAYOUT, "Faeroese" - IDS_FYRO_MACEDONIAN_LAYOUT, "FYRO Macedonian" - IDS_CANADIAN_MULTILINGUAL_STD_LAYOUT, "Canadian Multilingual Standard" - IDS_CHINESE_TRADITIONAL_QUICK_LAYOUT, "Chinese (Traditional) - Quick" - IDS_CHINESE_TRADITIONAL_ARRAY_LAYOUT, "Chinese (Traditional) - Array" - IDS_KAZAKH_LAYOUT, "Kazakh" - IDS_UZBEK_CYRILLIC_LAYOUT, "Uzbek Cyrillic" - IDS_AZERI_CYRILLIC_LAYOUT, "Azeri Cyrillic" - IDS_TATAR_LAYOUT, "Tatar" - IDS_AZERI_LATIN_LAYOUT, "Azeri Latin" - IDS_VIETNAMESE_LAYOUT, "Vietnamese" - IDS_GEORGIAN_LAYOUT, "Georgian" - IDS_ARMENIAN_EASTERN_LAYOUT, "Armenian Eastern" - IDS_ARMENIAN_WESTERN_LAYOUT, "Armenian Western" - IDS_GREEK_POLYTONIC_LAYOUT, "Greek Polytonic" - IDS_USENG_TABLE_IBM_ARABIC238L_LAYOUT, "US English Table for IBM Arabic 238_L" - IDS_FARSI_LAYOUT, "Farsi" - IDS_GAELIC_LAYOUT, "Gaelic" - IDS_PORTUGUESE_BRAZIL_ABNT2_LAYOUT, "Portuguese (Brazilian ABNT2)" - IDS_MONGOLIAN_CYRILLIC_LAYOUT, "Mongolian Cyrillic" - IDS_KYRGYZ_CYRILLIC_LAYOUT, "Kyrgyz Cyrillic" - IDS_URDU_LAYOUT, "Urdu" - IDS_SYRIAC_LAYOUT, "Syriac" - IDS_SYRIAC_PHONETIC_LAYOUT, "Syriac Phonetic" - IDS_DIVEHI_PHONETIC_LAYOUT, "Divehi Phonetic" - IDS_DIVEHI_TYPEWRITER_LAYOUT, "Divehi Typewriter" -END +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 +BEGIN + GROUPBOX "&Standard Eingabesprache", -1, 7,7,231,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 + 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 + 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 "Sprach&leiste...", IDC_LANG_BAR_BUTTON, 14, 198, 70, 14 + PUSHBUTTON "&Tasteneinstellungen...", IDC_KEY_SETTINGS_BUTTON, 90, 198, 70, 14 +END + +IDD_PROPPAGEADVANCED DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Erweitert" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + GROUPBOX Kompatibilitäts-Konfiguration", -1, 7,7,231,60 + AUTOCHECKBOX "&Erweiterte Textdienste in allen Programmen verwenden.", IDC_SUPPORT_ADV_SERV_CHECKBOX, 14, 19, 210, 10, WS_GROUP + LTEXT "Aktivieren Sie diese Funktion, um alle Erweiterten Textdienste in Notepad und anderen Programmen zu aktivieren, die normalerweise keine Sprach- und Handschrifterkennung oder andere Erweiterte Textdienste unterstützen.",-1,14,33,220,25 + GROUPBOX "Systemkonfiguration", -1, 7,74,231,60 + AUTOCHECKBOX "Erweiterte Textdienste d&eaktivieren", IDC_TURNOFF_ADV_TXTSERV_CHECKBOX, 14, 86, 210, 10, WS_GROUP + LTEXT "Wählen Sie diese Option, um alle Erweiterten Textdienste in allen Programmen zu deaktivieren. Dies ist für Ostasiatische Sprachen nicht empfohlen, da somit die Sprachleiste geschlossen wird.",-1,14,100,220,25 +END + +IDD_LANGBAR DIALOG 20, 20, 240, 120 +STYLE DS_SETFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_3DLOOK | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION +CAPTION "Sprachleisten-Einstellungen" +FONT 8, "MS Shell Dlg" +{ + GROUPBOX "", -1, 7, 7, 226, 85 + AUTOCHECKBOX "&Die Sprachleiste auf dem Desktop anzeigen", IDC_LANGBAR_ON_DESK_CHECKBOX, 17, 17, 210, 10, WS_GROUP + AUTOCHECKBOX "Die Sprachleis&te transparent anzeigen wenn inaktiv", IDC_LANGBAR_TRANSP_INACT_CHECKBOX, 17, 32, 210, 10 + AUTOCHECKBOX "Weitere Sprachleistenicons anzeigen", IDC_ADDIT_LANGBAR_ICON_NOTIFYAREA_CHECKBOX, 17, 47, 210, 10 + AUTOCHECKBOX "T&extlabels in der Sprachleiste anzeiegen", IDC_TEXTLABEL_ON_LANGBAR_CHECKBOX, 17, 62, 210, 10 + AUTOCHECKBOX "E&rweiterte Textdienste deaktivieren", IDC_OFF_ADVAN_TEXTSERV_CHECKBOX, 17, 77, 200, 10 + DEFPUSHBUTTON "OK", IDOK, 129, 99, 50, 14 + PUSHBUTTON "Abbrechen", IDCANCEL, 182, 99, 50, 14 +} + +IDD_KEYSETTINGS DIALOG 0, 0, 272, 163 +STYLE DS_SETFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_3DLOOK | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION +CAPTION "Erweiterte Tasteneinstellungen" +FONT 8, "MS Shell Dlg" +{ + GROUPBOX "Um Caps Lock zu deaktivieren", -1, 7, 7, 258, 26 + AUTORADIOBUTTON "Caps &Lock Taste drücken", IDC_PRESS_CAPSLOCK_KEY_RADIOBTN, 14, 17, 120, 11, WS_GROUP + AUTORADIOBUTTON "&Shift Taste drücken", IDC_PRESS_SHIFT_KEY_RADIOBTN, 144, 17, 120, 11, NOT WS_TABSTOP + GROUPBOX "Schnelltasten für Eingabesprachen", -1, 7, 37, 258, 95 + LTEXT "Aktion", -1, 14, 47, 60, 9 + RTEXT "Tasten&kombination", -1, 177, 47, 79, 9 + LISTBOX IDC_KEY_LISTBOX, 14, 57, 244, 52, LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP + PUSHBUTTON "Tastenkombination änder&n...", IDC_CHANGE_KEY_SEQ_BUTTON, 152, 113, 106, 14, WS_GROUP + DEFPUSHBUTTON "OK", IDOK, 66, 140, 70, 14 + PUSHBUTTON "Abbrechen", IDCANCEL, 146, 140, 70, 14 +} + +IDD_ADD DIALOG 20, 20, 227, 90 +STYLE DS_SETFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_3DLOOK | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION +CAPTION "Eingabesprache hinzufügen" +FONT 8, "MS Shell Dlg" +{ + LTEXT "&Eingabesprache:", -1, 7, 7, 61, 10 + COMBOBOX IDC_INPUT_LANGUAGE_COMBO, 7, 17, 212, 60, 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 + DEFPUSHBUTTON "OK", IDOK, 116, 68, 50, 14 + PUSHBUTTON "Abbrechen", IDCANCEL, 169, 68, 50, 14 +} + +IDD_CHANGE_KEY_SEQ 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" +{ + LTEXT "", -1, 16, 5, 250, 10 + GROUPBOX "", -1, 12, 17, 184, 48 + AUTOCHECKBOX "Tastenkombination aktivi&eren", IDC_ENABLE_KEY_SEQ_CHECKBOX, 17, 17, 85, 8 + CTEXT "SHIFT", -1, 68, 37, 27, 12 + CTEXT "+", -1, 57, 37, 8, 9 + CTEXT "+", -1, 98, 37, 8, 10 + CHECKBOX "&STRG", IDC_CTRL_CHECKBOX, 24, 31, 30, 11, NOT WS_TABSTOP + CHECKBOX "&ALT", IDC_ALT_CHECKBOX, 24, 45, 40, 12, NOT WS_TABSTOP + LTEXT "&Taste:", -1, 110, 37, 14, 10 + COMBOBOX IDC_CKEY_COMBOBOX, 127, 34, 46, 48, CBS_DROPDOWNLIST | WS_VSCROLL + DEFPUSHBUTTON "OK", IDOK, 212, 25, 50, 14 + PUSHBUTTON "Abbrechen", 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 "Eingabesprache Einstellungen" +FONT 8, "MS Shell Dlg" +{ + LTEXT "Eingabesprache:", -1, 7, 7, 61, 8 + LTEXT "", -1, 73, 7, 129, 8 + LTEXT "&Tastaturlayout/IME:", -1, 7, 21, 110, 10 + COMBOBOX IDC_KEYBOARD_LAYOUT_IME_COMBO, 7, 32, 212, 60, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL + DEFPUSHBUTTON "OK", IDOK, 116, 53, 52, 14 + PUSHBUTTON "Abbrechen", IDCANCEL, 169, 53, 52, 14 +} + +STRINGTABLE +BEGIN + IDS_CPLSYSTEMNAME "Textdienste und Eingabesprachen" + IDS_CPLSYSTEMDESCRIPTION "Ändert die Einstellungen der Texteingabe einer Sprache." + IDS_US_LAYOUT, "US" + IDS_BELGIAN_LAYOUT, "Belgian (Period)" + IDS_BELGIAN_FRENCH_LAYOUT, "Belgian French" + IDS_PORTUGUESE_BRAZILIAN_ABNT_LAYOUT, "Portuguese (Brazilian ABNT)" + IDS_CANADIAN_FRENCH_LAYOUT, "Canadian French" + IDS_CANADIAN_FRENCH_LEGACY_LAYOUT, "Canadian French (Legacy)" + IDS_DANISH_LAYOUT, "Danish" + IDS_DUTCH_LAYOUT, "Dutch" + IDS_FINNISH_LAYOUT, "Finnish" + IDS_FRENCH_LAYOUT, "French" + IDS_GERMAN_LAYOUT, "German" + IDS_GERMAN_IBM_LAYOUT, "German (IBM)" + IDS_ICELANDIC_LAYOUT, "Icelandic" + IDS_IRISH_LAYOUT, "Irish" + IDS_ITALIAN_LAYOUT, "Italian" + IDS_ITALIAN_142_LAYOUT, "Italian (142)" + IDS_LATIN_AMERICAN_LAYOUT, "Latin American" + IDS_NORWEGIAN_LAYOUT, "Norwegian" + IDS_PORTUGUESE_LAYOUT, "Portuguese" + IDS_SPANISH_LAYOUT, "Spanish" + IDS_SPANISH_VARIANTION_LAYOUT, "Spanish Variation" + IDS_SWEDISH_LAYOUT, "Swedish" + IDS_SWISS_FRENCH_LAYOUT, "Swiss French" + IDS_SWISS_GERMAN_LAYOUT, "Swiss German" + IDS_UNITED_KINGDOM_LAYOUT, "United Kingdom" + IDS_UNITED_STATES_INTERNATIONAL_LAYOUT, "United States-International" + IDS_UNITED_STATES_DVORAK_FOR_LEFT_HAND_LAYOUT, "United States-Dvorak for left hand" + IDS_UNITED_STATES_DVORAK_FOR_RIGHT_HAND_LAYOUT, "United States-Dvorak for right hand" + IDS_ALBANIAN_LAYOUT, "Albanian" + IDS_CROATIAN_LAYOUT, "Croatian" + IDS_CZECH_LAYOUT, "Czech" + IDS_CZECH_QWERTY_LAYOUT, "Czech (QWERTY)" + IDS_HUNGARIAN_LAYOUT, "Hungarian" + IDS_HUNGARIAN_101_KEY_LAYOUT, "Hungarian 101-key" + IDS_POLISH_LAYOUT, "Polish (Programmers)" + IDS_POLISH_214_LAYOUT, "Polish (214)" + IDS_ROMANIAN_LAYOUT, "Romanian" + IDS_SERBIAN_LATIN_LAYOUT, "Serbian (Latin)" + IDS_SLOVAK_LAYOUT, "Slovak" + IDS_SLOVAK_QWERTY_LAYOUT, "Slovak (QWERTY)" + IDS_SLOVENIAN_LAYOUT, "Slovenian" + IDS_ESTONIAN_LAYOUT, "Estonian" + IDS_LATVIAN_LAYOUT, "Latvian" + IDS_LATVIAN_QWERTY_LAYOUT, "Latvian (QWERTY)" + IDS_LITHUANIAN_IBM_LAYOUT, "Lithuanian IBM" + IDS_GREEK_LAYOUT, "Greek" + IDS_GREEK_LATIN_LAYOUT, "Greek Latin" + IDS_GREEK_220_LAYOUT, "Greek (220)" + IDS_GREEK_319_LAYOUT, "Greek (319)" + IDS_GREEK_220_LATIN_LAYOUT, "Greek (220) Latin" + IDS_GREEK_319_LATIN_LAYOUT, "Greek (319) Latin" + IDS_BELARUSIAN_LAYOUT, "Belarusian" + IDS_BULGARIAN_LAYOUT, "Bulgarian" + IDS_BULGARIAN_LATIN_LAYOUT, "Bulgarian (Latin)" + IDS_RUSSIAN_LAYOUT, "Russian" + IDS_RUSSIAN_TYPEWRITER_LAYOUT, "Russian (Typewriter)" + IDS_SERBIAN_CYRILLIC_LAYOUT, "Serbian (Cyrillic)" + IDS_UKRAINIAN_LAYOUT, "Ukrainian" + IDS_TURKISH_F_LAYOUT, "Turkish F" + IDS_TURKISH_Q_LAYOUT, "Turkish Q" + IDS_JAPANESE_LAYOUT, "Japanese" + IDS_JAPANESE_INPUT_SYSTEM_MSIME2002_LAYOUT, "Japanese Input System (MS-IME2002)" + IDS_KOREAN_LAYOUT, "Korean" + IDS_KOREAN_INPUT_SYSTEM_MSIME2002_LAYOUT, "Korean Input System (MS-IME2002)" + IDS_CHINESE_TRADITIONAL_USKEYBOARD_LAYOUT, "Chinese (Traditional) - US Keyboard" + IDS_CHINESE_TRADITIONAL_PHONETIC_LAYOUT, "Chinese (Traditional) - Phonetic" + IDS_CHINESE_TRADITIONAL_CHANGJIE_LAYOUT, "Chinese (Traditional) - ChangJie" + IDS_CHINESE_TRADITIONAL_BIG5CODE_LAYOUT, "Chinese (Traditional) - Big5 Code" + IDS_CHINESE_TRADITIONAL_DAYI_LAYOUT, "Chinese (Traditional) - DaYi" + IDS_CHINESE_TRADITIONAL_UNICODE_LAYOUT, "Chinese (Traditional) - Unicode" + IDS_CHINESE_TRADITIONAL_ALPHANUMERIC_LAYOUT, "Chinese (Traditional) - Alphanumeric" + IDS_CHINESE_SIMPLIFIED_USKEYBOARD_LAYOUT, "Chinese (Simplified) - US Keyboard" + IDS_CHINESE_SIMPLIFIED_QUANPIN_LAYOUT, "Chinese (Simplified) - QuanPin" + IDS_CHINESE_SIMPLIFIED_SHUANGPIN_LAYOUT, "Chinese (Simplified) - ShuangPin" + IDS_CHINESE_SIMPLIFIED_ZHENGMA_LAYOUT, "Chinese (Simplified) - ZhengMa" + IDS_CHINESE_SIMPLIFIED_NEIMA_LAYOUT, "Chinese (Simplified) - NeiMa" + IDS_THAI_KEDMANEE_LAYOUT, "Thai Kedmanee" + IDS_THAI_PATTACHOTE_LAYOUT, "Thai Pattachote" + IDS_THAI_KEDMANEE_NONSHIFTLOCK_LAYOUT, "Thai Kedmanee (non-ShiftLock)" + IDS_THAI_PATTACHOTE_NONSHIFTLOCK_LAYOUT, "Thai Pattachote (non-ShiftLock)" + IDS_HEBREW_LAYOUT, "Hebrew" + IDS_ARABIC_101_LAYOUT, "Arabic (101)" + IDS_ARABIC_102_LAYOUT, "Arabic (102)" + IDS_ARABIC_102_AZERTY_LAYOUT, "Arabic (102) AZERTY" + IDS_CZECH_PROGRAMMERS_LAYOUT, "Czech Programmers" + IDS_LITHUANIAN_LAYOUT, "Lithuanian" + IDS_BELGIAN_COMMA_LAYOUT, "Belgian (Comma)" + IDS_CHINESE_TRADITIONAL_NEWPHONETIC_LAYOUT, "Chinese (Traditional) - New Phonetic" + IDS_CHINESE_SIMPLIFIED_MSPINYINIME30_LAYOUT, "Chinese (Simplified) - Microsoft Pinyin IME 3.0" + IDS_UNITED_STATES_DVIRAK_LAYOUT, "United States-Dvorak" + IDS_CHINESE_TRADITIONAL_NEWCHANGJIE_LAYOUT, "Chinese (Traditional) - New ChangJie" + IDS_ASSAMESE_LAYOUT, "Assamese" + IDS_BENGALI_LAYOUT, "Bengali" + IDS_DEVANAGARI_INSCRIPT_LAYOUT, "Devanagari - INSCRIPT" + IDS_GUJARATI_LAYOUT, "Gujarati" + IDS_KANNADA_LAYOUT, "Kannada" + IDS_MALAYALAM_LAYOUT, "Malayalam" + IDS_ORIYA_LAYOUT, "Oriya" + IDS_PUNJABI_LAYOUT, "Punjabi" + IDS_TAMIL_LAYOUT, "Tamil" + IDS_TELUGU_LAYOUT, "Telugu" + IDS_MARATHI_LAYOUT, "Marathi" + IDS_HINDI_TRADITIONAL_LAYOUT, "Hindi Traditional" + IDS_CANTONESE_PHONETIC_LAYOUT, "Cantonese Phonetic" + IDS_FAEROESE_LAYOUT, "Faeroese" + IDS_FYRO_MACEDONIAN_LAYOUT, "FYRO Macedonian" + IDS_CANADIAN_MULTILINGUAL_STD_LAYOUT, "Canadian Multilingual Standard" + IDS_CHINESE_TRADITIONAL_QUICK_LAYOUT, "Chinese (Traditional) - Quick" + IDS_CHINESE_TRADITIONAL_ARRAY_LAYOUT, "Chinese (Traditional) - Array" + IDS_KAZAKH_LAYOUT, "Kazakh" + IDS_UZBEK_CYRILLIC_LAYOUT, "Uzbek Cyrillic" + IDS_AZERI_CYRILLIC_LAYOUT, "Azeri Cyrillic" + IDS_TATAR_LAYOUT, "Tatar" + IDS_AZERI_LATIN_LAYOUT, "Azeri Latin" + IDS_VIETNAMESE_LAYOUT, "Vietnamese" + IDS_GEORGIAN_LAYOUT, "Georgian" + IDS_ARMENIAN_EASTERN_LAYOUT, "Armenian Eastern" + IDS_ARMENIAN_WESTERN_LAYOUT, "Armenian Western" + IDS_GREEK_POLYTONIC_LAYOUT, "Greek Polytonic" + IDS_USENG_TABLE_IBM_ARABIC238L_LAYOUT, "US English Table for IBM Arabic 238_L" + IDS_FARSI_LAYOUT, "Farsi" + IDS_GAELIC_LAYOUT, "Gaelic" + IDS_PORTUGUESE_BRAZIL_ABNT2_LAYOUT, "Portuguese (Brazilian ABNT2)" + IDS_MONGOLIAN_CYRILLIC_LAYOUT, "Mongolian Cyrillic" + IDS_KYRGYZ_CYRILLIC_LAYOUT, "Kyrgyz Cyrillic" + IDS_URDU_LAYOUT, "Urdu" + IDS_SYRIAC_LAYOUT, "Syriac" + IDS_SYRIAC_PHONETIC_LAYOUT, "Syriac Phonetic" + IDS_DIVEHI_PHONETIC_LAYOUT, "Divehi Phonetic" + IDS_DIVEHI_TYPEWRITER_LAYOUT, "Divehi Typewriter" +END Propchange: trunk/reactos/dll/cpl/input/lang/de-DE.rc ------------------------------------------------------------------------------ svn:eol-style = native 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 Mon Sep 10 17:00:42 2007 @@ -1,255 +1,255 @@ -/* - * PROJECT: Text Input DLL - * LICENSE: GPL - See COPYING in the top level directory - * FILE: dll/cpl/input/lang/uk-UA.rc - * PURPOSE: Ukraianian Language File for input.dll - * PROGRAMMERS: Artem Reznikov - */ - -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 -BEGIN - GROUPBOX "Ìîâà ââîäó çà çàìîâ÷óâàííÿì", -1, 7,7,231,53 - LTEXT "Âèáåð³òü îäíó ç óñòàíîâëåíèõ ìîâ ââîäó, ÿêà âèêîðèñòîâóâàòèìåòüñÿ ïðè çàïóñêó êîìï'þòåðà.",-1,14,18,220,17 - COMBOBOX IDC_DEFAULT_INPUT_LANG, 14, 40, 218, 46, CBS_DROPDOWNLIST - GROUPBOX "Óñòàíîâëåí³ ñëóæáè", -1, 7,65,231,115 - LTEXT "Âèáåð³òü ïîòð³áí³ ñëóæáè äëÿ êîæíî¿ ìîâè ââîäó ç³ ñïèñêó. Çì³íèòè ñïèñîê ìîæíà çà äîïîìîãîþ êíîïîê ""Äîäàòè"" òà ""Âèäàëèòè"".",-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_LANG_BAR_BUTTON, 14, 198, 70, 14 - PUSHBUTTON "&Ïàðàìåòðè êëàâ³àòóðè...", IDC_KEY_SETTINGS_BUTTON, 90, 198, 70, 14 -END - -IDD_PROPPAGEADVANCED 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 -BEGIN - GROUPBOX "Íàñòðîéêà ñóì³ñíîñò³", -1, 7,7,231,60 - AUTOCHECKBOX "&Ðîçïîâñþäèòè ï³äòðèìêó äîäàòêîâèõ òåêñòîâèõ ñëóæá íà âñ³ ïðîãðàìè", IDC_SUPPORT_ADV_SERV_CHECKBOX, 14, 19, 210, 10, WS_GROUP - LTEXT "Âñòàíîâ³òü öåé ïðàïîðåöü ùîá ââ³ìêíóòè ï³äòðèìêó äîäàòêîâèõ òåêñòîâèõ ñëóæá â ïðîãðàì³ ""Áëîêíîò"" ³ ³íøèõ ïðîãðàìàõ, ÿê³ íå ï³äòðèìóþòü ðîçï³çíàâàííÿ ìîâè, ðóêîïèñíîãî òåêñòó àáî ³íøèõ äîäàòêîâèõ ñëóæá ââîäó.",-1,14,33,220,25 - GROUPBOX "Íàñòðîéêà ñèñòåìè", -1, 7,74,231,60 - AUTOCHECKBOX "&Âèìêíóòè äîäàòêîâ³ òåêñòîâ³ ñëóæáè", IDC_TURNOFF_ADV_TXTSERV_CHECKBOX, 14, 86, 210, 10, WS_GROUP - LTEXT "Âñòàíîâ³òü öåé ïðàïîðåöü ùîá âèìêíóòè äîäàòêîâ³ òåêñòîâ³ ñëóæáè äëÿ âñ³õ ïðîãðàì. Íå ðåêîìåíäîâàíî äëÿ ìîâ ñõ³äíî¿ Àç³¿, îñê³ëüêè ìîâíà ïàíåëü áóäå çàêðèòà.",-1,14,100,220,25 -END - -IDD_LANGBAR DIALOG 20, 20, 240, 120 -STYLE DS_SETFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_3DLOOK | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION -CAPTION "Ïàðàìåòðè ìîâíî¿ ïàíåë³" -FONT 8, "MS Shell Dlg" -{ - GROUPBOX "", -1, 7, 7, 226, 85 - AUTOCHECKBOX "Ï&îêàçóâàòè ïàíåëü ìîâè íà ðîáî÷îìó ñòîë³", IDC_LANGBAR_ON_DESK_CHECKBOX, 17, 17, 210, 10, WS_GROUP - AUTOCHECKBOX "&Ïîêàçóâàòè ïàíåëü ìîâè ïðîçîðîþ, êîëè âîíà íåàêòèâíà", IDC_LANGBAR_TRANSP_INACT_CHECKBOX, 17, 32, 210, 10 - AUTOCHECKBOX "Ïîêà&çóâàòè äîäàòêîâ³ çíà÷êè ïàíåë³ ìîâè â îáëàñò³ ñïîâ³ùåíü", IDC_ADDIT_LANGBAR_ICON_NOTIFYAREA_CHECKBOX, 17, 47, 210, 10 - AUTOCHECKBOX "Ïîêàçóâà&òè ï³äïèñè íà ïàíåë³ ìîâè", IDC_TEXTLABEL_ON_LANGBAR_CHECKBOX, 17, 62, 210, 10 - AUTOCHECKBOX "&Âèìêíóòè äîäàòêîâ³ òåêñòîâ³ ñëóæáè", IDC_OFF_ADVAN_TEXTSERV_CHECKBOX, 17, 77, 200, 10 - DEFPUSHBUTTON "OK", IDOK, 129, 99, 50, 14 - PUSHBUTTON "Ñêàñóâàòè", IDCANCEL, 182, 99, 50, 14 -} - -IDD_KEYSETTINGS DIALOG 0, 0, 272, 163 -STYLE DS_SETFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_3DLOOK | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION -CAPTION "Äîäàòêîâ³ ïàðàìåòðè êëàâ³àòóðè" -FONT 8, "MS Shell Dlg" -{ - GROUPBOX "Âèìêíåííÿ ðåæèìó Caps Lock", -1, 7, 7, 258, 26 - AUTORADIOBUTTON "&ïðè íàòèñíåíí³ êëàâ³ø³ CAPS LOCK", IDC_PRESS_CAPSLOCK_KEY_RADIOBTN, 14, 17, 120, 11, WS_GROUP - AUTORADIOBUTTON "ïðè &íàòèñíåíí³ êëàâ³ø³ SHIFT", IDC_PRESS_SHIFT_KEY_RADIOBTN, 144, 17, 120, 11, NOT WS_TABSTOP - GROUPBOX "Ñïîëó÷åííÿ êëàâ³ø äëÿ ìîâ ââîäó", -1, 7, 37, 258, 95 - LTEXT "Ä³ÿ", -1, 14, 47, 60, 9 - RTEXT "&Ñïîëó÷åííÿ êëàâ³ø", -1, 177, 47, 79, 9 - LISTBOX IDC_KEY_LISTBOX, 14, 57, 244, 52, LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP - PUSHBUTTON "Ç&ì³íà ñïîëó÷åííÿ êëàâ³ø...", IDC_CHANGE_KEY_SEQ_BUTTON, 152, 113, 106, 14, WS_GROUP - DEFPUSHBUTTON "OK", IDOK, 66, 140, 70, 14 - PUSHBUTTON "Ñêàñóâàòè", IDCANCEL, 146, 140, 70, 14 -} - -IDD_ADD DIALOG 20, 20, 227, 90 -STYLE DS_SETFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_3DLOOK | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION -CAPTION "Äîäàâàííÿ ìîâè ââîäó" -FONT 8, "MS Shell Dlg" -{ - LTEXT "&Ìîâà ââîäó:", -1, 7, 7, 61, 10 - COMBOBOX IDC_INPUT_LANGUAGE_COMBO, 7, 17, 212, 60, 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 - DEFPUSHBUTTON "OK", IDOK, 116, 68, 50, 14 - PUSHBUTTON "Ñêàñóâàòè", IDCANCEL, 169, 68, 50, 14 -} - -IDD_CHANGE_KEY_SEQ 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" -{ - LTEXT "", -1, 16, 5, 250, 10 - GROUPBOX "", -1, 12, 17, 184, 48 - AUTOCHECKBOX "&Ââ³ìêíóòè ñïîëó÷åííÿ êëàâ³ø", IDC_ENABLE_KEY_SEQ_CHECKBOX, 17, 17, 85, 8 - CTEXT "SHIFT", -1, 68, 37, 27, 12 - CTEXT "+", -1, 57, 37, 8, 9 - CTEXT "+", -1, 98, 37, 8, 10 - CHECKBOX "&CTRL", IDC_CTRL_CHECKBOX, 24, 31, 30, 11, NOT WS_TABSTOP - CHECKBOX "&ALT", IDC_ALT_CHECKBOX, 24, 45, 40, 12, NOT WS_TABSTOP - LTEXT "&Êëàâ³øà:", -1, 110, 37, 14, 10 - COMBOBOX IDC_CKEY_COMBOBOX, 127, 34, 46, 48, CBS_DROPDOWNLIST | WS_VSCROLL - DEFPUSHBUTTON "OK", IDOK, 212, 25, 50, 14 - PUSHBUTTON "Ñêàñóâàòè", 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 "Âëàñòèâîñò³ ìîâè ââîäó" -FONT 8, "MS Shell Dlg" -{ - LTEXT "Ìîâà ââîäó:", -1, 7, 7, 61, 8 - LTEXT "", -1, 73, 7, 129, 8 - LTEXT "&Ðîçêëàäêà êëàâ³àòóðè àáî çàñ³á ââîäó (IME):", -1, 7, 21, 110, 10 - COMBOBOX IDC_KEYBOARD_LAYOUT_IME_COMBO, 7, 32, 212, 60, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL - DEFPUSHBUTTON "OK", IDOK, 116, 53, 52, 14 - PUSHBUTTON "Ñêàñóâàòè", IDCANCEL, 169, 53, 52, 14 -} - -STRINGTABLE -BEGIN - IDS_CPLSYSTEMNAME "Ìîâè òà ñëóæáè òåêñòîâîãî ââîäó" - IDS_CPLSYSTEMDESCRIPTION "Íàëàøòîâóº ïàðàìåòðè äëÿ òåêñòîâîãî ââîäó." - IDS_US_LAYOUT, "ÑØÀ" - IDS_BELGIAN_LAYOUT, "Áåëüã³éñüêà (³ç êðàïêîþ)" - IDS_BELGIAN_FRENCH_LAYOUT, "Ôðàíöóçüêà (Áåëüã³ÿ)" - IDS_PORTUGUESE_BRAZILIAN_ABNT_LAYOUT, "Ïîðòóãàëüñüêà (Áðàçèë³ÿ ABNT)" - IDS_CANADIAN_FRENCH_LAYOUT, "Ôðàíöóçüêà (Êàíàäà)" - IDS_CANADIAN_FRENCH_LEGACY_LAYOUT, "Ôðàíöóçüêà (Êàíàäà, òðàäèö³éíà)" - IDS_DANISH_LAYOUT, "Äàòñüêà" - IDS_DUTCH_LAYOUT, "Í³äåðëàíäñüêà" - IDS_FINNISH_LAYOUT, "Ô³íñüêà" - IDS_FRENCH_LAYOUT, "Ôðàíöóçüêà" - IDS_GERMAN_LAYOUT, "Í³ìåöüêà" - IDS_GERMAN_IBM_LAYOUT, "Í³ìåöüêà (IBM)" - IDS_ICELANDIC_LAYOUT, "²ñëàíäñüêà" - IDS_IRISH_LAYOUT, "²ðëàíäñüêà" - IDS_ITALIAN_LAYOUT, "²òàë³éñüêà" - IDS_ITALIAN_142_LAYOUT, "²òàë³éñüêà (142)" - IDS_LATIN_AMERICAN_LAYOUT, "Ëàòèíñüêà Àìåðèêà" - IDS_NORWEGIAN_LAYOUT, "Íîðâåçüêà" - IDS_PORTUGUESE_LAYOUT, "Ïîðòóãàëüñüêà" - IDS_SPANISH_LAYOUT, "²ñïàíñüêà" - IDS_SPANISH_VARIANTION_LAYOUT, "²ñïàíñüêà 2" - IDS_SWEDISH_LAYOUT, "Øâåäñüêà" - IDS_SWISS_FRENCH_LAYOUT, "Ôðàíöóçüêà (Øâåéöàð³ÿ)" - IDS_SWISS_GERMAN_LAYOUT, "Í³ìåöüêà (Øâåéöàð³ÿ)" - IDS_UNITED_KINGDOM_LAYOUT, "Âåëèêîáðèòàí³ÿ" - IDS_UNITED_STATES_INTERNATIONAL_LAYOUT, "ÑØÀ - ì³æíàðîäíà" - IDS_UNITED_STATES_DVORAK_FOR_LEFT_HAND_LAYOUT, "ÑØÀ - Äâîðàê (äëÿ ë³âî¿ ðóêè)" - IDS_UNITED_STATES_DVORAK_FOR_RIGHT_HAND_LAYOUT, "ÑØÀ - Äâîðàê (äëÿ ïðàâî¿ ðóêè)" - IDS_ALBANIAN_LAYOUT, "Àëáàíñüêà" - IDS_CROATIAN_LAYOUT, "Õîðâàòñüêà" - IDS_CZECH_LAYOUT, "×åñüêà" - IDS_CZECH_QWERTY_LAYOUT, "×åñüêà (QWERTY)" - IDS_HUNGARIAN_LAYOUT, "Óãîðñüêà" - IDS_HUNGARIAN_101_KEY_LAYOUT, "Óãîðñüêà (101 êëàâ³øà)" - IDS_POLISH_LAYOUT, "Ïîëüñüêà (ïðîãðàì³ñòñüêà)" - IDS_POLISH_214_LAYOUT, "Ïîëüñüêà (214)" - IDS_ROMANIAN_LAYOUT, "Ðóìóíñüêà" - IDS_SERBIAN_LATIN_LAYOUT, "Ñåðáñüêà (ëàòèíèöÿ)" - IDS_SLOVAK_LAYOUT, "Ñëîâàöüêà" - IDS_SLOVAK_QWERTY_LAYOUT, "Ñëîâàöüêà (QWERTY)" - IDS_SLOVENIAN_LAYOUT, "Ñëîâåíñüêà" - IDS_ESTONIAN_LAYOUT, "Åñòîíñüêà" - IDS_LATVIAN_LAYOUT, "Ëàòâ³éñüêà" - IDS_LATVIAN_QWERTY_LAYOUT, "Ëàòâ³éñüêà (QWERTY)" - IDS_LITHUANIAN_IBM_LAYOUT, "Ëèòîâñüêà (IBM)" - IDS_GREEK_LAYOUT, "Ãðåöüêà" - IDS_GREEK_LATIN_LAYOUT, "Ãðåöüêà (ëàòèíèöÿ)" - IDS_GREEK_220_LAYOUT, "Ãðåöüêà (220)" - IDS_GREEK_319_LAYOUT, "Ãðåöüêà (319)" - IDS_GREEK_220_LATIN_LAYOUT, "Ãðåöüêà (220, ëàòèíèöÿ)" - IDS_GREEK_319_LATIN_LAYOUT, "Ãðåöüêà (319, ëàòèíèöÿ)" - IDS_BELARUSIAN_LAYOUT, "Á³ëîðóñüêà" - IDS_BULGARIAN_LAYOUT, "Áîëãàðñüêà" - IDS_BULGARIAN_LATIN_LAYOUT, "Áîëãàðñüêà (ëàòèíèöÿ)" - IDS_RUSSIAN_LAYOUT, "Ðîñ³éñüêà" - IDS_RUSSIAN_TYPEWRITER_LAYOUT, "Ðîñ³éñüêà (äðóêàðñüêà ìàøèíêà)" - IDS_SERBIAN_CYRILLIC_LAYOUT, "Ñåðáñüêà (êèðèëèöÿ)" - IDS_UKRAINIAN_LAYOUT, "Óêðà¿íñüêà" - IDS_TURKISH_F_LAYOUT, "Òóðåöüêà F" - IDS_TURKISH_Q_LAYOUT, "Òóðåöüêà Q" - IDS_JAPANESE_LAYOUT, "ßïîíñüêà" - IDS_JAPANESE_INPUT_SYSTEM_MSIME2002_LAYOUT, "ßïîíñüêèé çàñ³á ââîäó (MS-IME2002)" - IDS_KOREAN_LAYOUT, "Êîðåéñüêà" - IDS_KOREAN_INPUT_SYSTEM_MSIME2002_LAYOUT, "Êîðåéñüêèé çàñ³á ââîäó (MS-IME2002)" - IDS_CHINESE_TRADITIONAL_USKEYBOARD_LAYOUT, "Êèòàéñüêà (òðàäèö³éíå ïèñüìî) - ÑØÀ" - IDS_CHINESE_TRADITIONAL_PHONETIC_LAYOUT, "Êèòàéñüêà (òðàäèö³éíå ïèñüìî) - ôîíåòè÷íà" - IDS_CHINESE_TRADITIONAL_CHANGJIE_LAYOUT, "Êèòàéñüêà (òðàäèö³éíå ïèñüìî) - ChangJie" - IDS_CHINESE_TRADITIONAL_BIG5CODE_LAYOUT, "Êèòàéñüêà (òðàäèö³éíå ïèñüìî) - Big5 Code" - IDS_CHINESE_TRADITIONAL_DAYI_LAYOUT, "Êèòàéñüêà (òðàäèö³éíå ïèñüìî) - DaYi" - IDS_CHINESE_TRADITIONAL_UNICODE_LAYOUT, "Êèòàéñüêà (òðàäèö³éíå ïèñüìî) - Þí³êîä" - IDS_CHINESE_TRADITIONAL_ALPHANUMERIC_LAYOUT, "Êèòàéñüêà (òðàäèö³éíå ïèñüìî) - àëôàâ³òíî-öèôðîâà" - IDS_CHINESE_SIMPLIFIED_USKEYBOARD_LAYOUT, "Êèòàéñüêà (ñïðîùåíå ïèñüìî) - ÑØÀ" - IDS_CHINESE_SIMPLIFIED_QUANPIN_LAYOUT, "Êèòàéñüêà (ñïðîùåíå ïèñüìî) - QuanPin" - IDS_CHINESE_SIMPLIFIED_SHUANGPIN_LAYOUT, "Êèòàéñüêà (ñïðîùåíå ïèñüìî) - ShuangPin" - IDS_CHINESE_SIMPLIFIED_ZHENGMA_LAYOUT, "Êèòàéñüêà (ñïðîùåíå ïèñüìî) - ZhengMa" - IDS_CHINESE_SIMPLIFIED_NEIMA_LAYOUT, "Êèòàéñüêà (ñïðîùåíå ïèñüìî) - NeiMa" - IDS_THAI_KEDMANEE_LAYOUT, "Òàéñüêà Êåäìàí³" - IDS_THAI_PATTACHOTE_LAYOUT, "Òàéñüêà Ïàòàøîò" - IDS_THAI_KEDMANEE_NONSHIFTLOCK_LAYOUT, "Òàéñüêà Êåäìàí³ (áåç ShiftLock)" - IDS_THAI_PATTACHOTE_NONSHIFTLOCK_LAYOUT, "Òàéñüêà Ïàòàøîò (áåç ShiftLock)" - IDS_HEBREW_LAYOUT, "²âðèò" - IDS_ARABIC_101_LAYOUT, "Àðàáñüêà (101)" - IDS_ARABIC_102_LAYOUT, "Àðàáñüêà (102)" - IDS_ARABIC_102_AZERTY_LAYOUT, "Àðàáñüêà (102) AZERTY" - IDS_CZECH_PROGRAMMERS_LAYOUT, "×åñüêà (ïðîãðàì³ñòñüêà)" - IDS_LITHUANIAN_LAYOUT, "Ëèòîâñüêà" - IDS_BELGIAN_COMMA_LAYOUT, "Áåëüã³éñüêà (ç êîìîþ)" - IDS_CHINESE_TRADITIONAL_NEWPHONETIC_LAYOUT, "Êèòàéñüêà (òðàäèö³éíå ïèñüìî) - íîâà ôîíåòè÷íà" - IDS_CHINESE_SIMPLIFIED_MSPINYINIME30_LAYOUT, "Êèòàéñüêà (ñïðîùåíå ïèñüìî) - Microsoft Pinyin IME 3.0" - IDS_UNITED_STATES_DVIRAK_LAYOUT, "ÑØÀ - Äâîðàê" - IDS_CHINESE_TRADITIONAL_NEWCHANGJIE_LAYOUT, "Êèòàéñüêà (òðàäèö³éíå ïèñüìî) - íîâà ChangJie" - IDS_ASSAMESE_LAYOUT, "Àññàìñüêà" - IDS_BENGALI_LAYOUT, "Áåíãàë³" - IDS_DEVANAGARI_INSCRIPT_LAYOUT, "Äåâàíàãàð³ (INSCRIPT)" - IDS_GUJARATI_LAYOUT, "Ãóäæàðàò³" - IDS_KANNADA_LAYOUT, "Êàííàäà" - IDS_MALAYALAM_LAYOUT, "Ìàëàÿëàì" - IDS_ORIYA_LAYOUT, "Îð³ÿ" - IDS_PUNJABI_LAYOUT, "Ïàíäæàá³" - IDS_TAMIL_LAYOUT, "Òàì³ëüñüêà" - IDS_TELUGU_LAYOUT, "Òåëóãó" - IDS_MARATHI_LAYOUT, "Ìàðàòõ³" - IDS_HINDI_TRADITIONAL_LAYOUT, "Õ³íä³ (òðàäèö³éíà)" - IDS_CANTONESE_PHONETIC_LAYOUT, "Êàíòîíñüêà (ôîíåòè÷íà)" - IDS_FAEROESE_LAYOUT, "Ôàðåðñüêà" - IDS_FYRO_MACEDONIAN_LAYOUT, "Ìàêåäîíñüêà (Ìàêåäîí³ÿ)" - IDS_CANADIAN_MULTILINGUAL_STD_LAYOUT, "Êàíàäñüêà ñòàíäàðòíà (áàãàòîìîâíà)" - IDS_CHINESE_TRADITIONAL_QUICK_LAYOUT, "Êèòàéñüêà (òðàäèö³éíå ïèñüìî) - øâèäêà" - IDS_CHINESE_TRADITIONAL_ARRAY_LAYOUT, "Êèòàéñüêà (òðàäèö³éíå ïèñüìî) - òàáëè÷íà" - IDS_KAZAKH_LAYOUT, "Êàçàõñüêà" - IDS_UZBEK_CYRILLIC_LAYOUT, "Óçáåöüêà (êèðèëèöÿ)" - IDS_AZERI_CYRILLIC_LAYOUT, "Àçåðáàéäæàíñüêà (êèðèëèöÿ)" - IDS_TATAR_LAYOUT, "Òàòàðñüêà" - IDS_AZERI_LATIN_LAYOUT, "Àçåðáàéäæàíñüêà (ëàòèíèöÿ)" - IDS_VIETNAMESE_LAYOUT, "Â'ºòíàìñüêà" - IDS_GEORGIAN_LAYOUT, "Ãðóçèíñüêà" - IDS_ARMENIAN_EASTERN_LAYOUT, "Â³ðìåíñüêà (ñõ³äíà)" - IDS_ARMENIAN_WESTERN_LAYOUT, "Â³ðìåíñüêà (çàõ³äíà)" - IDS_GREEK_POLYTONIC_LAYOUT, "Ãðåöüêà (ïîë³òîí³÷íà)" - IDS_USENG_TABLE_IBM_ARABIC238L_LAYOUT, "Àíãë³éñüêà òàáëè÷íà (ÑØÀ) äëÿ àðàáñüêî¿ (IBM, 238_L)" - IDS_FARSI_LAYOUT, "Ïåðñüêà" - IDS_GAELIC_LAYOUT, "Ãåëüñüêà" - IDS_PORTUGUESE_BRAZIL_ABNT2_LAYOUT, "Ïîðòóãàëüñüêà (Áðàçèë³ÿ ABNT2)" - IDS_MONGOLIAN_CYRILLIC_LAYOUT, "Ìîíãîëüñüêà (êèðèëèöÿ)" - IDS_KYRGYZ_CYRILLIC_LAYOUT, "Êèðãèçüêà (êèðèëèöÿ)" - IDS_URDU_LAYOUT, "Óðäó" - IDS_SYRIAC_LAYOUT, "Ñèð³éñüêà" - IDS_SYRIAC_PHONETIC_LAYOUT, "Ñèð³éñüêà (ôîíåòè÷íà)" - IDS_DIVEHI_PHONETIC_LAYOUT, "Ìàëüä³âñüêà (ôîíåòè÷íà)" - IDS_DIVEHI_TYPEWRITER_LAYOUT, "Ìàëüä³âñüêà (äðóêàðñüêà ìàøèíêà)" -END +/* + * PROJECT: Text Input DLL + * LICENSE: GPL - See COPYING in the top level directory + * FILE: dll/cpl/input/lang/uk-UA.rc + * PURPOSE: Ukraianian Language File for input.dll + * PROGRAMMERS: Artem Reznikov + */ + +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 +BEGIN + GROUPBOX "Ìîâà ââîäó çà çàìîâ÷óâàííÿì", -1, 7,7,231,53 + LTEXT "Âèáåð³òü îäíó ç óñòàíîâëåíèõ ìîâ ââîäó, ÿêà âèêîðèñòîâóâàòèìåòüñÿ ïðè çàïóñêó êîìï'þòåðà.",-1,14,18,220,17 + COMBOBOX IDC_DEFAULT_INPUT_LANG, 14, 40, 218, 46, CBS_DROPDOWNLIST + GROUPBOX "Óñòàíîâëåí³ ñëóæáè", -1, 7,65,231,115 + LTEXT "Âèáåð³òü ïîòð³áí³ ñëóæáè äëÿ êîæíî¿ ìîâè ââîäó ç³ ñïèñêó. Çì³íèòè ñïèñîê ìîæíà çà äîïîìîãîþ êíîïîê ""Äîäàòè"" òà ""Âèäàëèòè"".",-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_LANG_BAR_BUTTON, 14, 198, 70, 14 + PUSHBUTTON "&Ïàðàìåòðè êëàâ³àòóðè...", IDC_KEY_SETTINGS_BUTTON, 90, 198, 70, 14 +END + +IDD_PROPPAGEADVANCED 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 +BEGIN + GROUPBOX "Íàñòðîéêà ñóì³ñíîñò³", -1, 7,7,231,60 + AUTOCHECKBOX "&Ðîçïîâñþäèòè ï³äòðèìêó äîäàòêîâèõ òåêñòîâèõ ñëóæá íà âñ³ ïðîãðàìè", IDC_SUPPORT_ADV_SERV_CHECKBOX, 14, 19, 210, 10, WS_GROUP + LTEXT "Âñòàíîâ³òü öåé ïðàïîðåöü ùîá ââ³ìêíóòè ï³äòðèìêó äîäàòêîâèõ òåêñòîâèõ ñëóæá â ïðîãðàì³ ""Áëîêíîò"" ³ ³íøèõ ïðîãðàìàõ, ÿê³ íå ï³äòðèìóþòü ðîçï³çíàâàííÿ ìîâè, ðóêîïèñíîãî òåêñòó àáî ³íøèõ äîäàòêîâèõ ñëóæá ââîäó.",-1,14,33,220,25 + GROUPBOX "Íàñòðîéêà ñèñòåìè", -1, 7,74,231,60 + AUTOCHECKBOX "&Âèìêíóòè äîäàòêîâ³ òåêñòîâ³ ñëóæáè", IDC_TURNOFF_ADV_TXTSERV_CHECKBOX, 14, 86, 210, 10, WS_GROUP + LTEXT "Âñòàíîâ³òü öåé ïðàïîðåöü ùîá âèìêíóòè äîäàòêîâ³ òåêñòîâ³ ñëóæáè äëÿ âñ³õ ïðîãðàì. Íå ðåêîìåíäîâàíî äëÿ ìîâ ñõ³äíî¿ Àç³¿, îñê³ëüêè ìîâíà ïàíåëü áóäå çàêðèòà.",-1,14,100,220,25 +END + +IDD_LANGBAR DIALOG 20, 20, 240, 120 +STYLE DS_SETFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_3DLOOK | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION +CAPTION "Ïàðàìåòðè ìîâíî¿ ïàíåë³" +FONT 8, "MS Shell Dlg" +{ + GROUPBOX "", -1, 7, 7, 226, 85 + AUTOCHECKBOX "Ï&îêàçóâàòè ïàíåëü ìîâè íà ðîáî÷îìó ñòîë³", IDC_LANGBAR_ON_DESK_CHECKBOX, 17, 17, 210, 10, WS_GROUP + AUTOCHECKBOX "&Ïîêàçóâàòè ïàíåëü ìîâè ïðîçîðîþ, êîëè âîíà íåàêòèâíà", IDC_LANGBAR_TRANSP_INACT_CHECKBOX, 17, 32, 210, 10 + AUTOCHECKBOX "Ïîêà&çóâàòè äîäàòêîâ³ çíà÷êè ïàíåë³ ìîâè â îáëàñò³ ñïîâ³ùåíü", IDC_ADDIT_LANGBAR_ICON_NOTIFYAREA_CHECKBOX, 17, 47, 210, 10 + AUTOCHECKBOX "Ïîêàçóâà&òè ï³äïèñè íà ïàíåë³ ìîâè", IDC_TEXTLABEL_ON_LANGBAR_CHECKBOX, 17, 62, 210, 10 + AUTOCHECKBOX "&Âèìêíóòè äîäàòêîâ³ òåêñòîâ³ ñëóæáè", IDC_OFF_ADVAN_TEXTSERV_CHECKBOX, 17, 77, 200, 10 + DEFPUSHBUTTON "OK", IDOK, 129, 99, 50, 14 + PUSHBUTTON "Ñêàñóâàòè", IDCANCEL, 182, 99, 50, 14 +} + +IDD_KEYSETTINGS DIALOG 0, 0, 272, 163 +STYLE DS_SETFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_3DLOOK | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION +CAPTION "Äîäàòêîâ³ ïàðàìåòðè êëàâ³àòóðè" +FONT 8, "MS Shell Dlg" +{ + GROUPBOX "Âèìêíåííÿ ðåæèìó Caps Lock", -1, 7, 7, 258, 26 + AUTORADIOBUTTON "&ïðè íàòèñíåíí³ êëàâ³ø³ CAPS LOCK", IDC_PRESS_CAPSLOCK_KEY_RADIOBTN, 14, 17, 120, 11, WS_GROUP + AUTORADIOBUTTON "ïðè &íàòèñíåíí³ êëàâ³ø³ SHIFT", IDC_PRESS_SHIFT_KEY_RADIOBTN, 144, 17, 120, 11, NOT WS_TABSTOP + GROUPBOX "Ñïîëó÷åííÿ êëàâ³ø äëÿ ìîâ ââîäó", -1, 7, 37, 258, 95 + LTEXT "Ä³ÿ", -1, 14, 47, 60, 9 + RTEXT "&Ñïîëó÷åííÿ êëàâ³ø", -1, 177, 47, 79, 9 + LISTBOX IDC_KEY_LISTBOX, 14, 57, 244, 52, LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP + PUSHBUTTON "Ç&ì³íà ñïîëó÷åííÿ êëàâ³ø...", IDC_CHANGE_KEY_SEQ_BUTTON, 152, 113, 106, 14, WS_GROUP + DEFPUSHBUTTON "OK", IDOK, 66, 140, 70, 14 + PUSHBUTTON "Ñêàñóâàòè", IDCANCEL, 146, 140, 70, 14 +} + +IDD_ADD DIALOG 20, 20, 227, 90 +STYLE DS_SETFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_3DLOOK | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION +CAPTION "Äîäàâàííÿ ìîâè ââîäó" +FONT 8, "MS Shell Dlg" +{ + LTEXT "&Ìîâà ââîäó:", -1, 7, 7, 61, 10 + COMBOBOX IDC_INPUT_LANGUAGE_COMBO, 7, 17, 212, 60, 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 + DEFPUSHBUTTON "OK", IDOK, 116, 68, 50, 14 + PUSHBUTTON "Ñêàñóâàòè", IDCANCEL, 169, 68, 50, 14 +} + +IDD_CHANGE_KEY_SEQ 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" +{ + LTEXT "", -1, 16, 5, 250, 10 + GROUPBOX "", -1, 12, 17, 184, 48 + AUTOCHECKBOX "&Ââ³ìêíóòè ñïîëó÷åííÿ êëàâ³ø", IDC_ENABLE_KEY_SEQ_CHECKBOX, 17, 17, 85, 8 + CTEXT "SHIFT", -1, 68, 37, 27, 12 + CTEXT "+", -1, 57, 37, 8, 9 + CTEXT "+", -1, 98, 37, 8, 10 + CHECKBOX "&CTRL", IDC_CTRL_CHECKBOX, 24, 31, 30, 11, NOT WS_TABSTOP + CHECKBOX "&ALT", IDC_ALT_CHECKBOX, 24, 45, 40, 12, NOT WS_TABSTOP + LTEXT "&Êëàâ³øà:", -1, 110, 37, 14, 10 + COMBOBOX IDC_CKEY_COMBOBOX, 127, 34, 46, 48, CBS_DROPDOWNLIST | WS_VSCROLL + DEFPUSHBUTTON "OK", IDOK, 212, 25, 50, 14 + PUSHBUTTON "Ñêàñóâàòè", 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 "Âëàñòèâîñò³ ìîâè ââîäó" +FONT 8, "MS Shell Dlg" +{ + LTEXT "Ìîâà ââîäó:", -1, 7, 7, 61, 8 + LTEXT "", -1, 73, 7, 129, 8 + LTEXT "&Ðîçêëàäêà êëàâ³àòóðè àáî çàñ³á ââîäó (IME):", -1, 7, 21, 110, 10 + COMBOBOX IDC_KEYBOARD_LAYOUT_IME_COMBO, 7, 32, 212, 60, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL + DEFPUSHBUTTON "OK", IDOK, 116, 53, 52, 14 + PUSHBUTTON "Ñêàñóâàòè", IDCANCEL, 169, 53, 52, 14 +} + +STRINGTABLE +BEGIN + IDS_CPLSYSTEMNAME "Ìîâè òà ñëóæáè òåêñòîâîãî ââîäó" + IDS_CPLSYSTEMDESCRIPTION "Íàëàøòîâóº ïàðàìåòðè äëÿ òåêñòîâîãî ââîäó." + IDS_US_LAYOUT, "ÑØÀ" + IDS_BELGIAN_LAYOUT, "Áåëüã³éñüêà (³ç êðàïêîþ)" + IDS_BELGIAN_FRENCH_LAYOUT, "Ôðàíöóçüêà (Áåëüã³ÿ)" + IDS_PORTUGUESE_BRAZILIAN_ABNT_LAYOUT, "Ïîðòóãàëüñüêà (Áðàçèë³ÿ ABNT)" + IDS_CANADIAN_FRENCH_LAYOUT, "Ôðàíöóçüêà (Êàíàäà)" + IDS_CANADIAN_FRENCH_LEGACY_LAYOUT, "Ôðàíöóçüêà (Êàíàäà, òðàäèö³éíà)" + IDS_DANISH_LAYOUT, "Äàòñüêà" + IDS_DUTCH_LAYOUT, "Í³äåðëàíäñüêà" + IDS_FINNISH_LAYOUT, "Ô³íñüêà" + IDS_FRENCH_LAYOUT, "Ôðàíöóçüêà" + IDS_GERMAN_LAYOUT, "Í³ìåöüêà" + IDS_GERMAN_IBM_LAYOUT, "Í³ìåöüêà (IBM)" + IDS_ICELANDIC_LAYOUT, "²ñëàíäñüêà" + IDS_IRISH_LAYOUT, "²ðëàíäñüêà" + IDS_ITALIAN_LAYOUT, "²òàë³éñüêà" + IDS_ITALIAN_142_LAYOUT, "²òàë³éñüêà (142)" + IDS_LATIN_AMERICAN_LAYOUT, "Ëàòèíñüêà Àìåðèêà" + IDS_NORWEGIAN_LAYOUT, "Íîðâåçüêà" + IDS_PORTUGUESE_LAYOUT, "Ïîðòóãàëüñüêà" + IDS_SPANISH_LAYOUT, "²ñïàíñüêà" + IDS_SPANISH_VARIANTION_LAYOUT, "²ñïàíñüêà 2" + IDS_SWEDISH_LAYOUT, "Øâåäñüêà" + IDS_SWISS_FRENCH_LAYOUT, "Ôðàíöóçüêà (Øâåéöàð³ÿ)" + IDS_SWISS_GERMAN_LAYOUT, "Í³ìåöüêà (Øâåéöàð³ÿ)" + IDS_UNITED_KINGDOM_LAYOUT, "Âåëèêîáðèòàí³ÿ" + IDS_UNITED_STATES_INTERNATIONAL_LAYOUT, "ÑØÀ - ì³æíàðîäíà" + IDS_UNITED_STATES_DVORAK_FOR_LEFT_HAND_LAYOUT, "ÑØÀ - Äâîðàê (äëÿ ë³âî¿ ðóêè)" + IDS_UNITED_STATES_DVORAK_FOR_RIGHT_HAND_LAYOUT, "ÑØÀ - Äâîðàê (äëÿ ïðàâî¿ ðóêè)" + IDS_ALBANIAN_LAYOUT, "Àëáàíñüêà" + IDS_CROATIAN_LAYOUT, "Õîðâàòñüêà" + IDS_CZECH_LAYOUT, "×åñüêà" + IDS_CZECH_QWERTY_LAYOUT, "×åñüêà (QWERTY)" + IDS_HUNGARIAN_LAYOUT, "Óãîðñüêà" + IDS_HUNGARIAN_101_KEY_LAYOUT, "Óãîðñüêà (101 êëàâ³øà)" + IDS_POLISH_LAYOUT, "Ïîëüñüêà (ïðîãðàì³ñòñüêà)" + IDS_POLISH_214_LAYOUT, "Ïîëüñüêà (214)" + IDS_ROMANIAN_LAYOUT, "Ðóìóíñüêà" + IDS_SERBIAN_LATIN_LAYOUT, "Ñåðáñüêà (ëàòèíèöÿ)" + IDS_SLOVAK_LAYOUT, "Ñëîâàöüêà" + IDS_SLOVAK_QWERTY_LAYOUT, "Ñëîâàöüêà (QWERTY)" + IDS_SLOVENIAN_LAYOUT, "Ñëîâåíñüêà" + IDS_ESTONIAN_LAYOUT, "Åñòîíñüêà" + IDS_LATVIAN_LAYOUT, "Ëàòâ³éñüêà" + IDS_LATVIAN_QWERTY_LAYOUT, "Ëàòâ³éñüêà (QWERTY)" + IDS_LITHUANIAN_IBM_LAYOUT, "Ëèòîâñüêà (IBM)" + IDS_GREEK_LAYOUT, "Ãðåöüêà" + IDS_GREEK_LATIN_LAYOUT, "Ãðåöüêà (ëàòèíèöÿ)" + IDS_GREEK_220_LAYOUT, "Ãðåöüêà (220)" + IDS_GREEK_319_LAYOUT, "Ãðåöüêà (319)" + IDS_GREEK_220_LATIN_LAYOUT, "Ãðåöüêà (220, ëàòèíèöÿ)" + IDS_GREEK_319_LATIN_LAYOUT, "Ãðåöüêà (319, ëàòèíèöÿ)" + IDS_BELARUSIAN_LAYOUT, "Á³ëîðóñüêà" + IDS_BULGARIAN_LAYOUT, "Áîëãàðñüêà" + IDS_BULGARIAN_LATIN_LAYOUT, "Áîëãàðñüêà (ëàòèíèöÿ)" + IDS_RUSSIAN_LAYOUT, "Ðîñ³éñüêà" + IDS_RUSSIAN_TYPEWRITER_LAYOUT, "Ðîñ³éñüêà (äðóêàðñüêà ìàøèíêà)" + IDS_SERBIAN_CYRILLIC_LAYOUT, "Ñåðáñüêà (êèðèëèöÿ)" + IDS_UKRAINIAN_LAYOUT, "Óêðà¿íñüêà" + IDS_TURKISH_F_LAYOUT, "Òóðåöüêà F" + IDS_TURKISH_Q_LAYOUT, "Òóðåöüêà Q" + IDS_JAPANESE_LAYOUT, "ßïîíñüêà" + IDS_JAPANESE_INPUT_SYSTEM_MSIME2002_LAYOUT, "ßïîíñüêèé çàñ³á ââîäó (MS-IME2002)" + IDS_KOREAN_LAYOUT, "Êîðåéñüêà" + IDS_KOREAN_INPUT_SYSTEM_MSIME2002_LAYOUT, "Êîðåéñüêèé çàñ³á ââîäó (MS-IME2002)" + IDS_CHINESE_TRADITIONAL_USKEYBOARD_LAYOUT, "Êèòàéñüêà (òðàäèö³éíå ïèñüìî) - ÑØÀ" + IDS_CHINESE_TRADITIONAL_PHONETIC_LAYOUT, "Êèòàéñüêà (òðàäèö³éíå ïèñüìî) - ôîíåòè÷íà" + IDS_CHINESE_TRADITIONAL_CHANGJIE_LAYOUT, "Êèòàéñüêà (òðàäèö³éíå ïèñüìî) - ChangJie" + IDS_CHINESE_TRADITIONAL_BIG5CODE_LAYOUT, "Êèòàéñüêà (òðàäèö³éíå ïèñüìî) - Big5 Code" + IDS_CHINESE_TRADITIONAL_DAYI_LAYOUT, "Êèòàéñüêà (òðàäèö³éíå ïèñüìî) - DaYi" + IDS_CHINESE_TRADITIONAL_UNICODE_LAYOUT, "Êèòàéñüêà (òðàäèö³éíå ïèñüìî) - Þí³êîä" + IDS_CHINESE_TRADITIONAL_ALPHANUMERIC_LAYOUT, "Êèòàéñüêà (òðàäèö³éíå ïèñüìî) - àëôàâ³òíî-öèôðîâà" + IDS_CHINESE_SIMPLIFIED_USKEYBOARD_LAYOUT, "Êèòàéñüêà (ñïðîùåíå ïèñüìî) - ÑØÀ" + IDS_CHINESE_SIMPLIFIED_QUANPIN_LAYOUT, "Êèòàéñüêà (ñïðîùåíå ïèñüìî) - QuanPin" + IDS_CHINESE_SIMPLIFIED_SHUANGPIN_LAYOUT, "Êèòàéñüêà (ñïðîùåíå ïèñüìî) - ShuangPin" + IDS_CHINESE_SIMPLIFIED_ZHENGMA_LAYOUT, "Êèòàéñüêà (ñïðîùåíå ïèñüìî) - ZhengMa" + IDS_CHINESE_SIMPLIFIED_NEIMA_LAYOUT, "Êèòàéñüêà (ñïðîùåíå ïèñüìî) - NeiMa" + IDS_THAI_KEDMANEE_LAYOUT, "Òàéñüêà Êåäìàí³" + IDS_THAI_PATTACHOTE_LAYOUT, "Òàéñüêà Ïàòàøîò" + IDS_THAI_KEDMANEE_NONSHIFTLOCK_LAYOUT, "Òàéñüêà Êåäìàí³ (áåç ShiftLock)" + IDS_THAI_PATTACHOTE_NONSHIFTLOCK_LAYOUT, "Òàéñüêà Ïàòàøîò (áåç ShiftLock)" + IDS_HEBREW_LAYOUT, "²âðèò" + IDS_ARABIC_101_LAYOUT, "Àðàáñüêà (101)" + IDS_ARABIC_102_LAYOUT, "Àðàáñüêà (102)" + IDS_ARABIC_102_AZERTY_LAYOUT, "Àðàáñüêà (102) AZERTY" + IDS_CZECH_PROGRAMMERS_LAYOUT, "×åñüêà (ïðîãðàì³ñòñüêà)" + IDS_LITHUANIAN_LAYOUT, "Ëèòîâñüêà" + IDS_BELGIAN_COMMA_LAYOUT, "Áåëüã³éñüêà (ç êîìîþ)" + IDS_CHINESE_TRADITIONAL_NEWPHONETIC_LAYOUT, "Êèòàéñüêà (òðàäèö³éíå ïèñüìî) - íîâà ôîíåòè÷íà" + IDS_CHINESE_SIMPLIFIED_MSPINYINIME30_LAYOUT, "Êèòàéñüêà (ñïðîùåíå ïèñüìî) - Microsoft Pinyin IME 3.0" + IDS_UNITED_STATES_DVIRAK_LAYOUT, "ÑØÀ - Äâîðàê" + IDS_CHINESE_TRADITIONAL_NEWCHANGJIE_LAYOUT, "Êèòàéñüêà (òðàäèö³éíå ïèñüìî) - íîâà ChangJie" + IDS_ASSAMESE_LAYOUT, "Àññàìñüêà" + IDS_BENGALI_LAYOUT, "Áåíãàë³" + IDS_DEVANAGARI_INSCRIPT_LAYOUT, "Äåâàíàãàð³ (INSCRIPT)" + IDS_GUJARATI_LAYOUT, "Ãóäæàðàò³" + IDS_KANNADA_LAYOUT, "Êàííàäà" + IDS_MALAYALAM_LAYOUT, "Ìàëàÿëàì" + IDS_ORIYA_LAYOUT, "Îð³ÿ" + IDS_PUNJABI_LAYOUT, "Ïàíäæàá³" + IDS_TAMIL_LAYOUT, "Òàì³ëüñüêà" + IDS_TELUGU_LAYOUT, "Òåëóãó" + IDS_MARATHI_LAYOUT, "Ìàðàòõ³" + IDS_HINDI_TRADITIONAL_LAYOUT, "Õ³íä³ (òðàäèö³éíà)" + IDS_CANTONESE_PHONETIC_LAYOUT, "Êàíòîíñüêà (ôîíåòè÷íà)" + IDS_FAEROESE_LAYOUT, "Ôàðåðñüêà" + IDS_FYRO_MACEDONIAN_LAYOUT, "Ìàêåäîíñüêà (Ìàêåäîí³ÿ)" + IDS_CANADIAN_MULTILINGUAL_STD_LAYOUT, "Êàíàäñüêà ñòàíäàðòíà (áàãàòîìîâíà)" + IDS_CHINESE_TRADITIONAL_QUICK_LAYOUT, "Êèòàéñüêà (òðàäèö³éíå ïèñüìî) - øâèäêà" + IDS_CHINESE_TRADITIONAL_ARRAY_LAYOUT, "Êèòàéñüêà (òðàäèö³éíå ïèñüìî) - òàáëè÷íà" + IDS_KAZAKH_LAYOUT, "Êàçàõñüêà" + IDS_UZBEK_CYRILLIC_LAYOUT, "Óçáåöüêà (êèðèëèöÿ)" + IDS_AZERI_CYRILLIC_LAYOUT, "Àçåðáàéäæàíñüêà (êèðèëèöÿ)" + IDS_TATAR_LAYOUT, "Òàòàðñüêà" + IDS_AZERI_LATIN_LAYOUT, "Àçåðáàéäæàíñüêà (ëàòèíèöÿ)" + IDS_VIETNAMESE_LAYOUT, "Â'ºòíàìñüêà" + IDS_GEORGIAN_LAYOUT, "Ãðóçèíñüêà" + IDS_ARMENIAN_EASTERN_LAYOUT, "Â³ðìåíñüêà (ñõ³äíà)" + IDS_ARMENIAN_WESTERN_LAYOUT, "Â³ðìåíñüêà (çàõ³äíà)" + IDS_GREEK_POLYTONIC_LAYOUT, "Ãðåöüêà (ïîë³òîí³÷íà)" + IDS_USENG_TABLE_IBM_ARABIC238L_LAYOUT, "Àíãë³éñüêà òàáëè÷íà (ÑØÀ) äëÿ àðàáñüêî¿ (IBM, 238_L)" + IDS_FARSI_LAYOUT, "Ïåðñüêà" + IDS_GAELIC_LAYOUT, "Ãåëüñüêà" + IDS_PORTUGUESE_BRAZIL_ABNT2_LAYOUT, "Ïîðòóãàëüñüêà (Áðàçèë³ÿ ABNT2)" + IDS_MONGOLIAN_CYRILLIC_LAYOUT, "Ìîíãîëüñüêà (êèðèëèöÿ)" + IDS_KYRGYZ_CYRILLIC_LAYOUT, "Êèðãèçüêà (êèðèëèöÿ)" + IDS_URDU_LAYOUT, "Óðäó" + IDS_SYRIAC_LAYOUT, "Ñèð³éñüêà" + IDS_SYRIAC_PHONETIC_LAYOUT, "Ñèð³éñüêà (ôîíåòè÷íà)" + IDS_DIVEHI_PHONETIC_LAYOUT, "Ìàëüä³âñüêà (ôîíåòè÷íà)" + IDS_DIVEHI_TYPEWRITER_LAYOUT, "Ìàëüä³âñüêà (äðóêàðñüêà ìàøèíêà)" +END Propchange: trunk/reactos/dll/cpl/input/lang/uk-UA.rc ------------------------------------------------------------------------------ svn:eol-style = native

1 0

← Newer
1
...
30
31
32
33
34
35
36
...
59
Older →

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs September 2007