Ros-diffs

ros-diffs@reactos.org

17 participants
81085 discussions

[reactos] 01/01: [ATTRIB] De-duplicate code; handle reparse points; verify path concatenation (#4215)

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=ec0cc847b93cbcf92efd7… commit ec0cc847b93cbcf92efd7f67140f863a3489dcbd Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Wed Dec 29 04:01:40 2021 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Fri Aug 11 13:49:27 2023 +0200 [ATTRIB] De-duplicate code; handle reparse points; verify path concatenation (#4215) - Simplify duplicated code by having one EnumFiles() function using callbacks to perform actual action on enumerated files. PrintAttribute() and ChangeAttribute() duplicate their functionality, except for the actual difference of displaying the file attributes vs. changing them. Instead, move that per-file action into two callbacks, create a file enumerator function that contains the common functionality, and make it call the callback passed in parameter to it. - Reparse points can be encountered during enumeration. In this case, don't try to go into too many reparse-point levels (maximum two). - Verify that paths/file names concatenation don't overflow (with the StringCch* functions returning an error), as this could cause an infinite loop in case of recursive-enumeration, and the position where the new path part would be appended turns out to be just at the end of the buffer. --- base/applications/cmdutils/attrib/attrib.c | 455 +++++++++++++++-------------- 1 file changed, 237 insertions(+), 218 deletions(-) diff --git a/base/applications/cmdutils/attrib/attrib.c b/base/applications/cmdutils/attrib/attrib.c index 821bfd52faf..3f62a42c684 100644 --- a/base/applications/cmdutils/attrib/attrib.c +++ b/base/applications/cmdutils/attrib/attrib.c @@ -1,35 +1,10 @@ /* - * ATTRIB.C - attrib internal command. - * - * - * History: - * - * 04-Dec-1998 Eric Kohl - * started - * - * 09-Dec-1998 Eric Kohl - * implementation works, except recursion ("attrib /s"). - * - * 05-Jan-1999 Eric Kohl - * major rewrite. - * fixed recursion ("attrib /s"). - * started directory support ("attrib /s /d"). - * updated help text. - * - * 14-Jan-1999 Eric Kohl - * Unicode ready! - * - * 19-Jan-1999 Eric Kohl - * Redirection ready! - * - * 21-Jan-1999 Eric Kohl - * Added check for invalid filenames. - * - * 23-Jan-1999 Eric Kohl - * Added handling of multiple filenames. - * - * 02-Apr-2005 (Magnus Olsen <magnus(a)greatlord.com>) - * Remove all hardcoded strings in En.rc + * PROJECT: ReactOS Attrib Command + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: Displays or changes file attributes recursively. + * COPYRIGHT: Copyright 1998-2019 Eric Kohl <eric.kohl(a)reactos.org> + * Copyright 2021 Doug Lyons <douglyons(a)douglyons.com> + * Copyright 2021-2023 Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> */ #include <stdio.h> @@ -39,15 +14,22 @@ #include <winbase.h> #include <wincon.h> #include <winuser.h> +#include <strsafe.h> #include <conutils.h> #include "resource.h" +/* Enable to support extended attributes. + * See https://ss64.com/nt/attrib.html for an exhaustive list. */ +// TODO: If you enable this, translations need to be updated as well! +//#define EXTENDED_ATTRIBUTES + +#define ALL_FILES_PATTERN L"*.*" // It may also be possible to use L"*" (shorter) + CON_SCREEN StdOutScreen = INIT_CON_SCREEN(StdOut); -static -VOID +static VOID ErrorMessage( _In_ DWORD dwErrorCode, _In_opt_ PCWSTR pszMsg, @@ -77,217 +59,257 @@ ErrorMessage( ConPrintf(StdErr, L" %s\n", pszMsg); } -/* Returns TRUE if anything is printed, FALSE otherwise */ -static -BOOL -PrintAttribute( - LPWSTR pszPath, - LPWSTR pszFile, - BOOL bRecurse, - BOOL bDirectories) -{ - WIN32_FIND_DATAW findData; - HANDLE hFind; - WCHAR szFullName[MAX_PATH]; - LPWSTR pszFileName; - BOOL bFound = FALSE; - BOOL bIsDir; - BOOL bExactMatch; - DWORD Error; - - /* prepare full file name buffer */ - wcscpy(szFullName, pszPath); - pszFileName = szFullName + wcslen(szFullName); - - /* display all subdirectories */ - if (bRecurse) - { - /* append *.* */ - wcscpy(pszFileName, L"*.*"); - hFind = FindFirstFileW(szFullName, &findData); - if (hFind == INVALID_HANDLE_VALUE) - { - Error = GetLastError(); - if ((Error != ERROR_DIRECTORY) && (Error != ERROR_SHARING_VIOLATION) - && (Error != ERROR_FILE_NOT_FOUND)) - { - ErrorMessage(Error, pszFile); - } - return FALSE; - } - - do - { - if (!(findData.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY)) - continue; - - if (!wcscmp(findData.cFileName, L".") || - !wcscmp(findData.cFileName, L"..")) - { - continue; - } +/** + * @brief Displays attributes for the given file. + * @return Always TRUE (success). + **/ +static BOOL +PrintAttributes( + _In_ PWIN32_FIND_DATAW pFindData, + _In_ PCWSTR pszFullName, + _Inout_opt_ PVOID Context) +{ + DWORD dwAttributes = pFindData->dwFileAttributes; + + UNREFERENCED_PARAMETER(Context); + + ConPrintf(StdOut, +#ifdef EXTENDED_ATTRIBUTES + L"%c %c%c%c %c %s\n", +#else + L"%c %c%c%c %s\n", +#endif + (dwAttributes & FILE_ATTRIBUTE_ARCHIVE) ? L'A' : L' ', + (dwAttributes & FILE_ATTRIBUTE_SYSTEM) ? L'S' : L' ', + (dwAttributes & FILE_ATTRIBUTE_HIDDEN) ? L'H' : L' ', + (dwAttributes & FILE_ATTRIBUTE_READONLY) ? L'R' : L' ', +#ifdef EXTENDED_ATTRIBUTES + (dwAttributes & FILE_ATTRIBUTE_NOT_CONTENT_INDEXED) ? L'I' : L' ', +#endif + pszFullName); + + return TRUE; +} - wcscpy(pszFileName, findData.cFileName); - wcscat(pszFileName, L"\\"); - bFound |= PrintAttribute(szFullName, pszFile, bRecurse, bDirectories); - } - while (FindNextFileW(hFind, &findData)); - FindClose(hFind); - } +typedef struct _ATTRIBS_MASKS +{ + DWORD dwMask; + DWORD dwAttrib; +} ATTRIBS_MASKS, *PATTRIBS_MASKS; + +/** + * @brief Changes attributes for the given file. + * @return TRUE if anything changed, FALSE otherwise. + **/ +static BOOL +ChangeAttributes( + _In_ PWIN32_FIND_DATAW pFindData, + _In_ PCWSTR pszFullName, + _Inout_opt_ PVOID Context) +{ + PATTRIBS_MASKS AttribsMasks = (PATTRIBS_MASKS)Context; + DWORD dwAttributes; - /* append file name */ - wcscpy(pszFileName, pszFile); + dwAttributes = ((pFindData->dwFileAttributes & ~AttribsMasks->dwMask) | AttribsMasks->dwAttrib); + return SetFileAttributesW(pszFullName, dwAttributes); +} - /* search current directory */ - hFind = FindFirstFileW(szFullName, &findData); - if (hFind == INVALID_HANDLE_VALUE) - { - return bFound; - } - do - { - bIsDir = findData.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY; - bExactMatch = wcsicmp(findData.cFileName, pszFile) == 0; +#define ENUM_RECURSE 0x01 +#define ENUM_DIRECTORIES 0x02 - if (bIsDir && !bDirectories && !bExactMatch) - continue; +typedef BOOL +(*PENUMFILES_CALLBACK)( + _In_ PWIN32_FIND_DATAW pFindData, + _In_ PCWSTR pszFullName, + _Inout_opt_ PVOID Context); - if (!wcscmp(findData.cFileName, L".") || - !wcscmp(findData.cFileName, L"..")) - { - continue; - } +typedef struct _ENUMFILES_CTX +{ + /* Fixed data */ + _In_ PCWSTR FileName; + _In_ DWORD Flags; - wcscpy(pszFileName, findData.cFileName); + /* Callback invoked on each enumerated file/directory */ + _In_ PENUMFILES_CALLBACK Callback; + _In_ PVOID Context; - ConPrintf(StdOut, - L"%c %c%c%c %s\n", - (findData.dwFileAttributes & FILE_ATTRIBUTE_ARCHIVE) ? L'A' : L' ', - (findData.dwFileAttributes & FILE_ATTRIBUTE_SYSTEM) ? L'S' : L' ', - (findData.dwFileAttributes & FILE_ATTRIBUTE_HIDDEN) ? L'H' : L' ', - (findData.dwFileAttributes & FILE_ATTRIBUTE_READONLY) ? L'R' : L' ', - szFullName); - bFound = TRUE; - } - while (FindNextFileW(hFind, &findData)); - FindClose(hFind); + /* Dynamic data */ + WIN32_FIND_DATAW findData; + ULONG uReparseLevel; - return bFound; -} + /* The full path buffer the function will act recursively */ + // PWSTR FullPath; // Use a relocated buffer once long paths become supported! + size_t cchBuffer; // Buffer size + WCHAR FullPathBuffer[MAX_PATH + _countof("\\" ALL_FILES_PATTERN)]; +} ENUMFILES_CTX, *PENUMFILES_CTX; -/* Returns TRUE if anything changed, FALSE otherwise */ -static -BOOL -ChangeAttribute( - LPWSTR pszPath, - LPWSTR pszFile, - BOOL bRecurse, - BOOL bDirectories, - DWORD dwMask, - DWORD dwAttrib) +/* Returns TRUE if anything is done, FALSE otherwise */ +static BOOL +EnumFilesWorker( + _Inout_ PENUMFILES_CTX EnumCtx, + _Inout_ off_t offFilePart) // Offset to the file name inside FullPathBuffer { - WIN32_FIND_DATAW findData; + BOOL bFound = FALSE; + HRESULT hRes; HANDLE hFind; - WCHAR szFullName[MAX_PATH]; - LPWSTR pszFileName; - BOOL bFound = FALSE; - BOOL bIsDir; - BOOL bExactMatch; - DWORD dwAttribute; - DWORD Error; - - /* prepare full file name buffer */ - wcscpy(szFullName, pszPath); - pszFileName = szFullName + wcslen(szFullName); - - /* display all subdirectories */ - if (bRecurse) + PWSTR findFileName = EnumCtx->findData.cFileName; + PWSTR pFilePart = EnumCtx->FullPathBuffer + offFilePart; + size_t cchRemaining = EnumCtx->cchBuffer - offFilePart; + + /* Recurse over all subdirectories */ + if (EnumCtx->Flags & ENUM_RECURSE) { - /* append *.* */ - wcscpy(pszFileName, L"*.*"); + /* Append '*.*' */ + hRes = StringCchCopyW(pFilePart, cchRemaining, ALL_FILES_PATTERN); + if (hRes != S_OK) + { + if (hRes == STRSAFE_E_INSUFFICIENT_BUFFER) + { + // TODO: If this fails, try to reallocate EnumCtx->FullPathBuffer by + // increasing its size by _countof(EnumCtx->findData.cFileName) + 1 + // to satisfy this copy, as well as the one made in the loop below. + } + // else + ConPrintf(StdErr, L"Directory level too deep: %s\n", EnumCtx->FullPathBuffer); + return FALSE; + } - hFind = FindFirstFileW(szFullName, &findData); + hFind = FindFirstFileW(EnumCtx->FullPathBuffer, &EnumCtx->findData); if (hFind == INVALID_HANDLE_VALUE) { - Error = GetLastError(); - if ((Error != ERROR_DIRECTORY) && (Error != ERROR_SHARING_VIOLATION) - && (Error != ERROR_FILE_NOT_FOUND)) + DWORD Error = GetLastError(); + if ((Error != ERROR_DIRECTORY) && + (Error != ERROR_SHARING_VIOLATION) && + (Error != ERROR_FILE_NOT_FOUND)) { - ErrorMessage(Error, pszFile); + ErrorMessage(Error, EnumCtx->FullPathBuffer); } return FALSE; } do { - if (!(findData.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY)) + BOOL bIsReparse; + size_t offNewFilePart; + + if (!(EnumCtx->findData.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY)) continue; - if (!wcscmp(findData.cFileName, L".") || - !wcscmp(findData.cFileName, L"..")) - { + if (!wcscmp(findFileName, L".") || !wcscmp(findFileName, L"..")) continue; + + /* Allow at most 2 levels of reparse points / symbolic links */ + bIsReparse = !!(EnumCtx->findData.dwFileAttributes & FILE_ATTRIBUTE_REPARSE_POINT); + if (bIsReparse) + { + if (EnumCtx->uReparseLevel < 2) + EnumCtx->uReparseLevel++; + else + continue; } - wcscpy(pszFileName, findData.cFileName); - wcscat(pszFileName, L"\\"); - bFound |= ChangeAttribute(szFullName, pszFile, bRecurse, bDirectories, - dwMask, dwAttrib); + hRes = StringCchPrintfExW(pFilePart, cchRemaining, + NULL, &offNewFilePart, 0, + L"%s\\", findFileName); + /* Offset to the new file name part */ + offNewFilePart = EnumCtx->cchBuffer - offNewFilePart; + + bFound |= EnumFilesWorker(EnumCtx, offNewFilePart); + + /* Recalculate the file part pointer and the number of characters + * remaining: the buffer may have been enlarged and relocated. */ + pFilePart = EnumCtx->FullPathBuffer + offFilePart; + cchRemaining = EnumCtx->cchBuffer - offFilePart; + + /* If we went through a reparse point / symbolic link, decrease level */ + if (bIsReparse) + EnumCtx->uReparseLevel--; } - while (FindNextFileW(hFind, &findData)); + while (FindNextFileW(hFind, &EnumCtx->findData)); FindClose(hFind); } - /* append file name */ - wcscpy(pszFileName, pszFile); + /* Append the file name pattern to search for */ + hRes = StringCchCopyW(pFilePart, cchRemaining, EnumCtx->FileName); - /* search current directory */ - hFind = FindFirstFileW(szFullName, &findData); + /* Search in the current directory */ + hFind = FindFirstFileW(EnumCtx->FullPathBuffer, &EnumCtx->findData); if (hFind == INVALID_HANDLE_VALUE) - { return bFound; - } do { - bIsDir = findData.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY; - bExactMatch = wcsicmp(findData.cFileName, pszFile) == 0; + BOOL bIsDir = !!(EnumCtx->findData.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY); + BOOL bExactMatch = (wcsicmp(findFileName, EnumCtx->FileName) == 0); - if (bIsDir && !bDirectories && !bExactMatch) + if (bIsDir && !(EnumCtx->Flags & ENUM_DIRECTORIES) && !bExactMatch) continue; - if (!wcscmp(findData.cFileName, L".") || - !wcscmp(findData.cFileName, L"..")) - { + if (!wcscmp(findFileName, L".") || !wcscmp(findFileName, L"..")) continue; - } - if (bRecurse && bIsDir && !bDirectories) + /* If we recursively enumerate files excluding directories, + * exclude any directory from the enumeration. */ + if (bIsDir && !(EnumCtx->Flags & ENUM_DIRECTORIES) && (EnumCtx->Flags & ENUM_RECURSE)) continue; - wcscpy(pszFileName, findData.cFileName); - - dwAttribute = (findData.dwFileAttributes & ~dwMask) | dwAttrib; - - SetFileAttributes(szFullName, dwAttribute); + StringCchCopyW(pFilePart, cchRemaining, findFileName); + /* bFound = */ EnumCtx->Callback(&EnumCtx->findData, EnumCtx->FullPathBuffer, EnumCtx->Context); bFound = TRUE; } - while (FindNextFileW(hFind, &findData)); + while (FindNextFileW(hFind, &EnumCtx->findData)); FindClose(hFind); return bFound; } +static BOOL +AttribEnumFiles( + _In_ PCWSTR pszPath, + _In_ PCWSTR pszFile, + _In_ DWORD fFlags, + _In_ PATTRIBS_MASKS AttribsMasks) +{ + ENUMFILES_CTX EnumContext = {0}; + size_t offFilePart; + HRESULT hRes; + + EnumContext.FileName = pszFile; + EnumContext.Flags = fFlags; + EnumContext.Callback = (AttribsMasks->dwMask == 0 ? PrintAttributes : ChangeAttributes); + EnumContext.Context = (AttribsMasks->dwMask == 0 ? NULL : AttribsMasks); + + /* Prepare the full file path buffer */ + EnumContext.cchBuffer = _countof(EnumContext.FullPathBuffer); + hRes = StringCchCopyExW(EnumContext.FullPathBuffer, + EnumContext.cchBuffer, + pszPath, + NULL, + &offFilePart, + 0); + if (hRes != S_OK) + return FALSE; + + /* Offset to the file name part */ + offFilePart = EnumContext.cchBuffer - offFilePart; + if (EnumContext.FullPathBuffer[offFilePart - 1] != L'\\') + { + EnumContext.FullPathBuffer[offFilePart] = L'\\'; + EnumContext.FullPathBuffer[offFilePart + 1] = UNICODE_NULL; + offFilePart++; + } + + return EnumFilesWorker(&EnumContext, offFilePart); +} + int wmain(int argc, WCHAR *argv[]) { INT i; - BOOL bRecurse = FALSE; - BOOL bDirectories = FALSE; - DWORD dwAttrib = 0; - DWORD dwMask = 0; + DWORD dwEnumFlags = 0; + ATTRIBS_MASKS AttribsMasks = {0}; BOOL bFound = FALSE; PWSTR pszFileName; WCHAR szFilePath[MAX_PATH + 2] = L""; // + 2 to reserve an extra path separator and a NULL-terminator. @@ -309,9 +331,9 @@ int wmain(int argc, WCHAR *argv[]) else /* Retrieve the enumeration modes */ if (wcsicmp(argv[i], L"/s") == 0) - bRecurse = TRUE; + dwEnumFlags |= ENUM_RECURSE; else if (wcsicmp(argv[i], L"/d") == 0) - bDirectories = TRUE; + dwEnumFlags |= ENUM_DIRECTORIES; else { /* Unknown option */ @@ -334,37 +356,47 @@ int wmain(int argc, WCHAR *argv[]) switch (towupper(argv[i][1])) { case L'A': - dwMask |= FILE_ATTRIBUTE_ARCHIVE; + AttribsMasks.dwMask |= FILE_ATTRIBUTE_ARCHIVE; if (bAdd) - dwAttrib |= FILE_ATTRIBUTE_ARCHIVE; + AttribsMasks.dwAttrib |= FILE_ATTRIBUTE_ARCHIVE; else - dwAttrib &= ~FILE_ATTRIBUTE_ARCHIVE; + AttribsMasks.dwAttrib &= ~FILE_ATTRIBUTE_ARCHIVE; break; case L'S': - dwMask |= FILE_ATTRIBUTE_SYSTEM; + AttribsMasks.dwMask |= FILE_ATTRIBUTE_SYSTEM; if (bAdd) - dwAttrib |= FILE_ATTRIBUTE_SYSTEM; + AttribsMasks.dwAttrib |= FILE_ATTRIBUTE_SYSTEM; else - dwAttrib &= ~FILE_ATTRIBUTE_SYSTEM; + AttribsMasks.dwAttrib &= ~FILE_ATTRIBUTE_SYSTEM; break; case L'H': - dwMask |= FILE_ATTRIBUTE_HIDDEN; + AttribsMasks.dwMask |= FILE_ATTRIBUTE_HIDDEN; if (bAdd) - dwAttrib |= FILE_ATTRIBUTE_HIDDEN; + AttribsMasks.dwAttrib |= FILE_ATTRIBUTE_HIDDEN; else - dwAttrib &= ~FILE_ATTRIBUTE_HIDDEN; + AttribsMasks.dwAttrib &= ~FILE_ATTRIBUTE_HIDDEN; break; case L'R': - dwMask |= FILE_ATTRIBUTE_READONLY; + AttribsMasks.dwMask |= FILE_ATTRIBUTE_READONLY; if (bAdd) - dwAttrib |= FILE_ATTRIBUTE_READONLY; + AttribsMasks.dwAttrib |= FILE_ATTRIBUTE_READONLY; else - dwAttrib &= ~FILE_ATTRIBUTE_READONLY; + AttribsMasks.dwAttrib &= ~FILE_ATTRIBUTE_READONLY; break; +#ifdef EXTENDED_ATTRIBUTES + case L'I': + AttribsMasks.dwMask |= FILE_ATTRIBUTE_NOT_CONTENT_INDEXED; + if (bAdd) + AttribsMasks.dwAttrib |= FILE_ATTRIBUTE_NOT_CONTENT_INDEXED; + else + AttribsMasks.dwAttrib &= ~FILE_ATTRIBUTE_NOT_CONTENT_INDEXED; + break; +#endif + default: ConResPrintf(StdErr, STRING_ERROR_INVALID_PARAM_FORMAT, argv[i]); return -1; @@ -380,19 +412,10 @@ int wmain(int argc, WCHAR *argv[]) /* If no file specification was found, operate on all files of the current directory */ if (!bFound) { - DWORD len = GetCurrentDirectoryW(_countof(szFilePath) - 2, szFilePath); - if (szFilePath[len - 1] != L'\\') - { - szFilePath[len] = L'\\'; - szFilePath[len + 1] = UNICODE_NULL; - } - pszFileName = L"*.*"; - - if (dwMask == 0) - bFound = PrintAttribute(szFilePath, pszFileName, bRecurse, bDirectories); - else - bFound = ChangeAttribute(szFilePath, pszFileName, bRecurse, bDirectories, dwMask, dwAttrib); + GetCurrentDirectoryW(_countof(szFilePath) - 2, szFilePath); + pszFileName = ALL_FILES_PATTERN; + bFound = AttribEnumFiles(szFilePath, pszFileName, dwEnumFlags, &AttribsMasks); if (!bFound) ConResPrintf(StdOut, STRING_FILE_NOT_FOUND, pszFileName); @@ -419,11 +442,7 @@ int wmain(int argc, WCHAR *argv[]) pszFileName = L""; } - if (dwMask == 0) - bFound = PrintAttribute(szFilePath, pszFileName, bRecurse, bDirectories); - else - bFound = ChangeAttribute(szFilePath, pszFileName, bRecurse, bDirectories, dwMask, dwAttrib); - + bFound = AttribEnumFiles(szFilePath, pszFileName, dwEnumFlags, &AttribsMasks); if (!bFound) ConResPrintf(StdOut, STRING_FILE_NOT_FOUND, argv[i]); }

1 year, 5 months

[reactos] 01/01: [MSPAINT] Support converting to black and white (#5554)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=e6c23361a12e994d529c5… commit e6c23361a12e994d529c5ab6c1ce904300b3bb71 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Fri Aug 11 20:27:12 2023 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Fri Aug 11 20:27:12 2023 +0900 [MSPAINT] Support converting to black and white (#5554) - Add ImageModel::IsBlackAndWhite and ImageModel::PushBlackAndWhite helper functions. - Add CAttributesDialog::m_bBlackAndWhite. - If IDD_ATTRIBUTESRB4 is checked, then make the bitmap black and white. - Add IDS_LOSECOLOR to show message. CORE-19094 --- base/applications/mspaint/dialogs.cpp | 7 +++++- base/applications/mspaint/dialogs.h | 1 + base/applications/mspaint/history.cpp | 44 +++++++++++++++++++++++++++++++++ base/applications/mspaint/history.h | 2 ++ base/applications/mspaint/lang/bg-BG.rc | 1 + base/applications/mspaint/lang/cs-CZ.rc | 1 + base/applications/mspaint/lang/de-DE.rc | 1 + base/applications/mspaint/lang/en-GB.rc | 1 + base/applications/mspaint/lang/en-US.rc | 1 + base/applications/mspaint/lang/es-ES.rc | 1 + base/applications/mspaint/lang/et-EE.rc | 1 + base/applications/mspaint/lang/eu-ES.rc | 1 + base/applications/mspaint/lang/fr-FR.rc | 1 + base/applications/mspaint/lang/he-IL.rc | 1 + base/applications/mspaint/lang/hu-HU.rc | 1 + base/applications/mspaint/lang/id-ID.rc | 1 + base/applications/mspaint/lang/it-IT.rc | 1 + base/applications/mspaint/lang/ja-JP.rc | 1 + base/applications/mspaint/lang/nl-NL.rc | 1 + base/applications/mspaint/lang/no-NO.rc | 1 + base/applications/mspaint/lang/pl-PL.rc | 1 + base/applications/mspaint/lang/pt-BR.rc | 1 + base/applications/mspaint/lang/pt-PT.rc | 1 + base/applications/mspaint/lang/ro-RO.rc | 1 + base/applications/mspaint/lang/ru-RU.rc | 1 + base/applications/mspaint/lang/sk-SK.rc | 1 + base/applications/mspaint/lang/sq-AL.rc | 1 + base/applications/mspaint/lang/sv-SE.rc | 1 + base/applications/mspaint/lang/tr-TR.rc | 1 + base/applications/mspaint/lang/uk-UA.rc | 1 + base/applications/mspaint/lang/vi-VN.rc | 1 + base/applications/mspaint/lang/zh-CN.rc | 1 + base/applications/mspaint/lang/zh-HK.rc | 1 + base/applications/mspaint/lang/zh-TW.rc | 1 + base/applications/mspaint/resource.h | 1 + base/applications/mspaint/winproc.cpp | 17 ++++++++++++- 36 files changed, 100 insertions(+), 2 deletions(-) diff --git a/base/applications/mspaint/dialogs.cpp b/base/applications/mspaint/dialogs.cpp index 7ec302dfe7f..9cda67b3d72 100644 --- a/base/applications/mspaint/dialogs.cpp +++ b/base/applications/mspaint/dialogs.cpp @@ -103,10 +103,14 @@ LRESULT CAttributesDialog::OnInitDialog(UINT nMsg, WPARAM wParam, LPARAM lParam, newHeight = imageModel.GetHeight(); CheckDlgButton(IDD_ATTRIBUTESRB3, BST_CHECKED); - CheckDlgButton(IDD_ATTRIBUTESRB5, BST_CHECKED); SetDlgItemInt(IDD_ATTRIBUTESEDIT1, newWidth, FALSE); SetDlgItemInt(IDD_ATTRIBUTESEDIT2, newHeight, FALSE); + if (imageModel.IsBlackAndWhite()) + CheckRadioButton(IDD_ATTRIBUTESRB4, IDD_ATTRIBUTESRB5, IDD_ATTRIBUTESRB4); + else + CheckRadioButton(IDD_ATTRIBUTESRB4, IDD_ATTRIBUTESRB5, IDD_ATTRIBUTESRB5); + if (g_isAFile) { TCHAR date[100]; @@ -142,6 +146,7 @@ LRESULT CAttributesDialog::OnClose(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL LRESULT CAttributesDialog::OnOk(WORD wNotifyCode, WORD wID, HWND hWndCtl, BOOL& bHandled) { + m_bBlackAndWhite = (IsDlgButtonChecked(IDD_ATTRIBUTESRB4) == BST_CHECKED); EndDialog(1); return 0; } diff --git a/base/applications/mspaint/dialogs.h b/base/applications/mspaint/dialogs.h index d760c59d556..f4354de11fe 100644 --- a/base/applications/mspaint/dialogs.h +++ b/base/applications/mspaint/dialogs.h @@ -64,6 +64,7 @@ public: public: int newWidth; int newHeight; + BOOL m_bBlackAndWhite; }; class CStretchSkewDialog : public CDialogImpl<CStretchSkewDialog> diff --git a/base/applications/mspaint/history.cpp b/base/applications/mspaint/history.cpp index 3f1878ad3d3..8867a53025a 100644 --- a/base/applications/mspaint/history.cpp +++ b/base/applications/mspaint/history.cpp @@ -267,3 +267,47 @@ HBITMAP ImageModel::CopyBitmap() m_hbmOld = ::SelectObject(m_hDrawingDC, m_hBms[m_currInd]); // Re-select return ret; } + +BOOL ImageModel::IsBlackAndWhite() +{ + LONG cxWidth = GetWidth(), cyHeight = GetHeight(); + for (LONG y = 0; y < cyHeight; ++y) + { + for (LONG x = 0; x < cxWidth; ++x) + { + COLORREF rgbColor = ::GetPixel(m_hDrawingDC, x, y); + if (rgbColor != RGB(0, 0, 0) && rgbColor != RGB(255, 255, 255)) + return FALSE; + } + } + return TRUE; +} + +void ImageModel::PushBlackAndWhite() +{ + HBITMAP hNewBitmap = CopyBitmap(); + if (!hNewBitmap) + return; + + HDC hdc2 = ::CreateCompatibleDC(NULL); + HGDIOBJ hbm2Old = ::SelectObject(hdc2, hNewBitmap); + LONG cxWidth = GetWidth(), cyHeight = GetHeight(); + for (LONG y = 0; y < cyHeight; ++y) + { + for (LONG x = 0; x < cxWidth; ++x) + { + COLORREF rgbColor = ::GetPixel(m_hDrawingDC, x, y); + BYTE Red = GetRValue(rgbColor); + BYTE Green = GetGValue(rgbColor); + BYTE Blue = GetBValue(rgbColor); + if ((Red + Green + Blue) / 3 >= 255 / 2) + ::SetPixelV(hdc2, x, y, RGB(255, 255, 255)); // White + else + ::SetPixelV(hdc2, x, y, RGB(0, 0, 0)); // Black + } + } + ::SelectObject(hdc2, hbm2Old); + ::DeleteDC(hdc2); + + PushImageForUndo(hNewBitmap); +} diff --git a/base/applications/mspaint/history.h b/base/applications/mspaint/history.h index b9fe323db67..5bee4105240 100644 --- a/base/applications/mspaint/history.h +++ b/base/applications/mspaint/history.h @@ -37,6 +37,8 @@ public: void RotateNTimes90Degrees(int iN); void Clamp(POINT& pt) const; void NotifyImageChanged(); + BOOL IsBlackAndWhite(); + void PushBlackAndWhite(); protected: HDC m_hDrawingDC; // The device context for this class diff --git a/base/applications/mspaint/lang/bg-BG.rc b/base/applications/mspaint/lang/bg-BG.rc index 66bf74763c3..cfc791946ae 100644 --- a/base/applications/mspaint/lang/bg-BG.rc +++ b/base/applications/mspaint/lang/bg-BG.rc @@ -264,4 +264,5 @@ BEGIN IDS_CANTPASTE "Failed to paste from the clipboard. The data format is either incorrect or not supported." IDS_SAVEERROR "Failed to save the bitmap to file:\n\n%s" IDS_CANTSENDMAIL "Failed to send a mail." + IDS_LOSECOLOR "The color information will be lost in this operation. Are you sure to proceed?" END diff --git a/base/applications/mspaint/lang/cs-CZ.rc b/base/applications/mspaint/lang/cs-CZ.rc index 57608b40f96..32d33bf98d2 100644 --- a/base/applications/mspaint/lang/cs-CZ.rc +++ b/base/applications/mspaint/lang/cs-CZ.rc @@ -264,4 +264,5 @@ BEGIN IDS_CANTPASTE "Failed to paste from the clipboard. The data format is either incorrect or not supported." IDS_SAVEERROR "Failed to save the bitmap to file:\n\n%s" IDS_CANTSENDMAIL "Failed to send a mail." + IDS_LOSECOLOR "The color information will be lost in this operation. Are you sure to proceed?" END diff --git a/base/applications/mspaint/lang/de-DE.rc b/base/applications/mspaint/lang/de-DE.rc index fb947b1eeb2..20fb505484f 100644 --- a/base/applications/mspaint/lang/de-DE.rc +++ b/base/applications/mspaint/lang/de-DE.rc @@ -263,4 +263,5 @@ BEGIN IDS_CANTPASTE "Failed to paste from the clipboard. The data format is either incorrect or not supported." IDS_SAVEERROR "Failed to save the bitmap to file:\n\n%s" IDS_CANTSENDMAIL "Failed to send a mail." + IDS_LOSECOLOR "The color information will be lost in this operation. Are you sure to proceed?" END diff --git a/base/applications/mspaint/lang/en-GB.rc b/base/applications/mspaint/lang/en-GB.rc index 9dc21b13c6a..b5267ad1d0e 100644 --- a/base/applications/mspaint/lang/en-GB.rc +++ b/base/applications/mspaint/lang/en-GB.rc @@ -263,4 +263,5 @@ BEGIN IDS_CANTPASTE "Failed to paste from the clipboard. The data format is either incorrect or not supported." IDS_SAVEERROR "Failed to save the bitmap to file:\n\n%s" IDS_CANTSENDMAIL "Failed to send a mail." + IDS_LOSECOLOR "The color information will be lost in this operation. Are you sure to proceed?" END diff --git a/base/applications/mspaint/lang/en-US.rc b/base/applications/mspaint/lang/en-US.rc index 805c239e8d0..987e1ab7449 100644 --- a/base/applications/mspaint/lang/en-US.rc +++ b/base/applications/mspaint/lang/en-US.rc @@ -264,4 +264,5 @@ BEGIN IDS_CANTPASTE "Failed to paste from the clipboard. The data format is either incorrect or not supported." IDS_SAVEERROR "Failed to save the bitmap to file:\n\n%s" IDS_CANTSENDMAIL "Failed to send a mail." + IDS_LOSECOLOR "The color information will be lost in this operation. Are you sure to proceed?" END diff --git a/base/applications/mspaint/lang/es-ES.rc b/base/applications/mspaint/lang/es-ES.rc index a851b972dfc..850307363b6 100644 --- a/base/applications/mspaint/lang/es-ES.rc +++ b/base/applications/mspaint/lang/es-ES.rc @@ -266,4 +266,5 @@ BEGIN IDS_CANTPASTE "Failed to paste from the clipboard. The data format is either incorrect or not supported." IDS_SAVEERROR "Failed to save the bitmap to file:\n\n%s" IDS_CANTSENDMAIL "Failed to send a mail." + IDS_LOSECOLOR "The color information will be lost in this operation. Are you sure to proceed?" END diff --git a/base/applications/mspaint/lang/et-EE.rc b/base/applications/mspaint/lang/et-EE.rc index 78d33480f3a..b3996096fd2 100644 --- a/base/applications/mspaint/lang/et-EE.rc +++ b/base/applications/mspaint/lang/et-EE.rc @@ -263,4 +263,5 @@ BEGIN IDS_CANTPASTE "Failed to paste from the clipboard. The data format is either incorrect or not supported." IDS_SAVEERROR "Failed to save the bitmap to file:\n\n%s" IDS_CANTSENDMAIL "Failed to send a mail." + IDS_LOSECOLOR "The color information will be lost in this operation. Are you sure to proceed?" END diff --git a/base/applications/mspaint/lang/eu-ES.rc b/base/applications/mspaint/lang/eu-ES.rc index f9f38cd2056..708d62466d2 100644 --- a/base/applications/mspaint/lang/eu-ES.rc +++ b/base/applications/mspaint/lang/eu-ES.rc @@ -264,4 +264,5 @@ BEGIN IDS_CANTPASTE "Failed to paste from the clipboard. The data format is either incorrect or not supported." IDS_SAVEERROR "Failed to save the bitmap to file:\n\n%s" IDS_CANTSENDMAIL "Failed to send a mail." + IDS_LOSECOLOR "The color information will be lost in this operation. Are you sure to proceed?" END diff --git a/base/applications/mspaint/lang/fr-FR.rc b/base/applications/mspaint/lang/fr-FR.rc index 8ea08410321..9fd0034abdc 100644 --- a/base/applications/mspaint/lang/fr-FR.rc +++ b/base/applications/mspaint/lang/fr-FR.rc @@ -264,4 +264,5 @@ BEGIN IDS_CANTPASTE "Failed to paste from the clipboard. The data format is either incorrect or not supported." IDS_SAVEERROR "Failed to save the bitmap to file:\n\n%s" IDS_CANTSENDMAIL "Failed to send a mail." + IDS_LOSECOLOR "The color information will be lost in this operation. Are you sure to proceed?" END diff --git a/base/applications/mspaint/lang/he-IL.rc b/base/applications/mspaint/lang/he-IL.rc index 7735f853725..1623e258a0c 100644 --- a/base/applications/mspaint/lang/he-IL.rc +++ b/base/applications/mspaint/lang/he-IL.rc @@ -266,4 +266,5 @@ BEGIN IDS_CANTPASTE "Failed to paste from the clipboard. The data format is either incorrect or not supported." IDS_SAVEERROR "Failed to save the bitmap to file:\n\n%s" IDS_CANTSENDMAIL "Failed to send a mail." + IDS_LOSECOLOR "The color information will be lost in this operation. Are you sure to proceed?" END diff --git a/base/applications/mspaint/lang/hu-HU.rc b/base/applications/mspaint/lang/hu-HU.rc index 03315eabded..07f84d6a3a9 100644 --- a/base/applications/mspaint/lang/hu-HU.rc +++ b/base/applications/mspaint/lang/hu-HU.rc @@ -264,4 +264,5 @@ BEGIN IDS_CANTPASTE "Failed to paste from the clipboard. The data format is either incorrect or not supported." IDS_SAVEERROR "Failed to save the bitmap to file:\n\n%s" IDS_CANTSENDMAIL "Failed to send a mail." + IDS_LOSECOLOR "The color information will be lost in this operation. Are you sure to proceed?" END diff --git a/base/applications/mspaint/lang/id-ID.rc b/base/applications/mspaint/lang/id-ID.rc index eeda00200d3..556aa5efb6c 100644 --- a/base/applications/mspaint/lang/id-ID.rc +++ b/base/applications/mspaint/lang/id-ID.rc @@ -263,4 +263,5 @@ BEGIN IDS_CANTPASTE "Failed to paste from the clipboard. The data format is either incorrect or not supported." IDS_SAVEERROR "Failed to save the bitmap to file:\n\n%s" IDS_CANTSENDMAIL "Failed to send a mail." + IDS_LOSECOLOR "The color information will be lost in this operation. Are you sure to proceed?" END diff --git a/base/applications/mspaint/lang/it-IT.rc b/base/applications/mspaint/lang/it-IT.rc index 63ad7624367..ae66f2a3e33 100644 --- a/base/applications/mspaint/lang/it-IT.rc +++ b/base/applications/mspaint/lang/it-IT.rc @@ -264,4 +264,5 @@ BEGIN IDS_CANTPASTE "Failed to paste from the clipboard. The data format is either incorrect or not supported." IDS_SAVEERROR "Failed to save the bitmap to file:\n\n%s" IDS_CANTSENDMAIL "Failed to send a mail." + IDS_LOSECOLOR "The color information will be lost in this operation. Are you sure to proceed?" END diff --git a/base/applications/mspaint/lang/ja-JP.rc b/base/applications/mspaint/lang/ja-JP.rc index a98a0f73bab..c6e72466acc 100644 --- a/base/applications/mspaint/lang/ja-JP.rc +++ b/base/applications/mspaint/lang/ja-JP.rc @@ -265,4 +265,5 @@ BEGIN IDS_CANTPASTE "クリップボードからの貼り付けに失敗しました。データ形式が間違っているか、未対応です。" IDS_SAVEERROR "次のファイルとして画像を保存するのに失敗しました:\n\n%s" IDS_CANTSENDMAIL "Failed to send a mail." + IDS_LOSECOLOR "The color information will be lost in this operation. Are you sure to proceed?" END diff --git a/base/applications/mspaint/lang/nl-NL.rc b/base/applications/mspaint/lang/nl-NL.rc index 29daec70fc7..199c8be03f7 100644 --- a/base/applications/mspaint/lang/nl-NL.rc +++ b/base/applications/mspaint/lang/nl-NL.rc @@ -263,4 +263,5 @@ BEGIN IDS_CANTPASTE "Failed to paste from the clipboard. The data format is either incorrect or not supported." IDS_SAVEERROR "Failed to save the bitmap to file:\n\n%s" IDS_CANTSENDMAIL "Failed to send a mail." + IDS_LOSECOLOR "The color information will be lost in this operation. Are you sure to proceed?" END diff --git a/base/applications/mspaint/lang/no-NO.rc b/base/applications/mspaint/lang/no-NO.rc index 7a16a4d668f..3cc7679639f 100644 --- a/base/applications/mspaint/lang/no-NO.rc +++ b/base/applications/mspaint/lang/no-NO.rc @@ -263,4 +263,5 @@ BEGIN IDS_CANTPASTE "Failed to paste from the clipboard. The data format is either incorrect or not supported." IDS_SAVEERROR "Failed to save the bitmap to file:\n\n%s" IDS_CANTSENDMAIL "Failed to send a mail." + IDS_LOSECOLOR "The color information will be lost in this operation. Are you sure to proceed?" END diff --git a/base/applications/mspaint/lang/pl-PL.rc b/base/applications/mspaint/lang/pl-PL.rc index b35b2691d2a..04dde3f8aa4 100644 --- a/base/applications/mspaint/lang/pl-PL.rc +++ b/base/applications/mspaint/lang/pl-PL.rc @@ -266,4 +266,5 @@ BEGIN IDS_CANTPASTE "Nie można wkleić ze schowka. Format danych jest nieprawidłowy lub nieobsługiwany." IDS_SAVEERROR "Failed to save the bitmap to file:\n\n%s" IDS_CANTSENDMAIL "Failed to send a mail." + IDS_LOSECOLOR "The color information will be lost in this operation. Are you sure to proceed?" END diff --git a/base/applications/mspaint/lang/pt-BR.rc b/base/applications/mspaint/lang/pt-BR.rc index c551cd77671..fc38012623b 100644 --- a/base/applications/mspaint/lang/pt-BR.rc +++ b/base/applications/mspaint/lang/pt-BR.rc @@ -264,4 +264,5 @@ BEGIN IDS_CANTPASTE "Failed to paste from the clipboard. The data format is either incorrect or not supported." IDS_SAVEERROR "Failed to save the bitmap to file:\n\n%s" IDS_CANTSENDMAIL "Failed to send a mail." + IDS_LOSECOLOR "The color information will be lost in this operation. Are you sure to proceed?" END diff --git a/base/applications/mspaint/lang/pt-PT.rc b/base/applications/mspaint/lang/pt-PT.rc index 7ff2ba98503..7457d339fee 100644 --- a/base/applications/mspaint/lang/pt-PT.rc +++ b/base/applications/mspaint/lang/pt-PT.rc @@ -264,4 +264,5 @@ BEGIN IDS_CANTPASTE "Failed to paste from the clipboard. The data format is either incorrect or not supported." IDS_SAVEERROR "Failed to save the bitmap to file:\n\n%s" IDS_CANTSENDMAIL "Failed to send a mail." + IDS_LOSECOLOR "The color information will be lost in this operation. Are you sure to proceed?" END diff --git a/base/applications/mspaint/lang/ro-RO.rc b/base/applications/mspaint/lang/ro-RO.rc index 447e01c5337..516d15bc335 100644 --- a/base/applications/mspaint/lang/ro-RO.rc +++ b/base/applications/mspaint/lang/ro-RO.rc @@ -265,4 +265,5 @@ BEGIN IDS_CANTPASTE "Nu a putut fi lipit din clipboard. Formatul de date este fie incorect, fie nesuportat." IDS_SAVEERROR "Failed to save the bitmap to file:\n\n%s" IDS_CANTSENDMAIL "Failed to send a mail." + IDS_LOSECOLOR "The color information will be lost in this operation. Are you sure to proceed?" END diff --git a/base/applications/mspaint/lang/ru-RU.rc b/base/applications/mspaint/lang/ru-RU.rc index 125eadbcfdf..94e187feb63 100644 --- a/base/applications/mspaint/lang/ru-RU.rc +++ b/base/applications/mspaint/lang/ru-RU.rc @@ -267,4 +267,5 @@ BEGIN IDS_CANTPASTE "Не удалось вставить из буфера обмена. Формат данных либо некорректный, либо не поддерживается." IDS_SAVEERROR "Не удалось сохранить точечный рисунок в файл:\n\n%s" IDS_CANTSENDMAIL "Failed to send a mail." + IDS_LOSECOLOR "The color information will be lost in this operation. Are you sure to proceed?" END diff --git a/base/applications/mspaint/lang/sk-SK.rc b/base/applications/mspaint/lang/sk-SK.rc index dd80ce12592..16695f6d212 100644 --- a/base/applications/mspaint/lang/sk-SK.rc +++ b/base/applications/mspaint/lang/sk-SK.rc @@ -263,4 +263,5 @@ BEGIN IDS_CANTPASTE "Failed to paste from the clipboard. The data format is either incorrect or not supported." IDS_SAVEERROR "Failed to save the bitmap to file:\n\n%s" IDS_CANTSENDMAIL "Failed to send a mail." + IDS_LOSECOLOR "The color information will be lost in this operation. Are you sure to proceed?" END diff --git a/base/applications/mspaint/lang/sq-AL.rc b/base/applications/mspaint/lang/sq-AL.rc index a60ef9a2774..916fb382a0d 100644 --- a/base/applications/mspaint/lang/sq-AL.rc +++ b/base/applications/mspaint/lang/sq-AL.rc @@ -263,4 +263,5 @@ BEGIN IDS_CANTPASTE "Failed to paste from the clipboard. The data format is either incorrect or not supported." IDS_SAVEERROR "Failed to save the bitmap to file:\n\n%s" IDS_CANTSENDMAIL "Failed to send a mail." + IDS_LOSECOLOR "The color information will be lost in this operation. Are you sure to proceed?" END diff --git a/base/applications/mspaint/lang/sv-SE.rc b/base/applications/mspaint/lang/sv-SE.rc index dfe72b9b0b9..95a379dbdf8 100644 --- a/base/applications/mspaint/lang/sv-SE.rc +++ b/base/applications/mspaint/lang/sv-SE.rc @@ -264,4 +264,5 @@ BEGIN IDS_CANTPASTE "Failed to paste from the clipboard. The data format is either incorrect or not supported." IDS_SAVEERROR "Failed to save the bitmap to file:\n\n%s" IDS_CANTSENDMAIL "Failed to send a mail." + IDS_LOSECOLOR "The color information will be lost in this operation. Are you sure to proceed?" END diff --git a/base/applications/mspaint/lang/tr-TR.rc b/base/applications/mspaint/lang/tr-TR.rc index fab8c39fcc3..42706400c2d 100644 --- a/base/applications/mspaint/lang/tr-TR.rc +++ b/base/applications/mspaint/lang/tr-TR.rc @@ -264,4 +264,5 @@ BEGIN IDS_CANTPASTE "Failed to paste from the clipboard. The data format is either incorrect or not supported." IDS_SAVEERROR "Failed to save the bitmap to file:\n\n%s" IDS_CANTSENDMAIL "Failed to send a mail." + IDS_LOSECOLOR "The color information will be lost in this operation. Are you sure to proceed?" END diff --git a/base/applications/mspaint/lang/uk-UA.rc b/base/applications/mspaint/lang/uk-UA.rc index f0e0676589a..3df7b6724fa 100644 --- a/base/applications/mspaint/lang/uk-UA.rc +++ b/base/applications/mspaint/lang/uk-UA.rc @@ -265,4 +265,5 @@ BEGIN IDS_CANTPASTE "Failed to paste from the clipboard. The data format is either incorrect or not supported." IDS_SAVEERROR "Failed to save the bitmap to file:\n\n%s" IDS_CANTSENDMAIL "Failed to send a mail." + IDS_LOSECOLOR "The color information will be lost in this operation. Are you sure to proceed?" END diff --git a/base/applications/mspaint/lang/vi-VN.rc b/base/applications/mspaint/lang/vi-VN.rc index b1c7c2cc227..6d5847da4b3 100644 --- a/base/applications/mspaint/lang/vi-VN.rc +++ b/base/applications/mspaint/lang/vi-VN.rc @@ -263,4 +263,5 @@ BEGIN IDS_CANTPASTE "Failed to paste from the clipboard. The data format is either incorrect or not supported." IDS_SAVEERROR "Failed to save the bitmap to file:\n\n%s" IDS_CANTSENDMAIL "Failed to send a mail." + IDS_LOSECOLOR "The color information will be lost in this operation. Are you sure to proceed?" END diff --git a/base/applications/mspaint/lang/zh-CN.rc b/base/applications/mspaint/lang/zh-CN.rc index 43fa7f34582..ec8eab59263 100644 --- a/base/applications/mspaint/lang/zh-CN.rc +++ b/base/applications/mspaint/lang/zh-CN.rc @@ -266,4 +266,5 @@ BEGIN IDS_CANTPASTE "Failed to paste from the clipboard. The data format is either incorrect or not supported." IDS_SAVEERROR "Failed to save the bitmap to file:\n\n%s" IDS_CANTSENDMAIL "Failed to send a mail." + IDS_LOSECOLOR "The color information will be lost in this operation. Are you sure to proceed?" END diff --git a/base/applications/mspaint/lang/zh-HK.rc b/base/applications/mspaint/lang/zh-HK.rc index ff88459ddc6..748acf93f03 100644 --- a/base/applications/mspaint/lang/zh-HK.rc +++ b/base/applications/mspaint/lang/zh-HK.rc @@ -264,4 +264,5 @@ BEGIN IDS_CANTPASTE "Failed to paste from the clipboard. The data format is either incorrect or not supported." IDS_SAVEERROR "Failed to save the bitmap to file:\n\n%s" IDS_CANTSENDMAIL "Failed to send a mail." + IDS_LOSECOLOR "The color information will be lost in this operation. Are you sure to proceed?" END diff --git a/base/applications/mspaint/lang/zh-TW.rc b/base/applications/mspaint/lang/zh-TW.rc index 10401e53cb8..d3c35628019 100644 --- a/base/applications/mspaint/lang/zh-TW.rc +++ b/base/applications/mspaint/lang/zh-TW.rc @@ -264,4 +264,5 @@ BEGIN IDS_CANTPASTE "Failed to paste from the clipboard. The data format is either incorrect or not supported." IDS_SAVEERROR "Failed to save the bitmap to file:\n\n%s" IDS_CANTSENDMAIL "Failed to send a mail." + IDS_LOSECOLOR "The color information will be lost in this operation. Are you sure to proceed?" END diff --git a/base/applications/mspaint/resource.h b/base/applications/mspaint/resource.h index 4ec9f9a0f98..310554de200 100644 --- a/base/applications/mspaint/resource.h +++ b/base/applications/mspaint/resource.h @@ -222,3 +222,4 @@ #define IDS_CANTPASTE 940 #define IDS_SAVEERROR 941 #define IDS_CANTSENDMAIL 942 +#define IDS_LOSECOLOR 943 diff --git a/base/applications/mspaint/winproc.cpp b/base/applications/mspaint/winproc.cpp index 7aa25091766..3db01639a34 100644 --- a/base/applications/mspaint/winproc.cpp +++ b/base/applications/mspaint/winproc.cpp @@ -949,7 +949,22 @@ LRESULT CMainWindow::OnCommand(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bH { if (attributesDialog.DoModal(mainWindow.m_hWnd)) { - imageModel.Crop(attributesDialog.newWidth, attributesDialog.newHeight, 0, 0); + if (attributesDialog.m_bBlackAndWhite && !imageModel.IsBlackAndWhite()) + { + CString strText(MAKEINTRESOURCE(IDS_LOSECOLOR)); + CString strTitle(MAKEINTRESOURCE(IDS_PROGRAMNAME)); + INT id = MessageBox(strText, strTitle, MB_ICONINFORMATION | MB_YESNOCANCEL); + if (id != IDYES) + break; + + imageModel.PushBlackAndWhite(); + } + + if (imageModel.GetWidth() != attributesDialog.newWidth || + imageModel.GetHeight() != attributesDialog.newHeight) + { + imageModel.Crop(attributesDialog.newWidth, attributesDialog.newHeight); + } } break; }

1 year, 5 months

[reactos] 01/01: [CONFIGURE] Fix using ninja as a configure switch (#5556)

by Egor Ananyin

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=97f59fa5451fcb397e243… commit 97f59fa5451fcb397e243659db09373702b6c9a4 Author: Egor Ananyin <ananinegor(a)gmail.com> AuthorDate: Thu Aug 10 18:25:06 2023 +0300 Commit: GitHub <noreply(a)github.com> CommitDate: Thu Aug 10 17:25:06 2023 +0200 [CONFIGURE] Fix using ninja as a configure switch (#5556) CORE-19059 This was unhidden by commit 3feb0cfb9. --- configure.cmd | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/configure.cmd b/configure.cmd index 33213aed58d..f8c2cc67669 100755 --- a/configure.cmd +++ b/configure.cmd @@ -84,6 +84,8 @@ REM Parse command line parameters set CMAKE_GENERATOR="Eclipse CDT4 - MinGW Makefiles" ) else if /I "%1" == "Makefiles" ( set CMAKE_GENERATOR="MinGW Makefiles" + ) else if /I "%1" == "Ninja" ( + set CMAKE_GENERATOR="Ninja" ) else if /I "%1" == "VSSolution" ( echo. && echo Error: Creation of VS Solution files is not supported in a MinGW environment. echo Please run this command in a [Developer] Command Prompt for Visual Studio. @@ -107,6 +109,8 @@ REM Parse command line parameters set CMAKE_GENERATOR="Eclipse CDT4 - NMake Makefiles" ) else if /I "%1" == "Makefiles" ( set CMAKE_GENERATOR="NMake Makefiles" + ) else if /I "%1" == "Ninja" ( + set CMAKE_GENERATOR="Ninja" ) else if /I "%1" == "clang" ( set USE_CLANG_CL=1 ) else if /I "%1" == "VSSolution" (

1 year, 5 months

[reactos] 01/01: [WINESYNC][COMCTL32] Listview: Initialize marqueeRect from left-click coordinates before starting a marquee highlight (#5555)

by Thamatip Chitpong

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=918a8180718f0901e231b… commit 918a8180718f0901e231b12fe2274b82baa926b6 Author: Thamatip Chitpong <thamatip.chitpong(a)reactos.org> AuthorDate: Thu Aug 10 22:11:43 2023 +0700 Commit: GitHub <noreply(a)github.com> CommitDate: Thu Aug 10 17:11:43 2023 +0200 [WINESYNC][COMCTL32] Listview: Initialize marqueeRect from left-click coordinates before starting a marquee highlight (#5555) The infoPtr->marqueeRect structure is not currently initialized before the marquee highlight sequence starts, resulting in the RECT having initial coordinates of (0,0)-(0,0). These coordinates cause the first item in the listview control to be identified as being within the range of the marqueeRect's coordinates. That item is then set to LVIS_SELECTED even though it is not part of the marquee selection. Wine commit: daf95aaadf3a59f0ccc129a853327417b5e4f07c author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Mon, 26 Apr 2021 10:59:51 +0000 (20:59 +1000) --- dll/win32/comctl32/listview.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dll/win32/comctl32/listview.c b/dll/win32/comctl32/listview.c index 2052b66e6a9..9d6609ffd71 100644 --- a/dll/win32/comctl32/listview.c +++ b/dll/win32/comctl32/listview.c @@ -4218,6 +4218,7 @@ static LRESULT LISTVIEW_MouseMove(LISTVIEW_INFO *infoPtr, WORD fwKeys, INT x, IN /* Begin selection and capture mouse */ infoPtr->bMarqueeSelect = TRUE; + infoPtr->marqueeRect = rect; SetCapture(infoPtr->hwndSelf); } }

1 year, 5 months

[reactos] 01/01: [NTUSER] Fix SPI_SETFONTSMOOTHING behavior (#5526)

by Carl J. Bialorucki

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=c64103d55f2be9dc42f6b… commit c64103d55f2be9dc42f6b052abf7bc8a6c47c53b Author: Carl J. Bialorucki <cbialo2(a)outlook.com> AuthorDate: Thu Aug 10 09:10:51 2023 -0600 Commit: GitHub <noreply(a)github.com> CommitDate: Thu Aug 10 17:10:51 2023 +0200 [NTUSER] Fix SPI_SETFONTSMOOTHING behavior (#5526) CORE-19092 Fixes the behavior of the SPI_SETFONTSMOOTHING system parameter. This also fixes a bug when trying to select "Use the following method to smooth edges of screen fonts" in desk.cpl. Instead of checking if uiParam is equal to two, treat uiParam as a Boolean that sets font smoothing on or off. This is the correct behavior according to Microsoft documentation. Use SpiStoreSzInt method instead of SpiStoreSz to store the value in the registry. --- win32ss/user/ntuser/sysparams.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/win32ss/user/ntuser/sysparams.c b/win32ss/user/ntuser/sysparams.c index 47349cedd37..552a63e1f6a 100644 --- a/win32ss/user/ntuser/sysparams.c +++ b/win32ss/user/ntuser/sysparams.c @@ -1404,10 +1404,10 @@ SpiGetSet(UINT uiAction, UINT uiParam, PVOID pvParam, FLONG fl) return SpiGetInt(pvParam, &gspv.bFontSmoothing, fl); case SPI_SETFONTSMOOTHING: - gspv.bFontSmoothing = (uiParam == 2); + gspv.bFontSmoothing = !!uiParam; if (fl & SPIF_UPDATEINIFILE) { - SpiStoreSz(KEY_DESKTOP, VAL_FONTSMOOTHING, (uiParam == 2) ? L"2" : L"0"); + SpiStoreSzInt(KEY_DESKTOP, VAL_FONTSMOOTHING, gspv.bFontSmoothing ? 2 : 0); } return (UINT_PTR)KEY_DESKTOP;

1 year, 5 months

[reactos] 01/01: [EXPLORER] Set icon size and show or hide desktop button from taskbar properties (#5510)

by Carl J. Bialorucki

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=28ae9fb73841e917a7c49… commit 28ae9fb73841e917a7c49d8e2b88a77f911dc895 Author: Carl J. Bialorucki <cbialo2(a)outlook.com> AuthorDate: Thu Aug 10 09:06:55 2023 -0600 Commit: GitHub <noreply(a)github.com> CommitDate: Thu Aug 10 17:06:55 2023 +0200 [EXPLORER] Set icon size and show or hide desktop button from taskbar properties (#5510) CORE-11698, CORE-15369 Allows a user to set the icon size and show or hide the desktop button in the taskbar using the taskbar properties menu. After applying these changes, the taskbar updates and resizes without requiring a restart. - This PR moves the 'Notification Area' section into its own separate tab. This allows us to include more options for users without increasing the size of the window. It is also very similar to the Windows Vista taskbar properties menu. - Some minor changes to allow the taskbar to refresh its view when the icon size or show desktop button setting changes. --- base/shell/explorer/lang/bg-BG.rc | 27 ++++-- base/shell/explorer/lang/cs-CZ.rc | 27 ++++-- base/shell/explorer/lang/de-DE.rc | 27 ++++-- base/shell/explorer/lang/en-US.rc | 27 ++++-- base/shell/explorer/lang/es-ES.rc | 51 ++++++----- base/shell/explorer/lang/et-EE.rc | 27 ++++-- base/shell/explorer/lang/eu-ES.rc | 27 ++++-- base/shell/explorer/lang/fi-FI.rc | 27 ++++-- base/shell/explorer/lang/fr-FR.rc | 27 ++++-- base/shell/explorer/lang/he-IL.rc | 27 ++++-- base/shell/explorer/lang/hi-IN.rc | 27 ++++-- base/shell/explorer/lang/hu-HU.rc | 27 ++++-- base/shell/explorer/lang/id-ID.rc | 27 ++++-- base/shell/explorer/lang/it-IT.rc | 27 ++++-- base/shell/explorer/lang/ja-JP.rc | 27 ++++-- base/shell/explorer/lang/ko-KR.rc | 27 ++++-- base/shell/explorer/lang/lt-LT.rc | 28 ++++-- base/shell/explorer/lang/ms-MY.rc | 27 ++++-- base/shell/explorer/lang/nl-NL.rc | 27 ++++-- base/shell/explorer/lang/no-NO.rc | 28 ++++-- base/shell/explorer/lang/pl-PL.rc | 27 ++++-- base/shell/explorer/lang/pt-BR.rc | 27 ++++-- base/shell/explorer/lang/pt-PT.rc | 27 ++++-- base/shell/explorer/lang/ro-RO.rc | 27 ++++-- base/shell/explorer/lang/ru-RU.rc | 27 ++++-- base/shell/explorer/lang/sk-SK.rc | 27 ++++-- base/shell/explorer/lang/sq-AL.rc | 27 ++++-- base/shell/explorer/lang/tr-TR.rc | 27 ++++-- base/shell/explorer/lang/uk-UA.rc | 27 ++++-- base/shell/explorer/lang/zh-CN.rc | 27 ++++-- base/shell/explorer/lang/zh-HK.rc | 27 ++++-- base/shell/explorer/lang/zh-TW.rc | 27 ++++-- base/shell/explorer/precomp.h | 1 + base/shell/explorer/resource.h | 33 +++++--- base/shell/explorer/settings.cpp | 4 + base/shell/explorer/taskswnd.cpp | 14 ++- base/shell/explorer/trayprop.cpp | 173 +++++++++++++++++++++++++------------- base/shell/explorer/traywnd.cpp | 25 +++--- 38 files changed, 787 insertions(+), 353 deletions(-) diff --git a/base/shell/explorer/lang/bg-BG.rc b/base/shell/explorer/lang/bg-BG.rc index 6bf40cd0ca3..f4efc7fc621 100644 --- a/base/shell/explorer/lang/bg-BG.rc +++ b/base/shell/explorer/lang/bg-BG.rc @@ -72,20 +72,14 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYS CAPTION "Лентата със задачите" FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN - GROUPBOX "Изглед на лентата със задачите", IDC_STATIC, 6, 6, 240, 104 + GROUPBOX "Изглед на лентата със задачите", IDC_STATIC, 6, 6, 240, 120 CONTROL "", IDC_TASKBARPROP_TASKBARBITMAP, "Static", SS_BITMAP | SS_SUNKEN | SS_CENTERIMAGE, 12, 18, 229, 24 AUTOCHECKBOX "Заключване на лентата със задачите", IDC_TASKBARPROP_LOCK, 13, 45, 200, 10 AUTOCHECKBOX "Автоматично скриване на лентата със задачите", IDC_TASKBARPROP_HIDE, 13, 58, 200, 10 AUTOCHECKBOX "Лентата със задачите стои над останалите прозорци", IDC_TASKBARPROP_ONTOP, 13, 71, 200, 10 AUTOCHECKBOX "Групиране на приложенията в лентата със задачите", IDC_TASKBARPROP_GROUP, 13, 84, 200, 10 AUTOCHECKBOX "Показване на бърз старт", IDC_TASKBARPROP_SHOWQL, 13, 97, 200, 10 - GROUPBOX "Зона за уведомления", IDC_STATIC, 6, 114, 240, 98 - CONTROL "", IDC_TASKBARPROP_NOTIFICATIONBITMAP, "Static", SS_BITMAP | SS_SUNKEN | SS_CENTERIMAGE, 12, 126, 229, 24 - AUTOCHECKBOX "&Часовник", IDC_TASKBARPROP_CLOCK, 13, 153, 80, 10 - AUTOCHECKBOX "Покажи секундите", IDC_TASKBARPROP_SECONDS, 120, 153, 80, 10, WS_DISABLED - LTEXT "Можете да поддържате лентата подредена, като скривате приложенията, върху които скоро не сте стартирали.", IDC_STATIC, 13, 169, 223, 16, WS_DISABLED - AUTOCHECKBOX "Скриване на неактивните иконки", IDC_TASKBARPROP_HIDEICONS, 13, 191, 125, 10 - PUSHBUTTON "Персонализиране...", IDC_TASKBARPROP_ICONCUST, 168, 191, 70, 14 + AUTOCHECKBOX "Use small icons", IDC_TASKBARPROP_SMALLICONS, 13, 110, 200, 10 END IDD_TASKBARPROP_STARTMENU DIALOGEX 0, 0, 252, 218 @@ -102,6 +96,23 @@ BEGIN PUSHBUTTON "&Персонализиране...", IDC_TASKBARPROP_STARTMENUCLASSICCUST, 192, 172, 53, 14 END +IDD_TASKBARPROP_NOTIFY DIALOGEX 0, 0, 252, 218 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Зона за уведомления" +FONT 8, "MS Shell Dlg", 0, 0, 0x1 +BEGIN + CONTROL "", IDC_TASKBARPROP_NOTIFICATIONBITMAP, "Static", SS_BITMAP | SS_SUNKEN | SS_CENTERIMAGE, 12, 6, 229, 24 + GROUPBOX "Icons", IDC_STATIC, 6, 36, 240, 56 + LTEXT "Можете да поддържате лентата подредена, като скривате приложенията, върху които скоро не сте стартирали.", IDC_STATIC, 13, 48, 223, 16 + AUTOCHECKBOX "Скриване на неактивните иконки", IDC_TASKBARPROP_HIDEICONS, 13, 70, 125, 10 + PUSHBUTTON "Персонализиране...", IDC_TASKBARPROP_ICONCUST, 168, 70, 70, 14 + GROUPBOX "System icons", IDC_STATIC, 6, 99, 240, 56 + LTEXT "Select which system icons to always show.", IDC_STATIC, 13, 113, 223, 8 + AUTOCHECKBOX "&Часовник", IDC_TASKBARPROP_CLOCK, 13, 127, 80, 10 + AUTOCHECKBOX "Покажи секундите", IDC_TASKBARPROP_SECONDS, 120, 127, 80, 10, WS_DISABLED + AUTOCHECKBOX "Desktop", IDC_TASKBARPROP_DESKTOP, 13, 140, 80, 10 +END + IDD_NOTIFICATIONS_CUSTOMIZE DIALOGEX 0, 0, 232, 240 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_DLGFRAME EXSTYLE WS_EX_CONTEXTHELP diff --git a/base/shell/explorer/lang/cs-CZ.rc b/base/shell/explorer/lang/cs-CZ.rc index 087b85b75fc..af53b5a26dc 100644 --- a/base/shell/explorer/lang/cs-CZ.rc +++ b/base/shell/explorer/lang/cs-CZ.rc @@ -71,20 +71,14 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYS CAPTION "Hlavní panel" FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN - GROUPBOX "Vzhled hlavního panelu", IDC_STATIC, 6, 6, 240, 104 + GROUPBOX "Vzhled hlavního panelu", IDC_STATIC, 6, 6, 240, 120 CONTROL "", IDC_TASKBARPROP_TASKBARBITMAP, "Static", SS_BITMAP | SS_SUNKEN | SS_CENTERIMAGE, 12, 18, 229, 24 AUTOCHECKBOX "Uzamknout &hlavní panel", IDC_TASKBARPROP_LOCK, 13, 45, 200, 10 AUTOCHECKBOX "&Automaticky sktývat hlavní panel", IDC_TASKBARPROP_HIDE, 13, 58, 200, 10 AUTOCHECKBOX "&Zobrazit hlavní panel nad ostatními okny", IDC_TASKBARPROP_ONTOP, 13, 71, 200, 10 AUTOCHECKBOX "&Seskupovat podobná tlačítka hlavního panelu", IDC_TASKBARPROP_GROUP, 13, 84, 200, 10 AUTOCHECKBOX "Zobrazit &panel Snadné spuštění", IDC_TASKBARPROP_SHOWQL, 13, 97, 200, 10 - GROUPBOX "Oznamovací oblast", IDC_STATIC, 6, 114, 240, 99 - CONTROL "", IDC_TASKBARPROP_NOTIFICATIONBITMAP, "Static", SS_BITMAP | SS_SUNKEN | SS_CENTERIMAGE, 12, 126, 229, 24 - AUTOCHECKBOX "&Zobrazit hodiny", IDC_TASKBARPROP_CLOCK, 13, 153, 80, 10 - AUTOCHECKBOX "Zobrazit sekundy", IDC_TASKBARPROP_SECONDS, 120, 153, 80, 10, WS_DISABLED - LTEXT "Přehlednost oznamovací oblasti lze zachovat pomocí skrytí nepoužívaných ikon.", IDC_STATIC, 13, 169, 223, 16 - AUTOCHECKBOX "Sk&rýt neaktivní ikony", IDC_TASKBARPROP_HIDEICONS, 13, 191, 125, 10 - PUSHBUTTON "&Upravit...", IDC_TASKBARPROP_ICONCUST, 188, 191, 50, 14 + AUTOCHECKBOX "Use small icons", IDC_TASKBARPROP_SMALLICONS, 13, 110, 200, 10 END IDD_TASKBARPROP_STARTMENU DIALOGEX 0, 0, 252, 218 @@ -101,6 +95,23 @@ BEGIN PUSHBUTTON "Up&ravit...", IDC_TASKBARPROP_STARTMENUCLASSICCUST, 192, 172, 53, 14 END +IDD_TASKBARPROP_NOTIFY DIALOGEX 0, 0, 252, 218 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Oznamovací oblast" +FONT 8, "MS Shell Dlg", 0, 0, 0x1 +BEGIN + CONTROL "", IDC_TASKBARPROP_NOTIFICATIONBITMAP, "Static", SS_BITMAP | SS_SUNKEN | SS_CENTERIMAGE, 12, 6, 229, 24 + GROUPBOX "Icons", IDC_STATIC, 6, 36, 240, 56 + LTEXT "Přehlednost oznamovací oblasti lze zachovat pomocí skrytí nepoužívaných ikon.", IDC_STATIC, 13, 48, 223, 16 + AUTOCHECKBOX "Sk&rýt neaktivní ikony", IDC_TASKBARPROP_HIDEICONS, 13, 70, 125, 10 + PUSHBUTTON "&Upravit...", IDC_TASKBARPROP_ICONCUST, 188, 70, 50, 14 + GROUPBOX "System icons", IDC_STATIC, 6, 99, 240, 56 + LTEXT "Select which system icons to always show.", IDC_STATIC, 13, 113, 223, 8 + AUTOCHECKBOX "&Zobrazit hodiny", IDC_TASKBARPROP_CLOCK, 13, 127, 80, 10 + AUTOCHECKBOX "Zobrazit sekundy", IDC_TASKBARPROP_SECONDS, 120, 127, 80, 10, WS_DISABLED + AUTOCHECKBOX "Desktop", IDC_TASKBARPROP_DESKTOP, 13, 140, 80, 10 +END + IDD_NOTIFICATIONS_CUSTOMIZE DIALOGEX 0, 0, 232, 240 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_DLGFRAME EXSTYLE WS_EX_CONTEXTHELP diff --git a/base/shell/explorer/lang/de-DE.rc b/base/shell/explorer/lang/de-DE.rc index 2a7a898923e..9de204a5e59 100644 --- a/base/shell/explorer/lang/de-DE.rc +++ b/base/shell/explorer/lang/de-DE.rc @@ -75,20 +75,14 @@ STYLE DS_FIXEDSYS | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSM CAPTION "Taskleiste" FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN - GROUPBOX "Taskleiste", IDC_STATIC, 6, 6, 240, 104 + GROUPBOX "Taskleiste", IDC_STATIC, 6, 6, 240, 120 CONTROL "", IDC_TASKBARPROP_TASKBARBITMAP, "Static", SS_BITMAP | SS_SUNKEN | SS_CENTERIMAGE, 12, 18, 229, 24 AUTOCHECKBOX "Task&leiste fixieren", IDC_TASKBARPROP_LOCK, 13, 45, 200, 10 AUTOCHECKBOX "Taskleiste a&utom. verstecken", IDC_TASKBARPROP_HIDE, 13, 58, 200, 10 AUTOCHECKBOX "&Taskleiste immer im Vordergrund halten", IDC_TASKBARPROP_ONTOP, 13, 71, 200, 10 AUTOCHECKBOX "Ähnliche Buttons &gruppieren", IDC_TASKBARPROP_GROUP, 13, 84, 200, 10 AUTOCHECKBOX "Schnellstartleiste &anzeigen", IDC_TASKBARPROP_SHOWQL, 13, 97, 200, 10 - GROUPBOX "Benachrichtigungsfeld", IDC_STATIC, 6, 114, 240, 98 - CONTROL "", IDC_TASKBARPROP_NOTIFICATIONBITMAP, "Static", SS_BITMAP | SS_SUNKEN | SS_CENTERIMAGE, 12, 126, 229, 24 - AUTOCHECKBOX "&Uhr Anzeigen", IDC_TASKBARPROP_CLOCK, 13, 153, 80, 10 - AUTOCHECKBOX "Sekunden Anzeigen", IDC_TASKBARPROP_SECONDS, 120, 153, 80, 10, WS_DISABLED - LTEXT "Das Benachrichtigungsfeld kann übersichtlich gestaltet werden, indem selten verwendete Symbole ausgeblendet werden.", IDC_STATIC, 13, 169, 223, 16 - AUTOCHECKBOX "&Inaktive Symbole ausblenden", IDC_TASKBARPROP_HIDEICONS, 13, 191, 125, 10 - PUSHBUTTON "An&passen...", IDC_TASKBARPROP_ICONCUST, 188, 191, 50, 14 + AUTOCHECKBOX "Use small icons", IDC_TASKBARPROP_SMALLICONS, 13, 110, 200, 10 END IDD_TASKBARPROP_STARTMENU DIALOGEX 0, 0, 252, 218 @@ -105,6 +99,23 @@ BEGIN PUSHBUTTON "An&passen...", IDC_TASKBARPROP_STARTMENUCLASSICCUST, 192, 172, 53, 14 END +IDD_TASKBARPROP_NOTIFY DIALOGEX 0, 0, 252, 218 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Benachrichtigungsfeld" +FONT 8, "MS Shell Dlg", 0, 0, 0x1 +BEGIN + CONTROL "", IDC_TASKBARPROP_NOTIFICATIONBITMAP, "Static", SS_BITMAP | SS_SUNKEN | SS_CENTERIMAGE, 12, 6, 229, 24 + GROUPBOX "Icons", IDC_STATIC, 6, 36, 240, 56 + LTEXT "Das Benachrichtigungsfeld kann übersichtlich gestaltet werden, indem selten verwendete Symbole ausgeblendet werden.", IDC_STATIC, 13, 48, 223, 16 + AUTOCHECKBOX "&Inaktive Symbole ausblenden", IDC_TASKBARPROP_HIDEICONS, 13, 70, 125, 10 + PUSHBUTTON "An&passen...", IDC_TASKBARPROP_ICONCUST, 188, 70, 50, 14 + GROUPBOX "System icons", IDC_STATIC, 6, 99, 240, 56 + LTEXT "Select which system icons to always show.", IDC_STATIC, 13, 113, 223, 8 + AUTOCHECKBOX "&Uhr Anzeigen", IDC_TASKBARPROP_CLOCK, 13, 127, 80, 10 + AUTOCHECKBOX "Sekunden Anzeigen", IDC_TASKBARPROP_SECONDS, 120, 127, 80, 10, WS_DISABLED + AUTOCHECKBOX "Desktop", IDC_TASKBARPROP_DESKTOP, 13, 140, 80, 10 +END + IDD_NOTIFICATIONS_CUSTOMIZE DIALOGEX 0, 0, 232, 240 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_DLGFRAME EXSTYLE WS_EX_CONTEXTHELP diff --git a/base/shell/explorer/lang/en-US.rc b/base/shell/explorer/lang/en-US.rc index d71ba82e66f..dcb82674148 100644 --- a/base/shell/explorer/lang/en-US.rc +++ b/base/shell/explorer/lang/en-US.rc @@ -71,20 +71,14 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYS CAPTION "Taskbar" FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN - GROUPBOX "Taskbar appearance", IDC_STATIC, 6, 6, 240, 104 + GROUPBOX "Taskbar appearance", IDC_STATIC, 6, 6, 240, 120 CONTROL "", IDC_TASKBARPROP_TASKBARBITMAP, "Static", SS_BITMAP | SS_SUNKEN | SS_CENTERIMAGE, 12, 18, 229, 24 AUTOCHECKBOX "&Lock the taskbar", IDC_TASKBARPROP_LOCK, 13, 45, 200, 10 AUTOCHECKBOX "A&uto-hide the taskbar", IDC_TASKBARPROP_HIDE, 13, 58, 200, 10 AUTOCHECKBOX "Keep the &taskbar on top of other windows", IDC_TASKBARPROP_ONTOP, 13, 71, 200, 10 AUTOCHECKBOX "&Group similar taskbar buttons", IDC_TASKBARPROP_GROUP, 13, 84, 200, 10 AUTOCHECKBOX "Show &Quick Launch", IDC_TASKBARPROP_SHOWQL, 13, 97, 200, 10 - GROUPBOX "Notification area", IDC_STATIC, 6, 114, 240, 98 - CONTROL "", IDC_TASKBARPROP_NOTIFICATIONBITMAP, "Static", SS_BITMAP | SS_SUNKEN | SS_CENTERIMAGE, 12, 126, 229, 24 - AUTOCHECKBOX "Show Cloc&k", IDC_TASKBARPROP_CLOCK, 13, 153, 80, 10 - AUTOCHECKBOX "Show seconds", IDC_TASKBARPROP_SECONDS, 120, 153, 80, 10, WS_DISABLED - LTEXT "You can keep the notification area uncluttered by hiding icons that you have not clicked recently.", IDC_STATIC, 13, 169, 223, 16 - AUTOCHECKBOX "&Hide inactive icons", IDC_TASKBARPROP_HIDEICONS, 13, 191, 125, 10 - PUSHBUTTON "&Customize...", IDC_TASKBARPROP_ICONCUST, 188, 191, 50, 14 + AUTOCHECKBOX "U&se small icons", IDC_TASKBARPROP_SMALLICONS, 13, 110, 200, 10 END IDD_TASKBARPROP_STARTMENU DIALOGEX 0, 0, 252, 218 @@ -101,6 +95,23 @@ BEGIN PUSHBUTTON "&Customize...", IDC_TASKBARPROP_STARTMENUCLASSICCUST, 192, 172, 53, 14 END +IDD_TASKBARPROP_NOTIFY DIALOGEX 0, 0, 252, 218 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Notification Area" +FONT 8, "MS Shell Dlg", 0, 0, 0x1 +BEGIN + CONTROL "", IDC_TASKBARPROP_NOTIFICATIONBITMAP, "Static", SS_BITMAP | SS_SUNKEN | SS_CENTERIMAGE, 12, 6, 229, 24 + GROUPBOX "Icons", IDC_STATIC, 6, 36, 240, 56 + LTEXT "You can keep the notification area uncluttered by hiding icons that you have not clicked recently.", IDC_STATIC, 13, 48, 223, 16 + AUTOCHECKBOX "&Hide inactive icons", IDC_TASKBARPROP_HIDEICONS, 13, 70, 125, 10 + PUSHBUTTON "&Customize...", IDC_TASKBARPROP_ICONCUST, 188, 70, 50, 14 + GROUPBOX "System icons", IDC_STATIC, 6, 99, 240, 56 + LTEXT "Select which system icons to always show.", IDC_STATIC, 13, 113, 223, 8 + AUTOCHECKBOX "Cloc&k", IDC_TASKBARPROP_CLOCK, 13, 127, 80, 10 + AUTOCHECKBOX "Show seconds", IDC_TASKBARPROP_SECONDS, 120, 127, 80, 10, WS_DISABLED + AUTOCHECKBOX "&Desktop", IDC_TASKBARPROP_DESKTOP, 13, 140, 80, 10 +END + IDD_NOTIFICATIONS_CUSTOMIZE DIALOGEX 0, 0, 232, 240 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_DLGFRAME EXSTYLE WS_EX_CONTEXTHELP diff --git a/base/shell/explorer/lang/es-ES.rc b/base/shell/explorer/lang/es-ES.rc index e11e13b7521..72656875165 100644 --- a/base/shell/explorer/lang/es-ES.rc +++ b/base/shell/explorer/lang/es-ES.rc @@ -75,20 +75,14 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYS CAPTION "Barra de tareas" FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN - GROUPBOX "Apariencia de la barra de tareas ", IDC_STATIC, 6,6,240,104 + GROUPBOX "Apariencia de la barra de tareas", IDC_STATIC, 6, 6, 240, 120 CONTROL "", IDC_TASKBARPROP_TASKBARBITMAP, "Static", SS_BITMAP | SS_SUNKEN | SS_CENTERIMAGE, 12, 18, 229, 24 - AUTOCHECKBOX "&Bloquear la barra de tareas", IDC_TASKBARPROP_LOCK, 13,45,200,10 - AUTOCHECKBOX "Ocultar automáticam&ente la barra de tareas", IDC_TASKBARPROP_HIDE, 13,58,200,10 - AUTOCHECKBOX "Mantener la barra de tareas &siempre visible", IDC_TASKBARPROP_ONTOP, 13,71,200,10 - AUTOCHECKBOX "&Agrupar botones similares de la barra de tareas", IDC_TASKBARPROP_GROUP, 13,84,200,10 - AUTOCHECKBOX "Mostrar Inicio rápi&do", IDC_TASKBARPROP_SHOWQL, 13,97,200,10 - GROUPBOX "Área de notificaciones", IDC_STATIC, 6, 114, 240, 98 - CONTROL "", IDC_TASKBARPROP_NOTIFICATIONBITMAP, "Static", SS_BITMAP | SS_SUNKEN | SS_CENTERIMAGE, 12, 126, 229, 24 - AUTOCHECKBOX "Re&loj", IDC_TASKBARPROP_CLOCK, 13, 153, 80, 10 - AUTOCHECKBOX "Mostrar segundos", IDC_TASKBARPROP_SECONDS, 120, 153, 80, 10, WS_DISABLED - LTEXT "Puede mantener libre el área de notifación ocultando iconos que no se han usado recientemente.", IDC_STATIC, 13, 169, 223, 16 - AUTOCHECKBOX "Ocultar &iconos inactivos", IDC_TASKBARPROP_HIDEICONS, 13, 191, 125, 10 - PUSHBUTTON "&Personalizar...", IDC_TASKBARPROP_ICONCUST, 184, 191, 50, 14 + AUTOCHECKBOX "&Bloquear la barra de tareas", IDC_TASKBARPROP_LOCK, 13, 45, 200, 10 + AUTOCHECKBOX "Ocultar automáticam&ente la barra de tareas", IDC_TASKBARPROP_HIDE, 13, 58, 200, 10 + AUTOCHECKBOX "Mantener la barra de tareas &siempre visible", IDC_TASKBARPROP_ONTOP, 13, 71, 200, 10 + AUTOCHECKBOX "&Agrupar botones similares de la barra de tareas", IDC_TASKBARPROP_GROUP, 13, 84, 200, 10 + AUTOCHECKBOX "Mostrar Inicio rápi&do", IDC_TASKBARPROP_SHOWQL, 13, 97, 200, 10 + AUTOCHECKBOX "Use small icons", IDC_TASKBARPROP_SMALLICONS, 13, 110, 200, 10 END IDD_TASKBARPROP_STARTMENU DIALOGEX 0, 0, 252, 218 @@ -96,13 +90,30 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYS CAPTION "Menú Inicio" FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN - CONTROL "", IDC_TASKBARPROP_STARTMENU_BITMAP, "Static", SS_BITMAP | SS_SUNKEN,7, 7, 183, 108 - AUTORADIOBUTTON "&Menú inicio", IDC_TASKBARPROP_STARTMENU, 7,135,105,10 - LTEXT "Este estilo de menú proporciona un rápido acceso a las carpetas, programas favoritos, y búsquedas.", IDC_TASKBARPROP_STARTMENUMODERNTEXT, 20,145,150,24 - PUSHBUTTON "&Personalizar...", IDC_TASKBARPROP_STARTMENUCUST, 192,132,53,14 - AUTORADIOBUTTON "Menú Inicio &clásico", IDC_TASKBARPROP_STARTMENUCLASSIC, 7,175,105,10 - LTEXT "Este estilo de menú le proporciona el aspecto y funcionalidad clásicas.",IDC_TASKBARPROP_STARTMENUCLASSICTEXT,20,185,150,24 - PUSHBUTTON "P&ersonalizar...", IDC_TASKBARPROP_STARTMENUCLASSICCUST, 192,172,53,14 + CONTROL "", IDC_TASKBARPROP_STARTMENU_BITMAP, "Static", SS_BITMAP | SS_SUNKEN, 7, 7, 183, 108 + AUTORADIOBUTTON "&Menú inicio", IDC_TASKBARPROP_STARTMENU, 7, 135, 105, 10 + LTEXT "Este estilo de menú proporciona un rápido acceso a las carpetas, programas favoritos, y búsquedas.", IDC_TASKBARPROP_STARTMENUMODERNTEXT, 20, 145, 150, 24 + PUSHBUTTON "&Personalizar...", IDC_TASKBARPROP_STARTMENUCUST, 192, 132, 53, 14 + AUTORADIOBUTTON "Menú Inicio &clásico", IDC_TASKBARPROP_STARTMENUCLASSIC, 7, 175, 105, 10 + LTEXT "Este estilo de menú le proporciona el aspecto y funcionalidad clásicas.",IDC_TASKBARPROP_STARTMENUCLASSICTEXT, 20, 185, 150, 24 + PUSHBUTTON "P&ersonalizar...", IDC_TASKBARPROP_STARTMENUCLASSICCUST, 192, 172, 53, 14 +END + +IDD_TASKBARPROP_NOTIFY DIALOGEX 0, 0, 252, 218 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Área de notificaciones" +FONT 8, "MS Shell Dlg", 0, 0, 0x1 +BEGIN + CONTROL "", IDC_TASKBARPROP_NOTIFICATIONBITMAP, "Static", SS_BITMAP | SS_SUNKEN | SS_CENTERIMAGE, 12, 6, 229, 24 + GROUPBOX "Icons", IDC_STATIC, 6, 36, 240, 56 + LTEXT "Puede mantener libre el área de notifación ocultando iconos que no se han usado recientemente.", IDC_STATIC, 13, 48, 223, 16 + AUTOCHECKBOX "Ocultar &iconos inactivos", IDC_TASKBARPROP_HIDEICONS, 13, 70, 125, 10 + PUSHBUTTON "&Personalizar...", IDC_TASKBARPROP_ICONCUST, 184, 70, 50, 14 + GROUPBOX "System icons", IDC_STATIC, 6, 99, 240, 56 + LTEXT "Select which system icons to always show.", IDC_STATIC, 13, 113, 223, 8 + AUTOCHECKBOX "Re&loj", IDC_TASKBARPROP_CLOCK, 13, 127, 80, 10 + AUTOCHECKBOX "Mostrar segundos", IDC_TASKBARPROP_SECONDS, 120, 127, 80, 10, WS_DISABLED + AUTOCHECKBOX "Desktop", IDC_TASKBARPROP_DESKTOP, 13, 140, 80, 10 END IDD_NOTIFICATIONS_CUSTOMIZE DIALOGEX 0, 0, 232, 240 diff --git a/base/shell/explorer/lang/et-EE.rc b/base/shell/explorer/lang/et-EE.rc index 39f1169661c..bcf309d01e9 100644 --- a/base/shell/explorer/lang/et-EE.rc +++ b/base/shell/explorer/lang/et-EE.rc @@ -71,20 +71,14 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYS CAPTION "Tegumiriba" FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN - GROUPBOX "Tegumiriba ilme", IDC_STATIC, 6, 6, 240, 104 + GROUPBOX "Tegumiriba ilme", IDC_STATIC, 6, 6, 240, 120 CONTROL "", IDC_TASKBARPROP_TASKBARBITMAP, "Static", SS_BITMAP | SS_SUNKEN | SS_CENTERIMAGE, 12, 18, 229, 24 AUTOCHECKBOX "&Lukusta tegumiriba", IDC_TASKBARPROP_LOCK, 13, 45, 200, 10 AUTOCHECKBOX "Peida tegumiriba &automaatselt", IDC_TASKBARPROP_HIDE, 13, 58, 200, 10 AUTOCHECKBOX "Hoia &tegumiriba muude akende peall", IDC_TASKBARPROP_ONTOP, 13, 71, 200, 10 AUTOCHECKBOX "&Rühmita sarnased tegumiriba nupud", IDC_TASKBARPROP_GROUP, 13, 84, 200, 10 AUTOCHECKBOX "Kuva &kiirkäivitusikoonid", IDC_TASKBARPROP_SHOWQL, 13, 97, 200, 10 - GROUPBOX "Olekuala", IDC_STATIC, 6, 114, 240, 98 - CONTROL "", IDC_TASKBARPROP_NOTIFICATIONBITMAP, "Static", SS_BITMAP | SS_SUNKEN | SS_CENTERIMAGE, 12, 126, 229, 24 - AUTOCHECKBOX "Kuva &kell", IDC_TASKBARPROP_CLOCK, 13, 153, 80, 10 - AUTOCHECKBOX "Kuva sekundeid", IDC_TASKBARPROP_SECONDS, 120, 153, 80, 10, WS_DISABLED - LTEXT "Olekuala lagenda hoidmiseks võite peita ikoonid, mida te pole viimasel ajal klõpsanud.", IDC_STATIC, 13, 169, 223, 16 - AUTOCHECKBOX "&Peida passiivsed ikoonid", IDC_TASKBARPROP_HIDEICONS, 13, 191, 125, 10 - PUSHBUTTON "&Kohanda...", IDC_TASKBARPROP_ICONCUST, 188, 191, 50, 14 + AUTOCHECKBOX "Use small icons", IDC_TASKBARPROP_SMALLICONS, 13, 110, 200, 10 END IDD_TASKBARPROP_STARTMENU DIALOGEX 0, 0, 252, 218 @@ -101,6 +95,23 @@ BEGIN PUSHBUTTON "&Kohanda...", IDC_TASKBARPROP_STARTMENUCLASSICCUST, 192, 172, 53, 14 END +IDD_TASKBARPROP_NOTIFY DIALOGEX 0, 0, 252, 218 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Olekuala" +FONT 8, "MS Shell Dlg", 0, 0, 0x1 +BEGIN + CONTROL "", IDC_TASKBARPROP_NOTIFICATIONBITMAP, "Static", SS_BITMAP | SS_SUNKEN | SS_CENTERIMAGE, 12, 6, 229, 24 + GROUPBOX "Icons", IDC_STATIC, 6, 36, 240, 56 + LTEXT "Olekuala lagenda hoidmiseks võite peita ikoonid, mida te pole viimasel ajal klõpsanud.", IDC_STATIC, 13, 48, 223, 16 + AUTOCHECKBOX "&Peida passiivsed ikoonid", IDC_TASKBARPROP_HIDEICONS, 13, 70, 125, 10 + PUSHBUTTON "&Kohanda...", IDC_TASKBARPROP_ICONCUST, 188, 70, 50, 14 + GROUPBOX "System icons", IDC_STATIC, 6, 99, 240, 56 + LTEXT "Select which system icons to always show.", IDC_STATIC, 13, 113, 223, 8 + AUTOCHECKBOX "Kuva &kell", IDC_TASKBARPROP_CLOCK, 13, 127, 80, 10 + AUTOCHECKBOX "Kuva sekundeid", IDC_TASKBARPROP_SECONDS, 120, 127, 80, 10, WS_DISABLED + AUTOCHECKBOX "Desktop", IDC_TASKBARPROP_DESKTOP, 13, 140, 80, 10 +END + IDD_NOTIFICATIONS_CUSTOMIZE DIALOGEX 0, 0, 232, 240 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_DLGFRAME EXSTYLE WS_EX_CONTEXTHELP diff --git a/base/shell/explorer/lang/eu-ES.rc b/base/shell/explorer/lang/eu-ES.rc index d6b4a5d4f8c..2b727731c11 100644 --- a/base/shell/explorer/lang/eu-ES.rc +++ b/base/shell/explorer/lang/eu-ES.rc @@ -71,20 +71,14 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYS CAPTION "Ataza-barra" FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN - GROUPBOX "Ataza-barraren itxura ", IDC_STATIC, 6,6,240,104 + GROUPBOX "Ataza-barraren itxura ", IDC_STATIC, 6,6,240,120 CONTROL "", IDC_TASKBARPROP_TASKBARBITMAP, "Static", SS_BITMAP | SS_SUNKEN | SS_CENTERIMAGE, 12, 18, 229, 24 AUTOCHECKBOX "B&lokeatu ataza-barra", IDC_TASKBARPROP_LOCK, 13,45,200,10 AUTOCHECKBOX "Aut&omatikoki ezkutatu ataza-barra", IDC_TASKBARPROP_HIDE, 13,58,200,10 AUTOCHECKBOX "&Eduki ataza-barra beste leihoen gainean", IDC_TASKBARPROP_ONTOP, 13,71,200,10 AUTOCHECKBOX "Elkart&u ataza-barrako antzeko botoiak", IDC_TASKBARPROP_GROUP, 13,84,200,10 AUTOCHECKBOX "Era&kutsi abiarazte bizkorra", IDC_TASKBARPROP_SHOWQL, 13,97,200,10 - GROUPBOX "Jakinarazpen-area", IDC_STATIC, 6, 114, 240, 98 - CONTROL "", IDC_TASKBARPROP_NOTIFICATIONBITMAP, "Static", SS_BITMAP | SS_SUNKEN | SS_CENTERIMAGE, 12, 126, 229, 24 - AUTOCHECKBOX "Er&lojua", IDC_TASKBARPROP_CLOCK, 13, 153, 80, 10 - AUTOCHECKBOX "Erakutsi segunduak", IDC_TASKBARPROP_SECONDS, 120, 153, 80, 10, WS_DISABLED - LTEXT "Jakinarazpen-area txukun edukitzeko, ezkutatu azkenaldian erabili ez dituzun ikonoak.", IDC_STATIC, 13, 169, 223, 16 - AUTOCHECKBOX "E&zkutatu ikono inaktiboak", IDC_TASKBARPROP_HIDEICONS, 13, 191, 125, 10 - PUSHBUTTON "&Pertsonalizatu...", IDC_TASKBARPROP_ICONCUST, 184, 191, 50, 14 + AUTOCHECKBOX "Use small icons", IDC_TASKBARPROP_SMALLICONS, 13, 110, 200, 10 END IDD_TASKBARPROP_STARTMENU DIALOGEX 0, 0, 252, 218 @@ -101,6 +95,23 @@ BEGIN PUSHBUTTON "&Pertsonalizatu...", IDC_TASKBARPROP_STARTMENUCLASSICCUST, 192,172,53,14 END +IDD_TASKBARPROP_NOTIFY DIALOGEX 0, 0, 252, 218 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Jakinarazpen-area" +FONT 8, "MS Shell Dlg", 0, 0, 0x1 +BEGIN + CONTROL "", IDC_TASKBARPROP_NOTIFICATIONBITMAP, "Static", SS_BITMAP | SS_SUNKEN | SS_CENTERIMAGE, 12, 6, 229, 24 + GROUPBOX "Icons", IDC_STATIC, 6, 36, 240, 56 + LTEXT "Jakinarazpen-area txukun edukitzeko, ezkutatu azkenaldian erabili ez dituzun ikonoak.", IDC_STATIC, 13, 48, 223, 16 + AUTOCHECKBOX "E&zkutatu ikono inaktiboak", IDC_TASKBARPROP_HIDEICONS, 13, 70, 125, 10 + PUSHBUTTON "&Pertsonalizatu...", IDC_TASKBARPROP_ICONCUST, 184, 70, 50, 14 + GROUPBOX "System icons", IDC_STATIC, 6, 99, 240, 56 + LTEXT "Select which system icons to always show.", IDC_STATIC, 13, 113, 223, 8 + AUTOCHECKBOX "Er&lojua", IDC_TASKBARPROP_CLOCK, 13, 127, 80, 10 + AUTOCHECKBOX "Erakutsi segunduak", IDC_TASKBARPROP_SECONDS, 120, 127, 80, 10, WS_DISABLED + AUTOCHECKBOX "Desktop", IDC_TASKBARPROP_DESKTOP, 13, 140, 80, 10 +END + IDD_NOTIFICATIONS_CUSTOMIZE DIALOGEX 0, 0, 232, 240 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_DLGFRAME EXSTYLE WS_EX_CONTEXTHELP diff --git a/base/shell/explorer/lang/fi-FI.rc b/base/shell/explorer/lang/fi-FI.rc index 3e89bd40504..1b2acd2379e 100644 --- a/base/shell/explorer/lang/fi-FI.rc +++ b/base/shell/explorer/lang/fi-FI.rc @@ -71,20 +71,14 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYS CAPTION "Tehtäväpalkki" FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN - GROUPBOX "Tehtäväpalkin ulkoasu", IDC_STATIC, 6, 6, 240, 104 + GROUPBOX "Tehtäväpalkin ulkoasu", IDC_STATIC, 6, 6, 240, 120 CONTROL "", IDC_TASKBARPROP_TASKBARBITMAP, "Static", SS_BITMAP | SS_SUNKEN | SS_CENTERIMAGE, 12, 18, 229, 24 AUTOCHECKBOX "&Lukitse tehtäväpalkki", IDC_TASKBARPROP_LOCK, 13, 45, 200, 10 AUTOCHECKBOX "Piilota tehtäväpalkki &automaattisesti", IDC_TASKBARPROP_HIDE, 13, 58, 200, 10 AUTOCHECKBOX "&Pidä tehtäväpalkki muiden ikkunoiden päällä", IDC_TASKBARPROP_ONTOP, 13, 71, 200, 10 AUTOCHECKBOX "&Ryhmitä samankaltaiset tehtäväpalkin painikkeet", IDC_TASKBARPROP_GROUP, 13, 84, 200, 10 AUTOCHECKBOX "Näytä p&ikakäynnistys", IDC_TASKBARPROP_SHOWQL, 13, 97, 200, 10 - GROUPBOX "Ilmoitusalue", IDC_STATIC, 6, 114, 240, 98 - CONTROL "", IDC_TASKBARPROP_NOTIFICATIONBITMAP, "Static", SS_BITMAP | SS_SUNKEN | SS_CENTERIMAGE, 12, 126, 229, 24 - AUTOCHECKBOX "Näytä &kello", IDC_TASKBARPROP_CLOCK, 13, 153, 80, 10 - AUTOCHECKBOX "Näytä &sekunnit", IDC_TASKBARPROP_SECONDS, 120, 153, 80, 10, WS_DISABLED - LTEXT "Voit pitää ilmoitusalueen siistinä piilottamalla kuvakkeet joita et ole klikannut viimeaikoina.", IDC_STATIC, 13, 169, 223, 16 - AUTOCHECKBOX "Piilota &ei-aktiiviset kuvakkeet", IDC_TASKBARPROP_HIDEICONS, 13, 191, 125, 10 - PUSHBUTTON "&Mukauta...", IDC_TASKBARPROP_ICONCUST, 188, 191, 50, 14 + AUTOCHECKBOX "Use small icons", IDC_TASKBARPROP_SMALLICONS, 13, 110, 200, 10 END IDD_TASKBARPROP_STARTMENU DIALOGEX 0, 0, 252, 218 @@ -101,6 +95,23 @@ BEGIN PUSHBUTTON "M&ukauta...", IDC_TASKBARPROP_STARTMENUCLASSICCUST, 192, 172, 53, 14 END +IDD_TASKBARPROP_NOTIFY DIALOGEX 0, 0, 252, 218 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Ilmoitusalue" +FONT 8, "MS Shell Dlg", 0, 0, 0x1 +BEGIN + CONTROL "", IDC_TASKBARPROP_NOTIFICATIONBITMAP, "Static", SS_BITMAP | SS_SUNKEN | SS_CENTERIMAGE, 12, 6, 229, 24 + GROUPBOX "Icons", IDC_STATIC, 6, 36, 240, 56 + LTEXT "Voit pitää ilmoitusalueen siistinä piilottamalla kuvakkeet joita et ole klikannut viimeaikoina.", IDC_STATIC, 13, 48, 223, 16 + AUTOCHECKBOX "Piilota &ei-aktiiviset kuvakkeet", IDC_TASKBARPROP_HIDEICONS, 13, 70, 125, 10 + PUSHBUTTON "&Mukauta...", IDC_TASKBARPROP_ICONCUST, 188, 70, 50, 14 + GROUPBOX "System icons", IDC_STATIC, 6, 99, 240, 56 + LTEXT "Select which system icons to always show.", IDC_STATIC, 13, 113, 223, 8 + AUTOCHECKBOX "Näytä &kello", IDC_TASKBARPROP_CLOCK, 13, 127, 80, 10 + AUTOCHECKBOX "Näytä &sekunnit", IDC_TASKBARPROP_SECONDS, 120, 127, 80, 10, WS_DISABLED + AUTOCHECKBOX "Desktop", IDC_TASKBARPROP_DESKTOP, 13, 140, 80, 10 +END + IDD_NOTIFICATIONS_CUSTOMIZE DIALOGEX 0, 0, 232, 240 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_DLGFRAME EXSTYLE WS_EX_CONTEXTHELP diff --git a/base/shell/explorer/lang/fr-FR.rc b/base/shell/explorer/lang/fr-FR.rc index 10893af41fd..9daca429631 100644 --- a/base/shell/explorer/lang/fr-FR.rc +++ b/base/shell/explorer/lang/fr-FR.rc @@ -72,20 +72,14 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYS CAPTION "Barre des tâches" FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN - GROUPBOX "Apparence de la barre des tâches", IDC_STATIC, 6, 6, 240, 104 + GROUPBOX "Apparence de la barre des tâches", IDC_STATIC, 6, 6, 240, 120 CONTROL "", IDC_TASKBARPROP_TASKBARBITMAP, "Static", SS_BITMAP | SS_SUNKEN | SS_CENTERIMAGE, 12, 18, 229, 24 AUTOCHECKBOX "&Verrouiller la barre des tâches", IDC_TASKBARPROP_LOCK, 13, 45, 200, 10 AUTOCHECKBOX "&Cacher a&utomatiquement la barre des tâches", IDC_TASKBARPROP_HIDE, 13, 58, 200, 10 AUTOCHECKBOX "Garder la barre des &tâches au-dessus des autres fenêtres", IDC_TASKBARPROP_ONTOP, 13, 71, 200, 10 AUTOCHECKBOX "&Grouper les boutons similaires de la barre des tâches", IDC_TASKBARPROP_GROUP, 13, 84, 200, 10 AUTOCHECKBOX "Montrer la &zone de lancement rapide", IDC_TASKBARPROP_SHOWQL, 13, 97, 200, 10 - GROUPBOX "Zone de notification", IDC_STATIC, 6, 114, 240, 98 - CONTROL "", IDC_TASKBARPROP_NOTIFICATIONBITMAP, "Static", SS_BITMAP | SS_SUNKEN | SS_CENTERIMAGE, 12, 126, 229, 24 - AUTOCHECKBOX "&Horloge", IDC_TASKBARPROP_CLOCK, 13, 153, 80, 10 - AUTOCHECKBOX "Afficher les secondes", IDC_TASKBARPROP_SECONDS, 120, 153, 80, 10, WS_DISABLED - LTEXT "Vous pouvez garder la zone de notification épurée en cachant les icônes sur lesquelles vous n'avez pas cliqué récemment.", IDC_STATIC, 13, 169, 223, 16 - AUTOCHECKBOX "&Cacher les icônes inactives", IDC_TASKBARPROP_HIDEICONS, 13, 191, 125, 10 - PUSHBUTTON "&Personnaliser...", IDC_TASKBARPROP_ICONCUST, 185, 191, 53, 14 + AUTOCHECKBOX "Use small icons", IDC_TASKBARPROP_SMALLICONS, 13, 110, 200, 10 END IDD_TASKBARPROP_STARTMENU DIALOGEX 0, 0, 252, 218 @@ -102,6 +96,23 @@ BEGIN PUSHBUTTON "&Personnaliser...", IDC_TASKBARPROP_STARTMENUCLASSICCUST, 192, 172, 53, 14 END +IDD_TASKBARPROP_NOTIFY DIALOGEX 0, 0, 252, 218 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Zone de notification" +FONT 8, "MS Shell Dlg", 0, 0, 0x1 +BEGIN + CONTROL "", IDC_TASKBARPROP_NOTIFICATIONBITMAP, "Static", SS_BITMAP | SS_SUNKEN | SS_CENTERIMAGE, 12, 6, 229, 24 + GROUPBOX "Icons", IDC_STATIC, 6, 36, 240, 56 + LTEXT "Vous pouvez garder la zone de notification épurée en cachant les icônes sur lesquelles vous n'avez pas cliqué récemment.", IDC_STATIC, 13, 48, 223, 16 + AUTOCHECKBOX "&Cacher les icônes inactives", IDC_TASKBARPROP_HIDEICONS, 13, 70, 125, 10 + PUSHBUTTON "&Personnaliser...", IDC_TASKBARPROP_ICONCUST, 185, 70, 53, 14 + GROUPBOX "System icons", IDC_STATIC, 6, 99, 240, 56 + LTEXT "Select which system icons to always show.", IDC_STATIC, 13, 113, 223, 8 + AUTOCHECKBOX "&Horloge", IDC_TASKBARPROP_CLOCK, 13, 127, 80, 10 + AUTOCHECKBOX "Afficher les secondes", IDC_TASKBARPROP_SECONDS, 120, 127, 80, 10, WS_DISABLED + AUTOCHECKBOX "Desktop", IDC_TASKBARPROP_DESKTOP, 13, 140, 80, 10 +END + IDD_NOTIFICATIONS_CUSTOMIZE DIALOGEX 0, 0, 232, 240 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_DLGFRAME EXSTYLE WS_EX_CONTEXTHELP diff --git a/base/shell/explorer/lang/he-IL.rc b/base/shell/explorer/lang/he-IL.rc index 7511e1d8f3a..8a1c55b5b0b 100644 --- a/base/shell/explorer/lang/he-IL.rc +++ b/base/shell/explorer/lang/he-IL.rc @@ -71,20 +71,14 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYS CAPTION "שורת המשימות" FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN - GROUPBOX "מראה שורת המשימות", IDC_STATIC, 6, 6, 240, 104 + GROUPBOX "מראה שורת המשימות", IDC_STATIC, 6, 6, 240, 120 CONTROL "", IDC_TASKBARPROP_TASKBARBITMAP, "Static", SS_BITMAP | SS_SUNKEN | SS_CENTERIMAGE, 12, 18, 229, 24 AUTOCHECKBOX "נעל את שורת המשימות", IDC_TASKBARPROP_LOCK, 13, 45, 200, 10 AUTOCHECKBOX "הסתר אוטמטית את שורת המשימות", IDC_TASKBARPROP_HIDE, 13, 58, 200, 10 AUTOCHECKBOX "השאר את שורת המשימות תמיד מעל", IDC_TASKBARPROP_ONTOP, 13, 71, 200, 10 AUTOCHECKBOX "קבץ לחצנים דומים", IDC_TASKBARPROP_GROUP, 13, 84, 200, 10 AUTOCHECKBOX "הראה את סרגל הפעלה מהירה", IDC_TASKBARPROP_SHOWQL, 13, 97, 200, 10 - GROUPBOX "Notification area", IDC_STATIC, 6, 114, 240, 98 - CONTROL "", IDC_TASKBARPROP_NOTIFICATIONBITMAP, "Static", SS_BITMAP | SS_SUNKEN | SS_CENTERIMAGE, 12, 126, 229, 24 - AUTOCHECKBOX "שעון", IDC_TASKBARPROP_CLOCK, 13, 153, 80, 10 - AUTOCHECKBOX "Show seconds", IDC_TASKBARPROP_SECONDS, 120, 153, 80, 10, WS_DISABLED - LTEXT "You can keep the notification area uncluttered by hiding icons that you have not clicked recently.", IDC_STATIC, 13, 169, 223, 16 - AUTOCHECKBOX "החבא סמלים לא פעילים", IDC_TASKBARPROP_HIDEICONS, 13, 191, 125, 10 - PUSHBUTTON "התאם אישית...", IDC_TASKBARPROP_ICONCUST, 188, 191, 50, 14 + AUTOCHECKBOX "Use small icons", IDC_TASKBARPROP_SMALLICONS, 13, 110, 200, 10 END IDD_TASKBARPROP_STARTMENU DIALOGEX 0, 0, 252, 218 @@ -101,6 +95,23 @@ BEGIN PUSHBUTTON "התאם אישית...", IDC_TASKBARPROP_STARTMENUCLASSICCUST, 192, 172, 53, 14 END +IDD_TASKBARPROP_NOTIFY DIALOGEX 0, 0, 252, 218 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Notification area" +FONT 8, "MS Shell Dlg", 0, 0, 0x1 +BEGIN + CONTROL "", IDC_TASKBARPROP_NOTIFICATIONBITMAP, "Static", SS_BITMAP | SS_SUNKEN | SS_CENTERIMAGE, 12, 6, 229, 24 + GROUPBOX "Icons", IDC_STATIC, 6, 36, 240, 56 + LTEXT "You can keep the notification area uncluttered by hiding icons that you have not clicked recently.", IDC_STATIC, 13, 48, 223, 16 + AUTOCHECKBOX "החבא סמלים לא פעילים", IDC_TASKBARPROP_HIDEICONS, 13, 70, 125, 10 + PUSHBUTTON "התאם אישית...", IDC_TASKBARPROP_ICONCUST, 188, 70, 50, 14 + GROUPBOX "System icons", IDC_STATIC, 6, 99, 240, 56 + LTEXT "Select which system icons to always show.", IDC_STATIC, 13, 113, 223, 8 + AUTOCHECKBOX "שעון", IDC_TASKBARPROP_CLOCK, 13, 127, 80, 10 + AUTOCHECKBOX "Show seconds", IDC_TASKBARPROP_SECONDS, 120, 127, 80, 10, WS_DISABLED + AUTOCHECKBOX "Desktop", IDC_TASKBARPROP_DESKTOP, 13, 140, 80, 10 +END + IDD_NOTIFICATIONS_CUSTOMIZE DIALOGEX 0, 0, 232, 240 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_DLGFRAME EXSTYLE WS_EX_CONTEXTHELP diff --git a/base/shell/explorer/lang/hi-IN.rc b/base/shell/explorer/lang/hi-IN.rc index 1d4a751949d..0c8558f2316 100644 --- a/base/shell/explorer/lang/hi-IN.rc +++ b/base/shell/explorer/lang/hi-IN.rc @@ -71,20 +71,14 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYS CAPTION "टास्कबार" FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN - GROUPBOX "टास्कबार उपस्थिति", IDC_STATIC, 6, 6, 240, 104 + GROUPBOX "टास्कबार उपस्थिति", IDC_STATIC, 6, 6, 240, 120 CONTROL "", IDC_TASKBARPROP_TASKBARBITMAP, "Static", SS_BITMAP | SS_SUNKEN | SS_CENTERIMAGE, 12, 18, 229, 24 AUTOCHECKBOX "&टास्कबार को लॉक करें", IDC_TASKBARPROP_LOCK, 13, 45, 200, 10 AUTOCHECKBOX "टास्कबार को ऑटो-हाइड कर दो", IDC_TASKBARPROP_HIDE, 13, 58, 200, 10 AUTOCHECKBOX "टास्कबार को अन्य विंडो के शीर्ष पर रखें", IDC_TASKBARPROP_ONTOP, 13, 71, 200, 10 AUTOCHECKBOX "&समान टास्कबार बटन का समूह करे", IDC_TASKBARPROP_GROUP, 13, 84, 200, 10 AUTOCHECKBOX "&त्वरित लॉन्च दिखाएं", IDC_TASKBARPROP_SHOWQL, 13, 97, 200, 10 - GROUPBOX "अधिसूचना क्षेत्र", IDC_STATIC, 6, 114, 240, 98 - CONTROL "", IDC_TASKBARPROP_NOTIFICATIONBITMAP, "Static", SS_BITMAP | SS_SUNKEN | SS_CENTERIMAGE, 12, 126, 229, 24 - AUTOCHECKBOX "&घड़ी दिखाओ", IDC_TASKBARPROP_CLOCK, 13, 153, 80, 10 - AUTOCHECKBOX "सेकंड दिखाएं", IDC_TASKBARPROP_SECONDS, 120, 153, 80, 10, WS_DISABLED - LTEXT "आप उन आइकनों को छुपाकर अधिसूचना क्षेत्र को सुव्यवस्थित कर सकते हैं जिन्हें आपने हाल ही में क्लिक नहीं किया है।", IDC_STATIC, 13, 169, 223, 16 - AUTOCHECKBOX "&निष्क्रिय आइकनों छुपाएं", IDC_TASKBARPROP_HIDEICONS, 13, 191, 125, 10 - PUSHBUTTON "&कस्टमाइज़...", IDC_TASKBARPROP_ICONCUST, 188, 191, 50, 14 + AUTOCHECKBOX "Use small icons", IDC_TASKBARPROP_SMALLICONS, 13, 110, 200, 10 END IDD_TASKBARPROP_STARTMENU DIALOGEX 0, 0, 252, 218 @@ -101,6 +95,23 @@ BEGIN PUSHBUTTON "&कस्टमाइज़...", IDC_TASKBARPROP_STARTMENUCLASSICCUST, 192, 172, 53, 14 END +IDD_TASKBARPROP_NOTIFY DIALOGEX 0, 0, 252, 218 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "अधिसूचना क्षेत्र" +FONT 8, "MS Shell Dlg", 0, 0, 0x1 +BEGIN + CONTROL "", IDC_TASKBARPROP_NOTIFICATIONBITMAP, "Static", SS_BITMAP | SS_SUNKEN | SS_CENTERIMAGE, 12, 6, 229, 24 + GROUPBOX "Icons", IDC_STATIC, 6, 36, 240, 56 + LTEXT "आप उन आइकनों को छुपाकर अधिसूचना क्षेत्र को सुव्यवस्थित कर सकते हैं जिन्हें आपने हाल ही में क्लिक नहीं किया है।", IDC_STATIC, 13, 48, 223, 16 + AUTOCHECKBOX "&निष्क्रिय आइकनों छुपाएं", IDC_TASKBARPROP_HIDEICONS, 13, 70, 125, 10 + PUSHBUTTON "&कस्टमाइज़...", IDC_TASKBARPROP_ICONCUST, 188, 70, 50, 14 + GROUPBOX "System icons", IDC_STATIC, 6, 99, 240, 56 + LTEXT "Select which system icons to always show.", IDC_STATIC, 13, 113, 223, 8 + AUTOCHECKBOX "&घड़ी दिखाओ", IDC_TASKBARPROP_CLOCK, 13, 127, 80, 10 + AUTOCHECKBOX "सेकंड दिखाएं", IDC_TASKBARPROP_SECONDS, 120, 127, 80, 10, WS_DISABLED + AUTOCHECKBOX "Desktop", IDC_TASKBARPROP_DESKTOP, 13, 140, 80, 10 +END + IDD_NOTIFICATIONS_CUSTOMIZE DIALOGEX 0, 0, 232, 240 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_DLGFRAME EXSTYLE WS_EX_CONTEXTHELP diff --git a/base/shell/explorer/lang/hu-HU.rc b/base/shell/explorer/lang/hu-HU.rc index 73243d68662..f09fa414fea 100644 --- a/base/shell/explorer/lang/hu-HU.rc +++ b/base/shell/explorer/lang/hu-HU.rc @@ -71,20 +71,14 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYS CAPTION "Tálca" FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN - GROUPBOX "A tálca megjelenése", IDC_STATIC, 6, 6, 240, 104 + GROUPBOX "A tálca megjelenése", IDC_STATIC, 6, 6, 240, 120 CONTROL "", IDC_TASKBARPROP_TASKBARBITMAP, "Static", SS_BITMAP | SS_SUNKEN | SS_CENTERIMAGE, 12, 18, 229, 24 AUTOCHECKBOX "A tálca &zárolása", IDC_TASKBARPROP_LOCK, 13, 45, 200, 10 AUTOCHECKBOX "A tálca automatikus &elrejtése", IDC_TASKBARPROP_HIDE, 13, 58, 200, 10 AUTOCHECKBOX "A tálca mindig legyen &látható a többi ablak előtt", IDC_TASKBARPROP_ONTOP, 13, 71, 200, 10 AUTOCHECKBOX "Hasonló tálca gombok &csoportosítása", IDC_TASKBARPROP_GROUP, 13, 84, 200, 10 AUTOCHECKBOX "&Gyorsindító megjelenítése", IDC_TASKBARPROP_SHOWQL, 13, 97, 200, 10 - GROUPBOX "Értesítési terület", IDC_STATIC, 6, 114, 240, 98 - CONTROL "", IDC_TASKBARPROP_NOTIFICATIONBITMAP, "Static", SS_BITMAP | SS_SUNKEN | SS_CENTERIMAGE, 12, 126, 229, 24 - AUTOCHECKBOX "Az óra &megjelenítése", IDC_TASKBARPROP_CLOCK, 13, 153, 80, 10 - AUTOCHECKBOX "Má&sodpercek megjelenítése", IDC_TASKBARPROP_SECONDS, 120, 153, 100, 10, WS_DISABLED - LTEXT "Rendezettebbé teheti az értesítési területet, ha elrejti azokat az ikonokat, amelyekre már régen nem kattintott rá.", IDC_STATIC, 13, 169, 223, 16 - AUTOCHECKBOX "A nem aktív &ikonok elrejtése", IDC_TASKBARPROP_HIDEICONS, 13, 191, 125, 10 - PUSHBUTTON "&Testreszabás...", IDC_TASKBARPROP_ICONCUST, 188, 188, 53, 14 + AUTOCHECKBOX "Use small icons", IDC_TASKBARPROP_SMALLICONS, 13, 110, 200, 10 END IDD_TASKBARPROP_STARTMENU DIALOGEX 0, 0, 252, 218 @@ -101,6 +95,23 @@ BEGIN PUSHBUTTON "&Testreszabás...", IDC_TASKBARPROP_STARTMENUCLASSICCUST, 192, 172, 53, 14 END +IDD_TASKBARPROP_NOTIFY DIALOGEX 0, 0, 252, 218 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Értesítési terület" +FONT 8, "MS Shell Dlg", 0, 0, 0x1 +BEGIN + CONTROL "", IDC_TASKBARPROP_NOTIFICATIONBITMAP, "Static", SS_BITMAP | SS_SUNKEN | SS_CENTERIMAGE, 12, 6, 229, 24 + GROUPBOX "Icons", IDC_STATIC, 6, 36, 240, 56 + LTEXT "Rendezettebbé teheti az értesítési területet, ha elrejti azokat az ikonokat, amelyekre már régen nem kattintott rá.", IDC_STATIC, 13, 48, 223, 16 + AUTOCHECKBOX "A nem aktív &ikonok elrejtése", IDC_TASKBARPROP_HIDEICONS, 13, 70, 125, 10 + PUSHBUTTON "&Testreszabás...", IDC_TASKBARPROP_ICONCUST, 188, 67, 53, 14 + GROUPBOX "System icons", IDC_STATIC, 6, 99, 240, 56 + LTEXT "Select which system icons to always show.", IDC_STATIC, 13, 113, 223, 8 + AUTOCHECKBOX "Az óra &megjelenítése", IDC_TASKBARPROP_CLOCK, 13, 127, 80, 10 + AUTOCHECKBOX "Má&sodpercek megjelenítése", IDC_TASKBARPROP_SECONDS, 120, 127, 100, 10, WS_DISABLED + AUTOCHECKBOX "Desktop", IDC_TASKBARPROP_DESKTOP, 13, 140, 80, 10 +END + IDD_NOTIFICATIONS_CUSTOMIZE DIALOGEX 0, 0, 232, 240 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_DLGFRAME EXSTYLE WS_EX_CONTEXTHELP diff --git a/base/shell/explorer/lang/id-ID.rc b/base/shell/explorer/lang/id-ID.rc index f76f8b5bd04..d6ed221bbb5 100644 --- a/base/shell/explorer/lang/id-ID.rc +++ b/base/shell/explorer/lang/id-ID.rc @@ -72,20 +72,14 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYS CAPTION "Bilah Tugas" FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN - GROUPBOX "Tampilan bilah tugas", IDC_STATIC, 6, 6, 240, 104 + GROUPBOX "Tampilan bilah tugas", IDC_STATIC, 6, 6, 240, 120 CONTROL "", IDC_TASKBARPROP_TASKBARBITMAP, "Static", SS_BITMAP | SS_SUNKEN | SS_CENTERIMAGE, 12, 18, 229, 24 AUTOCHECKBOX "&Kunci bilah tugas", IDC_TASKBARPROP_LOCK, 13, 45, 200, 10 AUTOCHECKBOX "Otomatis sembunyikan bilah tugas", IDC_TASKBARPROP_HIDE, 13, 58, 200, 10 AUTOCHECKBOX "Te&mpatkan bilah tugas pada bagian atas jendela lain", IDC_TASKBARPROP_ONTOP, 13, 71, 200, 10 AUTOCHECKBOX "K&elompokkan tombol bilah tugas yang sama", IDC_TASKBARPROP_GROUP, 13, 84, 200, 10 AUTOCHECKBOX "Tampilkan peluncur &cepat", IDC_TASKBARPROP_SHOWQL, 13, 97, 200, 10 - GROUPBOX "Area pemberitahuan", IDC_STATIC, 6, 114, 240, 98 - CONTROL "", IDC_TASKBARPROP_NOTIFICATIONBITMAP, "Static", SS_BITMAP | SS_SUNKEN | SS_CENTERIMAGE, 12, 126, 229, 24 - AUTOCHECKBOX "Tampil&kan jam", IDC_TASKBARPROP_CLOCK, 13, 153, 80, 10 - AUTOCHECKBOX "Tampilkan detik", IDC_TASKBARPROP_SECONDS, 120, 153, 80, 10, WS_DISABLED - LTEXT "Area pemberitahuan akan terlihat rapi dengan menyembunyikan ikon yang belum pernah diklik akhir-akhir ini.", IDC_STATIC, 13, 169, 223, 16 - AUTOCHECKBOX "&Sembunyikan ikon tidak aktif", IDC_TASKBARPROP_HIDEICONS, 13, 191, 125, 10 - PUSHBUTTON "&Sesuaikan...", IDC_TASKBARPROP_ICONCUST, 188, 191, 50, 14 + AUTOCHECKBOX "Use small icons", IDC_TASKBARPROP_SMALLICONS, 13, 110, 200, 10 END IDD_TASKBARPROP_STARTMENU DIALOGEX 0, 0, 252, 218 @@ -102,6 +96,23 @@ BEGIN PUSHBUTTON "Ses&uaikan...", IDC_TASKBARPROP_STARTMENUCLASSICCUST, 192, 172, 53, 14 END +IDD_TASKBARPROP_NOTIFY DIALOGEX 0, 0, 252, 218 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Area pemberitahuan" +FONT 8, "MS Shell Dlg", 0, 0, 0x1 +BEGIN + CONTROL "", IDC_TASKBARPROP_NOTIFICATIONBITMAP, "Static", SS_BITMAP | SS_SUNKEN | SS_CENTERIMAGE, 12, 6, 229, 24 + GROUPBOX "Icons", IDC_STATIC, 6, 36, 240, 56 + LTEXT "Area pemberitahuan akan terlihat rapi dengan menyembunyikan ikon yang belum pernah diklik akhir-akhir ini.", IDC_STATIC, 13, 48, 223, 16 + AUTOCHECKBOX "&Sembunyikan ikon tidak aktif", IDC_TASKBARPROP_HIDEICONS, 13, 70, 125, 10 + PUSHBUTTON "&Sesuaikan...", IDC_TASKBARPROP_ICONCUST, 188, 70, 50, 14 + GROUPBOX "System icons", IDC_STATIC, 6, 99, 240, 56 + LTEXT "Select which system icons to always show.", IDC_STATIC, 13, 113, 223, 8 + AUTOCHECKBOX "Tampil&kan jam", IDC_TASKBARPROP_CLOCK, 13, 127, 80, 10 + AUTOCHECKBOX "Tampilkan detik", IDC_TASKBARPROP_SECONDS, 120, 127, 80, 10, WS_DISABLED + AUTOCHECKBOX "Desktop", IDC_TASKBARPROP_DESKTOP, 13, 140, 80, 10 +END + IDD_NOTIFICATIONS_CUSTOMIZE DIALOGEX 0, 0, 232, 240 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_DLGFRAME EXSTYLE WS_EX_CONTEXTHELP diff --git a/base/shell/explorer/lang/it-IT.rc b/base/shell/explorer/lang/it-IT.rc index b1c079b4b99..23a9b50159e 100644 --- a/base/shell/explorer/lang/it-IT.rc +++ b/base/shell/explorer/lang/it-IT.rc @@ -72,20 +72,14 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYS CAPTION "Barra delle applicazioni" FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN - GROUPBOX "Aspetto della Barra delle applicazioni", IDC_STATIC, 6, 6, 240, 104 + GROUPBOX "Aspetto della Barra delle applicazioni", IDC_STATIC, 6, 6, 240, 120 CONTROL "", IDC_TASKBARPROP_TASKBARBITMAP, "Static", SS_BITMAP | SS_SUNKEN | SS_CENTERIMAGE, 12, 18, 229, 24 AUTOCHECKBOX "&Bloccare la Barra delle applicazioni", IDC_TASKBARPROP_LOCK, 13, 45, 200, 10 AUTOCHECKBOX "N&ascondere automaticamente", IDC_TASKBARPROP_HIDE, 13, 58, 200, 10 AUTOCHECKBOX "Mantenere la Barra delle applicazioni in &primo piano", IDC_TASKBARPROP_ONTOP, 13, 71, 200, 10 AUTOCHECKBOX "&Raggruppare pulsanti simili", IDC_TASKBARPROP_GROUP, 13, 84, 200, 10 AUTOCHECKBOX "Mostrare Avvio &veloce", IDC_TASKBARPROP_SHOWQL, 13, 97, 200, 10 - GROUPBOX "Notification area", IDC_STATIC, 6, 114, 240, 98 - CONTROL "", IDC_TASKBARPROP_NOTIFICATIONBITMAP, "Static", SS_BITMAP | SS_SUNKEN | SS_CENTERIMAGE, 12, 126, 229, 24 - AUTOCHECKBOX "Orolog&io", IDC_TASKBARPROP_CLOCK, 13, 153, 80, 10 - AUTOCHECKBOX "Show seconds", IDC_TASKBARPROP_SECONDS, 120, 153, 80, 10, WS_DISABLED - LTEXT "Puoi tenere libera l'area di notifica nascondendo icone non usate recentemente.", IDC_STATIC, 13, 169, 223, 16 - AUTOCHECKBOX "&Nascondere icone inattive", IDC_TASKBARPROP_HIDEICONS, 13, 191, 125, 10 - PUSHBUTTON "&Personalizzare...", IDC_TASKBARPROP_ICONCUST, 188, 191, 50, 14 + AUTOCHECKBOX "Use small icons", IDC_TASKBARPROP_SMALLICONS, 13, 110, 200, 10 END IDD_TASKBARPROP_STARTMENU DIALOGEX 0, 0, 252, 218 @@ -102,6 +96,23 @@ BEGIN PUSHBUTTON "&Personalizza...", IDC_TASKBARPROP_STARTMENUCLASSICCUST, 192, 172, 53, 14 END +IDD_TASKBARPROP_NOTIFY DIALOGEX 0, 0, 252, 218 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Notification area" +FONT 8, "MS Shell Dlg", 0, 0, 0x1 +BEGIN + CONTROL "", IDC_TASKBARPROP_NOTIFICATIONBITMAP, "Static", SS_BITMAP | SS_SUNKEN | SS_CENTERIMAGE, 12, 6, 229, 24 + GROUPBOX "Icons", IDC_STATIC, 6, 36, 240, 56 + LTEXT "Puoi tenere libera l'area di notifica nascondendo icone non usate recentemente.", IDC_STATIC, 13, 48, 223, 16 + AUTOCHECKBOX "&Nascondere icone inattive", IDC_TASKBARPROP_HIDEICONS, 13, 70, 125, 10 + PUSHBUTTON "&Personalizzare...", IDC_TASKBARPROP_ICONCUST, 188, 70, 50, 14 + GROUPBOX "System icons", IDC_STATIC, 6, 99, 240, 56 + LTEXT "Select which system icons to always show.", IDC_STATIC, 13, 113, 223, 8 + AUTOCHECKBOX "Orolog&io", IDC_TASKBARPROP_CLOCK, 13, 127, 80, 10 + AUTOCHECKBOX "Show seconds", IDC_TASKBARPROP_SECONDS, 120, 127, 80, 10, WS_DISABLED + AUTOCHECKBOX "Desktop", IDC_TASKBARPROP_DESKTOP, 13, 140, 80, 10 +END + IDD_NOTIFICATIONS_CUSTOMIZE DIALOGEX 0, 0, 232, 240 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_DLGFRAME EXSTYLE WS_EX_CONTEXTHELP diff --git a/base/shell/explorer/lang/ja-JP.rc b/base/shell/explorer/lang/ja-JP.rc index bda368f7eae..e8914d2f4ba 100644 --- a/base/shell/explorer/lang/ja-JP.rc +++ b/base/shell/explorer/lang/ja-JP.rc @@ -73,20 +73,14 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYS CAPTION "タスクバー" FONT 9, "MS UI Gothic", 0, 0, 0x1 BEGIN - GROUPBOX "タスクバーの外観", IDC_STATIC, 6, 6, 240, 104 + GROUPBOX "タスクバーの外観", IDC_STATIC, 6, 6, 240, 120 CONTROL "", IDC_TASKBARPROP_TASKBARBITMAP, "Static", SS_BITMAP | SS_SUNKEN | SS_CENTERIMAGE, 12, 18, 229, 24 AUTOCHECKBOX "タスクバーを固定する(&L)", IDC_TASKBARPROP_LOCK, 13, 45, 200, 10 AUTOCHECKBOX "タスクバーを自動的に隠す(&U)", IDC_TASKBARPROP_HIDE, 13, 58, 200, 10 AUTOCHECKBOX "タスクバーを他のウインドウ上に保つ(&T)", IDC_TASKBARPROP_ONTOP, 13, 71, 200, 10 AUTOCHECKBOX "類似するタスクバーボタンをグループ化する(&G)", IDC_TASKBARPROP_GROUP, 13, 84, 200, 10 AUTOCHECKBOX "クイック起動の表示(&Q)", IDC_TASKBARPROP_SHOWQL, 13, 97, 200, 10 - GROUPBOX "通知領域", IDC_STATIC, 6, 114, 240, 98 - CONTROL "", IDC_TASKBARPROP_NOTIFICATIONBITMAP, "Static", SS_BITMAP | SS_SUNKEN | SS_CENTERIMAGE, 12, 126, 229, 24 - AUTOCHECKBOX "時計(&K)", IDC_TASKBARPROP_CLOCK, 13, 153, 80, 10 - AUTOCHECKBOX "秒を表示", IDC_TASKBARPROP_SECONDS, 120, 153, 80, 10, WS_DISABLED - LTEXT "最近クリックしていないアイコンを隠して通知領域をすっきりさせることができます。", IDC_STATIC, 13, 169, 223, 16 - AUTOCHECKBOX "アクティブでないアイコンを隠す(&H)", IDC_TASKBARPROP_HIDEICONS, 13, 191, 125, 10 - PUSHBUTTON "カスタマイズ(&C)...", IDC_TASKBARPROP_ICONCUST, 175, 190, 65, 14 + AUTOCHECKBOX "Use small icons", IDC_TASKBARPROP_SMALLICONS, 13, 110, 200, 10 END IDD_TASKBARPROP_STARTMENU DIALOGEX 0, 0, 252, 218 @@ -103,6 +97,23 @@ BEGIN PUSHBUTTON "カスタマイズ(&C)...", IDC_TASKBARPROP_STARTMENUCLASSICCUST, 192, 172, 53, 14 END +IDD_TASKBARPROP_NOTIFY DIALOGEX 0, 0, 252, 218 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "通知領域" +FONT 9, "MS UI Gothic", 0, 0, 0x1 +BEGIN + CONTROL "", IDC_TASKBARPROP_NOTIFICATIONBITMAP, "Static", SS_BITMAP | SS_SUNKEN | SS_CENTERIMAGE, 12, 6, 229, 24 + GROUPBOX "Icons", IDC_STATIC, 6, 36, 240, 56 + LTEXT "最近クリックしていないアイコンを隠して通知領域をすっきりさせることができます。", IDC_STATIC, 13, 48, 223, 16 + AUTOCHECKBOX "アクティブでないアイコンを隠す(&H)", IDC_TASKBARPROP_HIDEICONS, 13, 70, 125, 10 + PUSHBUTTON "カスタマイズ(&C)...", IDC_TASKBARPROP_ICONCUST, 175, 69, 65, 14 + GROUPBOX "System icons", IDC_STATIC, 6, 99, 240, 56 + LTEXT "Select which system icons to always show.", IDC_STATIC, 13, 113, 223, 8 + AUTOCHECKBOX "時計(&K)", IDC_TASKBARPROP_CLOCK, 13, 127, 80, 10 + AUTOCHECKBOX "秒を表示", IDC_TASKBARPROP_SECONDS, 120, 127, 80, 10, WS_DISABLED + AUTOCHECKBOX "Desktop", IDC_TASKBARPROP_DESKTOP, 13, 140, 80, 10 +END + IDD_NOTIFICATIONS_CUSTOMIZE DIALOGEX 0, 0, 232, 240 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_DLGFRAME EXSTYLE WS_EX_CONTEXTHELP diff --git a/base/shell/explorer/lang/ko-KR.rc b/base/shell/explorer/lang/ko-KR.rc index a6e88008126..29abc0cc171 100644 --- a/base/shell/explorer/lang/ko-KR.rc +++ b/base/shell/explorer/lang/ko-KR.rc @@ -72,20 +72,14 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYS CAPTION "Taskbar" FONT 9, "굴림", 0, 0, 0x1 BEGIN - GROUPBOX "작업 표시줄 모양", IDC_STATIC, 6, 6, 240, 104 + GROUPBOX "작업 표시줄 모양", IDC_STATIC, 6, 6, 240, 120 CONTROL "", IDC_TASKBARPROP_TASKBARBITMAP, "Static", SS_BITMAP | SS_SUNKEN | SS_CENTERIMAGE, 12, 18, 229, 24 AUTOCHECKBOX "&Lock the taskbar", IDC_TASKBARPROP_LOCK, 13, 45, 200, 10 AUTOCHECKBOX "A&uto-hide the taskbar", IDC_TASKBARPROP_HIDE, 13, 58, 200, 10 AUTOCHECKBOX "Keep the &taskbar on top of other windows", IDC_TASKBARPROP_ONTOP, 13, 71, 200, 10 AUTOCHECKBOX "&Group similar taskbar buttons", IDC_TASKBARPROP_GROUP, 13, 84, 200, 10 AUTOCHECKBOX "Show &Quick Launch", IDC_TASKBARPROP_SHOWQL, 13, 97, 200, 10 - GROUPBOX "Notification area", IDC_STATIC, 6, 114, 240, 98 - CONTROL "", IDC_TASKBARPROP_NOTIFICATIONBITMAP, "Static", SS_BITMAP | SS_SUNKEN | SS_CENTERIMAGE, 12, 126, 229, 24 - AUTOCHECKBOX "Show cloc&k", IDC_TASKBARPROP_CLOCK, 13, 153, 80, 10 - AUTOCHECKBOX "Show seconds", IDC_TASKBARPROP_SECONDS, 120, 153, 80, 10, WS_DISABLED - LTEXT "You can keep the notification area uncluttered by hiding icons that you have not clicked recently.", IDC_STATIC, 13, 169, 223, 16 - AUTOCHECKBOX "&Hide inactive icons", IDC_TASKBARPROP_HIDEICONS, 13, 191, 125, 10 - PUSHBUTTON "&Customize...", IDC_TASKBARPROP_ICONCUST, 188, 191, 50, 14 + AUTOCHECKBOX "Use small icons", IDC_TASKBARPROP_SMALLICONS, 13, 110, 200, 10 END IDD_TASKBARPROP_STARTMENU DIALOGEX 0, 0, 252, 218 @@ -102,6 +96,23 @@ BEGIN PUSHBUTTON "&Customize...", IDC_TASKBARPROP_STARTMENUCLASSICCUST, 192, 172, 53, 14 END +IDD_TASKBARPROP_NOTIFY DIALOGEX 0, 0, 252, 218 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Notification area" +FONT 9, "굴림", 0, 0, 0x1 +BEGIN + CONTROL "", IDC_TASKBARPROP_NOTIFICATIONBITMAP, "Static", SS_BITMAP | SS_SUNKEN | SS_CENTERIMAGE, 12, 6, 229, 24 + GROUPBOX "Icons", IDC_STATIC, 6, 36, 240, 56 + LTEXT "You can keep the notification area uncluttered by hiding icons that you have not clicked recently.", IDC_STATIC, 13, 48, 223, 16 + AUTOCHECKBOX "&Hide inactive icons", IDC_TASKBARPROP_HIDEICONS, 13, 70, 125, 10 + PUSHBUTTON "&Customize...", IDC_TASKBARPROP_ICONCUST, 188, 70, 50, 14 + GROUPBOX "System icons", IDC_STATIC, 6, 99, 240, 56 + LTEXT "Select which system icons to always show.", IDC_STATIC, 13, 113, 223, 8 + AUTOCHECKBOX "Show cloc&k", IDC_TASKBARPROP_CLOCK, 13, 127, 80, 10 + AUTOCHECKBOX "Show seconds", IDC_TASKBARPROP_SECONDS, 120, 127, 80, 10, WS_DISABLED + AUTOCHECKBOX "Desktop", IDC_TASKBARPROP_DESKTOP, 13, 140, 80, 10 +END + IDD_NOTIFICATIONS_CUSTOMIZE DIALOGEX 0, 0, 232, 240 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_DLGFRAME EXSTYLE WS_EX_CONTEXTHELP diff --git a/base/shell/explorer/lang/lt-LT.rc b/base/shell/explorer/lang/lt-LT.rc index 7a7600c8e2d..92d51c80bc0 100644 --- a/base/shell/explorer/lang/lt-LT.rc +++ b/base/shell/explorer/lang/lt-LT.rc @@ -71,21 +71,14 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYS CAPTION "Taskbar" FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN - GROUPBOX "Taskbar appearance", IDC_STATIC, 6, 6, 240, 104 + GROUPBOX "Taskbar appearance", IDC_STATIC, 6, 6, 240, 120 CONTROL "", IDC_TASKBARPROP_TASKBARBITMAP, "Static", SS_BITMAP | SS_SUNKEN | SS_CENTERIMAGE, 12, 18, 229, 24 AUTOCHECKBOX "&Lock the taskbar", IDC_TASKBARPROP_LOCK, 13, 45, 200, 10 AUTOCHECKBOX "A&uto-hide the taskbar", IDC_TASKBARPROP_HIDE, 13, 58, 200, 10 AUTOCHECKBOX "Keep the &taskbar on top of other windows", IDC_TASKBARPROP_ONTOP, 13, 71, 200, 10 AUTOCHECKBOX "&Group similar taskbar buttons", IDC_TASKBARPROP_GROUP, 13, 84, 200, 10 AUTOCHECKBOX "Show &Quick Launch", IDC_TASKBARPROP_SHOWQL, 13, 97, 200, 10 - GROUPBOX "Notification area", IDC_STATIC, 6, 114, 240, 58 - CONTROL "", IDC_TASKBARPROP_NOTIFICATIONBITMAP, "Static", SS_BITMAP | SS_SUNKEN | SS_CENTERIMAGE, 12, 126, 229, 24 - AUTOCHECKBOX "Cloc&k", IDC_TASKBARPROP_CLOCK, 13, 153, 80, 10 - AUTOCHECKBOX "Show seconds", IDC_TASKBARPROP_SECONDS, 120, 153, 80, 10, WS_DISABLED - LTEXT "You can keep the notification area uncluttered by hiding icons that you have not clicked recently.", IDC_STATIC, 13, 169, 223, 16 - AUTOCHECKBOX "&Hide inactive icons", IDC_TASKBARPROP_HIDEICONS, 13, 191, 125, 10 - PUSHBUTTON "&Customize...", IDC_TASKBARPROP_ICONCUST, 188, 191, 50, 14 - + AUTOCHECKBOX "Use small icons", IDC_TASKBARPROP_SMALLICONS, 13, 110, 200, 10 END IDD_TASKBARPROP_STARTMENU DIALOGEX 0, 0, 252, 218 @@ -102,6 +95,23 @@ BEGIN PUSHBUTTON "&Customize...", IDC_TASKBARPROP_STARTMENUCLASSICCUST, 192, 172, 53, 14 END +IDD_TASKBARPROP_NOTIFY DIALOGEX 0, 0, 252, 218 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Notification area" +FONT 8, "MS Shell Dlg", 0, 0, 0x1 +BEGIN + CONTROL "", IDC_TASKBARPROP_NOTIFICATIONBITMAP, "Static", SS_BITMAP | SS_SUNKEN | SS_CENTERIMAGE, 12, 6, 229, 24 + GROUPBOX "Icons", IDC_STATIC, 6, 36, 240, 56 + LTEXT "You can keep the notification area uncluttered by hiding icons that you have not clicked recently.", IDC_STATIC, 13, 48, 223, 16 + AUTOCHECKBOX "&Hide inactive icons", IDC_TASKBARPROP_HIDEICONS, 13, 70, 125, 10 + PUSHBUTTON "&Customize...", IDC_TASKBARPROP_ICONCUST, 188, 70, 50, 14 + GROUPBOX "System icons", IDC_STATIC, 6, 99, 240, 56 + LTEXT "Select which system icons to always show.", IDC_STATIC, 13, 113, 223, 8 + AUTOCHECKBOX "Cloc&k", IDC_TASKBARPROP_CLOCK, 13, 127, 80, 10 + AUTOCHECKBOX "Show seconds", IDC_TASKBARPROP_SECONDS, 120, 127, 80, 10, WS_DISABLED + AUTOCHECKBOX "Desktop", IDC_TASKBARPROP_DESKTOP, 13, 140, 80, 10 +END + IDD_NOTIFICATIONS_CUSTOMIZE DIALOGEX 0, 0, 232, 240 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_DLGFRAME EXSTYLE WS_EX_CONTEXTHELP diff --git a/base/shell/explorer/lang/ms-MY.rc b/base/shell/explorer/lang/ms-MY.rc index bab8c6a7ac5..712a8aedf62 100644 --- a/base/shell/explorer/lang/ms-MY.rc +++ b/base/shell/explorer/lang/ms-MY.rc @@ -71,20 +71,14 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYS CAPTION "Bar Tugas" FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN - GROUPBOX "Rupa Bar Tugas", IDC_STATIC, 6, 6, 240, 104 + GROUPBOX "Rupa Bar Tugas", IDC_STATIC, 6, 6, 240, 120 CONTROL "", IDC_TASKBARPROP_TASKBARBITMAP, "Static", SS_BITMAP | SS_SUNKEN | SS_CENTERIMAGE, 12, 18, 229, 24 AUTOCHECKBOX "Kunci Bar Tugas(&L)", IDC_TASKBARPROP_LOCK, 13, 45, 200, 10 AUTOCHECKBOX "A&uto-sembunyi bar tugas", IDC_TASKBARPROP_HIDE, 13, 58, 200, 10 AUTOCHECKBOX "Simpan bar &tugas ini di atas tetingkap lain", IDC_TASKBARPROP_ONTOP, 13, 71, 200, 10 AUTOCHECKBOX "Butan&g bar tugas kumpulkan dengan sama", IDC_TASKBARPROP_GROUP, 13, 84, 200, 10 AUTOCHECKBOX "Paparkan Pelancaran Pantas(&Q)", IDC_TASKBARPROP_SHOWQL, 13, 97, 200, 10 - GROUPBOX "Kawasan pemberitahuan", IDC_STATIC, 6, 114, 240, 98 - CONTROL "", IDC_TASKBARPROP_NOTIFICATIONBITMAP, "Static", SS_BITMAP | SS_SUNKEN | SS_CENTERIMAGE, 12, 126, 229, 24 - AUTOCHECKBOX "Tunjukkan jam(&K)", IDC_TASKBARPROP_CLOCK, 13, 153, 80, 10 - AUTOCHECKBOX "Tunjukkan saat", IDC_TASKBARPROP_SECONDS, 120, 153, 80, 10, WS_DISABLED - LTEXT "Anda boleh memastikan kawasan pemberitahuan tidak bersepah dengan menyembunyikan ikon yang anda tidak klik baru-baru ini.", IDC_STATIC, 13, 169, 223, 16 - AUTOCHECKBOX "Menyembunyikan ikon yang tidak aktif(&H)", IDC_TASKBARPROP_HIDEICONS, 13, 191, 125, 10 - PUSHBUTTON "Suaikan...(&C)", IDC_TASKBARPROP_ICONCUST, 188, 191, 50, 14 + AUTOCHECKBOX "Use small icons", IDC_TASKBARPROP_SMALLICONS, 13, 110, 200, 10 END IDD_TASKBARPROP_STARTMENU DIALOGEX 0, 0, 252, 218 @@ -101,6 +95,23 @@ BEGIN PUSHBUTTON "Suaikan...(&C)", IDC_TASKBARPROP_STARTMENUCLASSICCUST, 192, 172, 53, 14 END +IDD_TASKBARPROP_NOTIFY DIALOGEX 0, 0, 252, 218 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Kawasan pemberitahuan" +FONT 8, "MS Shell Dlg", 0, 0, 0x1 +BEGIN + CONTROL "", IDC_TASKBARPROP_NOTIFICATIONBITMAP, "Static", SS_BITMAP | SS_SUNKEN | SS_CENTERIMAGE, 12, 6, 229, 24 + GROUPBOX "Icons", IDC_STATIC, 6, 36, 240, 56 + LTEXT "Anda boleh memastikan kawasan pemberitahuan tidak bersepah dengan menyembunyikan ikon yang anda tidak klik baru-baru ini.", IDC_STATIC, 13, 48, 223, 16 + AUTOCHECKBOX "Menyembunyikan ikon yang tidak aktif(&H)", IDC_TASKBARPROP_HIDEICONS, 13, 70, 125, 10 + PUSHBUTTON "Suaikan...(&C)", IDC_TASKBARPROP_ICONCUST, 188, 70, 50, 14 + GROUPBOX "System icons", IDC_STATIC, 6, 99, 240, 56 + LTEXT "Select which system icons to always show.", IDC_STATIC, 13, 113, 223, 8 + AUTOCHECKBOX "Tunjukkan jam(&K)", IDC_TASKBARPROP_CLOCK, 13, 127, 80, 10 + AUTOCHECKBOX "Tunjukkan saat", IDC_TASKBARPROP_SECONDS, 120, 127, 80, 10, WS_DISABLED + AUTOCHECKBOX "Desktop", IDC_TASKBARPROP_DESKTOP, 13, 140, 80, 10 +END + IDD_NOTIFICATIONS_CUSTOMIZE DIALOGEX 0, 0, 232, 240 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_DLGFRAME EXSTYLE WS_EX_CONTEXTHELP diff --git a/base/shell/explorer/lang/nl-NL.rc b/base/shell/explorer/lang/nl-NL.rc index bf22dbfd0bc..a81d0c2fee4 100644 --- a/base/shell/explorer/lang/nl-NL.rc +++ b/base/shell/explorer/lang/nl-NL.rc @@ -72,20 +72,14 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYS CAPTION "Taakbalk" FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN - GROUPBOX "Taakbalkweergave", IDC_STATIC, 6, 6, 240, 104 + GROUPBOX "Taakbalkweergave", IDC_STATIC, 6, 6, 240, 120 CONTROL "", IDC_TASKBARPROP_TASKBARBITMAP, "Static", SS_BITMAP | SS_SUNKEN | SS_CENTERIMAGE, 12, 18, 229, 24 AUTOCHECKBOX "Taakbalk &vergrendelen", IDC_TASKBARPROP_LOCK, 13, 45, 200, 10 AUTOCHECKBOX "Taakbalk a&utomatisch verbergen", IDC_TASKBARPROP_HIDE, 13, 58, 200, 10 AUTOCHECKBOX "Taakbalk altijd o&p voorgrond weergeven", IDC_TASKBARPROP_ONTOP, 13, 71, 200, 10 AUTOCHECKBOX "&Gelijksoortige knoppen gegroepeerd weergeven", IDC_TASKBARPROP_GROUP, 13, 84, 200, 10 AUTOCHECKBOX "Werkbalk &Snel starten weergeven", IDC_TASKBARPROP_SHOWQL, 13, 97, 200, 10 - GROUPBOX "Notification area", IDC_STATIC, 6, 114, 240, 98 - CONTROL "", IDC_TASKBARPROP_NOTIFICATIONBITMAP, "Static", SS_BITMAP | SS_SUNKEN | SS_CENTERIMAGE, 12, 126, 229, 24 - AUTOCHECKBOX "&Klok", IDC_TASKBARPROP_CLOCK, 13, 153, 80, 10 - AUTOCHECKBOX "Show seconds", IDC_TASKBARPROP_SECONDS, 120, 153, 80, 10, WS_DISABLED - LTEXT "U kunt het systeemvak opruimen door pictogrammen te verbergen waarop u recentelijk niet hebt geklikt.", IDC_STATIC, 13, 169, 223, 16 - AUTOCHECKBOX "&Inactieve pictogrammen verbergen", IDC_TASKBARPROP_HIDEICONS, 13, 191, 125, 10 - PUSHBUTTON "&Aanpassen...", IDC_TASKBARPROP_ICONCUST, 188, 191, 50, 14 + AUTOCHECKBOX "Use small icons", IDC_TASKBARPROP_SMALLICONS, 13, 110, 200, 10 END IDD_TASKBARPROP_STARTMENU DIALOGEX 0, 0, 252, 218 @@ -102,6 +96,23 @@ BEGIN PUSHBUTTON "&Aanpassen...", IDC_TASKBARPROP_STARTMENUCLASSICCUST, 192, 172, 53, 14 END +IDD_TASKBARPROP_NOTIFY DIALOGEX 0, 0, 252, 218 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Notification area" +FONT 8, "MS Shell Dlg", 0, 0, 0x1 +BEGIN + CONTROL "", IDC_TASKBARPROP_NOTIFICATIONBITMAP, "Static", SS_BITMAP | SS_SUNKEN | SS_CENTERIMAGE, 12, 6, 229, 24 + GROUPBOX "Icons", IDC_STATIC, 6, 36, 240, 56 + LTEXT "U kunt het systeemvak opruimen door pictogrammen te verbergen waarop u recentelijk niet hebt geklikt.", IDC_STATIC, 13, 48, 223, 16 + AUTOCHECKBOX "&Inactieve pictogrammen verbergen", IDC_TASKBARPROP_HIDEICONS, 13, 70, 125, 10 + PUSHBUTTON "&Aanpassen...", IDC_TASKBARPROP_ICONCUST, 188, 70, 50, 14 + GROUPBOX "System icons", IDC_STATIC, 6, 99, 240, 56 + LTEXT "Select which system icons to always show.", IDC_STATIC, 13, 113, 223, 8 + AUTOCHECKBOX "&Klok", IDC_TASKBARPROP_CLOCK, 13, 127, 80, 10 + AUTOCHECKBOX "Show seconds", IDC_TASKBARPROP_SECONDS, 120, 127, 80, 10, WS_DISABLED + AUTOCHECKBOX "Desktop", IDC_TASKBARPROP_DESKTOP, 13, 140, 80, 10 +END + IDD_NOTIFICATIONS_CUSTOMIZE DIALOGEX 0, 0, 232, 240 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_DLGFRAME EXSTYLE WS_EX_CONTEXTHELP diff --git a/base/shell/explorer/lang/no-NO.rc b/base/shell/explorer/lang/no-NO.rc index db333409033..a9852d3e74a 100644 --- a/base/shell/explorer/lang/no-NO.rc +++ b/base/shell/explorer/lang/no-NO.rc @@ -71,21 +71,14 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYS CAPTION "Oppgavelinje" FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN - GROUPBOX "Oppgavelinjens egenskaper", IDC_STATIC, 6, 6, 240, 104 + GROUPBOX "Oppgavelinjens egenskaper", IDC_STATIC, 6, 6, 240, 120 CONTROL "", IDC_TASKBARPROP_TASKBARBITMAP, "Static", SS_BITMAP | SS_SUNKEN | SS_CENTERIMAGE, 12, 18, 229, 24 AUTOCHECKBOX "&Lås oppgavelinjen", IDC_TASKBARPROP_LOCK, 13, 45, 200, 10 AUTOCHECKBOX "&Skjul oppgavelinjen automatisk", IDC_TASKBARPROP_HIDE, 13, 58, 200, 10 AUTOCHECKBOX "Behold &oppgavelinjen på toppen over andre vinduer", IDC_TASKBARPROP_ONTOP, 13, 71, 200, 10 AUTOCHECKBOX "&Grupper og lignende knapper på oppgavelinjen", IDC_TASKBARPROP_GROUP, 13, 84, 200, 10 AUTOCHECKBOX "Vis &hurtigstart", IDC_TASKBARPROP_SHOWQL, 13, 97, 200, 10 - GROUPBOX "Ikoner", IDC_STATIC, 6, 114, 240, 98 - CONTROL "", IDC_TASKBARPROP_NOTIFICATIONBITMAP, "Static", SS_BITMAP | SS_SUNKEN | SS_CENTERIMAGE, 12, 126, 229, 24 - AUTOCHECKBOX "Show clock", IDC_TASKBARPROP_CLOCK, 13, 153, 80, 10 - AUTOCHECKBOX "Show seconds", IDC_TASKBARPROP_SECONDS, 120, 153, 80, 10, WS_DISABLED - LTEXT "Du kan beholde systemfeltet ryddig ved å skjule ikoner som du ikke har brukt så ofte.", IDC_STATIC, 13, 169, 223, 16 - AUTOCHECKBOX "&Skjul inaktive ikoner", IDC_TASKBARPROP_HIDEICONS, 13, 191, 125, 10 - PUSHBUTTON "&Tilpass...", IDC_TASKBARPROP_ICONCUST, 188, 191, 50, 14 - + AUTOCHECKBOX "Use small icons", IDC_TASKBARPROP_SMALLICONS, 13, 110, 200, 10 END IDD_TASKBARPROP_STARTMENU DIALOGEX 0, 0, 252, 218 @@ -102,6 +95,23 @@ BEGIN PUSHBUTTON "&Tilpass...", IDC_TASKBARPROP_STARTMENUCLASSICCUST, 192, 172, 53, 14 END +IDD_TASKBARPROP_NOTIFY DIALOGEX 0, 0, 252, 218 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Ikoner" +FONT 8, "MS Shell Dlg", 0, 0, 0x1 +BEGIN + CONTROL "", IDC_TASKBARPROP_NOTIFICATIONBITMAP, "Static", SS_BITMAP | SS_SUNKEN | SS_CENTERIMAGE, 12, 6, 229, 24 + GROUPBOX "Icons", IDC_STATIC, 6, 36, 240, 56 + LTEXT "Du kan beholde systemfeltet ryddig ved å skjule ikoner som du ikke har brukt så ofte.", IDC_STATIC, 13, 48, 223, 16 + AUTOCHECKBOX "&Skjul inaktive ikoner", IDC_TASKBARPROP_HIDEICONS, 13, 70, 125, 10 + PUSHBUTTON "&Tilpass...", IDC_TASKBARPROP_ICONCUST, 188, 70, 50, 14 + GROUPBOX "System icons", IDC_STATIC, 6, 99, 240, 56 + LTEXT "Select which system icons to always show.", IDC_STATIC, 13, 113, 223, 8 + AUTOCHECKBOX "Show clock", IDC_TASKBARPROP_CLOCK, 13, 127, 80, 10 + AUTOCHECKBOX "Show seconds", IDC_TASKBARPROP_SECONDS, 120, 127, 80, 10, WS_DISABLED + AUTOCHECKBOX "Desktop", IDC_TASKBARPROP_DESKTOP, 13, 140, 80, 10 +END + IDD_NOTIFICATIONS_CUSTOMIZE DIALOGEX 0, 0, 232, 240 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_DLGFRAME EXSTYLE WS_EX_CONTEXTHELP diff --git a/base/shell/explorer/lang/pl-PL.rc b/base/shell/explorer/lang/pl-PL.rc index 20b947b0b33..c282ada24bb 100644 --- a/base/shell/explorer/lang/pl-PL.rc +++ b/base/shell/explorer/lang/pl-PL.rc @@ -74,20 +74,14 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYS CAPTION "Pasek zadań" FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN - GROUPBOX "Wygląd paska zadań", IDC_STATIC, 6, 6, 240, 104 + GROUPBOX "Wygląd paska zadań", IDC_STATIC, 6, 6, 240, 120 CONTROL "", IDC_TASKBARPROP_TASKBARBITMAP, "Static", SS_BITMAP | SS_SUNKEN | SS_CENTERIMAGE, 12, 18, 229, 24 AUTOCHECKBOX "Za&blokuj pasek zadań", IDC_TASKBARPROP_LOCK, 13, 45, 200, 10 AUTOCHECKBOX "&Włącz autoukrywanie paska zadań", IDC_TASKBARPROP_HIDE, 13, 58, 200, 10 AUTOCHECKBOX "&Trzymaj pasek zadań na wierzchu", IDC_TASKBARPROP_ONTOP, 13, 71, 200, 10 AUTOCHECKBOX "&Grupuj podobne przyciski paska zadań", IDC_TASKBARPROP_GROUP, 13, 84, 200, 10 AUTOCHECKBOX "Pokaż pasek &Szybkiego uruchamiania", IDC_TASKBARPROP_SHOWQL, 13, 97, 200, 10 - GROUPBOX "Pasek powiadomień", IDC_STATIC, 6, 114, 240, 96 - CONTROL "", IDC_TASKBARPROP_NOTIFICATIONBITMAP, "Static", SS_BITMAP | SS_SUNKEN | SS_CENTERIMAGE, 12, 126, 229, 24 - AUTOCHECKBOX "Pokaż &zegar", IDC_TASKBARPROP_CLOCK, 13, 153, 80, 10 - AUTOCHECKBOX "Pokaż sekundy", IDC_TASKBARPROP_SECONDS, 120, 153, 80, 10, WS_DISABLED - LTEXT "Możesz uporządkować obszar powiadomień poprzez ukrycie rzadko używanych ikon.", IDC_STATIC, 13, 169, 223, 16 - AUTOCHECKBOX "&Ukryj nieaktywne ikony", IDC_TASKBARPROP_HIDEICONS, 13, 191, 125, 10 - PUSHBUTTON "&Dostosuj...", IDC_TASKBARPROP_ICONCUST, 188, 191, 50, 14 + AUTOCHECKBOX "Use small icons", IDC_TASKBARPROP_SMALLICONS, 13, 110, 200, 10 END IDD_TASKBARPROP_STARTMENU DIALOGEX 0, 0, 252, 218 @@ -104,6 +98,23 @@ BEGIN PUSHBUTTON "&Dostosuj...", IDC_TASKBARPROP_STARTMENUCLASSICCUST, 192, 172, 53, 14 END +IDD_TASKBARPROP_NOTIFY DIALOGEX 0, 0, 252, 218 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Pasek powiadomień" +FONT 8, "MS Shell Dlg", 0, 0, 0x1 +BEGIN + CONTROL "", IDC_TASKBARPROP_NOTIFICATIONBITMAP, "Static", SS_BITMAP | SS_SUNKEN | SS_CENTERIMAGE, 12, 6, 229, 24 + GROUPBOX "Icons", IDC_STATIC, 6, 36, 240, 56 + LTEXT "Możesz uporządkować obszar powiadomień poprzez ukrycie rzadko używanych ikon.", IDC_STATIC, 13, 48, 223, 16 + AUTOCHECKBOX "&Ukryj nieaktywne ikony", IDC_TASKBARPROP_HIDEICONS, 13, 70, 125, 10 + PUSHBUTTON "&Dostosuj...", IDC_TASKBARPROP_ICONCUST, 188, 70, 50, 14 + GROUPBOX "System icons", IDC_STATIC, 6, 99, 240, 56 + LTEXT "Select which system icons to always show.", IDC_STATIC, 13, 113, 223, 8 + AUTOCHECKBOX "Pokaż &zegar", IDC_TASKBARPROP_CLOCK, 13, 127, 80, 10 + AUTOCHECKBOX "Pokaż sekundy", IDC_TASKBARPROP_SECONDS, 120, 127, 80, 10, WS_DISABLED + AUTOCHECKBOX "Desktop", IDC_TASKBARPROP_DESKTOP, 13, 140, 80, 10 +END + IDD_NOTIFICATIONS_CUSTOMIZE DIALOGEX 0, 0, 232, 240 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_DLGFRAME EXSTYLE WS_EX_CONTEXTHELP diff --git a/base/shell/explorer/lang/pt-BR.rc b/base/shell/explorer/lang/pt-BR.rc index a0702db0aeb..9c36ed9a014 100644 --- a/base/shell/explorer/lang/pt-BR.rc +++ b/base/shell/explorer/lang/pt-BR.rc @@ -72,20 +72,14 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYS CAPTION "Barra de Tarefas" FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN - GROUPBOX "Aparência da barra de tarefas", IDC_STATIC, 6, 6, 240, 104 + GROUPBOX "Aparência da barra de tarefas", IDC_STATIC, 6, 6, 240, 120 CONTROL "", IDC_TASKBARPROP_TASKBARBITMAP, "Static", SS_BITMAP | SS_SUNKEN | SS_CENTERIMAGE, 12, 18, 229, 24 AUTOCHECKBOX "&Bloquear a barra de tarefas", IDC_TASKBARPROP_LOCK, 13, 45, 200, 10 AUTOCHECKBOX "&Ocultar automaticamente a barra de tarefas", IDC_TASKBARPROP_HIDE, 13, 58, 200, 10 AUTOCHECKBOX "&Manter barra de tarefas sobre outros janelas", IDC_TASKBARPROP_ONTOP, 13, 71, 200, 10 AUTOCHECKBOX "&Agrupar botões similares da barra de tarefas", IDC_TASKBARPROP_GROUP, 13, 84, 200, 10 AUTOCHECKBOX "&Exibir Inicialização Rápida", IDC_TASKBARPROP_SHOWQL, 13, 97, 200, 10 - GROUPBOX "Notification area", IDC_STATIC, 6, 114, 240, 98 - CONTROL "", IDC_TASKBARPROP_NOTIFICATIONBITMAP, "Static", SS_BITMAP | SS_SUNKEN | SS_CENTERIMAGE, 12, 126, 229, 24 - AUTOCHECKBOX "Reló&gio", IDC_TASKBARPROP_CLOCK, 13, 153, 80, 10 - AUTOCHECKBOX "Show seconds", IDC_TASKBARPROP_SECONDS, 120, 153, 80, 10, WS_DISABLED - LTEXT "Você pode manter a área de notificação organizada escondendo os ícones que você não tenha clicado recentemente.", IDC_STATIC, 13, 169, 223, 16 - AUTOCHECKBOX "&Esconder ícones inativos", IDC_TASKBARPROP_HIDEICONS, 13, 191, 125, 10 - PUSHBUTTON "&Personalizar...", IDC_TASKBARPROP_ICONCUST, 188, 191, 50, 14 + AUTOCHECKBOX "Use small icons", IDC_TASKBARPROP_SMALLICONS, 13, 110, 200, 10 END IDD_TASKBARPROP_STARTMENU DIALOGEX 0, 0, 252, 218 @@ -102,6 +96,23 @@ BEGIN PUSHBUTTON "&Personalizar...", IDC_TASKBARPROP_STARTMENUCLASSICCUST, 192, 172, 53, 14 END +IDD_TASKBARPROP_NOTIFY DIALOGEX 0, 0, 252, 218 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Notification area" +FONT 8, "MS Shell Dlg", 0, 0, 0x1 +BEGIN + CONTROL "", IDC_TASKBARPROP_NOTIFICATIONBITMAP, "Static", SS_BITMAP | SS_SUNKEN | SS_CENTERIMAGE, 12, 6, 229, 24 + GROUPBOX "Icons", IDC_STATIC, 6, 36, 240, 56 + LTEXT "Você pode manter a área de notificação organizada escondendo os ícones que você não tenha clicado recentemente.", IDC_STATIC, 13, 48, 223, 16 + AUTOCHECKBOX "&Esconder ícones inativos", IDC_TASKBARPROP_HIDEICONS, 13, 70, 125, 10 + PUSHBUTTON "&Personalizar...", IDC_TASKBARPROP_ICONCUST, 188, 70, 50, 14 + GROUPBOX "System icons", IDC_STATIC, 6, 99, 240, 56 + LTEXT "Select which system icons to always show.", IDC_STATIC, 13, 113, 223, 8 + AUTOCHECKBOX "Reló&gio", IDC_TASKBARPROP_CLOCK, 13, 127, 80, 10 + AUTOCHECKBOX "Show seconds", IDC_TASKBARPROP_SECONDS, 120, 127, 80, 10, WS_DISABLED + AUTOCHECKBOX "Desktop", IDC_TASKBARPROP_DESKTOP, 13, 140, 80, 10 +END + IDD_NOTIFICATIONS_CUSTOMIZE DIALOGEX 0, 0, 232, 240 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_DLGFRAME EXSTYLE WS_EX_CONTEXTHELP diff --git a/base/shell/explorer/lang/pt-PT.rc b/base/shell/explorer/lang/pt-PT.rc index 37d7e1c84f3..5cd3bd3ad36 100644 --- a/base/shell/explorer/lang/pt-PT.rc +++ b/base/shell/explorer/lang/pt-PT.rc @@ -73,20 +73,14 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYS CAPTION "Barra de Tarefas" FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN - GROUPBOX "Aspecto da barra de tarefas", IDC_STATIC, 6, 6, 240, 104 + GROUPBOX "Aspecto da barra de tarefas", IDC_STATIC, 6, 6, 240, 120 CONTROL "", IDC_TASKBARPROP_TASKBARBITMAP, "Static", SS_BITMAP | SS_SUNKEN | SS_CENTERIMAGE, 12, 18, 229, 24 AUTOCHECKBOX "&Bloquear a barra de tarefas", IDC_TASKBARPROP_LOCK, 13, 45, 200, 10 AUTOCHECKBOX "&Ocultar automaticamente a barra de tarefas", IDC_TASKBARPROP_HIDE, 13, 58, 200, 10 AUTOCHECKBOX "&Manter a barra de tarefas sobre outras janelas", IDC_TASKBARPROP_ONTOP, 13, 71, 200, 10 AUTOCHECKBOX "&Agrupar botões similares da barra de tarefas", IDC_TASKBARPROP_GROUP, 13, 84, 200, 10 AUTOCHECKBOX "&Mostrar Iniciação Rápida", IDC_TASKBARPROP_SHOWQL, 13, 97, 200, 10 - GROUPBOX "Área de Notificação", IDC_STATIC, 6, 114, 240, 98 - CONTROL "", IDC_TASKBARPROP_NOTIFICATIONBITMAP, "Static", SS_BITMAP | SS_SUNKEN | SS_CENTERIMAGE, 12, 126, 229, 24 - AUTOCHECKBOX "Reló&gio", IDC_TASKBARPROP_CLOCK, 13, 153, 80, 10 - AUTOCHECKBOX "Mostrar segundos", IDC_TASKBARPROP_SECONDS, 120, 153, 80, 10, WS_DISABLED - LTEXT "Pode manter a área de notificação organizada ocultando os ícones que não clicou recentemente.", IDC_STATIC, 13, 169, 223, 16 - AUTOCHECKBOX "&Ocultar ícones inactivos", IDC_TASKBARPROP_HIDEICONS, 13, 191, 125, 10 - PUSHBUTTON "&Personalizar...", IDC_TASKBARPROP_ICONCUST, 188, 191, 50, 14 + AUTOCHECKBOX "Use small icons", IDC_TASKBARPROP_SMALLICONS, 13, 110, 200, 10 END IDD_TASKBARPROP_STARTMENU DIALOGEX 0, 0, 252, 218 @@ -103,6 +97,23 @@ BEGIN PUSHBUTTON "&Personalizar...", IDC_TASKBARPROP_STARTMENUCLASSICCUST, 192, 172, 53, 14 END +IDD_TASKBARPROP_NOTIFY DIALOGEX 0, 0, 252, 218 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Área de Notificação" +FONT 8, "MS Shell Dlg", 0, 0, 0x1 +BEGIN + CONTROL "", IDC_TASKBARPROP_NOTIFICATIONBITMAP, "Static", SS_BITMAP | SS_SUNKEN | SS_CENTERIMAGE, 12, 6, 229, 24 + GROUPBOX "Icons", IDC_STATIC, 6, 36, 240, 56 + LTEXT "Pode manter a área de notificação organizada ocultando os ícones que não clicou recentemente.", IDC_STATIC, 13, 48, 223, 16 + AUTOCHECKBOX "&Ocultar ícones inactivos", IDC_TASKBARPROP_HIDEICONS, 13, 70, 125, 10 + PUSHBUTTON "&Personalizar...", IDC_TASKBARPROP_ICONCUST, 188, 70, 50, 14 + GROUPBOX "System icons", IDC_STATIC, 6, 99, 240, 56 + LTEXT "Select which system icons to always show.", IDC_STATIC, 13, 113, 223, 8 + AUTOCHECKBOX "Reló&gio", IDC_TASKBARPROP_CLOCK, 13, 127, 80, 10 + AUTOCHECKBOX "Mostrar segundos", IDC_TASKBARPROP_SECONDS, 120, 127, 80, 10, WS_DISABLED + AUTOCHECKBOX "Desktop", IDC_TASKBARPROP_DESKTOP, 13, 140, 80, 10 +END + IDD_NOTIFICATIONS_CUSTOMIZE DIALOGEX 0, 0, 232, 240 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_DLGFRAME EXSTYLE WS_EX_CONTEXTHELP diff --git a/base/shell/explorer/lang/ro-RO.rc b/base/shell/explorer/lang/ro-RO.rc index 2c51b84f5eb..e89edc15445 100644 --- a/base/shell/explorer/lang/ro-RO.rc +++ b/base/shell/explorer/lang/ro-RO.rc @@ -72,20 +72,14 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYS CAPTION "Bară de activități" FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN - GROUPBOX "Aspectul barei de activități", IDC_STATIC, 6, 6, 240, 104 + GROUPBOX "Aspectul barei de activități", IDC_STATIC, 6, 6, 240, 120 CONTROL "", IDC_TASKBARPROP_TASKBARBITMAP, "Static", SS_BITMAP | SS_SUNKEN | SS_CENTERIMAGE, 12, 18, 229, 24 AUTOCHECKBOX "Fi&xează bara de activități", IDC_TASKBARPROP_LOCK, 13, 45, 200, 10 AUTOCHECKBOX "&Auto-ascunde bara de activități", IDC_TASKBARPROP_HIDE, 13, 58, 200, 10 AUTOCHECKBOX "&Menține bara de activități deasupra celorlalte ferestre", IDC_TASKBARPROP_ONTOP, 13, 71, 200, 10 AUTOCHECKBOX "&Grupează butoanele similare din bara de activități", IDC_TASKBARPROP_GROUP, 13, 84, 200, 10 AUTOCHECKBOX "Afișează bara „&Lansări rapide”", IDC_TASKBARPROP_SHOWQL, 13, 97, 200, 10 - GROUPBOX "Zonă de notificare", IDC_STATIC, 6, 114, 240, 98 - CONTROL "", IDC_TASKBARPROP_NOTIFICATIONBITMAP, "Static", SS_BITMAP | SS_SUNKEN | SS_CENTERIMAGE, 12, 126, 229, 24 - AUTOCHECKBOX "Afișează &ceas", IDC_TASKBARPROP_CLOCK, 13, 153, 80, 10 - AUTOCHECKBOX "Afișează s&ecunde", IDC_TASKBARPROP_SECONDS, 120, 153, 80, 10, WS_DISABLED - LTEXT "Puteți menține ordonată zona de notificare prin ascunderea pictogramelor neaccesate recent.", IDC_STATIC, 13, 169, 223, 16 - AUTOCHECKBOX "Asc&unde pictogramele neaccesate", IDC_TASKBARPROP_HIDEICONS, 13, 191, 125, 10 - PUSHBUTTON "&Particularizare…", IDC_TASKBARPROP_ICONCUST, 188, 191, 50, 14 + AUTOCHECKBOX "Use small icons", IDC_TASKBARPROP_SMALLICONS, 13, 110, 200, 10 END IDD_TASKBARPROP_STARTMENU DIALOGEX 0, 0, 252, 218 @@ -102,6 +96,23 @@ BEGIN PUSHBUTTON "Pa&rticularizare…", IDC_TASKBARPROP_STARTMENUCLASSICCUST, 192, 172, 53, 14 END +IDD_TASKBARPROP_NOTIFY DIALOGEX 0, 0, 252, 218 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Zonă de notificare" +FONT 8, "MS Shell Dlg", 0, 0, 0x1 +BEGIN + CONTROL "", IDC_TASKBARPROP_NOTIFICATIONBITMAP, "Static", SS_BITMAP | SS_SUNKEN | SS_CENTERIMAGE, 12, 6, 229, 24 + GROUPBOX "Icons", IDC_STATIC, 6, 36, 240, 56 + LTEXT "Puteți menține ordonată zona de notificare prin ascunderea pictogramelor neaccesate recent.", IDC_STATIC, 13, 48, 223, 16 + AUTOCHECKBOX "Asc&unde pictogramele neaccesate", IDC_TASKBARPROP_HIDEICONS, 13, 70, 125, 10 + PUSHBUTTON "&Particularizare…", IDC_TASKBARPROP_ICONCUST, 188, 70, 50, 14 + GROUPBOX "System icons", IDC_STATIC, 6, 99, 240, 56 + LTEXT "Select which system icons to always show.", IDC_STATIC, 13, 113, 223, 8 + AUTOCHECKBOX "Afișează &ceas", IDC_TASKBARPROP_CLOCK, 13, 127, 80, 10 + AUTOCHECKBOX "Afișează s&ecunde", IDC_TASKBARPROP_SECONDS, 120, 127, 80, 10, WS_DISABLED + AUTOCHECKBOX "Desktop", IDC_TASKBARPROP_DESKTOP, 13, 140, 80, 10 +END + IDD_NOTIFICATIONS_CUSTOMIZE DIALOGEX 0, 0, 232, 240 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_DLGFRAME EXSTYLE WS_EX_CONTEXTHELP diff --git a/base/shell/explorer/lang/ru-RU.rc b/base/shell/explorer/lang/ru-RU.rc index 545b98f06bf..d4ccba1fc5e 100644 --- a/base/shell/explorer/lang/ru-RU.rc +++ b/base/shell/explorer/lang/ru-RU.rc @@ -75,20 +75,14 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYS CAPTION "Панель задач" FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN - GROUPBOX "Свойства панели задач", IDC_STATIC, 6, 6, 240, 104 + GROUPBOX "Свойства панели задач", IDC_STATIC, 6, 6, 240, 120 CONTROL "", IDC_TASKBARPROP_TASKBARBITMAP, "Static", SS_BITMAP | SS_SUNKEN | SS_CENTERIMAGE, 12, 18, 229, 24 AUTOCHECKBOX "&Закрепить панель задач", IDC_TASKBARPROP_LOCK, 13, 45, 200, 10 AUTOCHECKBOX "&Автоматически скрывать панель задач", IDC_TASKBARPROP_HIDE, 13, 58, 200, 10 AUTOCHECKBOX "Отображать панель задач &поверх других окон", IDC_TASKBARPROP_ONTOP, 13, 71, 200, 10 AUTOCHECKBOX "&Группировать схожие кнопки панели задач", IDC_TASKBARPROP_GROUP, 13, 84, 200, 10 AUTOCHECKBOX "Отображать панель &быстрого запуска", IDC_TASKBARPROP_SHOWQL, 13, 97, 200, 10 - GROUPBOX "Область уведомлений", IDC_STATIC, 6, 114, 240, 98 - CONTROL "", IDC_TASKBARPROP_NOTIFICATIONBITMAP, "Static", SS_BITMAP | SS_SUNKEN | SS_CENTERIMAGE, 12, 126, 229, 24 - AUTOCHECKBOX "Отображать &часы", IDC_TASKBARPROP_CLOCK, 13, 153, 80, 10 - AUTOCHECKBOX "Отображать &секунды", IDC_TASKBARPROP_SECONDS, 120, 153, 83, 10, WS_DISABLED - LTEXT "Можно избежать загромождения области уведомлений, скрывая значки, которые давно не использовались.", IDC_STATIC, 13, 169, 223, 16 - AUTOCHECKBOX "Скрывать &неиспользуемые значки", IDC_TASKBARPROP_HIDEICONS, 13, 191, 128, 10 - PUSHBUTTON "&Настроить...", IDC_TASKBARPROP_ICONCUST, 188, 191, 50, 14 + AUTOCHECKBOX "Use small icons", IDC_TASKBARPROP_SMALLICONS, 13, 110, 200, 10 END IDD_TASKBARPROP_STARTMENU DIALOGEX 0, 0, 252, 218 @@ -105,6 +99,23 @@ BEGIN PUSHBUTTON "Н&астроить...", IDC_TASKBARPROP_STARTMENUCLASSICCUST, 192, 172, 53, 14 END +IDD_TASKBARPROP_NOTIFY DIALOGEX 0, 0, 252, 218 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Область уведомлений" +FONT 8, "MS Shell Dlg", 0, 0, 0x1 +BEGIN + CONTROL "", IDC_TASKBARPROP_NOTIFICATIONBITMAP, "Static", SS_BITMAP | SS_SUNKEN | SS_CENTERIMAGE, 12, 6, 229, 24 + GROUPBOX "Icons", IDC_STATIC, 6, 36, 240, 56 + LTEXT "Можно избежать загромождения области уведомлений, скрывая значки, которые давно не использовались.", IDC_STATIC, 13, 48, 223, 16 + AUTOCHECKBOX "Скрывать &неиспользуемые значки", IDC_TASKBARPROP_HIDEICONS, 13, 70, 128, 10 + PUSHBUTTON "&Настроить...", IDC_TASKBARPROP_ICONCUST, 188, 70, 50, 14 + GROUPBOX "System icons", IDC_STATIC, 6, 99, 240, 56 + LTEXT "Select which system icons to always show.", IDC_STATIC, 13, 113, 223, 8 + AUTOCHECKBOX "Отображать &часы", IDC_TASKBARPROP_CLOCK, 13, 127, 80, 10 + AUTOCHECKBOX "Отображать &секунды", IDC_TASKBARPROP_SECONDS, 120, 127, 83, 10, WS_DISABLED + AUTOCHECKBOX "Desktop", IDC_TASKBARPROP_DESKTOP, 13, 140, 80, 10 +END + IDD_NOTIFICATIONS_CUSTOMIZE DIALOGEX 0, 0, 232, 240 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_DLGFRAME EXSTYLE WS_EX_CONTEXTHELP diff --git a/base/shell/explorer/lang/sk-SK.rc b/base/shell/explorer/lang/sk-SK.rc index 83c2f77fbaf..7a52a8316c5 100644 --- a/base/shell/explorer/lang/sk-SK.rc +++ b/base/shell/explorer/lang/sk-SK.rc @@ -71,20 +71,14 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYS CAPTION "Panel úloh" FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN - GROUPBOX "Vzhľad panela úloh", IDC_STATIC, 6, 6, 240, 104 + GROUPBOX "Vzhľad panela úloh", IDC_STATIC, 6, 6, 240, 120 CONTROL "", IDC_TASKBARPROP_TASKBARBITMAP, "Static", SS_BITMAP | SS_SUNKEN | SS_CENTERIMAGE, 12, 18, 229, 24 AUTOCHECKBOX "Za&mknúť panel úloh", IDC_TASKBARPROP_LOCK, 13, 45, 200, 10 AUTOCHECKBOX "A&utomaticky skývať panel úloh", IDC_TASKBARPROP_HIDE, 13, 58, 200, 10 AUTOCHECKBOX "Zo&brazovať panel úloh nad ostatnými oknami", IDC_TASKBARPROP_ONTOP, 13, 71, 200, 10 // Ponechať panel úloh nad ostatnými oknami AUTOCHECKBOX "&Zoskupovať podobné tlačidlá na paneli s nástrojmi", IDC_TASKBARPROP_GROUP, 13, 84, 200, 10 AUTOCHECKBOX "Zobraziť panel &Rýchle spustenie", IDC_TASKBARPROP_SHOWQL, 13, 97, 200, 10 - GROUPBOX "Notification area", IDC_STATIC, 6, 114, 240, 98 - CONTROL "", IDC_TASKBARPROP_NOTIFICATIONBITMAP, "Static", SS_BITMAP | SS_SUNKEN | SS_CENTERIMAGE, 12, 126, 229, 24 - AUTOCHECKBOX "Ho&diny", IDC_TASKBARPROP_CLOCK, 13, 153, 80, 10 - AUTOCHECKBOX "Show seconds", IDC_TASKBARPROP_SECONDS, 120, 153, 80, 10, WS_DISABLED - LTEXT "You can keep the notification area uncluttered by hiding icons that you have not clicked recently.", IDC_STATIC, 16, 169, 223, 16 - AUTOCHECKBOX "&Skryť neaktívne ikony", IDC_TASKBARPROP_HIDEICONS, 13, 191, 125, 10 - PUSHBUTTON "P&rispôsobiť...", IDC_TASKBARPROP_ICONCUST, 188, 191, 50, 14 + AUTOCHECKBOX "Use small icons", IDC_TASKBARPROP_SMALLICONS, 13, 110, 200, 10 END IDD_TASKBARPROP_STARTMENU DIALOGEX 0, 0, 252, 218 @@ -101,6 +95,23 @@ BEGIN PUSHBUTTON "&Prispôsobiť...", IDC_TASKBARPROP_STARTMENUCLASSICCUST, 192, 172, 53, 14 END +IDD_TASKBARPROP_NOTIFY DIALOGEX 0, 0, 252, 218 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Notification area" +FONT 8, "MS Shell Dlg", 0, 0, 0x1 +BEGIN + CONTROL "", IDC_TASKBARPROP_NOTIFICATIONBITMAP, "Static", SS_BITMAP | SS_SUNKEN | SS_CENTERIMAGE, 12, 6, 229, 24 + GROUPBOX "Icons", IDC_STATIC, 6, 36, 240, 56 + LTEXT "You can keep the notification area uncluttered by hiding icons that you have not clicked recently.", IDC_STATIC, 16, 48, 223, 16 + AUTOCHECKBOX "&Skryť neaktívne ikony", IDC_TASKBARPROP_HIDEICONS, 13, 70, 125, 10 + PUSHBUTTON "P&rispôsobiť...", IDC_TASKBARPROP_ICONCUST, 188, 70, 50, 14 + GROUPBOX "System icons", IDC_STATIC, 6, 99, 240, 56 + LTEXT "Select which system icons to always show.", IDC_STATIC, 13, 113, 223, 8 + AUTOCHECKBOX "Ho&diny", IDC_TASKBARPROP_CLOCK, 13, 127, 80, 10 + AUTOCHECKBOX "Show seconds", IDC_TASKBARPROP_SECONDS, 120, 127, 80, 10, WS_DISABLED + AUTOCHECKBOX "Desktop", IDC_TASKBARPROP_DESKTOP, 13, 140, 80, 10 +END + IDD_NOTIFICATIONS_CUSTOMIZE DIALOGEX 0, 0, 232, 240 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_DLGFRAME EXSTYLE WS_EX_CONTEXTHELP diff --git a/base/shell/explorer/lang/sq-AL.rc b/base/shell/explorer/lang/sq-AL.rc index 4b94bcc57a7..b12786ebff2 100644 --- a/base/shell/explorer/lang/sq-AL.rc +++ b/base/shell/explorer/lang/sq-AL.rc @@ -71,20 +71,14 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYS CAPTION "Taskbar" FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN - GROUPBOX "Aparenca e Taskbar", IDC_STATIC, 6, 6, 240, 104 + GROUPBOX "Aparenca e Taskbar", IDC_STATIC, 6, 6, 240, 120 CONTROL "", IDC_TASKBARPROP_TASKBARBITMAP, "Static", SS_BITMAP | SS_SUNKEN | SS_CENTERIMAGE, 12, 18, 229, 24 AUTOCHECKBOX "&Blloko taskbarin", IDC_TASKBARPROP_LOCK, 13, 45, 200, 10 AUTOCHECKBOX "Fsheh automatikish taskbarin", IDC_TASKBARPROP_HIDE, 13, 58, 200, 10 AUTOCHECKBOX "Mbaj &taskbar mbi dritaret e tjera", IDC_TASKBARPROP_ONTOP, 13, 71, 200, 10 AUTOCHECKBOX "&Grupo butonat e njejte në taskbar", IDC_TASKBARPROP_GROUP, 13, 84, 200, 10 AUTOCHECKBOX "Shfaq &Quick Launch", IDC_TASKBARPROP_SHOWQL, 13, 97, 200, 10 - GROUPBOX "Notification area", IDC_STATIC, 6, 114, 240, 98 - CONTROL "", IDC_TASKBARPROP_NOTIFICATIONBITMAP, "Static", SS_BITMAP | SS_SUNKEN | SS_CENTERIMAGE, 12, 126, 229, 24 - AUTOCHECKBOX "Shfaq Ora", IDC_TASKBARPROP_CLOCK, 13, 153, 80, 10 - AUTOCHECKBOX "Show seconds", IDC_TASKBARPROP_SECONDS, 120, 153, 80, 10, WS_DISABLED - LTEXT "Ju mund të mbani zonën e njoftimit të pa prerë duke i fshehur ikona që ju nuk e keni klikuar kohët e fundit.", IDC_STATIC, 13, 169, 223, 16 - AUTOCHECKBOX "Fsheh ikonat inaktive", IDC_TASKBARPROP_HIDEICONS, 13, 191, 125, 10 - PUSHBUTTON "Rregulloje...", IDC_TASKBARPROP_ICONCUST, 188, 191, 50, 14 + AUTOCHECKBOX "Use small icons", IDC_TASKBARPROP_SMALLICONS, 13, 110, 200, 10 END IDD_TASKBARPROP_STARTMENU DIALOGEX 0, 0, 252, 218 @@ -101,6 +95,23 @@ BEGIN PUSHBUTTON "&Modifiko...", IDC_TASKBARPROP_STARTMENUCLASSICCUST, 192, 172, 53, 14 END +IDD_TASKBARPROP_NOTIFY DIALOGEX 0, 0, 252, 218 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Notification area" +FONT 8, "MS Shell Dlg", 0, 0, 0x1 +BEGIN + CONTROL "", IDC_TASKBARPROP_NOTIFICATIONBITMAP, "Static", SS_BITMAP | SS_SUNKEN | SS_CENTERIMAGE, 12, 6, 229, 24 + GROUPBOX "Icons", IDC_STATIC, 6, 36, 240, 56 + LTEXT "Ju mund të mbani zonën e njoftimit të pa prerë duke i fshehur ikona që ju nuk e keni klikuar kohët e fundit.", IDC_STATIC, 13, 48, 223, 16 + AUTOCHECKBOX "Fsheh ikonat inaktive", IDC_TASKBARPROP_HIDEICONS, 13, 70, 125, 10 + PUSHBUTTON "Rregulloje...", IDC_TASKBARPROP_ICONCUST, 188, 70, 50, 14 + GROUPBOX "System icons", IDC_STATIC, 6, 99, 240, 56 + LTEXT "Select which system icons to always show.", IDC_STATIC, 13, 113, 223, 8 + AUTOCHECKBOX "Shfaq Ora", IDC_TASKBARPROP_CLOCK, 13, 127, 80, 10 + AUTOCHECKBOX "Show seconds", IDC_TASKBARPROP_SECONDS, 120, 127, 80, 10, WS_DISABLED + AUTOCHECKBOX "Desktop", IDC_TASKBARPROP_DESKTOP, 13, 140, 80, 10 +END + IDD_NOTIFICATIONS_CUSTOMIZE DIALOGEX 0, 0, 232, 240 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_DLGFRAME EXSTYLE WS_EX_CONTEXTHELP diff --git a/base/shell/explorer/lang/tr-TR.rc b/base/shell/explorer/lang/tr-TR.rc index 7ff3b2a4d29..3914ee4abfb 100644 --- a/base/shell/explorer/lang/tr-TR.rc +++ b/base/shell/explorer/lang/tr-TR.rc @@ -72,20 +72,14 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYS CAPTION "Görev Çubuğu" FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN - GROUPBOX "Görev Çubuğu Görünümü", IDC_STATIC, 6, 6, 240, 104 + GROUPBOX "Görev Çubuğu Görünümü", IDC_STATIC, 6, 6, 240, 120 CONTROL "", IDC_TASKBARPROP_TASKBARBITMAP, "Static", SS_BITMAP | SS_SUNKEN | SS_CENTERIMAGE, 12, 18, 229, 24 AUTOCHECKBOX "&Görev Çubuğunu Kilitle", IDC_TASKBARPROP_LOCK, 13, 45, 200, 10 AUTOCHECKBOX "G&örev Çubuğunu Kendiliğinden Gizle", IDC_TASKBARPROP_HIDE, 13, 58, 200, 10 AUTOCHECKBOX "Gö&rev Çubuğunu Pencerelerin Üstünde Tut", IDC_TASKBARPROP_ONTOP, 13, 71, 200, 10 AUTOCHECKBOX "&Benzer Görev Çubuğu Düğmelerini Gruplandır", IDC_TASKBARPROP_GROUP, 13, 84, 200, 10 AUTOCHECKBOX "&Hızlı Başlat'ı Göster", IDC_TASKBARPROP_SHOWQL, 13, 97, 200, 10 - GROUPBOX "Simgeler", IDC_STATIC, 6, 114, 240, 98 - CONTROL "", IDC_TASKBARPROP_NOTIFICATIONBITMAP, "Static", SS_BITMAP | SS_SUNKEN | SS_CENTERIMAGE, 12, 126, 229, 24 - AUTOCHECKBOX "&Saat", IDC_TASKBARPROP_CLOCK, 13, 153, 80, 10 - AUTOCHECKBOX "S&aniyeleri Göster", IDC_TASKBARPROP_SECONDS, 120, 153, 80, 10, WS_DISABLED - LTEXT "Son zamanlarda tıklamadığınız simgeleri gizleyerek bildirim alanını düzenli tutabilirsiniz.", IDC_STATIC, 13, 169, 223, 16 - AUTOCHECKBOX "&Devre Dışı Simgeleri Gizle", IDC_TASKBARPROP_HIDEICONS, 13, 191, 125, 10 - PUSHBUTTON "Ö&zelleştir...", IDC_TASKBARPROP_ICONCUST, 188, 191, 50, 14 + AUTOCHECKBOX "Use small icons", IDC_TASKBARPROP_SMALLICONS, 13, 110, 200, 10 END IDD_TASKBARPROP_STARTMENU DIALOGEX 0, 0, 252, 218 @@ -102,6 +96,23 @@ BEGIN PUSHBUTTON "Ö&zelleştir...", IDC_TASKBARPROP_STARTMENUCLASSICCUST, 192, 172, 53, 14 END +IDD_TASKBARPROP_NOTIFY DIALOGEX 0, 0, 252, 218 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Simgeler" +FONT 8, "MS Shell Dlg", 0, 0, 0x1 +BEGIN + CONTROL "", IDC_TASKBARPROP_NOTIFICATIONBITMAP, "Static", SS_BITMAP | SS_SUNKEN | SS_CENTERIMAGE, 12, 6, 229, 24 + GROUPBOX "Icons", IDC_STATIC, 6, 36, 240, 56 + LTEXT "Son zamanlarda tıklamadığınız simgeleri gizleyerek bildirim alanını düzenli tutabilirsiniz.", IDC_STATIC, 13, 48, 223, 16 + AUTOCHECKBOX "&Devre Dışı Simgeleri Gizle", IDC_TASKBARPROP_HIDEICONS, 13, 70, 125, 10 + PUSHBUTTON "Ö&zelleştir...", IDC_TASKBARPROP_ICONCUST, 188, 70, 50, 14 + GROUPBOX "System icons", IDC_STATIC, 6, 99, 240, 56 + LTEXT "Select which system icons to always show.", IDC_STATIC, 13, 113, 223, 8 + AUTOCHECKBOX "&Saat", IDC_TASKBARPROP_CLOCK, 13, 127, 80, 10 + AUTOCHECKBOX "S&aniyeleri Göster", IDC_TASKBARPROP_SECONDS, 120, 127, 80, 10, WS_DISABLED + AUTOCHECKBOX "Desktop", IDC_TASKBARPROP_DESKTOP, 13, 140, 80, 10 +END + IDD_NOTIFICATIONS_CUSTOMIZE DIALOGEX 0, 0, 232, 240 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_DLGFRAME EXSTYLE WS_EX_CONTEXTHELP diff --git a/base/shell/explorer/lang/uk-UA.rc b/base/shell/explorer/lang/uk-UA.rc index e341f929b55..790a92c91de 100644 --- a/base/shell/explorer/lang/uk-UA.rc +++ b/base/shell/explorer/lang/uk-UA.rc @@ -75,20 +75,14 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYS CAPTION "Панель задач" FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN - GROUPBOX "Властивості панелі задач", IDC_STATIC, 6, 6, 240, 104 + GROUPBOX "Властивості панелі задач", IDC_STATIC, 6, 6, 240, 120 CONTROL "", IDC_TASKBARPROP_TASKBARBITMAP, "Static", SS_BITMAP | SS_SUNKEN | SS_CENTERIMAGE, 12, 18, 229, 24 AUTOCHECKBOX "&Заборонити панель задач", IDC_TASKBARPROP_LOCK, 13, 45, 200, 10 AUTOCHECKBOX "&Автоматично приховувати панель задач", IDC_TASKBARPROP_HIDE, 13, 58, 200, 10 AUTOCHECKBOX "&Поверх інших вікон", IDC_TASKBARPROP_ONTOP, 13, 71, 200, 10 AUTOCHECKBOX "&Групувати схожі кнопки", IDC_TASKBARPROP_GROUP, 13, 84, 200, 10 AUTOCHECKBOX "Відображати панель &швидкого запуску", IDC_TASKBARPROP_SHOWQL, 13, 97, 200, 10 - GROUPBOX "Область сповіщень", IDC_STATIC, 6, 114, 240, 98 - CONTROL "", IDC_TASKBARPROP_NOTIFICATIONBITMAP, "Static", SS_BITMAP | SS_SUNKEN | SS_CENTERIMAGE, 12, 126, 229, 24 - AUTOCHECKBOX "&Годинник", IDC_TASKBARPROP_CLOCK, 13, 153, 80, 10 - AUTOCHECKBOX "Показувати секунди", IDC_TASKBARPROP_SECONDS, 120, 153, 80, 10, WS_DISABLED - LTEXT "Можна уникнути захаращення області повідомлень, приховуючи значки, які давно не використовувалися.", IDC_STATIC, 13, 169, 223, 16 - AUTOCHECKBOX "&Приховувати невживані значки", IDC_TASKBARPROP_HIDEICONS, 13, 191, 125, 10 - PUSHBUTTON "&Налаштувати...", IDC_TASKBARPROP_ICONCUST, 188, 191, 50, 14 + AUTOCHECKBOX "Use small icons", IDC_TASKBARPROP_SMALLICONS, 13, 110, 200, 10 END IDD_TASKBARPROP_STARTMENU DIALOGEX 0, 0, 252, 218 @@ -105,6 +99,23 @@ BEGIN PUSHBUTTON "Н&алаштувати...", IDC_TASKBARPROP_STARTMENUCLASSICCUST, 192, 172, 53, 14 END +IDD_TASKBARPROP_NOTIFY DIALOGEX 0, 0, 252, 218 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Область сповіщень" +FONT 8, "MS Shell Dlg", 0, 0, 0x1 +BEGIN + CONTROL "", IDC_TASKBARPROP_NOTIFICATIONBITMAP, "Static", SS_BITMAP | SS_SUNKEN | SS_CENTERIMAGE, 12, 6, 229, 24 + GROUPBOX "Icons", IDC_STATIC, 6, 36, 240, 56 + LTEXT "Можна уникнути захаращення області повідомлень, приховуючи значки, які давно не використовувалися.", IDC_STATIC, 13, 48, 223, 16 + AUTOCHECKBOX "&Приховувати невживані значки", IDC_TASKBARPROP_HIDEICONS, 13, 70, 125, 10 + PUSHBUTTON "&Налаштувати...", IDC_TASKBARPROP_ICONCUST, 188, 70, 50, 14 + GROUPBOX "System icons", IDC_STATIC, 6, 99, 240, 56 + LTEXT "Select which system icons to always show.", IDC_STATIC, 13, 113, 223, 8 + AUTOCHECKBOX "&Годинник", IDC_TASKBARPROP_CLOCK, 13, 127, 80, 10 + AUTOCHECKBOX "Показувати секунди", IDC_TASKBARPROP_SECONDS, 120, 127, 80, 10, WS_DISABLED + AUTOCHECKBOX "Desktop", IDC_TASKBARPROP_DESKTOP, 13, 140, 80, 10 +END + IDD_NOTIFICATIONS_CUSTOMIZE DIALOGEX 0, 0, 232, 240 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_DLGFRAME EXSTYLE WS_EX_CONTEXTHELP diff --git a/base/shell/explorer/lang/zh-CN.rc b/base/shell/explorer/lang/zh-CN.rc index e6eeccab616..3408a84d095 100644 --- a/base/shell/explorer/lang/zh-CN.rc +++ b/base/shell/explorer/lang/zh-CN.rc @@ -73,20 +73,14 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYS CAPTION "任务栏" FONT 9, "宋体", 0, 0, 0x1 BEGIN - GROUPBOX "任务栏外观", IDC_STATIC, 6, 6, 240, 104 + GROUPBOX "任务栏外观", IDC_STATIC, 6, 6, 240, 120 CONTROL "", IDC_TASKBARPROP_TASKBARBITMAP, "Static", SS_BITMAP | SS_SUNKEN | SS_CENTERIMAGE, 12, 18, 229, 24 AUTOCHECKBOX "锁定任务栏(&L)", IDC_TASKBARPROP_LOCK, 13, 45, 200, 10 AUTOCHECKBOX "自动隐藏任务栏(&U)", IDC_TASKBARPROP_HIDE, 13, 58, 200, 10 AUTOCHECKBOX "将任务栏保持在其它窗口的前端(&T)", IDC_TASKBARPROP_ONTOP, 13, 71, 200, 10 AUTOCHECKBOX "分组类似任务栏按钮(&G)", IDC_TASKBARPROP_GROUP, 13, 84, 200, 10 AUTOCHECKBOX "显示快速启动(&Q)", IDC_TASKBARPROP_SHOWQL, 13, 97, 200, 10 - GROUPBOX "通知区域", IDC_STATIC, 6, 114, 240, 98 - CONTROL "", IDC_TASKBARPROP_NOTIFICATIONBITMAP, "Static", SS_BITMAP | SS_SUNKEN | SS_CENTERIMAGE, 12, 126, 229, 24 - AUTOCHECKBOX "显示时钟(&K)", IDC_TASKBARPROP_CLOCK, 13, 153, 80, 10 - AUTOCHECKBOX "显示秒", IDC_TASKBARPROP_SECONDS, 120, 153, 80, 10, WS_DISABLED - LTEXT "您可以通过隐藏不常用的图标来保持通知区域的整洁。", IDC_STATIC, 13, 169, 223, 16 - AUTOCHECKBOX "隐藏不活动的图标(&H)", IDC_TASKBARPROP_HIDEICONS, 13, 191, 125, 10 - PUSHBUTTON "自定义(&C)...", IDC_TASKBARPROP_ICONCUST, 188, 191, 50, 14 + AUTOCHECKBOX "Use small icons", IDC_TASKBARPROP_SMALLICONS, 13, 110, 200, 10 END IDD_TASKBARPROP_STARTMENU DIALOGEX 0, 0, 252, 218 @@ -103,6 +97,23 @@ BEGIN PUSHBUTTON "自定义(&C)...", IDC_TASKBARPROP_STARTMENUCLASSICCUST, 192, 172, 53, 14 END +IDD_TASKBARPROP_NOTIFY DIALOGEX 0, 0, 252, 218 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "通知区域" +FONT 9, "宋体", 0, 0, 0x1 +BEGIN + CONTROL "", IDC_TASKBARPROP_NOTIFICATIONBITMAP, "Static", SS_BITMAP | SS_SUNKEN | SS_CENTERIMAGE, 12, 6, 229, 24 + GROUPBOX "Icons", IDC_STATIC, 6, 36, 240, 56 + LTEXT "您可以通过隐藏不常用的图标来保持通知区域的整洁。", IDC_STATIC, 13, 48, 223, 16 + AUTOCHECKBOX "隐藏不活动的图标(&H)", IDC_TASKBARPROP_HIDEICONS, 13, 70, 125, 10 + PUSHBUTTON "自定义(&C)...", IDC_TASKBARPROP_ICONCUST, 188, 70, 50, 14 + GROUPBOX "System icons", IDC_STATIC, 6, 99, 240, 56 + LTEXT "Select which system icons to always show.", IDC_STATIC, 13, 113, 223, 8 + AUTOCHECKBOX "显示时钟(&K)", IDC_TASKBARPROP_CLOCK, 13, 127, 80, 10 + AUTOCHECKBOX "显示秒", IDC_TASKBARPROP_SECONDS, 120, 127, 80, 10, WS_DISABLED + AUTOCHECKBOX "Desktop", IDC_TASKBARPROP_DESKTOP, 13, 140, 80, 10 +END + IDD_NOTIFICATIONS_CUSTOMIZE DIALOGEX 0, 0, 232, 240 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_DLGFRAME EXSTYLE WS_EX_CONTEXTHELP diff --git a/base/shell/explorer/lang/zh-HK.rc b/base/shell/explorer/lang/zh-HK.rc index 03f8db4bb15..36daeb70dc3 100644 --- a/base/shell/explorer/lang/zh-HK.rc +++ b/base/shell/explorer/lang/zh-HK.rc @@ -72,20 +72,14 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYS CAPTION "工作列" FONT 9, "新細明體", 0, 0, 0x1 BEGIN - GROUPBOX "工作列外觀", IDC_STATIC, 6, 6, 240, 104 + GROUPBOX "工作列外觀", IDC_STATIC, 6, 6, 240, 120 CONTROL "", IDC_TASKBARPROP_TASKBARBITMAP, "Static", SS_BITMAP | SS_SUNKEN | SS_CENTERIMAGE, 12, 18, 229, 24 AUTOCHECKBOX "鎖定工作列(&L)", IDC_TASKBARPROP_LOCK, 13, 45, 200, 10 AUTOCHECKBOX "自動隱藏工作列(&U)", IDC_TASKBARPROP_HIDE, 13, 58, 200, 10 AUTOCHECKBOX "使工作列顯示在最上層(&T)", IDC_TASKBARPROP_ONTOP, 13, 71, 200, 10 AUTOCHECKBOX "合併類似的工作列按鈕(&G)", IDC_TASKBARPROP_GROUP, 13, 84, 200, 10 AUTOCHECKBOX "顯示快速啟動(&Q)", IDC_TASKBARPROP_SHOWQL, 13, 97, 200, 10 - GROUPBOX "通知區域", IDC_STATIC, 6, 114, 240, 98 - CONTROL "", IDC_TASKBARPROP_NOTIFICATIONBITMAP, "Static", SS_BITMAP | SS_SUNKEN | SS_CENTERIMAGE, 12, 126, 229, 24 - AUTOCHECKBOX "小時鐘(&K)", IDC_TASKBARPROP_CLOCK, 13, 153, 80, 10 - AUTOCHECKBOX "顯示秒", IDC_TASKBARPROP_SECONDS, 120, 153, 80, 10, WS_DISABLED - LTEXT "您可以隱藏最近未選取過的圖示以保持通知區域整潔。", IDC_STATIC, 13, 169, 223, 16 - AUTOCHECKBOX "隱藏非使用中的圖示(&H)", IDC_TASKBARPROP_HIDEICONS, 13, 191, 125, 10 - PUSHBUTTON "自訂(&C)...", IDC_TASKBARPROP_ICONCUST, 188, 191, 50, 14 + AUTOCHECKBOX "Use small icons", IDC_TASKBARPROP_SMALLICONS, 13, 110, 200, 10 END IDD_TASKBARPROP_STARTMENU DIALOGEX 0, 0, 252, 218 @@ -102,6 +96,23 @@ BEGIN PUSHBUTTON "自訂(&C)...", IDC_TASKBARPROP_STARTMENUCLASSICCUST, 192, 172, 53, 14 END +IDD_TASKBARPROP_NOTIFY DIALOGEX 0, 0, 252, 218 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "通知區域" +FONT 9, "新細明體", 0, 0, 0x1 +BEGIN + CONTROL "", IDC_TASKBARPROP_NOTIFICATIONBITMAP, "Static", SS_BITMAP | SS_SUNKEN | SS_CENTERIMAGE, 12, 6, 229, 24 + GROUPBOX "Icons", IDC_STATIC, 6, 36, 240, 56 + LTEXT "您可以隱藏最近未選取過的圖示以保持通知區域整潔。", IDC_STATIC, 13, 48, 223, 16 + AUTOCHECKBOX "隱藏非使用中的圖示(&H)", IDC_TASKBARPROP_HIDEICONS, 13, 70, 125, 10 + PUSHBUTTON "自訂(&C)...", IDC_TASKBARPROP_ICONCUST, 188, 70, 50, 14 + GROUPBOX "System icons", IDC_STATIC, 6, 99, 240, 56 + LTEXT "Select which system icons to always show.", IDC_STATIC, 13, 113, 223, 8 + AUTOCHECKBOX "小時鐘(&K)", IDC_TASKBARPROP_CLOCK, 13, 127, 80, 10 + AUTOCHECKBOX "顯示秒", IDC_TASKBARPROP_SECONDS, 120, 127, 80, 10, WS_DISABLED + AUTOCHECKBOX "Desktop", IDC_TASKBARPROP_DESKTOP, 13, 140, 80, 10 +END + IDD_NOTIFICATIONS_CUSTOMIZE DIALOGEX 0, 0, 232, 240 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_DLGFRAME EXSTYLE WS_EX_CONTEXTHELP diff --git a/base/shell/explorer/lang/zh-TW.rc b/base/shell/explorer/lang/zh-TW.rc index 741d85f0ce5..e29a34e5e05 100644 --- a/base/shell/explorer/lang/zh-TW.rc +++ b/base/shell/explorer/lang/zh-TW.rc @@ -73,20 +73,14 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYS CAPTION "工作列" FONT 9, "新細明體", 0, 0, 0x1 BEGIN - GROUPBOX "工作列外觀", IDC_STATIC, 6, 6, 240, 104 + GROUPBOX "工作列外觀", IDC_STATIC, 6, 6, 240, 120 CONTROL "", IDC_TASKBARPROP_TASKBARBITMAP, "Static", SS_BITMAP | SS_SUNKEN | SS_CENTERIMAGE, 12, 18, 229, 24 AUTOCHECKBOX "鎖定工作列(&L)", IDC_TASKBARPROP_LOCK, 13, 45, 200, 10 AUTOCHECKBOX "自動隱藏工作列(&U)", IDC_TASKBARPROP_HIDE, 13, 58, 200, 10 AUTOCHECKBOX "使工作列顯示在最上層(&T)", IDC_TASKBARPROP_ONTOP, 13, 71, 200, 10 AUTOCHECKBOX "合併類似的工作列按鈕(&G)", IDC_TASKBARPROP_GROUP, 13, 84, 200, 10 AUTOCHECKBOX "顯示快速啟動(&Q)", IDC_TASKBARPROP_SHOWQL, 13, 97, 200, 10 - GROUPBOX "通知區域", IDC_STATIC, 6, 114, 240, 98 - CONTROL "", IDC_TASKBARPROP_NOTIFICATIONBITMAP, "Static", SS_BITMAP | SS_SUNKEN | SS_CENTERIMAGE, 12, 126, 229, 24 - AUTOCHECKBOX "小時鐘(&K)", IDC_TASKBARPROP_CLOCK, 13, 153, 80, 10 - AUTOCHECKBOX "顯示秒", IDC_TASKBARPROP_SECONDS, 120, 153, 80, 10, WS_DISABLED - LTEXT "您可以隱藏最近沒有選取過的圖示以保持通知區域整潔。", IDC_STATIC, 13, 169, 223, 16 - AUTOCHECKBOX "隱藏非使用中的圖示(&H)", IDC_TASKBARPROP_HIDEICONS, 13, 191, 125, 10 - PUSHBUTTON "自訂(&C)...", IDC_TASKBARPROP_ICONCUST, 188, 191, 50, 14 + AUTOCHECKBOX "Use small icons", IDC_TASKBARPROP_SMALLICONS, 13, 110, 200, 10 END IDD_TASKBARPROP_STARTMENU DIALOGEX 0, 0, 252, 218 @@ -103,6 +97,23 @@ BEGIN PUSHBUTTON "自訂(&C)...", IDC_TASKBARPROP_STARTMENUCLASSICCUST, 192, 172, 53, 14 END +IDD_TASKBARPROP_NOTIFY DIALOGEX 0, 0, 252, 218 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "通知區域" +FONT 9, "新細明體", 0, 0, 0x1 +BEGIN + CONTROL "", IDC_TASKBARPROP_NOTIFICATIONBITMAP, "Static", SS_BITMAP | SS_SUNKEN | SS_CENTERIMAGE, 12, 6, 229, 24 + GROUPBOX "Icons", IDC_STATIC, 6, 36, 240, 56 + LTEXT "您可以隱藏最近沒有選取過的圖示以保持通知區域整潔。", IDC_STATIC, 13, 48, 223, 16 + AUTOCHECKBOX "隱藏非使用中的圖示(&H)", IDC_TASKBARPROP_HIDEICONS, 13, 70, 125, 10 + PUSHBUTTON "自訂(&C)...", IDC_TASKBARPROP_ICONCUST, 188, 70, 50, 14 + GROUPBOX "System icons", IDC_STATIC, 6, 99, 240, 56 + LTEXT "Select which system icons to always show.", IDC_STATIC, 13, 113, 223, 8 + AUTOCHECKBOX "小時鐘(&K)", IDC_TASKBARPROP_CLOCK, 13, 127, 80, 10 + AUTOCHECKBOX "顯示秒", IDC_TASKBARPROP_SECONDS, 120, 127, 80, 10, WS_DISABLED + AUTOCHECKBOX "Desktop", IDC_TASKBARPROP_DESKTOP, 13, 140, 80, 10 +END + IDD_NOTIFICATIONS_CUSTOMIZE DIALOGEX 0, 0, 232, 240 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_DLGFRAME EXSTYLE WS_EX_CONTEXTHELP diff --git a/base/shell/explorer/precomp.h b/base/shell/explorer/precomp.h index a52e3704266..c9693ec04f1 100644 --- a/base/shell/explorer/precomp.h +++ b/base/shell/explorer/precomp.h @@ -212,6 +212,7 @@ struct TaskbarSettings BOOL bHideInactiveIcons; BOOL bSmallIcons; BOOL bCompactTrayIcons; + BOOL bShowDesktopButton; TW_STRUCKRECTS2 sr; BOOL Load(); diff --git a/base/shell/explorer/resource.h b/base/shell/explorer/resource.h index 2ff1e6b4e5f..8ea838f1bdc 100644 --- a/base/shell/explorer/resource.h +++ b/base/shell/explorer/resource.h @@ -87,6 +87,7 @@ #define IDD_CLASSICSTART_CUSTOMIZE 9 #define IDD_FILENAME_WARNING 20 #define IDD_TASKBARPROP_STARTMENU 205 +#define IDD_TASKBARPROP_NOTIFY 206 #define IDD_MODERNSTART_ADVANCED 1036 #define IDD_MODERNSTART_GENERAL 1037 @@ -110,19 +111,15 @@ \*******************************************************************************/ /* Taskbar Page */ -#define IDC_TASKBARPROP_FIRST_CMD 1000 -#define IDC_TASKBARPROP_HIDEICONS 1000 -#define IDC_TASKBARPROP_ICONCUST 1007 -#define IDC_TASKBARPROP_ONTOP 1101 -#define IDC_TASKBARPROP_HIDE 1102 -#define IDC_TASKBARPROP_CLOCK 1103 -#define IDC_TASKBARPROP_GROUP 1104 -#define IDC_TASKBARPROP_LOCK 1105 -#define IDC_TASKBARPROP_SECONDS 1106 -#define IDC_TASKBARPROP_SHOWQL 1107 -#define IDC_TASKBARPROP_LAST_CMD 1107 -#define IDC_TASKBARPROP_TASKBARBITMAP 1111 -#define IDC_TASKBARPROP_NOTIFICATIONBITMAP 1112 +#define IDC_TASKBARPROP_FIRST_CMD 1114 +#define IDC_TASKBARPROP_ONTOP 1114 +#define IDC_TASKBARPROP_HIDE 1115 +#define IDC_TASKBARPROP_GROUP 1116 +#define IDC_TASKBARPROP_LOCK 1117 +#define IDC_TASKBARPROP_SHOWQL 1118 +#define IDC_TASKBARPROP_SMALLICONS 1119 +#define IDC_TASKBARPROP_LAST_CMD 1119 +#define IDC_TASKBARPROP_TASKBARBITMAP 1120 /* Startmenu Page */ #define IDC_TASKBARPROP_STARTMENUCLASSICCUST 1130 @@ -134,6 +131,16 @@ #define IDC_TASKBARPROP_STARTMENU_BITMAP 1134 #define IDC_STARTBTN 1140 +/* Notification Area Page */ +#define IDC_TASKBARPROP_NOTIFY_FIRST_CMD 1000 +#define IDC_TASKBARPROP_HIDEICONS 1000 +#define IDC_TASKBARPROP_ICONCUST 1007 +#define IDC_TASKBARPROP_CLOCK 1103 +#define IDC_TASKBARPROP_SECONDS 1106 +#define IDC_TASKBARPROP_NOTIFICATIONBITMAP 1112 +#define IDC_TASKBARPROP_DESKTOP 1113 +#define IDC_TASKBARPROP_NOTIFY_LAST_CMD 1113 + /* Customize Notifications Dialog */ #define IDC_TASKBARPROP_NOTIREST 1402 #define IDC_NOTIFICATION_LIST 1005 diff --git a/base/shell/explorer/settings.cpp b/base/shell/explorer/settings.cpp index 0f3daeddea6..62ac29b5b2f 100644 --- a/base/shell/explorer/settings.cpp +++ b/base/shell/explorer/settings.cpp @@ -33,6 +33,7 @@ BOOL TaskbarSettings::Save() sr.cbSize = sizeof(sr); SHSetValueW(hkExplorer, L"Advanced", L"TaskbarSmallIcons", REG_DWORD, &bSmallIcons, sizeof(bSmallIcons)); SHSetValueW(hkExplorer, L"Advanced", L"CompactTrayIcons", REG_DWORD, &bCompactTrayIcons, sizeof(bCompactTrayIcons)); + SHSetValueW(hkExplorer, L"Advanced", L"TaskbarSd", REG_DWORD, &bShowDesktopButton, sizeof(bShowDesktopButton)); SHSetValueW(hkExplorer, L"StuckRects2", L"Settings", REG_BINARY, &sr, sizeof(sr)); /* TODO: AutoHide writes something to HKEY_CURRENT_USER\Software\Microsoft\Internet Explorer\Desktop\Components\0 figure out what and why */ @@ -65,6 +66,9 @@ BOOL TaskbarSettings::Load() dwRet = SHGetValueW(hkExplorer, L"Advanced", L"CompactTrayIcons", NULL, &dwValue, &cbSize); bCompactTrayIcons = (dwRet == ERROR_SUCCESS) ? (dwValue != 0) : bSmallIcons; + dwRet = SHGetValueW(hkExplorer, L"Advanced", L"TaskbarSd", NULL, &dwValue, &cbSize); + bShowDesktopButton = (dwRet == ERROR_SUCCESS) ? (dwValue != 0) : TRUE; + cbSize = sizeof(sr); dwRet = SHGetValueW(hkExplorer, L"StuckRects2", L"Settings", NULL, &sr, &cbSize); diff --git a/base/shell/explorer/taskswnd.cpp b/base/shell/explorer/taskswnd.cpp index 588e7d73fd3..dcbc5cb7be5 100644 --- a/base/shell/explorer/taskswnd.cpp +++ b/base/shell/explorer/taskswnd.cpp @@ -1847,13 +1847,25 @@ public: LRESULT OnTaskbarSettingsChanged(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) { + BOOL bSettingsChanged = FALSE; TaskbarSettings* newSettings = (TaskbarSettings*)lParam; + if (newSettings->bGroupButtons != g_TaskbarSettings.bGroupButtons) { + bSettingsChanged = TRUE; g_TaskbarSettings.bGroupButtons = newSettings->bGroupButtons; m_IsGroupingEnabled = g_TaskbarSettings.bGroupButtons; + } + + if (newSettings->bSmallIcons != g_TaskbarSettings.bSmallIcons) + { + bSettingsChanged = TRUE; + g_TaskbarSettings.bSmallIcons = newSettings->bSmallIcons; + } - /* Collapse or expand groups if necessary */ + if (bSettingsChanged) + { + /* Refresh each task item view */ RefreshWindowList(); UpdateButtonsSize(FALSE); } diff --git a/base/shell/explorer/trayprop.cpp b/base/shell/explorer/trayprop.cpp index 52ceb863ced..90e2c85996f 100644 --- a/base/shell/explorer/trayprop.cpp +++ b/base/shell/explorer/trayprop.cpp @@ -48,24 +48,17 @@ class CTaskBarSettingsPage : public CPropertyPageImpl<CTaskBarSettingsPage> { private: HBITMAP m_hbmpTaskbar; - HBITMAP m_hbmpTray; HWND m_hwndTaskbar; - void UpdateDialog() + void _UpdateDialog() { BOOL bLock = IsDlgButtonChecked(IDC_TASKBARPROP_LOCK); BOOL bHide = IsDlgButtonChecked(IDC_TASKBARPROP_HIDE); BOOL bGroup = IsDlgButtonChecked(IDC_TASKBARPROP_GROUP); BOOL bShowQL = IsDlgButtonChecked(IDC_TASKBARPROP_SHOWQL); - BOOL bShowClock = IsDlgButtonChecked(IDC_TASKBARPROP_CLOCK); - BOOL bShowSeconds = IsDlgButtonChecked(IDC_TASKBARPROP_SECONDS); - BOOL bHideInactive = IsDlgButtonChecked(IDC_TASKBARPROP_HIDEICONS); UINT uImageId; - HWND hwndCustomizeNotifyButton = GetDlgItem(IDC_TASKBARPROP_ICONCUST); - HWND hwndSeconds = GetDlgItem(IDC_TASKBARPROP_SECONDS); HWND hwndTaskbarBitmap = GetDlgItem(IDC_TASKBARPROP_TASKBARBITMAP); - HWND hwndTrayBitmap = GetDlgItem(IDC_TASKBARPROP_NOTIFICATIONBITMAP); if (bHide) uImageId = IDB_TASKBARPROP_AUTOHIDE; @@ -85,32 +78,8 @@ private: uImageId = IDB_TASKBARPROP_NOLOCK_NOGROUP_QL; else if (!bLock && bGroup && bShowQL) uImageId = IDB_TASKBARPROP_NOLOCK_GROUP_QL; - else - ASSERT(FALSE); SetBitmap(hwndTaskbarBitmap, &m_hbmpTaskbar, uImageId); - - ::EnableWindow(hwndCustomizeNotifyButton, bHideInactive); - ::EnableWindow(hwndSeconds, bShowClock); - if (!bShowSeconds) - CheckDlgButton(IDC_TASKBARPROP_SECONDS, BST_UNCHECKED); - - if (bHideInactive && bShowClock && bShowSeconds) - uImageId = IDB_SYSTRAYPROP_HIDE_SECONDS; - else if (bHideInactive && bShowClock && !bShowSeconds) - uImageId = IDB_SYSTRAYPROP_HIDE_CLOCK; - else if (bHideInactive && !bShowClock) - uImageId = IDB_SYSTRAYPROP_HIDE_NOCLOCK; - else if (!bHideInactive && bShowClock && bShowSeconds) - uImageId = IDB_SYSTRAYPROP_SHOW_SECONDS; - else if (!bHideInactive && bShowClock && !bShowSeconds) - uImageId = IDB_SYSTRAYPROP_SHOW_CLOCK; - else if (!bHideInactive && !bShowClock) - uImageId = IDB_SYSTRAYPROP_SHOW_NOCLOCK; - else - ASSERT(FALSE); - - SetBitmap(hwndTrayBitmap, &m_hbmpTray, uImageId); } public: @@ -118,14 +87,12 @@ public: BEGIN_MSG_MAP(CTaskBarSettingsPage) MESSAGE_HANDLER(WM_INITDIALOG, OnInitDialog) - COMMAND_ID_HANDLER(IDC_TASKBARPROP_ICONCUST, OnCustomizeTrayIcons) COMMAND_RANGE_HANDLER(IDC_TASKBARPROP_FIRST_CMD, IDC_TASKBARPROP_LAST_CMD, OnCtrlCommand) CHAIN_MSG_MAP(CPropertyPageImpl<CTaskBarSettingsPage>) END_MSG_MAP() CTaskBarSettingsPage(HWND hwnd): m_hbmpTaskbar(NULL), - m_hbmpTray(NULL), m_hwndTaskbar(hwnd) { } @@ -134,8 +101,6 @@ public: { if (m_hbmpTaskbar) DeleteObject(m_hbmpTaskbar); - if (m_hbmpTray) - DeleteObject(m_hbmpTray); } LRESULT OnInitDialog(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandled) @@ -145,40 +110,29 @@ public: CheckDlgButton(IDC_TASKBARPROP_ONTOP, g_TaskbarSettings.sr.AlwaysOnTop ? BST_CHECKED : BST_UNCHECKED); CheckDlgButton(IDC_TASKBARPROP_GROUP, g_TaskbarSettings.bGroupButtons ? BST_CHECKED : BST_UNCHECKED); //CheckDlgButton(IDC_TASKBARPROP_SHOWQL, g_TaskbarSettings.bShowQuickLaunch ? BST_CHECKED : BST_UNCHECKED); - CheckDlgButton(IDC_TASKBARPROP_CLOCK, (!g_TaskbarSettings.sr.HideClock) ? BST_CHECKED : BST_UNCHECKED); - CheckDlgButton(IDC_TASKBARPROP_SECONDS, g_TaskbarSettings.bShowSeconds ? BST_CHECKED : BST_UNCHECKED); - CheckDlgButton(IDC_TASKBARPROP_HIDEICONS, g_TaskbarSettings.bHideInactiveIcons ? BST_CHECKED : BST_UNCHECKED); + CheckDlgButton(IDC_TASKBARPROP_SMALLICONS, g_TaskbarSettings.bSmallIcons ? BST_CHECKED : BST_UNCHECKED); - UpdateDialog(); + _UpdateDialog(); return TRUE; } - LRESULT OnCustomizeTrayIcons(WORD wNotifyCode, WORD wID, HWND hWndCtl, BOOL &bHandled) - { - ShowCustomizeNotifyIcons(hExplorerInstance, m_hWnd); - return 0; - } - LRESULT OnCtrlCommand(WORD wNotifyCode, WORD wID, HWND hWndCtl, BOOL &bHandled) { - UpdateDialog(); + _UpdateDialog(); SetModified(TRUE); return 0; } int OnApply() { - TaskbarSettings newSettings; - memcpy(&newSettings, &g_TaskbarSettings, sizeof(TaskbarSettings)); + TaskbarSettings newSettings = g_TaskbarSettings; newSettings.bLock = IsDlgButtonChecked(IDC_TASKBARPROP_LOCK); newSettings.sr.AutoHide = IsDlgButtonChecked(IDC_TASKBARPROP_HIDE); newSettings.sr.AlwaysOnTop = IsDlgButtonChecked(IDC_TASKBARPROP_ONTOP); newSettings.bGroupButtons = IsDlgButtonChecked(IDC_TASKBARPROP_GROUP); //newSettings.bShowQuickLaunch = IsDlgButtonChecked(IDC_TASKBARPROP_SHOWQL); - newSettings.sr.HideClock = !IsDlgButtonChecked(IDC_TASKBARPROP_CLOCK); - newSettings.bShowSeconds = IsDlgButtonChecked(IDC_TASKBARPROP_SECONDS); - newSettings.bHideInactiveIcons = IsDlgButtonChecked(IDC_TASKBARPROP_HIDEICONS); + newSettings.bSmallIcons = IsDlgButtonChecked(IDC_TASKBARPROP_SMALLICONS); SendMessage(m_hwndTaskbar, TWM_SETTINGSCHANGED, 0, (LPARAM)&newSettings); @@ -191,7 +145,7 @@ class CStartMenuSettingsPage : public CPropertyPageImpl<CStartMenuSettingsPage> private: HBITMAP m_hbmpStartBitmap; - void UpdateDialog() + void _UpdateDialog() { HWND hwndCustomizeClassic = GetDlgItem(IDC_TASKBARPROP_STARTMENUCLASSICCUST); HWND hwndCustomizeModern = GetDlgItem(IDC_TASKBARPROP_STARTMENUCUST); @@ -252,7 +206,7 @@ public: { // fix me: start menu style (classic/modern) should be read somewhere from the registry. CheckDlgButton(IDC_TASKBARPROP_STARTMENUCLASSIC, BST_CHECKED); // HACK: This has to be read from registry!!!!!!! - UpdateDialog(); + _UpdateDialog(); return TRUE; } @@ -270,6 +224,105 @@ public: } }; +class CNotifySettingsPage : public CPropertyPageImpl<CNotifySettingsPage> +{ +private: + HBITMAP m_hbmpTray; + HWND m_hwndTaskbar; + + void _UpdateDialog() + { + BOOL bShowClock = IsDlgButtonChecked(IDC_TASKBARPROP_CLOCK); + BOOL bShowSeconds = IsDlgButtonChecked(IDC_TASKBARPROP_SECONDS); + BOOL bHideInactive = IsDlgButtonChecked(IDC_TASKBARPROP_HIDEICONS); + UINT uImageId; + + HWND hwndCustomizeNotifyButton = GetDlgItem(IDC_TASKBARPROP_ICONCUST); + HWND hwndSeconds = GetDlgItem(IDC_TASKBARPROP_SECONDS); + HWND hwndTrayBitmap = GetDlgItem(IDC_TASKBARPROP_NOTIFICATIONBITMAP); + + ::EnableWindow(hwndCustomizeNotifyButton, bHideInactive); + ::EnableWindow(hwndSeconds, bShowClock); + if (!bShowSeconds) + CheckDlgButton(IDC_TASKBARPROP_SECONDS, BST_UNCHECKED); + + if (bHideInactive && bShowClock && bShowSeconds) + uImageId = IDB_SYSTRAYPROP_HIDE_SECONDS; + else if (bHideInactive && bShowClock && !bShowSeconds) + uImageId = IDB_SYSTRAYPROP_HIDE_CLOCK; + else if (bHideInactive && !bShowClock) + uImageId = IDB_SYSTRAYPROP_HIDE_NOCLOCK; + else if (!bHideInactive && bShowClock && bShowSeconds) + uImageId = IDB_SYSTRAYPROP_SHOW_SECONDS; + else if (!bHideInactive && bShowClock && !bShowSeconds) + uImageId = IDB_SYSTRAYPROP_SHOW_CLOCK; + else if (!bHideInactive && !bShowClock) + uImageId = IDB_SYSTRAYPROP_SHOW_NOCLOCK; + + SetBitmap(hwndTrayBitmap, &m_hbmpTray, uImageId); + } + +public: + enum { IDD = IDD_TASKBARPROP_NOTIFY }; + + BEGIN_MSG_MAP(CNotifySettingsPage) + MESSAGE_HANDLER(WM_INITDIALOG, OnInitDialog) + COMMAND_ID_HANDLER(IDC_TASKBARPROP_ICONCUST, OnCustomizeTrayIcons) + COMMAND_RANGE_HANDLER(IDC_TASKBARPROP_NOTIFY_FIRST_CMD, IDC_TASKBARPROP_NOTIFY_LAST_CMD, OnCtrlCommand) + CHAIN_MSG_MAP(CPropertyPageImpl<CNotifySettingsPage>) + END_MSG_MAP() + + CNotifySettingsPage(HWND hwnd): + m_hbmpTray(NULL), + m_hwndTaskbar(hwnd) + { + } + + ~CNotifySettingsPage() + { + if (m_hbmpTray) + DeleteObject(m_hbmpTray); + } + + LRESULT OnInitDialog(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandled) + { + CheckDlgButton(IDC_TASKBARPROP_CLOCK, (!g_TaskbarSettings.sr.HideClock) ? BST_CHECKED : BST_UNCHECKED); + CheckDlgButton(IDC_TASKBARPROP_SECONDS, g_TaskbarSettings.bShowSeconds ? BST_CHECKED : BST_UNCHECKED); + CheckDlgButton(IDC_TASKBARPROP_HIDEICONS, g_TaskbarSettings.bHideInactiveIcons ? BST_CHECKED : BST_UNCHECKED); + CheckDlgButton(IDC_TASKBARPROP_DESKTOP, g_TaskbarSettings.bShowDesktopButton ? BST_CHECKED : BST_UNCHECKED); + + _UpdateDialog(); + return TRUE; + } + + LRESULT OnCustomizeTrayIcons(WORD wNotifyCode, WORD wID, HWND hWndCtl, BOOL &bHandled) + { + ShowCustomizeNotifyIcons(hExplorerInstance, m_hWnd); + return 0; + } + + LRESULT OnCtrlCommand(WORD wNotifyCode, WORD wID, HWND hWndCtl, BOOL &bHandled) + { + _UpdateDialog(); + SetModified(TRUE); + return 0; + } + + int OnApply() + { + TaskbarSettings newSettings = g_TaskbarSettings; + + newSettings.sr.HideClock = !IsDlgButtonChecked(IDC_TASKBARPROP_CLOCK); + newSettings.bShowSeconds = IsDlgButtonChecked(IDC_TASKBARPROP_SECONDS); + newSettings.bHideInactiveIcons = IsDlgButtonChecked(IDC_TASKBARPROP_HIDEICONS); + newSettings.bShowDesktopButton = IsDlgButtonChecked(IDC_TASKBARPROP_DESKTOP); + + SendMessage(m_hwndTaskbar, TWM_SETTINGSCHANGED, 0, (LPARAM)&newSettings); + + return PSNRET_NOERROR; + } +}; + static int CALLBACK PropSheetProc(HWND hwndDlg, UINT uMsg, LPARAM lParam) { @@ -291,15 +344,17 @@ VOID DisplayTrayProperties(IN HWND hwndOwner, IN HWND hwndTaskbar) { PROPSHEETHEADER psh; - HPROPSHEETPAGE hpsp[2]; + CSimpleArray<HPROPSHEETPAGE> hpsp; CTaskBarSettingsPage tbSettingsPage(hwndTaskbar); CStartMenuSettingsPage smSettingsPage; + CNotifySettingsPage naSettingsPage(hwndTaskbar); CStringW caption; caption.LoadStringW(IDS_TASKBAR_STARTMENU_PROP_CAPTION); - hpsp[0] = tbSettingsPage.Create(); - hpsp[1] = smSettingsPage.Create(); + hpsp.Add(tbSettingsPage.Create()); + hpsp.Add(smSettingsPage.Create()); + hpsp.Add(naSettingsPage.Create()); ZeroMemory(&psh, sizeof(psh)); psh.dwSize = sizeof(psh); @@ -308,9 +363,9 @@ DisplayTrayProperties(IN HWND hwndOwner, IN HWND hwndTaskbar) psh.hInstance = hExplorerInstance; psh.pszIcon = MAKEINTRESOURCEW(IDI_STARTMENU); psh.pszCaption = caption.GetString(); - psh.nPages = _countof(hpsp); + psh.nPages = hpsp.GetSize(); psh.nStartPage = 0; - psh.phpage = hpsp; + psh.phpage = hpsp.GetData(); psh.pfnCallback = PropSheetProc; PropertySheet(&psh); diff --git a/base/shell/explorer/traywnd.cpp b/base/shell/explorer/traywnd.cpp index 2fbcea85299..5aacfa43c0c 100644 --- a/base/shell/explorer/traywnd.cpp +++ b/base/shell/explorer/traywnd.cpp @@ -2531,15 +2531,6 @@ ChangePos: return m_ContextMenu->GetCommandString(idCmd, uType, pwReserved, pszName, cchMax); } - BOOL IsShowDesktopButtonNeeded() // Read the registry value - { - return SHRegGetBoolUSValueW( - L"SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Explorer\\Advanced", - L"TaskbarSd", - FALSE, - TRUE); - } - /********************************************************** * ##### message handling ##### */ @@ -2556,7 +2547,7 @@ ChangePos: m_StartButton.Create(m_hWnd); /* Create the 'Show Desktop' button if necessary */ - if (IsShowDesktopButtonNeeded()) + if (g_TaskbarSettings.bShowDesktopButton) m_ShowDesktopButton.DoCreate(m_hWnd); /* Load the saved tray window settings */ @@ -3525,6 +3516,20 @@ HandleTrayContextMenu: SetWindowPos(hWndInsertAfter, 0, 0, 0, 0, SWP_NOACTIVATE | SWP_NOMOVE | SWP_NOSIZE | SWP_SHOWWINDOW); } + /* Toggle show desktop button */ + if (newSettings->bShowDesktopButton != g_TaskbarSettings.bShowDesktopButton) + { + g_TaskbarSettings.bShowDesktopButton = newSettings->bShowDesktopButton; + if (!g_TaskbarSettings.bShowDesktopButton) + ::DestroyWindow(m_ShowDesktopButton.m_hWnd); + else if (!m_ShowDesktopButton.IsWindow()) + m_ShowDesktopButton.DoCreate(m_hWnd); + AlignControls(NULL); + } + + /* Adjust taskbar size */ + CheckTrayWndPosition(); + g_TaskbarSettings.Save(); return 0; }

1 year, 5 months

[reactos] 01/01: [DDK] Fix wsk.h header (#5544)

by Johannes Thoma

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=984284c436d507dd1c3e0… commit 984284c436d507dd1c3e0734ca2f5c64a35d59d9 Author: Johannes Thoma <johannes(a)johannesthoma.com> AuthorDate: Thu Aug 10 15:51:13 2023 +0200 Commit: GitHub <noreply(a)github.com> CommitDate: Thu Aug 10 15:51:13 2023 +0200 [DDK] Fix wsk.h header (#5544) Some datagram related dispatcher function types (like PFN_WSK_SEND_TO) were used before they were declared. This patch moves the use after the definition. --- sdk/include/ddk/wsk.h | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/sdk/include/ddk/wsk.h b/sdk/include/ddk/wsk.h index 94d3c1b482f..e9458e8d882 100644 --- a/sdk/include/ddk/wsk.h +++ b/sdk/include/ddk/wsk.h @@ -284,23 +284,6 @@ NTSTATUS _Inout_ PIRP Irp); #endif /* (NTDDI_VERSION >= NTDDI_WIN8) */ -typedef struct _WSK_PROVIDER_DATAGRAM_DISPATCH -{ -#ifdef __cplusplus - WSK_PROVIDER_BASIC_DISPATCH Basic; -#else - WSK_PROVIDER_BASIC_DISPATCH; -#endif - PFN_WSK_BIND WskBind; - PFN_WSK_SEND_TO WskSendTo; - PFN_WSK_RECEIVE_FROM WskReceiveFrom; - PFN_WSK_RELEASE_DATAGRAM_INDICATION_LIST WskRelease; - PFN_WSK_GET_LOCAL_ADDRESS WskGetLocalAddress; -#if (NTDDI_VERSION >= NTDDI_WIN8) - PFN_WSK_SEND_MESSAGES WskSendMessages; -#endif -} WSK_PROVIDER_DATAGRAM_DISPATCH, *PWSK_PROVIDER_DATAGRAM_DISPATCH; - typedef NTSTATUS (WSKAPI * PFN_WSK_CONNECT) ( @@ -507,6 +490,23 @@ NTSTATUS _In_ PWSK_SOCKET Socket, _In_ PWSK_DATAGRAM_INDICATION DatagramIndication); +typedef struct _WSK_PROVIDER_DATAGRAM_DISPATCH +{ +#ifdef __cplusplus + WSK_PROVIDER_BASIC_DISPATCH Basic; +#else + WSK_PROVIDER_BASIC_DISPATCH; +#endif + PFN_WSK_BIND WskBind; + PFN_WSK_SEND_TO WskSendTo; + PFN_WSK_RECEIVE_FROM WskReceiveFrom; + PFN_WSK_RELEASE_DATAGRAM_INDICATION_LIST WskRelease; + PFN_WSK_GET_LOCAL_ADDRESS WskGetLocalAddress; +#if (NTDDI_VERSION >= NTDDI_WIN8) + PFN_WSK_SEND_MESSAGES WskSendMessages; +#endif +} WSK_PROVIDER_DATAGRAM_DISPATCH, *PWSK_PROVIDER_DATAGRAM_DISPATCH; + typedef NTSTATUS (WSKAPI * PFN_WSK_CLIENT_EVENT)(

1 year, 5 months

[reactos] 01/01: [BROWSEUI] Don't forget to CoInitializeEx on COM thread (#5552)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=0aa2e82c06656aa59f04f… commit 0aa2e82c06656aa59f04f0f96c4298bd26d5ad64 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Thu Aug 10 22:16:30 2023 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Thu Aug 10 22:16:30 2023 +0900 [BROWSEUI] Don't forget to CoInitializeEx on COM thread (#5552) Use CoInitializeEx and CoUninitialize in CFindFolder::SearchThreadProc. CORE-19110 --- dll/win32/browseui/shellfind/CFindFolder.cpp | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dll/win32/browseui/shellfind/CFindFolder.cpp b/dll/win32/browseui/shellfind/CFindFolder.cpp index faa71f4c528..6108970fb55 100644 --- a/dll/win32/browseui/shellfind/CFindFolder.cpp +++ b/dll/win32/browseui/shellfind/CFindFolder.cpp @@ -455,6 +455,8 @@ DWORD WINAPI CFindFolder::SearchThreadProc(LPVOID lpParameter) { _SearchData *data = static_cast<_SearchData*>(lpParameter); + HRESULT hrCoInit = CoInitializeEx(NULL, COINIT_MULTITHREADED); + data->pFindFolder->NotifyConnections(DISPID_SEARCHSTART); UINT uTotalFound = RecursiveFind(data->szPath, data); @@ -469,6 +471,9 @@ DWORD WINAPI CFindFolder::SearchThreadProc(LPVOID lpParameter) CloseHandle(data->hStopEvent); delete data; + if (SUCCEEDED(hrCoInit)) + CoUninitialize(); + return 0; }

1 year, 5 months

[reactos] 01/01: [XDK] Fix definition of KeRaiseIrqlToSynchLevel for x64 UP

by Timo Kreuzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=b9958c7be7e5df9a602fb… commit b9958c7be7e5df9a602fb9cbcd0338cf30c15012 Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Thu Aug 10 14:46:29 2023 +0300 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Thu Aug 10 14:46:29 2023 +0300 [XDK] Fix definition of KeRaiseIrqlToSynchLevel for x64 UP --- sdk/include/xdk/amd64/ke.h | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/sdk/include/xdk/amd64/ke.h b/sdk/include/xdk/amd64/ke.h index b9238ccfd17..87d46752af8 100644 --- a/sdk/include/xdk/amd64/ke.h +++ b/sdk/include/xdk/amd64/ke.h @@ -116,7 +116,11 @@ FORCEINLINE KIRQL KeRaiseIrqlToSynchLevel(VOID) { +#ifdef CONFIG_SMP return KfRaiseIrql(12); // SYNCH_LEVEL = IPI_LEVEL - 2 +#else + return KfRaiseIrql(2); // SYNCH_LEVEL = DISPATCH_LEVEL +#endif } FORCEINLINE

1 year, 5 months

[reactos] 01/01: [MSPAINT] Fix focus and radiobuttons of some dialogs (#5537)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=893715b72267723cb2a40… commit 893715b72267723cb2a40052f4cea8453e2d1eb0 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Thu Aug 10 08:20:55 2023 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Thu Aug 10 08:20:55 2023 +0900 [MSPAINT] Fix focus and radiobuttons of some dialogs (#5537) - Return TRUE on WM_INITDIALOG handling to set focus. - Check if the radiobutton is checked on the radiobutton action (considering BN_SETFOCUS etc.). CORE-18011 --- base/applications/mspaint/dialogs.cpp | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/base/applications/mspaint/dialogs.cpp b/base/applications/mspaint/dialogs.cpp index 9c9fad3e567..7ec302dfe7f 100644 --- a/base/applications/mspaint/dialogs.cpp +++ b/base/applications/mspaint/dialogs.cpp @@ -42,7 +42,7 @@ LRESULT CMirrorRotateDialog::OnInitDialog(UINT nMsg, WPARAM wParam, LPARAM lPara { CheckDlgButton(IDD_MIRRORROTATERB1, BST_CHECKED); CheckDlgButton(IDD_MIRRORROTATERB4, BST_CHECKED); - return 0; + return TRUE; } LRESULT CMirrorRotateDialog::OnClose(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) @@ -74,6 +74,9 @@ LRESULT CMirrorRotateDialog::OnCancel(WORD wNotifyCode, WORD wID, HWND hWndCtl, LRESULT CMirrorRotateDialog::OnRadioButton3(WORD wNotifyCode, WORD wID, HWND hWndCtl, BOOL& bHandled) { + if (IsDlgButtonChecked(IDD_MIRRORROTATERB3) != BST_CHECKED) + return 0; + ::EnableWindow(GetDlgItem(IDD_MIRRORROTATERB4), TRUE); ::EnableWindow(GetDlgItem(IDD_MIRRORROTATERB5), TRUE); ::EnableWindow(GetDlgItem(IDD_MIRRORROTATERB6), TRUE); @@ -82,6 +85,12 @@ LRESULT CMirrorRotateDialog::OnRadioButton3(WORD wNotifyCode, WORD wID, HWND hWn LRESULT CMirrorRotateDialog::OnRadioButton12(WORD wNotifyCode, WORD wID, HWND hWndCtl, BOOL& bHandled) { + if (IsDlgButtonChecked(IDD_MIRRORROTATERB1) != BST_CHECKED && + IsDlgButtonChecked(IDD_MIRRORROTATERB2) != BST_CHECKED) + { + return 0; + } + ::EnableWindow(GetDlgItem(IDD_MIRRORROTATERB4), FALSE); ::EnableWindow(GetDlgItem(IDD_MIRRORROTATERB5), FALSE); ::EnableWindow(GetDlgItem(IDD_MIRRORROTATERB6), FALSE); @@ -122,7 +131,7 @@ LRESULT CAttributesDialog::OnInitDialog(UINT nMsg, WPARAM wParam, LPARAM lParam, strRes.Format(IDS_PRINTRES, ROUND(PpcmFromDpi(g_xDpi)), ROUND(PpcmFromDpi(g_yDpi))); SetDlgItemText(IDD_ATTRIBUTESTEXT8, strRes); - return 0; + return TRUE; } LRESULT CAttributesDialog::OnClose(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) @@ -156,6 +165,9 @@ LRESULT CAttributesDialog::OnDefault(WORD wNotifyCode, WORD wID, HWND hWndCtl, B LRESULT CAttributesDialog::OnRadioButton1(WORD wNotifyCode, WORD wID, HWND hWndCtl, BOOL& bHandled) { + if (IsDlgButtonChecked(IDD_ATTRIBUTESRB1) != BST_CHECKED) + return 0; + CString strNum; strNum.Format(_T("%.3lf"), newWidth / g_xDpi); SetDlgItemText(IDD_ATTRIBUTESEDIT1, strNum); @@ -166,6 +178,9 @@ LRESULT CAttributesDialog::OnRadioButton1(WORD wNotifyCode, WORD wID, HWND hWndC LRESULT CAttributesDialog::OnRadioButton2(WORD wNotifyCode, WORD wID, HWND hWndCtl, BOOL& bHandled) { + if (IsDlgButtonChecked(IDD_ATTRIBUTESRB2) != BST_CHECKED) + return 0; + CString strNum; strNum.Format(_T("%.3lf"), newWidth / PpcmFromDpi(g_xDpi)); SetDlgItemText(IDD_ATTRIBUTESEDIT1, strNum); @@ -176,6 +191,9 @@ LRESULT CAttributesDialog::OnRadioButton2(WORD wNotifyCode, WORD wID, HWND hWndC LRESULT CAttributesDialog::OnRadioButton3(WORD wNotifyCode, WORD wID, HWND hWndCtl, BOOL& bHandled) { + if (IsDlgButtonChecked(IDD_ATTRIBUTESRB3) != BST_CHECKED) + return 0; + SetDlgItemInt(IDD_ATTRIBUTESEDIT1, newWidth, FALSE); SetDlgItemInt(IDD_ATTRIBUTESEDIT2, newHeight, FALSE); return 0; @@ -239,7 +257,7 @@ LRESULT CStretchSkewDialog::OnInitDialog(UINT nMsg, WPARAM wParam, LPARAM lParam SetDlgItemInt(IDD_STRETCHSKEWEDITVSTRETCH, 100, FALSE); SetDlgItemInt(IDD_STRETCHSKEWEDITHSKEW, 0, FALSE); SetDlgItemInt(IDD_STRETCHSKEWEDITVSKEW, 0, FALSE); - return 0; + return TRUE; } LRESULT CStretchSkewDialog::OnClose(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled)

1 year, 5 months

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs