Ros-diffs December 2021

ros-diffs@reactos.org

33 participants
155 discussions

[reactos] 01/01: [I8042PRT] Add Latitude D820 to the hack list (#4185)

by Scott Maday

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=99a6d037864b4c8631e01… commit 99a6d037864b4c8631e014e2cf4b3a2d5d91894c Author: Scott Maday <coldasdryice1(a)gmail.com> AuthorDate: Fri Dec 24 20:07:33 2021 -0600 Commit: GitHub <noreply(a)github.com> CommitDate: Sat Dec 25 03:07:33 2021 +0100 [I8042PRT] Add Latitude D820 to the hack list (#4185) Fixes the Dell Latitude D820 TouchPad not working. --- drivers/input/i8042prt/hwhacks.c | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/input/i8042prt/hwhacks.c b/drivers/input/i8042prt/hwhacks.c index ddb8a6fbaaf..4478c78cb19 100644 --- a/drivers/input/i8042prt/hwhacks.c +++ b/drivers/input/i8042prt/hwhacks.c @@ -49,6 +49,7 @@ const HARDWARE_TABLE i8042HardwareTable[] = { {{SYS_VENDOR, "Dell Inc."}, {SYS_PRODUCT, "Latitude D620 "}}, FL_INITHACK }, { {{SYS_VENDOR, "Dell Inc."}, {SYS_PRODUCT, "Latitude D630 "}}, FL_INITHACK }, { {{SYS_VENDOR, "Dell Inc."}, {SYS_PRODUCT, "Latitude D810 "}}, FL_INITHACK }, + { {{SYS_VENDOR, "Dell Inc."}, {SYS_PRODUCT, "Latitude D820 "}}, FL_INITHACK }, { {{SYS_VENDOR, "Dell Inc."}, {SYS_PRODUCT, "Latitude E4300 "}}, FL_INITHACK }, { {{SYS_VENDOR, "Dell Inc."}, {SYS_PRODUCT, "Latitude E4310 "}}, FL_INITHACK }, { {{SYS_VENDOR, "Dell Inc."}, {SYS_PRODUCT, "Latitude E6400 "}}, FL_INITHACK },

3 years

[reactos] 01/01: [MSV1_0] Create stubs for SECPKG_USER_FUNCTION_TABLE

by Andreas Maier

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=0901077f8c29feaec9990… commit 0901077f8c29feaec9990e1501ca481b67f13cad Author: Andreas Maier <staubim(a)quantentunnel.de> AuthorDate: Sat Dec 25 00:10:33 2021 +0100 Commit: GitHub <noreply(a)github.com> CommitDate: Sat Dec 25 02:10:33 2021 +0300 [MSV1_0] Create stubs for SECPKG_USER_FUNCTION_TABLE This commit fixes a bug as well: old code of SpUserModeInitialze returns a pointer to a local variable (SECPKG_USER_FUNCTION_TABLE). --- dll/win32/msv1_0/CMakeLists.txt | 4 +- dll/win32/msv1_0/lsa.c | 6 +- dll/win32/msv1_0/lsa.h | 10 +-- dll/win32/msv1_0/msv1_0.c | 22 +---- dll/win32/msv1_0/msv1_0.spec | 2 +- dll/win32/msv1_0/ntlm/global.c | 34 ++++++++ dll/win32/msv1_0/ntlm/global.h | 17 ++++ dll/win32/msv1_0/precomp.h | 4 + dll/win32/msv1_0/user.c | 176 ++++++++++++++++++++++++++++++++++++++++ dll/win32/msv1_0/user.h | 100 +++++++++++++++++++++++ dll/win32/msv1_0/usercontext.c | 22 +++++ dll/win32/msv1_0/usercontext.h | 14 ++++ 12 files changed, 377 insertions(+), 34 deletions(-) diff --git a/dll/win32/msv1_0/CMakeLists.txt b/dll/win32/msv1_0/CMakeLists.txt index 380fc5d16dd..3b2b5e7fd65 100644 --- a/dll/win32/msv1_0/CMakeLists.txt +++ b/dll/win32/msv1_0/CMakeLists.txt @@ -4,7 +4,9 @@ spec2def(msv1_0.dll msv1_0.spec) list(APPEND SOURCE lsa.c msv1_0.c - precomp.h + ntlm/global.c + user.c + usercontext.c ${CMAKE_CURRENT_BINARY_DIR}/msv1_0_stubs.c ${CMAKE_CURRENT_BINARY_DIR}/msv1_0.def) diff --git a/dll/win32/msv1_0/lsa.c b/dll/win32/msv1_0/lsa.c index 63a4bb1f0a7..0bbf4699c66 100644 --- a/dll/win32/msv1_0/lsa.c +++ b/dll/win32/msv1_0/lsa.c @@ -1,9 +1,7 @@ /* * PROJECT: Authentication Package DLL - * LICENSE: GPL - See COPYING in the top level directory - * FILE: dll/win32/msv1_0/lsa.c - * PURPOSE: NTLM-functions returned from SpLsaModeInitialize - (PSECPKG_FUNCTION_TABLE) + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: NTLM functions returned from SpLsaModeInitialize (PSECPKG_FUNCTION_TABLE) * COPYRIGHT: Copyright 2019-2020 Andreas Maier <staubim(a)quantentunnel.de> */ diff --git a/dll/win32/msv1_0/lsa.h b/dll/win32/msv1_0/lsa.h index e5fe1a934d1..2df98a710c6 100644 --- a/dll/win32/msv1_0/lsa.h +++ b/dll/win32/msv1_0/lsa.h @@ -1,13 +1,11 @@ /* * PROJECT: Authentication Package DLL - * LICENSE: GPL - See COPYING in the top level directory - * FILE: dll/win32/msv1_0/lsa.h - * PURPOSE: header for lsa.c + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: Header for lsa.c * COPYRIGHT: Copyright 2019-2020 Andreas Maier <staubim(a)quantentunnel.de> */ -#ifndef _MSV1_0_LSA_H_ -#define _MSV1_0_LSA_H_ +#pragma once // functions we provide to LSA in SpLsaModeInitialize extern SECPKG_FUNCTION_TABLE NtlmLsaFn[1]; @@ -138,5 +136,3 @@ NTAPI LsaSpSetExtendedInformation( _In_ SECPKG_EXTENDED_INFORMATION_CLASS Class, _In_ PSECPKG_EXTENDED_INFORMATION Info); - -#endif /* _MSV1_0_LSA_H_ */ diff --git a/dll/win32/msv1_0/msv1_0.c b/dll/win32/msv1_0/msv1_0.c index 2ab923213a3..c5d87f88c2d 100644 --- a/dll/win32/msv1_0/msv1_0.c +++ b/dll/win32/msv1_0/msv1_0.c @@ -1769,7 +1769,6 @@ SpLsaModeInitialize( return STATUS_SUCCESS; } - /* * @unimplemented */ @@ -1781,8 +1780,6 @@ SpUserModeInitialize( _Out_ PSECPKG_USER_FUNCTION_TABLE *ppTables, _Out_ PULONG pcTables) { - SECPKG_USER_FUNCTION_TABLE Tables[1]; - TRACE("SpUserModeInitialize(0x%lx %p %p %p)\n", LsaVersion, PackageVersion, ppTables, pcTables); @@ -1791,24 +1788,7 @@ SpUserModeInitialize( *PackageVersion = SECPKG_INTERFACE_VERSION; - RtlZeroMemory(&Tables, sizeof(Tables)); - -// Tables[0].InstanceInit = SpInstanceInit; -// Tables[0].InitUserModeContext = NULL; -// Tables[0].MakeSignature = NULL; -// Tables[0].VerifySignature = NULL; -// Tables[0].SealMessage = NULL; -// Tables[0].UnsealMessage = NULL; -// Tables[0].GetContextToken = NULL; -// Tables[0].SpQueryContextAttributes = NULL; -// Tables[0].CompleteAuthToken = NULL; -// Tables[0].DeleteUserModeContext = NULL; -// Tables[0].FormatCredentials = NULL; -// Tables[0].MarshallSupplementalCreds = NULL; -// Tables[0].ExportContext = NULL; -// Tables[0].ImportContext = NULL; - - *ppTables = Tables; + *ppTables = NtlmUsrFn; *pcTables = 1; return STATUS_SUCCESS; diff --git a/dll/win32/msv1_0/msv1_0.spec b/dll/win32/msv1_0/msv1_0.spec index 36d62cf1223..ab746f861ac 100644 --- a/dll/win32/msv1_0/msv1_0.spec +++ b/dll/win32/msv1_0/msv1_0.spec @@ -11,6 +11,6 @@ @ stub MsvSamValidate @ stub MsvValidateTarget @ stdcall SpInitialize(long ptr ptr) -@ stub SpInstanceInit +@ stdcall SpInstanceInit(long ptr ptr) @ stdcall SpLsaModeInitialize(long ptr ptr ptr) @ stdcall SpUserModeInitialize(long ptr ptr ptr) diff --git a/dll/win32/msv1_0/ntlm/global.c b/dll/win32/msv1_0/ntlm/global.c new file mode 100644 index 00000000000..ba1082f9ff9 --- /dev/null +++ b/dll/win32/msv1_0/ntlm/global.c @@ -0,0 +1,34 @@ +/* + * PROJECT: Authentication Package DLL + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: NTLM globals definitions (header) + * COPYRIGHT: Copyright 2011 Samuel Serapión + * Copyright 2020 Andreas Maier <staubim(a)quantentunnel.de> + */ + +#include "../precomp.h" + +#include "wine/debug.h" +WINE_DEFAULT_DEBUG_CHANNEL(ntlm); + +/* globals */ +PSECPKG_DLL_FUNCTIONS UsrFunctions = NULL; +SECPKG_USER_FUNCTION_TABLE NtlmUsrFn[1] = +{ + { + .InstanceInit = SpInstanceInit, + .InitUserModeContext = UsrSpInitUserModeContext, + .MakeSignature = UsrSpMakeSignature, + .VerifySignature = UsrSpVerifySignature, + .SealMessage = UsrSpSealMessage, + .UnsealMessage = UsrSpUnsealMessage, + .GetContextToken = UsrSpGetContextToken, + .SpQueryContextAttributes = UsrSpQueryContextAttributes, + .CompleteAuthToken = UsrSpCompleteAuthToken, + .DeleteUserModeContext = UsrSpDeleteUserModeContext, + .FormatCredentials = UsrSpFormatCredentials, + .MarshallSupplementalCreds = UsrSpMarshallSupplementalCreds, + .ExportContext = UsrSpExportSecurityContext, + .ImportContext = UsrSpImportSecurityContext + } +}; diff --git a/dll/win32/msv1_0/ntlm/global.h b/dll/win32/msv1_0/ntlm/global.h new file mode 100644 index 00000000000..2ee2f1092dd --- /dev/null +++ b/dll/win32/msv1_0/ntlm/global.h @@ -0,0 +1,17 @@ +/* + * PROJECT: Authentication Package DLL + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: ntlm globals definitions (header) + * COPYRIGHT: Copyright 2011 Samuel Serapión + * Copyright 2020 Andreas Maier (staubim(a)quantentunnel.de) + */ + +#ifndef _MSV1_0_NTLM_GLOBALS_H_ +#define _MSV1_0_NTLM_GLOBALS_H_ + +/* functions provided by LSA in SpInstanceInit */ +extern PSECPKG_DLL_FUNCTIONS UsrFunctions; +/* functions we provide to LSA in SpUserModeInitialize */ +extern SECPKG_USER_FUNCTION_TABLE NtlmUsrFn[1]; + +#endif diff --git a/dll/win32/msv1_0/precomp.h b/dll/win32/msv1_0/precomp.h index 462fb56a401..094db60e990 100644 --- a/dll/win32/msv1_0/precomp.h +++ b/dll/win32/msv1_0/precomp.h @@ -30,8 +30,12 @@ #include <samsrv/samsrv.h> //#include <lsass/lsasrv.h> +#include "ntlm/global.h" #include "lsa.h" #include "msv1_0.h" +#include "user.h" +#include "usercontext.h" + #include <wine/debug.h> diff --git a/dll/win32/msv1_0/user.c b/dll/win32/msv1_0/user.c new file mode 100644 index 00000000000..97f41b350a5 --- /dev/null +++ b/dll/win32/msv1_0/user.c @@ -0,0 +1,176 @@ +/* + * PROJECT: Authentication Package DLL + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: NTLM Functions returned from SpUserModeInitialize (PSECPKG_USER_FUNCTION_TABLE) + * COPYRIGHT: Copyright 2019-2020 Andreas Maier <staubim(a)quantentunnel.de> + */ + +#include "precomp.h" + +#include "wine/debug.h" +WINE_DEFAULT_DEBUG_CHANNEL(msv1_0); + +NTSTATUS +NTAPI +SpInstanceInit( + _In_ ULONG Version, + _In_ PSECPKG_DLL_FUNCTIONS FunctionTable, + _Inout_ PVOID *UserFunctions) +{ + TRACE("SpInstanceInit(Version 0x%lx, 0x%p, 0x%p)\n", + Version, FunctionTable, UserFunctions); + return STATUS_NOT_IMPLEMENTED; +} + +NTSTATUS +NTAPI +UsrSpMakeSignature( + _In_ LSA_SEC_HANDLE ContextHandle, + _In_ ULONG QualityOfProtection, + _Inout_ PSecBufferDesc MessageBuffers, + _In_ ULONG MessageSequenceNumber) +{ + TRACE("UsrSpMakeSignature(0x%p 0x%x 0x%p 0x%x)\n", + ContextHandle, QualityOfProtection, + MessageBuffers, MessageSequenceNumber); + return STATUS_NOT_IMPLEMENTED; +} + +NTSTATUS +NTAPI +UsrSpVerifySignature( + _In_ LSA_SEC_HANDLE phContext, + _In_ PSecBufferDesc pMessage, + _In_ ULONG MessageSeqNo, + _In_ PULONG pfQOP) +{ + TRACE("UsrSpVerifySignature(0x%p 0x%x 0x%x 0x%p)\n", + phContext, pMessage, MessageSeqNo, pfQOP); + + return ERROR_NOT_SUPPORTED; +} + +NTSTATUS +NTAPI +UsrSpSealMessage( + _In_ LSA_SEC_HANDLE ContextHandle, + _In_ ULONG QualityOfProtection, + _Inout_ PSecBufferDesc MessageBuffers, + _In_ ULONG MessageSequenceNumber) +{ + TRACE("UsrSpSealMessage(0x%p 0x%x 0x%p 0x%x)\n", + ContextHandle, QualityOfProtection, + MessageBuffers, MessageSequenceNumber); + return STATUS_NOT_IMPLEMENTED; +} + +NTSTATUS +NTAPI +UsrSpUnsealMessage( + _In_ LSA_SEC_HANDLE ContextHandle, + _Inout_ PSecBufferDesc MessageBuffers, + _In_ ULONG MessageSequenceNumber, + _In_ PULONG QualityOfProtection) +{ + TRACE("UsrSpUnsealMessage(0x%p 0x%x 0x%p 0x%x)\n", + ContextHandle, MessageBuffers, + MessageSequenceNumber, QualityOfProtection); + return STATUS_NOT_IMPLEMENTED; +} + +NTSTATUS +NTAPI +UsrSpGetContextToken( + _In_ LSA_SEC_HANDLE ContextHandle, + _Inout_ PHANDLE ImpersonationToken) +{ + TRACE("UsrSpGetContextToken(0x%p 0x%p)\n", + ContextHandle, ImpersonationToken); + return STATUS_NOT_IMPLEMENTED; +} + +NTSTATUS +NTAPI +UsrSpQueryContextAttributes( + _In_ LSA_SEC_HANDLE ContextHandle, + _In_ ULONG ContextAttribute, + _Inout_ PVOID Buffer) +{ + TRACE("UsrSpQueryContextAttributes(0x%p 0x%x 0x%p)\n", + ContextHandle, ContextAttribute, Buffer); + return STATUS_NOT_IMPLEMENTED; +} + +NTSTATUS +NTAPI +UsrSpCompleteAuthToken( + _In_ LSA_SEC_HANDLE ContextHandle, + _In_ PSecBufferDesc InputBuffer) +{ + TRACE("UsrSpCompleteAuthToken(0x%p 0x%p)\n", + ContextHandle, InputBuffer); + return STATUS_NOT_IMPLEMENTED; +} + +NTSTATUS +NTAPI +UsrSpDeleteUserModeContext( + _In_ LSA_SEC_HANDLE ContextHandle) +{ + TRACE("UsrSpDeleteUserModeContext(0x%p)\n", + ContextHandle); + return STATUS_NOT_IMPLEMENTED; +} + +NTSTATUS +NTAPI +UsrSpFormatCredentials( + _In_ PSecBuffer Credentials, + _Inout_ PSecBuffer FormattedCredentials) +{ + TRACE("UsrSpFormatCredentials(0x%p 0x%p)\n", + Credentials, FormattedCredentials); + + return ERROR_NOT_SUPPORTED; +} + +NTSTATUS +NTAPI +UsrSpMarshallSupplementalCreds( + _In_ ULONG CredentialSize, + _In_ PUCHAR Credentials, + _Inout_ PULONG MarshalledCredSize, + _Inout_ PVOID *MarshalledCreds) +{ + TRACE("UsrSpMarshallSupplementalCreds(0x%x 0x%p 0x%p 0x%p)\n", + CredentialSize, Credentials, MarshalledCredSize, MarshalledCreds); + + return ERROR_NOT_SUPPORTED; +} + +NTSTATUS +NTAPI +UsrSpExportSecurityContext( + _In_ LSA_SEC_HANDLE phContext, + _In_ ULONG fFlags, + _Inout_ PSecBuffer pPackedContext, + _Inout_ PHANDLE pToken) +{ + TRACE("UsrSpExportSecurityContext(0x%p 0x%x 0x%p 0x%p)\n", + phContext, fFlags, pPackedContext, pToken); + + return ERROR_NOT_SUPPORTED; +} + +NTSTATUS +NTAPI +UsrSpImportSecurityContext( + _In_ PSecBuffer pPackedContext, + _In_ HANDLE Token, + _Inout_ PLSA_SEC_HANDLE phContext) +{ + TRACE("UsrSpImportSecurityContext(0x%p 0x%x 0x%p)\n", + pPackedContext, Token, phContext); + + return ERROR_NOT_SUPPORTED; +} diff --git a/dll/win32/msv1_0/user.h b/dll/win32/msv1_0/user.h new file mode 100644 index 00000000000..9388e5fdec1 --- /dev/null +++ b/dll/win32/msv1_0/user.h @@ -0,0 +1,100 @@ +/* + * PROJECT: Authentication Package DLL + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: Header for user.c + * COPYRIGHT: Copyright 2019-2020 Andreas Maier <staubim(a)quantentunnel.de> + */ + +#pragma once + +NTSTATUS +NTAPI +SpInstanceInit( + _In_ ULONG Version, + _In_ PSECPKG_DLL_FUNCTIONS FunctionTable, + _Inout_ PVOID *UserFunctions); + +NTSTATUS +NTAPI +UsrSpMakeSignature( + _In_ LSA_SEC_HANDLE ContextHandle, + _In_ ULONG QualityOfProtection, + _Inout_ PSecBufferDesc MessageBuffers, + _In_ ULONG MessageSequenceNumber); + +NTSTATUS +NTAPI +UsrSpVerifySignature( + _In_ LSA_SEC_HANDLE phContext, + _In_ PSecBufferDesc pMessage, + _In_ ULONG MessageSeqNo, + _In_ PULONG pfQOP); + +NTSTATUS +NTAPI +UsrSpSealMessage( + _In_ LSA_SEC_HANDLE ContextHandle, + _In_ ULONG QualityOfProtection, + _Inout_ PSecBufferDesc MessageBuffers, + _In_ ULONG MessageSequenceNumber); + +NTSTATUS +NTAPI +UsrSpUnsealMessage( + _In_ LSA_SEC_HANDLE ContextHandle, + _Inout_ PSecBufferDesc MessageBuffers, + _In_ ULONG MessageSequenceNumber, + _In_ PULONG QualityOfProtection); + +NTSTATUS +NTAPI +UsrSpGetContextToken( + _In_ LSA_SEC_HANDLE ContextHandle, + _Inout_ PHANDLE ImpersonationToken); + +NTSTATUS +NTAPI +UsrSpQueryContextAttributes( + _In_ LSA_SEC_HANDLE ContextHandle, + _In_ ULONG ContextAttribute, + _Inout_ PVOID Buffer); + +NTSTATUS +NTAPI +UsrSpCompleteAuthToken( + _In_ LSA_SEC_HANDLE ContextHandle, + _In_ PSecBufferDesc InputBuffer); + +NTSTATUS +NTAPI +UsrSpDeleteUserModeContext( + _In_ LSA_SEC_HANDLE ContextHandle); + +NTSTATUS +NTAPI +UsrSpFormatCredentials( + _In_ PSecBuffer Credentials, + _Inout_ PSecBuffer FormattedCredentials); + +NTSTATUS +NTAPI +UsrSpMarshallSupplementalCreds( + _In_ ULONG CredentialSize, + _In_ PUCHAR Credentials, + _Inout_ PULONG MarshalledCredSize, + _Inout_ PVOID *MarshalledCreds); + +NTSTATUS +NTAPI +UsrSpExportSecurityContext( + _In_ LSA_SEC_HANDLE phContext, + _In_ ULONG fFlags, + _Inout_ PSecBuffer pPackedContext, + _Inout_ PHANDLE pToken); + +NTSTATUS +NTAPI +UsrSpImportSecurityContext( + _In_ PSecBuffer pPackedContext, + _In_ HANDLE Token, + _Inout_ PLSA_SEC_HANDLE phContext); diff --git a/dll/win32/msv1_0/usercontext.c b/dll/win32/msv1_0/usercontext.c new file mode 100644 index 00000000000..a9fd023c47f --- /dev/null +++ b/dll/win32/msv1_0/usercontext.c @@ -0,0 +1,22 @@ +/* + * PROJECT: Authentication Package DLL + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: Manage user mode contexts (create, destroy, reference) + * COPYRIGHT: Copyright 2019-2020 Andreas Maier (staubim(a)quantentunnel.de) + */ + +#include "precomp.h" + +#include "wine/debug.h" +WINE_DEFAULT_DEBUG_CHANNEL(msv1_0); + +NTSTATUS +NTAPI +UsrSpInitUserModeContext( + _In_ LSA_SEC_HANDLE ContextHandle, + _In_ PSecBuffer PackedContext) +{ + TRACE("UsrSpInitUserModeContext(%p %p)\n", + ContextHandle, PackedContext); + return STATUS_NOT_IMPLEMENTED; +} diff --git a/dll/win32/msv1_0/usercontext.h b/dll/win32/msv1_0/usercontext.h new file mode 100644 index 00000000000..b1a5ca31a49 --- /dev/null +++ b/dll/win32/msv1_0/usercontext.h @@ -0,0 +1,14 @@ +/* + * PROJECT: Authentication Package DLL + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: Manage user mode contexts (create, destroy, reference) + * COPYRIGHT: Copyright 2019-2020 Andreas Maier <staubim(a)quantentunnel.de> + */ + +#pragma once + +NTSTATUS +NTAPI +UsrSpInitUserModeContext( + _In_ LSA_SEC_HANDLE ContextHandle, + _In_ PSecBuffer PackedContext);

3 years

[reactos] 01/01: [TASKMGR] Avoid freezing in getting icons (#4180)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=1c82bf032498d3d107aae… commit 1c82bf032498d3d107aae7174c5fb179680f0eb5 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Fri Dec 24 16:08:07 2021 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Fri Dec 24 16:08:07 2021 +0900 [TASKMGR] Avoid freezing in getting icons (#4180) - Modify the timeout value of SendMessageTimeout. - Use SMTO_ABORTIFHUNG flag. - Check if the window alive. CORE-17894 --- base/applications/taskmgr/applpage.c | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/base/applications/taskmgr/applpage.c b/base/applications/taskmgr/applpage.c index f3ad41c891a..b249006e94b 100644 --- a/base/applications/taskmgr/applpage.c +++ b/base/applications/taskmgr/applpage.c @@ -353,6 +353,7 @@ BOOL CALLBACK EnumWindowsProc(HWND hWnd, LPARAM lParam) WCHAR szText[260]; BOOL bLargeIcon; BOOL bHung = FALSE; + LRESULT bAlive; typedef int (FAR __stdcall *IsHungAppWindowProc)(HWND); IsHungAppWindowProc IsHungAppWindow; @@ -377,20 +378,26 @@ BOOL CALLBACK EnumWindowsProc(HWND hWnd, LPARAM lParam) noApps = FALSE; +#define GET_ICON(type) \ + SendMessageTimeoutW(hWnd, WM_GETICON, (type), 0, SMTO_ABORTIFHUNG, 100, (PDWORD_PTR)&hIcon) + /* Get the icon for this window */ hIcon = NULL; - SendMessageTimeoutW(hWnd, WM_GETICON, bLargeIcon ? ICON_BIG : ICON_SMALL, 0, 0, 1000, (PDWORD_PTR)&hIcon); + bAlive = GET_ICON(bLargeIcon ? ICON_BIG : ICON_SMALL); if (!hIcon) { /* We failed, try to retrieve other icons... */ - hIcon = (HICON)(LONG_PTR)GetClassLongPtrW(hWnd, bLargeIcon ? GCL_HICON : GCL_HICONSM); - if (!hIcon) hIcon = (HICON)(LONG_PTR)GetClassLongPtrW(hWnd, bLargeIcon ? GCL_HICONSM : GCL_HICON); - if (!hIcon) SendMessageTimeoutW(hWnd, WM_QUERYDRAGICON, 0, 0, 0, 1000, (PDWORD_PTR)&hIcon); - if (!hIcon) SendMessageTimeoutW(hWnd, WM_GETICON, bLargeIcon ? ICON_SMALL : ICON_BIG, 0, 0, 1000, (PDWORD_PTR)&hIcon); + if (!hIcon && bAlive) + GET_ICON(bLargeIcon ? ICON_SMALL : ICON_BIG); + if (!hIcon) + hIcon = (HICON)(LONG_PTR)GetClassLongPtrW(hWnd, bLargeIcon ? GCL_HICON : GCL_HICONSM); + if (!hIcon) + hIcon = (HICON)(LONG_PTR)GetClassLongPtrW(hWnd, bLargeIcon ? GCL_HICONSM : GCL_HICON); /* If we still do not have any icon, load the default one */ if (!hIcon) hIcon = LoadIconW(hInst, bLargeIcon ? MAKEINTRESOURCEW(IDI_WINDOW) : MAKEINTRESOURCEW(IDI_WINDOWSM)); } +#undef GET_ICON bHung = FALSE;

3 years

[reactos] 01/01: [EXPLORER] Adjust Taskbar AUTOHIDE size Part 2

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=4ed752e2c56830bae761c… commit 4ed752e2c56830bae761c4cdb6db24bf8394a412 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Fri Dec 24 07:52:02 2021 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Fri Dec 24 07:52:02 2021 +0900 [EXPLORER] Adjust Taskbar AUTOHIDE size Part 2 The previous commit 2cc893f was too thick. CORE-17927 --- base/shell/explorer/traywnd.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/base/shell/explorer/traywnd.cpp b/base/shell/explorer/traywnd.cpp index 0bcb6d81327..57acf0d28a0 100644 --- a/base/shell/explorer/traywnd.cpp +++ b/base/shell/explorer/traywnd.cpp @@ -1869,8 +1869,8 @@ ChangePos: void ProcessAutoHide() { - INT w = m_TraySize.cx - (GetSystemMetrics(SM_CXSIZEFRAME) + GetSystemMetrics(SM_CXEDGE)); - INT h = m_TraySize.cy - (GetSystemMetrics(SM_CYSIZEFRAME) + GetSystemMetrics(SM_CYEDGE)); + INT w = m_TraySize.cx - GetSystemMetrics(SM_CXSIZEFRAME); + INT h = m_TraySize.cy - GetSystemMetrics(SM_CYSIZEFRAME); switch (m_AutoHideState) {

3 years

[reactos] 01/01: [EXPLORER] Adjust AUTOHIDE size

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=2cc893f514240d1cadd4c… commit 2cc893f514240d1cadd4c51225a27c724fe17595 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Fri Dec 24 07:24:33 2021 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Fri Dec 24 07:26:11 2021 +0900 [EXPLORER] Adjust AUTOHIDE size GetSystemMetrics(SM_CXBORDER) is too thin. CORE-17927 --- base/shell/explorer/traywnd.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/base/shell/explorer/traywnd.cpp b/base/shell/explorer/traywnd.cpp index 0f3005ca950..0bcb6d81327 100644 --- a/base/shell/explorer/traywnd.cpp +++ b/base/shell/explorer/traywnd.cpp @@ -1869,8 +1869,8 @@ ChangePos: void ProcessAutoHide() { - INT w = m_TraySize.cx - GetSystemMetrics(SM_CXBORDER) * 2 - 1; - INT h = m_TraySize.cy - GetSystemMetrics(SM_CYBORDER) * 2 - 1; + INT w = m_TraySize.cx - (GetSystemMetrics(SM_CXSIZEFRAME) + GetSystemMetrics(SM_CXEDGE)); + INT h = m_TraySize.cy - (GetSystemMetrics(SM_CYSIZEFRAME) + GetSystemMetrics(SM_CYEDGE)); switch (m_AutoHideState) {

3 years

[reactos] 01/01: [SHELL32] Use IDI_SHELL_DOCUMENT for broken non-exe icons

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=f153b52dbb461fd6c5346… commit f153b52dbb461fd6c534643ae853b4191031ec7b Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Fri Dec 24 02:47:31 2021 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Fri Dec 24 02:47:31 2021 +0900 [SHELL32] Use IDI_SHELL_DOCUMENT for broken non-exe icons CORE-16287 --- dll/win32/shell32/folders/CFSFolder.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dll/win32/shell32/folders/CFSFolder.cpp b/dll/win32/shell32/folders/CFSFolder.cpp index 09c7574fd9c..b1c578ada8b 100644 --- a/dll/win32/shell32/folders/CFSFolder.cpp +++ b/dll/win32/shell32/folders/CFSFolder.cpp @@ -321,7 +321,10 @@ HRESULT CFSExtractIcon_CreateInstance(IShellFolder * psf, LPCITEMIDLIST pidl, RE if (ret <= 0) { StringCbCopyW(wTemp, sizeof(wTemp), swShell32Name); - icon_idx = -IDI_SHELL_EXE; + if (lstrcmpiW(pExtension, L".exe") == 0 || lstrcmpiW(pExtension, L".scr") == 0) + icon_idx = -IDI_SHELL_EXE; + else + icon_idx = -IDI_SHELL_DOCUMENT; } }

3 years

[reactos] 01/01: [NTUSER] Use call procedure handle if available (#4178)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=051561ed172abf44da5b9… commit 051561ed172abf44da5b93a9e9dd0df976431831 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Thu Dec 23 11:53:18 2021 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Thu Dec 23 11:53:18 2021 +0900 [NTUSER] Use call procedure handle if available (#4178) Based on I_Kill_Bugs' patch. - Use IsCallProcHandle to check if the procedure is a call procedure handle. - If so, use the call procedure. CORE-10499 --- win32ss/user/ntuser/window.c | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/win32ss/user/ntuser/window.c b/win32ss/user/ntuser/window.c index 8e42d693d45..d9cba3219d6 100644 --- a/win32ss/user/ntuser/window.c +++ b/win32ss/user/ntuser/window.c @@ -1623,6 +1623,7 @@ PWND FASTCALL IntCreateWindow(CREATESTRUCTW* Cs, PTHREADINFO pti = NULL; BOOL MenuChanged; BOOL bUnicodeWindow; + PCALLPROCDATA pcpd; pti = pdeskCreated ? gptiDesktopThread : GetW32ThreadInfo(); @@ -1769,7 +1770,16 @@ PWND FASTCALL IntCreateWindow(CREATESTRUCTW* Cs, see what problems this would cause. */ // Set WndProc from Class. - pWnd->lpfnWndProc = pWnd->pcls->lpfnWndProc; + if (IsCallProcHandle(pWnd->pcls->lpfnWndProc)) + { + pcpd = UserGetObject(gHandleTable, pWnd->pcls->lpfnWndProc, TYPE_CALLPROC); + if (pcpd) + pWnd->lpfnWndProc = pcpd->pfnClientPrevious; + } + else + { + pWnd->lpfnWndProc = pWnd->pcls->lpfnWndProc; + } // GetWindowProc, test for non server side default classes and set WndProc. if ( pWnd->pcls->fnid <= FNID_GHOST && pWnd->pcls->fnid >= FNID_BUTTON )

3 years

[reactos] 01/01: [SYSDM] Make the environment dialog box resizable (#4038)

by Arnav Bhatt

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=52befa1d7363a722adb80… commit 52befa1d7363a722adb80edf9e12bcfe834236cb Author: Arnav Bhatt <arnavbhatt288(a)gmail.com> AuthorDate: Thu Dec 23 05:55:32 2021 +0530 Commit: GitHub <noreply(a)github.com> CommitDate: Thu Dec 23 01:25:32 2021 +0100 [SYSDM] Make the environment dialog box resizable (#4038) Make it resizable, similarly to what is done in Windows 10. --- dll/cpl/sysdm/environment.c | 301 ++++++++++++++++++++++++++++++++++++++++++-- dll/cpl/sysdm/lang/bg-BG.rc | 7 +- dll/cpl/sysdm/lang/cs-CZ.rc | 7 +- dll/cpl/sysdm/lang/da-DK.rc | 7 +- dll/cpl/sysdm/lang/de-DE.rc | 7 +- dll/cpl/sysdm/lang/el-GR.rc | 7 +- dll/cpl/sysdm/lang/en-US.rc | 7 +- dll/cpl/sysdm/lang/es-ES.rc | 7 +- dll/cpl/sysdm/lang/fr-FR.rc | 7 +- dll/cpl/sysdm/lang/he-IL.rc | 7 +- dll/cpl/sysdm/lang/hu-HU.rc | 7 +- dll/cpl/sysdm/lang/id-ID.rc | 7 +- dll/cpl/sysdm/lang/it-IT.rc | 7 +- dll/cpl/sysdm/lang/ja-JP.rc | 7 +- dll/cpl/sysdm/lang/nl-NL.rc | 7 +- dll/cpl/sysdm/lang/no-NO.rc | 7 +- dll/cpl/sysdm/lang/pl-PL.rc | 7 +- dll/cpl/sysdm/lang/pt-PT.rc | 7 +- dll/cpl/sysdm/lang/ro-RO.rc | 7 +- dll/cpl/sysdm/lang/ru-RU.rc | 7 +- dll/cpl/sysdm/lang/sk-SK.rc | 7 +- dll/cpl/sysdm/lang/sq-AL.rc | 7 +- dll/cpl/sysdm/lang/sv-SE.rc | 7 +- dll/cpl/sysdm/lang/tr-TR.rc | 7 +- dll/cpl/sysdm/lang/uk-UA.rc | 7 +- dll/cpl/sysdm/lang/zh-CN.rc | 7 +- dll/cpl/sysdm/lang/zh-TW.rc | 7 +- dll/cpl/sysdm/resource.h | 2 + 28 files changed, 398 insertions(+), 87 deletions(-) diff --git a/dll/cpl/sysdm/environment.c b/dll/cpl/sysdm/environment.c index b10aa2b4959..49f408af182 100644 --- a/dll/cpl/sysdm/environment.c +++ b/dll/cpl/sysdm/environment.c @@ -23,6 +23,14 @@ typedef struct _VARIABLE_DATA LPTSTR lpCookedValue; } VARIABLE_DATA, *PVARIABLE_DATA; +typedef struct _ENVIRONMENT_DIALOG_DATA +{ + DWORD cxMin; + DWORD cyMin; + DWORD cxOld; + DWORD cyOld; +} ENVIRONMENT_DIALOG_DATA, *PENVIRONMENT_DIALOG_DATA; + typedef struct _ENVIRONMENT_EDIT_DIALOG_DATA { BOOL bIsItemSelected; @@ -230,7 +238,7 @@ AddEmptyItem(HWND hwndListView, lvi.pszText = _T(""); lvi.iItem = dwSelectedValueIndex; lvi.iSubItem = 0; - ListView_InsertItem(hwndListView, &lvi); + ListView_InsertItem(hwndListView, &lvi); } static VOID @@ -417,12 +425,12 @@ OnEnvironmentEditDlgResize(HWND hwndDlg, if ((cx == DlgData->cxOld) && (cy == DlgData->cyOld)) return; - + if (DlgData->dwDlgID == IDD_EDIT_VARIABLE) { hdwp = BeginDeferWindowPos(5); - - /* For edit control */ + + /* For edit control */ hItemWnd = GetDlgItem(hwndDlg, IDC_VARIABLE_NAME); GetWindowRect(hItemWnd, &rect); MapWindowPoints(HWND_DESKTOP, hwndDlg, (LPPOINT)&rect, sizeof(RECT)/sizeof(POINT)); @@ -947,7 +955,7 @@ EditVariableDlgProc(HWND hwndDlg, LoadString(hApplet, IDS_ENVIRONMENT_WARNING, szStr, _countof(szStr)); LoadString(hApplet, IDS_ENVIRONMENT_WARNING_TITLE, szStr2, _countof(szStr2)); - + if (MessageBox(hwndDlg, szStr, szStr2, @@ -959,7 +967,7 @@ EditVariableDlgProc(HWND hwndDlg, } case IDC_BUTTON_NEW: - { + { DlgData->dwSelectedValueIndex = ListView_GetItemCount(hwndListView); AddEmptyItem(hwndListView, DlgData->dwSelectedValueIndex); ListView_EditLabel(hwndListView, DlgData->dwSelectedValueIndex); @@ -1243,10 +1251,10 @@ OnEditVariable(HWND hwndDlg, DlgData = GlobalAlloc(GPTR, sizeof(EDIT_DIALOG_DATA)); if (!DlgData) return; - + DlgData->dwDlgID = IDD_EDIT_VARIABLE; DlgData->dwSelectedValueIndex = -1; - + hwndListView = GetDlgItem(hwndDlg, iDlgItem); iItem = GetSelectedListViewItem(hwndListView); @@ -1280,7 +1288,7 @@ OnEditVariable(HWND hwndDlg, EditVariableDlgProc, (LPARAM)DlgData); } - + if (iRet > 0) { ListView_SetItemText(hwndListView, iItem, 0, DlgData->VarData->lpName); @@ -1342,6 +1350,238 @@ OnDeleteVariable(HWND hwndDlg, } } +static VOID +OnEnvironmentDlgResize(HWND hwndDlg, + PENVIRONMENT_DIALOG_DATA DlgData, + DWORD cx, + DWORD cy) +{ + RECT rect; + INT Colx, y = 0; + HDWP hdwp = NULL; + HWND hItemWnd; + + if ((cx == DlgData->cxOld) && (cy == DlgData->cyOld)) + return; + + hdwp = BeginDeferWindowPos(13); + + if (cy >= DlgData->cyOld) + y += (cy - DlgData->cyOld + 1) / 2; + else + y -= (DlgData->cyOld - cy + 1) / 2; + + /* For group box control */ + hItemWnd = GetDlgItem(hwndDlg, IDC_USER_VARIABLE_GROUP); + GetWindowRect(hItemWnd, &rect); + MapWindowPoints(HWND_DESKTOP, hwndDlg, (LPPOINT)&rect, sizeof(RECT)/sizeof(POINT)); + + if (hdwp) + { + hdwp = DeferWindowPos(hdwp, + hItemWnd, + 0, + rect.left, rect.top, + (rect.right - rect.left) + (cx - DlgData->cxOld), + (rect.bottom - rect.top) + y, + SWP_NOZORDER | SWP_NOACTIVATE); + } + + hItemWnd = GetDlgItem(hwndDlg, IDC_SYSTEM_VARIABLE_GROUP); + GetWindowRect(hItemWnd, &rect); + MapWindowPoints(HWND_DESKTOP, hwndDlg, (LPPOINT)&rect, sizeof(RECT)/sizeof(POINT)); + + if (hdwp) + { + hdwp = DeferWindowPos(hdwp, + hItemWnd, + 0, + rect.left, rect.top + y, + (rect.right - rect.left) + (cx - DlgData->cxOld), + (rect.bottom - rect.top) + y, + SWP_NOZORDER | SWP_NOACTIVATE); + } + + /* For list view control */ + hItemWnd = GetDlgItem(hwndDlg, IDC_USER_VARIABLE_LIST); + GetWindowRect(hItemWnd, &rect); + MapWindowPoints(HWND_DESKTOP, hwndDlg, (LPPOINT)&rect, sizeof(RECT)/sizeof(POINT)); + + if (hdwp) + { + hdwp = DeferWindowPos(hdwp, + hItemWnd, + 0, + rect.left, rect.top, + (rect.right - rect.left) + (cx - DlgData->cxOld), + (rect.bottom - rect.top) + y, + SWP_NOZORDER | SWP_NOACTIVATE); + Colx = ListView_GetColumnWidth(hItemWnd, 1); + ListView_SetColumnWidth(hItemWnd, 1, Colx + (cx - DlgData->cxOld)); + } + + hItemWnd = GetDlgItem(hwndDlg, IDC_SYSTEM_VARIABLE_LIST); + GetWindowRect(hItemWnd, &rect); + MapWindowPoints(HWND_DESKTOP, hwndDlg, (LPPOINT)&rect, sizeof(RECT)/sizeof(POINT)); + + if (hdwp) + { + hdwp = DeferWindowPos(hdwp, + hItemWnd, + 0, + rect.left, rect.top + y, + (rect.right - rect.left) + (cx - DlgData->cxOld), + (rect.bottom - rect.top) + y, + SWP_NOZORDER | SWP_NOACTIVATE); + Colx = ListView_GetColumnWidth(hItemWnd, 1); + ListView_SetColumnWidth(hItemWnd, 1, Colx + (cx - DlgData->cxOld)); + } + + /* For the buttons */ + hItemWnd = GetDlgItem(hwndDlg, IDC_USER_VARIABLE_NEW); + GetWindowRect(hItemWnd, &rect); + MapWindowPoints(HWND_DESKTOP, hwndDlg, (LPPOINT)&rect, sizeof(RECT)/sizeof(POINT)); + + if (hdwp) + { + hdwp = DeferWindowPos(hdwp, + hItemWnd, + 0, + rect.left + (cx - DlgData->cxOld), + rect.top + y, + 0, 0, + SWP_NOSIZE | SWP_NOZORDER | SWP_NOACTIVATE); + } + + hItemWnd = GetDlgItem(hwndDlg, IDC_USER_VARIABLE_EDIT); + GetWindowRect(hItemWnd, &rect); + MapWindowPoints(HWND_DESKTOP, hwndDlg, (LPPOINT)&rect, sizeof(RECT)/sizeof(POINT)); + + if (hdwp) + { + hdwp = DeferWindowPos(hdwp, + hItemWnd, + 0, + rect.left + (cx - DlgData->cxOld), + rect.top + y, + 0, 0, + SWP_NOSIZE | SWP_NOZORDER | SWP_NOACTIVATE); + } + + hItemWnd = GetDlgItem(hwndDlg, IDC_USER_VARIABLE_DELETE); + GetWindowRect(hItemWnd, &rect); + MapWindowPoints(HWND_DESKTOP, hwndDlg, (LPPOINT)&rect, sizeof(RECT)/sizeof(POINT)); + + if (hdwp) + { + hdwp = DeferWindowPos(hdwp, + hItemWnd, + 0, + rect.left + (cx - DlgData->cxOld), + rect.top + y, + 0, 0, + SWP_NOSIZE | SWP_NOZORDER | SWP_NOACTIVATE); + } + + hItemWnd = GetDlgItem(hwndDlg, IDC_SYSTEM_VARIABLE_NEW); + GetWindowRect(hItemWnd, &rect); + MapWindowPoints(HWND_DESKTOP, hwndDlg, (LPPOINT)&rect, sizeof(RECT)/sizeof(POINT)); + + if (hdwp) + { + hdwp = DeferWindowPos(hdwp, + hItemWnd, + 0, + rect.left + (cx - DlgData->cxOld), + rect.top + y * 2, + 0, 0, + SWP_NOSIZE | SWP_NOZORDER | SWP_NOACTIVATE); + } + + hItemWnd = GetDlgItem(hwndDlg, IDC_SYSTEM_VARIABLE_EDIT); + GetWindowRect(hItemWnd, &rect); + MapWindowPoints(HWND_DESKTOP, hwndDlg, (LPPOINT)&rect, sizeof(RECT)/sizeof(POINT)); + + if (hdwp) + { + hdwp = DeferWindowPos(hdwp, + hItemWnd, + 0, + rect.left + (cx - DlgData->cxOld), + rect.top + y * 2, + 0, 0, + SWP_NOSIZE | SWP_NOZORDER | SWP_NOACTIVATE); + } + + hItemWnd = GetDlgItem(hwndDlg, IDC_SYSTEM_VARIABLE_DELETE); + GetWindowRect(hItemWnd, &rect); + MapWindowPoints(HWND_DESKTOP, hwndDlg, (LPPOINT)&rect, sizeof(RECT)/sizeof(POINT)); + + if (hdwp) + { + hdwp = DeferWindowPos(hdwp, + hItemWnd, + 0, + rect.left + (cx - DlgData->cxOld), + rect.top + y * 2, + 0, 0, + SWP_NOSIZE | SWP_NOZORDER | SWP_NOACTIVATE); + } + + hItemWnd = GetDlgItem(hwndDlg, IDOK); + GetWindowRect(hItemWnd, &rect); + MapWindowPoints(HWND_DESKTOP, hwndDlg, (LPPOINT)&rect, sizeof(RECT)/sizeof(POINT)); + + if (hdwp) + { + hdwp = DeferWindowPos(hdwp, + hItemWnd, + 0, + rect.left + (cx - DlgData->cxOld), + rect.top + (cy - DlgData->cyOld * 2), + 0, 0, + SWP_NOSIZE | SWP_NOZORDER | SWP_NOACTIVATE); + } + + hItemWnd = GetDlgItem(hwndDlg, IDCANCEL); + GetWindowRect(hItemWnd, &rect); + MapWindowPoints(HWND_DESKTOP, hwndDlg, (LPPOINT)&rect, sizeof(RECT)/sizeof(POINT)); + + if (hdwp) + { + hdwp = DeferWindowPos(hdwp, + hItemWnd, + 0, + rect.left + (cx - DlgData->cxOld), + rect.top + y * 2, + 0, 0, + SWP_NOSIZE | SWP_NOZORDER | SWP_NOACTIVATE); + } + + /* For the size grip */ + hItemWnd = GetDlgItem(hwndDlg, IDC_DIALOG_GRIP); + GetWindowRect(hItemWnd, &rect); + MapWindowPoints(HWND_DESKTOP, hwndDlg, (LPPOINT)&rect, sizeof(RECT)/sizeof(POINT)); + + if (hdwp) + { + hdwp = DeferWindowPos(hdwp, + hItemWnd, + 0, + rect.left + (cx - DlgData->cxOld), + rect.top + (cy - DlgData->cyOld), + 0, 0, + SWP_NOSIZE | SWP_NOZORDER | SWP_NOACTIVATE); + } + + if (hdwp) + { + EndDeferWindowPos(hdwp); + } + + DlgData->cxOld = cx; + DlgData->cyOld = cy; +} static VOID ReleaseListViewItems(HWND hwndDlg, @@ -1557,11 +1797,53 @@ EnvironmentDlgProc(HWND hwndDlg, WPARAM wParam, LPARAM lParam) { + PENVIRONMENT_DIALOG_DATA DlgData; + DlgData = (PENVIRONMENT_DIALOG_DATA)GetWindowLongPtr(hwndDlg, GWLP_USERDATA); + switch (uMsg) { case WM_INITDIALOG: + { + RECT rect; + + DlgData = GlobalAlloc(GPTR, sizeof(ENVIRONMENT_DIALOG_DATA)); + if (!DlgData) + { + EndDialog(hwndDlg, 0); + return (INT_PTR)TRUE; + } + SetWindowLongPtr(hwndDlg, GWLP_USERDATA, (LONG_PTR)DlgData); + + GetClientRect(hwndDlg, &rect); + DlgData->cxOld = rect.right - rect.left; + DlgData->cyOld = rect.bottom - rect.top; + + GetWindowRect(hwndDlg, &rect); + DlgData->cxMin = rect.right - rect.left; + DlgData->cyMin = rect.bottom - rect.top; + OnInitEnvironmentDialog(hwndDlg); break; + } + + case WM_SIZE: + { + OnEnvironmentDlgResize(hwndDlg, DlgData, LOWORD(lParam), HIWORD(lParam)); + break; + } + + case WM_SIZING: + { + LPRECT pRect = (LPRECT)lParam; + + if (pRect->right - pRect->left < DlgData->cxMin) + pRect->right = pRect->left + DlgData->cxMin; + + if (pRect->bottom - pRect->top < DlgData->cyMin) + pRect->bottom = pRect->top + DlgData->cyMin; + + return TRUE; + } case WM_COMMAND: switch (LOWORD(wParam)) @@ -1607,6 +1889,7 @@ EnvironmentDlgProc(HWND hwndDlg, case WM_DESTROY: ReleaseListViewItems(hwndDlg, IDC_USER_VARIABLE_LIST); ReleaseListViewItems(hwndDlg, IDC_SYSTEM_VARIABLE_LIST); + GlobalFree(DlgData); break; case WM_NOTIFY: diff --git a/dll/cpl/sysdm/lang/bg-BG.rc b/dll/cpl/sysdm/lang/bg-BG.rc index 39d2ecbcdfe..522d7e41b26 100644 --- a/dll/cpl/sysdm/lang/bg-BG.rc +++ b/dll/cpl/sysdm/lang/bg-BG.rc @@ -258,17 +258,18 @@ BEGIN END IDD_ENVIRONMENT_VARIABLES DIALOGEX 6, 18, 252, 245 -STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUPWINDOW | WS_CAPTION | WS_VISIBLE | WS_THICKFRAME CAPTION "Променливи на средата" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - GROUPBOX "Потребителски променливи", IDC_STATIC, 7, 12, 238, 100 + SCROLLBAR IDC_DIALOG_GRIP, 245, 238, 7, 7, SBS_SIZEGRIP + GROUPBOX "Потребителски променливи", IDC_USER_VARIABLE_GROUP, 7, 12, 238, 100 CONTROL "", IDC_USER_VARIABLE_LIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SORTASCENDING | LVS_NOSORTHEADER | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP, 14, 25, 224, 58, WS_EX_CLIENTEDGE PUSHBUTTON "&Нов...", IDC_USER_VARIABLE_NEW, 80, 90, 50, 14 PUSHBUTTON "&Обработка...", IDC_USER_VARIABLE_EDIT, 134, 90, 50, 14 PUSHBUTTON "Из&триване", IDC_USER_VARIABLE_DELETE, 188, 90, 50, 14 - GROUPBOX "Променливи на системата", IDC_STATIC, 7, 116, 238, 100 + GROUPBOX "Променливи на системата", IDC_SYSTEM_VARIABLE_GROUP, 7, 116, 238, 100 CONTROL "", IDC_SYSTEM_VARIABLE_LIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SORTASCENDING | LVS_NOSORTHEADER | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP, 14, 129, 224, 58, WS_EX_CLIENTEDGE PUSHBUTTON "Но&в...", IDC_SYSTEM_VARIABLE_NEW, 80, 194, 50, 14 diff --git a/dll/cpl/sysdm/lang/cs-CZ.rc b/dll/cpl/sysdm/lang/cs-CZ.rc index 4c119804071..ee89498508c 100644 --- a/dll/cpl/sysdm/lang/cs-CZ.rc +++ b/dll/cpl/sysdm/lang/cs-CZ.rc @@ -263,17 +263,18 @@ BEGIN END IDD_ENVIRONMENT_VARIABLES DIALOGEX 6, 18, 252, 245 -STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUPWINDOW | WS_CAPTION | WS_VISIBLE | WS_THICKFRAME CAPTION "Proměnné prostředí" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - GROUPBOX "Uživatelské proměnné", IDC_STATIC, 7, 12, 238, 100 + SCROLLBAR IDC_DIALOG_GRIP, 245, 238, 7, 7, SBS_SIZEGRIP + GROUPBOX "Uživatelské proměnné", IDC_USER_VARIABLE_GROUP, 7, 12, 238, 100 CONTROL "", IDC_USER_VARIABLE_LIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SORTASCENDING | LVS_NOSORTHEADER | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP, 14, 25, 224, 58, WS_EX_CLIENTEDGE PUSHBUTTON "&Nová...", IDC_USER_VARIABLE_NEW, 80, 90, 50, 14 PUSHBUTTON "&Upravit...", IDC_USER_VARIABLE_EDIT, 134, 90, 50, 14 PUSHBUTTON "&Odstranit", IDC_USER_VARIABLE_DELETE, 188, 90, 50, 14 - GROUPBOX "Systémové proměnné", IDC_STATIC, 7, 116, 238, 100 + GROUPBOX "Systémové proměnné", IDC_SYSTEM_VARIABLE_GROUP, 7, 116, 238, 100 CONTROL "", IDC_SYSTEM_VARIABLE_LIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SORTASCENDING | LVS_NOSORTHEADER | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP, 14, 129, 224, 58, WS_EX_CLIENTEDGE PUSHBUTTON "No&vá...", IDC_SYSTEM_VARIABLE_NEW, 80, 194, 50, 14 diff --git a/dll/cpl/sysdm/lang/da-DK.rc b/dll/cpl/sysdm/lang/da-DK.rc index bd3bf415d88..668574b9516 100644 --- a/dll/cpl/sysdm/lang/da-DK.rc +++ b/dll/cpl/sysdm/lang/da-DK.rc @@ -258,17 +258,18 @@ BEGIN END IDD_ENVIRONMENT_VARIABLES DIALOGEX 6, 18, 252, 245 -STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUPWINDOW | WS_CAPTION | WS_VISIBLE | WS_THICKFRAME CAPTION "Miljø Variabler" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - GROUPBOX "Brugere Variabler", IDC_STATIC, 7, 12, 238, 100 + SCROLLBAR IDC_DIALOG_GRIP, 245, 238, 7, 7, SBS_SIZEGRIP + GROUPBOX "Brugere Variabler", IDC_USER_VARIABLE_GROUP, 7, 12, 238, 100 CONTROL "", IDC_USER_VARIABLE_LIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SORTASCENDING | LVS_NOSORTHEADER | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP, 14, 25, 224, 58, WS_EX_CLIENTEDGE PUSHBUTTON "&Ny...", IDC_USER_VARIABLE_NEW, 80, 90, 50, 14 PUSHBUTTON "&Redigere...", IDC_USER_VARIABLE_EDIT, 134, 90, 50, 14 PUSHBUTTON "&Slet", IDC_USER_VARIABLE_DELETE, 188, 90, 50, 14 - GROUPBOX "System Variabler", IDC_STATIC, 7, 116, 238, 100 + GROUPBOX "System Variabler", IDC_SYSTEM_VARIABLE_GROUP, 7, 116, 238, 100 CONTROL "", IDC_SYSTEM_VARIABLE_LIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SORTASCENDING | LVS_NOSORTHEADER | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP, 14, 129, 224, 58, WS_EX_CLIENTEDGE PUSHBUTTON "N&y...", IDC_SYSTEM_VARIABLE_NEW, 80, 194, 50, 14 diff --git a/dll/cpl/sysdm/lang/de-DE.rc b/dll/cpl/sysdm/lang/de-DE.rc index b8aff646b38..48cfbb39f3d 100644 --- a/dll/cpl/sysdm/lang/de-DE.rc +++ b/dll/cpl/sysdm/lang/de-DE.rc @@ -267,17 +267,18 @@ BEGIN END IDD_ENVIRONMENT_VARIABLES DIALOGEX 6, 18, 252, 245 -STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUPWINDOW | WS_CAPTION | WS_VISIBLE | WS_THICKFRAME CAPTION "Umgebungsvariablen" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - GROUPBOX "Benutzerdefinierte Variablen", IDC_STATIC, 7, 12, 238, 100 + SCROLLBAR IDC_DIALOG_GRIP, 245, 238, 7, 7, SBS_SIZEGRIP + GROUPBOX "Benutzerdefinierte Variablen", IDC_USER_VARIABLE_GROUP, 7, 12, 238, 100 CONTROL "", IDC_USER_VARIABLE_LIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SORTASCENDING | LVS_NOSORTHEADER | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP, 14, 25, 224, 58, WS_EX_CLIENTEDGE PUSHBUTTON "&Neu...", IDC_USER_VARIABLE_NEW, 80, 90, 50, 14 PUSHBUTTON "Be&arbeiten...", IDC_USER_VARIABLE_EDIT, 134, 90, 50, 14 PUSHBUTTON "&Löschen", IDC_USER_VARIABLE_DELETE, 188, 90, 50, 14 - GROUPBOX "Systemvariablen", IDC_STATIC, 7, 116, 238, 100 + GROUPBOX "Systemvariablen", IDC_SYSTEM_VARIABLE_GROUP, 7, 116, 238, 100 CONTROL "", IDC_SYSTEM_VARIABLE_LIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SORTASCENDING | LVS_NOSORTHEADER | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP, 14, 129, 224, 58, WS_EX_CLIENTEDGE PUSHBUTTON "N&eu...", IDC_SYSTEM_VARIABLE_NEW, 80, 194, 50, 14 diff --git a/dll/cpl/sysdm/lang/el-GR.rc b/dll/cpl/sysdm/lang/el-GR.rc index 70d7896adce..7ead5542296 100644 --- a/dll/cpl/sysdm/lang/el-GR.rc +++ b/dll/cpl/sysdm/lang/el-GR.rc @@ -258,17 +258,18 @@ BEGIN END IDD_ENVIRONMENT_VARIABLES DIALOGEX 6, 18, 252, 245 -STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUPWINDOW | WS_CAPTION | WS_VISIBLE | WS_THICKFRAME CAPTION "Μεταβλητές περιβάλλοντος" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - GROUPBOX "Μεταβλητές χρήστη", IDC_STATIC, 7, 12, 238, 100 + SCROLLBAR IDC_DIALOG_GRIP, 245, 238, 7, 7, SBS_SIZEGRIP + GROUPBOX "Μεταβλητές χρήστη", IDC_USER_VARIABLE_GROUP, 7, 12, 238, 100 CONTROL "", IDC_USER_VARIABLE_LIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SORTASCENDING | LVS_NOSORTHEADER | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP, 14, 25, 224, 58, WS_EX_CLIENTEDGE PUSHBUTTON "&Δημιουργία...", IDC_USER_VARIABLE_NEW, 80, 90, 50, 14 PUSHBUTTON "Επε&ξεργασία...", IDC_USER_VARIABLE_EDIT, 134, 90, 50, 14 PUSHBUTTON "Διαγρα&φή", IDC_USER_VARIABLE_DELETE, 188, 90, 50, 14 - GROUPBOX "&Μεταβλητές συστήματος", IDC_STATIC, 7, 116, 238, 100 + GROUPBOX "&Μεταβλητές συστήματος", IDC_SYSTEM_VARIABLE_GROUP, 7, 116, 238, 100 CONTROL "", IDC_SYSTEM_VARIABLE_LIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SORTASCENDING | LVS_NOSORTHEADER | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP, 14, 129, 224, 58, WS_EX_CLIENTEDGE PUSHBUTTON "Δ&ημιουργία...", IDC_SYSTEM_VARIABLE_NEW, 80, 194, 50, 14 diff --git a/dll/cpl/sysdm/lang/en-US.rc b/dll/cpl/sysdm/lang/en-US.rc index 56d1f8739cb..5f2fde34b5a 100644 --- a/dll/cpl/sysdm/lang/en-US.rc +++ b/dll/cpl/sysdm/lang/en-US.rc @@ -258,17 +258,18 @@ BEGIN END IDD_ENVIRONMENT_VARIABLES DIALOGEX 6, 18, 252, 245 -STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUPWINDOW | WS_CAPTION | WS_VISIBLE | WS_THICKFRAME CAPTION "Environment Variables" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - GROUPBOX "User variables", IDC_STATIC, 7, 12, 238, 100 + SCROLLBAR IDC_DIALOG_GRIP, 245, 238, 7, 7, SBS_SIZEGRIP + GROUPBOX "User variables", IDC_USER_VARIABLE_GROUP, 7, 12, 238, 100 CONTROL "", IDC_USER_VARIABLE_LIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SORTASCENDING | LVS_NOSORTHEADER | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP, 14, 25, 224, 58, WS_EX_CLIENTEDGE PUSHBUTTON "&New...", IDC_USER_VARIABLE_NEW, 80, 90, 50, 14 PUSHBUTTON "&Edit...", IDC_USER_VARIABLE_EDIT, 134, 90, 50, 14 PUSHBUTTON "&Delete", IDC_USER_VARIABLE_DELETE, 188, 90, 50, 14 - GROUPBOX "System variables", IDC_STATIC, 7, 116, 238, 100 + GROUPBOX "System variables", IDC_SYSTEM_VARIABLE_GROUP, 7, 116, 238, 100 CONTROL "", IDC_SYSTEM_VARIABLE_LIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SORTASCENDING | LVS_NOSORTHEADER | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP, 14, 129, 224, 58, WS_EX_CLIENTEDGE PUSHBUTTON "Ne&w...", IDC_SYSTEM_VARIABLE_NEW, 80, 194, 50, 14 diff --git a/dll/cpl/sysdm/lang/es-ES.rc b/dll/cpl/sysdm/lang/es-ES.rc index d31fccadc50..591d19719bc 100644 --- a/dll/cpl/sysdm/lang/es-ES.rc +++ b/dll/cpl/sysdm/lang/es-ES.rc @@ -260,17 +260,18 @@ BEGIN END IDD_ENVIRONMENT_VARIABLES DIALOGEX 6, 18, 252, 245 -STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUPWINDOW | WS_CAPTION | WS_VISIBLE | WS_THICKFRAME CAPTION "Variables de entorno" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - GROUPBOX "Variables de usuario ", IDC_STATIC, 7, 12, 238, 100 + SCROLLBAR IDC_DIALOG_GRIP, 245, 238, 7, 7, SBS_SIZEGRIP + GROUPBOX "Variables de usuario ", IDC_USER_VARIABLE_GROUP, 7, 12, 238, 100 CONTROL "", IDC_USER_VARIABLE_LIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SORTASCENDING | LVS_NOSORTHEADER | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP, 14, 25, 224, 58, WS_EX_CLIENTEDGE PUSHBUTTON "&Nueva...", IDC_USER_VARIABLE_NEW, 80, 90, 50, 14 PUSHBUTTON "&Modificar...", IDC_USER_VARIABLE_EDIT, 134, 90, 50, 14 PUSHBUTTON "E&liminar", IDC_USER_VARIABLE_DELETE, 188, 90, 50, 14 - GROUPBOX "Variables del sistema ", IDC_STATIC, 7, 116, 238, 100 + GROUPBOX "Variables del sistema ", IDC_SYSTEM_VARIABLE_GROUP, 7, 116, 238, 100 CONTROL "", IDC_SYSTEM_VARIABLE_LIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SORTASCENDING | LVS_NOSORTHEADER | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP, 14, 129, 224, 58, WS_EX_CLIENTEDGE PUSHBUTTON "Nue&va...", IDC_SYSTEM_VARIABLE_NEW, 80, 194, 50, 14 diff --git a/dll/cpl/sysdm/lang/fr-FR.rc b/dll/cpl/sysdm/lang/fr-FR.rc index 6246e3b270c..36d82604988 100644 --- a/dll/cpl/sysdm/lang/fr-FR.rc +++ b/dll/cpl/sysdm/lang/fr-FR.rc @@ -258,17 +258,18 @@ BEGIN END IDD_ENVIRONMENT_VARIABLES DIALOGEX 6, 18, 252, 245 -STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUPWINDOW | WS_CAPTION | WS_VISIBLE | WS_THICKFRAME CAPTION "Variables d'environnement" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - GROUPBOX "Variables utilisateur", IDC_STATIC, 7, 12, 238, 100 + SCROLLBAR IDC_DIALOG_GRIP, 245, 238, 7, 7, SBS_SIZEGRIP + GROUPBOX "Variables utilisateur", IDC_USER_VARIABLE_GROUP, 7, 12, 238, 100 CONTROL "", IDC_USER_VARIABLE_LIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SORTASCENDING | LVS_NOSORTHEADER | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP, 14, 25, 224, 58, WS_EX_CLIENTEDGE PUSHBUTTON "&Nouvelle...", IDC_USER_VARIABLE_NEW, 80, 90, 50, 14 PUSHBUTTON "&Éditer...", IDC_USER_VARIABLE_EDIT, 134, 90, 50, 14 PUSHBUTTON "&Supprimer", IDC_USER_VARIABLE_DELETE, 188, 90, 50, 14 - GROUPBOX "Variables système", IDC_STATIC, 7, 116, 238, 100 + GROUPBOX "Variables système", IDC_SYSTEM_VARIABLE_GROUP, 7, 116, 238, 100 CONTROL "", IDC_SYSTEM_VARIABLE_LIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SORTASCENDING | LVS_NOSORTHEADER | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP, 14, 129, 224, 58, WS_EX_CLIENTEDGE PUSHBUTTON "Nou&velle...", IDC_SYSTEM_VARIABLE_NEW, 80, 194, 50, 14 diff --git a/dll/cpl/sysdm/lang/he-IL.rc b/dll/cpl/sysdm/lang/he-IL.rc index 622f65914aa..d0b9da93242 100644 --- a/dll/cpl/sysdm/lang/he-IL.rc +++ b/dll/cpl/sysdm/lang/he-IL.rc @@ -260,17 +260,18 @@ BEGIN END IDD_ENVIRONMENT_VARIABLES DIALOGEX 6, 18, 252, 245 -STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUPWINDOW | WS_CAPTION | WS_VISIBLE | WS_THICKFRAME CAPTION "משתני סביבה" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - GROUPBOX "משתני משתמש", IDC_STATIC, 7, 12, 238, 100 + SCROLLBAR IDC_DIALOG_GRIP, 245, 238, 7, 7, SBS_SIZEGRIP + GROUPBOX "משתני משתמש", IDC_USER_VARIABLE_GROUP, 7, 12, 238, 100 CONTROL "", IDC_USER_VARIABLE_LIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SORTASCENDING | LVS_NOSORTHEADER | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP, 14, 25, 224, 58, WS_EX_CLIENTEDGE PUSHBUTTON "חדש...", IDC_USER_VARIABLE_NEW, 80, 90, 50, 14 PUSHBUTTON "עריכה...", IDC_USER_VARIABLE_EDIT, 134, 90, 50, 14 PUSHBUTTON "מחק", IDC_USER_VARIABLE_DELETE, 188, 90, 50, 14 - GROUPBOX "משתני מערכת", IDC_STATIC, 7, 116, 238, 100 + GROUPBOX "משתני מערכת", IDC_SYSTEM_VARIABLE_GROUP, 7, 116, 238, 100 CONTROL "", IDC_SYSTEM_VARIABLE_LIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SORTASCENDING | LVS_NOSORTHEADER | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP, 14, 129, 224, 58, WS_EX_CLIENTEDGE PUSHBUTTON "חדש...", IDC_SYSTEM_VARIABLE_NEW, 80, 194, 50, 14 diff --git a/dll/cpl/sysdm/lang/hu-HU.rc b/dll/cpl/sysdm/lang/hu-HU.rc index b1e8ce6692e..fb652b06cdc 100644 --- a/dll/cpl/sysdm/lang/hu-HU.rc +++ b/dll/cpl/sysdm/lang/hu-HU.rc @@ -260,17 +260,18 @@ BEGIN END IDD_ENVIRONMENT_VARIABLES DIALOGEX 6, 18, 252, 245 -STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUPWINDOW | WS_CAPTION | WS_VISIBLE | WS_THICKFRAME CAPTION "Környezeti változók" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - GROUPBOX "Felhasználói változók", IDC_STATIC, 7, 12, 238, 100 + SCROLLBAR IDC_DIALOG_GRIP, 245, 238, 7, 7, SBS_SIZEGRIP + GROUPBOX "Felhasználói változók", IDC_USER_VARIABLE_GROUP, 7, 12, 238, 100 CONTROL "", IDC_USER_VARIABLE_LIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SORTASCENDING | LVS_NOSORTHEADER | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP, 14, 25, 224, 58, WS_EX_CLIENTEDGE PUSHBUTTON "&Új...", IDC_USER_VARIABLE_NEW, 80, 90, 50, 14 PUSHBUTTON "&Szerkesztés", IDC_USER_VARIABLE_EDIT, 134, 90, 50, 14 PUSHBUTTON "&Törlés", IDC_USER_VARIABLE_DELETE, 188, 90, 50, 14 - GROUPBOX "Rendszerváltozók", IDC_STATIC, 7, 116, 238, 100 + GROUPBOX "Rendszerváltozók", IDC_SYSTEM_VARIABLE_GROUP, 7, 116, 238, 100 CONTROL "", IDC_SYSTEM_VARIABLE_LIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SORTASCENDING | LVS_NOSORTHEADER | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP, 14, 129, 224, 58, WS_EX_CLIENTEDGE PUSHBUTTON "Ú&j...", IDC_SYSTEM_VARIABLE_NEW, 80, 194, 50, 14 diff --git a/dll/cpl/sysdm/lang/id-ID.rc b/dll/cpl/sysdm/lang/id-ID.rc index 407d422ee82..c779f954f55 100644 --- a/dll/cpl/sysdm/lang/id-ID.rc +++ b/dll/cpl/sysdm/lang/id-ID.rc @@ -258,17 +258,18 @@ BEGIN END IDD_ENVIRONMENT_VARIABLES DIALOGEX 6, 18, 252, 245 -STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUPWINDOW | WS_CAPTION | WS_VISIBLE | WS_THICKFRAME CAPTION "Variabel Lingkungan" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - GROUPBOX "Variabel Pengguna", IDC_STATIC, 7, 12, 238, 100 + SCROLLBAR IDC_DIALOG_GRIP, 245, 238, 7, 7, SBS_SIZEGRIP + GROUPBOX "Variabel Pengguna", IDC_USER_VARIABLE_GROUP, 7, 12, 238, 100 CONTROL "", IDC_USER_VARIABLE_LIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SORTASCENDING | LVS_NOSORTHEADER | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP, 14, 25, 224, 58, WS_EX_CLIENTEDGE PUSHBUTTON "&Baru...", IDC_USER_VARIABLE_NEW, 80, 90, 50, 14 PUSHBUTTON "&Edit...", IDC_USER_VARIABLE_EDIT, 134, 90, 50, 14 PUSHBUTTON "&Hapus", IDC_USER_VARIABLE_DELETE, 188, 90, 50, 14 - GROUPBOX "Variabel sistem", IDC_STATIC, 7, 116, 238, 100 + GROUPBOX "Variabel sistem", IDC_SYSTEM_VARIABLE_GROUP, 7, 116, 238, 100 CONTROL "", IDC_SYSTEM_VARIABLE_LIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SORTASCENDING | LVS_NOSORTHEADER | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP, 14, 129, 224, 58, WS_EX_CLIENTEDGE PUSHBUTTON "&Baru...", IDC_SYSTEM_VARIABLE_NEW, 80, 194, 50, 14 diff --git a/dll/cpl/sysdm/lang/it-IT.rc b/dll/cpl/sysdm/lang/it-IT.rc index 88eb47de85d..59602adefde 100644 --- a/dll/cpl/sysdm/lang/it-IT.rc +++ b/dll/cpl/sysdm/lang/it-IT.rc @@ -258,17 +258,18 @@ BEGIN END IDD_ENVIRONMENT_VARIABLES DIALOGEX 6, 18, 252, 245 -STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUPWINDOW | WS_CAPTION | WS_VISIBLE | WS_THICKFRAME CAPTION "Variabili di ambiente" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - GROUPBOX "Variabili utente", IDC_STATIC, 7, 12, 238, 100 + SCROLLBAR IDC_DIALOG_GRIP, 245, 238, 7, 7, SBS_SIZEGRIP + GROUPBOX "Variabili utente", IDC_USER_VARIABLE_GROUP, 7, 12, 238, 100 CONTROL "", IDC_USER_VARIABLE_LIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SORTASCENDING | LVS_NOSORTHEADER | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP, 14, 25, 224, 58, WS_EX_CLIENTEDGE PUSHBUTTON "&Nuova...", IDC_USER_VARIABLE_NEW, 80, 90, 50, 14 PUSHBUTTON "&Modifica...", IDC_USER_VARIABLE_EDIT, 134, 90, 50, 14 PUSHBUTTON "&Cancella", IDC_USER_VARIABLE_DELETE, 188, 90, 50, 14 - GROUPBOX "Variabili di sistema", IDC_STATIC, 7, 116, 238, 100 + GROUPBOX "Variabili di sistema", IDC_SYSTEM_VARIABLE_GROUP, 7, 116, 238, 100 CONTROL "", IDC_SYSTEM_VARIABLE_LIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SORTASCENDING | LVS_NOSORTHEADER | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP, 14, 129, 224, 58, WS_EX_CLIENTEDGE PUSHBUTTON "N&uova...", IDC_SYSTEM_VARIABLE_NEW, 80, 194, 50, 14 diff --git a/dll/cpl/sysdm/lang/ja-JP.rc b/dll/cpl/sysdm/lang/ja-JP.rc index 13dffad6000..4fcfb0133f7 100644 --- a/dll/cpl/sysdm/lang/ja-JP.rc +++ b/dll/cpl/sysdm/lang/ja-JP.rc @@ -258,17 +258,18 @@ BEGIN END IDD_ENVIRONMENT_VARIABLES DIALOGEX 6, 18, 252, 245 -STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUPWINDOW | WS_CAPTION | WS_VISIBLE | WS_THICKFRAME CAPTION "環境変数" FONT 9, "MS UI Gothic", 0, 0, 0x0 BEGIN - GROUPBOX "ユーザ変数", IDC_STATIC, 7, 12, 238, 100 + SCROLLBAR IDC_DIALOG_GRIP, 245, 238, 7, 7, SBS_SIZEGRIP + GROUPBOX "ユーザ変数", IDC_USER_VARIABLE_GROUP, 7, 12, 238, 100 CONTROL "", IDC_USER_VARIABLE_LIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SORTASCENDING | LVS_NOSORTHEADER | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP, 14, 25, 224, 58, WS_EX_CLIENTEDGE PUSHBUTTON "新規(&N)...", IDC_USER_VARIABLE_NEW, 80, 90, 50, 14 PUSHBUTTON "編集(&E)...", IDC_USER_VARIABLE_EDIT, 134, 90, 50, 14 PUSHBUTTON "削除(&D)", IDC_USER_VARIABLE_DELETE, 188, 90, 50, 14 - GROUPBOX "システム変数", IDC_STATIC, 7, 116, 238, 100 + GROUPBOX "システム変数", IDC_SYSTEM_VARIABLE_GROUP, 7, 116, 238, 100 CONTROL "", IDC_SYSTEM_VARIABLE_LIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SORTASCENDING | LVS_NOSORTHEADER | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP, 14, 129, 224, 58, WS_EX_CLIENTEDGE PUSHBUTTON "新規(&W)...", IDC_SYSTEM_VARIABLE_NEW, 80, 194, 50, 14 diff --git a/dll/cpl/sysdm/lang/nl-NL.rc b/dll/cpl/sysdm/lang/nl-NL.rc index f72ba8a7cbf..46c1b337ed4 100644 --- a/dll/cpl/sysdm/lang/nl-NL.rc +++ b/dll/cpl/sysdm/lang/nl-NL.rc @@ -258,17 +258,18 @@ BEGIN END IDD_ENVIRONMENT_VARIABLES DIALOGEX 6, 18, 252, 245 -STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUPWINDOW | WS_CAPTION | WS_VISIBLE | WS_THICKFRAME CAPTION "Omgevingsvariabelen" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - GROUPBOX "Gebruikersvariabelen", IDC_STATIC, 7, 12, 238, 100 + SCROLLBAR IDC_DIALOG_GRIP, 245, 238, 7, 7, SBS_SIZEGRIP + GROUPBOX "Gebruikersvariabelen", IDC_USER_VARIABLE_GROUP, 7, 12, 238, 100 CONTROL "", IDC_USER_VARIABLE_LIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SORTASCENDING | LVS_NOSORTHEADER | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP, 14, 25, 224, 58, WS_EX_CLIENTEDGE PUSHBUTTON "&Nieuw...", IDC_USER_VARIABLE_NEW, 80, 90, 50, 14 PUSHBUTTON "&Bewerken...", IDC_USER_VARIABLE_EDIT, 134, 90, 50, 14 PUSHBUTTON "&Verwijderen", IDC_USER_VARIABLE_DELETE, 188, 90, 50, 14 - GROUPBOX "Systeemvariabelen", IDC_STATIC, 7, 116, 238, 100 + GROUPBOX "Systeemvariabelen", IDC_SYSTEM_VARIABLE_GROUP, 7, 116, 238, 100 CONTROL "", IDC_SYSTEM_VARIABLE_LIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SORTASCENDING | LVS_NOSORTHEADER | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP, 14, 129, 224, 58, WS_EX_CLIENTEDGE PUSHBUTTON "N&ieuw...", IDC_SYSTEM_VARIABLE_NEW, 80, 194, 50, 14 diff --git a/dll/cpl/sysdm/lang/no-NO.rc b/dll/cpl/sysdm/lang/no-NO.rc index 4441431cd16..58e718c4acd 100644 --- a/dll/cpl/sysdm/lang/no-NO.rc +++ b/dll/cpl/sysdm/lang/no-NO.rc @@ -258,17 +258,18 @@ BEGIN END IDD_ENVIRONMENT_VARIABLES DIALOGEX 6, 18, 252, 245 -STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUPWINDOW | WS_CAPTION | WS_VISIBLE | WS_THICKFRAME CAPTION "Miljøvariabel" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - GROUPBOX "Brukervariabeler", IDC_STATIC, 7, 12, 238, 100 + SCROLLBAR IDC_DIALOG_GRIP, 245, 238, 7, 7, SBS_SIZEGRIP + GROUPBOX "Brukervariabeler", IDC_USER_VARIABLE_GROUP, 7, 12, 238, 100 CONTROL "", IDC_USER_VARIABLE_LIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SORTASCENDING | LVS_NOSORTHEADER | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP, 14, 25, 224, 58, WS_EX_CLIENTEDGE PUSHBUTTON "&Ny...", IDC_USER_VARIABLE_NEW, 80, 90, 50, 14 PUSHBUTTON "&Rediger...", IDC_USER_VARIABLE_EDIT, 134, 90, 50, 14 PUSHBUTTON "&Slett", IDC_USER_VARIABLE_DELETE, 188, 90, 50, 14 - GROUPBOX "System variabeler", IDC_STATIC, 7, 116, 238, 100 + GROUPBOX "System variabeler", IDC_SYSTEM_VARIABLE_GROUP, 7, 116, 238, 100 CONTROL "", IDC_SYSTEM_VARIABLE_LIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SORTASCENDING | LVS_NOSORTHEADER | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP, 14, 129, 224, 58, WS_EX_CLIENTEDGE PUSHBUTTON "N&y...", IDC_SYSTEM_VARIABLE_NEW, 80, 194, 50, 14 diff --git a/dll/cpl/sysdm/lang/pl-PL.rc b/dll/cpl/sysdm/lang/pl-PL.rc index 61d89d3691b..d16c97e1677 100644 --- a/dll/cpl/sysdm/lang/pl-PL.rc +++ b/dll/cpl/sysdm/lang/pl-PL.rc @@ -267,17 +267,18 @@ BEGIN END IDD_ENVIRONMENT_VARIABLES DIALOGEX 6, 18, 252, 245 -STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUPWINDOW | WS_CAPTION | WS_VISIBLE | WS_THICKFRAME CAPTION "Zmienne środowiskowe" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - GROUPBOX "Zmienne użytkownika", IDC_STATIC, 7, 12, 238, 100 + SCROLLBAR IDC_DIALOG_GRIP, 245, 238, 7, 7, SBS_SIZEGRIP + GROUPBOX "Zmienne użytkownika", IDC_USER_VARIABLE_GROUP, 7, 12, 238, 100 CONTROL "", IDC_USER_VARIABLE_LIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SORTASCENDING | LVS_NOSORTHEADER | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP, 14, 25, 224, 58, WS_EX_CLIENTEDGE PUSHBUTTON "&Nowa...", IDC_USER_VARIABLE_NEW, 80, 90, 50, 14 PUSHBUTTON "&Edytuj...", IDC_USER_VARIABLE_EDIT, 134, 90, 50, 14 PUSHBUTTON "&Usuń", IDC_USER_VARIABLE_DELETE, 188, 90, 50, 14 - GROUPBOX "Zmienne systemowe", IDC_STATIC, 7, 116, 238, 100 + GROUPBOX "Zmienne systemowe", IDC_SYSTEM_VARIABLE_GROUP, 7, 116, 238, 100 CONTROL "", IDC_SYSTEM_VARIABLE_LIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SORTASCENDING | LVS_NOSORTHEADER | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP, 14, 129, 224, 58, WS_EX_CLIENTEDGE PUSHBUTTON "N&owa...", IDC_SYSTEM_VARIABLE_NEW, 80, 194, 50, 14 diff --git a/dll/cpl/sysdm/lang/pt-PT.rc b/dll/cpl/sysdm/lang/pt-PT.rc index 8689cc603c6..0bdde937170 100644 --- a/dll/cpl/sysdm/lang/pt-PT.rc +++ b/dll/cpl/sysdm/lang/pt-PT.rc @@ -262,17 +262,18 @@ BEGIN END IDD_ENVIRONMENT_VARIABLES DIALOGEX 6, 18, 252, 245 -STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUPWINDOW | WS_CAPTION | WS_VISIBLE | WS_THICKFRAME CAPTION "Variáveis de ambiente" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - GROUPBOX "Variáveis do utilizador", IDC_STATIC, 7, 12, 238, 100 + SCROLLBAR IDC_DIALOG_GRIP, 245, 238, 7, 7, SBS_SIZEGRIP + GROUPBOX "Variáveis do utilizador", IDC_USER_VARIABLE_GROUP, 7, 12, 238, 100 CONTROL "", IDC_USER_VARIABLE_LIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SORTASCENDING | LVS_NOSORTHEADER | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP, 14, 25, 224, 58, WS_EX_CLIENTEDGE PUSHBUTTON "&Novo...", IDC_USER_VARIABLE_NEW, 80, 90, 50, 14 PUSHBUTTON "&Editar...", IDC_USER_VARIABLE_EDIT, 134, 90, 50, 14 PUSHBUTTON "E&liminar", IDC_USER_VARIABLE_DELETE, 188, 90, 50, 14 - GROUPBOX "Variáveis do sistema", IDC_STATIC, 7, 116, 238, 100 + GROUPBOX "Variáveis do sistema", IDC_SYSTEM_VARIABLE_GROUP, 7, 116, 238, 100 CONTROL "", IDC_SYSTEM_VARIABLE_LIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SORTASCENDING | LVS_NOSORTHEADER | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP, 14, 129, 224, 58, WS_EX_CLIENTEDGE PUSHBUTTON "N&ovo...", IDC_SYSTEM_VARIABLE_NEW, 80, 194, 50, 14 diff --git a/dll/cpl/sysdm/lang/ro-RO.rc b/dll/cpl/sysdm/lang/ro-RO.rc index f41b944947d..92eec198cb4 100644 --- a/dll/cpl/sysdm/lang/ro-RO.rc +++ b/dll/cpl/sysdm/lang/ro-RO.rc @@ -267,17 +267,18 @@ BEGIN END IDD_ENVIRONMENT_VARIABLES DIALOGEX 6, 18, 252, 245 -STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUPWINDOW | WS_CAPTION | WS_VISIBLE | WS_THICKFRAME CAPTION "Variabile de mediu" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - GROUPBOX "Variable de cont utilizator", IDC_STATIC, 7, 12, 238, 100 + SCROLLBAR IDC_DIALOG_GRIP, 245, 238, 7, 7, SBS_SIZEGRIP + GROUPBOX "Variable de cont utilizator", IDC_USER_VARIABLE_GROUP, 7, 12, 238, 100 CONTROL "", IDC_USER_VARIABLE_LIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SORTASCENDING | LVS_NOSORTHEADER | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP, 14, 25, 224, 58, WS_EX_CLIENTEDGE PUSHBUTTON "N&ouă…", IDC_USER_VARIABLE_NEW, 80, 90, 50, 14 PUSHBUTTON "E&ditare…", IDC_USER_VARIABLE_EDIT, 134, 90, 50, 14 PUSHBUTTON "Șt&erge", IDC_USER_VARIABLE_DELETE, 188, 90, 50, 14 - GROUPBOX "Variabile de sistem", IDC_STATIC, 7, 116, 238, 100 + GROUPBOX "Variabile de sistem", IDC_SYSTEM_VARIABLE_GROUP, 7, 116, 238, 100 CONTROL "", IDC_SYSTEM_VARIABLE_LIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SORTASCENDING | LVS_NOSORTHEADER | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP, 14, 129, 224, 58, WS_EX_CLIENTEDGE PUSHBUTTON "No&uă…", IDC_SYSTEM_VARIABLE_NEW, 80, 194, 50, 14 diff --git a/dll/cpl/sysdm/lang/ru-RU.rc b/dll/cpl/sysdm/lang/ru-RU.rc index 0a479808c4a..0336c9bab69 100644 --- a/dll/cpl/sysdm/lang/ru-RU.rc +++ b/dll/cpl/sysdm/lang/ru-RU.rc @@ -258,17 +258,18 @@ BEGIN END IDD_ENVIRONMENT_VARIABLES DIALOGEX 6, 18, 252, 245 -STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUPWINDOW | WS_CAPTION | WS_VISIBLE | WS_THICKFRAME CAPTION "Переменные среды" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - GROUPBOX "Пользовательские переменные", IDC_STATIC, 7, 12, 238, 100 + SCROLLBAR IDC_DIALOG_GRIP, 245, 238, 7, 7, SBS_SIZEGRIP + GROUPBOX "Пользовательские переменные", IDC_USER_VARIABLE_GROUP, 7, 12, 238, 100 CONTROL "", IDC_USER_VARIABLE_LIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SORTASCENDING | LVS_NOSORTHEADER | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP, 14, 25, 224, 58, WS_EX_CLIENTEDGE PUSHBUTTON "&Создать...", IDC_USER_VARIABLE_NEW, 80, 90, 50, 14 PUSHBUTTON "&Изменить...", IDC_USER_VARIABLE_EDIT, 134, 90, 50, 14 PUSHBUTTON "&Удалить", IDC_USER_VARIABLE_DELETE, 188, 90, 50, 14 - GROUPBOX "Системные переменные", IDC_STATIC, 7, 116, 238, 100 + GROUPBOX "Системные переменные", IDC_SYSTEM_VARIABLE_GROUP, 7, 116, 238, 100 CONTROL "", IDC_SYSTEM_VARIABLE_LIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SORTASCENDING | LVS_NOSORTHEADER | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP, 14, 129, 224, 58, WS_EX_CLIENTEDGE PUSHBUTTON "С&оздать...", IDC_SYSTEM_VARIABLE_NEW, 80, 194, 50, 14 diff --git a/dll/cpl/sysdm/lang/sk-SK.rc b/dll/cpl/sysdm/lang/sk-SK.rc index e5d3d1ced4c..3bc920c389d 100644 --- a/dll/cpl/sysdm/lang/sk-SK.rc +++ b/dll/cpl/sysdm/lang/sk-SK.rc @@ -266,17 +266,18 @@ BEGIN END IDD_ENVIRONMENT_VARIABLES DIALOGEX 6, 18, 252, 245 -STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUPWINDOW | WS_CAPTION | WS_VISIBLE | WS_THICKFRAME CAPTION "Premenné prostredia" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - GROUPBOX "&Používateľské premenné", IDC_STATIC, 7, 12, 238, 100 + SCROLLBAR IDC_DIALOG_GRIP, 245, 238, 7, 7, SBS_SIZEGRIP + GROUPBOX "&Používateľské premenné", IDC_USER_VARIABLE_GROUP, 7, 12, 238, 100 CONTROL "", IDC_USER_VARIABLE_LIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SORTASCENDING | LVS_NOSORTHEADER | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP, 14, 25, 224, 58, WS_EX_CLIENTEDGE PUSHBUTTON "&Nová...", IDC_USER_VARIABLE_NEW, 80, 90, 50, 14 PUSHBUTTON "&Upraviť...", IDC_USER_VARIABLE_EDIT, 134, 90, 50, 14 PUSHBUTTON "&Odstrániť", IDC_USER_VARIABLE_DELETE, 188, 90, 50, 14 - GROUPBOX "&Systémové premenné", IDC_STATIC, 7, 116, 238, 100 + GROUPBOX "&Systémové premenné", IDC_SYSTEM_VARIABLE_GROUP, 7, 116, 238, 100 CONTROL "", IDC_SYSTEM_VARIABLE_LIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SORTASCENDING | LVS_NOSORTHEADER | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP, 14, 129, 224, 58, WS_EX_CLIENTEDGE PUSHBUTTON "No&vá...", IDC_SYSTEM_VARIABLE_NEW, 80, 194, 50, 14 diff --git a/dll/cpl/sysdm/lang/sq-AL.rc b/dll/cpl/sysdm/lang/sq-AL.rc index aff00d43626..958f6f506b3 100644 --- a/dll/cpl/sysdm/lang/sq-AL.rc +++ b/dll/cpl/sysdm/lang/sq-AL.rc @@ -258,17 +258,18 @@ BEGIN END IDD_ENVIRONMENT_VARIABLES DIALOGEX 6, 18, 252, 245 -STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUPWINDOW | WS_CAPTION | WS_VISIBLE | WS_THICKFRAME CAPTION "Variabël Mjedisi" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - GROUPBOX "Variabël Përdoruesi", IDC_STATIC, 7, 12, 238, 100 + SCROLLBAR IDC_DIALOG_GRIP, 245, 238, 7, 7, SBS_SIZEGRIP + GROUPBOX "Variabël Përdoruesi", IDC_USER_VARIABLE_GROUP, 7, 12, 238, 100 CONTROL "", IDC_USER_VARIABLE_LIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SORTASCENDING | LVS_NOSORTHEADER | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP, 14, 25, 224, 58, WS_EX_CLIENTEDGE PUSHBUTTON "&E're...", IDC_USER_VARIABLE_NEW, 80, 90, 50, 14 PUSHBUTTON "&Modifiko...", IDC_USER_VARIABLE_EDIT, 134, 90, 50, 14 PUSHBUTTON "&Fshi", IDC_USER_VARIABLE_DELETE, 188, 90, 50, 14 - GROUPBOX "Variablë Sistemi", IDC_STATIC, 7, 116, 238, 100 + GROUPBOX "Variablë Sistemi", IDC_SYSTEM_VARIABLE_GROUP, 7, 116, 238, 100 CONTROL "", IDC_SYSTEM_VARIABLE_LIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SORTASCENDING | LVS_NOSORTHEADER | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP, 14, 129, 224, 58, WS_EX_CLIENTEDGE PUSHBUTTON "E're...", IDC_SYSTEM_VARIABLE_NEW, 80, 194, 50, 14 diff --git a/dll/cpl/sysdm/lang/sv-SE.rc b/dll/cpl/sysdm/lang/sv-SE.rc index 76331c99c91..2154dc098f0 100644 --- a/dll/cpl/sysdm/lang/sv-SE.rc +++ b/dll/cpl/sysdm/lang/sv-SE.rc @@ -260,17 +260,18 @@ BEGIN END IDD_ENVIRONMENT_VARIABLES DIALOGEX 6, 18, 252, 245 -STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUPWINDOW | WS_CAPTION | WS_VISIBLE | WS_THICKFRAME CAPTION "Miljövariabler" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - GROUPBOX "Användarvariabler", IDC_STATIC, 7, 12, 238, 100 + SCROLLBAR IDC_DIALOG_GRIP, 245, 238, 7, 7, SBS_SIZEGRIP + GROUPBOX "Användarvariabler", IDC_USER_VARIABLE_GROUP, 7, 12, 238, 100 CONTROL "", IDC_USER_VARIABLE_LIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SORTASCENDING | LVS_NOSORTHEADER | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP, 14, 25, 224, 58, WS_EX_CLIENTEDGE PUSHBUTTON "&Ny...", IDC_USER_VARIABLE_NEW, 80, 90, 50, 14 PUSHBUTTON "&Redigera...", IDC_USER_VARIABLE_EDIT, 134, 90, 50, 14 PUSHBUTTON "&Ta bort", IDC_USER_VARIABLE_DELETE, 188, 90, 50, 14 - GROUPBOX "Systemvariabler", IDC_STATIC, 7, 116, 238, 100 + GROUPBOX "Systemvariabler", IDC_SYSTEM_VARIABLE_GROUP, 7, 116, 238, 100 CONTROL "", IDC_SYSTEM_VARIABLE_LIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SORTASCENDING | LVS_NOSORTHEADER | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP, 14, 129, 224, 58, WS_EX_CLIENTEDGE PUSHBUTTON "N&y...", IDC_SYSTEM_VARIABLE_NEW, 80, 194, 50, 14 diff --git a/dll/cpl/sysdm/lang/tr-TR.rc b/dll/cpl/sysdm/lang/tr-TR.rc index ba285d9ecb6..d939cbc6f49 100644 --- a/dll/cpl/sysdm/lang/tr-TR.rc +++ b/dll/cpl/sysdm/lang/tr-TR.rc @@ -260,17 +260,18 @@ BEGIN END IDD_ENVIRONMENT_VARIABLES DIALOGEX 6, 18, 252, 245 -STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUPWINDOW | WS_CAPTION | WS_VISIBLE | WS_THICKFRAME CAPTION "Ortam Değişkenleri" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - GROUPBOX "Kullanıcı Değişkenleri", IDC_STATIC, 7, 12, 238, 100 + SCROLLBAR IDC_DIALOG_GRIP, 245, 238, 7, 7, SBS_SIZEGRIP + GROUPBOX "Kullanıcı Değişkenleri", IDC_USER_VARIABLE_GROUP, 7, 12, 238, 100 CONTROL "", IDC_USER_VARIABLE_LIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SORTASCENDING | LVS_NOSORTHEADER | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP, 14, 25, 224, 58, WS_EX_CLIENTEDGE PUSHBUTTON "&Yeni...", IDC_USER_VARIABLE_NEW, 80, 90, 50, 14 PUSHBUTTON "&Düzenle...", IDC_USER_VARIABLE_EDIT, 134, 90, 50, 14 PUSHBUTTON "&Sil", IDC_USER_VARIABLE_DELETE, 188, 90, 50, 14 - GROUPBOX "Sistem Değişkenleri", IDC_STATIC, 7, 116, 238, 100 + GROUPBOX "Sistem Değişkenleri", IDC_SYSTEM_VARIABLE_GROUP, 7, 116, 238, 100 CONTROL "", IDC_SYSTEM_VARIABLE_LIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SORTASCENDING | LVS_NOSORTHEADER | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP, 14, 129, 224, 58, WS_EX_CLIENTEDGE PUSHBUTTON "Y&eni...", IDC_SYSTEM_VARIABLE_NEW, 80, 194, 50, 14 diff --git a/dll/cpl/sysdm/lang/uk-UA.rc b/dll/cpl/sysdm/lang/uk-UA.rc index de6dd0c79f9..df6a8e9c1d4 100644 --- a/dll/cpl/sysdm/lang/uk-UA.rc +++ b/dll/cpl/sysdm/lang/uk-UA.rc @@ -266,17 +266,18 @@ BEGIN END IDD_ENVIRONMENT_VARIABLES DIALOGEX 6, 18, 252, 245 -STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUPWINDOW | WS_CAPTION | WS_VISIBLE | WS_THICKFRAME CAPTION "Змінні оточення" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - GROUPBOX "Змінні користувача", IDC_STATIC, 7, 12, 238, 100 + SCROLLBAR IDC_DIALOG_GRIP, 245, 238, 7, 7, SBS_SIZEGRIP + GROUPBOX "Змінні користувача", IDC_USER_VARIABLE_GROUP, 7, 12, 238, 100 CONTROL "", IDC_USER_VARIABLE_LIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SORTASCENDING | LVS_NOSORTHEADER | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP, 14, 25, 224, 58, WS_EX_CLIENTEDGE PUSHBUTTON "&Створити...", IDC_USER_VARIABLE_NEW, 80, 90, 50, 14 PUSHBUTTON "&Змінити...", IDC_USER_VARIABLE_EDIT, 134, 90, 50, 14 PUSHBUTTON "В&идалити", IDC_USER_VARIABLE_DELETE, 188, 90, 50, 14 - GROUPBOX "Системні змінні", IDC_STATIC, 7, 116, 238, 100 + GROUPBOX "Системні змінні", IDC_SYSTEM_VARIABLE_GROUP, 7, 116, 238, 100 CONTROL "", IDC_SYSTEM_VARIABLE_LIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SORTASCENDING | LVS_NOSORTHEADER | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP, 14, 129, 224, 58, WS_EX_CLIENTEDGE PUSHBUTTON "&Створити...", IDC_SYSTEM_VARIABLE_NEW, 80, 194, 50, 14 diff --git a/dll/cpl/sysdm/lang/zh-CN.rc b/dll/cpl/sysdm/lang/zh-CN.rc index 38c1dd73adc..e3620d2e28f 100644 --- a/dll/cpl/sysdm/lang/zh-CN.rc +++ b/dll/cpl/sysdm/lang/zh-CN.rc @@ -261,17 +261,18 @@ BEGIN END IDD_ENVIRONMENT_VARIABLES DIALOGEX 6, 18, 252, 245 -STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUPWINDOW | WS_CAPTION | WS_VISIBLE | WS_THICKFRAME CAPTION "环境变量" FONT 9, "宋体", 0, 0, 0x0 BEGIN - GROUPBOX "用户变量", IDC_STATIC, 7, 12, 238, 100 + SCROLLBAR IDC_DIALOG_GRIP, 245, 238, 7, 7, SBS_SIZEGRIP + GROUPBOX "用户变量", IDC_USER_VARIABLE_GROUP, 7, 12, 238, 100 CONTROL "", IDC_USER_VARIABLE_LIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SORTASCENDING | LVS_NOSORTHEADER | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP, 14, 25, 224, 58, WS_EX_CLIENTEDGE PUSHBUTTON "新建(&N)", IDC_USER_VARIABLE_NEW, 80, 90, 50, 14 PUSHBUTTON "编辑(&E)", IDC_USER_VARIABLE_EDIT, 134, 90, 50, 14 PUSHBUTTON "删除(&D)", IDC_USER_VARIABLE_DELETE, 188, 90, 50, 14 - GROUPBOX "系统变量", IDC_STATIC, 7, 116, 238, 100 + GROUPBOX "系统变量", IDC_SYSTEM_VARIABLE_GROUP, 7, 116, 238, 100 CONTROL "", IDC_SYSTEM_VARIABLE_LIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SORTASCENDING | LVS_NOSORTHEADER | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP, 14, 129, 224, 58, WS_EX_CLIENTEDGE PUSHBUTTON "新建(&W)", IDC_SYSTEM_VARIABLE_NEW, 80, 194, 50, 14 diff --git a/dll/cpl/sysdm/lang/zh-TW.rc b/dll/cpl/sysdm/lang/zh-TW.rc index 626688b5e3b..29c547af5c2 100644 --- a/dll/cpl/sysdm/lang/zh-TW.rc +++ b/dll/cpl/sysdm/lang/zh-TW.rc @@ -266,17 +266,18 @@ BEGIN END IDD_ENVIRONMENT_VARIABLES DIALOGEX 6, 18, 252, 245 -STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUPWINDOW | WS_CAPTION | WS_VISIBLE | WS_THICKFRAME CAPTION "環境變數" FONT 9, "新細明體", 0, 0, 0x0 BEGIN - GROUPBOX "使用者變數", IDC_STATIC, 7, 12, 238, 100 + SCROLLBAR IDC_DIALOG_GRIP, 245, 238, 7, 7, SBS_SIZEGRIP + GROUPBOX "使用者變數", IDC_USER_VARIABLE_GROUP, 7, 12, 238, 100 CONTROL "", IDC_USER_VARIABLE_LIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SORTASCENDING | LVS_NOSORTHEADER | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP, 14, 25, 224, 58, WS_EX_CLIENTEDGE PUSHBUTTON "新增(&N)", IDC_USER_VARIABLE_NEW, 80, 90, 50, 14 PUSHBUTTON "編輯(&E)", IDC_USER_VARIABLE_EDIT, 134, 90, 50, 14 PUSHBUTTON "刪除(&D)", IDC_USER_VARIABLE_DELETE, 188, 90, 50, 14 - GROUPBOX "系統變數", IDC_STATIC, 7, 116, 238, 100 + GROUPBOX "系統變數", IDC_SYSTEM_VARIABLE_GROUP, 7, 116, 238, 100 CONTROL "", IDC_SYSTEM_VARIABLE_LIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SORTASCENDING | LVS_NOSORTHEADER | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP, 14, 129, 224, 58, WS_EX_CLIENTEDGE PUSHBUTTON "新增(&W)", IDC_SYSTEM_VARIABLE_NEW, 80, 194, 50, 14 diff --git a/dll/cpl/sysdm/resource.h b/dll/cpl/sysdm/resource.h index d0a720f1619..4fc0fa8ae79 100644 --- a/dll/cpl/sysdm/resource.h +++ b/dll/cpl/sysdm/resource.h @@ -132,6 +132,8 @@ #define IDC_SYSTEM_VARIABLE_NEW 606 #define IDC_SYSTEM_VARIABLE_EDIT 607 #define IDC_SYSTEM_VARIABLE_DELETE 608 +#define IDC_USER_VARIABLE_GROUP 609 +#define IDC_SYSTEM_VARIABLE_GROUP 610 /* Edit environment variables */ #define IDD_EDIT_VARIABLE 700

3 years

[reactos] 01/01: [SYSDM] Edit Environment Variable Dialog Improvement (#3575)

by Arnav Bhatt

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=e58b4a492835bb7812de9… commit e58b4a492835bb7812de9d7705208894696dee2b Author: Arnav Bhatt <arnavbhatt288(a)gmail.com> AuthorDate: Thu Dec 23 05:07:21 2021 +0530 Commit: GitHub <noreply(a)github.com> CommitDate: Thu Dec 23 00:37:21 2021 +0100 [SYSDM] Edit Environment Variable Dialog Improvement (#3575) Improve the "Edit Environment Variable" dialog box to be functionally as similar to the one of Windows 10. CORE-11733 - Improved the existing dialog box. In particular, allow it to be resizable. - Implemented new "fancy" dialog box for variables containing multiple directories as values, showing them in a list. --- dll/cpl/sysdm/CMakeLists.txt | 2 +- dll/cpl/sysdm/environment.c | 1044 ++++++++++++++++++++++++++++++++++++++---- dll/cpl/sysdm/lang/bg-BG.rc | 40 +- dll/cpl/sysdm/lang/cs-CZ.rc | 40 +- dll/cpl/sysdm/lang/da-DK.rc | 40 +- dll/cpl/sysdm/lang/de-DE.rc | 40 +- dll/cpl/sysdm/lang/el-GR.rc | 40 +- dll/cpl/sysdm/lang/en-US.rc | 40 +- dll/cpl/sysdm/lang/es-ES.rc | 40 +- dll/cpl/sysdm/lang/fr-FR.rc | 40 +- dll/cpl/sysdm/lang/he-IL.rc | 40 +- dll/cpl/sysdm/lang/hu-HU.rc | 40 +- dll/cpl/sysdm/lang/id-ID.rc | 40 +- dll/cpl/sysdm/lang/it-IT.rc | 40 +- dll/cpl/sysdm/lang/ja-JP.rc | 40 +- dll/cpl/sysdm/lang/nl-NL.rc | 40 +- dll/cpl/sysdm/lang/no-NO.rc | 40 +- dll/cpl/sysdm/lang/pl-PL.rc | 40 +- dll/cpl/sysdm/lang/pt-PT.rc | 40 +- dll/cpl/sysdm/lang/ro-RO.rc | 40 +- dll/cpl/sysdm/lang/ru-RU.rc | 40 +- dll/cpl/sysdm/lang/sk-SK.rc | 40 +- dll/cpl/sysdm/lang/sq-AL.rc | 40 +- dll/cpl/sysdm/lang/sv-SE.rc | 40 +- dll/cpl/sysdm/lang/tr-TR.rc | 40 +- dll/cpl/sysdm/lang/uk-UA.rc | 40 +- dll/cpl/sysdm/lang/zh-CN.rc | 40 +- dll/cpl/sysdm/lang/zh-TW.rc | 40 +- dll/cpl/sysdm/resource.h | 21 +- 29 files changed, 1808 insertions(+), 299 deletions(-) diff --git a/dll/cpl/sysdm/CMakeLists.txt b/dll/cpl/sysdm/CMakeLists.txt index 4643a4523b5..6ee05f2fa05 100644 --- a/dll/cpl/sysdm/CMakeLists.txt +++ b/dll/cpl/sysdm/CMakeLists.txt @@ -28,6 +28,6 @@ add_library(sysdm MODULE set_module_type(sysdm cpl UNICODE) target_link_libraries(sysdm udmihelp) -add_importlibs(sysdm advapi32 setupapi user32 gdi32 comctl32 msimg32 shell32 shlwapi ole32 powrprof msvcrt kernel32 ntdll) +add_importlibs(sysdm advapi32 setupapi user32 gdi32 comctl32 comdlg32 msimg32 shell32 shlwapi ole32 powrprof msvcrt kernel32 ntdll) add_pch(sysdm precomp.h SOURCE) add_cd_file(TARGET sysdm DESTINATION reactos/system32 FOR all) diff --git a/dll/cpl/sysdm/environment.c b/dll/cpl/sysdm/environment.c index 2d6ecf9a179..b10aa2b4959 100644 --- a/dll/cpl/sysdm/environment.c +++ b/dll/cpl/sysdm/environment.c @@ -4,10 +4,16 @@ * FILE: dll/cpl/sysdm/environment.c * PURPOSE: Environment variable settings * COPYRIGHT: Copyright Eric Kohl - * + * Copyright 2021 Arnav Bhatt <arnavbhatt288(a)gmail.com> */ #include "precomp.h" +#include <commctrl.h> +#include <commdlg.h> +#include <string.h> +#include <strsafe.h> + +#define MAX_STR_LENGTH 128 typedef struct _VARIABLE_DATA { @@ -17,6 +23,146 @@ typedef struct _VARIABLE_DATA LPTSTR lpCookedValue; } VARIABLE_DATA, *PVARIABLE_DATA; +typedef struct _ENVIRONMENT_EDIT_DIALOG_DATA +{ + BOOL bIsItemSelected; + DWORD dwSelectedValueIndex; + DWORD cxMin; + DWORD cyMin; + DWORD cxOld; + DWORD cyOld; + DWORD dwDlgID; + HWND hEditBox; + PVARIABLE_DATA VarData; +} EDIT_DIALOG_DATA, *PEDIT_DIALOG_DATA; + +static BOOL +DetermineDialogBoxType(LPTSTR lpRawValue) +{ + DWORD dwValueLength; + LPTSTR lpTemp; + LPTSTR lpToken; + + dwValueLength = _tcslen(lpRawValue) + 1; + lpTemp = GlobalAlloc(GPTR, dwValueLength * sizeof(TCHAR)); + if (!lpTemp) + return FALSE; + + StringCchCopy(lpTemp, dwValueLength, lpRawValue); + + for (lpToken = _tcstok(lpTemp, _T(";")); + lpToken != NULL; + lpToken = _tcstok(NULL, _T(";"))) + { + /* If the string has environment variable then expand it */ + ExpandEnvironmentStrings(lpToken, lpToken, dwValueLength); + + if (!PathIsDirectoryW(lpToken)) + return FALSE; + } + GlobalFree(lpTemp); + + return TRUE; +} + +static DWORD +GatherDataFromEditBox(HWND hwndDlg, + PVARIABLE_DATA VarData) +{ + DWORD dwNameLength; + DWORD dwValueLength; + + dwNameLength = SendDlgItemMessage(hwndDlg, IDC_VARIABLE_NAME, WM_GETTEXTLENGTH, 0, 0); + dwValueLength = SendDlgItemMessage(hwndDlg, IDC_VARIABLE_VALUE, WM_GETTEXTLENGTH, 0, 0); + + if (dwNameLength == 0 || dwValueLength == 0) + { + return 0; + } + + /* Reallocate the name buffer, regrowing it if necessary */ + if (!VarData->lpName || (_tcslen(VarData->lpName) < dwNameLength)) + { + if (VarData->lpName) + GlobalFree(VarData->lpName); + + VarData->lpName = GlobalAlloc(GPTR, (dwNameLength + 1) * sizeof(TCHAR)); + if (!VarData->lpName) + return 0; + } + SendDlgItemMessage(hwndDlg, IDC_VARIABLE_NAME, WM_GETTEXT, dwNameLength + 1, (LPARAM)VarData->lpName); + + /* Reallocate the value buffer, regrowing it if necessary */ + if (!VarData->lpRawValue || (_tcslen(VarData->lpRawValue) < dwValueLength)) + { + if (VarData->lpRawValue) + GlobalFree(VarData->lpRawValue); + + VarData->lpRawValue = GlobalAlloc(GPTR, (dwValueLength + 1) * sizeof(TCHAR)); + if (!VarData->lpRawValue) + return 0; + } + SendDlgItemMessage(hwndDlg, IDC_VARIABLE_VALUE, WM_GETTEXT, dwValueLength + 1, (LPARAM)VarData->lpRawValue); + + return dwValueLength; +} + +static DWORD +GatherDataFromListView(HWND hwndListView, + PVARIABLE_DATA VarData) +{ + DWORD dwValueLength; + DWORD NumberOfItems; + DWORD i; + TCHAR szData[MAX_PATH]; + + /* Gather the number of items for the semi-colon */ + NumberOfItems = ListView_GetItemCount(hwndListView); + if (NumberOfItems == 0) + { + return 0; + } + + /* Since the last item doesn't need the semi-colon subtract 1 */ + dwValueLength = NumberOfItems - 1; + + for (i = 0; i < NumberOfItems; i++) + { + ListView_GetItemText(hwndListView, + i, + 0, + szData, + _countof(szData)); + dwValueLength += _tcslen(szData); + } + + /* Reallocate the value buffer, regrowing it if necessary */ + if (!VarData->lpRawValue || (_tcslen(VarData->lpRawValue) < dwValueLength)) + { + if (VarData->lpRawValue) + GlobalFree(VarData->lpRawValue); + + VarData->lpRawValue = GlobalAlloc(GPTR, (dwValueLength + 1) * sizeof(TCHAR)); + if (!VarData->lpRawValue) + return 0; + } + + /* Copy the variable values while seperating them with a semi-colon except for the last value */ + for (i = 0; i < NumberOfItems; i++) + { + if (i > 0) + { + StringCchCat(VarData->lpRawValue, dwValueLength + 1, _T(";")); + } + ListView_GetItemText(hwndListView, + i, + 0, + szData, + _countof(szData)); + StringCchCat(VarData->lpRawValue, dwValueLength + 1, szData); + } + return dwValueLength; +} static INT GetSelectedListViewItem(HWND hwndListView) @@ -45,6 +191,566 @@ GetSelectedListViewItem(HWND hwndListView) return -1; } +static LRESULT CALLBACK +ListViewSubclassProc(HWND hListBox, + UINT uMsg, + WPARAM wParam, + LPARAM lParam, + UINT_PTR uIdSubclass, + DWORD_PTR dwRefData) +{ + switch (uMsg) + { + case WM_DESTROY: + { + RemoveWindowSubclass(hListBox, ListViewSubclassProc, uIdSubclass); + break; + } + + /* Whenever the control is resized make sure it doesn't spawn the horizontal scrollbar */ + case WM_SIZE: + { + ShowScrollBar(hListBox, SB_HORZ, FALSE); + break; + } + } + + return DefSubclassProc(hListBox, uMsg, wParam, lParam); +} + +static VOID +AddEmptyItem(HWND hwndListView, + DWORD dwSelectedValueIndex) +{ + LV_ITEM lvi; + + ZeroMemory(&lvi, sizeof(lvi)); + lvi.mask = LVIF_TEXT | LVIF_STATE; + lvi.cchTextMax = MAX_PATH; + lvi.pszText = _T(""); + lvi.iItem = dwSelectedValueIndex; + lvi.iSubItem = 0; + ListView_InsertItem(hwndListView, &lvi); +} + +static VOID +AddValuesToList(HWND hwndDlg, + PEDIT_DIALOG_DATA DlgData) +{ + LV_COLUMN column; + LV_ITEM lvi; + RECT rItem; + + DWORD dwValueLength; + DWORD i; + HWND hwndListView; + LPTSTR lpTemp; + LPTSTR lpToken; + + ZeroMemory(&column, sizeof(column)); + ZeroMemory(&lvi, sizeof(lvi)); + + hwndListView = GetDlgItem(hwndDlg, IDC_LIST_VARIABLE_VALUE); + + GetClientRect(hwndListView, &rItem); + + column.mask = LVCF_WIDTH; + column.cx = rItem.right; + ListView_InsertColumn(hwndListView, 0, &column); + ShowScrollBar(hwndListView, SB_HORZ, FALSE); + + lvi.mask = LVIF_TEXT | LVIF_STATE; + lvi.cchTextMax = MAX_PATH; + lvi.iSubItem = 0; + + dwValueLength = _tcslen(DlgData->VarData->lpRawValue) + 1; + lpTemp = GlobalAlloc(GPTR, dwValueLength * sizeof(TCHAR)); + if (!lpTemp) + return; + + StringCchCopy(lpTemp, dwValueLength, DlgData->VarData->lpRawValue); + + for (lpToken = _tcstok(lpTemp, _T(";")), i = 0; + lpToken != NULL; + lpToken = _tcstok(NULL, _T(";")), i++) + { + lvi.iItem = i; + lvi.pszText = lpToken; + lvi.state = (i == 0) ? LVIS_SELECTED : 0; + ListView_InsertItem(hwndListView, &lvi); + } + + DlgData->dwSelectedValueIndex = 0; + ListView_SetExtendedListViewStyle(hwndListView, LVS_EX_GRIDLINES | LVS_EX_FULLROWSELECT); + ListView_SetItemState(hwndListView, DlgData->dwSelectedValueIndex, + LVIS_FOCUSED | LVIS_SELECTED, + LVIS_FOCUSED | LVIS_SELECTED); + + ListView_Update(hwndListView, DlgData->dwSelectedValueIndex); + GlobalFree(lpTemp); +} + +static VOID +BrowseRequiredFile(HWND hwndDlg) +{ + OPENFILENAME ofn; + TCHAR szFile[MAX_PATH] = _T(""); + + ZeroMemory(&ofn, sizeof(ofn)); + + ofn.lStructSize = sizeof(ofn); + ofn.hwndOwner = hwndDlg; + ofn.lpstrFilter = _T("All Files (*.*)\0*.*\0"); + ofn.lpstrFile = szFile; + ofn.nMaxFile = _countof(szFile); + ofn.Flags = OFN_EXPLORER | OFN_FILEMUSTEXIST | OFN_HIDEREADONLY; + + if (GetOpenFileName(&ofn)) + { + SetDlgItemText(hwndDlg, IDC_VARIABLE_VALUE, szFile); + } +} + +static VOID +BrowseRequiredFolder(HWND hwndDlg, + PEDIT_DIALOG_DATA DlgData) +{ + HWND hwndListView; + TCHAR szDir[MAX_PATH]; + + BROWSEINFO bi; + LPITEMIDLIST pidllist; + + ZeroMemory(&bi, sizeof(bi)); + bi.hwndOwner = hwndDlg; + bi.ulFlags = BIF_NEWDIALOGSTYLE; + + hwndListView = GetDlgItem(hwndDlg, IDC_LIST_VARIABLE_VALUE); + + pidllist = SHBrowseForFolder(&bi); + if (!pidllist) + { + return; + } + + if (SHGetPathFromIDList(pidllist, szDir)) + { + if (DlgData->dwDlgID == IDD_EDIT_VARIABLE_FANCY) + { + /* If no item is selected then create a new empty item and add the required location to it */ + if (!DlgData->bIsItemSelected) + { + DlgData->dwSelectedValueIndex = ListView_GetItemCount(hwndListView); + AddEmptyItem(hwndListView, DlgData->dwSelectedValueIndex); + } + ListView_SetItemText(hwndListView, + DlgData->dwSelectedValueIndex, + 0, + szDir); + ListView_SetItemState(hwndListView, DlgData->dwSelectedValueIndex, + LVIS_FOCUSED | LVIS_SELECTED, + LVIS_FOCUSED | LVIS_SELECTED); + } + else + { + SetDlgItemText(hwndDlg, IDC_VARIABLE_VALUE, szDir); + } + } + + CoTaskMemFree(pidllist); +} + +static VOID +MoveListItem(HWND hwndDlg, + PEDIT_DIALOG_DATA DlgData, + BOOL bMoveUp) +{ + TCHAR szDest[MAX_PATH]; + TCHAR szSource[MAX_PATH]; + HWND hwndListView; + DWORD dwSrcIndex, dwDestIndex, dwLastIndex; + + hwndListView = GetDlgItem(hwndDlg, IDC_LIST_VARIABLE_VALUE); + + dwLastIndex = ListView_GetItemCount(hwndListView) - 1; + dwSrcIndex = DlgData->dwSelectedValueIndex; + dwDestIndex = bMoveUp ? (dwSrcIndex - 1) : (dwSrcIndex + 1); + + if ((bMoveUp && dwSrcIndex > 0) || (!bMoveUp && dwSrcIndex < dwLastIndex)) + { + ListView_GetItemText(hwndListView, + dwSrcIndex, + 0, + szDest, + _countof(szDest)); + ListView_GetItemText(hwndListView, + dwDestIndex, + 0, + szSource, + _countof(szSource)); + + ListView_SetItemText(hwndListView, + dwDestIndex, + 0, + szDest); + ListView_SetItemText(hwndListView, + dwSrcIndex, + 0, + szSource); + + DlgData->dwSelectedValueIndex = dwDestIndex; + ListView_SetItemState(hwndListView, DlgData->dwSelectedValueIndex, + LVIS_FOCUSED | LVIS_SELECTED, + LVIS_FOCUSED | LVIS_SELECTED); + } +} + +static VOID +OnEnvironmentEditDlgResize(HWND hwndDlg, + PEDIT_DIALOG_DATA DlgData, + DWORD cx, + DWORD cy) +{ + RECT rect; + HDWP hdwp = NULL; + HWND hItemWnd; + + if ((cx == DlgData->cxOld) && (cy == DlgData->cyOld)) + return; + + if (DlgData->dwDlgID == IDD_EDIT_VARIABLE) + { + hdwp = BeginDeferWindowPos(5); + + /* For edit control */ + hItemWnd = GetDlgItem(hwndDlg, IDC_VARIABLE_NAME); + GetWindowRect(hItemWnd, &rect); + MapWindowPoints(HWND_DESKTOP, hwndDlg, (LPPOINT)&rect, sizeof(RECT)/sizeof(POINT)); + + if (hdwp) + { + hdwp = DeferWindowPos(hdwp, + hItemWnd, + 0, + rect.left, rect.top, + (rect.right - rect.left) + (cx - DlgData->cxOld), + rect.bottom - rect.top, + SWP_NOZORDER | SWP_NOACTIVATE); + } + + hItemWnd = GetDlgItem(hwndDlg, IDC_VARIABLE_VALUE); + GetWindowRect(hItemWnd, &rect); + MapWindowPoints(HWND_DESKTOP, hwndDlg, (LPPOINT)&rect, sizeof(RECT)/sizeof(POINT)); + + if (hdwp) + { + hdwp = DeferWindowPos(hdwp, + hItemWnd, + 0, + rect.left, rect.top, + (rect.right - rect.left) + (cx - DlgData->cxOld), + rect.bottom - rect.top, + SWP_NOZORDER | SWP_NOACTIVATE); + } + } + else if (DlgData->dwDlgID == IDD_EDIT_VARIABLE_FANCY) + { + hdwp = BeginDeferWindowPos(11); + + /* For list view control */ + hItemWnd = GetDlgItem(hwndDlg, IDC_LIST_VARIABLE_VALUE); + GetWindowRect(hItemWnd, &rect); + MapWindowPoints(HWND_DESKTOP, hwndDlg, (LPPOINT)&rect, sizeof(RECT)/sizeof(POINT)); + + if (hdwp) + { + hdwp = DeferWindowPos(hdwp, + hItemWnd, + 0, + rect.left, rect.top, + (rect.right - rect.left) + (cx - DlgData->cxOld), + (rect.bottom - rect.top) + (cy - DlgData->cyOld), + SWP_NOZORDER | SWP_NOACTIVATE); + ListView_SetColumnWidth(hItemWnd, 0, (rect.right - rect.left) + (cx - DlgData->cxOld)); + } + + /* For buttons */ + hItemWnd = GetDlgItem(hwndDlg, IDC_BUTTON_BROWSE_FOLDER); + GetWindowRect(hItemWnd, &rect); + MapWindowPoints(HWND_DESKTOP, hwndDlg, (LPPOINT)&rect, sizeof(RECT)/sizeof(POINT)); + + if (hdwp) + { + hdwp = DeferWindowPos(hdwp, + hItemWnd, + 0, + rect.left + (cx - DlgData->cxOld), + rect.top, + 0, 0, + SWP_NOSIZE | SWP_NOZORDER | SWP_NOACTIVATE); + } + + hItemWnd = GetDlgItem(hwndDlg, IDC_BUTTON_NEW); + GetWindowRect(hItemWnd, &rect); + MapWindowPoints(HWND_DESKTOP, hwndDlg, (LPPOINT)&rect, sizeof(RECT)/sizeof(POINT)); + + if (hdwp) + { + hdwp = DeferWindowPos(hdwp, + hItemWnd, + 0, + rect.left + (cx - DlgData->cxOld), + rect.top, + 0, 0, + SWP_NOSIZE | SWP_NOZORDER | SWP_NOACTIVATE); + } + + hItemWnd = GetDlgItem(hwndDlg, IDC_BUTTON_EDIT); + GetWindowRect(hItemWnd, &rect); + MapWindowPoints(HWND_DESKTOP, hwndDlg, (LPPOINT)&rect, sizeof(RECT)/sizeof(POINT)); + + if (hdwp) + { + hdwp = DeferWindowPos(hdwp, + hItemWnd, + 0, + rect.left + (cx - DlgData->cxOld), + rect.top, + 0, 0, + SWP_NOSIZE | SWP_NOZORDER | SWP_NOACTIVATE); + } + + hItemWnd = GetDlgItem(hwndDlg, IDC_BUTTON_DELETE); + GetWindowRect(hItemWnd, &rect); + MapWindowPoints(HWND_DESKTOP, hwndDlg, (LPPOINT)&rect, sizeof(RECT)/sizeof(POINT)); + + if (hdwp) + { + hdwp = DeferWindowPos(hdwp, + hItemWnd, + 0, + rect.left + (cx - DlgData->cxOld), + rect.top, + 0, 0, + SWP_NOSIZE | SWP_NOZORDER | SWP_NOACTIVATE); + } + + hItemWnd = GetDlgItem(hwndDlg, IDC_BUTTON_MOVE_UP); + GetWindowRect(hItemWnd, &rect); + MapWindowPoints(HWND_DESKTOP, hwndDlg, (LPPOINT)&rect, sizeof(RECT)/sizeof(POINT)); + + if (hdwp) + { + hdwp = DeferWindowPos(hdwp, + hItemWnd, + 0, + rect.left + (cx - DlgData->cxOld), + rect.top, + 0, 0, + SWP_NOSIZE | SWP_NOZORDER | SWP_NOACTIVATE); + } + + hItemWnd = GetDlgItem(hwndDlg, IDC_BUTTON_MOVE_DOWN); + GetWindowRect(hItemWnd, &rect); + MapWindowPoints(HWND_DESKTOP, hwndDlg, (LPPOINT)&rect, sizeof(RECT)/sizeof(POINT)); + + if (hdwp) + { + hdwp = DeferWindowPos(hdwp, + hItemWnd, + 0, + rect.left + (cx - DlgData->cxOld), + rect.top, + 0, 0, + SWP_NOSIZE | SWP_NOZORDER | SWP_NOACTIVATE); + } + + hItemWnd = GetDlgItem(hwndDlg, IDC_BUTTON_EDIT_TEXT); + GetWindowRect(hItemWnd, &rect); + MapWindowPoints(HWND_DESKTOP, hwndDlg, (LPPOINT)&rect, sizeof(RECT)/sizeof(POINT)); + + if (hdwp) + { + hdwp = DeferWindowPos(hdwp, + hItemWnd, + 0, + rect.left + (cx - DlgData->cxOld), + rect.top, + 0, 0, + SWP_NOSIZE | SWP_NOZORDER | SWP_NOACTIVATE); + } + } + + hItemWnd = GetDlgItem(hwndDlg, IDOK); + GetWindowRect(hItemWnd, &rect); + MapWindowPoints(HWND_DESKTOP, hwndDlg, (LPPOINT)&rect, sizeof(RECT)/sizeof(POINT)); + + if (hdwp) + { + hdwp = DeferWindowPos(hdwp, + hItemWnd, + 0, + rect.left + (cx - DlgData->cxOld), + rect.top + (cy - DlgData->cyOld), + 0, 0, + SWP_NOSIZE | SWP_NOZORDER | SWP_NOACTIVATE); + } + + hItemWnd = GetDlgItem(hwndDlg, IDCANCEL); + GetWindowRect(hItemWnd, &rect); + MapWindowPoints(HWND_DESKTOP, hwndDlg, (LPPOINT)&rect, sizeof(RECT)/sizeof(POINT)); + + if (hdwp) + { + hdwp = DeferWindowPos(hdwp, + hItemWnd, + 0, + rect.left + (cx - DlgData->cxOld), + rect.top + (cy - DlgData->cyOld), + 0, 0, + SWP_NOSIZE | SWP_NOZORDER | SWP_NOACTIVATE); + } + + /* For the size grip */ + hItemWnd = GetDlgItem(hwndDlg, IDC_DIALOG_GRIP); + GetWindowRect(hItemWnd, &rect); + MapWindowPoints(HWND_DESKTOP, hwndDlg, (LPPOINT)&rect, sizeof(RECT)/sizeof(POINT)); + + if (hdwp) + { + hdwp = DeferWindowPos(hdwp, + hItemWnd, + 0, + rect.left + (cx - DlgData->cxOld), + rect.top + (cy - DlgData->cyOld), + 0, 0, + SWP_NOSIZE | SWP_NOZORDER | SWP_NOACTIVATE); + } + + if (hdwp) + { + EndDeferWindowPos(hdwp); + } + + DlgData->cxOld = cx; + DlgData->cyOld = cy; +} + +static BOOL +OnBeginLabelEdit(NMLVDISPINFO* pnmv) +{ + HWND hwndEdit; + + hwndEdit = ListView_GetEditControl(pnmv->hdr.hwndFrom); + if (hwndEdit == NULL) + { + return TRUE; + } + + SendMessage(hwndEdit, EM_SETLIMITTEXT, MAX_PATH - 1, 0); + + return FALSE; +} + +static BOOL +OnEndLabelEdit(NMLVDISPINFO* pnmv) +{ + HWND hwndEdit; + TCHAR szOldDir[MAX_PATH]; + TCHAR szNewDir[MAX_PATH]; + + hwndEdit = ListView_GetEditControl(pnmv->hdr.hwndFrom); + if (hwndEdit == NULL) + { + return TRUE; + } + + /* Leave, if there is no valid listview item */ + if (pnmv->item.iItem == -1) + { + return FALSE; + } + + ListView_GetItemText(pnmv->hdr.hwndFrom, + pnmv->item.iItem, 0, + szOldDir, + _countof(szOldDir)); + + SendMessage(hwndEdit, WM_GETTEXT, _countof(szNewDir), (LPARAM)szNewDir); + + /* If there is nothing in the text box then remove the item */ + if (_tcslen(szNewDir) == 0) + { + ListView_DeleteItem(pnmv->hdr.hwndFrom, pnmv->item.iItem); + ListView_SetItemState(pnmv->hdr.hwndFrom, pnmv->item.iItem - 1, + LVIS_FOCUSED | LVIS_SELECTED, + LVIS_FOCUSED | LVIS_SELECTED); + return FALSE; + } + + /* If nothing has been changed then just bail out */ + if (_tcscmp(szOldDir, szNewDir) == 0) + { + return FALSE; + } + + ListView_SetItemText(pnmv->hdr.hwndFrom, + pnmv->item.iItem, 0, + szNewDir); + + return TRUE; +} + +static BOOL +OnNotifyEditVariableDlg(HWND hwndDlg, PEDIT_DIALOG_DATA DlgData, NMHDR *phdr) +{ + LPNMLISTVIEW lpnmlv = (LPNMLISTVIEW)phdr; + + switch (phdr->idFrom) + { + case IDC_LIST_VARIABLE_VALUE: + switch(phdr->code) + { + case NM_CLICK: + { + /* Detect if an item is selected */ + DlgData->bIsItemSelected = (lpnmlv->iItem != -1); + if (lpnmlv->iItem != -1) + { + DlgData->dwSelectedValueIndex = lpnmlv->iItem; + } + break; + } + + case NM_DBLCLK: + { + /* Either simulate IDC_BUTTON_NEW or edit an item depending upon the condition */ + if (lpnmlv->iItem == -1) + { + SendMessage(GetDlgItem(hwndDlg, IDC_BUTTON_NEW), BM_CLICK, 0, 0); + } + else + { + ListView_EditLabel(GetDlgItem(hwndDlg, IDC_LIST_VARIABLE_VALUE), DlgData->dwSelectedValueIndex); + } + break; + } + + case LVN_BEGINLABELEDIT: + { + return OnBeginLabelEdit((NMLVDISPINFO*)phdr); + } + + case LVN_ENDLABELEDIT: + { + return OnEndLabelEdit((NMLVDISPINFO*)phdr); + } + } + break; + } + + return FALSE; +} static INT_PTR CALLBACK EditVariableDlgProc(HWND hwndDlg, @@ -52,90 +758,219 @@ EditVariableDlgProc(HWND hwndDlg, WPARAM wParam, LPARAM lParam) { - PVARIABLE_DATA VarData; - DWORD dwNameLength; - DWORD dwValueLength; - - VarData = (PVARIABLE_DATA)GetWindowLongPtr(hwndDlg, GWLP_USERDATA); + PEDIT_DIALOG_DATA DlgData; + HWND hwndListView; + DlgData = (PEDIT_DIALOG_DATA)GetWindowLongPtr(hwndDlg, GWLP_USERDATA); + hwndListView = GetDlgItem(hwndDlg, IDC_LIST_VARIABLE_VALUE); switch (uMsg) { case WM_INITDIALOG: + { + RECT rect; + SetWindowLongPtr(hwndDlg, GWLP_USERDATA, (LONG_PTR)lParam); - VarData = (PVARIABLE_DATA)lParam; + DlgData = (PEDIT_DIALOG_DATA)lParam; - if (VarData->lpName != NULL) + GetClientRect(hwndDlg, &rect); + DlgData->cxOld = rect.right - rect.left; + DlgData->cyOld = rect.bottom - rect.top; + + GetWindowRect(hwndDlg, &rect); + DlgData->cxMin = rect.right - rect.left; + DlgData->cyMin = rect.bottom - rect.top; + + /* Either get the values from list box or from edit box */ + if (DlgData->dwDlgID == IDD_EDIT_VARIABLE_FANCY) { - SendDlgItemMessage(hwndDlg, IDC_VARIABLE_NAME, WM_SETTEXT, 0, (LPARAM)VarData->lpName); - } + /* Subclass the listview control first */ + SetWindowSubclass(hwndListView, ListViewSubclassProc, 1, 0); - if (VarData->lpRawValue != NULL) + if (DlgData->VarData->lpRawValue != NULL) + { + AddValuesToList(hwndDlg, DlgData); + } + } + else { - SendDlgItemMessage(hwndDlg, IDC_VARIABLE_VALUE, WM_SETTEXT, 0, (LPARAM)VarData->lpRawValue); + if (DlgData->VarData->lpName != NULL) + { + SendDlgItemMessage(hwndDlg, IDC_VARIABLE_NAME, WM_SETTEXT, 0, (LPARAM)DlgData->VarData->lpName); + } + + if (DlgData->VarData->lpRawValue != NULL) + { + SendDlgItemMessage(hwndDlg, IDC_VARIABLE_VALUE, WM_SETTEXT, 0, (LPARAM)DlgData->VarData->lpRawValue); + } } break; + } + + case WM_SIZE: + { + OnEnvironmentEditDlgResize(hwndDlg, DlgData, LOWORD(lParam), HIWORD(lParam)); + break; + } + + case WM_SIZING: + { + LPRECT pRect = (LPRECT)lParam; + + if (pRect->right - pRect->left < DlgData->cxMin) + pRect->right = pRect->left + DlgData->cxMin; + + if (pRect->bottom - pRect->top < DlgData->cyMin) + pRect->bottom = pRect->top + DlgData->cyMin; + + /* Make sure the normal variable edit dialog doesn't change its width */ + if (DlgData->dwDlgID == IDD_EDIT_VARIABLE) + { + if (pRect->bottom - pRect->top > DlgData->cyMin) + pRect->bottom = pRect->top + DlgData->cyMin; + } + + return TRUE; + } + + case WM_NOTIFY: + { + return OnNotifyEditVariableDlg(hwndDlg, DlgData, (NMHDR*)lParam); + } case WM_COMMAND: switch (LOWORD(wParam)) { case IDOK: - dwNameLength = (DWORD)SendDlgItemMessage(hwndDlg, IDC_VARIABLE_NAME, WM_GETTEXTLENGTH, 0, 0); - dwValueLength = (DWORD)SendDlgItemMessage(hwndDlg, IDC_VARIABLE_VALUE, WM_GETTEXTLENGTH, 0, 0); - if (dwNameLength > 0 && dwValueLength > 0) + { + LPTSTR p; + DWORD dwValueLength; + + /* Either set the values to the list box or to the edit box */ + if (DlgData->dwDlgID == IDD_EDIT_VARIABLE_FANCY) + { + dwValueLength = GatherDataFromListView(hwndListView, DlgData->VarData); + } + else + { + dwValueLength = GatherDataFromEditBox(hwndDlg, DlgData->VarData); + } + + if (dwValueLength == 0) { - LPTSTR p; - - if (VarData->lpName == NULL) - { - VarData->lpName = GlobalAlloc(GPTR, (dwNameLength + 1) * sizeof(TCHAR)); - } - else if (_tcslen(VarData->lpName) < dwNameLength) - { - GlobalFree(VarData->lpName); - VarData->lpName = GlobalAlloc(GPTR, (dwNameLength + 1) * sizeof(TCHAR)); - } - SendDlgItemMessage(hwndDlg, IDC_VARIABLE_NAME, WM_GETTEXT, dwNameLength + 1, (LPARAM)VarData->lpName); - - if (VarData->lpRawValue == NULL) - { - VarData->lpRawValue = GlobalAlloc(GPTR, (dwValueLength + 1) * sizeof(TCHAR)); - } - else if (_tcslen(VarData->lpRawValue) < dwValueLength) - { - GlobalFree(VarData->lpRawValue); - VarData->lpRawValue = GlobalAlloc(GPTR, (dwValueLength + 1) * sizeof(TCHAR)); - } - SendDlgItemMessage(hwndDlg, IDC_VARIABLE_VALUE, WM_GETTEXT, dwValueLength + 1, (LPARAM)VarData->lpRawValue); - - if (VarData->lpCookedValue != NULL) - { - GlobalFree(VarData->lpCookedValue); - VarData->lpCookedValue = NULL; - } - - p = _tcschr(VarData->lpRawValue, _T('%')); - if (p && _tcschr(++p, _T('%'))) - { - VarData->dwType = REG_EXPAND_SZ; - VarData->lpCookedValue = GlobalAlloc(GPTR, 2 * MAX_PATH * sizeof(TCHAR)); - - ExpandEnvironmentStrings(VarData->lpRawValue, - VarData->lpCookedValue, - 2 * MAX_PATH); - } - else - { - VarData->dwType = REG_SZ; - VarData->lpCookedValue = GlobalAlloc(GPTR, (dwValueLength + 1) * sizeof(TCHAR)); - _tcscpy(VarData->lpCookedValue, VarData->lpRawValue); - } + break; + } + + if (DlgData->VarData->lpCookedValue != NULL) + { + GlobalFree(DlgData->VarData->lpCookedValue); + DlgData->VarData->lpCookedValue = NULL; + } + + p = _tcschr(DlgData->VarData->lpRawValue, _T('%')); + if (p && _tcschr(++p, _T('%'))) + { + DlgData->VarData->dwType = REG_EXPAND_SZ; + + DlgData->VarData->lpCookedValue = GlobalAlloc(GPTR, 2 * MAX_PATH * sizeof(TCHAR)); + if (!DlgData->VarData->lpCookedValue) + return FALSE; + + ExpandEnvironmentStrings(DlgData->VarData->lpRawValue, + DlgData->VarData->lpCookedValue, + 2 * MAX_PATH); + } + else + { + DlgData->VarData->dwType = REG_SZ; + + DlgData->VarData->lpCookedValue = GlobalAlloc(GPTR, (dwValueLength + 1) * sizeof(TCHAR)); + if (!DlgData->VarData->lpCookedValue) + return FALSE; + + _tcscpy(DlgData->VarData->lpCookedValue, DlgData->VarData->lpRawValue); } + EndDialog(hwndDlg, 1); return TRUE; + } case IDCANCEL: EndDialog(hwndDlg, 0); return TRUE; + + case IDC_BUTTON_BROWSE_FILE: + { + BrowseRequiredFile(hwndDlg); + break; + } + + case IDC_BUTTON_BROWSE_FOLDER: + { + BrowseRequiredFolder(hwndDlg, DlgData); + break; + } + + case IDC_BUTTON_DELETE: + { + DWORD dwLastIndex; + + dwLastIndex = ListView_GetItemCount(hwndListView) - 1; + ListView_DeleteItem(hwndListView, DlgData->dwSelectedValueIndex); + + if (dwLastIndex == DlgData->dwSelectedValueIndex) + { + DlgData->dwSelectedValueIndex--; + } + + ListView_SetItemState(hwndListView, DlgData->dwSelectedValueIndex, + LVIS_FOCUSED | LVIS_SELECTED, + LVIS_FOCUSED | LVIS_SELECTED); + break; + } + + case IDC_BUTTON_MOVE_UP: + { + MoveListItem(hwndDlg, DlgData, TRUE); + break; + } + + case IDC_BUTTON_MOVE_DOWN: + { + MoveListItem(hwndDlg, DlgData, FALSE); + break; + } + + case IDC_BUTTON_EDIT_TEXT: + { + TCHAR szStr[MAX_STR_LENGTH] = _T(""); + TCHAR szStr2[MAX_STR_LENGTH] = _T(""); + + LoadString(hApplet, IDS_ENVIRONMENT_WARNING, szStr, _countof(szStr)); + LoadString(hApplet, IDS_ENVIRONMENT_WARNING_TITLE, szStr2, _countof(szStr2)); + + if (MessageBox(hwndDlg, + szStr, + szStr2, + MB_OKCANCEL | MB_ICONWARNING | MB_DEFBUTTON1) == IDOK) + { + EndDialog(hwndDlg, -1); + } + break; + } + + case IDC_BUTTON_NEW: + { + DlgData->dwSelectedValueIndex = ListView_GetItemCount(hwndListView); + AddEmptyItem(hwndListView, DlgData->dwSelectedValueIndex); + ListView_EditLabel(hwndListView, DlgData->dwSelectedValueIndex); + break; + } + + case IDC_BUTTON_EDIT: + { + ListView_EditLabel(hwndListView, DlgData->dwSelectedValueIndex); + break; + } } break; } @@ -345,43 +1180,51 @@ OnNewVariable(HWND hwndDlg, INT iDlgItem) { HWND hwndListView; - PVARIABLE_DATA VarData; + PEDIT_DIALOG_DATA DlgData; LV_ITEM lvi; INT iItem; + DlgData = GlobalAlloc(GPTR, sizeof(EDIT_DIALOG_DATA)); + if (!DlgData) + return; + hwndListView = GetDlgItem(hwndDlg, iDlgItem); + DlgData->dwDlgID = IDD_EDIT_VARIABLE; + DlgData->dwSelectedValueIndex = -1; - VarData = GlobalAlloc(GPTR, sizeof(VARIABLE_DATA)); + DlgData->VarData = GlobalAlloc(GPTR, sizeof(VARIABLE_DATA)); + if (!DlgData->VarData) + return; if (DialogBoxParam(hApplet, - MAKEINTRESOURCE(IDD_EDIT_VARIABLE), + MAKEINTRESOURCE(DlgData->dwDlgID), hwndDlg, EditVariableDlgProc, - (LPARAM)VarData) <= 0) + (LPARAM)DlgData) <= 0) { - if (VarData->lpName != NULL) - GlobalFree(VarData->lpName); + if (DlgData->VarData->lpName != NULL) + GlobalFree(DlgData->VarData->lpName); - if (VarData->lpRawValue != NULL) - GlobalFree(VarData->lpRawValue); + if (DlgData->VarData->lpRawValue != NULL) + GlobalFree(DlgData->VarData->lpRawValue); - if (VarData->lpCookedValue != NULL) - GlobalFree(VarData->lpCookedValue); + if (DlgData->VarData->lpCookedValue != NULL) + GlobalFree(DlgData->VarData->lpCookedValue); - GlobalFree(VarData); + GlobalFree(DlgData); } else { - if (VarData->lpName != NULL && (VarData->lpCookedValue || VarData->lpRawValue)) + if (DlgData->VarData->lpName != NULL && (DlgData->VarData->lpCookedValue || DlgData->VarData->lpRawValue)) { - memset(&lvi, 0x00, sizeof(lvi)); + ZeroMemory(&lvi, sizeof(lvi)); lvi.mask = LVIF_TEXT | LVIF_STATE | LVIF_PARAM; - lvi.lParam = (LPARAM)VarData; - lvi.pszText = VarData->lpName; + lvi.lParam = (LPARAM)DlgData->VarData; + lvi.pszText = DlgData->VarData->lpName; lvi.state = 0; iItem = ListView_InsertItem(hwndListView, &lvi); - ListView_SetItemText(hwndListView, iItem, 1, VarData->lpCookedValue); + ListView_SetItemText(hwndListView, iItem, 1, DlgData->VarData->lpCookedValue); } } } @@ -392,33 +1235,60 @@ OnEditVariable(HWND hwndDlg, INT iDlgItem) { HWND hwndListView; - PVARIABLE_DATA VarData; + PEDIT_DIALOG_DATA DlgData; LV_ITEM lvi; INT iItem; + INT iRet; + DlgData = GlobalAlloc(GPTR, sizeof(EDIT_DIALOG_DATA)); + if (!DlgData) + return; + + DlgData->dwDlgID = IDD_EDIT_VARIABLE; + DlgData->dwSelectedValueIndex = -1; + hwndListView = GetDlgItem(hwndDlg, iDlgItem); iItem = GetSelectedListViewItem(hwndListView); if (iItem != -1) { - memset(&lvi, 0x00, sizeof(lvi)); + ZeroMemory(&lvi, sizeof(lvi)); lvi.mask = LVIF_PARAM; lvi.iItem = iItem; if (ListView_GetItem(hwndListView, &lvi)) { - VarData = (PVARIABLE_DATA)lvi.lParam; + DlgData->VarData = (PVARIABLE_DATA)lvi.lParam; - if (DialogBoxParam(hApplet, - MAKEINTRESOURCE(IDD_EDIT_VARIABLE), - hwndDlg, - EditVariableDlgProc, - (LPARAM)VarData) > 0) + /* If the value has multiple values and directories then edit value with fancy dialog box */ + if (DetermineDialogBoxType(DlgData->VarData->lpRawValue)) + DlgData->dwDlgID = IDD_EDIT_VARIABLE_FANCY; + + iRet = DialogBoxParam(hApplet, + MAKEINTRESOURCE(DlgData->dwDlgID), + hwndDlg, + EditVariableDlgProc, + (LPARAM)DlgData); + + /* If iRet is less than 0 edit the value and name normally */ + if (iRet < 0) { - ListView_SetItemText(hwndListView, iItem, 0, VarData->lpName); - ListView_SetItemText(hwndListView, iItem, 1, VarData->lpCookedValue); + DlgData->dwDlgID = IDD_EDIT_VARIABLE; + iRet = DialogBoxParam(hApplet, + MAKEINTRESOURCE(DlgData->dwDlgID), + hwndDlg, + EditVariableDlgProc, + (LPARAM)DlgData); + } + + if (iRet > 0) + { + ListView_SetItemText(hwndListView, iItem, 0, DlgData->VarData->lpName); + ListView_SetItemText(hwndListView, iItem, 1, DlgData->VarData->lpCookedValue); } } + + GlobalFree(DlgData); } } diff --git a/dll/cpl/sysdm/lang/bg-BG.rc b/dll/cpl/sysdm/lang/bg-BG.rc index c32102725a3..39d2ecbcdfe 100644 --- a/dll/cpl/sysdm/lang/bg-BG.rc +++ b/dll/cpl/sysdm/lang/bg-BG.rc @@ -278,17 +278,39 @@ BEGIN PUSHBUTTON "Отказ", IDCANCEL, 195, 224, 50, 14 END -IDD_EDIT_VARIABLE DIALOGEX 10, 15, 227, 71 -STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +IDD_EDIT_VARIABLE DIALOGEX 10, 15, 372, 71 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUPWINDOW | WS_CAPTION | WS_VISIBLE | WS_THICKFRAME +CAPTION "Обработка на променливата" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + SCROLLBAR IDC_DIALOG_GRIP, 365, 64, 7, 7, SBS_SIZEGRIP + LTEXT "&Име на променливата:", IDC_STATIC, 7, 14, 50, 8 + EDITTEXT IDC_VARIABLE_NAME, 75, 12, 289, 12, ES_AUTOHSCROLL + LTEXT "&Стойност на променливата:", IDC_STATIC, 7, 32, 50, 8 + EDITTEXT IDC_VARIABLE_VALUE, 75, 30, 289, 12, ES_AUTOHSCROLL + DEFPUSHBUTTON "Добре", IDOK, 260, 50, 50, 14 + PUSHBUTTON "Отказ", IDCANCEL, 314, 50, 50, 14 + PUSHBUTTON "Browse Directory...", IDC_BUTTON_BROWSE_FOLDER, 6, 50, 75, 14 + PUSHBUTTON "Browse Files...", IDC_BUTTON_BROWSE_FILE, 86, 50, 75, 14 +END + +IDD_EDIT_VARIABLE_FANCY DIALOGEX 10, 15, 300, 250 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUPWINDOW | WS_CAPTION | WS_VISIBLE | WS_THICKFRAME CAPTION "Обработка на променливата" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - LTEXT "&Име на променливата", IDC_STATIC, 7, 14, 68, 8 - EDITTEXT IDC_VARIABLE_NAME, 88, 12, 135, 12, ES_AUTOHSCROLL - LTEXT "&Стойност на променливата", IDC_STATIC, 7, 32, 68, 8 - EDITTEXT IDC_VARIABLE_VALUE, 88, 30, 135, 12, ES_AUTOHSCROLL - DEFPUSHBUTTON "Добре", IDOK, 116, 50, 50, 14 - PUSHBUTTON "Отказ", IDCANCEL, 170, 50, 50, 14 + SCROLLBAR IDC_DIALOG_GRIP, 293, 243, 7, 7, SBS_SIZEGRIP + CONTROL "", IDC_LIST_VARIABLE_VALUE, "SysListView32", LVS_NOCOLUMNHEADER | LVS_EDITLABELS | LVS_SHOWSELALWAYS | + LVS_SINGLESEL | LVS_REPORT | WS_BORDER | WS_TABSTOP, 10, 10, 224, 208, WS_EX_CLIENTEDGE + PUSHBUTTON "New", IDC_BUTTON_NEW, 242, 10, 50, 14 + PUSHBUTTON "Edit", IDC_BUTTON_EDIT, 242, 30, 50, 14 + PUSHBUTTON "Browse...", IDC_BUTTON_BROWSE_FOLDER, 242, 50, 50, 14 + PUSHBUTTON "Delete", IDC_BUTTON_DELETE, 242, 70, 50, 14 + PUSHBUTTON "Move Up", IDC_BUTTON_MOVE_UP, 242, 100, 50, 14 + PUSHBUTTON "Move Down", IDC_BUTTON_MOVE_DOWN, 242, 120, 50, 14 + PUSHBUTTON "Edit text...", IDC_BUTTON_EDIT_TEXT, 242, 150, 50, 14 + DEFPUSHBUTTON "Добре", IDOK, 188, 228, 50, 14 + PUSHBUTTON "Отказ", IDCANCEL, 242, 228, 50, 14 END IDD_LICENCE DIALOGEX 6, 5, 267, 159 @@ -344,4 +366,6 @@ BEGIN IDS_HWPROFILE_ALREADY_IN_USE "The profile name is already in use." IDS_HWPROFILE_PROFILE "Profile" IDS_HWPROFILE_WARNING "Warning" + IDS_ENVIRONMENT_WARNING "Any changes that have been done will be discarded and the variable's value will be edited as text." + IDS_ENVIRONMENT_WARNING_TITLE "System Properties" END diff --git a/dll/cpl/sysdm/lang/cs-CZ.rc b/dll/cpl/sysdm/lang/cs-CZ.rc index d16ee52ff83..4c119804071 100644 --- a/dll/cpl/sysdm/lang/cs-CZ.rc +++ b/dll/cpl/sysdm/lang/cs-CZ.rc @@ -283,17 +283,39 @@ BEGIN PUSHBUTTON "Storno", IDCANCEL, 195, 224, 50, 14 END -IDD_EDIT_VARIABLE DIALOGEX 10, 15, 227, 71 -STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +IDD_EDIT_VARIABLE DIALOGEX 10, 15, 372, 71 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUPWINDOW | WS_CAPTION | WS_VISIBLE | WS_THICKFRAME +CAPTION "Úpravy proměnných" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + SCROLLBAR IDC_DIALOG_GRIP, 365, 64, 7, 7, SBS_SIZEGRIP + LTEXT "&Název proměnné:", IDC_STATIC, 7, 14, 50, 8 + EDITTEXT IDC_VARIABLE_NAME, 75, 12, 289, 12, ES_AUTOHSCROLL + LTEXT "&Hodnota proměnné:", IDC_STATIC, 7, 32, 50, 8 + EDITTEXT IDC_VARIABLE_VALUE, 75, 30, 289, 12, ES_AUTOHSCROLL + DEFPUSHBUTTON "OK", IDOK, 260, 50, 50, 14 + PUSHBUTTON "Storno", IDCANCEL, 314, 50, 50, 14 + PUSHBUTTON "Browse Directory...", IDC_BUTTON_BROWSE_FOLDER, 6, 50, 75, 14 + PUSHBUTTON "Browse Files...", IDC_BUTTON_BROWSE_FILE, 86, 50, 75, 14 +END + +IDD_EDIT_VARIABLE_FANCY DIALOGEX 10, 15, 300, 250 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUPWINDOW | WS_CAPTION | WS_VISIBLE | WS_THICKFRAME CAPTION "Úpravy proměnných" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - LTEXT "&Název proměnné:", IDC_STATIC, 7, 14, 68, 8 - EDITTEXT IDC_VARIABLE_NAME, 75, 12, 145, 12, ES_AUTOHSCROLL - LTEXT "&Hodnota proměnné:", IDC_STATIC, 7, 32, 68, 8 - EDITTEXT IDC_VARIABLE_VALUE, 75, 30, 145, 12, ES_AUTOHSCROLL - DEFPUSHBUTTON "OK", IDOK, 116, 50, 50, 14 - PUSHBUTTON "Storno", IDCANCEL, 170, 50, 50, 14 + SCROLLBAR IDC_DIALOG_GRIP, 293, 243, 7, 7, SBS_SIZEGRIP + CONTROL "", IDC_LIST_VARIABLE_VALUE, "SysListView32", LVS_NOCOLUMNHEADER | LVS_EDITLABELS | LVS_SHOWSELALWAYS | + LVS_SINGLESEL | LVS_REPORT | WS_BORDER | WS_TABSTOP, 10, 10, 224, 208, WS_EX_CLIENTEDGE + PUSHBUTTON "New", IDC_BUTTON_NEW, 242, 10, 50, 14 + PUSHBUTTON "Edit", IDC_BUTTON_EDIT, 242, 30, 50, 14 + PUSHBUTTON "Browse...", IDC_BUTTON_BROWSE_FOLDER, 242, 50, 50, 14 + PUSHBUTTON "Delete", IDC_BUTTON_DELETE, 242, 70, 50, 14 + PUSHBUTTON "Move Up", IDC_BUTTON_MOVE_UP, 242, 100, 50, 14 + PUSHBUTTON "Move Down", IDC_BUTTON_MOVE_DOWN, 242, 120, 50, 14 + PUSHBUTTON "Edit text...", IDC_BUTTON_EDIT_TEXT, 242, 150, 50, 14 + DEFPUSHBUTTON "OK", IDOK, 188, 228, 50, 14 + PUSHBUTTON "Storno", IDCANCEL, 242, 228, 50, 14 END IDD_LICENCE DIALOGEX 6, 5, 267, 159 @@ -349,4 +371,6 @@ BEGIN IDS_HWPROFILE_ALREADY_IN_USE "Zadané jméno profilu se již používá." IDS_HWPROFILE_PROFILE "Profil" IDS_HWPROFILE_WARNING "Varování" + IDS_ENVIRONMENT_WARNING "Any changes that have been done will be discarded and the variable's value will be edited as text." + IDS_ENVIRONMENT_WARNING_TITLE "System Properties" END diff --git a/dll/cpl/sysdm/lang/da-DK.rc b/dll/cpl/sysdm/lang/da-DK.rc index 4ead9c8f275..bd3bf415d88 100644 --- a/dll/cpl/sysdm/lang/da-DK.rc +++ b/dll/cpl/sysdm/lang/da-DK.rc @@ -278,17 +278,39 @@ BEGIN PUSHBUTTON "Fortryd", IDCANCEL, 195, 224, 50, 14 END -IDD_EDIT_VARIABLE DIALOGEX 10, 15, 227, 71 -STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +IDD_EDIT_VARIABLE DIALOGEX 10, 15, 372, 71 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUPWINDOW | WS_CAPTION | WS_VISIBLE | WS_THICKFRAME +CAPTION "Redigere Variable" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + SCROLLBAR IDC_DIALOG_GRIP, 365, 64, 7, 7, SBS_SIZEGRIP + LTEXT "&Navn:", IDC_STATIC, 7, 14, 50, 8 + EDITTEXT IDC_VARIABLE_NAME, 75, 12, 289, 12, ES_AUTOHSCROLL + LTEXT "&Indhold:", IDC_STATIC, 7, 32, 50, 8 + EDITTEXT IDC_VARIABLE_VALUE, 75, 30, 289, 12, ES_AUTOHSCROLL + DEFPUSHBUTTON "OK", IDOK, 260, 50, 50, 14 + PUSHBUTTON "Fortryd", IDCANCEL, 314, 50, 50, 14 + PUSHBUTTON "Browse Directory...", IDC_BUTTON_BROWSE_FOLDER, 6, 50, 75, 14 + PUSHBUTTON "Browse Files...", IDC_BUTTON_BROWSE_FILE, 86, 50, 75, 14 +END + +IDD_EDIT_VARIABLE_FANCY DIALOGEX 10, 15, 300, 250 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUPWINDOW | WS_CAPTION | WS_VISIBLE | WS_THICKFRAME CAPTION "Redigere Variable" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - LTEXT "&Navn:", IDC_STATIC, 7, 14, 68, 8 - EDITTEXT IDC_VARIABLE_NAME, 75, 12, 145, 12, ES_AUTOHSCROLL - LTEXT "&Indhold:", IDC_STATIC, 7, 32, 68, 8 - EDITTEXT IDC_VARIABLE_VALUE, 75, 30, 145, 12, ES_AUTOHSCROLL - DEFPUSHBUTTON "OK", IDOK, 116, 50, 50, 14 - PUSHBUTTON "Fortryd", IDCANCEL, 170, 50, 50, 14 + SCROLLBAR IDC_DIALOG_GRIP, 293, 243, 7, 7, SBS_SIZEGRIP + CONTROL "", IDC_LIST_VARIABLE_VALUE, "SysListView32", LVS_NOCOLUMNHEADER | LVS_EDITLABELS | LVS_SHOWSELALWAYS | + LVS_SINGLESEL | LVS_REPORT | WS_BORDER | WS_TABSTOP, 10, 10, 224, 208, WS_EX_CLIENTEDGE + PUSHBUTTON "New", IDC_BUTTON_NEW, 242, 10, 50, 14 + PUSHBUTTON "Edit", IDC_BUTTON_EDIT, 242, 30, 50, 14 + PUSHBUTTON "Browse...", IDC_BUTTON_BROWSE_FOLDER, 242, 50, 50, 14 + PUSHBUTTON "Delete", IDC_BUTTON_DELETE, 242, 70, 50, 14 + PUSHBUTTON "Move Up", IDC_BUTTON_MOVE_UP, 242, 100, 50, 14 + PUSHBUTTON "Move Down", IDC_BUTTON_MOVE_DOWN, 242, 120, 50, 14 + PUSHBUTTON "Edit text...", IDC_BUTTON_EDIT_TEXT, 242, 150, 50, 14 + DEFPUSHBUTTON "OK", IDOK, 188, 228, 50, 14 + PUSHBUTTON "Fortryd", IDCANCEL, 242, 228, 50, 14 END IDD_LICENCE DIALOGEX 6, 5, 267, 159 @@ -344,4 +366,6 @@ BEGIN IDS_HWPROFILE_ALREADY_IN_USE "The profile name is already in use." IDS_HWPROFILE_PROFILE "Profile" IDS_HWPROFILE_WARNING "Warning" + IDS_ENVIRONMENT_WARNING "Any changes that have been done will be discarded and the variable's value will be edited as text." + IDS_ENVIRONMENT_WARNING_TITLE "System Properties" END diff --git a/dll/cpl/sysdm/lang/de-DE.rc b/dll/cpl/sysdm/lang/de-DE.rc index 345d19913e5..b8aff646b38 100644 --- a/dll/cpl/sysdm/lang/de-DE.rc +++ b/dll/cpl/sysdm/lang/de-DE.rc @@ -287,17 +287,39 @@ BEGIN PUSHBUTTON "Abbrechen", IDCANCEL, 195, 224, 50, 14 END -IDD_EDIT_VARIABLE DIALOGEX 10, 15, 227, 71 -STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +IDD_EDIT_VARIABLE DIALOGEX 10, 15, 372, 71 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUPWINDOW | WS_CAPTION | WS_VISIBLE | WS_THICKFRAME +CAPTION "Variable bearbeiten" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + SCROLLBAR IDC_DIALOG_GRIP, 365, 64, 7, 7, SBS_SIZEGRIP + LTEXT "Variablen-&Name:", IDC_STATIC, 7, 14, 50, 8 + EDITTEXT IDC_VARIABLE_NAME, 75, 12, 289, 12, ES_AUTOHSCROLL + LTEXT "Variablen-&Wert:", IDC_STATIC, 7, 32, 50, 8 + EDITTEXT IDC_VARIABLE_VALUE, 75, 30, 289, 12, ES_AUTOHSCROLL + DEFPUSHBUTTON "OK", IDOK, 260, 50, 50, 14 + PUSHBUTTON "Abbrechen", IDCANCEL, 314, 50, 50, 14 + PUSHBUTTON "Browse Directory...", IDC_BUTTON_BROWSE_FOLDER, 6, 50, 75, 14 + PUSHBUTTON "Browse Files...", IDC_BUTTON_BROWSE_FILE, 86, 50, 75, 14 +END + +IDD_EDIT_VARIABLE_FANCY DIALOGEX 10, 15, 300, 250 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUPWINDOW | WS_CAPTION | WS_VISIBLE | WS_THICKFRAME CAPTION "Variable bearbeiten" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - LTEXT "Variablen-&Name:", IDC_STATIC, 7, 14, 68, 8 - EDITTEXT IDC_VARIABLE_NAME, 75, 12, 145, 12, ES_AUTOHSCROLL - LTEXT "Variablen-&Wert:", IDC_STATIC, 7, 32, 68, 8 - EDITTEXT IDC_VARIABLE_VALUE, 75, 30, 145, 12, ES_AUTOHSCROLL - DEFPUSHBUTTON "OK", IDOK, 116, 50, 50, 14 - PUSHBUTTON "Abbrechen", IDCANCEL, 170, 50, 50, 14 + SCROLLBAR IDC_DIALOG_GRIP, 293, 243, 7, 7, SBS_SIZEGRIP + CONTROL "", IDC_LIST_VARIABLE_VALUE, "SysListView32", LVS_NOCOLUMNHEADER | LVS_EDITLABELS | LVS_SHOWSELALWAYS | + LVS_SINGLESEL | LVS_REPORT | WS_BORDER | WS_TABSTOP, 10, 10, 224, 208, WS_EX_CLIENTEDGE + PUSHBUTTON "New", IDC_BUTTON_NEW, 242, 10, 50, 14 + PUSHBUTTON "Edit", IDC_BUTTON_EDIT, 242, 30, 50, 14 + PUSHBUTTON "Browse...", IDC_BUTTON_BROWSE_FOLDER, 242, 50, 50, 14 + PUSHBUTTON "Delete", IDC_BUTTON_DELETE, 242, 70, 50, 14 + PUSHBUTTON "Move Up", IDC_BUTTON_MOVE_UP, 242, 100, 50, 14 + PUSHBUTTON "Move Down", IDC_BUTTON_MOVE_DOWN, 242, 120, 50, 14 + PUSHBUTTON "Edit text...", IDC_BUTTON_EDIT_TEXT, 242, 150, 50, 14 + DEFPUSHBUTTON "OK", IDOK, 188, 228, 50, 14 + PUSHBUTTON "Abbrechen", IDCANCEL, 242, 228, 50, 14 END IDD_LICENCE DIALOGEX 6, 5, 267, 159 @@ -353,4 +375,6 @@ BEGIN IDS_HWPROFILE_ALREADY_IN_USE "Der Profilname wird bereits verwendet." IDS_HWPROFILE_PROFILE "Profil" IDS_HWPROFILE_WARNING "Warnung" + IDS_ENVIRONMENT_WARNING "Any changes that have been done will be discarded and the variable's value will be edited as text." + IDS_ENVIRONMENT_WARNING_TITLE "System Properties" END diff --git a/dll/cpl/sysdm/lang/el-GR.rc b/dll/cpl/sysdm/lang/el-GR.rc index 59e550ba518..70d7896adce 100644 --- a/dll/cpl/sysdm/lang/el-GR.rc +++ b/dll/cpl/sysdm/lang/el-GR.rc @@ -278,17 +278,39 @@ BEGIN PUSHBUTTON "Άκυρο", IDCANCEL, 195, 224, 50, 14 END -IDD_EDIT_VARIABLE DIALOGEX 10, 15, 227, 71 -STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +IDD_EDIT_VARIABLE DIALOGEX 10, 15, 372, 71 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUPWINDOW | WS_CAPTION | WS_VISIBLE | WS_THICKFRAME +CAPTION "Επεξεργασία μεταβλητής" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + SCROLLBAR IDC_DIALOG_GRIP, 365, 64, 7, 7, SBS_SIZEGRIP + LTEXT "Όνομα μεταβλητής:", IDC_STATIC, 7, 14, 50, 8 + EDITTEXT IDC_VARIABLE_NAME, 75, 12, 289, 12, ES_AUTOHSCROLL + LTEXT "Τιμή μεταβλητής:", IDC_STATIC, 7, 32, 50, 8 + EDITTEXT IDC_VARIABLE_VALUE, 75, 30, 289, 12, ES_AUTOHSCROLL + DEFPUSHBUTTON "OK", IDOK, 260, 50, 50, 14 + PUSHBUTTON "Άκυρο", IDCANCEL, 314, 50, 50, 14 + PUSHBUTTON "Browse Directory...", IDC_BUTTON_BROWSE_FOLDER, 6, 50, 75, 14 + PUSHBUTTON "Browse Files...", IDC_BUTTON_BROWSE_FILE, 86, 50, 75, 14 +END + +IDD_EDIT_VARIABLE_FANCY DIALOGEX 10, 15, 300, 250 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUPWINDOW | WS_CAPTION | WS_VISIBLE | WS_THICKFRAME CAPTION "Επεξεργασία μεταβλητής" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - LTEXT "Όνομα μεταβλητής:", IDC_STATIC, 7, 14, 68, 8 - EDITTEXT IDC_VARIABLE_NAME, 75, 12, 145, 12, ES_AUTOHSCROLL - LTEXT "Τιμή μεταβλητής:", IDC_STATIC, 7, 32, 68, 8 - EDITTEXT IDC_VARIABLE_VALUE, 75, 30, 145, 12, ES_AUTOHSCROLL - DEFPUSHBUTTON "OK", IDOK, 116, 50, 50, 14 - PUSHBUTTON "Άκυρο", IDCANCEL, 170, 50, 50, 14 + SCROLLBAR IDC_DIALOG_GRIP, 293, 243, 7, 7, SBS_SIZEGRIP + CONTROL "", IDC_LIST_VARIABLE_VALUE, "SysListView32", LVS_NOCOLUMNHEADER | LVS_EDITLABELS | LVS_SHOWSELALWAYS | + LVS_SINGLESEL | LVS_REPORT | WS_BORDER | WS_TABSTOP, 10, 10, 224, 208, WS_EX_CLIENTEDGE + PUSHBUTTON "New", IDC_BUTTON_NEW, 242, 10, 50, 14 + PUSHBUTTON "Edit", IDC_BUTTON_EDIT, 242, 30, 50, 14 + PUSHBUTTON "Browse...", IDC_BUTTON_BROWSE_FOLDER, 242, 50, 50, 14 + PUSHBUTTON "Delete", IDC_BUTTON_DELETE, 242, 70, 50, 14 + PUSHBUTTON "Move Up", IDC_BUTTON_MOVE_UP, 242, 100, 50, 14 + PUSHBUTTON "Move Down", IDC_BUTTON_MOVE_DOWN, 242, 120, 50, 14 + PUSHBUTTON "Edit text...", IDC_BUTTON_EDIT_TEXT, 242, 150, 50, 14 + DEFPUSHBUTTON "OK", IDOK, 188, 228, 50, 14 + PUSHBUTTON "Άκυρο", IDCANCEL, 242, 228, 50, 14 END IDD_LICENCE DIALOGEX 6, 5, 267, 159 @@ -344,4 +366,6 @@ BEGIN IDS_HWPROFILE_ALREADY_IN_USE "The profile name is already in use." IDS_HWPROFILE_PROFILE "Profile" IDS_HWPROFILE_WARNING "Warning" + IDS_ENVIRONMENT_WARNING "Any changes that have been done will be discarded and the variable's value will be edited as text." + IDS_ENVIRONMENT_WARNING_TITLE "System Properties" END diff --git a/dll/cpl/sysdm/lang/en-US.rc b/dll/cpl/sysdm/lang/en-US.rc index 99798a3f52f..56d1f8739cb 100644 --- a/dll/cpl/sysdm/lang/en-US.rc +++ b/dll/cpl/sysdm/lang/en-US.rc @@ -278,17 +278,39 @@ BEGIN PUSHBUTTON "Cancel", IDCANCEL, 195, 224, 50, 14 END -IDD_EDIT_VARIABLE DIALOGEX 10, 15, 227, 71 -STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +IDD_EDIT_VARIABLE DIALOGEX 10, 15, 372, 71 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUPWINDOW | WS_CAPTION | WS_VISIBLE | WS_THICKFRAME +CAPTION "Edit Variable" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + SCROLLBAR IDC_DIALOG_GRIP, 365, 64, 7, 7, SBS_SIZEGRIP + LTEXT "Variable &Name:", IDC_STATIC, 7, 14, 50, 8 + EDITTEXT IDC_VARIABLE_NAME, 75, 12, 289, 12, ES_AUTOHSCROLL + LTEXT "Variable &Value:", IDC_STATIC, 7, 32, 50, 8 + EDITTEXT IDC_VARIABLE_VALUE, 75, 30, 289, 12, ES_AUTOHSCROLL + DEFPUSHBUTTON "OK", IDOK, 260, 50, 50, 14 + PUSHBUTTON "Cancel", IDCANCEL, 314, 50, 50, 14 + PUSHBUTTON "Browse Directory...", IDC_BUTTON_BROWSE_FOLDER, 6, 50, 75, 14 + PUSHBUTTON "Browse Files...", IDC_BUTTON_BROWSE_FILE, 86, 50, 75, 14 +END + +IDD_EDIT_VARIABLE_FANCY DIALOGEX 10, 15, 300, 250 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUPWINDOW | WS_CAPTION | WS_VISIBLE | WS_THICKFRAME CAPTION "Edit Variable" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - LTEXT "Variable &Name:", IDC_STATIC, 7, 14, 68, 8 - EDITTEXT IDC_VARIABLE_NAME, 75, 12, 145, 12, ES_AUTOHSCROLL - LTEXT "Variable &Value:", IDC_STATIC, 7, 32, 68, 8 - EDITTEXT IDC_VARIABLE_VALUE, 75, 30, 145, 12, ES_AUTOHSCROLL - DEFPUSHBUTTON "OK", IDOK, 116, 50, 50, 14 - PUSHBUTTON "Cancel", IDCANCEL, 170, 50, 50, 14 + SCROLLBAR IDC_DIALOG_GRIP, 293, 243, 7, 7, SBS_SIZEGRIP + CONTROL "", IDC_LIST_VARIABLE_VALUE, "SysListView32", LVS_NOCOLUMNHEADER | LVS_EDITLABELS | LVS_SHOWSELALWAYS | + LVS_SINGLESEL | LVS_REPORT | WS_BORDER | WS_TABSTOP, 10, 10, 224, 208, WS_EX_CLIENTEDGE + PUSHBUTTON "New", IDC_BUTTON_NEW, 242, 10, 50, 14 + PUSHBUTTON "Edit", IDC_BUTTON_EDIT, 242, 30, 50, 14 + PUSHBUTTON "Browse...", IDC_BUTTON_BROWSE_FOLDER, 242, 50, 50, 14 + PUSHBUTTON "Delete", IDC_BUTTON_DELETE, 242, 70, 50, 14 + PUSHBUTTON "Move Up", IDC_BUTTON_MOVE_UP, 242, 100, 50, 14 + PUSHBUTTON "Move Down", IDC_BUTTON_MOVE_DOWN, 242, 120, 50, 14 + PUSHBUTTON "Edit text...", IDC_BUTTON_EDIT_TEXT, 242, 150, 50, 14 + DEFPUSHBUTTON "OK", IDOK, 188, 228, 50, 14 + PUSHBUTTON "Cancel", IDCANCEL, 242, 228, 50, 14 END IDD_LICENCE DIALOGEX 6, 5, 267, 159 @@ -344,4 +366,6 @@ BEGIN IDS_HWPROFILE_ALREADY_IN_USE "The profile name is already in use." IDS_HWPROFILE_PROFILE "Profile" IDS_HWPROFILE_WARNING "Warning" + IDS_ENVIRONMENT_WARNING "Any changes that have been done will be discarded and the variable's value will be edited as text." + IDS_ENVIRONMENT_WARNING_TITLE "System Properties" END diff --git a/dll/cpl/sysdm/lang/es-ES.rc b/dll/cpl/sysdm/lang/es-ES.rc index f909851c9f1..d31fccadc50 100644 --- a/dll/cpl/sysdm/lang/es-ES.rc +++ b/dll/cpl/sysdm/lang/es-ES.rc @@ -280,17 +280,39 @@ BEGIN PUSHBUTTON "Cancelar", IDCANCEL, 195, 224, 50, 14 END -IDD_EDIT_VARIABLE DIALOGEX 10, 15, 227, 71 -STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +IDD_EDIT_VARIABLE DIALOGEX 10, 15, 372, 71 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUPWINDOW | WS_CAPTION | WS_VISIBLE | WS_THICKFRAME +CAPTION "Modificar la variable" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + SCROLLBAR IDC_DIALOG_GRIP, 365, 64, 7, 7, SBS_SIZEGRIP + LTEXT "&Nombre:", IDC_STATIC, 7, 14, 50, 8 + EDITTEXT IDC_VARIABLE_NAME, 75, 12, 289, 12, ES_AUTOHSCROLL + LTEXT "&Valor:", IDC_STATIC, 7, 32, 50, 8 + EDITTEXT IDC_VARIABLE_VALUE, 75, 30, 289, 12, ES_AUTOHSCROLL + DEFPUSHBUTTON "Aceptar", IDOK, 260, 50, 50, 14 + PUSHBUTTON "Cancelar", IDCANCEL, 314, 50, 50, 14 + PUSHBUTTON "Browse Directory...", IDC_BUTTON_BROWSE_FOLDER, 6, 50, 75, 14 + PUSHBUTTON "Browse Files...", IDC_BUTTON_BROWSE_FILE, 86, 50, 75, 14 +END + +IDD_EDIT_VARIABLE_FANCY DIALOGEX 10, 15, 300, 250 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUPWINDOW | WS_CAPTION | WS_VISIBLE | WS_THICKFRAME CAPTION "Modificar la variable" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - LTEXT "&Nombre:", IDC_STATIC, 7, 14, 68, 8 - EDITTEXT IDC_VARIABLE_NAME, 75, 12, 145, 12, ES_AUTOHSCROLL - LTEXT "&Valor:", IDC_STATIC, 7, 32, 68, 8 - EDITTEXT IDC_VARIABLE_VALUE, 75, 30, 145, 12, ES_AUTOHSCROLL - DEFPUSHBUTTON "Aceptar", IDOK, 116, 50, 50, 14 - PUSHBUTTON "Cancelar", IDCANCEL, 170, 50, 50, 14 + SCROLLBAR IDC_DIALOG_GRIP, 293, 243, 7, 7, SBS_SIZEGRIP + CONTROL "", IDC_LIST_VARIABLE_VALUE, "SysListView32", LVS_NOCOLUMNHEADER | LVS_EDITLABELS | LVS_SHOWSELALWAYS | + LVS_SINGLESEL | LVS_REPORT | WS_BORDER | WS_TABSTOP, 10, 10, 224, 208, WS_EX_CLIENTEDGE + PUSHBUTTON "New", IDC_BUTTON_NEW, 242, 10, 50, 14 + PUSHBUTTON "Edit", IDC_BUTTON_EDIT, 242, 30, 50, 14 + PUSHBUTTON "Browse...", IDC_BUTTON_BROWSE_FOLDER, 242, 50, 50, 14 + PUSHBUTTON "Delete", IDC_BUTTON_DELETE, 242, 70, 50, 14 + PUSHBUTTON "Move Up", IDC_BUTTON_MOVE_UP, 242, 100, 50, 14 + PUSHBUTTON "Move Down", IDC_BUTTON_MOVE_DOWN, 242, 120, 50, 14 + PUSHBUTTON "Edit text...", IDC_BUTTON_EDIT_TEXT, 242, 150, 50, 14 + DEFPUSHBUTTON "Aceptar", IDOK, 188, 228, 50, 14 + PUSHBUTTON "Cancelar", IDCANCEL, 242, 228, 50, 14 END IDD_LICENCE DIALOGEX 6, 5, 267, 159 @@ -346,4 +368,6 @@ BEGIN IDS_HWPROFILE_ALREADY_IN_USE "El nombre de perfil ya está en uso." IDS_HWPROFILE_PROFILE "Perfil" IDS_HWPROFILE_WARNING "Advertencia" + IDS_ENVIRONMENT_WARNING "Any changes that have been done will be discarded and the variable's value will be edited as text." + IDS_ENVIRONMENT_WARNING_TITLE "System Properties" END diff --git a/dll/cpl/sysdm/lang/fr-FR.rc b/dll/cpl/sysdm/lang/fr-FR.rc index caccd6fa492..6246e3b270c 100644 --- a/dll/cpl/sysdm/lang/fr-FR.rc +++ b/dll/cpl/sysdm/lang/fr-FR.rc @@ -278,17 +278,39 @@ BEGIN PUSHBUTTON "Annuler", IDCANCEL, 195, 224, 50, 14 END -IDD_EDIT_VARIABLE DIALOGEX 10, 15, 227, 71 -STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +IDD_EDIT_VARIABLE DIALOGEX 10, 15, 372, 71 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUPWINDOW | WS_CAPTION | WS_VISIBLE | WS_THICKFRAME +CAPTION "Modifier la variable" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + SCROLLBAR IDC_DIALOG_GRIP, 365, 64, 7, 7, SBS_SIZEGRIP + LTEXT "&Nom de la variable :", IDC_STATIC, 7, 14, 50, 8 + EDITTEXT IDC_VARIABLE_NAME, 75, 12, 289, 12, ES_AUTOHSCROLL + LTEXT "&Valeur de la variable :", IDC_STATIC, 7, 32, 50, 8 + EDITTEXT IDC_VARIABLE_VALUE, 75, 30, 289, 12, ES_AUTOHSCROLL + DEFPUSHBUTTON "OK", IDOK, 260, 50, 50, 14 + PUSHBUTTON "Annuler", IDCANCEL, 314, 50, 50, 14 + PUSHBUTTON "Browse Directory...", IDC_BUTTON_BROWSE_FOLDER, 6, 50, 75, 14 + PUSHBUTTON "Browse Files...", IDC_BUTTON_BROWSE_FILE, 86, 50, 75, 14 +END + +IDD_EDIT_VARIABLE_FANCY DIALOGEX 10, 15, 300, 250 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUPWINDOW | WS_CAPTION | WS_VISIBLE | WS_THICKFRAME CAPTION "Modifier la variable" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - LTEXT "&Nom de la variable :", IDC_STATIC, 7, 14, 68, 8 - EDITTEXT IDC_VARIABLE_NAME, 75, 12, 145, 12, ES_AUTOHSCROLL - LTEXT "&Valeur de la variable :", IDC_STATIC, 7, 32, 68, 8 - EDITTEXT IDC_VARIABLE_VALUE, 75, 30, 145, 12, ES_AUTOHSCROLL - DEFPUSHBUTTON "OK", IDOK, 116, 50, 50, 14 - PUSHBUTTON "Annuler", IDCANCEL, 170, 50, 50, 14 + SCROLLBAR IDC_DIALOG_GRIP, 293, 243, 7, 7, SBS_SIZEGRIP + CONTROL "", IDC_LIST_VARIABLE_VALUE, "SysListView32", LVS_NOCOLUMNHEADER | LVS_EDITLABELS | LVS_SHOWSELALWAYS | + LVS_SINGLESEL | LVS_REPORT | WS_BORDER | WS_TABSTOP, 10, 10, 224, 208, WS_EX_CLIENTEDGE + PUSHBUTTON "New", IDC_BUTTON_NEW, 242, 10, 50, 14 + PUSHBUTTON "Edit", IDC_BUTTON_EDIT, 242, 30, 50, 14 + PUSHBUTTON "Browse...", IDC_BUTTON_BROWSE_FOLDER, 242, 50, 50, 14 + PUSHBUTTON "Delete", IDC_BUTTON_DELETE, 242, 70, 50, 14 + PUSHBUTTON "Move Up", IDC_BUTTON_MOVE_UP, 242, 100, 50, 14 + PUSHBUTTON "Move Down", IDC_BUTTON_MOVE_DOWN, 242, 120, 50, 14 + PUSHBUTTON "Edit text...", IDC_BUTTON_EDIT_TEXT, 242, 150, 50, 14 + DEFPUSHBUTTON "OK", IDOK, 188, 228, 50, 14 + PUSHBUTTON "Annuler", IDCANCEL, 242, 228, 50, 14 END IDD_LICENCE DIALOGEX 6, 5, 267, 159 @@ -344,4 +366,6 @@ BEGIN IDS_HWPROFILE_ALREADY_IN_USE "Le nom de profil est déjà utilisé." IDS_HWPROFILE_PROFILE "Profil" IDS_HWPROFILE_WARNING "Attention" + IDS_ENVIRONMENT_WARNING "Any changes that have been done will be discarded and the variable's value will be edited as text." + IDS_ENVIRONMENT_WARNING_TITLE "System Properties" END diff --git a/dll/cpl/sysdm/lang/he-IL.rc b/dll/cpl/sysdm/lang/he-IL.rc index 69fbc6791f2..622f65914aa 100644 --- a/dll/cpl/sysdm/lang/he-IL.rc +++ b/dll/cpl/sysdm/lang/he-IL.rc @@ -280,17 +280,39 @@ BEGIN PUSHBUTTON "ביטול", IDCANCEL, 195, 224, 50, 14 END -IDD_EDIT_VARIABLE DIALOGEX 10, 15, 227, 71 -STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +IDD_EDIT_VARIABLE DIALOGEX 10, 15, 372, 71 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUPWINDOW | WS_CAPTION | WS_VISIBLE | WS_THICKFRAME +CAPTION "עריכת משתנה" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + SCROLLBAR IDC_DIALOG_GRIP, 365, 64, 7, 7, SBS_SIZEGRIP + LTEXT "שם המשתנה:", IDC_STATIC, 7, 14, 50, 8 + EDITTEXT IDC_VARIABLE_NAME, 75, 12, 289, 12, ES_AUTOHSCROLL + LTEXT "שם הערך:", IDC_STATIC, 7, 32, 50, 8 + EDITTEXT IDC_VARIABLE_VALUE, 75, 30, 289, 12, ES_AUTOHSCROLL + DEFPUSHBUTTON "אישור", IDOK, 260, 50, 50, 14 + PUSHBUTTON "ביטול", IDCANCEL, 314, 50, 50, 14 + PUSHBUTTON "Browse Directory...", IDC_BUTTON_BROWSE_FOLDER, 6, 50, 75, 14 + PUSHBUTTON "Browse Files...", IDC_BUTTON_BROWSE_FILE, 86, 50, 75, 14 +END + +IDD_EDIT_VARIABLE_FANCY DIALOGEX 10, 15, 300, 250 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUPWINDOW | WS_CAPTION | WS_VISIBLE | WS_THICKFRAME CAPTION "עריכת משתנה" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - LTEXT "שם המשתנה:", IDC_STATIC, 7, 14, 68, 8 - EDITTEXT IDC_VARIABLE_NAME, 75, 12, 145, 12, ES_AUTOHSCROLL - LTEXT "שם הערך:", IDC_STATIC, 7, 32, 68, 8 - EDITTEXT IDC_VARIABLE_VALUE, 75, 30, 145, 12, ES_AUTOHSCROLL - DEFPUSHBUTTON "אישור", IDOK, 116, 50, 50, 14 - PUSHBUTTON "ביטול", IDCANCEL, 170, 50, 50, 14 + SCROLLBAR IDC_DIALOG_GRIP, 293, 243, 7, 7, SBS_SIZEGRIP + CONTROL "", IDC_LIST_VARIABLE_VALUE, "SysListView32", LVS_NOCOLUMNHEADER | LVS_EDITLABELS | LVS_SHOWSELALWAYS | + LVS_SINGLESEL | LVS_REPORT | WS_BORDER | WS_TABSTOP, 10, 10, 224, 208, WS_EX_CLIENTEDGE + PUSHBUTTON "New", IDC_BUTTON_NEW, 242, 10, 50, 14 + PUSHBUTTON "Edit", IDC_BUTTON_EDIT, 242, 30, 50, 14 + PUSHBUTTON "Browse...", IDC_BUTTON_BROWSE_FOLDER, 242, 50, 50, 14 + PUSHBUTTON "Delete", IDC_BUTTON_DELETE, 242, 70, 50, 14 + PUSHBUTTON "Move Up", IDC_BUTTON_MOVE_UP, 242, 100, 50, 14 + PUSHBUTTON "Move Down", IDC_BUTTON_MOVE_DOWN, 242, 120, 50, 14 + PUSHBUTTON "Edit text...", IDC_BUTTON_EDIT_TEXT, 242, 150, 50, 14 + DEFPUSHBUTTON "אישור", IDOK, 188, 228, 50, 14 + PUSHBUTTON "ביטול", IDCANCEL, 242, 228, 50, 14 END IDD_LICENCE DIALOGEX 6, 5, 267, 159 @@ -346,4 +368,6 @@ BEGIN IDS_HWPROFILE_ALREADY_IN_USE "The profile name is already in use." IDS_HWPROFILE_PROFILE "Profile" IDS_HWPROFILE_WARNING "Warning" + IDS_ENVIRONMENT_WARNING "Any changes that have been done will be discarded and the variable's value will be edited as text." + IDS_ENVIRONMENT_WARNING_TITLE "System Properties" END diff --git a/dll/cpl/sysdm/lang/hu-HU.rc b/dll/cpl/sysdm/lang/hu-HU.rc index 259f6fc2e23..b1e8ce6692e 100644 --- a/dll/cpl/sysdm/lang/hu-HU.rc +++ b/dll/cpl/sysdm/lang/hu-HU.rc @@ -280,17 +280,39 @@ BEGIN PUSHBUTTON "Mégse", IDCANCEL, 195, 224, 50, 14 END -IDD_EDIT_VARIABLE DIALOGEX 10, 15, 227, 71 -STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +IDD_EDIT_VARIABLE DIALOGEX 10, 15, 372, 71 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUPWINDOW | WS_CAPTION | WS_VISIBLE | WS_THICKFRAME +CAPTION "Változó szerkesztése" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + SCROLLBAR IDC_DIALOG_GRIP, 365, 64, 7, 7, SBS_SIZEGRIP + LTEXT "Változó &neve:", IDC_STATIC, 7, 14, 50, 8 + EDITTEXT IDC_VARIABLE_NAME, 75, 12, 289, 12, ES_AUTOHSCROLL + LTEXT "Vál&tozó értéke:", IDC_STATIC, 7, 32, 50, 8 + EDITTEXT IDC_VARIABLE_VALUE, 75, 30, 289, 12, ES_AUTOHSCROLL + DEFPUSHBUTTON "Rendben", IDOK, 260, 50, 50, 14 + PUSHBUTTON "Mégse", IDCANCEL, 314, 50, 50, 14 + PUSHBUTTON "Browse Directory...", IDC_BUTTON_BROWSE_FOLDER, 6, 50, 75, 14 + PUSHBUTTON "Browse Files...", IDC_BUTTON_BROWSE_FILE, 86, 50, 75, 14 +END + +IDD_EDIT_VARIABLE_FANCY DIALOGEX 10, 15, 300, 250 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUPWINDOW | WS_CAPTION | WS_VISIBLE | WS_THICKFRAME CAPTION "Változó szerkesztése" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - LTEXT "Változó &neve:", IDC_STATIC, 7, 14, 68, 8 - EDITTEXT IDC_VARIABLE_NAME, 75, 12, 145, 12, ES_AUTOHSCROLL - LTEXT "Vál&tozó értéke:", IDC_STATIC, 7, 32, 68, 8 - EDITTEXT IDC_VARIABLE_VALUE, 75, 30, 145, 12, ES_AUTOHSCROLL - DEFPUSHBUTTON "Rendben", IDOK, 116, 50, 50, 14 - PUSHBUTTON "Mégse", IDCANCEL, 170, 50, 50, 14 + SCROLLBAR IDC_DIALOG_GRIP, 293, 243, 7, 7, SBS_SIZEGRIP + CONTROL "", IDC_LIST_VARIABLE_VALUE, "SysListView32", LVS_NOCOLUMNHEADER | LVS_EDITLABELS | LVS_SHOWSELALWAYS | + LVS_SINGLESEL | LVS_REPORT | WS_BORDER | WS_TABSTOP, 10, 10, 224, 208, WS_EX_CLIENTEDGE + PUSHBUTTON "New", IDC_BUTTON_NEW, 242, 10, 50, 14 + PUSHBUTTON "Edit", IDC_BUTTON_EDIT, 242, 30, 50, 14 + PUSHBUTTON "Browse...", IDC_BUTTON_BROWSE_FOLDER, 242, 50, 50, 14 + PUSHBUTTON "Delete", IDC_BUTTON_DELETE, 242, 70, 50, 14 + PUSHBUTTON "Move Up", IDC_BUTTON_MOVE_UP, 242, 100, 50, 14 + PUSHBUTTON "Move Down", IDC_BUTTON_MOVE_DOWN, 242, 120, 50, 14 + PUSHBUTTON "Edit text...", IDC_BUTTON_EDIT_TEXT, 242, 150, 50, 14 + DEFPUSHBUTTON "Rendben", IDOK, 188, 228, 50, 14 + PUSHBUTTON "Mégse", IDCANCEL, 242, 228, 50, 14 END IDD_LICENCE DIALOGEX 6, 5, 267, 159 @@ -346,4 +368,6 @@ BEGIN IDS_HWPROFILE_ALREADY_IN_USE "Ez a profilnév már használatban van." IDS_HWPROFILE_PROFILE "Profil" IDS_HWPROFILE_WARNING "Figyelmeztetés" + IDS_ENVIRONMENT_WARNING "Any changes that have been done will be discarded and the variable's value will be edited as text." + IDS_ENVIRONMENT_WARNING_TITLE "System Properties" END diff --git a/dll/cpl/sysdm/lang/id-ID.rc b/dll/cpl/sysdm/lang/id-ID.rc index 81a674c1874..407d422ee82 100644 --- a/dll/cpl/sysdm/lang/id-ID.rc +++ b/dll/cpl/sysdm/lang/id-ID.rc @@ -278,17 +278,39 @@ BEGIN PUSHBUTTON "Batal", IDCANCEL, 195, 224, 50, 14 END -IDD_EDIT_VARIABLE DIALOGEX 10, 15, 227, 71 -STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +IDD_EDIT_VARIABLE DIALOGEX 10, 15, 372, 71 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUPWINDOW | WS_CAPTION | WS_VISIBLE | WS_THICKFRAME +CAPTION "Edit Variabel" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + SCROLLBAR IDC_DIALOG_GRIP, 365, 64, 7, 7, SBS_SIZEGRIP + LTEXT "&Nama Variabel:", IDC_STATIC, 7, 14, 50, 8 + EDITTEXT IDC_VARIABLE_NAME, 75, 12, 289, 12, ES_AUTOHSCROLL + LTEXT "N&ilai Variabel:", IDC_STATIC, 7, 32, 50, 8 + EDITTEXT IDC_VARIABLE_VALUE, 75, 30, 289, 12, ES_AUTOHSCROLL + DEFPUSHBUTTON "OK", IDOK, 260, 50, 50, 14 + PUSHBUTTON "Batal", IDCANCEL, 314, 50, 50, 14 + PUSHBUTTON "Browse Directory...", IDC_BUTTON_BROWSE_FOLDER, 6, 50, 75, 14 + PUSHBUTTON "Browse Files...", IDC_BUTTON_BROWSE_FILE, 86, 50, 75, 14 +END + +IDD_EDIT_VARIABLE_FANCY DIALOGEX 10, 15, 300, 250 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUPWINDOW | WS_CAPTION | WS_VISIBLE | WS_THICKFRAME CAPTION "Edit Variabel" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - LTEXT "&Nama Variabel:", IDC_STATIC, 7, 14, 68, 8 - EDITTEXT IDC_VARIABLE_NAME, 75, 12, 145, 12, ES_AUTOHSCROLL - LTEXT "N&ilai Variabel:", IDC_STATIC, 7, 32, 68, 8 - EDITTEXT IDC_VARIABLE_VALUE, 75, 30, 145, 12, ES_AUTOHSCROLL - DEFPUSHBUTTON "OK", IDOK, 116, 50, 50, 14 - PUSHBUTTON "Batal", IDCANCEL, 170, 50, 50, 14 + SCROLLBAR IDC_DIALOG_GRIP, 293, 243, 7, 7, SBS_SIZEGRIP + CONTROL "", IDC_LIST_VARIABLE_VALUE, "SysListView32", LVS_NOCOLUMNHEADER | LVS_EDITLABELS | LVS_SHOWSELALWAYS | + LVS_SINGLESEL | LVS_REPORT | WS_BORDER | WS_TABSTOP, 10, 10, 224, 208, WS_EX_CLIENTEDGE + PUSHBUTTON "New", IDC_BUTTON_NEW, 242, 10, 50, 14 + PUSHBUTTON "Edit", IDC_BUTTON_EDIT, 242, 30, 50, 14 + PUSHBUTTON "Browse...", IDC_BUTTON_BROWSE_FOLDER, 242, 50, 50, 14 + PUSHBUTTON "Delete", IDC_BUTTON_DELETE, 242, 70, 50, 14 + PUSHBUTTON "Move Up", IDC_BUTTON_MOVE_UP, 242, 100, 50, 14 + PUSHBUTTON "Move Down", IDC_BUTTON_MOVE_DOWN, 242, 120, 50, 14 + PUSHBUTTON "Edit text...", IDC_BUTTON_EDIT_TEXT, 242, 150, 50, 14 + DEFPUSHBUTTON "OK", IDOK, 188, 228, 50, 14 + PUSHBUTTON "Batal", IDCANCEL, 242, 228, 50, 14 END IDD_LICENCE DIALOGEX 6, 5, 267, 159 @@ -344,4 +366,6 @@ BEGIN IDS_HWPROFILE_ALREADY_IN_USE "Nama profil telah digunakan." IDS_HWPROFILE_PROFILE "Profil" IDS_HWPROFILE_WARNING "Peringatan" + IDS_ENVIRONMENT_WARNING "Any changes that have been done will be discarded and the variable's value will be edited as text." + IDS_ENVIRONMENT_WARNING_TITLE "System Properties" END diff --git a/dll/cpl/sysdm/lang/it-IT.rc b/dll/cpl/sysdm/lang/it-IT.rc index 584b60682de..88eb47de85d 100644 --- a/dll/cpl/sysdm/lang/it-IT.rc +++ b/dll/cpl/sysdm/lang/it-IT.rc @@ -278,17 +278,39 @@ BEGIN PUSHBUTTON "Annulla", IDCANCEL, 195, 224, 50, 14 END -IDD_EDIT_VARIABLE DIALOGEX 10, 15, 227, 71 -STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +IDD_EDIT_VARIABLE DIALOGEX 10, 15, 372, 71 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUPWINDOW | WS_CAPTION | WS_VISIBLE | WS_THICKFRAME +CAPTION "Modifica variabile" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + SCROLLBAR IDC_DIALOG_GRIP, 365, 64, 7, 7, SBS_SIZEGRIP + LTEXT "&Nome della variabile:", IDC_STATIC, 7, 14, 50, 8 + EDITTEXT IDC_VARIABLE_NAME, 75, 12, 289, 12, ES_AUTOHSCROLL + LTEXT "&Valore della variabile:", IDC_STATIC, 7, 32, 50, 8 + EDITTEXT IDC_VARIABLE_VALUE, 75, 30, 289, 12, ES_AUTOHSCROLL + DEFPUSHBUTTON "OK", IDOK, 260, 50, 50, 14 + PUSHBUTTON "Annulla", IDCANCEL, 314, 50, 50, 14 + PUSHBUTTON "Browse Directory...", IDC_BUTTON_BROWSE_FOLDER, 6, 50, 75, 14 + PUSHBUTTON "Browse Files...", IDC_BUTTON_BROWSE_FILE, 86, 50, 75, 14 +END + +IDD_EDIT_VARIABLE_FANCY DIALOGEX 10, 15, 300, 250 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUPWINDOW | WS_CAPTION | WS_VISIBLE | WS_THICKFRAME CAPTION "Modifica variabile" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - LTEXT "&Nome della variabile:", IDC_STATIC, 7, 14, 68, 8 - EDITTEXT IDC_VARIABLE_NAME, 75, 12, 145, 12, ES_AUTOHSCROLL - LTEXT "&Valore della variabile :", IDC_STATIC, 7, 32, 68, 8 - EDITTEXT IDC_VARIABLE_VALUE, 75, 30, 145, 12, ES_AUTOHSCROLL - DEFPUSHBUTTON "OK", IDOK, 116, 50, 50, 14 - PUSHBUTTON "Annulla", IDCANCEL, 170, 50, 50, 14 + SCROLLBAR IDC_DIALOG_GRIP, 293, 243, 7, 7, SBS_SIZEGRIP + CONTROL "", IDC_LIST_VARIABLE_VALUE, "SysListView32", LVS_NOCOLUMNHEADER | LVS_EDITLABELS | LVS_SHOWSELALWAYS | + LVS_SINGLESEL | LVS_REPORT | WS_BORDER | WS_TABSTOP, 10, 10, 224, 208, WS_EX_CLIENTEDGE + PUSHBUTTON "New", IDC_BUTTON_NEW, 242, 10, 50, 14 + PUSHBUTTON "Edit", IDC_BUTTON_EDIT, 242, 30, 50, 14 + PUSHBUTTON "Browse...", IDC_BUTTON_BROWSE_FOLDER, 242, 50, 50, 14 + PUSHBUTTON "Delete", IDC_BUTTON_DELETE, 242, 70, 50, 14 + PUSHBUTTON "Move Up", IDC_BUTTON_MOVE_UP, 242, 100, 50, 14 + PUSHBUTTON "Move Down", IDC_BUTTON_MOVE_DOWN, 242, 120, 50, 14 + PUSHBUTTON "Edit text...", IDC_BUTTON_EDIT_TEXT, 242, 150, 50, 14 + DEFPUSHBUTTON "OK", IDOK, 188, 228, 50, 14 + PUSHBUTTON "Annulla", IDCANCEL, 242, 228, 50, 14 END IDD_LICENCE DIALOGEX 6, 5, 267, 159 @@ -344,4 +366,6 @@ BEGIN IDS_HWPROFILE_ALREADY_IN_USE "The profile name is already in use." IDS_HWPROFILE_PROFILE "Profile" IDS_HWPROFILE_WARNING "Warning" + IDS_ENVIRONMENT_WARNING "Any changes that have been done will be discarded and the variable's value will be edited as text." + IDS_ENVIRONMENT_WARNING_TITLE "System Properties" END diff --git a/dll/cpl/sysdm/lang/ja-JP.rc b/dll/cpl/sysdm/lang/ja-JP.rc index 134afa9d40b..13dffad6000 100644 --- a/dll/cpl/sysdm/lang/ja-JP.rc +++ b/dll/cpl/sysdm/lang/ja-JP.rc @@ -278,17 +278,39 @@ BEGIN PUSHBUTTON "キャンセル", IDCANCEL, 195, 224, 50, 14 END -IDD_EDIT_VARIABLE DIALOGEX 10, 15, 227, 71 -STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +IDD_EDIT_VARIABLE DIALOGEX 10, 15, 372, 71 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUPWINDOW | WS_CAPTION | WS_VISIBLE | WS_THICKFRAME +CAPTION "変数の編集" +FONT 9, "MS UI Gothic", 0, 0, 0x0 +BEGIN + SCROLLBAR IDC_DIALOG_GRIP, 365, 64, 7, 7, SBS_SIZEGRIP + LTEXT "変数名(&N):", IDC_STATIC, 7, 14, 50, 8 + EDITTEXT IDC_VARIABLE_NAME, 75, 12, 289, 12, ES_AUTOHSCROLL + LTEXT "変数の値(&V):", IDC_STATIC, 7, 32, 50, 8 + EDITTEXT IDC_VARIABLE_VALUE, 75, 30, 289, 12, ES_AUTOHSCROLL + DEFPUSHBUTTON "OK", IDOK, 260, 50, 50, 14 + PUSHBUTTON "キャンセル", IDCANCEL, 314, 50, 50, 14 + PUSHBUTTON "Browse Directory...", IDC_BUTTON_BROWSE_FOLDER, 6, 50, 75, 14 + PUSHBUTTON "Browse Files...", IDC_BUTTON_BROWSE_FILE, 86, 50, 75, 14 +END + +IDD_EDIT_VARIABLE_FANCY DIALOGEX 10, 15, 300, 250 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUPWINDOW | WS_CAPTION | WS_VISIBLE | WS_THICKFRAME CAPTION "変数の編集" FONT 9, "MS UI Gothic", 0, 0, 0x0 BEGIN - LTEXT "変数名(&N):", IDC_STATIC, 7, 14, 68, 8 - EDITTEXT IDC_VARIABLE_NAME, 75, 12, 145, 12, ES_AUTOHSCROLL - LTEXT "変数の値(&V):", IDC_STATIC, 7, 32, 68, 8 - EDITTEXT IDC_VARIABLE_VALUE, 75, 30, 145, 12, ES_AUTOHSCROLL - DEFPUSHBUTTON "OK", IDOK, 116, 50, 50, 14 - PUSHBUTTON "キャンセル", IDCANCEL, 170, 50, 50, 14 + SCROLLBAR IDC_DIALOG_GRIP, 293, 243, 7, 7, SBS_SIZEGRIP + CONTROL "", IDC_LIST_VARIABLE_VALUE, "SysListView32", LVS_NOCOLUMNHEADER | LVS_EDITLABELS | LVS_SHOWSELALWAYS | + LVS_SINGLESEL | LVS_REPORT | WS_BORDER | WS_TABSTOP, 10, 10, 224, 208, WS_EX_CLIENTEDGE + PUSHBUTTON "New", IDC_BUTTON_NEW, 242, 10, 50, 14 + PUSHBUTTON "Edit", IDC_BUTTON_EDIT, 242, 30, 50, 14 + PUSHBUTTON "Browse...", IDC_BUTTON_BROWSE_FOLDER, 242, 50, 50, 14 + PUSHBUTTON "Delete", IDC_BUTTON_DELETE, 242, 70, 50, 14 + PUSHBUTTON "Move Up", IDC_BUTTON_MOVE_UP, 242, 100, 50, 14 + PUSHBUTTON "Move Down", IDC_BUTTON_MOVE_DOWN, 242, 120, 50, 14 + PUSHBUTTON "Edit text...", IDC_BUTTON_EDIT_TEXT, 242, 150, 50, 14 + DEFPUSHBUTTON "OK", IDOK, 188, 228, 50, 14 + PUSHBUTTON "キャンセル", IDCANCEL, 242, 228, 50, 14 END IDD_LICENCE DIALOGEX 6, 5, 267, 159 @@ -344,4 +366,6 @@ BEGIN IDS_HWPROFILE_ALREADY_IN_USE "プロファイル名は使用中です。" IDS_HWPROFILE_PROFILE "プロファイル" IDS_HWPROFILE_WARNING "警告" + IDS_ENVIRONMENT_WARNING "Any changes that have been done will be discarded and the variable's value will be edited as text." + IDS_ENVIRONMENT_WARNING_TITLE "System Properties" END diff --git a/dll/cpl/sysdm/lang/nl-NL.rc b/dll/cpl/sysdm/lang/nl-NL.rc index 5b70da973af..f72ba8a7cbf 100644 --- a/dll/cpl/sysdm/lang/nl-NL.rc +++ b/dll/cpl/sysdm/lang/nl-NL.rc @@ -278,17 +278,39 @@ BEGIN PUSHBUTTON "Annuleren", IDCANCEL, 195, 224, 50, 14 END -IDD_EDIT_VARIABLE DIALOGEX 10, 15, 227, 71 -STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +IDD_EDIT_VARIABLE DIALOGEX 10, 15, 372, 71 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUPWINDOW | WS_CAPTION | WS_VISIBLE | WS_THICKFRAME +CAPTION "Variabele bewerken" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + SCROLLBAR IDC_DIALOG_GRIP, 365, 64, 7, 7, SBS_SIZEGRIP + LTEXT "Naam van variabele:", IDC_STATIC, 7, 14, 50, 8 + EDITTEXT IDC_VARIABLE_NAME, 75, 12, 289, 12, ES_AUTOHSCROLL + LTEXT "Waarde van variabele:", IDC_STATIC, 7, 32, 50, 8 + EDITTEXT IDC_VARIABLE_VALUE, 75, 30, 289, 12, ES_AUTOHSCROLL + DEFPUSHBUTTON "OK", IDOK, 260, 50, 50, 14 + PUSHBUTTON "Annuleren", IDCANCEL, 314, 50, 50, 14 + PUSHBUTTON "Browse Directory...", IDC_BUTTON_BROWSE_FOLDER, 6, 50, 75, 14 + PUSHBUTTON "Browse Files...", IDC_BUTTON_BROWSE_FILE, 86, 50, 75, 14 +END + +IDD_EDIT_VARIABLE_FANCY DIALOGEX 10, 15, 300, 250 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUPWINDOW | WS_CAPTION | WS_VISIBLE | WS_THICKFRAME CAPTION "Variabele bewerken" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - LTEXT "Naam van variabele:", IDC_STATIC, 7, 14, 68, 8 - EDITTEXT IDC_VARIABLE_NAME, 75, 12, 145, 12, ES_AUTOHSCROLL - LTEXT "Waarde van variabele:", IDC_STATIC, 7, 32, 68, 8 - EDITTEXT IDC_VARIABLE_VALUE, 75, 30, 145, 12, ES_AUTOHSCROLL - DEFPUSHBUTTON "OK", IDOK, 116, 50, 50, 14 - PUSHBUTTON "Annuleren", IDCANCEL, 170, 50, 50, 14 + SCROLLBAR IDC_DIALOG_GRIP, 293, 243, 7, 7, SBS_SIZEGRIP + CONTROL "", IDC_LIST_VARIABLE_VALUE, "SysListView32", LVS_NOCOLUMNHEADER | LVS_EDITLABELS | LVS_SHOWSELALWAYS | + LVS_SINGLESEL | LVS_REPORT | WS_BORDER | WS_TABSTOP, 10, 10, 224, 208, WS_EX_CLIENTEDGE + PUSHBUTTON "New", IDC_BUTTON_NEW, 242, 10, 50, 14 + PUSHBUTTON "Edit", IDC_BUTTON_EDIT, 242, 30, 50, 14 + PUSHBUTTON "Browse...", IDC_BUTTON_BROWSE_FOLDER, 242, 50, 50, 14 + PUSHBUTTON "Delete", IDC_BUTTON_DELETE, 242, 70, 50, 14 + PUSHBUTTON "Move Up", IDC_BUTTON_MOVE_UP, 242, 100, 50, 14 + PUSHBUTTON "Move Down", IDC_BUTTON_MOVE_DOWN, 242, 120, 50, 14 + PUSHBUTTON "Edit text...", IDC_BUTTON_EDIT_TEXT, 242, 150, 50, 14 + DEFPUSHBUTTON "OK", IDOK, 188, 228, 50, 14 + PUSHBUTTON "Annuleren", IDCANCEL, 242, 228, 50, 14 END IDD_LICENCE DIALOGEX 6, 5, 267, 159 @@ -344,4 +366,6 @@ BEGIN IDS_HWPROFILE_ALREADY_IN_USE "The profile name is already in use." IDS_HWPROFILE_PROFILE "Profile" IDS_HWPROFILE_WARNING "Warning" + IDS_ENVIRONMENT_WARNING "Any changes that have been done will be discarded and the variable's value will be edited as text." + IDS_ENVIRONMENT_WARNING_TITLE "System Properties" END diff --git a/dll/cpl/sysdm/lang/no-NO.rc b/dll/cpl/sysdm/lang/no-NO.rc index e2a4fb0684a..4441431cd16 100644 --- a/dll/cpl/sysdm/lang/no-NO.rc +++ b/dll/cpl/sysdm/lang/no-NO.rc @@ -278,17 +278,39 @@ BEGIN PUSHBUTTON "Avbryt", IDCANCEL, 195, 224, 50, 14 END -IDD_EDIT_VARIABLE DIALOGEX 10, 15, 227, 71 -STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +IDD_EDIT_VARIABLE DIALOGEX 10, 15, 372, 71 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUPWINDOW | WS_CAPTION | WS_VISIBLE | WS_THICKFRAME +CAPTION "Rediger variabel" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + SCROLLBAR IDC_DIALOG_GRIP, 365, 64, 7, 7, SBS_SIZEGRIP + LTEXT "Variabel &navn:", IDC_STATIC, 7, 14, 50, 8 + EDITTEXT IDC_VARIABLE_NAME, 75, 12, 289, 12, ES_AUTOHSCROLL + LTEXT "Variabel &verdi:", IDC_STATIC, 7, 32, 50, 8 + EDITTEXT IDC_VARIABLE_VALUE, 75, 30, 289, 12, ES_AUTOHSCROLL + DEFPUSHBUTTON "OK", IDOK, 260, 50, 50, 14 + PUSHBUTTON "Avbryt", IDCANCEL, 314, 50, 50, 14 + PUSHBUTTON "Browse Directory...", IDC_BUTTON_BROWSE_FOLDER, 6, 50, 75, 14 + PUSHBUTTON "Browse Files...", IDC_BUTTON_BROWSE_FILE, 86, 50, 75, 14 +END + +IDD_EDIT_VARIABLE_FANCY DIALOGEX 10, 15, 300, 250 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUPWINDOW | WS_CAPTION | WS_VISIBLE | WS_THICKFRAME CAPTION "Rediger variabel" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - LTEXT "Variabel &navn:", IDC_STATIC, 7, 14, 68, 8 - EDITTEXT IDC_VARIABLE_NAME, 75, 12, 145, 12, ES_AUTOHSCROLL - LTEXT "Variabel &verdi:", IDC_STATIC, 7, 32, 68, 8 - EDITTEXT IDC_VARIABLE_VALUE, 75, 30, 145, 12, ES_AUTOHSCROLL - DEFPUSHBUTTON "OK", IDOK, 116, 50, 50, 14 - PUSHBUTTON "Avbryt", IDCANCEL, 170, 50, 50, 14 + SCROLLBAR IDC_DIALOG_GRIP, 293, 243, 7, 7, SBS_SIZEGRIP + CONTROL "", IDC_LIST_VARIABLE_VALUE, "SysListView32", LVS_NOCOLUMNHEADER | LVS_EDITLABELS | LVS_SHOWSELALWAYS | + LVS_SINGLESEL | LVS_REPORT | WS_BORDER | WS_TABSTOP, 10, 10, 224, 208, WS_EX_CLIENTEDGE + PUSHBUTTON "New", IDC_BUTTON_NEW, 242, 10, 50, 14 + PUSHBUTTON "Edit", IDC_BUTTON_EDIT, 242, 30, 50, 14 + PUSHBUTTON "Browse...", IDC_BUTTON_BROWSE_FOLDER, 242, 50, 50, 14 + PUSHBUTTON "Delete", IDC_BUTTON_DELETE, 242, 70, 50, 14 + PUSHBUTTON "Move Up", IDC_BUTTON_MOVE_UP, 242, 100, 50, 14 + PUSHBUTTON "Move Down", IDC_BUTTON_MOVE_DOWN, 242, 120, 50, 14 + PUSHBUTTON "Edit text...", IDC_BUTTON_EDIT_TEXT, 242, 150, 50, 14 + DEFPUSHBUTTON "OK", IDOK, 188, 228, 50, 14 + PUSHBUTTON "Avbryt", IDCANCEL, 242, 228, 50, 14 END IDD_LICENCE DIALOGEX 6, 5, 267, 159 @@ -344,4 +366,6 @@ BEGIN IDS_HWPROFILE_ALREADY_IN_USE "The profile name is already in use." IDS_HWPROFILE_PROFILE "Profile" IDS_HWPROFILE_WARNING "Warning" + IDS_ENVIRONMENT_WARNING "Any changes that have been done will be discarded and the variable's value will be edited as text." + IDS_ENVIRONMENT_WARNING_TITLE "System Properties" END diff --git a/dll/cpl/sysdm/lang/pl-PL.rc b/dll/cpl/sysdm/lang/pl-PL.rc index 8973446b116..61d89d3691b 100644 --- a/dll/cpl/sysdm/lang/pl-PL.rc +++ b/dll/cpl/sysdm/lang/pl-PL.rc @@ -287,17 +287,39 @@ BEGIN PUSHBUTTON "Anuluj", IDCANCEL, 195, 224, 50, 14 END -IDD_EDIT_VARIABLE DIALOGEX 10, 15, 227, 71 -STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +IDD_EDIT_VARIABLE DIALOGEX 10, 15, 372, 71 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUPWINDOW | WS_CAPTION | WS_VISIBLE | WS_THICKFRAME +CAPTION "Edit Variable" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + SCROLLBAR IDC_DIALOG_GRIP, 365, 64, 7, 7, SBS_SIZEGRIP + LTEXT "&Nazwa zmiennej:", IDC_STATIC, 7, 14, 50, 8 + EDITTEXT IDC_VARIABLE_NAME, 75, 12, 289, 12, ES_AUTOHSCROLL + LTEXT "&Wartość zmiennej:", IDC_STATIC, 7, 32, 50, 8 + EDITTEXT IDC_VARIABLE_VALUE, 75, 30, 289, 12, ES_AUTOHSCROLL + DEFPUSHBUTTON "OK", IDOK, 260, 50, 50, 14 + PUSHBUTTON "Anuluj", IDCANCEL, 314, 50, 50, 14 + PUSHBUTTON "Browse Directory...", IDC_BUTTON_BROWSE_FOLDER, 6, 50, 75, 14 + PUSHBUTTON "Browse Files...", IDC_BUTTON_BROWSE_FILE, 86, 50, 75, 14 +END + +IDD_EDIT_VARIABLE_FANCY DIALOGEX 10, 15, 300, 250 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUPWINDOW | WS_CAPTION | WS_VISIBLE | WS_THICKFRAME CAPTION "Edycja zmiennej" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - LTEXT "&Nazwa zmiennej:", IDC_STATIC, 7, 14, 68, 8 - EDITTEXT IDC_VARIABLE_NAME, 75, 12, 145, 12, ES_AUTOHSCROLL - LTEXT "&Wartość zmiennej:", IDC_STATIC, 7, 32, 68, 8 - EDITTEXT IDC_VARIABLE_VALUE, 75, 30, 145, 12, ES_AUTOHSCROLL - DEFPUSHBUTTON "OK", IDOK, 116, 50, 50, 14 - PUSHBUTTON "Anuluj", IDCANCEL, 170, 50, 50, 14 + SCROLLBAR IDC_DIALOG_GRIP, 293, 243, 7, 7, SBS_SIZEGRIP + CONTROL "", IDC_LIST_VARIABLE_VALUE, "SysListView32", LVS_NOCOLUMNHEADER | LVS_EDITLABELS | LVS_SHOWSELALWAYS | + LVS_SINGLESEL | LVS_REPORT | WS_BORDER | WS_TABSTOP, 10, 10, 224, 208, WS_EX_CLIENTEDGE + PUSHBUTTON "New", IDC_BUTTON_NEW, 242, 10, 50, 14 + PUSHBUTTON "Edit", IDC_BUTTON_EDIT, 242, 30, 50, 14 + PUSHBUTTON "Browse...", IDC_BUTTON_BROWSE_FOLDER, 242, 50, 50, 14 + PUSHBUTTON "Delete", IDC_BUTTON_DELETE, 242, 70, 50, 14 + PUSHBUTTON "Move Up", IDC_BUTTON_MOVE_UP, 242, 100, 50, 14 + PUSHBUTTON "Move Down", IDC_BUTTON_MOVE_DOWN, 242, 120, 50, 14 + PUSHBUTTON "Edit text...", IDC_BUTTON_EDIT_TEXT, 242, 150, 50, 14 + DEFPUSHBUTTON "OK", IDOK, 188, 228, 50, 14 + PUSHBUTTON "Anuluj", IDCANCEL, 242, 228, 50, 14 END IDD_LICENCE DIALOGEX 6, 5, 267, 159 @@ -353,4 +375,6 @@ BEGIN IDS_HWPROFILE_ALREADY_IN_USE "Nazwa profilu jest już w użyciu." IDS_HWPROFILE_PROFILE "Profil" IDS_HWPROFILE_WARNING "Uwaga" + IDS_ENVIRONMENT_WARNING "Any changes that have been done will be discarded and the variable's value will be edited as text." + IDS_ENVIRONMENT_WARNING_TITLE "System Properties" END diff --git a/dll/cpl/sysdm/lang/pt-PT.rc b/dll/cpl/sysdm/lang/pt-PT.rc index 47b31fa31e9..8689cc603c6 100644 --- a/dll/cpl/sysdm/lang/pt-PT.rc +++ b/dll/cpl/sysdm/lang/pt-PT.rc @@ -282,17 +282,39 @@ BEGIN PUSHBUTTON "&Cancelar", IDCANCEL, 195, 224, 50, 14 END -IDD_EDIT_VARIABLE DIALOGEX 10, 15, 227, 71 -STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +IDD_EDIT_VARIABLE DIALOGEX 10, 15, 372, 71 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUPWINDOW | WS_CAPTION | WS_VISIBLE | WS_THICKFRAME +CAPTION "Editar variável" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + SCROLLBAR IDC_DIALOG_GRIP, 365, 64, 7, 7, SBS_SIZEGRIP + LTEXT "&Nome da variável:", IDC_STATIC, 7, 14, 50, 8 + EDITTEXT IDC_VARIABLE_NAME, 75, 12, 289, 12, ES_AUTOHSCROLL + LTEXT "&Valor da variável:", IDC_STATIC, 7, 32, 50, 8 + EDITTEXT IDC_VARIABLE_VALUE, 75, 30, 289, 12, ES_AUTOHSCROLL + DEFPUSHBUTTON "OK", IDOK, 260, 50, 50, 14 + PUSHBUTTON "Cancelar", IDCANCEL, 314, 50, 50, 14 + PUSHBUTTON "Browse Directory...", IDC_BUTTON_BROWSE_FOLDER, 6, 50, 75, 14 + PUSHBUTTON "Browse Files...", IDC_BUTTON_BROWSE_FILE, 86, 50, 75, 14 +END + +IDD_EDIT_VARIABLE_FANCY DIALOGEX 10, 15, 300, 250 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUPWINDOW | WS_CAPTION | WS_VISIBLE | WS_THICKFRAME CAPTION "Editar variável" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - LTEXT "&Nome da variável:", IDC_STATIC, 7, 14, 68, 8 - EDITTEXT IDC_VARIABLE_NAME, 75, 12, 145, 12, ES_AUTOHSCROLL - LTEXT "&Valor da variável:", IDC_STATIC, 7, 32, 68, 8 - EDITTEXT IDC_VARIABLE_VALUE, 75, 30, 145, 12, ES_AUTOHSCROLL - DEFPUSHBUTTON "&OK", IDOK, 116, 50, 50, 14 - PUSHBUTTON "&Cancelar", IDCANCEL, 170, 50, 50, 14 + SCROLLBAR IDC_DIALOG_GRIP, 293, 243, 7, 7, SBS_SIZEGRIP + CONTROL "", IDC_LIST_VARIABLE_VALUE, "SysListView32", LVS_NOCOLUMNHEADER | LVS_EDITLABELS | LVS_SHOWSELALWAYS | + LVS_SINGLESEL | LVS_REPORT | WS_BORDER | WS_TABSTOP, 10, 10, 224, 208, WS_EX_CLIENTEDGE + PUSHBUTTON "New", IDC_BUTTON_NEW, 242, 10, 50, 14 + PUSHBUTTON "Edit", IDC_BUTTON_EDIT, 242, 30, 50, 14 + PUSHBUTTON "Browse...", IDC_BUTTON_BROWSE_FOLDER, 242, 50, 50, 14 + PUSHBUTTON "Delete", IDC_BUTTON_DELETE, 242, 70, 50, 14 + PUSHBUTTON "Move Up", IDC_BUTTON_MOVE_UP, 242, 100, 50, 14 + PUSHBUTTON "Move Down", IDC_BUTTON_MOVE_DOWN, 242, 120, 50, 14 + PUSHBUTTON "Edit text...", IDC_BUTTON_EDIT_TEXT, 242, 150, 50, 14 + DEFPUSHBUTTON "OK", IDOK, 188, 228, 50, 14 + PUSHBUTTON "Cancelar", IDCANCEL, 242, 228, 50, 14 END IDD_LICENCE DIALOGEX 6, 5, 267, 159 @@ -348,4 +370,6 @@ BEGIN IDS_HWPROFILE_ALREADY_IN_USE "O nome do perfil já está em uso." IDS_HWPROFILE_PROFILE "Perfil" IDS_HWPROFILE_WARNING "Aviso" + IDS_ENVIRONMENT_WARNING "Any changes that have been done will be discarded and the variable's value will be edited as text." + IDS_ENVIRONMENT_WARNING_TITLE "System Properties" END diff --git a/dll/cpl/sysdm/lang/ro-RO.rc b/dll/cpl/sysdm/lang/ro-RO.rc index efd123e40c7..f41b944947d 100644 --- a/dll/cpl/sysdm/lang/ro-RO.rc +++ b/dll/cpl/sysdm/lang/ro-RO.rc @@ -287,17 +287,39 @@ BEGIN PUSHBUTTON "A&nulează", IDCANCEL, 195, 224, 50, 14 END -IDD_EDIT_VARIABLE DIALOGEX 10, 15, 227, 71 -STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +IDD_EDIT_VARIABLE DIALOGEX 10, 15, 372, 71 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUPWINDOW | WS_CAPTION | WS_VISIBLE | WS_THICKFRAME +CAPTION "Editare variablă" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + SCROLLBAR IDC_DIALOG_GRIP, 365, 64, 7, 7, SBS_SIZEGRIP + LTEXT "N&ume variabilă:", IDC_STATIC, 7, 14, 50, 8 + EDITTEXT IDC_VARIABLE_NAME, 75, 12, 289, 12, ES_AUTOHSCROLL + LTEXT "&Valoare variabilă:", IDC_STATIC, 7, 32, 50, 8 + EDITTEXT IDC_VARIABLE_VALUE, 75, 30, 289, 12, ES_AUTOHSCROLL + DEFPUSHBUTTON "Confirmă", IDOK, 260, 50, 50, 14 + PUSHBUTTON "Anulează", IDCANCEL, 314, 50, 50, 14 + PUSHBUTTON "Browse Directory...", IDC_BUTTON_BROWSE_FOLDER, 6, 50, 75, 14 + PUSHBUTTON "Browse Files...", IDC_BUTTON_BROWSE_FILE, 86, 50, 75, 14 +END + +IDD_EDIT_VARIABLE_FANCY DIALOGEX 10, 15, 300, 250 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUPWINDOW | WS_CAPTION | WS_VISIBLE | WS_THICKFRAME CAPTION "Editare variablă" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - LTEXT "N&ume variabilă:", IDC_STATIC, 7, 14, 68, 8 - EDITTEXT IDC_VARIABLE_NAME, 75, 12, 145, 12, ES_AUTOHSCROLL - LTEXT "&Valoare variabilă:", IDC_STATIC, 7, 32, 68, 8 - EDITTEXT IDC_VARIABLE_VALUE, 75, 30, 145, 12, ES_AUTOHSCROLL - DEFPUSHBUTTON "Con&firmă", IDOK, 116, 50, 50, 14 - PUSHBUTTON "A&nulează", IDCANCEL, 170, 50, 50, 14 + SCROLLBAR IDC_DIALOG_GRIP, 293, 243, 7, 7, SBS_SIZEGRIP + CONTROL "", IDC_LIST_VARIABLE_VALUE, "SysListView32", LVS_NOCOLUMNHEADER | LVS_EDITLABELS | LVS_SHOWSELALWAYS | + LVS_SINGLESEL | LVS_REPORT | WS_BORDER | WS_TABSTOP, 10, 10, 224, 208, WS_EX_CLIENTEDGE + PUSHBUTTON "New", IDC_BUTTON_NEW, 242, 10, 50, 14 + PUSHBUTTON "Edit", IDC_BUTTON_EDIT, 242, 30, 50, 14 + PUSHBUTTON "Browse...", IDC_BUTTON_BROWSE_FOLDER, 242, 50, 50, 14 + PUSHBUTTON "Delete", IDC_BUTTON_DELETE, 242, 70, 50, 14 + PUSHBUTTON "Move Up", IDC_BUTTON_MOVE_UP, 242, 100, 50, 14 + PUSHBUTTON "Move Down", IDC_BUTTON_MOVE_DOWN, 242, 120, 50, 14 + PUSHBUTTON "Edit text...", IDC_BUTTON_EDIT_TEXT, 242, 150, 50, 14 + DEFPUSHBUTTON "Confirmă", IDOK, 188, 228, 50, 14 + PUSHBUTTON "Anulează", IDCANCEL, 242, 228, 50, 14 END IDD_LICENCE DIALOGEX 6, 5, 267, 159 @@ -353,4 +375,6 @@ BEGIN IDS_HWPROFILE_ALREADY_IN_USE "Profilul este deja în uz." IDS_HWPROFILE_PROFILE "Profil" IDS_HWPROFILE_WARNING "Avertisment" + IDS_ENVIRONMENT_WARNING "Any changes that have been done will be discarded and the variable's value will be edited as text." + IDS_ENVIRONMENT_WARNING_TITLE "System Properties" END diff --git a/dll/cpl/sysdm/lang/ru-RU.rc b/dll/cpl/sysdm/lang/ru-RU.rc index 8edb10cd575..0a479808c4a 100644 --- a/dll/cpl/sysdm/lang/ru-RU.rc +++ b/dll/cpl/sysdm/lang/ru-RU.rc @@ -278,17 +278,39 @@ BEGIN PUSHBUTTON "Отмена", IDCANCEL, 195, 224, 50, 14 END -IDD_EDIT_VARIABLE DIALOGEX 10, 15, 227, 71 -STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +IDD_EDIT_VARIABLE DIALOGEX 10, 15, 372, 71 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUPWINDOW | WS_CAPTION | WS_VISIBLE | WS_THICKFRAME +CAPTION "Изменение переменной" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + SCROLLBAR IDC_DIALOG_GRIP, 365, 64, 7, 7, SBS_SIZEGRIP + LTEXT "Им&я переменной:", IDC_STATIC, 7, 14, 50, 8 + EDITTEXT IDC_VARIABLE_NAME, 75, 12, 289, 12, ES_AUTOHSCROLL + LTEXT "Значение перемен&ной:", IDC_STATIC, 7, 32, 50, 8 + EDITTEXT IDC_VARIABLE_VALUE, 75, 30, 289, 12, ES_AUTOHSCROLL + DEFPUSHBUTTON "OK", IDOK, 260, 50, 50, 14 + PUSHBUTTON "Отмена", IDCANCEL, 314, 50, 50, 14 + PUSHBUTTON "Browse Directory...", IDC_BUTTON_BROWSE_FOLDER, 6, 50, 75, 14 + PUSHBUTTON "Browse Files...", IDC_BUTTON_BROWSE_FILE, 86, 50, 75, 14 +END + +IDD_EDIT_VARIABLE_FANCY DIALOGEX 10, 15, 300, 250 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUPWINDOW | WS_CAPTION | WS_VISIBLE | WS_THICKFRAME CAPTION "Изменение переменной" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - LTEXT "Им&я переменной:", IDC_STATIC, 7, 14, 68, 8 - EDITTEXT IDC_VARIABLE_NAME, 75, 12, 145, 12, ES_AUTOHSCROLL - LTEXT "Значение перемен&ной:", IDC_STATIC, 7, 32, 68, 8 - EDITTEXT IDC_VARIABLE_VALUE, 75, 30, 145, 12, ES_AUTOHSCROLL - DEFPUSHBUTTON "OK", IDOK, 116, 50, 50, 14 - PUSHBUTTON "Отмена", IDCANCEL, 170, 50, 50, 14 + SCROLLBAR IDC_DIALOG_GRIP, 293, 243, 7, 7, SBS_SIZEGRIP + CONTROL "", IDC_LIST_VARIABLE_VALUE, "SysListView32", LVS_NOCOLUMNHEADER | LVS_EDITLABELS | LVS_SHOWSELALWAYS | + LVS_SINGLESEL | LVS_REPORT | WS_BORDER | WS_TABSTOP, 10, 10, 224, 208, WS_EX_CLIENTEDGE + PUSHBUTTON "New", IDC_BUTTON_NEW, 242, 10, 50, 14 + PUSHBUTTON "Edit", IDC_BUTTON_EDIT, 242, 30, 50, 14 + PUSHBUTTON "Browse...", IDC_BUTTON_BROWSE_FOLDER, 242, 50, 50, 14 + PUSHBUTTON "Delete", IDC_BUTTON_DELETE, 242, 70, 50, 14 + PUSHBUTTON "Move Up", IDC_BUTTON_MOVE_UP, 242, 100, 50, 14 + PUSHBUTTON "Move Down", IDC_BUTTON_MOVE_DOWN, 242, 120, 50, 14 + PUSHBUTTON "Edit text...", IDC_BUTTON_EDIT_TEXT, 242, 150, 50, 14 + DEFPUSHBUTTON "OK", IDOK, 188, 228, 50, 14 + PUSHBUTTON "Отмена", IDCANCEL, 242, 228, 50, 14 END IDD_LICENCE DIALOGEX 6, 5, 267, 159 @@ -344,4 +366,6 @@ BEGIN IDS_HWPROFILE_ALREADY_IN_USE "Профиль с таким названием уже существует." IDS_HWPROFILE_PROFILE "Профиль" IDS_HWPROFILE_WARNING "Внимание" + IDS_ENVIRONMENT_WARNING "Any changes that have been done will be discarded and the variable's value will be edited as text." + IDS_ENVIRONMENT_WARNING_TITLE "System Properties" END diff --git a/dll/cpl/sysdm/lang/sk-SK.rc b/dll/cpl/sysdm/lang/sk-SK.rc index 4fc717a7b53..e5d3d1ced4c 100644 --- a/dll/cpl/sysdm/lang/sk-SK.rc +++ b/dll/cpl/sysdm/lang/sk-SK.rc @@ -286,17 +286,39 @@ BEGIN PUSHBUTTON "Zrušiť", IDCANCEL, 195, 224, 50, 14 END -IDD_EDIT_VARIABLE DIALOGEX 10, 15, 227, 71 -STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +IDD_EDIT_VARIABLE DIALOGEX 10, 15, 372, 71 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUPWINDOW | WS_CAPTION | WS_VISIBLE | WS_THICKFRAME +CAPTION "Upraviť premennú" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + SCROLLBAR IDC_DIALOG_GRIP, 365, 64, 7, 7, SBS_SIZEGRIP + LTEXT "&Názov premennej:", IDC_STATIC, 7, 14, 50, 8 + EDITTEXT IDC_VARIABLE_NAME, 75, 12, 289, 12, ES_AUTOHSCROLL + LTEXT "&Hodnota premennej:", IDC_STATIC, 7, 32, 50, 8 + EDITTEXT IDC_VARIABLE_VALUE, 75, 30, 289, 12, ES_AUTOHSCROLL + DEFPUSHBUTTON "OK", IDOK, 260, 50, 50, 14 + PUSHBUTTON "Zrušiť", IDCANCEL, 314, 50, 50, 14 + PUSHBUTTON "Browse Directory...", IDC_BUTTON_BROWSE_FOLDER, 6, 50, 75, 14 + PUSHBUTTON "Browse Files...", IDC_BUTTON_BROWSE_FILE, 86, 50, 75, 14 +END + +IDD_EDIT_VARIABLE_FANCY DIALOGEX 10, 15, 300, 250 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUPWINDOW | WS_CAPTION | WS_VISIBLE | WS_THICKFRAME CAPTION "Upraviť premennú" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - LTEXT "&Názov premennej:", IDC_STATIC, 7, 14, 68, 8 - EDITTEXT IDC_VARIABLE_NAME, 75, 12, 145, 12, ES_AUTOHSCROLL - LTEXT "&Hodnota premennej:", IDC_STATIC, 7, 32, 68, 8 - EDITTEXT IDC_VARIABLE_VALUE, 75, 30, 145, 12, ES_AUTOHSCROLL - DEFPUSHBUTTON "OK", IDOK, 116, 50, 50, 14 - PUSHBUTTON "Zrušiť", IDCANCEL, 170, 50, 50, 14 + SCROLLBAR IDC_DIALOG_GRIP, 293, 243, 7, 7, SBS_SIZEGRIP + CONTROL "", IDC_LIST_VARIABLE_VALUE, "SysListView32", LVS_NOCOLUMNHEADER | LVS_EDITLABELS | LVS_SHOWSELALWAYS | + LVS_SINGLESEL | LVS_REPORT | WS_BORDER | WS_TABSTOP, 10, 10, 224, 208, WS_EX_CLIENTEDGE + PUSHBUTTON "New", IDC_BUTTON_NEW, 242, 10, 50, 14 + PUSHBUTTON "Edit", IDC_BUTTON_EDIT, 242, 30, 50, 14 + PUSHBUTTON "Browse...", IDC_BUTTON_BROWSE_FOLDER, 242, 50, 50, 14 + PUSHBUTTON "Delete", IDC_BUTTON_DELETE, 242, 70, 50, 14 + PUSHBUTTON "Move Up", IDC_BUTTON_MOVE_UP, 242, 100, 50, 14 + PUSHBUTTON "Move Down", IDC_BUTTON_MOVE_DOWN, 242, 120, 50, 14 + PUSHBUTTON "Edit text...", IDC_BUTTON_EDIT_TEXT, 242, 150, 50, 14 + DEFPUSHBUTTON "OK", IDOK, 188, 228, 50, 14 + PUSHBUTTON "Zrušiť", IDCANCEL, 242, 228, 50, 14 END IDD_LICENCE DIALOGEX 6, 5, 267, 159 @@ -352,4 +374,6 @@ BEGIN IDS_HWPROFILE_ALREADY_IN_USE "The profile name is already in use." IDS_HWPROFILE_PROFILE "Profile" IDS_HWPROFILE_WARNING "Warning" + IDS_ENVIRONMENT_WARNING "Any changes that have been done will be discarded and the variable's value will be edited as text." + IDS_ENVIRONMENT_WARNING_TITLE "System Properties" END diff --git a/dll/cpl/sysdm/lang/sq-AL.rc b/dll/cpl/sysdm/lang/sq-AL.rc index e1f6e226845..aff00d43626 100644 --- a/dll/cpl/sysdm/lang/sq-AL.rc +++ b/dll/cpl/sysdm/lang/sq-AL.rc @@ -278,17 +278,39 @@ BEGIN PUSHBUTTON "Anulo", IDCANCEL, 195, 224, 50, 14 END -IDD_EDIT_VARIABLE DIALOGEX 10, 15, 227, 71 -STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +IDD_EDIT_VARIABLE DIALOGEX 10, 15, 372, 71 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUPWINDOW | WS_CAPTION | WS_VISIBLE | WS_THICKFRAME +CAPTION "Modifiko Variablë" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + SCROLLBAR IDC_DIALOG_GRIP, 365, 64, 7, 7, SBS_SIZEGRIP + LTEXT "&Emrat Variablë:", IDC_STATIC, 7, 14, 50, 8 + EDITTEXT IDC_VARIABLE_NAME, 75, 12, 289, 12, ES_AUTOHSCROLL + LTEXT "&Vlera Variablë:", IDC_STATIC, 7, 32, 50, 8 + EDITTEXT IDC_VARIABLE_VALUE, 75, 30, 289, 12, ES_AUTOHSCROLL + DEFPUSHBUTTON "OK", IDOK, 260, 50, 50, 14 + PUSHBUTTON "Anulo", IDCANCEL, 314, 50, 50, 14 + PUSHBUTTON "Browse Directory...", IDC_BUTTON_BROWSE_FOLDER, 6, 50, 75, 14 + PUSHBUTTON "Browse Files...", IDC_BUTTON_BROWSE_FILE, 86, 50, 75, 14 +END + +IDD_EDIT_VARIABLE_FANCY DIALOGEX 10, 15, 300, 250 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUPWINDOW | WS_CAPTION | WS_VISIBLE | WS_THICKFRAME CAPTION "Modifiko Variablë" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - LTEXT "&Emrat Variablë:", IDC_STATIC, 7, 14, 68, 8 - EDITTEXT IDC_VARIABLE_NAME, 75, 12, 145, 12, ES_AUTOHSCROLL - LTEXT "&Vlera Variablë:", IDC_STATIC, 7, 32, 68, 8 - EDITTEXT IDC_VARIABLE_VALUE, 75, 30, 145, 12, ES_AUTOHSCROLL - DEFPUSHBUTTON "OK", IDOK, 116, 50, 50, 14 - PUSHBUTTON "Anulo", IDCANCEL, 170, 50, 50, 14 + SCROLLBAR IDC_DIALOG_GRIP, 293, 243, 7, 7, SBS_SIZEGRIP + CONTROL "", IDC_LIST_VARIABLE_VALUE, "SysListView32", LVS_NOCOLUMNHEADER | LVS_EDITLABELS | LVS_SHOWSELALWAYS | + LVS_SINGLESEL | LVS_REPORT | WS_BORDER | WS_TABSTOP, 10, 10, 224, 208, WS_EX_CLIENTEDGE + PUSHBUTTON "New", IDC_BUTTON_NEW, 242, 10, 50, 14 + PUSHBUTTON "Edit", IDC_BUTTON_EDIT, 242, 30, 50, 14 + PUSHBUTTON "Browse...", IDC_BUTTON_BROWSE_FOLDER, 242, 50, 50, 14 + PUSHBUTTON "Delete", IDC_BUTTON_DELETE, 242, 70, 50, 14 + PUSHBUTTON "Move Up", IDC_BUTTON_MOVE_UP, 242, 100, 50, 14 + PUSHBUTTON "Move Down", IDC_BUTTON_MOVE_DOWN, 242, 120, 50, 14 + PUSHBUTTON "Edit text...", IDC_BUTTON_EDIT_TEXT, 242, 150, 50, 14 + DEFPUSHBUTTON "OK", IDOK, 188, 228, 50, 14 + PUSHBUTTON "Anulo", IDCANCEL, 242, 228, 50, 14 END IDD_LICENCE DIALOGEX 6, 5, 267, 159 @@ -344,4 +366,6 @@ BEGIN IDS_HWPROFILE_ALREADY_IN_USE "The profile name is already in use." IDS_HWPROFILE_PROFILE "Profile" IDS_HWPROFILE_WARNING "Warning" + IDS_ENVIRONMENT_WARNING "Any changes that have been done will be discarded and the variable's value will be edited as text." + IDS_ENVIRONMENT_WARNING_TITLE "System Properties" END diff --git a/dll/cpl/sysdm/lang/sv-SE.rc b/dll/cpl/sysdm/lang/sv-SE.rc index e2a57183a86..76331c99c91 100644 --- a/dll/cpl/sysdm/lang/sv-SE.rc +++ b/dll/cpl/sysdm/lang/sv-SE.rc @@ -280,17 +280,39 @@ BEGIN PUSHBUTTON "Avbryt", IDCANCEL, 195, 224, 50, 14 END -IDD_EDIT_VARIABLE DIALOGEX 10, 15, 227, 71 -STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +IDD_EDIT_VARIABLE DIALOGEX 10, 15, 372, 71 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUPWINDOW | WS_CAPTION | WS_VISIBLE | WS_THICKFRAME +CAPTION "Redigera variabel" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + SCROLLBAR IDC_DIALOG_GRIP, 365, 64, 7, 7, SBS_SIZEGRIP + LTEXT "Variabel&namn:", IDC_STATIC, 7, 14, 50, 8 + EDITTEXT IDC_VARIABLE_NAME, 75, 12, 289, 12, ES_AUTOHSCROLL + LTEXT "Variabel&värde:", IDC_STATIC, 7, 32, 50, 8 + EDITTEXT IDC_VARIABLE_VALUE, 75, 30, 289, 12, ES_AUTOHSCROLL + DEFPUSHBUTTON "OK", IDOK, 260, 50, 50, 14 + PUSHBUTTON "Avbryt", IDCANCEL, 314, 50, 50, 14 + PUSHBUTTON "Browse Directory...", IDC_BUTTON_BROWSE_FOLDER, 6, 50, 75, 14 + PUSHBUTTON "Browse Files...", IDC_BUTTON_BROWSE_FILE, 86, 50, 75, 14 +END + +IDD_EDIT_VARIABLE_FANCY DIALOGEX 10, 15, 300, 250 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUPWINDOW | WS_CAPTION | WS_VISIBLE | WS_THICKFRAME CAPTION "Redigera variabel" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - LTEXT "Variabel&namn:", IDC_STATIC, 7, 14, 68, 8 - EDITTEXT IDC_VARIABLE_NAME, 75, 12, 145, 12, ES_AUTOHSCROLL - LTEXT "Variabel&värde:", IDC_STATIC, 7, 32, 68, 8 - EDITTEXT IDC_VARIABLE_VALUE, 75, 30, 145, 12, ES_AUTOHSCROLL - DEFPUSHBUTTON "OK", IDOK, 116, 50, 50, 14 - PUSHBUTTON "Avbryt", IDCANCEL, 170, 50, 50, 14 + SCROLLBAR IDC_DIALOG_GRIP, 293, 243, 7, 7, SBS_SIZEGRIP + CONTROL "", IDC_LIST_VARIABLE_VALUE, "SysListView32", LVS_NOCOLUMNHEADER | LVS_EDITLABELS | LVS_SHOWSELALWAYS | + LVS_SINGLESEL | LVS_REPORT | WS_BORDER | WS_TABSTOP, 10, 10, 224, 208, WS_EX_CLIENTEDGE + PUSHBUTTON "New", IDC_BUTTON_NEW, 242, 10, 50, 14 + PUSHBUTTON "Edit", IDC_BUTTON_EDIT, 242, 30, 50, 14 + PUSHBUTTON "Browse...", IDC_BUTTON_BROWSE_FOLDER, 242, 50, 50, 14 + PUSHBUTTON "Delete", IDC_BUTTON_DELETE, 242, 70, 50, 14 + PUSHBUTTON "Move Up", IDC_BUTTON_MOVE_UP, 242, 100, 50, 14 + PUSHBUTTON "Move Down", IDC_BUTTON_MOVE_DOWN, 242, 120, 50, 14 + PUSHBUTTON "Edit text...", IDC_BUTTON_EDIT_TEXT, 242, 150, 50, 14 + DEFPUSHBUTTON "OK", IDOK, 188, 228, 50, 14 + PUSHBUTTON "Avbryt", IDCANCEL, 242, 228, 50, 14 END IDD_LICENCE DIALOGEX 6, 5, 267, 159 @@ -346,4 +368,6 @@ BEGIN IDS_HWPROFILE_ALREADY_IN_USE "The profile name is already in use." IDS_HWPROFILE_PROFILE "Profile" IDS_HWPROFILE_WARNING "Warning" + IDS_ENVIRONMENT_WARNING "Any changes that have been done will be discarded and the variable's value will be edited as text." + IDS_ENVIRONMENT_WARNING_TITLE "System Properties" END diff --git a/dll/cpl/sysdm/lang/tr-TR.rc b/dll/cpl/sysdm/lang/tr-TR.rc index 0c825e89e69..ba285d9ecb6 100644 --- a/dll/cpl/sysdm/lang/tr-TR.rc +++ b/dll/cpl/sysdm/lang/tr-TR.rc @@ -280,17 +280,39 @@ BEGIN PUSHBUTTON "İptal", IDCANCEL, 195, 224, 50, 14 END -IDD_EDIT_VARIABLE DIALOGEX 10, 15, 227, 71 -STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +IDD_EDIT_VARIABLE DIALOGEX 10, 15, 372, 71 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUPWINDOW | WS_CAPTION | WS_VISIBLE | WS_THICKFRAME CAPTION "Değişkenleri Düzenle" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - LTEXT "&Değişken adı:", IDC_STATIC, 7, 14, 68, 8 - EDITTEXT IDC_VARIABLE_NAME, 75, 12, 145, 12, ES_AUTOHSCROLL - LTEXT "D&eğişken değeri:", IDC_STATIC, 7, 32, 68, 8 - EDITTEXT IDC_VARIABLE_VALUE, 75, 30, 145, 12, ES_AUTOHSCROLL - DEFPUSHBUTTON "Tamam", IDOK, 116, 50, 50, 14 - PUSHBUTTON "İptal", IDCANCEL, 170, 50, 50, 14 + SCROLLBAR IDC_DIALOG_GRIP, 365, 64, 7, 7, SBS_SIZEGRIP + LTEXT "&Değişken adı:", IDC_STATIC, 7, 14, 50, 8 + EDITTEXT IDC_VARIABLE_NAME, 75, 12, 289, 12, ES_AUTOHSCROLL + LTEXT "D&eğişken değeri:", IDC_STATIC, 7, 32, 50, 8 + EDITTEXT IDC_VARIABLE_VALUE, 75, 30, 289, 12, ES_AUTOHSCROLL + DEFPUSHBUTTON "Tamam", IDOK, 260, 50, 50, 14 + PUSHBUTTON "İptal", IDCANCEL, 314, 50, 50, 14 + PUSHBUTTON "Browse Directory...", IDC_BUTTON_BROWSE_FOLDER, 6, 50, 75, 14 + PUSHBUTTON "Browse Files...", IDC_BUTTON_BROWSE_FILE, 86, 50, 75, 14 +END + +IDD_EDIT_VARIABLE_FANCY DIALOGEX 10, 15, 300, 250 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUPWINDOW | WS_CAPTION | WS_VISIBLE | WS_THICKFRAME +CAPTION "Değişken Düzenle" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + SCROLLBAR IDC_DIALOG_GRIP, 293, 243, 7, 7, SBS_SIZEGRIP + CONTROL "", IDC_LIST_VARIABLE_VALUE, "SysListView32", LVS_NOCOLUMNHEADER | LVS_EDITLABELS | LVS_SHOWSELALWAYS | + LVS_SINGLESEL | LVS_REPORT | WS_BORDER | WS_TABSTOP, 10, 10, 224, 208, WS_EX_CLIENTEDGE + PUSHBUTTON "New", IDC_BUTTON_NEW, 242, 10, 50, 14 + PUSHBUTTON "Edit", IDC_BUTTON_EDIT, 242, 30, 50, 14 + PUSHBUTTON "Browse...", IDC_BUTTON_BROWSE_FOLDER, 242, 50, 50, 14 + PUSHBUTTON "Delete", IDC_BUTTON_DELETE, 242, 70, 50, 14 + PUSHBUTTON "Move Up", IDC_BUTTON_MOVE_UP, 242, 100, 50, 14 + PUSHBUTTON "Move Down", IDC_BUTTON_MOVE_DOWN, 242, 120, 50, 14 + PUSHBUTTON "Edit text...", IDC_BUTTON_EDIT_TEXT, 242, 150, 50, 14 + DEFPUSHBUTTON "Tamam", IDOK, 188, 228, 50, 14 + PUSHBUTTON "İptal", IDCANCEL, 242, 228, 50, 14 END IDD_LICENCE DIALOGEX 6, 5, 267, 159 @@ -346,4 +368,6 @@ BEGIN IDS_HWPROFILE_ALREADY_IN_USE "Profil adı zaten kullanımda." IDS_HWPROFILE_PROFILE "Profil" IDS_HWPROFILE_WARNING "Uyarı" + IDS_ENVIRONMENT_WARNING "Any changes that have been done will be discarded and the variable's value will be edited as text." + IDS_ENVIRONMENT_WARNING_TITLE "System Properties" END diff --git a/dll/cpl/sysdm/lang/uk-UA.rc b/dll/cpl/sysdm/lang/uk-UA.rc index 3b280e6bc6b..de6dd0c79f9 100644 --- a/dll/cpl/sysdm/lang/uk-UA.rc +++ b/dll/cpl/sysdm/lang/uk-UA.rc @@ -286,17 +286,39 @@ BEGIN PUSHBUTTON "Скасувати", IDCANCEL, 195, 224, 50, 14 END -IDD_EDIT_VARIABLE DIALOGEX 10, 15, 227, 71 -STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +IDD_EDIT_VARIABLE DIALOGEX 10, 15, 372, 71 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUPWINDOW | WS_CAPTION | WS_VISIBLE | WS_THICKFRAME +CAPTION "Редагування змінної" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + SCROLLBAR IDC_DIALOG_GRIP, 365, 64, 7, 7, SBS_SIZEGRIP + LTEXT "&Ім'я змінної:", IDC_STATIC, 7, 14, 50, 8 + EDITTEXT IDC_VARIABLE_NAME, 75, 12, 289, 12, ES_AUTOHSCROLL + LTEXT "&Значення змінної:", IDC_STATIC, 7, 32, 50, 8 + EDITTEXT IDC_VARIABLE_VALUE, 75, 30, 289, 12, ES_AUTOHSCROLL + DEFPUSHBUTTON "OK", IDOK, 260, 50, 50, 14 + PUSHBUTTON "Скасувати", IDCANCEL, 314, 50, 50, 14 + PUSHBUTTON "Browse Directory...", IDC_BUTTON_BROWSE_FOLDER, 6, 50, 75, 14 + PUSHBUTTON "Browse Files...", IDC_BUTTON_BROWSE_FILE, 86, 50, 75, 14 +END + +IDD_EDIT_VARIABLE_FANCY DIALOGEX 10, 15, 300, 250 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUPWINDOW | WS_CAPTION | WS_VISIBLE | WS_THICKFRAME CAPTION "Редагування змінної" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - LTEXT "&Ім'я змінної:", IDC_STATIC, 7, 14, 68, 8 - EDITTEXT IDC_VARIABLE_NAME, 75, 12, 145, 12, ES_AUTOHSCROLL - LTEXT "&Значення змінної:", IDC_STATIC, 7, 32, 68, 8 - EDITTEXT IDC_VARIABLE_VALUE, 75, 30, 145, 12, ES_AUTOHSCROLL - DEFPUSHBUTTON "OK", IDOK, 116, 50, 50, 14 - PUSHBUTTON "Скасувати", IDCANCEL, 170, 50, 50, 14 + SCROLLBAR IDC_DIALOG_GRIP, 293, 243, 7, 7, SBS_SIZEGRIP + CONTROL "", IDC_LIST_VARIABLE_VALUE, "SysListView32", LVS_NOCOLUMNHEADER | LVS_EDITLABELS | LVS_SHOWSELALWAYS | + LVS_SINGLESEL | LVS_REPORT | WS_BORDER | WS_TABSTOP, 10, 10, 224, 208, WS_EX_CLIENTEDGE + PUSHBUTTON "New", IDC_BUTTON_NEW, 242, 10, 50, 14 + PUSHBUTTON "Edit", IDC_BUTTON_EDIT, 242, 30, 50, 14 + PUSHBUTTON "Browse...", IDC_BUTTON_BROWSE_FOLDER, 242, 50, 50, 14 + PUSHBUTTON "Delete", IDC_BUTTON_DELETE, 242, 70, 50, 14 + PUSHBUTTON "Move Up", IDC_BUTTON_MOVE_UP, 242, 100, 50, 14 + PUSHBUTTON "Move Down", IDC_BUTTON_MOVE_DOWN, 242, 120, 50, 14 + PUSHBUTTON "Edit text...", IDC_BUTTON_EDIT_TEXT, 242, 150, 50, 14 + DEFPUSHBUTTON "OK", IDOK, 188, 228, 50, 14 + PUSHBUTTON "Скасувати", IDCANCEL, 242, 228, 50, 14 END IDD_LICENCE DIALOGEX 6, 5, 267, 159 @@ -352,4 +374,6 @@ BEGIN IDS_HWPROFILE_ALREADY_IN_USE "Ім'я вже зайнято." IDS_HWPROFILE_PROFILE "Профіль" IDS_HWPROFILE_WARNING "Увага" + IDS_ENVIRONMENT_WARNING "Any changes that have been done will be discarded and the variable's value will be edited as text." + IDS_ENVIRONMENT_WARNING_TITLE "System Properties" END diff --git a/dll/cpl/sysdm/lang/zh-CN.rc b/dll/cpl/sysdm/lang/zh-CN.rc index b575cac1017..38c1dd73adc 100644 --- a/dll/cpl/sysdm/lang/zh-CN.rc +++ b/dll/cpl/sysdm/lang/zh-CN.rc @@ -281,17 +281,39 @@ BEGIN PUSHBUTTON "取消", IDCANCEL, 195, 224, 50, 14 END -IDD_EDIT_VARIABLE DIALOGEX 10, 15, 227, 71 -STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +IDD_EDIT_VARIABLE DIALOGEX 10, 15, 372, 71 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUPWINDOW | WS_CAPTION | WS_VISIBLE | WS_THICKFRAME +CAPTION "编辑变量" +FONT 9, "宋体", 0, 0, 0x0 +BEGIN + SCROLLBAR IDC_DIALOG_GRIP, 365, 64, 7, 7, SBS_SIZEGRIP + LTEXT "变量名称(&N):", IDC_STATIC, 7, 14, 50, 8 + EDITTEXT IDC_VARIABLE_NAME, 75, 12, 289, 12, ES_AUTOHSCROLL + LTEXT "变量值(&V):", IDC_STATIC, 7, 32, 50, 8 + EDITTEXT IDC_VARIABLE_VALUE, 75, 30, 289, 12, ES_AUTOHSCROLL + DEFPUSHBUTTON "确定", IDOK, 260, 50, 50, 14 + PUSHBUTTON "取消", IDCANCEL, 314, 50, 50, 14 + PUSHBUTTON "Browse Directory...", IDC_BUTTON_BROWSE_FOLDER, 6, 50, 75, 14 + PUSHBUTTON "Browse Files...", IDC_BUTTON_BROWSE_FILE, 86, 50, 75, 14 +END + +IDD_EDIT_VARIABLE_FANCY DIALOGEX 10, 15, 300, 250 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUPWINDOW | WS_CAPTION | WS_VISIBLE | WS_THICKFRAME CAPTION "编辑变量" FONT 9, "宋体", 0, 0, 0x0 BEGIN - LTEXT "变量名称(&N):", IDC_STATIC, 7, 14, 68, 8 - EDITTEXT IDC_VARIABLE_NAME, 75, 12, 145, 12, ES_AUTOHSCROLL - LTEXT "变量值(&V):", IDC_STATIC, 7, 32, 68, 8 - EDITTEXT IDC_VARIABLE_VALUE, 75, 30, 145, 12, ES_AUTOHSCROLL - DEFPUSHBUTTON "确定", IDOK, 116, 50, 50, 14 - PUSHBUTTON "取消", IDCANCEL, 170, 50, 50, 14 + SCROLLBAR IDC_DIALOG_GRIP, 293, 243, 7, 7, SBS_SIZEGRIP + CONTROL "", IDC_LIST_VARIABLE_VALUE, "SysListView32", LVS_NOCOLUMNHEADER | LVS_EDITLABELS | LVS_SHOWSELALWAYS | + LVS_SINGLESEL | LVS_REPORT | WS_BORDER | WS_TABSTOP, 10, 10, 224, 208, WS_EX_CLIENTEDGE + PUSHBUTTON "New", IDC_BUTTON_NEW, 242, 10, 50, 14 + PUSHBUTTON "Edit", IDC_BUTTON_EDIT, 242, 30, 50, 14 + PUSHBUTTON "Browse...", IDC_BUTTON_BROWSE_FOLDER, 242, 50, 50, 14 + PUSHBUTTON "Delete", IDC_BUTTON_DELETE, 242, 70, 50, 14 + PUSHBUTTON "Move Up", IDC_BUTTON_MOVE_UP, 242, 100, 50, 14 + PUSHBUTTON "Move Down", IDC_BUTTON_MOVE_DOWN, 242, 120, 50, 14 + PUSHBUTTON "Edit text...", IDC_BUTTON_EDIT_TEXT, 242, 150, 50, 14 + DEFPUSHBUTTON "确定", IDOK, 188, 228, 50, 14 + PUSHBUTTON "取消", IDCANCEL, 242, 228, 50, 14 END IDD_LICENCE DIALOGEX 6, 5, 267, 159 @@ -347,4 +369,6 @@ BEGIN IDS_HWPROFILE_ALREADY_IN_USE "配置式名称已在使用。" IDS_HWPROFILE_PROFILE "配置文件" IDS_HWPROFILE_WARNING "警告" + IDS_ENVIRONMENT_WARNING "Any changes that have been done will be discarded and the variable's value will be edited as text." + IDS_ENVIRONMENT_WARNING_TITLE "System Properties" END diff --git a/dll/cpl/sysdm/lang/zh-TW.rc b/dll/cpl/sysdm/lang/zh-TW.rc index 9e2518e50d0..626688b5e3b 100644 --- a/dll/cpl/sysdm/lang/zh-TW.rc +++ b/dll/cpl/sysdm/lang/zh-TW.rc @@ -286,17 +286,39 @@ BEGIN PUSHBUTTON "取消", IDCANCEL, 195, 224, 50, 14 END -IDD_EDIT_VARIABLE DIALOGEX 10, 15, 227, 71 -STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +IDD_EDIT_VARIABLE DIALOGEX 10, 15, 372, 71 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUPWINDOW | WS_CAPTION | WS_VISIBLE | WS_THICKFRAME +CAPTION "編輯變數" +FONT 9, "新細明體", 0, 0, 0x0 +BEGIN + SCROLLBAR IDC_DIALOG_GRIP, 365, 64, 7, 7, SBS_SIZEGRIP + LTEXT "變數名稱(&N)︰", IDC_STATIC, 7, 14, 50, 8 + EDITTEXT IDC_VARIABLE_NAME, 75, 12, 289, 12, ES_AUTOHSCROLL + LTEXT "變數值(&V)︰", IDC_STATIC, 7, 32, 50, 8 + EDITTEXT IDC_VARIABLE_VALUE, 75, 30, 289, 12, ES_AUTOHSCROLL + DEFPUSHBUTTON "確定", IDOK, 260, 50, 50, 14 + PUSHBUTTON "取消", IDCANCEL, 314, 50, 50, 14 + PUSHBUTTON "Browse Directory...", IDC_BUTTON_BROWSE_FOLDER, 6, 50, 75, 14 + PUSHBUTTON "Browse Files...", IDC_BUTTON_BROWSE_FILE, 86, 50, 75, 14 +END + +IDD_EDIT_VARIABLE_FANCY DIALOGEX 10, 15, 300, 250 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUPWINDOW | WS_CAPTION | WS_VISIBLE | WS_THICKFRAME CAPTION "編輯變數" FONT 9, "新細明體", 0, 0, 0x0 BEGIN - LTEXT "變數名稱(&N)︰", IDC_STATIC, 7, 14, 68, 8 - EDITTEXT IDC_VARIABLE_NAME, 75, 12, 145, 12, ES_AUTOHSCROLL - LTEXT "變數值(&V)︰", IDC_STATIC, 7, 32, 68, 8 - EDITTEXT IDC_VARIABLE_VALUE, 75, 30, 145, 12, ES_AUTOHSCROLL - DEFPUSHBUTTON "確定", IDOK, 116, 50, 50, 14 - PUSHBUTTON "取消", IDCANCEL, 170, 50, 50, 14 + SCROLLBAR IDC_DIALOG_GRIP, 293, 243, 7, 7, SBS_SIZEGRIP + CONTROL "", IDC_LIST_VARIABLE_VALUE, "SysListView32", LVS_NOCOLUMNHEADER | LVS_EDITLABELS | LVS_SHOWSELALWAYS | + LVS_SINGLESEL | LVS_REPORT | WS_BORDER | WS_TABSTOP, 10, 10, 224, 208, WS_EX_CLIENTEDGE + PUSHBUTTON "New", IDC_BUTTON_NEW, 242, 10, 50, 14 + PUSHBUTTON "Edit", IDC_BUTTON_EDIT, 242, 30, 50, 14 + PUSHBUTTON "Browse...", IDC_BUTTON_BROWSE_FOLDER, 242, 50, 50, 14 + PUSHBUTTON "Delete", IDC_BUTTON_DELETE, 242, 70, 50, 14 + PUSHBUTTON "Move Up", IDC_BUTTON_MOVE_UP, 242, 100, 50, 14 + PUSHBUTTON "Move Down", IDC_BUTTON_MOVE_DOWN, 242, 120, 50, 14 + PUSHBUTTON "Edit text...", IDC_BUTTON_EDIT_TEXT, 242, 150, 50, 14 + DEFPUSHBUTTON "確定", IDOK, 188, 228, 50, 14 + PUSHBUTTON "取消", IDCANCEL, 242, 228, 50, 14 END IDD_LICENCE DIALOGEX 6, 5, 267, 159 @@ -352,4 +374,6 @@ BEGIN IDS_HWPROFILE_ALREADY_IN_USE "設定檔名稱已在使用。" IDS_HWPROFILE_PROFILE "設定檔" IDS_HWPROFILE_WARNING "警告" + IDS_ENVIRONMENT_WARNING "Any changes that have been done will be discarded and the variable's value will be edited as text." + IDS_ENVIRONMENT_WARNING_TITLE "System Properties" END diff --git a/dll/cpl/sysdm/resource.h b/dll/cpl/sysdm/resource.h index 94744806b0a..d0a720f1619 100644 --- a/dll/cpl/sysdm/resource.h +++ b/dll/cpl/sysdm/resource.h @@ -63,6 +63,9 @@ #define IDS_UPTIME_FORMAT 140 +#define IDS_ENVIRONMENT_WARNING 150 +#define IDS_ENVIRONMENT_WARNING_TITLE 151 + /* Propsheet - general */ #define IDD_PROPPAGEGENERAL 100 #define IDC_MACHINELINE1 101 @@ -131,9 +134,19 @@ #define IDC_SYSTEM_VARIABLE_DELETE 608 /* Edit environment variables */ -#define IDD_EDIT_VARIABLE 700 -#define IDC_VARIABLE_NAME 701 -#define IDC_VARIABLE_VALUE 702 +#define IDD_EDIT_VARIABLE 700 +#define IDC_VARIABLE_NAME 701 +#define IDC_VARIABLE_VALUE 702 +#define IDC_BUTTON_BROWSE_FILE 703 +#define IDC_BUTTON_BROWSE_FOLDER 704 +#define IDD_EDIT_VARIABLE_FANCY 705 +#define IDC_LIST_VARIABLE_VALUE 706 +#define IDC_BUTTON_NEW 707 +#define IDC_BUTTON_EDIT 708 +#define IDC_BUTTON_DELETE 709 +#define IDC_BUTTON_MOVE_UP 710 +#define IDC_BUTTON_MOVE_DOWN 711 +#define IDC_BUTTON_EDIT_TEXT 712 /* Virtual memory */ #define IDD_VIRTMEM 900 @@ -211,3 +224,5 @@ #define RTDATA 1503 #define IDS_DEVS 2000 + +#define IDC_DIALOG_GRIP 3000

3 years

[reactos] 01/01: [NETSHELL] Improve workgroup vs. domain wording (#4172)

by Chris Spiegel

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=00ffe2dfff1269a0ba233… commit 00ffe2dfff1269a0ba2331bf3e6104e68c9e4d32 Author: Chris Spiegel <cspiegel(a)gmail.com> AuthorDate: Tue Dec 21 04:40:54 2021 -0800 Commit: GitHub <noreply(a)github.com> CommitDate: Tue Dec 21 13:40:54 2021 +0100 [NETSHELL] Improve workgroup vs. domain wording (#4172) --- dll/shellext/netshell/lang/bg-BG.rc | 2 +- dll/shellext/netshell/lang/da-DK.rc | 2 +- dll/shellext/netshell/lang/el-GR.rc | 2 +- dll/shellext/netshell/lang/en-US.rc | 2 +- dll/shellext/netshell/lang/he-IL.rc | 2 +- dll/shellext/netshell/lang/id-ID.rc | 2 +- dll/shellext/netshell/lang/it-IT.rc | 2 +- dll/shellext/netshell/lang/nl-NL.rc | 2 +- dll/shellext/netshell/lang/no-NO.rc | 2 +- dll/shellext/netshell/lang/sk-SK.rc | 2 +- dll/shellext/netshell/lang/sq-AL.rc | 2 +- dll/shellext/netshell/lang/sv-SE.rc | 2 +- 12 files changed, 12 insertions(+), 12 deletions(-) diff --git a/dll/shellext/netshell/lang/bg-BG.rc b/dll/shellext/netshell/lang/bg-BG.rc index f04138264c6..002b525a593 100644 --- a/dll/shellext/netshell/lang/bg-BG.rc +++ b/dll/shellext/netshell/lang/bg-BG.rc @@ -111,7 +111,7 @@ FONT 8, "MS Shell Dlg" BEGIN LTEXT "Do you want this computer to be a member of a domain?\n\ (You can obtain this information from your network administrator.)", IDC_STATIC, 33, 2, 263, 50 - AUTORADIOBUTTON "No, this computer will be part of a workgroup.", IDC_SELECT_WORKGROUP, 33, 32, 253, 20, WS_TABSTOP | WS_GROUP + AUTORADIOBUTTON "No, this computer will be part of a workgroup instead.", IDC_SELECT_WORKGROUP, 33, 32, 253, 20, WS_TABSTOP | WS_GROUP AUTORADIOBUTTON "Yes, this computer will be part of a domain.", IDC_SELECT_DOMAIN, 33, 47, 253, 20, WS_TABSTOP LTEXT "Workgroup or Domain Name:", IDC_STATIC, 33, 72, 126, 14 EDITTEXT IDC_DOMAIN_NAME, 33, 82, 126, 14, WS_VISIBLE | WS_TABSTOP | ES_AUTOHSCROLL diff --git a/dll/shellext/netshell/lang/da-DK.rc b/dll/shellext/netshell/lang/da-DK.rc index 61ca49a6dde..26b8287135d 100644 --- a/dll/shellext/netshell/lang/da-DK.rc +++ b/dll/shellext/netshell/lang/da-DK.rc @@ -111,7 +111,7 @@ FONT 8, "MS Shell Dlg" BEGIN LTEXT "Do you want this computer to be a member of a domain?\n\ (You can obtain this information from your network administrator.)", IDC_STATIC, 33, 2, 263, 50 - AUTORADIOBUTTON "No, this computer will be part of a workgroup.", IDC_SELECT_WORKGROUP, 33, 32, 253, 20, WS_TABSTOP | WS_GROUP + AUTORADIOBUTTON "No, this computer will be part of a workgroup instead.", IDC_SELECT_WORKGROUP, 33, 32, 253, 20, WS_TABSTOP | WS_GROUP AUTORADIOBUTTON "Yes, this computer will be part of a domain.", IDC_SELECT_DOMAIN, 33, 47, 253, 20, WS_TABSTOP LTEXT "Workgroup or Domain Name:", IDC_STATIC, 33, 72, 126, 14 EDITTEXT IDC_DOMAIN_NAME, 33, 82, 126, 14, WS_VISIBLE | WS_TABSTOP | ES_AUTOHSCROLL diff --git a/dll/shellext/netshell/lang/el-GR.rc b/dll/shellext/netshell/lang/el-GR.rc index 0a4c91ecfdd..4c15fa7aa96 100644 --- a/dll/shellext/netshell/lang/el-GR.rc +++ b/dll/shellext/netshell/lang/el-GR.rc @@ -111,7 +111,7 @@ FONT 8, "MS Shell Dlg" BEGIN LTEXT "Do you want this computer to be a member of a domain?\n\ (You can obtain this information from your network administrator.)", IDC_STATIC, 33, 2, 263, 50 - AUTORADIOBUTTON "No, this computer will be part of a workgroup.", IDC_SELECT_WORKGROUP, 33, 32, 253, 20, WS_TABSTOP | WS_GROUP + AUTORADIOBUTTON "No, this computer will be part of a workgroup instead.", IDC_SELECT_WORKGROUP, 33, 32, 253, 20, WS_TABSTOP | WS_GROUP AUTORADIOBUTTON "Yes, this computer will be part of a domain.", IDC_SELECT_DOMAIN, 33, 47, 253, 20, WS_TABSTOP LTEXT "Workgroup or Domain Name:", IDC_STATIC, 33, 72, 126, 14 EDITTEXT IDC_DOMAIN_NAME, 33, 82, 126, 14, WS_VISIBLE | WS_TABSTOP | ES_AUTOHSCROLL diff --git a/dll/shellext/netshell/lang/en-US.rc b/dll/shellext/netshell/lang/en-US.rc index 2e2ce20f62d..b4ee99d6133 100644 --- a/dll/shellext/netshell/lang/en-US.rc +++ b/dll/shellext/netshell/lang/en-US.rc @@ -111,7 +111,7 @@ FONT 8, "MS Shell Dlg" BEGIN LTEXT "Do you want this computer to be a member of a domain?\n\ (You can obtain this information from your network administrator.)", IDC_STATIC, 33, 2, 263, 50 - AUTORADIOBUTTON "No, this computer will be part of a workgroup.", IDC_SELECT_WORKGROUP, 33, 32, 253, 20, WS_TABSTOP | WS_GROUP + AUTORADIOBUTTON "No, this computer will be part of a workgroup instead.", IDC_SELECT_WORKGROUP, 33, 32, 253, 20, WS_TABSTOP | WS_GROUP AUTORADIOBUTTON "Yes, this computer will be part of a domain.", IDC_SELECT_DOMAIN, 33, 47, 253, 20, WS_TABSTOP LTEXT "Workgroup or Domain Name:", IDC_STATIC, 33, 72, 126, 14 EDITTEXT IDC_DOMAIN_NAME, 33, 82, 126, 14, WS_VISIBLE | WS_TABSTOP | ES_AUTOHSCROLL diff --git a/dll/shellext/netshell/lang/he-IL.rc b/dll/shellext/netshell/lang/he-IL.rc index 66b574ec56f..ec9c451b8bf 100644 --- a/dll/shellext/netshell/lang/he-IL.rc +++ b/dll/shellext/netshell/lang/he-IL.rc @@ -111,7 +111,7 @@ FONT 8, "MS Shell Dlg" BEGIN LTEXT "Do you want this computer to be a member of a domain?\n\ (You can obtain this information from your network administrator.)", IDC_STATIC, 33, 2, 263, 50 - AUTORADIOBUTTON "No, this computer will be part of a workgroup.", IDC_SELECT_WORKGROUP, 33, 32, 253, 20, WS_TABSTOP | WS_GROUP + AUTORADIOBUTTON "No, this computer will be part of a workgroup instead.", IDC_SELECT_WORKGROUP, 33, 32, 253, 20, WS_TABSTOP | WS_GROUP AUTORADIOBUTTON "Yes, this computer will be part of a domain.", IDC_SELECT_DOMAIN, 33, 47, 253, 20, WS_TABSTOP LTEXT "Workgroup or Domain Name:", IDC_STATIC, 33, 72, 126, 14 EDITTEXT IDC_DOMAIN_NAME, 33, 82, 126, 14, WS_VISIBLE | WS_TABSTOP | ES_AUTOHSCROLL diff --git a/dll/shellext/netshell/lang/id-ID.rc b/dll/shellext/netshell/lang/id-ID.rc index 433a47b2395..c86de12e25f 100644 --- a/dll/shellext/netshell/lang/id-ID.rc +++ b/dll/shellext/netshell/lang/id-ID.rc @@ -111,7 +111,7 @@ FONT 8, "MS Shell Dlg" BEGIN LTEXT "Do you want this computer to be a member of a domain?\n\ (You can obtain this information from your network administrator.)", IDC_STATIC, 33, 2, 263, 50 - AUTORADIOBUTTON "No, this computer will be part of a workgroup.", IDC_SELECT_WORKGROUP, 33, 32, 253, 20, WS_TABSTOP | WS_GROUP + AUTORADIOBUTTON "No, this computer will be part of a workgroup instead.", IDC_SELECT_WORKGROUP, 33, 32, 253, 20, WS_TABSTOP | WS_GROUP AUTORADIOBUTTON "Yes, this computer will be part of a domain.", IDC_SELECT_DOMAIN, 33, 47, 253, 20, WS_TABSTOP LTEXT "Workgroup or Domain Name:", IDC_STATIC, 33, 72, 126, 14 EDITTEXT IDC_DOMAIN_NAME, 33, 82, 126, 14, WS_VISIBLE | WS_TABSTOP | ES_AUTOHSCROLL diff --git a/dll/shellext/netshell/lang/it-IT.rc b/dll/shellext/netshell/lang/it-IT.rc index dad2dce9f42..5dcebcc84bb 100644 --- a/dll/shellext/netshell/lang/it-IT.rc +++ b/dll/shellext/netshell/lang/it-IT.rc @@ -111,7 +111,7 @@ FONT 8, "MS Shell Dlg" BEGIN LTEXT "Do you want this computer to be a member of a domain?\n\ (You can obtain this information from your network administrator.)", IDC_STATIC, 33, 2, 263, 50 - AUTORADIOBUTTON "No, this computer will be part of a workgroup.", IDC_SELECT_WORKGROUP, 33, 32, 253, 20, WS_TABSTOP | WS_GROUP + AUTORADIOBUTTON "No, this computer will be part of a workgroup instead.", IDC_SELECT_WORKGROUP, 33, 32, 253, 20, WS_TABSTOP | WS_GROUP AUTORADIOBUTTON "Yes, this computer will be part of a domain.", IDC_SELECT_DOMAIN, 33, 47, 253, 20, WS_TABSTOP LTEXT "Workgroup or Domain Name:", IDC_STATIC, 33, 72, 126, 14 EDITTEXT IDC_DOMAIN_NAME, 33, 82, 126, 14, WS_VISIBLE | WS_TABSTOP | ES_AUTOHSCROLL diff --git a/dll/shellext/netshell/lang/nl-NL.rc b/dll/shellext/netshell/lang/nl-NL.rc index 25ee11f62b2..1176299d32f 100644 --- a/dll/shellext/netshell/lang/nl-NL.rc +++ b/dll/shellext/netshell/lang/nl-NL.rc @@ -111,7 +111,7 @@ FONT 8, "MS Shell Dlg" BEGIN LTEXT "Do you want this computer to be a member of a domain?\n\ (You can obtain this information from your network administrator.)", IDC_STATIC, 33, 2, 263, 50 - AUTORADIOBUTTON "No, this computer will be part of a workgroup.", IDC_SELECT_WORKGROUP, 33, 32, 253, 20, WS_TABSTOP | WS_GROUP + AUTORADIOBUTTON "No, this computer will be part of a workgroup instead.", IDC_SELECT_WORKGROUP, 33, 32, 253, 20, WS_TABSTOP | WS_GROUP AUTORADIOBUTTON "Yes, this computer will be part of a domain.", IDC_SELECT_DOMAIN, 33, 47, 253, 20, WS_TABSTOP LTEXT "Workgroup or Domain Name:", IDC_STATIC, 33, 72, 126, 14 EDITTEXT IDC_DOMAIN_NAME, 33, 82, 126, 14, WS_VISIBLE | WS_TABSTOP | ES_AUTOHSCROLL diff --git a/dll/shellext/netshell/lang/no-NO.rc b/dll/shellext/netshell/lang/no-NO.rc index 5ce8f378ff8..255576057d7 100644 --- a/dll/shellext/netshell/lang/no-NO.rc +++ b/dll/shellext/netshell/lang/no-NO.rc @@ -111,7 +111,7 @@ FONT 8, "MS Shell Dlg" BEGIN LTEXT "Do you want this computer to be a member of a domain?\n\ (You can obtain this information from your network administrator.)", IDC_STATIC, 33, 2, 263, 50 - AUTORADIOBUTTON "No, this computer will be part of a workgroup.", IDC_SELECT_WORKGROUP, 33, 32, 253, 20, WS_TABSTOP | WS_GROUP + AUTORADIOBUTTON "No, this computer will be part of a workgroup instead.", IDC_SELECT_WORKGROUP, 33, 32, 253, 20, WS_TABSTOP | WS_GROUP AUTORADIOBUTTON "Yes, this computer will be part of a domain.", IDC_SELECT_DOMAIN, 33, 47, 253, 20, WS_TABSTOP LTEXT "Workgroup or Domain Name:", IDC_STATIC, 33, 72, 126, 14 EDITTEXT IDC_DOMAIN_NAME, 33, 82, 126, 14, WS_VISIBLE | WS_TABSTOP | ES_AUTOHSCROLL diff --git a/dll/shellext/netshell/lang/sk-SK.rc b/dll/shellext/netshell/lang/sk-SK.rc index 7a85afa35bc..0185831ed76 100644 --- a/dll/shellext/netshell/lang/sk-SK.rc +++ b/dll/shellext/netshell/lang/sk-SK.rc @@ -116,7 +116,7 @@ FONT 8, "MS Shell Dlg" BEGIN LTEXT "Do you want this computer to be a member of a domain?\n\ (You can obtain this information from your network administrator.)", IDC_STATIC, 33, 2, 263, 50 - AUTORADIOBUTTON "No, this computer will be part of a workgroup.", IDC_SELECT_WORKGROUP, 33, 32, 253, 20, WS_TABSTOP | WS_GROUP + AUTORADIOBUTTON "No, this computer will be part of a workgroup instead.", IDC_SELECT_WORKGROUP, 33, 32, 253, 20, WS_TABSTOP | WS_GROUP AUTORADIOBUTTON "Yes, this computer will be part of a domain.", IDC_SELECT_DOMAIN, 33, 47, 253, 20, WS_TABSTOP LTEXT "Workgroup or Domain Name:", IDC_STATIC, 33, 72, 126, 14 EDITTEXT IDC_DOMAIN_NAME, 33, 82, 126, 14, WS_VISIBLE | WS_TABSTOP | ES_AUTOHSCROLL diff --git a/dll/shellext/netshell/lang/sq-AL.rc b/dll/shellext/netshell/lang/sq-AL.rc index 63fdda10dc4..26173d9d35a 100644 --- a/dll/shellext/netshell/lang/sq-AL.rc +++ b/dll/shellext/netshell/lang/sq-AL.rc @@ -115,7 +115,7 @@ FONT 8, "MS Shell Dlg" BEGIN LTEXT "Do you want this computer to be a member of a domain?\n\ (You can obtain this information from your network administrator.)", IDC_STATIC, 33, 2, 263, 50 - AUTORADIOBUTTON "No, this computer will be part of a workgroup.", IDC_SELECT_WORKGROUP, 33, 32, 253, 20, WS_TABSTOP | WS_GROUP + AUTORADIOBUTTON "No, this computer will be part of a workgroup instead.", IDC_SELECT_WORKGROUP, 33, 32, 253, 20, WS_TABSTOP | WS_GROUP AUTORADIOBUTTON "Yes, this computer will be part of a domain.", IDC_SELECT_DOMAIN, 33, 47, 253, 20, WS_TABSTOP LTEXT "Workgroup or Domain Name:", IDC_STATIC, 33, 72, 126, 14 EDITTEXT IDC_DOMAIN_NAME, 33, 82, 126, 14, WS_VISIBLE | WS_TABSTOP | ES_AUTOHSCROLL diff --git a/dll/shellext/netshell/lang/sv-SE.rc b/dll/shellext/netshell/lang/sv-SE.rc index 15d9ebd16b5..a01d9ca335c 100644 --- a/dll/shellext/netshell/lang/sv-SE.rc +++ b/dll/shellext/netshell/lang/sv-SE.rc @@ -111,7 +111,7 @@ FONT 8, "MS Shell Dlg" BEGIN LTEXT "Do you want this computer to be a member of a domain?\n\ (You can obtain this information from your network administrator.)", IDC_STATIC, 33, 2, 263, 50 - AUTORADIOBUTTON "No, this computer will be part of a workgroup.", IDC_SELECT_WORKGROUP, 33, 32, 253, 20, WS_TABSTOP | WS_GROUP + AUTORADIOBUTTON "No, this computer will be part of a workgroup instead.", IDC_SELECT_WORKGROUP, 33, 32, 253, 20, WS_TABSTOP | WS_GROUP AUTORADIOBUTTON "Yes, this computer will be part of a domain.", IDC_SELECT_DOMAIN, 33, 47, 253, 20, WS_TABSTOP LTEXT "Workgroup or Domain Name:", IDC_STATIC, 33, 72, 126, 14 EDITTEXT IDC_DOMAIN_NAME, 33, 82, 126, 14, WS_VISIBLE | WS_TABSTOP | ES_AUTOHSCROLL

3 years

← Newer
1
...
6
7
8
9
10
11
12
...
16
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs December 2021