Author: dchapyshev Date: Fri Feb 8 16:07:37 2008 New Revision: 32215
URL: http://svn.reactos.org/svn/reactos?rev=32215&view=rev Log: - Start implement Advanced General page - Update Russian translation
Added: trunk/reactos/dll/cpl/desk/general.c (with props) Modified: trunk/reactos/dll/cpl/desk/advmon.c trunk/reactos/dll/cpl/desk/desk.h trunk/reactos/dll/cpl/desk/desk.rbuild trunk/reactos/dll/cpl/desk/lang/bg-BG.rc trunk/reactos/dll/cpl/desk/lang/cs-CZ.rc trunk/reactos/dll/cpl/desk/lang/de-DE.rc trunk/reactos/dll/cpl/desk/lang/el-GR.rc trunk/reactos/dll/cpl/desk/lang/en-US.rc trunk/reactos/dll/cpl/desk/lang/es-ES.rc trunk/reactos/dll/cpl/desk/lang/fr-FR.rc trunk/reactos/dll/cpl/desk/lang/hu-HU.rc trunk/reactos/dll/cpl/desk/lang/id-ID.rc trunk/reactos/dll/cpl/desk/lang/it-IT.rc trunk/reactos/dll/cpl/desk/lang/ja-JP.rc trunk/reactos/dll/cpl/desk/lang/nl-NL.rc trunk/reactos/dll/cpl/desk/lang/pl-PL.rc trunk/reactos/dll/cpl/desk/lang/ru-RU.rc trunk/reactos/dll/cpl/desk/lang/sk-SK.rc trunk/reactos/dll/cpl/desk/lang/sv-SE.rc trunk/reactos/dll/cpl/desk/lang/uk-UA.rc trunk/reactos/dll/cpl/desk/resource.h
Modified: trunk/reactos/dll/cpl/desk/advmon.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/advmon.c?rev=3... ============================================================================== --- trunk/reactos/dll/cpl/desk/advmon.c (original) +++ trunk/reactos/dll/cpl/desk/advmon.c Fri Feb 8 16:07:37 2008 @@ -46,31 +46,6 @@ }
return FALSE; -} - -static INT_PTR CALLBACK -AdvGeneralPageProc(HWND hwndDlg, - UINT uMsg, - WPARAM wParam, - LPARAM lParam) -{ - PDISPLAY_DEVICE_ENTRY DispDevice = NULL; - INT_PTR Ret = 0; - - if (uMsg != WM_INITDIALOG) - DispDevice = (PDISPLAY_DEVICE_ENTRY)GetWindowLongPtr(hwndDlg, DWLP_USER); - - switch (uMsg) - { - case WM_INITDIALOG: - DispDevice = (PDISPLAY_DEVICE_ENTRY)(((LPPROPSHEETPAGE)lParam)->lParam); - SetWindowLongPtr(hwndDlg, DWLP_USER, (LONG_PTR)DispDevice); - - Ret = TRUE; - break; - } - - return Ret; }
static VOID
Modified: trunk/reactos/dll/cpl/desk/desk.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/desk.h?rev=322... ============================================================================== --- trunk/reactos/dll/cpl/desk/desk.h (original) +++ trunk/reactos/dll/cpl/desk/desk.h Fri Feb 8 16:07:37 2008 @@ -93,5 +93,8 @@
HPSXA WINAPI SHCreatePropSheetExtArrayEx(HKEY,LPCWSTR,UINT,IDataObject*);
+INT_PTR CALLBACK +AdvGeneralPageProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam); + #endif /* __CPL_DESK_H__ */
Modified: trunk/reactos/dll/cpl/desk/desk.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/desk.rbuild?re... ============================================================================== --- trunk/reactos/dll/cpl/desk/desk.rbuild (original) +++ trunk/reactos/dll/cpl/desk/desk.rbuild Fri Feb 8 16:07:37 2008 @@ -33,5 +33,6 @@ <file>advappdlg.c</file> <file>settings.c</file> <file>monslctl.c</file> + <file>general.c</file> <file>desk.rc</file> </module>
Added: trunk/reactos/dll/cpl/desk/general.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/general.c?rev=... ============================================================================== --- trunk/reactos/dll/cpl/desk/general.c (added) +++ trunk/reactos/dll/cpl/desk/general.c Fri Feb 8 16:07:37 2008 @@ -1,0 +1,140 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS Display Control Panel + * FILE: dll/cpl/desk/general.c + * PURPOSE: Advanced General settings + */ + +#include "desk.h" + +static VOID +InitFontSizeList(HWND hWnd) +{ + HINF hInf; + HKEY hKey; + HWND hFontSize; + INFCONTEXT Context; + int i, ci = 0; + + hFontSize = GetDlgItem(hWnd, IDC_FONTSIZE_COMBO); + + hInf = SetupOpenInfFile(L"font.inf", NULL, + INF_STYLE_WIN4, NULL); + + if (hInf != INVALID_HANDLE_VALUE) + { + if (SetupFindFirstLine(hInf, L"Font Sizes", NULL, &Context)) + { + if (RegOpenKeyEx(HKEY_LOCAL_MACHINE, L"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontDPI", + 0, KEY_READ, &hKey) == ERROR_SUCCESS) + for (;;) + { + TCHAR Desc[LINE_LEN]; + + if (SetupGetStringField(&Context, 0, Desc, sizeof(Desc), NULL) && + SetupGetIntField(&Context, 1, &ci)) + { + _stprintf(Desc, L"%s (%d DPI)", Desc, ci); + i = SendMessage(hFontSize, CB_ADDSTRING, 0, (LPARAM)Desc); + if (i != CB_ERR) + SendMessage(hFontSize, CB_SETITEMDATA, (WPARAM)i, (LPARAM)ci); + + DWORD dwSize = MAX_PATH, dwValue, dwType = REG_DWORD; + + if (RegQueryValueEx(hKey, L"LogPixels", NULL, + &dwType, (LPBYTE)&dwValue, &dwSize) == ERROR_SUCCESS) + { + if ((int)dwValue == ci) + { + SendMessage(hFontSize, CB_SETCURSEL, (WPARAM)i, 0); + SetWindowText(GetDlgItem(hWnd, IDC_FONTSIZE_COSTOM), Desc); + } + } + } + + if (!SetupFindNextLine(&Context, &Context)) + { + RegCloseKey(hKey); + break; + } + } + } + } + + SetupCloseInfFile(hInf); +} + +static VOID +InitRadioButtons(HWND hWnd) +{ + HKEY hKey; + + if (RegOpenKeyEx(HKEY_CURRENT_USER, L"SOFTWARE\Microsoft\Windows\CurrentVersion\Controls Folder\Display", + 0, KEY_READ, &hKey) == ERROR_SUCCESS) + { + TCHAR szBuf[64]; + DWORD dwSize = 64; + + if (RegQueryValueEx(hKey, L"DynaSettingsChange", 0, NULL, + (LPBYTE)szBuf, &dwSize) == ERROR_SUCCESS); + + switch (_ttoi(szBuf)) + { + case 0: + SendDlgItemMessage(hWnd, IDC_RESTART_RB, BM_SETCHECK, 1, 1); + break; + case 1: + SendDlgItemMessage(hWnd, IDC_WITHOUTREBOOT_RB, BM_SETCHECK, 1, 1); + break; + case 3: + SendDlgItemMessage(hWnd, IDC_ASKME_RB, BM_SETCHECK, 1, 1); + break; + } + + RegCloseKey(hKey); + } +} + +INT_PTR CALLBACK +AdvGeneralPageProc(HWND hwndDlg, + UINT uMsg, + WPARAM wParam, + LPARAM lParam) +{ + PDISPLAY_DEVICE_ENTRY DispDevice = NULL; + INT_PTR Ret = 0; + + if (uMsg != WM_INITDIALOG) + DispDevice = (PDISPLAY_DEVICE_ENTRY)GetWindowLongPtr(hwndDlg, DWLP_USER); + + switch (uMsg) + { + case WM_INITDIALOG: + DispDevice = (PDISPLAY_DEVICE_ENTRY)(((LPPROPSHEETPAGE)lParam)->lParam); + SetWindowLongPtr(hwndDlg, DWLP_USER, (LONG_PTR)DispDevice); + + InitFontSizeList(hwndDlg); + InitRadioButtons(hwndDlg); + + Ret = TRUE; + break; + case WM_COMMAND: + switch (LOWORD(wParam)) + { + case IDC_FONTSIZE_COMBO: + if (HIWORD(wParam) == CBN_SELCHANGE) + { + PropSheet_Changed(GetParent(hwndDlg), hwndDlg); + } + break; + case IDC_RESTART_RB: + case IDC_WITHOUTREBOOT_RB: + case IDC_ASKME_RB: + PropSheet_Changed(GetParent(hwndDlg), hwndDlg); + break; + } + break; + } + + return Ret; +}
Propchange: trunk/reactos/dll/cpl/desk/general.c ------------------------------------------------------------------------------ svn:eol-style = native
Modified: trunk/reactos/dll/cpl/desk/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/bg-BG.rc?... ============================================================================== --- trunk/reactos/dll/cpl/desk/lang/bg-BG.rc (original) +++ trunk/reactos/dll/cpl/desk/lang/bg-BG.rc Fri Feb 8 16:07:37 2008 @@ -120,11 +120,20 @@ PUSHBUTTON "Ðàç&øèðåíè...",IDC_SETTINGS_ADVANCED,306,165,56,14 END
-IDD_ADVANCED_GENERAL DIALOGEX DISCARDABLE 0, 0, 246, 204 -STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Îáùè" -FONT 8, "MS Shell Dlg" -BEGIN +IDD_ADVANCED_GENERAL DIALOGEX DISCARDABLE 0, 0, 253, 204 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "General" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "Display", -1, 7, 6, 237, 56, WS_GROUP + LTEXT "Font Size:", -1, 14, 20, 222, 8 + COMBOBOX IDC_FONTSIZE_COMBO, 14, 30, 223, 80, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + LTEXT "", IDC_FONTSIZE_COSTOM, 14, 46, 223, 12 + GROUPBOX "Compatibility", -1, 7, 67, 237, 97 + LTEXT "Some programs operate improperly if you do not restart your computer after you change color settings.\r\n\nAfter I change color settings:", -1, 12, 78, 228, 34 + AUTORADIOBUTTON "&Restart the computer before applying the new color settings.", IDC_RESTART_RB, 14, 116, 224, 10 + AUTORADIOBUTTON "Apply the new color settings without restarting.", IDC_WITHOUTREBOOT_RB, 14, 131, 224, 10 + AUTORADIOBUTTON "Ask me before applying the new color settings.", IDC_ASKME_RB, 14, 146, 224, 10 END
IDR_PREVIEW_MENU MENU
Modified: trunk/reactos/dll/cpl/desk/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/cs-CZ.rc?... ============================================================================== --- trunk/reactos/dll/cpl/desk/lang/cs-CZ.rc (original) +++ trunk/reactos/dll/cpl/desk/lang/cs-CZ.rc Fri Feb 8 16:07:37 2008 @@ -117,11 +117,20 @@ PUSHBUTTON "R&ozíøené nastavení...",IDC_SETTINGS_ADVANCED,170,165,70,14 END
-IDD_ADVANCED_GENERAL DIALOGEX DISCARDABLE 0, 0, 246, 204 +IDD_ADVANCED_GENERAL DIALOGEX DISCARDABLE 0, 0, 253, 204 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "General" FONT 8, "MS Shell Dlg" BEGIN + GROUPBOX "Display", -1, 7, 6, 237, 56, WS_GROUP + LTEXT "Font Size:", -1, 14, 20, 222, 8 + COMBOBOX IDC_FONTSIZE_COMBO, 14, 30, 223, 80, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + LTEXT "", IDC_FONTSIZE_COSTOM, 14, 46, 223, 12 + GROUPBOX "Compatibility", -1, 7, 67, 237, 97 + LTEXT "Some programs operate improperly if you do not restart your computer after you change color settings.\r\n\nAfter I change color settings:", -1, 12, 78, 228, 34 + AUTORADIOBUTTON "&Restart the computer before applying the new color settings.", IDC_RESTART_RB, 14, 116, 224, 10 + AUTORADIOBUTTON "Apply the new color settings without restarting.", IDC_WITHOUTREBOOT_RB, 14, 131, 224, 10 + AUTORADIOBUTTON "Ask me before applying the new color settings.", IDC_ASKME_RB, 14, 146, 224, 10 END
IDR_PREVIEW_MENU MENU
Modified: trunk/reactos/dll/cpl/desk/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/de-DE.rc?... ============================================================================== --- trunk/reactos/dll/cpl/desk/lang/de-DE.rc (original) +++ trunk/reactos/dll/cpl/desk/lang/de-DE.rc Fri Feb 8 16:07:37 2008 @@ -116,11 +116,20 @@ PUSHBUTTON "&Erweitert",IDC_SETTINGS_ADVANCED,170,165,70,14 END
-IDD_ADVANCED_GENERAL DIALOGEX DISCARDABLE 0, 0, 246, 204 -STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Allgemein" -FONT 8, "MS Shell Dlg" -BEGIN +IDD_ADVANCED_GENERAL DIALOGEX DISCARDABLE 0, 0, 253, 204 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "General" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "Display", -1, 7, 6, 237, 56, WS_GROUP + LTEXT "Font Size:", -1, 14, 20, 222, 8 + COMBOBOX IDC_FONTSIZE_COMBO, 14, 30, 223, 80, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + LTEXT "", IDC_FONTSIZE_COSTOM, 14, 46, 223, 12 + GROUPBOX "Compatibility", -1, 7, 67, 237, 97 + LTEXT "Some programs operate improperly if you do not restart your computer after you change color settings.\r\n\nAfter I change color settings:", -1, 12, 78, 228, 34 + AUTORADIOBUTTON "&Restart the computer before applying the new color settings.", IDC_RESTART_RB, 14, 116, 224, 10 + AUTORADIOBUTTON "Apply the new color settings without restarting.", IDC_WITHOUTREBOOT_RB, 14, 131, 224, 10 + AUTORADIOBUTTON "Ask me before applying the new color settings.", IDC_ASKME_RB, 14, 146, 224, 10 END
IDR_PREVIEW_MENU MENU
Modified: trunk/reactos/dll/cpl/desk/lang/el-GR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/el-GR.rc?... ============================================================================== --- trunk/reactos/dll/cpl/desk/lang/el-GR.rc (original) +++ trunk/reactos/dll/cpl/desk/lang/el-GR.rc Fri Feb 8 16:07:37 2008 @@ -116,11 +116,20 @@ PUSHBUTTON "Ãéá &ðñï÷ùñçìÝíïõò...",IDC_SETTINGS_ADVANCED,166,173,74,14 END
-IDD_ADVANCED_GENERAL DIALOGEX DISCARDABLE 0, 0, 246, 204 -STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "ÃåíéêÜ" -FONT 8, "MS Shell Dlg" -BEGIN +IDD_ADVANCED_GENERAL DIALOGEX DISCARDABLE 0, 0, 253, 204 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "General" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "Display", -1, 7, 6, 237, 56, WS_GROUP + LTEXT "Font Size:", -1, 14, 20, 222, 8 + COMBOBOX IDC_FONTSIZE_COMBO, 14, 30, 223, 80, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + LTEXT "", IDC_FONTSIZE_COSTOM, 14, 46, 223, 12 + GROUPBOX "Compatibility", -1, 7, 67, 237, 97 + LTEXT "Some programs operate improperly if you do not restart your computer after you change color settings.\r\n\nAfter I change color settings:", -1, 12, 78, 228, 34 + AUTORADIOBUTTON "&Restart the computer before applying the new color settings.", IDC_RESTART_RB, 14, 116, 224, 10 + AUTORADIOBUTTON "Apply the new color settings without restarting.", IDC_WITHOUTREBOOT_RB, 14, 131, 224, 10 + AUTORADIOBUTTON "Ask me before applying the new color settings.", IDC_ASKME_RB, 14, 146, 224, 10 END
IDR_PREVIEW_MENU MENU
Modified: trunk/reactos/dll/cpl/desk/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/en-US.rc?... ============================================================================== --- trunk/reactos/dll/cpl/desk/lang/en-US.rc (original) +++ trunk/reactos/dll/cpl/desk/lang/en-US.rc Fri Feb 8 16:07:37 2008 @@ -118,11 +118,20 @@ PUSHBUTTON "Ad&vanced...",IDC_SETTINGS_ADVANCED,170,165,70,14 END
-IDD_ADVANCED_GENERAL DIALOGEX DISCARDABLE 0, 0, 246, 204 +IDD_ADVANCED_GENERAL DIALOGEX DISCARDABLE 0, 0, 253, 204 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "General" FONT 8, "MS Shell Dlg" BEGIN + GROUPBOX "Display", -1, 7, 6, 237, 56, WS_GROUP + LTEXT "Font Size:", -1, 14, 20, 222, 8 + COMBOBOX IDC_FONTSIZE_COMBO, 14, 30, 223, 80, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + LTEXT "", IDC_FONTSIZE_COSTOM, 14, 46, 223, 12 + GROUPBOX "Compatibility", -1, 7, 67, 237, 97 + LTEXT "Some programs operate improperly if you do not restart your computer after you change color settings.\r\n\nAfter I change color settings:", -1, 12, 78, 228, 34 + AUTORADIOBUTTON "&Restart the computer before applying the new color settings.", IDC_RESTART_RB, 14, 116, 224, 10 + AUTORADIOBUTTON "Apply the new color settings without restarting.", IDC_WITHOUTREBOOT_RB, 14, 131, 224, 10 + AUTORADIOBUTTON "Ask me before applying the new color settings.", IDC_ASKME_RB, 14, 146, 224, 10 END
IDR_PREVIEW_MENU MENU
Modified: trunk/reactos/dll/cpl/desk/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/es-ES.rc?... ============================================================================== --- trunk/reactos/dll/cpl/desk/lang/es-ES.rc (original) +++ trunk/reactos/dll/cpl/desk/lang/es-ES.rc Fri Feb 8 16:07:37 2008 @@ -124,11 +124,20 @@ PUSHBUTTON "A&vanzado...",IDC_SETTINGS_ADVANCED,170,165,70,14 END
-IDD_ADVANCED_GENERAL DIALOGEX DISCARDABLE 0, 0, 246, 204 +IDD_ADVANCED_GENERAL DIALOGEX DISCARDABLE 0, 0, 253, 204 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "General" FONT 8, "MS Shell Dlg" BEGIN + GROUPBOX "Display", -1, 7, 6, 237, 56, WS_GROUP + LTEXT "Font Size:", -1, 14, 20, 222, 8 + COMBOBOX IDC_FONTSIZE_COMBO, 14, 30, 223, 80, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + LTEXT "", IDC_FONTSIZE_COSTOM, 14, 46, 223, 12 + GROUPBOX "Compatibility", -1, 7, 67, 237, 97 + LTEXT "Some programs operate improperly if you do not restart your computer after you change color settings.\r\n\nAfter I change color settings:", -1, 12, 78, 228, 34 + AUTORADIOBUTTON "&Restart the computer before applying the new color settings.", IDC_RESTART_RB, 14, 116, 224, 10 + AUTORADIOBUTTON "Apply the new color settings without restarting.", IDC_WITHOUTREBOOT_RB, 14, 131, 224, 10 + AUTORADIOBUTTON "Ask me before applying the new color settings.", IDC_ASKME_RB, 14, 146, 224, 10 END
IDR_PREVIEW_MENU MENU
Modified: trunk/reactos/dll/cpl/desk/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/fr-FR.rc?... ============================================================================== --- trunk/reactos/dll/cpl/desk/lang/fr-FR.rc (original) +++ trunk/reactos/dll/cpl/desk/lang/fr-FR.rc Fri Feb 8 16:07:37 2008 @@ -119,11 +119,20 @@ PUSHBUTTON "A&vancé...",IDC_SETTINGS_ADVANCED,170,165,70,14 END
-IDD_ADVANCED_GENERAL DIALOGEX DISCARDABLE 0, 0, 246, 204 -STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Général" -FONT 8, "MS Shell Dlg" -BEGIN +IDD_ADVANCED_GENERAL DIALOGEX DISCARDABLE 0, 0, 253, 204 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "General" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "Display", -1, 7, 6, 237, 56, WS_GROUP + LTEXT "Font Size:", -1, 14, 20, 222, 8 + COMBOBOX IDC_FONTSIZE_COMBO, 14, 30, 223, 80, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + LTEXT "", IDC_FONTSIZE_COSTOM, 14, 46, 223, 12 + GROUPBOX "Compatibility", -1, 7, 67, 237, 97 + LTEXT "Some programs operate improperly if you do not restart your computer after you change color settings.\r\n\nAfter I change color settings:", -1, 12, 78, 228, 34 + AUTORADIOBUTTON "&Restart the computer before applying the new color settings.", IDC_RESTART_RB, 14, 116, 224, 10 + AUTORADIOBUTTON "Apply the new color settings without restarting.", IDC_WITHOUTREBOOT_RB, 14, 131, 224, 10 + AUTORADIOBUTTON "Ask me before applying the new color settings.", IDC_ASKME_RB, 14, 146, 224, 10 END
IDR_PREVIEW_MENU MENU
Modified: trunk/reactos/dll/cpl/desk/lang/hu-HU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/hu-HU.rc?... ============================================================================== --- trunk/reactos/dll/cpl/desk/lang/hu-HU.rc (original) +++ trunk/reactos/dll/cpl/desk/lang/hu-HU.rc Fri Feb 8 16:07:37 2008 @@ -117,11 +117,20 @@ PUSHBUTTON "&Haladóknak...",IDC_SETTINGS_ADVANCED,170,165,70,14 END
-IDD_ADVANCED_GENERAL DIALOGEX DISCARDABLE 0, 0, 246, 204 +IDD_ADVANCED_GENERAL DIALOGEX DISCARDABLE 0, 0, 253, 204 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "General" FONT 8, "MS Shell Dlg" BEGIN + GROUPBOX "Display", -1, 7, 6, 237, 56, WS_GROUP + LTEXT "Font Size:", -1, 14, 20, 222, 8 + COMBOBOX IDC_FONTSIZE_COMBO, 14, 30, 223, 80, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + LTEXT "", IDC_FONTSIZE_COSTOM, 14, 46, 223, 12 + GROUPBOX "Compatibility", -1, 7, 67, 237, 97 + LTEXT "Some programs operate improperly if you do not restart your computer after you change color settings.\r\n\nAfter I change color settings:", -1, 12, 78, 228, 34 + AUTORADIOBUTTON "&Restart the computer before applying the new color settings.", IDC_RESTART_RB, 14, 116, 224, 10 + AUTORADIOBUTTON "Apply the new color settings without restarting.", IDC_WITHOUTREBOOT_RB, 14, 131, 224, 10 + AUTORADIOBUTTON "Ask me before applying the new color settings.", IDC_ASKME_RB, 14, 146, 224, 10 END
IDR_PREVIEW_MENU MENU
Modified: trunk/reactos/dll/cpl/desk/lang/id-ID.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/id-ID.rc?... ============================================================================== --- trunk/reactos/dll/cpl/desk/lang/id-ID.rc (original) +++ trunk/reactos/dll/cpl/desk/lang/id-ID.rc Fri Feb 8 16:07:37 2008 @@ -116,11 +116,20 @@ PUSHBUTTON "&Lanjutan...",IDC_SETTINGS_ADVANCED,170,165,70,14 END
-IDD_ADVANCED_GENERAL DIALOGEX DISCARDABLE 0, 0, 246, 204 +IDD_ADVANCED_GENERAL DIALOGEX DISCARDABLE 0, 0, 253, 204 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "General" FONT 8, "MS Shell Dlg" BEGIN + GROUPBOX "Display", -1, 7, 6, 237, 56, WS_GROUP + LTEXT "Font Size:", -1, 14, 20, 222, 8 + COMBOBOX IDC_FONTSIZE_COMBO, 14, 30, 223, 80, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + LTEXT "", IDC_FONTSIZE_COSTOM, 14, 46, 223, 12 + GROUPBOX "Compatibility", -1, 7, 67, 237, 97 + LTEXT "Some programs operate improperly if you do not restart your computer after you change color settings.\r\n\nAfter I change color settings:", -1, 12, 78, 228, 34 + AUTORADIOBUTTON "&Restart the computer before applying the new color settings.", IDC_RESTART_RB, 14, 116, 224, 10 + AUTORADIOBUTTON "Apply the new color settings without restarting.", IDC_WITHOUTREBOOT_RB, 14, 131, 224, 10 + AUTORADIOBUTTON "Ask me before applying the new color settings.", IDC_ASKME_RB, 14, 146, 224, 10 END
IDR_PREVIEW_MENU MENU
Modified: trunk/reactos/dll/cpl/desk/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/it-IT.rc?... ============================================================================== --- trunk/reactos/dll/cpl/desk/lang/it-IT.rc (original) +++ trunk/reactos/dll/cpl/desk/lang/it-IT.rc Fri Feb 8 16:07:37 2008 @@ -116,11 +116,20 @@ PUSHBUTTON "A&vanzate...",IDC_SETTINGS_ADVANCED,170,165,70,14 END
-IDD_ADVANCED_GENERAL DIALOGEX DISCARDABLE 0, 0, 246, 204 -STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Generale" -FONT 8, "MS Shell Dlg" -BEGIN +IDD_ADVANCED_GENERAL DIALOGEX DISCARDABLE 0, 0, 253, 204 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "General" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "Display", -1, 7, 6, 237, 56, WS_GROUP + LTEXT "Font Size:", -1, 14, 20, 222, 8 + COMBOBOX IDC_FONTSIZE_COMBO, 14, 30, 223, 80, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + LTEXT "", IDC_FONTSIZE_COSTOM, 14, 46, 223, 12 + GROUPBOX "Compatibility", -1, 7, 67, 237, 97 + LTEXT "Some programs operate improperly if you do not restart your computer after you change color settings.\r\n\nAfter I change color settings:", -1, 12, 78, 228, 34 + AUTORADIOBUTTON "&Restart the computer before applying the new color settings.", IDC_RESTART_RB, 14, 116, 224, 10 + AUTORADIOBUTTON "Apply the new color settings without restarting.", IDC_WITHOUTREBOOT_RB, 14, 131, 224, 10 + AUTORADIOBUTTON "Ask me before applying the new color settings.", IDC_ASKME_RB, 14, 146, 224, 10 END
IDR_PREVIEW_MENU MENU
Modified: trunk/reactos/dll/cpl/desk/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/ja-JP.rc?... ============================================================================== --- trunk/reactos/dll/cpl/desk/lang/ja-JP.rc (original) +++ trunk/reactos/dll/cpl/desk/lang/ja-JP.rc Fri Feb 8 16:07:37 2008 @@ -116,11 +116,20 @@ PUSHBUTTON "Ú×Ýè(&V)...",IDC_SETTINGS_ADVANCED,170,205,70,14 END
-IDD_ADVANCED_GENERAL DIALOGEX DISCARDABLE 0, 0, 246, 204 +IDD_ADVANCED_GENERAL DIALOGEX DISCARDABLE 0, 0, 253, 204 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "General" -FONT 9, "MS UI Gothic" -BEGIN +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "Display", -1, 7, 6, 237, 56, WS_GROUP + LTEXT "Font Size:", -1, 14, 20, 222, 8 + COMBOBOX IDC_FONTSIZE_COMBO, 14, 30, 223, 80, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + LTEXT "", IDC_FONTSIZE_COSTOM, 14, 46, 223, 12 + GROUPBOX "Compatibility", -1, 7, 67, 237, 97 + LTEXT "Some programs operate improperly if you do not restart your computer after you change color settings.\r\n\nAfter I change color settings:", -1, 12, 78, 228, 34 + AUTORADIOBUTTON "&Restart the computer before applying the new color settings.", IDC_RESTART_RB, 14, 116, 224, 10 + AUTORADIOBUTTON "Apply the new color settings without restarting.", IDC_WITHOUTREBOOT_RB, 14, 131, 224, 10 + AUTORADIOBUTTON "Ask me before applying the new color settings.", IDC_ASKME_RB, 14, 146, 224, 10 END
IDR_PREVIEW_MENU MENU
Modified: trunk/reactos/dll/cpl/desk/lang/nl-NL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/nl-NL.rc?... ============================================================================== --- trunk/reactos/dll/cpl/desk/lang/nl-NL.rc (original) +++ trunk/reactos/dll/cpl/desk/lang/nl-NL.rc Fri Feb 8 16:07:37 2008 @@ -118,11 +118,20 @@ PUSHBUTTON "&Geavanceerd...",IDC_SETTINGS_ADVANCED,170,165,70,14 END
-IDD_ADVANCED_GENERAL DIALOGEX DISCARDABLE 0, 0, 246, 204 +IDD_ADVANCED_GENERAL DIALOGEX DISCARDABLE 0, 0, 253, 204 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "General" FONT 8, "MS Shell Dlg" BEGIN + GROUPBOX "Display", -1, 7, 6, 237, 56, WS_GROUP + LTEXT "Font Size:", -1, 14, 20, 222, 8 + COMBOBOX IDC_FONTSIZE_COMBO, 14, 30, 223, 80, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + LTEXT "", IDC_FONTSIZE_COSTOM, 14, 46, 223, 12 + GROUPBOX "Compatibility", -1, 7, 67, 237, 97 + LTEXT "Some programs operate improperly if you do not restart your computer after you change color settings.\r\n\nAfter I change color settings:", -1, 12, 78, 228, 34 + AUTORADIOBUTTON "&Restart the computer before applying the new color settings.", IDC_RESTART_RB, 14, 116, 224, 10 + AUTORADIOBUTTON "Apply the new color settings without restarting.", IDC_WITHOUTREBOOT_RB, 14, 131, 224, 10 + AUTORADIOBUTTON "Ask me before applying the new color settings.", IDC_ASKME_RB, 14, 146, 224, 10 END
IDR_PREVIEW_MENU MENU
Modified: trunk/reactos/dll/cpl/desk/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/pl-PL.rc?... ============================================================================== --- trunk/reactos/dll/cpl/desk/lang/pl-PL.rc (original) +++ trunk/reactos/dll/cpl/desk/lang/pl-PL.rc Fri Feb 8 16:07:37 2008 @@ -126,11 +126,20 @@ PUSHBUTTON "Zaawa&nsowane...",IDC_SETTINGS_ADVANCED,170,165,70,14 END
-IDD_ADVANCED_GENERAL DIALOGEX DISCARDABLE 0, 0, 246, 204 -STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Ogólne" -FONT 8, "MS Shell Dlg" -BEGIN +IDD_ADVANCED_GENERAL DIALOGEX DISCARDABLE 0, 0, 253, 204 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "General" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "Display", -1, 7, 6, 237, 56, WS_GROUP + LTEXT "Font Size:", -1, 14, 20, 222, 8 + COMBOBOX IDC_FONTSIZE_COMBO, 14, 30, 223, 80, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + LTEXT "", IDC_FONTSIZE_COSTOM, 14, 46, 223, 12 + GROUPBOX "Compatibility", -1, 7, 67, 237, 97 + LTEXT "Some programs operate improperly if you do not restart your computer after you change color settings.\r\n\nAfter I change color settings:", -1, 12, 78, 228, 34 + AUTORADIOBUTTON "&Restart the computer before applying the new color settings.", IDC_RESTART_RB, 14, 116, 224, 10 + AUTORADIOBUTTON "Apply the new color settings without restarting.", IDC_WITHOUTREBOOT_RB, 14, 131, 224, 10 + AUTORADIOBUTTON "Ask me before applying the new color settings.", IDC_ASKME_RB, 14, 146, 224, 10 END
IDR_PREVIEW_MENU MENU
Modified: trunk/reactos/dll/cpl/desk/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/ru-RU.rc?... ============================================================================== --- trunk/reactos/dll/cpl/desk/lang/ru-RU.rc (original) +++ trunk/reactos/dll/cpl/desk/lang/ru-RU.rc Fri Feb 8 16:07:37 2008 @@ -28,20 +28,20 @@ 70, 10, 105, 70, WS_EX_STATICEDGE GROUPBOX "&Çàñòàâêà",IDC_SCREENS_DUMMY, 7, 92, 231, 52 COMBOBOX IDC_SCREENS_LIST, 14, 104, 100, 100, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP - PUSHBUTTON "&Ïàðàìåòðû",IDC_SCREENS_SETTINGS, 120, 103, 50, 13, WS_GROUP - PUSHBUTTON "Ï&ðîñìîòð",IDC_SCREENS_TESTSC, 175, 103, 50, 13 - LTEXT "È&íòåðâàë:",IDC_WAITTEXT, 14, 125, 36, 9 + PUSHBUTTON "&Ïàðàìåòðû",IDC_SCREENS_SETTINGS, 120, 104, 50, 14, WS_GROUP + PUSHBUTTON "Ï&ðîñìîòð",IDC_SCREENS_TESTSC, 175, 104, 50, 14 + LTEXT "È&íòåðâàë:",IDC_WAITTEXT, 14, 124, 40, 10 EDITTEXT IDC_SCREENS_TIMEDELAY, 55, 121, 32, 13, ES_RIGHT | WS_GROUP CONTROL "",IDC_SCREENS_TIME ,UPDOWN_CLASS,UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_BORDER | WS_GROUP, 54, 123, 12, 13 - LTEXT "ìèí.", IDC_MINTEXT, 90, 125, 20, 9 + LTEXT "ìèí.", IDC_MINTEXT, 90, 124, 19, 10 CONTROL "Íà&÷èíàòü ñ ýêðàíà ïðèâåòñòâèÿ",IDC_SCREENS_USEPASSCHK,"button", - BS_AUTOCHECKBOX | WS_TABSTOP, 109, 118, 122, 23 - GROUPBOX "&Ýíåðãîñáåðåæåíèå", IDC_SCREENS_DUMMY2, 6, 155, 232, 41 + BS_AUTOCHECKBOX | WS_TABSTOP, 110, 124, 124, 12 + GROUPBOX "&Ýíåðãîñáåðåæåíèå", IDC_SCREENS_DUMMY2, 6, 155, 232, 37 LTEXT "Äëÿ èçìåíåíèÿ ïàðàìåòðîâ ïèòàíèÿ ìîíèòîðà íàæìèòå êíîïêó ""Ïèòàíèå"".", IDC_STATIC, 14, 166, 146 ,20 - PUSHBUTTON "Ï&èòàíèå...", IDC_SCREENS_POWER_BUTTON, 176, 171, 50, 13 + PUSHBUTTON "Ï&èòàíèå...", IDC_SCREENS_POWER_BUTTON, 171, 168, 55, 14 END
IDD_APPEARANCE DIALOGEX DISCARDABLE 0, 0, 246, 228 @@ -51,9 +51,9 @@ BEGIN CONTROL "", IDC_APPEARANCE_PREVIEW, "PreviewWndClass", WS_VISIBLE | WS_BORDER, 7, 7, 232, 120 - LTEXT "Öâåòîâàÿ ñõåìà", IDC_STATIC, 7, 140, 64, 7 - COMBOBOX IDC_APPEARANCE_COLORSCHEME, 7, 150, 134, 90 , CBS_DROPDOWNLIST | CBS_HASSTRINGS | CBS_SORT | WS_VSCROLL | WS_TABSTOP - PUSHBUTTON "Äîïîëíèòåëüíî", IDC_APPEARANCE_ADVANCED, 178, 150, 60, 15 + LTEXT "Öâåòîâàÿ ñõåìà:", IDC_STATIC, 7, 139, 154, 10 + COMBOBOX IDC_APPEARANCE_COLORSCHEME, 7, 150, 155, 90 , CBS_DROPDOWNLIST | CBS_HASSTRINGS | CBS_SORT | WS_VSCROLL | WS_TABSTOP + PUSHBUTTON "Äîïîëíèòåëüíî", IDC_APPEARANCE_ADVANCED, 168, 150, 70, 14 END
IDD_ADVAPPEARANCE DIALOGEX DISCARDABLE 0, 0, 250, 239 @@ -94,33 +94,42 @@ DEFPUSHBUTTON "OK", IDOK, 137, 220, 50, 14 END
-IDD_SETTINGS DIALOGEX DISCARDABLE 0, 0, 246, 188 +IDD_SETTINGS DIALOGEX DISCARDABLE 0, 0, 249, 197 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Ïàðàìåòðû" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Drag the monitor icons to match the physical arrangement of your monitors.",-1,3,3,240,10 - CONTROL "",IDC_SETTINGS_MONSEL,"MONITORSELWNDCLASS",WS_CHILD|WS_VISIBLE|WS_TABSTOP,3,16,240,82,WS_EX_CLIENTEDGE - LTEXT "&Äèñïëåé:",1820,3,100,30,8 - LTEXT "<íåò>",IDC_SETTINGS_DEVICE,9,109,224,8 - GROUPBOX "&Ðàçðåøåíèå ýêðàíà",1818,3,120,119,43 + LTEXT "Ðàçìåñòèòå çíà÷êè ìîíèòîðîâ â ñîîòâåòñòâèè ñ èõ ðàñïîëîæåíèåì.",-1,3,7,244,17 + CONTROL "",IDC_SETTINGS_MONSEL,"MONITORSELWNDCLASS",WS_CHILD|WS_VISIBLE|WS_TABSTOP,3,21,240,82,WS_EX_CLIENTEDGE + LTEXT "&Äèñïëåé:",1820,3,105,40,8 + LTEXT "<íåò>",IDC_SETTINGS_DEVICE,9,115,224,8 + GROUPBOX "&Ðàçðåøåíèå ýêðàíà",1818,3,129,119,46 CONTROL "",IDC_SETTINGS_RESOLUTION,"msctls_trackbar32", - TBS_AUTOTICKS | WS_TABSTOP,33,130,58,17 - LTEXT "Ìåíüøå",1815,6,130,29,8,NOT WS_GROUP - LTEXT "Áîëüøå",1816,91,130,27,8,NOT WS_GROUP - LTEXT "",IDC_SETTINGS_RESOLUTION_TEXT,10,150,100,10,NOT WS_GROUP | SS_CENTER - GROUPBOX "&Êà÷åñòâî öâåòîïåðåäà÷è",1817,125,120,115,43 - COMBOBOX IDC_SETTINGS_BPP,131,130,103,80,CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | + TBS_AUTOTICKS | WS_TABSTOP,33,141,58,17 + LTEXT "ìåí.",1815,12,146,21,8,NOT WS_GROUP + LTEXT "áîë.",1816,94,146,21,8,NOT WS_GROUP + LTEXT "",IDC_SETTINGS_RESOLUTION_TEXT,10,161,105,10,NOT WS_GROUP | SS_CENTER + GROUPBOX "&Êà÷åñòâî öâåòîïåðåäà÷è",1817,129,129,115,46 + COMBOBOX IDC_SETTINGS_BPP,135,141,103,80,CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP - CONTROL "",IDC_SETTINGS_SPECTRUM,"Static",SS_OWNERDRAW | SS_SUNKEN,131,148,103,9 - PUSHBUTTON "Äî&ïîëíèòåëüíî",IDC_SETTINGS_ADVANCED,170,165,70,14 -END - -IDD_ADVANCED_GENERAL DIALOGEX DISCARDABLE 0, 0, 246, 204 -STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "General" -FONT 8, "MS Shell Dlg" -BEGIN + CONTROL "",IDC_SETTINGS_SPECTRUM,"Static",SS_OWNERDRAW | SS_SUNKEN,135,161,103,9 + PUSHBUTTON "Äî&ïîëíèòåëüíî",IDC_SETTINGS_ADVANCED,173,182,70,14 +END + +IDD_ADVANCED_GENERAL DIALOGEX DISCARDABLE 0, 0, 253, 204 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Îáùèå" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "Ýêðàí", -1, 7, 6, 237, 56, WS_GROUP + LTEXT "Ðàçìåð øðèôòà:", -1, 14, 20, 222, 8 + COMBOBOX IDC_FONTSIZE_COMBO, 14, 30, 223, 80, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + LTEXT "", IDC_FONTSIZE_COSTOM, 14, 46, 223, 12 + GROUPBOX "Ñîâìåñòèìîñòü", -1, 7, 67, 237, 97 + LTEXT "Íåêîòîðûå ïðîãðàììû ìîãóò ðàáîòàòü íåïðàâèëüíî, åñëè âû íå ïåðåçàãðóçèòå êîìïüþòåð ïîñëå èçìåíåíèÿ ïàðàìåòðîâ ýêðàíà.\r\n\nÏîñëå èçìåíåíèÿ ïàðàìåòðîâ ýêðàíà ñëåäóåò:", -1, 12, 78, 228, 34 + AUTORADIOBUTTON "Ïåðå&çàãðóçèòü êîìïüþòåð ñ íîâûìè ïàðàìåòðàìè ýêðàíà", IDC_RESTART_RB, 14, 116, 224, 10 + AUTORADIOBUTTON "&Ïðèìåíèòü íîâûå ïàðàìåòðû ýêðàíà áåç ïåðåçàãðóçêè", IDC_WITHOUTREBOOT_RB, 14, 131, 224, 10 + AUTORADIOBUTTON "Ç&àïðîñèòü ïåðåä ïðèìåíåíèåì íîâûõ ïàðàìåòðîâ ýêðàíà", IDC_ASKME_RB, 14, 146, 224, 10 END
IDR_PREVIEW_MENU MENU @@ -138,15 +147,15 @@ MENUITEM "&Primary", ID_MENU_PRIMARY MENUITEM SEPARATOR MENUITEM "&Identify", ID_MENU_IDENTIFY - MENUITEM "P&roperties", ID_MENU_PROPERTIES + MENUITEM "&Ñâîéñòâà", ID_MENU_PROPERTIES END END
STRINGTABLE BEGIN - IDS_MULTIPLEMONITORS "(Multiple Monitors)" - IDS_UNKNOWNMONITOR "(Unknown Monitor)" - IDS_ADVANCEDTITLEFMT "%s and %s" + IDS_MULTIPLEMONITORS "(Íåñêîëüêî ýêðàíîâ)" + IDS_UNKNOWNMONITOR "(Íåèçâåñòíûé ýêðàí)" + IDS_ADVANCEDTITLEFMT "%s è %s" END
STRINGTABLE @@ -171,7 +180,7 @@
STRINGTABLE DISCARDABLE BEGIN - IDS_BACKGROUND_COMDLG_FILTER "Êàðòèíêè (*.bmp;*.dib)\000*.bmp;*.dib" + IDS_BACKGROUND_COMDLG_FILTER "Èçîáðàæåíèÿ (*.bmp;*.dib)\000*.bmp;*.dib" IDS_SUPPORTED_EXT "*.bmp;*.dib" END
Modified: trunk/reactos/dll/cpl/desk/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/sk-SK.rc?... ============================================================================== --- trunk/reactos/dll/cpl/desk/lang/sk-SK.rc (original) +++ trunk/reactos/dll/cpl/desk/lang/sk-SK.rc Fri Feb 8 16:07:37 2008 @@ -125,11 +125,20 @@ PUSHBUTTON "&Spresni...",IDC_SETTINGS_ADVANCED,170,165,70,14 END
-IDD_ADVANCED_GENERAL DIALOGEX DISCARDABLE 0, 0, 246, 204 -STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Veobecné" -FONT 8, "MS Shell Dlg" -BEGIN +IDD_ADVANCED_GENERAL DIALOGEX DISCARDABLE 0, 0, 253, 204 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "General" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "Display", -1, 7, 6, 237, 56, WS_GROUP + LTEXT "Font Size:", -1, 14, 20, 222, 8 + COMBOBOX IDC_FONTSIZE_COMBO, 14, 30, 223, 80, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + LTEXT "", IDC_FONTSIZE_COSTOM, 14, 46, 223, 12 + GROUPBOX "Compatibility", -1, 7, 67, 237, 97 + LTEXT "Some programs operate improperly if you do not restart your computer after you change color settings.\r\n\nAfter I change color settings:", -1, 12, 78, 228, 34 + AUTORADIOBUTTON "&Restart the computer before applying the new color settings.", IDC_RESTART_RB, 14, 116, 224, 10 + AUTORADIOBUTTON "Apply the new color settings without restarting.", IDC_WITHOUTREBOOT_RB, 14, 131, 224, 10 + AUTORADIOBUTTON "Ask me before applying the new color settings.", IDC_ASKME_RB, 14, 146, 224, 10 END
IDR_PREVIEW_MENU MENU
Modified: trunk/reactos/dll/cpl/desk/lang/sv-SE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/sv-SE.rc?... ============================================================================== --- trunk/reactos/dll/cpl/desk/lang/sv-SE.rc (original) +++ trunk/reactos/dll/cpl/desk/lang/sv-SE.rc Fri Feb 8 16:07:37 2008 @@ -119,11 +119,20 @@ PUSHBUTTON "&Avancerat...",IDC_SETTINGS_ADVANCED,170,165,70,14 END
-IDD_ADVANCED_GENERAL DIALOGEX DISCARDABLE 0, 0, 246, 204 +IDD_ADVANCED_GENERAL DIALOGEX DISCARDABLE 0, 0, 253, 204 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "General" FONT 8, "MS Shell Dlg" BEGIN + GROUPBOX "Display", -1, 7, 6, 237, 56, WS_GROUP + LTEXT "Font Size:", -1, 14, 20, 222, 8 + COMBOBOX IDC_FONTSIZE_COMBO, 14, 30, 223, 80, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + LTEXT "", IDC_FONTSIZE_COSTOM, 14, 46, 223, 12 + GROUPBOX "Compatibility", -1, 7, 67, 237, 97 + LTEXT "Some programs operate improperly if you do not restart your computer after you change color settings.\r\n\nAfter I change color settings:", -1, 12, 78, 228, 34 + AUTORADIOBUTTON "&Restart the computer before applying the new color settings.", IDC_RESTART_RB, 14, 116, 224, 10 + AUTORADIOBUTTON "Apply the new color settings without restarting.", IDC_WITHOUTREBOOT_RB, 14, 131, 224, 10 + AUTORADIOBUTTON "Ask me before applying the new color settings.", IDC_ASKME_RB, 14, 146, 224, 10 END
IDR_PREVIEW_MENU MENU
Modified: trunk/reactos/dll/cpl/desk/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/uk-UA.rc?... ============================================================================== --- trunk/reactos/dll/cpl/desk/lang/uk-UA.rc (original) +++ trunk/reactos/dll/cpl/desk/lang/uk-UA.rc Fri Feb 8 16:07:37 2008 @@ -124,11 +124,20 @@ PUSHBUTTON "Äîä&àòêîâî...",IDC_SETTINGS_ADVANCED,170,165,70,14 END
-IDD_ADVANCED_GENERAL DIALOGEX DISCARDABLE 0, 0, 246, 204 -STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Çàãàëüí³" -FONT 8, "MS Shell Dlg" -BEGIN +IDD_ADVANCED_GENERAL DIALOGEX DISCARDABLE 0, 0, 253, 204 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "General" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "Display", -1, 7, 6, 237, 56, WS_GROUP + LTEXT "Font Size:", -1, 14, 20, 222, 8 + COMBOBOX IDC_FONTSIZE_COMBO, 14, 30, 223, 80, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + LTEXT "", IDC_FONTSIZE_COSTOM, 14, 46, 223, 12 + GROUPBOX "Compatibility", -1, 7, 67, 237, 97 + LTEXT "Some programs operate improperly if you do not restart your computer after you change color settings.\r\n\nAfter I change color settings:", -1, 12, 78, 228, 34 + AUTORADIOBUTTON "&Restart the computer before applying the new color settings.", IDC_RESTART_RB, 14, 116, 224, 10 + AUTORADIOBUTTON "Apply the new color settings without restarting.", IDC_WITHOUTREBOOT_RB, 14, 131, 224, 10 + AUTORADIOBUTTON "Ask me before applying the new color settings.", IDC_ASKME_RB, 14, 146, 224, 10 END
IDR_PREVIEW_MENU MENU
Modified: trunk/reactos/dll/cpl/desk/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/resource.h?rev... ============================================================================== --- trunk/reactos/dll/cpl/desk/resource.h (original) +++ trunk/reactos/dll/cpl/desk/resource.h Fri Feb 8 16:07:37 2008 @@ -2,14 +2,14 @@ #define __CPL_DESK_RESOURCE_H__
/* metrics */ -#define PROPSHEETWIDTH 246 -#define PROPSHEETHEIGHT 228 -#define PROPSHEETPADDING 6 +#define PROPSHEETWIDTH 246 +#define PROPSHEETHEIGHT 228 +#define PROPSHEETPADDING 6
-#define SYSTEM_COLUMN (18 * PROPSHEETPADDING) -#define LABELLINE(x) (((PROPSHEETPADDING + 2) * x) + (x + 2)) +#define SYSTEM_COLUMN (18 * PROPSHEETPADDING) +#define LABELLINE(x) (((PROPSHEETPADDING + 2) * x) + (x + 2))
-#define ICONSIZE 16 +#define ICONSIZE 16
/* ids */ #define IDC_DESK_ICON 40 @@ -17,6 +17,7 @@
#define IDC_STATIC -1
+/* Dialogs */ #define IDD_BACKGROUND 100 #define IDD_SCREENSAVER 101 #define IDD_APPEARANCE 102 @@ -34,7 +35,6 @@ #define IDS_BACKGROUND_COMDLG_FILTER 1006 #define IDS_SUPPORTED_EXT 1007
- /* Screensaver Page */ #define IDC_SCREENS_PREVIEW 1010 #define IDC_SCREENS_LIST 1011 @@ -51,116 +51,118 @@
#define IDC_SCREENS_CHOICES -1
-#define IDS_CPLNAME 2000 -#define IDS_CPLDESCRIPTION 2001 +#define IDS_CPLNAME 2000 +#define IDS_CPLDESCRIPTION 2001
-#define IDS_NONE 2002 -#define IDS_CENTER 2003 -#define IDS_STRETCH 2004 -#define IDS_TILE 2005 +#define IDS_NONE 2002 +#define IDS_CENTER 2003 +#define IDS_STRETCH 2004 +#define IDS_TILE 2005
-#define IDC_SETTINGS_DEVICE 201 -#define IDC_SETTINGS_BPP 202 -#define IDC_SETTINGS_RESOLUTION 203 -#define IDC_SETTINGS_RESOLUTION_TEXT 204 -#define IDC_SETTINGS_ADVANCED 205 -#define IDC_SETTINGS_MONSEL 206 -#define IDC_SETTINGS_SPECTRUM 207 +#define IDC_SETTINGS_DEVICE 201 +#define IDC_SETTINGS_BPP 202 +#define IDC_SETTINGS_RESOLUTION 203 +#define IDC_SETTINGS_RESOLUTION_TEXT 204 +#define IDC_SETTINGS_ADVANCED 205 +#define IDC_SETTINGS_MONSEL 206 +#define IDC_SETTINGS_SPECTRUM 207
-#define IDB_SPECTRUM_4 208 -#define IDB_SPECTRUM_8 209 -#define IDB_SPECTRUM_16 210 +#define IDB_SPECTRUM_4 208 +#define IDB_SPECTRUM_8 209 +#define IDB_SPECTRUM_16 210
-#define IDR_PREVIEW_MENU 2100 -#define ID_MENU_NORMAL 2101 -#define ID_MENU_DISABLED 2102 -#define ID_MENU_SELECTED 2103 +#define IDR_PREVIEW_MENU 2100 +#define ID_MENU_NORMAL 2101 +#define ID_MENU_DISABLED 2102 +#define ID_MENU_SELECTED 2103
-#define IDM_MONITOR_MENU 2110 -#define ID_MENU_ATTACHED 2111 -#define ID_MENU_PRIMARY 2112 -#define ID_MENU_IDENTIFY 2113 -#define ID_MENU_PROPERTIES 2114 +#define IDM_MONITOR_MENU 2110 +#define ID_MENU_ATTACHED 2111 +#define ID_MENU_PRIMARY 2112 +#define ID_MENU_IDENTIFY 2113 +#define ID_MENU_PROPERTIES 2114
/* Settings Page */ - -#define IDS_PIXEL 2301 - -#define IDS_COLOR_4BIT 2904 -#define IDS_COLOR_8BIT 2908 -#define IDS_COLOR_16BIT 2916 -#define IDS_COLOR_24BIT 2924 -#define IDS_COLOR_32BIT 2932 - +#define IDS_PIXEL 2301 +#define IDS_COLOR_4BIT 2904 +#define IDS_COLOR_8BIT 2908 +#define IDS_COLOR_16BIT 2916 +#define IDS_COLOR_24BIT 2924 +#define IDS_COLOR_32BIT 2932
/* Appearance Page */ -#define IDC_APPEARANCE_PREVIEW 1500 -#define IDC_APPEARANCE_UI_ITEM 1501 -#define IDC_APPEARANCE_COLORSCHEME 1502 -#define IDC_APPEARANCE_FONTSIZE 1503 -#define IDC_APPEARANCE_EFFECTS 1504 -#define IDC_APPEARANCE_ADVANCED 1505 +#define IDC_APPEARANCE_PREVIEW 1500 +#define IDC_APPEARANCE_UI_ITEM 1501 +#define IDC_APPEARANCE_COLORSCHEME 1502 +#define IDC_APPEARANCE_FONTSIZE 1503 +#define IDC_APPEARANCE_EFFECTS 1504 +#define IDC_APPEARANCE_ADVANCED 1505
-#define IDS_INACTWIN 1510 -#define IDS_ACTWIN 1511 -#define IDS_WINTEXT 1512 -#define IDS_MESSBOX 1513 -#define IDS_MESSTEXT 1514 -#define IDS_BUTTEXT 1515 +#define IDS_INACTWIN 1510 +#define IDS_ACTWIN 1511 +#define IDS_WINTEXT 1512 +#define IDS_MESSBOX 1513 +#define IDS_MESSTEXT 1514 +#define IDS_BUTTEXT 1515
/* Update these IDs when you change the string id list */ -#define IDS_ITEM_FIRST (IDS_ITEM_3D_OBJECTS) -#define IDS_ITEM_LAST (IDS_ITEM_CAPTION_BUTTONS + 1) +#define IDS_ITEM_FIRST (IDS_ITEM_3D_OBJECTS) +#define IDS_ITEM_LAST (IDS_ITEM_CAPTION_BUTTONS + 1)
+/* Advanced Appearance Dialog */ +#define IDC_ADVAPPEARANCE_PREVIEW 3101 +#define IDC_ADVAPPEARANCE_ELEMENT 3102 +#define IDC_ADVAPPEARANCE_SIZE_T 3103 +#define IDC_ADVAPPEARANCE_SIZE_E 3104 +#define IDC_ADVAPPEARANCE_SIZE_UD 3105 +#define IDC_ADVAPPEARANCE_COLOR1_T 3106 +#define IDC_ADVAPPEARANCE_COLOR1_B 3107 +#define IDC_ADVAPPEARANCE_COLOR2_T 3108 +#define IDC_ADVAPPEARANCE_COLOR2_B 3109 +#define IDC_ADVAPPEARANCE_FONT_T 3110 +#define IDC_ADVAPPEARANCE_FONT_C 3111 +#define IDC_ADVAPPEARANCE_FONTSIZE_T 3112 +#define IDC_ADVAPPEARANCE_FONTSIZE_E 3113 +#define IDC_ADVAPPEARANCE_FONTCOLOR_T 3114 +#define IDC_ADVAPPEARANCE_FONTCOLOR_B 3115 +#define IDC_ADVAPPEARANCE_FONTBOLD 3116 +#define IDC_ADVAPPEARANCE_FONTITALIC 3117
-/* Advanced Appearance Dialog */# +#define IDS_ELEMENT_0 3200 +#define IDS_ELEMENT_1 3201 +#define IDS_ELEMENT_2 3202 +#define IDS_ELEMENT_3 3203 +#define IDS_ELEMENT_4 3204 +#define IDS_ELEMENT_5 3205 +#define IDS_ELEMENT_6 3206 +#define IDS_ELEMENT_7 3207 +#define IDS_ELEMENT_8 3208 +#define IDS_ELEMENT_9 3209 +#define IDS_ELEMENT_10 3210 +#define IDS_ELEMENT_11 3211 +#define IDS_ELEMENT_12 3212 +#define IDS_ELEMENT_13 3213 +#define IDS_ELEMENT_14 3214 +#define IDS_ELEMENT_15 3215 +#define IDS_ELEMENT_16 3216 +#define IDS_ELEMENT_17 3217 +#define IDS_ELEMENT_18 3218 +#define IDS_ELEMENT_19 3219 +#define IDS_ELEMENT_20 3220 +#define IDS_ELEMENT_21 3221 +#define IDS_ELEMENT_22 3222 +#define IDS_ELEMENT_23 3223
-#define IDC_ADVAPPEARANCE_PREVIEW 3101 -#define IDC_ADVAPPEARANCE_ELEMENT 3102 -#define IDC_ADVAPPEARANCE_SIZE_T 3103 -#define IDC_ADVAPPEARANCE_SIZE_E 3104 -#define IDC_ADVAPPEARANCE_SIZE_UD 3105 -#define IDC_ADVAPPEARANCE_COLOR1_T 3106 -#define IDC_ADVAPPEARANCE_COLOR1_B 3107 -#define IDC_ADVAPPEARANCE_COLOR2_T 3108 -#define IDC_ADVAPPEARANCE_COLOR2_B 3109 -#define IDC_ADVAPPEARANCE_FONT_T 3110 -#define IDC_ADVAPPEARANCE_FONT_C 3111 -#define IDC_ADVAPPEARANCE_FONTSIZE_T 3112 -#define IDC_ADVAPPEARANCE_FONTSIZE_E 3113 -#define IDC_ADVAPPEARANCE_FONTCOLOR_T 3114 -#define IDC_ADVAPPEARANCE_FONTCOLOR_B 3115 -#define IDC_ADVAPPEARANCE_FONTBOLD 3116 -#define IDC_ADVAPPEARANCE_FONTITALIC 3117 +#define IDS_MULTIPLEMONITORS 3300 +#define IDS_UNKNOWNMONITOR 3301 +#define IDS_ADVANCEDTITLEFMT 3302
-#define IDS_ELEMENT_0 3200 -#define IDS_ELEMENT_1 3201 -#define IDS_ELEMENT_2 3202 -#define IDS_ELEMENT_3 3203 -#define IDS_ELEMENT_4 3204 -#define IDS_ELEMENT_5 3205 -#define IDS_ELEMENT_6 3206 -#define IDS_ELEMENT_7 3207 -#define IDS_ELEMENT_8 3208 -#define IDS_ELEMENT_9 3209 -#define IDS_ELEMENT_10 3210 -#define IDS_ELEMENT_11 3211 -#define IDS_ELEMENT_12 3212 -#define IDS_ELEMENT_13 3213 -#define IDS_ELEMENT_14 3214 -#define IDS_ELEMENT_15 3215 -#define IDS_ELEMENT_16 3216 -#define IDS_ELEMENT_17 3217 -#define IDS_ELEMENT_18 3218 -#define IDS_ELEMENT_19 3219 -#define IDS_ELEMENT_20 3220 -#define IDS_ELEMENT_21 3221 -#define IDS_ELEMENT_22 3222 -#define IDS_ELEMENT_23 3223 - -#define IDS_MULTIPLEMONITORS 3300 -#define IDS_UNKNOWNMONITOR 3301 -#define IDS_ADVANCEDTITLEFMT 3302 +/* Advanced General Dialog */ +#define IDC_FONTSIZE_COMBO 5000 +#define IDC_FONTSIZE_COSTOM 5001 +#define IDC_RESTART_RB 5002 +#define IDC_WITHOUTREBOOT_RB 5003 +#define IDC_ASKME_RB 5004
#endif /* __CPL_DESK_RESOURCE_H__ */