Ros-diffs October 2022

ros-diffs@reactos.org

23 participants
162 discussions

[reactos] 01/02: [WINDOWSX.H] Fix some x64 incompatibilities. (#4768)

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=6572dd7f489916426dceb… commit 6572dd7f489916426dceb01dfb272601a24f5ef9 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Mon Oct 10 22:59:46 2022 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Wed Oct 12 16:10:22 2022 +0200 [WINDOWSX.H] Fix some x64 incompatibilities. (#4768) --- sdk/include/psdk/windowsx.h | 40 ++++++++++++++++++++-------------------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/sdk/include/psdk/windowsx.h b/sdk/include/psdk/windowsx.h index 15dc2053bc4..f9df189301e 100644 --- a/sdk/include/psdk/windowsx.h +++ b/sdk/include/psdk/windowsx.h @@ -59,7 +59,7 @@ #define Edit_Enable(hwndCtl,fEnable) EnableWindow((hwndCtl),(fEnable)) #define Edit_FmtLines(hwndCtl,fAddEOL) ((BOOL)(DWORD)SendMessage((hwndCtl),EM_FMTLINES,(WPARAM)(BOOL)(fAddEOL),0)) #define Edit_GetFirstVisibleLine(hwndCtl) ((int)(DWORD)SendMessage((hwndCtl),EM_GETFIRSTVISIBLELINE,0,0)) -#define Edit_GetHandle(hwndCtl) ((HLOCAL)(UINT)(DWORD)SendMessage((hwndCtl),EM_GETHANDLE,0,0)) +#define Edit_GetHandle(hwndCtl) ((HLOCAL)(UINT_PTR)SendMessage((hwndCtl),EM_GETHANDLE,0,0)) #define Edit_GetLine(hwndCtl,line,lpch,cchMax) ((*((int*)(lpch)) = (cchMax)),((int)(DWORD)SendMessage((hwndCtl),EM_GETLINE,(WPARAM)(int)(line),(LPARAM)(LPTSTR)(lpch)))) #define Edit_GetLineCount(hwndCtl) ((int)(DWORD)SendMessage((hwndCtl),EM_GETLINECOUNT,0,0)) #define Edit_GetModify(hwndCtl) ((BOOL)(DWORD)SendMessage((hwndCtl),EM_GETMODIFY,0,0)) @@ -76,7 +76,7 @@ #define Edit_ReplaceSel(hwndCtl,lpszReplace) ((void)SendMessage((hwndCtl),EM_REPLACESEL,0,(LPARAM)(LPCTSTR)(lpszReplace))) #define Edit_Scroll(hwndCtl,dv,dh) ((void)SendMessage((hwndCtl),EM_LINESCROLL,(WPARAM)(dh),(LPARAM)(dv))) #define Edit_ScrollCaret(hwndCtl) ((BOOL)(DWORD)SendMessage((hwndCtl),EM_SCROLLCARET,0,0)) -#define Edit_SetHandle(hwndCtl,h) ((void)SendMessage((hwndCtl),EM_SETHANDLE,(WPARAM)(UINT)(HLOCAL)(h),0)) +#define Edit_SetHandle(hwndCtl,h) ((void)SendMessage((hwndCtl),EM_SETHANDLE,(WPARAM)(UINT_PTR)(HLOCAL)(h),0)) #define Edit_SetModify(hwndCtl,fModified) ((void)SendMessage((hwndCtl),EM_SETMODIFY,(WPARAM)(UINT)(fModified),0)) #define Edit_SetPasswordChar(hwndCtl,ch) ((void)SendMessage((hwndCtl),EM_SETPASSWORDCHAR,(WPARAM)(UINT)(ch),0)) #define Edit_SetReadOnly(hwndCtl,fReadOnly) ((BOOL)(DWORD)SendMessage((hwndCtl),EM_SETREADONLY,(WPARAM)(BOOL)(fReadOnly),0)) @@ -103,13 +103,13 @@ #define FORWARD_WM_COMPAREITEM(hwnd,lpCompareItem,fn) (int)(DWORD)(fn)((hwnd),WM_COMPAREITEM,(WPARAM)(((const COMPAREITEMSTRUCT*)(lpCompareItem))->CtlID),(LPARAM)(const COMPAREITEMSTRUCT*)(lpCompareItem)) #define FORWARD_WM_COPY(hwnd,fn) (void)(fn)((hwnd),WM_COPY,0,0) #define FORWARD_WM_CREATE(hwnd,lpCreateStruct,fn) (BOOL)(DWORD)(fn)((hwnd),WM_CREATE,0,(LPARAM)(LPCREATESTRUCT)(lpCreateStruct)) -#define FORWARD_WM_CTLCOLORBTN(hwnd,hdc,hwndChild,fn) (HBRUSH)(UINT)(DWORD)(fn)((hwnd),WM_CTLCOLORBTN,(WPARAM)(HDC)(hdc),(LPARAM)(HWND)(hwndChild)) -#define FORWARD_WM_CTLCOLORDLG(hwnd,hdc,hwndChild,fn) (HBRUSH)(UINT)(DWORD)(fn)((hwnd),WM_CTLCOLORDLG,(WPARAM)(HDC)(hdc),(LPARAM)(HWND)(hwndChild)) -#define FORWARD_WM_CTLCOLOREDIT(hwnd,hdc,hwndChild,fn) (HBRUSH)(UINT)(DWORD)(fn)((hwnd),WM_CTLCOLOREDIT,(WPARAM)(HDC)(hdc),(LPARAM)(HWND)(hwndChild)) -#define FORWARD_WM_CTLCOLORLISTBOX(hwnd,hdc,hwndChild,fn) (HBRUSH)(UINT)(DWORD)(fn)((hwnd),WM_CTLCOLORLISTBOX,(WPARAM)(HDC)(hdc),(LPARAM)(HWND)(hwndChild)) -#define FORWARD_WM_CTLCOLORMSGBOX(hwnd,hdc,hwndChild,fn) (HBRUSH)(UINT)(DWORD)(fn)((hwnd),WM_CTLCOLORMSGBOX,(WPARAM)(HDC)(hdc),(LPARAM)(HWND)(hwndChild)) -#define FORWARD_WM_CTLCOLORSCROLLBAR(hwnd,hdc,hwndChild,fn) (HBRUSH)(UINT)(DWORD)(fn)((hwnd),WM_CTLCOLORSCROLLBAR,(WPARAM)(HDC)(hdc),(LPARAM)(HWND)(hwndChild)) -#define FORWARD_WM_CTLCOLORSTATIC(hwnd,hdc,hwndChild,fn) (HBRUSH)(UINT)(DWORD)(fn)((hwnd),WM_CTLCOLORSTATIC,(WPARAM)(HDC)(hdc),(LPARAM)(HWND)(hwndChild)) +#define FORWARD_WM_CTLCOLORBTN(hwnd,hdc,hwndChild,fn) (HBRUSH)(UINT_PTR)(fn)((hwnd),WM_CTLCOLORBTN,(WPARAM)(HDC)(hdc),(LPARAM)(HWND)(hwndChild)) +#define FORWARD_WM_CTLCOLORDLG(hwnd,hdc,hwndChild,fn) (HBRUSH)(UINT_PTR)(fn)((hwnd),WM_CTLCOLORDLG,(WPARAM)(HDC)(hdc),(LPARAM)(HWND)(hwndChild)) +#define FORWARD_WM_CTLCOLOREDIT(hwnd,hdc,hwndChild,fn) (HBRUSH)(UINT_PTR)(fn)((hwnd),WM_CTLCOLOREDIT,(WPARAM)(HDC)(hdc),(LPARAM)(HWND)(hwndChild)) +#define FORWARD_WM_CTLCOLORLISTBOX(hwnd,hdc,hwndChild,fn) (HBRUSH)(UINT_PTR)(fn)((hwnd),WM_CTLCOLORLISTBOX,(WPARAM)(HDC)(hdc),(LPARAM)(HWND)(hwndChild)) +#define FORWARD_WM_CTLCOLORMSGBOX(hwnd,hdc,hwndChild,fn) (HBRUSH)(UINT_PTR)(fn)((hwnd),WM_CTLCOLORMSGBOX,(WPARAM)(HDC)(hdc),(LPARAM)(HWND)(hwndChild)) +#define FORWARD_WM_CTLCOLORSCROLLBAR(hwnd,hdc,hwndChild,fn) (HBRUSH)(UINT_PTR)(fn)((hwnd),WM_CTLCOLORSCROLLBAR,(WPARAM)(HDC)(hdc),(LPARAM)(HWND)(hwndChild)) +#define FORWARD_WM_CTLCOLORSTATIC(hwnd,hdc,hwndChild,fn) (HBRUSH)(UINT_PTR)(fn)((hwnd),WM_CTLCOLORSTATIC,(WPARAM)(HDC)(hdc),(LPARAM)(HWND)(hwndChild)) #define FORWARD_WM_CUT(hwnd,fn) (void)(fn)((hwnd),WM_CUT,0,0) #define FORWARD_WM_DEADCHAR(hwnd,ch,cRepeat,fn) (void)(fn)((hwnd),WM_DEADCHAR,(WPARAM)(TCHAR)(ch),MAKELPARAM((cRepeat),0)) #define FORWARD_WM_DELETEITEM(hwnd,lpDeleteItem,fn) (void)(fn)((hwnd),WM_DELETEITEM,(WPARAM)(((const DELETEITEMSTRUCT*)(lpDeleteItem))->CtlID),(LPARAM)(const DELETEITEMSTRUCT*)(lpDeleteItem)) @@ -125,11 +125,11 @@ #define FORWARD_WM_ERASEBKGND(hwnd,hdc,fn) (BOOL)(DWORD)(fn)((hwnd),WM_ERASEBKGND,(WPARAM)(HDC)(hdc),0) #define FORWARD_WM_FONTCHANGE(hwnd,fn) (void)(fn)((hwnd),WM_FONTCHANGE,0,0) #define FORWARD_WM_GETDLGCODE(hwnd,lpmsg,fn) (UINT)(DWORD)(fn)((hwnd),WM_GETDLGCODE,(lpmsg ? lpmsg->wParam : 0),(LPARAM)(LPMSG)(lpmsg)) -#define FORWARD_WM_GETFONT(hwnd,fn) (HFONT)(UINT)(DWORD)(fn)((hwnd),WM_GETFONT,0,0) +#define FORWARD_WM_GETFONT(hwnd,fn) (HFONT)(UINT_PTR)(fn)((hwnd),WM_GETFONT,0,0) #define FORWARD_WM_GETMINMAXINFO(hwnd,lpMinMaxInfo,fn) (void)(fn)((hwnd),WM_GETMINMAXINFO,0,(LPARAM)(LPMINMAXINFO)(lpMinMaxInfo)) #define FORWARD_WM_GETTEXT(hwnd,cchTextMax,lpszText,fn) (int)(DWORD)(fn)((hwnd),WM_GETTEXT,(WPARAM)(int)(cchTextMax),(LPARAM)(LPTSTR)(lpszText)) #define FORWARD_WM_GETTEXTLENGTH(hwnd,fn) (int)(DWORD)(fn)((hwnd),WM_GETTEXTLENGTH,0,0) -#define FORWARD_WM_HSCROLL(hwnd,hwndCtl,code,pos,fn) (void)(fn)((hwnd),WM_HSCROLL,MAKEWPARAM((UINT)(int)(code),(UINT)(int)(pos)),(LPARAM)(UINT)(hwndCtl)) +#define FORWARD_WM_HSCROLL(hwnd,hwndCtl,code,pos,fn) (void)(fn)((hwnd),WM_HSCROLL,MAKEWPARAM((UINT)(int)(code),(UINT)(int)(pos)),(LPARAM)(HWND)(hwndCtl)) #define FORWARD_WM_HSCROLLCLIPBOARD(hwnd,hwndCBViewer,code,pos,fn) (void)(fn)((hwnd),WM_HSCROLLCLIPBOARD,(WPARAM)(HWND)(hwndCBViewer),MAKELPARAM((code),(pos))) #define FORWARD_WM_ICONERASEBKGND(hwnd,hdc,fn) (BOOL)(DWORD)(fn)((hwnd),WM_ICONERASEBKGND,(WPARAM)(HDC)(hdc),0) #define FORWARD_WM_INITDIALOG(hwnd,hwndFocus,lParam,fn) (BOOL)(DWORD)(fn)((hwnd),WM_INITDIALOG,(WPARAM)(HWND)(hwndFocus),(lParam)) @@ -144,14 +144,14 @@ #define FORWARD_WM_MBUTTONUP(hwnd,x,y,keyFlags,fn) (void)(fn)((hwnd),WM_MBUTTONUP,(WPARAM)(UINT)(keyFlags),MAKELPARAM((x),(y))) #define FORWARD_WM_MDIACTIVATE(hwnd,fActive,hwndActivate,hwndDeactivate,fn) (void)(fn)(hwnd,WM_MDIACTIVATE,(WPARAM)(hwndDeactivate),(LPARAM)(hwndActivate)) #define FORWARD_WM_MDICASCADE(hwnd,cmd,fn) (BOOL)(DWORD)(fn)((hwnd),WM_MDICASCADE,(WPARAM)(cmd),0) -#define FORWARD_WM_MDICREATE(hwnd,lpmcs,fn) (HWND)(UINT)(DWORD)(fn)((hwnd),WM_MDICREATE,0,(LPARAM)(LPMDICREATESTRUCT)(lpmcs)) +#define FORWARD_WM_MDICREATE(hwnd,lpmcs,fn) (HWND)(UINT_PTR)(fn)((hwnd),WM_MDICREATE,0,(LPARAM)(LPMDICREATESTRUCT)(lpmcs)) #define FORWARD_WM_MDIDESTROY(hwnd,hwndDestroy,fn) (void)(fn)((hwnd),WM_MDIDESTROY,(WPARAM)(hwndDestroy),0) -#define FORWARD_WM_MDIGETACTIVE(hwnd,fn) (HWND)(UINT)(DWORD)(fn)((hwnd),WM_MDIGETACTIVE,0,0) +#define FORWARD_WM_MDIGETACTIVE(hwnd,fn) (HWND)(UINT_PTR)(fn)((hwnd),WM_MDIGETACTIVE,0,0) #define FORWARD_WM_MDIICONARRANGE(hwnd,fn) (void)(fn)((hwnd),WM_MDIICONARRANGE,0,0) #define FORWARD_WM_MDIMAXIMIZE(hwnd,hwndMaximize,fn) (void)(fn)((hwnd),WM_MDIMAXIMIZE,(WPARAM)(hwndMaximize),0) -#define FORWARD_WM_MDINEXT(hwnd,hwndCur,fPrev,fn) (HWND)(UINT)(DWORD)(fn)((hwnd),WM_MDINEXT,(WPARAM)(hwndCur),(LPARAM)(fPrev)) +#define FORWARD_WM_MDINEXT(hwnd,hwndCur,fPrev,fn) (HWND)(UINT_PTR)(fn)((hwnd),WM_MDINEXT,(WPARAM)(hwndCur),(LPARAM)(fPrev)) #define FORWARD_WM_MDIRESTORE(hwnd,hwndRestore,fn) (void)(fn)((hwnd),WM_MDIRESTORE,(WPARAM)(hwndRestore),0) -#define FORWARD_WM_MDISETMENU(hwnd,fRefresh,hmenuFrame,hmenuWindow,fn) (HMENU)(UINT)(DWORD)(fn)((hwnd),WM_MDISETMENU,(WPARAM)((fRefresh) ? (hmenuFrame) : 0),(LPARAM)(hmenuWindow)) +#define FORWARD_WM_MDISETMENU(hwnd,fRefresh,hmenuFrame,hmenuWindow,fn) (HMENU)(UINT_PTR)(fn)((hwnd),WM_MDISETMENU,(WPARAM)((fRefresh) ? (hmenuFrame) : 0),(LPARAM)(hmenuWindow)) #define FORWARD_WM_MDITILE(hwnd,cmd,fn) (BOOL)(DWORD)(fn)((hwnd),WM_MDITILE,(WPARAM)(cmd),0) #define FORWARD_WM_MEASUREITEM(hwnd,lpMeasureItem,fn) (void)(fn)((hwnd),WM_MEASUREITEM,(WPARAM)(((MEASUREITEMSTRUCT*)lpMeasureItem)->CtlID),(LPARAM)(MEASUREITEMSTRUCT*)(lpMeasureItem)) #define FORWARD_WM_MENUCHAR(hwnd,ch,flags,hmenu,fn) (DWORD)(fn)((hwnd),WM_MENUCHAR,MAKEWPARAM(flags,(WORD)(ch)),(LPARAM)(HMENU)(hmenu)) @@ -172,7 +172,7 @@ #define FORWARD_WM_NCPAINT(hwnd,hrgn,fn) (void)(fn)((hwnd),WM_NCPAINT,(WPARAM)(HRGN)(hrgn),0) #define FORWARD_WM_NCRBUTTONDOWN(hwnd,fDoubleClick,x,y,codeHitTest,fn) (void)(fn)((hwnd),(fDoubleClick) ? WM_NCRBUTTONDBLCLK : WM_NCRBUTTONDOWN,(WPARAM)(UINT)(codeHitTest),MAKELPARAM((x),(y)) ) #define FORWARD_WM_NCRBUTTONUP(hwnd,x,y,codeHitTest,fn) (void)(fn)((hwnd),WM_NCRBUTTONUP,(WPARAM)(UINT)(codeHitTest),MAKELPARAM((x),(y)) ) -#define FORWARD_WM_NEXTDLGCTL(hwnd,hwndSetFocus,fNext,fn) (HWND)(UINT)(DWORD)(fn)((hwnd),WM_NEXTDLGCTL,(WPARAM)(HWND)(hwndSetFocus),(LPARAM)(fNext)) +#define FORWARD_WM_NEXTDLGCTL(hwnd,hwndSetFocus,fNext,fn) (HWND)(UINT_PTR)(fn)((hwnd),WM_NEXTDLGCTL,(WPARAM)(HWND)(hwndSetFocus),(LPARAM)(fNext)) #define FORWARD_WM_PAINT(hwnd,fn) (void)(fn)((hwnd),WM_PAINT,0,0) #define FORWARD_WM_PAINTCLIPBOARD(hwnd,hwndCBViewer,lpPaintStruct,fn) (void)(fn)((hwnd),WM_PAINTCLIPBOARD,(WPARAM)(HWND)(hwndCBViewer),(LPARAM)(LPPAINTSTRUCT)(lpPaintStruct)) #define FORWARD_WM_PALETTECHANGED(hwnd,hwndPaletteChange,fn) (void)(fn)((hwnd),WM_PALETTECHANGED,(WPARAM)(HWND)(hwndPaletteChange),0) @@ -180,7 +180,7 @@ #define FORWARD_WM_PARENTNOTIFY(hwnd,msg,hwndChild,idChild,fn) (void)(fn)((hwnd),WM_PARENTNOTIFY,MAKEWPARAM(msg,idChild),(LPARAM)(hwndChild)) #define FORWARD_WM_PASTE(hwnd,fn) (void)(fn)((hwnd),WM_PASTE,0,0) #define FORWARD_WM_POWER(hwnd,code,fn) (void)(fn)((hwnd),WM_POWER,(WPARAM)(int)(code),0) -#define FORWARD_WM_QUERYDRAGICON(hwnd,fn) (HICON)(UINT)(DWORD)(fn)((hwnd),WM_QUERYDRAGICON,0,0) +#define FORWARD_WM_QUERYDRAGICON(hwnd,fn) (HICON)(UINT_PTR)(fn)((hwnd),WM_QUERYDRAGICON,0,0) #define FORWARD_WM_QUERYENDSESSION(hwnd,fn) (BOOL)(DWORD)(fn)((hwnd),WM_QUERYENDSESSION,0,0) #define FORWARD_WM_QUERYNEWPALETTE(hwnd,fn) (BOOL)(DWORD)(fn)((hwnd),WM_QUERYNEWPALETTE,0,0) #define FORWARD_WM_QUERYOPEN(hwnd,fn) (BOOL)(DWORD)(fn)((hwnd),WM_QUERYOPEN,0,0) @@ -189,7 +189,7 @@ #define FORWARD_WM_RBUTTONDOWN(hwnd,fDoubleClick,x,y,keyFlags,fn) (void)(fn)((hwnd),(fDoubleClick) ? WM_RBUTTONDBLCLK : WM_RBUTTONDOWN,(WPARAM)(UINT)(keyFlags),MAKELPARAM((x),(y))) #define FORWARD_WM_RBUTTONUP(hwnd,x,y,keyFlags,fn) (void)(fn)((hwnd),WM_RBUTTONUP,(WPARAM)(UINT)(keyFlags),MAKELPARAM((x),(y))) #define FORWARD_WM_RENDERALLFORMATS(hwnd,fn) (void)(fn)((hwnd),WM_RENDERALLFORMATS,0,0) -#define FORWARD_WM_RENDERFORMAT(hwnd,fmt,fn) (HANDLE)(UINT)(DWORD)(fn)((hwnd),WM_RENDERFORMAT,(WPARAM)(UINT)(fmt),0) +#define FORWARD_WM_RENDERFORMAT(hwnd,fmt,fn) (HANDLE)(UINT_PTR)(fn)((hwnd),WM_RENDERFORMAT,(WPARAM)(UINT)(fmt),0) #define FORWARD_WM_SETCURSOR(hwnd,hwndCursor,codeHitTest,msg,fn) (BOOL)(DWORD)(fn)((hwnd),WM_SETCURSOR,(WPARAM)(HWND)(hwndCursor),MAKELPARAM((codeHitTest),(msg))) #define FORWARD_WM_SETFOCUS(hwnd,hwndOldFocus,fn) (void)(fn)((hwnd),WM_SETFOCUS,(WPARAM)(HWND)(hwndOldFocus),0) #define FORWARD_WM_SETFONT(hwnd,hfont,fRedraw,fn) (void)(fn)((hwnd),WM_SETFONT,(WPARAM)(HFONT)(hfont),(LPARAM)(BOOL)(fRedraw)) @@ -508,10 +508,10 @@ #define SetWindowFont(hwnd,hfont,fRedraw) FORWARD_WM_SETFONT((hwnd),(hfont),(fRedraw),SendMessage) #define SetWindowRedraw(hwnd,fRedraw) ((void)SendMessage(hwnd,WM_SETREDRAW,(WPARAM)(BOOL)(fRedraw),0)) #define Static_Enable(hwndCtl,fEnable) EnableWindow((hwndCtl),(fEnable)) -#define Static_GetIcon(hwndCtl,hIcon) ((HICON)(UINT)(DWORD)SendMessage((hwndCtl),STM_GETICON,0,0)) +#define Static_GetIcon(hwndCtl,hIcon) ((HICON)(UINT_PTR)SendMessage((hwndCtl),STM_GETICON,0,0)) #define Static_GetText(hwndCtl,lpch,cchMax) GetWindowText((hwndCtl),(lpch),(cchMax)) #define Static_GetTextLength(hwndCtl) GetWindowTextLength(hwndCtl) -#define Static_SetIcon(hwndCtl,hIcon) ((HICON)(UINT)(DWORD)SendMessage((hwndCtl),STM_SETICON,(WPARAM)(HICON)(hIcon),0)) +#define Static_SetIcon(hwndCtl,hIcon) ((HICON)(UINT_PTR)SendMessage((hwndCtl),STM_SETICON,(WPARAM)(HICON)(hIcon),0)) #define Static_SetText(hwndCtl,lpsz) SetWindowText((hwndCtl),(lpsz)) #define SubclassDialog(hwndDlg,lpfn) ((DLGPROC)SetWindowLongPtr(hwndDlg,DWLP_DLGPROC,(LPARAM)(DLGPROC)(lpfn))) #define SubclassWindow(hwnd,lpfn) ((WNDPROC)SetWindowLongPtr((hwnd),GWLP_WNDPROC,(LPARAM)(WNDPROC)(lpfn)))

2 years, 2 months

[reactos] 01/01: [WIN32SS:ENG] Call display mouse functions only when using hardware pointer

by Hervé Poussineau

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=162de4a0d880ef36944a8… commit 162de4a0d880ef36944a845580d6b01ea7414f10 Author: Hervé Poussineau <hpoussin(a)reactos.org> AuthorDate: Tue Oct 11 18:56:04 2022 +0200 Commit: Hervé Poussineau <hpoussin(a)reactos.org> CommitDate: Tue Oct 11 19:04:59 2022 +0200 [WIN32SS:ENG] Call display mouse functions only when using hardware pointer Otherwise, use software pointer functions. This fixes graphical glitches on cursor change, when the display driver provides accelerated pointer functions (DrvSetPointerShape/DrvMovePointer), but refuses to handle a certain cursor. These graphical glitches may be reproduced: - by using Voodoo driver SFFT 1.9 - by using framebuf_new.dll instead of framebuf.dll - by using the panning driver (setting DefaultSettings.XPanning and DefaultSettings.YPanning in registry) --- win32ss/gdi/eng/mouse.c | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/win32ss/gdi/eng/mouse.c b/win32ss/gdi/eng/mouse.c index c8de250aa1f..9cbadcd87a7 100644 --- a/win32ss/gdi/eng/mouse.c +++ b/win32ss/gdi/eng/mouse.c @@ -84,7 +84,10 @@ MouseSafetyOnDrawStart( && pgp->Exclude.top <= HazardY2) { ppdev->SafetyRemoveLevel = ppdev->SafetyRemoveCount; - ppdev->pfnMovePointer(&ppdev->pSurface->SurfObj, -1, -1, NULL); + if (ppdev->flFlags & PDEV_HARDWARE_POINTER) + ppdev->pfnMovePointer(&ppdev->pSurface->SurfObj, -1, -1, NULL); + else if (ppdev->flFlags & PDEV_SOFTWARE_POINTER) + EngMovePointer(&ppdev->pSurface->SurfObj, -1, -1, NULL); } return TRUE; @@ -116,10 +119,16 @@ MouseSafetyOnDrawEnd( return FALSE; } - ppdev->pfnMovePointer(&ppdev->pSurface->SurfObj, - gpsi->ptCursor.x, - gpsi->ptCursor.y, - &pgp->Exclude); + if (ppdev->flFlags & PDEV_HARDWARE_POINTER) + ppdev->pfnMovePointer(&ppdev->pSurface->SurfObj, + gpsi->ptCursor.x, + gpsi->ptCursor.y, + &pgp->Exclude); + else if (ppdev->flFlags & PDEV_SOFTWARE_POINTER) + EngMovePointer(&ppdev->pSurface->SurfObj, + gpsi->ptCursor.x, + gpsi->ptCursor.y, + &pgp->Exclude); ppdev->SafetyRemoveLevel = 0;

2 years, 2 months

[reactos] 01/01: [RAPPS] Fix inconsistencies in the translations

by Stanislav Motylkov

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=e6841944b8265819da740… commit e6841944b8265819da740ba1499949941414216a Author: Stanislav Motylkov <x86corez(a)gmail.com> AuthorDate: Tue Oct 11 19:32:12 2022 +0300 Commit: Stanislav Motylkov <x86corez(a)gmail.com> CommitDate: Tue Oct 11 19:32:12 2022 +0300 [RAPPS] Fix inconsistencies in the translations - Fix truncated dialogs - Fix element positions - Fix element misc flags - Also uniform resource file headers per Coding Style Addendum to e3fdbe5806c, 1866b89100c, and 9186a358da0. CORE-18497 --- base/applications/rapps/lang/bg-BG.rc | 15 +++++++++------ base/applications/rapps/lang/cs-CZ.rc | 14 ++++++++------ base/applications/rapps/lang/de-DE.rc | 6 +++--- base/applications/rapps/lang/en-US.rc | 12 +++++++++++- base/applications/rapps/lang/es-ES.rc | 22 ++++++++++++++-------- base/applications/rapps/lang/et-EE.rc | 11 +++++------ base/applications/rapps/lang/fr-FR.rc | 6 +++--- base/applications/rapps/lang/he-IL.rc | 16 +++++++++++----- base/applications/rapps/lang/hu-HU.rc | 9 +++++++-- base/applications/rapps/lang/id-ID.rc | 2 +- base/applications/rapps/lang/it-IT.rc | 6 +++--- base/applications/rapps/lang/ja-JP.rc | 6 +++--- base/applications/rapps/lang/no-NO.rc | 8 ++++---- base/applications/rapps/lang/pl-PL.rc | 16 ++++++++-------- base/applications/rapps/lang/pt-BR.rc | 13 +++++++++---- base/applications/rapps/lang/pt-PT.rc | 15 ++++++++++----- base/applications/rapps/lang/ro-RO.rc | 17 ++++++++--------- base/applications/rapps/lang/ru-RU.rc | 4 ++-- base/applications/rapps/lang/sk-SK.rc | 14 ++++++++------ base/applications/rapps/lang/sq-AL.rc | 15 +++++++++------ base/applications/rapps/lang/sv-SE.rc | 12 ++++++------ base/applications/rapps/lang/tr-TR.rc | 15 +++++++++++---- base/applications/rapps/lang/uk-UA.rc | 15 ++++++++------- base/applications/rapps/lang/zh-CN.rc | 4 ++-- base/applications/rapps/lang/zh-HK.rc | 10 +++++----- base/applications/rapps/lang/zh-TW.rc | 10 +++++----- 26 files changed, 173 insertions(+), 120 deletions(-) diff --git a/base/applications/rapps/lang/bg-BG.rc b/base/applications/rapps/lang/bg-BG.rc index f81020f4310..4a33f85238a 100644 --- a/base/applications/rapps/lang/bg-BG.rc +++ b/base/applications/rapps/lang/bg-BG.rc @@ -1,6 +1,9 @@ -/* Превод на Български/ Bulgarian translation */ -/* http://www.reactos.org/wiki/Bulgarian_translation */ -/* LOCATION: base/applications/rapps/lang */ +/* + * PROJECT: ReactOS Applications Manager + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: Bulgarian resource file + * TRANSLATOR: Copyright 2009-2012 S. Stanev <sstpr(a)narod.ru> + */ LANGUAGE LANG_BULGARIAN, SUBLANG_DEFAULT @@ -79,7 +82,7 @@ BEGIN CONTROL "Direct (No proxy)", IDC_NO_PROXY, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 15, 195, 210, 10 CONTROL "Proxy", IDC_USE_PROXY, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 15, 210, 74, 10 EDITTEXT IDC_PROXY_SERVER, 90, 210, 147, 12, ES_AUTOHSCROLL | WS_DISABLED - LTEXT "No proxy for", -1, 27, 225, 64, 10 + LTEXT "No proxy for", -1, 26, 226, 64, 10 EDITTEXT IDC_NO_PROXY_FOR, 90, 225, 147, 12, ES_AUTOHSCROLL | WS_DISABLED PUSHBUTTON "Подразбирано", IDC_DEFAULT_SETTINGS, 8, 245, 60, 14 DEFPUSHBUTTON "Добре", IDOK, 116, 245, 60, 14 @@ -98,8 +101,8 @@ BEGIN PUSHBUTTON "Отказ", IDCANCEL, 150, 78, 60, 14 END -IDD_DOWNLOAD_DIALOG DIALOGEX 0, 0, 220, 72 -STYLE DS_SHELLFONT | DS_CENTER | WS_BORDER | WS_CAPTION | WS_POPUP | WS_SYSMENU | WS_VISIBLE +IDD_DOWNLOAD_DIALOG DIALOGEX 0, 0, 220, 220 +STYLE DS_SHELLFONT | DS_CENTER | WS_POPUPWINDOW | WS_CAPTION | WS_VISIBLE CAPTION "Сваляне %ls…" FONT 8, "MS Shell Dlg" BEGIN diff --git a/base/applications/rapps/lang/cs-CZ.rc b/base/applications/rapps/lang/cs-CZ.rc index e2670f3ac0c..8c7bbcdc390 100644 --- a/base/applications/rapps/lang/cs-CZ.rc +++ b/base/applications/rapps/lang/cs-CZ.rc @@ -1,6 +1,8 @@ -/* FILE: applications/rapps/lang/cs-CZ.rc - * TRANSLATOR: Radek Liska aka Black_Fox (radekliska at gmail dot com) - * UPDATED: 2014-04-20 +/* + * PROJECT: ReactOS Applications Manager + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: Czech resource file + * TRANSLATOR: Copyright 2014 Radek Liska aka Black_Fox <radekliska(a)gmail.com> */ LANGUAGE LANG_CZECH, SUBLANG_DEFAULT @@ -80,7 +82,7 @@ BEGIN CONTROL "Bez proxy serveru", IDC_NO_PROXY, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 15, 195, 210, 10 CONTROL "Proxy", IDC_USE_PROXY, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 15, 210, 74, 10 EDITTEXT IDC_PROXY_SERVER, 90, 210, 147, 12, ES_AUTOHSCROLL | WS_DISABLED - LTEXT "Nepoužívat pro", -1, 27, 225, 64, 10 + LTEXT "Nepoužívat pro", -1, 26, 226, 64, 10 EDITTEXT IDC_NO_PROXY_FOR, 90, 225, 147, 12, ES_AUTOHSCROLL | WS_DISABLED PUSHBUTTON "Výchozí", IDC_DEFAULT_SETTINGS, 8, 245, 60, 14 DEFPUSHBUTTON "OK", IDOK, 116, 245, 60, 14 @@ -99,8 +101,8 @@ BEGIN PUSHBUTTON "Storno", IDCANCEL, 150, 78, 60, 14 END -IDD_DOWNLOAD_DIALOG DIALOGEX 0, 0, 220, 72 -STYLE DS_SHELLFONT | DS_CENTER | WS_BORDER | WS_CAPTION | WS_POPUP | WS_SYSMENU | WS_VISIBLE +IDD_DOWNLOAD_DIALOG DIALOGEX 0, 0, 220, 220 +STYLE DS_SHELLFONT | DS_CENTER | WS_POPUPWINDOW | WS_CAPTION | WS_VISIBLE CAPTION "Stahování %ls…" FONT 8, "MS Shell Dlg" BEGIN diff --git a/base/applications/rapps/lang/de-DE.rc b/base/applications/rapps/lang/de-DE.rc index 476cd6d086e..f07f2bc90e9 100644 --- a/base/applications/rapps/lang/de-DE.rc +++ b/base/applications/rapps/lang/de-DE.rc @@ -75,7 +75,7 @@ BEGIN CONTROL "Direkt (Kein Proxy)", IDC_NO_PROXY, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 15, 195, 210, 10 CONTROL "Proxy", IDC_USE_PROXY, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 15, 210, 74, 10 EDITTEXT IDC_PROXY_SERVER, 90, 210, 147, 12, ES_AUTOHSCROLL | WS_DISABLED - LTEXT "Kein Proxy", -1, 27, 225, 64, 10 + LTEXT "Kein Proxy", -1, 26, 226, 64, 10 EDITTEXT IDC_NO_PROXY_FOR, 90, 225, 147, 12, ES_AUTOHSCROLL | WS_DISABLED PUSHBUTTON "Vorgabe", IDC_DEFAULT_SETTINGS, 8, 245, 60, 14 DEFPUSHBUTTON "OK", IDOK, 116, 245, 60, 14 @@ -94,8 +94,8 @@ BEGIN PUSHBUTTON "Abbrechen", IDCANCEL, 150, 78, 60, 14 END -IDD_DOWNLOAD_DIALOG DIALOGEX 0, 0, 220, 72 -STYLE DS_SHELLFONT | DS_CENTER | WS_BORDER | WS_CAPTION | WS_POPUP | WS_SYSMENU | WS_VISIBLE +IDD_DOWNLOAD_DIALOG DIALOGEX 0, 0, 220, 220 +STYLE DS_SHELLFONT | DS_CENTER | WS_POPUPWINDOW | WS_CAPTION | WS_VISIBLE CAPTION "Download von %ls…" FONT 8, "MS Shell Dlg" BEGIN diff --git a/base/applications/rapps/lang/en-US.rc b/base/applications/rapps/lang/en-US.rc index 4c4c8bff35f..aa7f0dfbc73 100644 --- a/base/applications/rapps/lang/en-US.rc +++ b/base/applications/rapps/lang/en-US.rc @@ -1,3 +1,13 @@ +/* + * PROJECT: ReactOS Applications Manager + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: English (United States) resource file + * TRANSLATORS: Copyright 2009 Dmitry Chapyshev <dmitry(a)reactos.org> + * Copyright 2015 Ismael Ferreras Morezuelas <swyterzone+ros(a)gmail.com> + * Copyright 2017-2018 Alexander Shaposhnikov <sanchaez(a)reactos.org> + * Copyright 2020 He Yang <1160386205(a)qq.com> + */ + LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US IDR_MAINMENU MENU @@ -75,7 +85,7 @@ BEGIN CONTROL "Direct (No proxy)", IDC_NO_PROXY, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 15, 195, 210, 10 CONTROL "Proxy", IDC_USE_PROXY, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 15, 210, 74, 10 EDITTEXT IDC_PROXY_SERVER, 90, 210, 147, 12, ES_AUTOHSCROLL | WS_DISABLED - LTEXT "No proxy for", -1, 27, 225, 64, 10 + LTEXT "No proxy for", -1, 26, 226, 64, 10 EDITTEXT IDC_NO_PROXY_FOR, 90, 225, 147, 12, ES_AUTOHSCROLL | WS_DISABLED PUSHBUTTON "Default", IDC_DEFAULT_SETTINGS, 8, 245, 60, 14 DEFPUSHBUTTON "OK", IDOK, 116, 245, 60, 14 diff --git a/base/applications/rapps/lang/es-ES.rc b/base/applications/rapps/lang/es-ES.rc index 24cf1214321..b671c27bc03 100644 --- a/base/applications/rapps/lang/es-ES.rc +++ b/base/applications/rapps/lang/es-ES.rc @@ -1,5 +1,11 @@ -/* Spanish Language resource file. - * Translated by: ?? and Ismael Ferreras Morezuelas (Swyter) <2014-11-07> and Julen Urizar Compains 2020-04-14 and Catalin Gabriel Draghita 2020-08-22 */ +/* + * PROJECT: ReactOS Applications Manager + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: Spanish resource file + * TRANSLATORS: Copyright 2014-2015 Ismael Ferreras Morezuelas <swyterzone+ros(a)gmail.com> + * Copyright 2020 Julen Urizar Compains <julenuri(a)hotmail.com> + * Copyright 2020 Catalin Gabriel Draghita <catalin.draghita(a)gmail.com> + */ LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL @@ -77,9 +83,9 @@ BEGIN CONTROL "Utilizar el proxy del sistema", IDC_PROXY_DEFAULT, "Button", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 15, 180, 210, 10 CONTROL "Conexión directa (sin nada)", IDC_NO_PROXY, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 15, 195, 210, 10 CONTROL "Proxy:", IDC_USE_PROXY, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 15, 210, 74, 10 - EDITTEXT IDC_PROXY_SERVER, 90, 210, 147, 12, ES_AUTOHSCROLL - LTEXT "Sin proxy para:", -1, 27, 225, 64, 10 - EDITTEXT IDC_NO_PROXY_FOR, 90, 225, 147, 12, ES_AUTOHSCROLL + EDITTEXT IDC_PROXY_SERVER, 90, 210, 147, 12, ES_AUTOHSCROLL | WS_DISABLED + LTEXT "Sin proxy para:", -1, 26, 226, 64, 10 + EDITTEXT IDC_NO_PROXY_FOR, 90, 225, 147, 12, ES_AUTOHSCROLL | WS_DISABLED PUSHBUTTON "Por defecto", IDC_DEFAULT_SETTINGS, 8, 245, 60, 14 DEFPUSHBUTTON "Aceptar", IDOK, 116, 245, 60, 14 PUSHBUTTON "Cancelar", IDCANCEL, 181, 245, 60, 14 @@ -97,13 +103,13 @@ BEGIN PUSHBUTTON "Cancelar", IDCANCEL, 150, 78, 60, 14 END -IDD_DOWNLOAD_DIALOG DIALOGEX 0, 0, 220, 72 -STYLE DS_SHELLFONT | DS_CENTER | WS_BORDER | WS_CAPTION | WS_POPUP | WS_SYSMENU | WS_VISIBLE +IDD_DOWNLOAD_DIALOG DIALOGEX 0, 0, 220, 220 +STYLE DS_SHELLFONT | DS_CENTER | WS_POPUPWINDOW | WS_CAPTION | WS_VISIBLE CAPTION "Descargando %ls…" FONT 8, "MS Shell Dlg" BEGIN CONTROL "Progress1", IDC_DOWNLOAD_PROGRESS, "msctls_progress32", WS_BORDER | PBS_SMOOTH, 10, 10, 200, 12 - EDITTEXT IDC_DOWNLOAD_STATUS, 10, 28, 200, 22, ES_CENTER | ES_MULTILINE | ES_AUTOVSCROLL | ES_READONLY | WS_CHILD | WS_VISIBLE | WS_DISABLED | NOT WS_BORDER, 0 + EDITTEXT IDC_DOWNLOAD_STATUS, 10, 28, 200, 22, ES_CENTER | ES_MULTILINE | ES_AUTOVSCROLL | ES_READONLY | WS_DISABLED | NOT WS_BORDER PUSHBUTTON "Cancelar", IDCANCEL, 85, 53, 50, 15, WS_GROUP | WS_TABSTOP END diff --git a/base/applications/rapps/lang/et-EE.rc b/base/applications/rapps/lang/et-EE.rc index 8db73934252..a5fbebd1b07 100644 --- a/base/applications/rapps/lang/et-EE.rc +++ b/base/applications/rapps/lang/et-EE.rc @@ -1,9 +1,8 @@ /* - * PROJECT: RAPPS for ReactOS - * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) - * FILE: base/applications/rapps/lang/et-EE.rc - * PURPOSE: Estonian Language resource file - * TRANSLATOR: Joann Mõndresku (joannmondresku at gmail dot com) + * PROJECT: ReactOS Applications Manager + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: Estonian resource file + * TRANSLATOR: Copyright 2018 Joann Mõndresku <joannmondresku(a)gmail.com> */ LANGUAGE LANG_ESTONIAN, SUBLANG_DEFAULT @@ -83,7 +82,7 @@ BEGIN CONTROL "Otse (Puhverserverita)", IDC_NO_PROXY, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 15, 195, 210, 10 CONTROL "Puhverserver", IDC_USE_PROXY, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 15, 210, 74, 10 EDITTEXT IDC_PROXY_SERVER, 90, 210, 147, 12, ES_AUTOHSCROLL | WS_DISABLED - LTEXT "Puhverserverita", -1, 27, 225, 64, 10 + LTEXT "Puhverserverita", -1, 26, 226, 64, 10 EDITTEXT IDC_NO_PROXY_FOR, 90, 225, 147, 12, ES_AUTOHSCROLL | WS_DISABLED PUSHBUTTON "Vaikimisi", IDC_DEFAULT_SETTINGS, 8, 245, 60, 14 DEFPUSHBUTTON "OK", IDOK, 116, 245, 60, 14 diff --git a/base/applications/rapps/lang/fr-FR.rc b/base/applications/rapps/lang/fr-FR.rc index f58ab4ba2c1..6ac994cd10b 100644 --- a/base/applications/rapps/lang/fr-FR.rc +++ b/base/applications/rapps/lang/fr-FR.rc @@ -75,7 +75,7 @@ BEGIN CONTROL "Direct (Pas de proxy)", IDC_NO_PROXY, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 15, 195, 210, 10 CONTROL "Proxy", IDC_USE_PROXY, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 15, 210, 74, 10 EDITTEXT IDC_PROXY_SERVER, 90, 210, 147, 12, ES_AUTOHSCROLL | WS_DISABLED - LTEXT "Pas de proxy pour", -1, 27, 225, 64, 10 + LTEXT "Pas de proxy pour", -1, 26, 226, 64, 10 EDITTEXT IDC_NO_PROXY_FOR, 90, 225, 147, 12, ES_AUTOHSCROLL | WS_DISABLED PUSHBUTTON "Par défaut", IDC_DEFAULT_SETTINGS, 8, 245, 60, 14 DEFPUSHBUTTON "Accepter", IDOK, 116, 245, 60, 14 @@ -94,8 +94,8 @@ BEGIN PUSHBUTTON "Annuler", IDCANCEL, 150, 78, 60, 14 END -IDD_DOWNLOAD_DIALOG DIALOGEX 0, 0, 220, 72 -STYLE DS_SHELLFONT | DS_CENTER | WS_BORDER | WS_CAPTION | WS_POPUP | WS_SYSMENU | WS_VISIBLE +IDD_DOWNLOAD_DIALOG DIALOGEX 0, 0, 220, 220 +STYLE DS_SHELLFONT | DS_CENTER | WS_POPUPWINDOW | WS_CAPTION | WS_VISIBLE CAPTION "Téléchargement %ls…" FONT 8, "MS Shell Dlg" BEGIN diff --git a/base/applications/rapps/lang/he-IL.rc b/base/applications/rapps/lang/he-IL.rc index ff689d5a33a..3557ca23bb2 100644 --- a/base/applications/rapps/lang/he-IL.rc +++ b/base/applications/rapps/lang/he-IL.rc @@ -1,5 +1,11 @@ -/* Translated by Baruch Rutman, additional translations by Shy Zedaka and Omer I.S. */ - +/* + * PROJECT: ReactOS Applications Manager + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: Hebrew resource file + * TRANSLATORS: Copyright 2013-2019 Baruch Rutman <peterooch(a)gmail.com> + * Copyright 2019 Shy Zedaka <shaytzedaka123(a)gmail.com> + * Copyright 2020 Omer Itzic Schwartz <omeritzicschwartz(a)gmail.com> + */ LANGUAGE LANG_HEBREW, SUBLANG_DEFAULT @@ -79,7 +85,7 @@ BEGIN CONTROL "חיבור ישיר(ללא פרוקסי)", IDC_NO_PROXY, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 15, 195, 210, 10 CONTROL "פרוקסי", IDC_USE_PROXY, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 15, 210, 74, 10 EDITTEXT IDC_PROXY_SERVER, 90, 210, 147, 12, ES_AUTOHSCROLL | WS_DISABLED - LTEXT "ללא פרוקסי עבור:", -1, 27, 225, 64, 10 + LTEXT "ללא פרוקסי עבור:", -1, 26, 226, 64, 10 EDITTEXT IDC_NO_PROXY_FOR, 90, 225, 147, 12, ES_AUTOHSCROLL | WS_DISABLED PUSHBUTTON "ברירת מחדל", IDC_DEFAULT_SETTINGS, 8, 245, 60, 14 DEFPUSHBUTTON "אישור", IDOK, 116, 245, 60, 14 @@ -99,8 +105,8 @@ BEGIN PUSHBUTTON "ביטול", IDCANCEL, 150, 78, 60, 14 END -IDD_DOWNLOAD_DIALOG DIALOGEX 0, 0, 220, 72 -STYLE DS_SHELLFONT | DS_CENTER | WS_BORDER | WS_CAPTION | WS_POPUP | WS_SYSMENU | WS_VISIBLE +IDD_DOWNLOAD_DIALOG DIALOGEX 0, 0, 220, 220 +STYLE DS_SHELLFONT | DS_CENTER | WS_POPUPWINDOW | WS_CAPTION | WS_VISIBLE EXSTYLE WS_EX_LAYOUTRTL CAPTION "הורדה %ls…" FONT 8, "MS Shell Dlg" diff --git a/base/applications/rapps/lang/hu-HU.rc b/base/applications/rapps/lang/hu-HU.rc index 50c6ae4e7cf..d87fd86a067 100644 --- a/base/applications/rapps/lang/hu-HU.rc +++ b/base/applications/rapps/lang/hu-HU.rc @@ -1,4 +1,9 @@ -/* Hungarian translation by Tibor Lajos Füzi (tibor.fuzi(a)gmail.com) 2021 */ +/* + * PROJECT: ReactOS Applications Manager + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: Hungarian resource file + * TRANSLATOR: Copyright 2021 Tibor Lajos Füzi <tibor.fuzi(a)gmail.com> + */ LANGUAGE LANG_HUNGARIAN, SUBLANG_NEUTRAL @@ -77,7 +82,7 @@ BEGIN CONTROL "Közvetlen (nincs proxy)", IDC_NO_PROXY, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 15, 195, 210, 10 CONTROL "Proxy", IDC_USE_PROXY, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 15, 210, 74, 10 EDITTEXT IDC_PROXY_SERVER, 97, 210, 140, 12, ES_AUTOHSCROLL | WS_DISABLED - LTEXT "Nincs proxy ezekhez:", -1, 27, 225, 77, 10 + LTEXT "Nincs proxy ezekhez:", -1, 26, 226, 77, 10 EDITTEXT IDC_NO_PROXY_FOR, 97, 225, 140, 12, ES_AUTOHSCROLL | WS_DISABLED PUSHBUTTON "Alapértelmezett", IDC_DEFAULT_SETTINGS, 8, 245, 70, 14 DEFPUSHBUTTON "OK", IDOK, 116, 245, 60, 14 diff --git a/base/applications/rapps/lang/id-ID.rc b/base/applications/rapps/lang/id-ID.rc index c8b11ebd592..dc0f7a79b00 100644 --- a/base/applications/rapps/lang/id-ID.rc +++ b/base/applications/rapps/lang/id-ID.rc @@ -75,7 +75,7 @@ BEGIN CONTROL "Langsung (Tanpa proxy)", IDC_NO_PROXY, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 15, 195, 210, 10 CONTROL "Proxy", IDC_USE_PROXY, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 15, 210, 74, 10 EDITTEXT IDC_PROXY_SERVER, 90, 210, 147, 12, ES_AUTOHSCROLL | WS_DISABLED - LTEXT "Tanpa proxy untuk", -1, 27, 225, 64, 10 + LTEXT "Tanpa proxy untuk", -1, 26, 226, 64, 10 EDITTEXT IDC_NO_PROXY_FOR, 90, 225, 147, 12, ES_AUTOHSCROLL | WS_DISABLED PUSHBUTTON "Asli", IDC_DEFAULT_SETTINGS, 8, 245, 60, 14 DEFPUSHBUTTON "OK", IDOK, 116, 245, 60, 14 diff --git a/base/applications/rapps/lang/it-IT.rc b/base/applications/rapps/lang/it-IT.rc index 1ca702e8d1c..f71b45f0569 100644 --- a/base/applications/rapps/lang/it-IT.rc +++ b/base/applications/rapps/lang/it-IT.rc @@ -75,7 +75,7 @@ BEGIN CONTROL "Diretto (nessun proxy)", IDC_NO_PROXY, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 15, 195, 210, 10 CONTROL "Proxy:", IDC_USE_PROXY, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 15, 210, 74, 10 EDITTEXT IDC_PROXY_SERVER, 90, 210, 147, 12, ES_AUTOHSCROLL | WS_DISABLED - LTEXT "Ignora proxy per:", -1, 27, 225, 64, 10 + LTEXT "Ignora proxy per:", -1, 26, 226, 64, 10 EDITTEXT IDC_NO_PROXY_FOR, 90, 225, 147, 12, ES_AUTOHSCROLL | WS_DISABLED PUSHBUTTON "Predefiniti", IDC_DEFAULT_SETTINGS, 8, 245, 60, 14 DEFPUSHBUTTON "OK", IDOK, 116, 245, 60, 14 @@ -94,8 +94,8 @@ BEGIN PUSHBUTTON "Annulla", IDCANCEL, 150, 78, 60, 14 END -IDD_DOWNLOAD_DIALOG DIALOGEX 0, 0, 220, 72 -STYLE DS_SHELLFONT | DS_CENTER | WS_BORDER | WS_CAPTION | WS_POPUP | WS_SYSMENU | WS_VISIBLE +IDD_DOWNLOAD_DIALOG DIALOGEX 0, 0, 220, 220 +STYLE DS_SHELLFONT | DS_CENTER | WS_POPUPWINDOW | WS_CAPTION | WS_VISIBLE CAPTION "Scaricamento in corso %ls…" FONT 8, "MS Shell Dlg" BEGIN diff --git a/base/applications/rapps/lang/ja-JP.rc b/base/applications/rapps/lang/ja-JP.rc index 6d11465afa1..3984b9a9ca7 100644 --- a/base/applications/rapps/lang/ja-JP.rc +++ b/base/applications/rapps/lang/ja-JP.rc @@ -75,7 +75,7 @@ BEGIN CONTROL "直接 (プロキシなし)", IDC_NO_PROXY, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 15, 195, 210, 10 CONTROL "プロキシ", IDC_USE_PROXY, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 15, 210, 74, 10 EDITTEXT IDC_PROXY_SERVER, 90, 210, 147, 12, ES_AUTOHSCROLL | WS_DISABLED - LTEXT "次のはプロキシなし", -1, 27, 225, 64, 10 + LTEXT "次のはプロキシなし", -1, 26, 226, 64, 10 EDITTEXT IDC_NO_PROXY_FOR, 90, 225, 147, 12, ES_AUTOHSCROLL | WS_DISABLED PUSHBUTTON "デフォルト", IDC_DEFAULT_SETTINGS, 8, 245, 60, 14 DEFPUSHBUTTON "OK", IDOK, 116, 245, 60, 14 @@ -94,8 +94,8 @@ BEGIN PUSHBUTTON "キャンセル", IDCANCEL, 150, 78, 60, 14 END -IDD_DOWNLOAD_DIALOG DIALOGEX 0, 0, 220, 72 -STYLE DS_SHELLFONT | DS_CENTER | WS_BORDER | WS_CAPTION | WS_POPUP | WS_SYSMENU | WS_VISIBLE +IDD_DOWNLOAD_DIALOG DIALOGEX 0, 0, 220, 220 +STYLE DS_SHELLFONT | DS_CENTER | WS_POPUPWINDOW | WS_CAPTION | WS_VISIBLE CAPTION "ダウンロード %ls..." FONT 9, "MS UI Gothic" BEGIN diff --git a/base/applications/rapps/lang/no-NO.rc b/base/applications/rapps/lang/no-NO.rc index 605c223fd29..a9dece48282 100644 --- a/base/applications/rapps/lang/no-NO.rc +++ b/base/applications/rapps/lang/no-NO.rc @@ -75,7 +75,7 @@ BEGIN CONTROL "Direct (No proxy)", IDC_NO_PROXY, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 15, 195, 210, 10 CONTROL "Proxy", IDC_USE_PROXY, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 15, 210, 74, 10 EDITTEXT IDC_PROXY_SERVER, 90, 210, 147, 12, ES_AUTOHSCROLL | WS_DISABLED - LTEXT "No proxy for", -1, 27, 225, 64, 10 + LTEXT "No proxy for", -1, 26, 226, 64, 10 EDITTEXT IDC_NO_PROXY_FOR, 90, 225, 147, 12, ES_AUTOHSCROLL | WS_DISABLED PUSHBUTTON "Default", IDC_DEFAULT_SETTINGS, 8, 245, 60, 14 DEFPUSHBUTTON "OK", IDOK, 116, 245, 60, 14 @@ -94,13 +94,13 @@ BEGIN PUSHBUTTON "Cancel", IDCANCEL, 150, 78, 60, 14 END -IDD_DOWNLOAD_DIALOG DIALOGEX 0, 0, 220, 72 -STYLE DS_SHELLFONT | DS_CENTER | WS_BORDER | WS_CAPTION | WS_POPUP | WS_SYSMENU | WS_VISIBLE +IDD_DOWNLOAD_DIALOG DIALOGEX 0, 0, 220, 220 +STYLE DS_SHELLFONT | DS_CENTER | WS_POPUPWINDOW | WS_CAPTION | WS_VISIBLE CAPTION "Lastet ned %ls…" FONT 8, "MS Shell Dlg" BEGIN CONTROL "Progress1", IDC_DOWNLOAD_PROGRESS, "msctls_progress32", WS_BORDER | PBS_SMOOTH, 10, 10, 200, 12 - EDITTEXT IDC_DOWNLOAD_STATUS, 10, 28, 200, 22, ES_CENTER | ES_MULTILINE | ES_AUTOVSCROLL | ES_READONLY | WS_DISABLED | NOT WS_BORDER + EDITTEXT IDC_DOWNLOAD_STATUS, 10, 28, 200, 22, ES_CENTER | ES_MULTILINE | ES_AUTOVSCROLL | ES_READONLY | WS_DISABLED | NOT WS_BORDER PUSHBUTTON "Avbryt", IDCANCEL, 85, 53, 50, 15, WS_GROUP | WS_TABSTOP END diff --git a/base/applications/rapps/lang/pl-PL.rc b/base/applications/rapps/lang/pl-PL.rc index c32f17306d3..d2bf8aeb54e 100644 --- a/base/applications/rapps/lang/pl-PL.rc +++ b/base/applications/rapps/lang/pl-PL.rc @@ -1,10 +1,10 @@ /* - * Translated by Caemyr - Olaf Siejka (Aug, 2009) - * Use ReactOS forum PM or IRC to contact me - * Updated by Saibamen - Adam Stachowicz (saibamenppl(a)gmail.com) (May, 2020) - * Updated by pithwz - Piotr Hetnarowicz (piotrhwz(a)gmail.com) (February, 2021) - * https://reactos.org/ - * IRC: irc.freenode.net #reactos-pl; + * PROJECT: ReactOS Applications Manager + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: Polish resource file + * TRANSLATORS: Copyright 2009 Olaf Siejka <caemyr(a)openmailbox.org> + * Copyright 2020 Adam Stachowicz <saibamenppl(a)gmail.com> + * Copyright 2021 Piotr Hetnarowicz <piotrhwz(a)gmail.com> */ LANGUAGE LANG_POLISH, SUBLANG_DEFAULT @@ -84,7 +84,7 @@ BEGIN CONTROL "Bezpośrednio (bez proxy)", IDC_NO_PROXY, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 15, 195, 210, 10 CONTROL "Proxy", IDC_USE_PROXY, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 15, 210, 74, 10 EDITTEXT IDC_PROXY_SERVER, 90, 210, 147, 12, ES_AUTOHSCROLL | WS_DISABLED - LTEXT "Bez proxy dla", -1, 27, 225, 64, 10 + LTEXT "Bez proxy dla", -1, 26, 226, 64, 10 EDITTEXT IDC_NO_PROXY_FOR, 90, 225, 147, 12, ES_AUTOHSCROLL | WS_DISABLED PUSHBUTTON "Domyślne", IDC_DEFAULT_SETTINGS, 8, 245, 60, 14 DEFPUSHBUTTON "OK", IDOK, 116, 245, 60, 14 @@ -104,7 +104,7 @@ BEGIN END IDD_DOWNLOAD_DIALOG DIALOGEX 0, 0, 220, 220 -STYLE DS_SHELLFONT | DS_CENTER | WS_BORDER | WS_CAPTION | WS_POPUP | WS_SYSMENU | WS_VISIBLE +STYLE DS_SHELLFONT | DS_CENTER | WS_POPUPWINDOW | WS_CAPTION | WS_VISIBLE CAPTION "Pobieranie %ls…" FONT 8, "MS Shell Dlg" BEGIN diff --git a/base/applications/rapps/lang/pt-BR.rc b/base/applications/rapps/lang/pt-BR.rc index 1bd4c71f3b2..269dd99d9e4 100644 --- a/base/applications/rapps/lang/pt-BR.rc +++ b/base/applications/rapps/lang/pt-BR.rc @@ -1,4 +1,9 @@ -/* Translation and UTF-8 Conversion by mkbu95 <mkbu95(a)gmail.com> (August, 2011) */ +/* + * PROJECT: ReactOS Applications Manager + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: Portuguese (Brazilian) resource file + * TRANSLATOR: Copyright 2011 Matheus Macabu <mkbu95(a)gmail.com> + */ LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE_BRAZILIAN @@ -77,7 +82,7 @@ BEGIN CONTROL "Direct (No proxy)", IDC_NO_PROXY, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 15, 195, 210, 10 CONTROL "Proxy", IDC_USE_PROXY, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 15, 210, 74, 10 EDITTEXT IDC_PROXY_SERVER, 90, 210, 147, 12, ES_AUTOHSCROLL | WS_DISABLED - LTEXT "No proxy for", -1, 27, 225, 64, 10 + LTEXT "No proxy for", -1, 26, 226, 64, 10 EDITTEXT IDC_NO_PROXY_FOR, 90, 225, 147, 12, ES_AUTOHSCROLL | WS_DISABLED PUSHBUTTON "Padrão", IDC_DEFAULT_SETTINGS, 8, 245, 60, 14 DEFPUSHBUTTON "OK", IDOK, 116, 245, 60, 14 @@ -96,8 +101,8 @@ BEGIN PUSHBUTTON "Cancelar", IDCANCEL, 150, 78, 60, 14 END -IDD_DOWNLOAD_DIALOG DIALOGEX 0, 0, 220, 72 -STYLE DS_SHELLFONT | DS_CENTER | WS_BORDER | WS_CAPTION | WS_POPUP | WS_SYSMENU | WS_VISIBLE +IDD_DOWNLOAD_DIALOG DIALOGEX 0, 0, 220, 220 +STYLE DS_SHELLFONT | DS_CENTER | WS_POPUPWINDOW | WS_CAPTION | WS_VISIBLE CAPTION "Download %ls…" FONT 8, "MS Shell Dlg" BEGIN diff --git a/base/applications/rapps/lang/pt-PT.rc b/base/applications/rapps/lang/pt-PT.rc index 358ec0db154..afc1ce00013 100644 --- a/base/applications/rapps/lang/pt-PT.rc +++ b/base/applications/rapps/lang/pt-PT.rc @@ -1,4 +1,9 @@ -/* Translation and UTF-8 Conversion by mkbu95 <mkbu95(a)gmail.com> (August, 2011) */ +/* + * PROJECT: ReactOS Applications Manager + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: Portuguese (Portugal) resource file + * TRANSLATOR: Copyright 2011 Matheus Macabu <mkbu95(a)gmail.com> + */ LANGUAGE LANG_PORTUGUESE, SUBLANG_NEUTRAL @@ -20,7 +25,7 @@ BEGIN MENUITEM SEPARATOR MENUITEM "&Actualizar\tF5", ID_REFRESH MENUITEM SEPARATOR - MENUITEM "actualizar Da&tabase\tCtrl+F5", ID_RESETDB + MENUITEM "Actualizar Da&tabase\tCtrl+F5", ID_RESETDB END POPUP "Aj&uda" BEGIN @@ -77,7 +82,7 @@ BEGIN CONTROL "Directo (Sem proxy)", IDC_NO_PROXY, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 15, 195, 210, 10 CONTROL "Proxy", IDC_USE_PROXY, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 15, 210, 74, 10 EDITTEXT IDC_PROXY_SERVER, 90, 210, 147, 12, ES_AUTOHSCROLL | WS_DISABLED - LTEXT "Sem proxy para", -1, 27, 225, 64, 10 + LTEXT "Sem proxy para", -1, 26, 226, 64, 10 EDITTEXT IDC_NO_PROXY_FOR, 90, 225, 147, 12, ES_AUTOHSCROLL | WS_DISABLED PUSHBUTTON "Padrão", IDC_DEFAULT_SETTINGS, 8, 245, 60, 14 DEFPUSHBUTTON "OK", IDOK, 116, 245, 60, 14 @@ -96,8 +101,8 @@ BEGIN PUSHBUTTON "Cancelar", IDCANCEL, 150, 78, 60, 14 END -IDD_DOWNLOAD_DIALOG DIALOGEX 0, 0, 220, 72 -STYLE DS_SHELLFONT | DS_CENTER | WS_BORDER | WS_CAPTION | WS_POPUP | WS_SYSMENU | WS_VISIBLE +IDD_DOWNLOAD_DIALOG DIALOGEX 0, 0, 220, 220 +STYLE DS_SHELLFONT | DS_CENTER | WS_POPUPWINDOW | WS_CAPTION | WS_VISIBLE CAPTION "Download %ls…" FONT 8, "MS Shell Dlg" BEGIN diff --git a/base/applications/rapps/lang/ro-RO.rc b/base/applications/rapps/lang/ro-RO.rc index cfd6b0e4aec..bb8a6972954 100644 --- a/base/applications/rapps/lang/ro-RO.rc +++ b/base/applications/rapps/lang/ro-RO.rc @@ -1,10 +1,9 @@ /* - * PROJECT: ReactOS Applications Manager (RAPPS) - * FILE: base/applications/rapps/lang/ro-RO.rc - * PURPOSE: Romanian Translation for RAPPS - * TRANSLATORS: - * Ștefan Fulea (stefan dot fulea at mail dot com) - * George Bișoc (george.bisoc(a)reactos.org) + * PROJECT: ReactOS Applications Manager + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: Romanian resource file + * TRANSLATORS: Copyright 2011-2018 Ștefan Fulea <stefan.fulea(a)mail.com> + * Copyright 2017-2018 George Bișoc <george.bisoc(a)reactos.org> */ LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL @@ -84,7 +83,7 @@ BEGIN CONTROL "Di&rect (fără mandatar)", IDC_NO_PROXY, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 15, 195, 210, 10 CONTROL "Man&datar", IDC_USE_PROXY, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 15, 210, 74, 10 EDITTEXT IDC_PROXY_SERVER, 90, 210, 147, 12, ES_AUTOHSCROLL | WS_DISABLED - LTEXT "excepție pentru", -1, 27, 225, 64, 10 + LTEXT "excepție pentru", -1, 26, 226, 64, 10 EDITTEXT IDC_NO_PROXY_FOR, 90, 225, 147, 12, ES_AUTOHSCROLL | WS_DISABLED PUSHBUTTON "I&mplicite", IDC_DEFAULT_SETTINGS, 8, 245, 60, 14 DEFPUSHBUTTON "Con&firmă", IDOK, 116, 245, 60, 14 @@ -103,8 +102,8 @@ BEGIN PUSHBUTTON "A&nulează", IDCANCEL, 150, 78, 60, 14 END -IDD_DOWNLOAD_DIALOG DIALOGEX 0, 0, 220, 72 -STYLE DS_SHELLFONT | DS_CENTER | WS_BORDER | WS_CAPTION | WS_POPUP | WS_SYSMENU | WS_VISIBLE +IDD_DOWNLOAD_DIALOG DIALOGEX 0, 0, 220, 220 +STYLE DS_SHELLFONT | DS_CENTER | WS_POPUPWINDOW | WS_CAPTION | WS_VISIBLE CAPTION "În curs de descărcare %ls…" FONT 8, "MS Shell Dlg" BEGIN diff --git a/base/applications/rapps/lang/ru-RU.rc b/base/applications/rapps/lang/ru-RU.rc index fafb3d03358..1bcfdc80fc8 100644 --- a/base/applications/rapps/lang/ru-RU.rc +++ b/base/applications/rapps/lang/ru-RU.rc @@ -75,7 +75,7 @@ BEGIN CONTROL "Без прокси", IDC_NO_PROXY, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 15, 195, 210, 10 CONTROL "Прокси", IDC_USE_PROXY, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 15, 210, 74, 10 EDITTEXT IDC_PROXY_SERVER, 90, 210, 147, 12, ES_AUTOHSCROLL | WS_DISABLED - LTEXT "Исключения", -1, 27, 225, 64, 10 + LTEXT "Исключения", -1, 26, 226, 64, 10 EDITTEXT IDC_NO_PROXY_FOR, 90, 225, 147, 12, ES_AUTOHSCROLL | WS_DISABLED PUSHBUTTON "По умолчанию", IDC_DEFAULT_SETTINGS, 8, 245, 60, 14 DEFPUSHBUTTON "OK", IDOK, 116, 245, 60, 14 @@ -95,7 +95,7 @@ BEGIN END IDD_DOWNLOAD_DIALOG DIALOGEX 0, 0, 220, 220 -STYLE DS_SHELLFONT | DS_CENTER | WS_POPUPWINDOW | WS_SYSMENU | WS_VISIBLE +STYLE DS_SHELLFONT | DS_CENTER | WS_POPUPWINDOW | WS_CAPTION | WS_VISIBLE CAPTION "Загрузка %ls…" FONT 8, "MS Shell Dlg" BEGIN diff --git a/base/applications/rapps/lang/sk-SK.rc b/base/applications/rapps/lang/sk-SK.rc index f029af632ee..8cbbda6bd81 100644 --- a/base/applications/rapps/lang/sk-SK.rc +++ b/base/applications/rapps/lang/sk-SK.rc @@ -1,6 +1,8 @@ -/* TRANSLATOR : Mário Kačmár /Mario Kacmar/ aka Kario (kario(a)szm.sk) - * DATE OF TR.: 29-08-2009 - * LAST CHANGE: 26-07-2010 +/* + * PROJECT: ReactOS Applications Manager + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: Slovak resource file + * TRANSLATOR: Copyright 2009-2010 Mário Kačmár <kario(a)szm.sk> */ LANGUAGE LANG_SLOVAK, SUBLANG_DEFAULT @@ -80,7 +82,7 @@ BEGIN CONTROL "Direct (No proxy)", IDC_NO_PROXY, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 15, 195, 210, 10 CONTROL "Proxy", IDC_USE_PROXY, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 15, 210, 74, 10 EDITTEXT IDC_PROXY_SERVER, 90, 210, 147, 12, ES_AUTOHSCROLL | WS_DISABLED - LTEXT "No proxy for", -1, 27, 225, 64, 10 + LTEXT "No proxy for", -1, 26, 226, 64, 10 EDITTEXT IDC_NO_PROXY_FOR, 90, 225, 147, 12, ES_AUTOHSCROLL | WS_DISABLED PUSHBUTTON "Predvolené", IDC_DEFAULT_SETTINGS, 8, 245, 60, 14 DEFPUSHBUTTON "OK", IDOK, 116, 245, 60, 14 @@ -99,8 +101,8 @@ BEGIN PUSHBUTTON "Zrušiť", IDCANCEL, 150, 78, 60, 14 END -IDD_DOWNLOAD_DIALOG DIALOGEX 0, 0, 220, 72 -STYLE DS_SHELLFONT | DS_CENTER | WS_BORDER | WS_CAPTION | WS_POPUP | WS_SYSMENU | WS_VISIBLE +IDD_DOWNLOAD_DIALOG DIALOGEX 0, 0, 220, 220 +STYLE DS_SHELLFONT | DS_CENTER | WS_POPUPWINDOW | WS_CAPTION | WS_VISIBLE CAPTION "Sťahujem %ls…" // Stiahnuť ??? FONT 8, "MS Shell Dlg" BEGIN diff --git a/base/applications/rapps/lang/sq-AL.rc b/base/applications/rapps/lang/sq-AL.rc index 99b28381606..afafad7cf09 100644 --- a/base/applications/rapps/lang/sq-AL.rc +++ b/base/applications/rapps/lang/sq-AL.rc @@ -1,6 +1,9 @@ -/* TRANSLATOR : Ardit Dani (Ard1t) (ardit.dani(a)gmail.com) - * DATE OF TR: 29-11-2013 -*/ +/* + * PROJECT: ReactOS Applications Manager + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: Albanian resource file + * TRANSLATOR: Copyright 2013 Ardit Dani (Ard1t) <ardit.dani(a)gmail.com> + */ LANGUAGE LANG_ALBANIAN, SUBLANG_NEUTRAL @@ -79,7 +82,7 @@ BEGIN CONTROL "Direct (No proxy)", IDC_NO_PROXY, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 15, 195, 210, 10 CONTROL "Proxy", IDC_USE_PROXY, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 15, 210, 74, 10 EDITTEXT IDC_PROXY_SERVER, 90, 210, 147, 12, ES_AUTOHSCROLL | WS_DISABLED - LTEXT "No proxy for", -1, 27, 225, 64, 10 + LTEXT "No proxy for", -1, 26, 226, 64, 10 EDITTEXT IDC_NO_PROXY_FOR, 90, 225, 147, 12, ES_AUTOHSCROLL | WS_DISABLED PUSHBUTTON "Parazgjedhur", IDC_DEFAULT_SETTINGS, 8, 245, 60, 14 DEFPUSHBUTTON "OK", IDOK, 116, 245, 60, 14 @@ -98,8 +101,8 @@ BEGIN PUSHBUTTON "Anulo", IDCANCEL, 150, 78, 60, 14 END -IDD_DOWNLOAD_DIALOG DIALOGEX 0, 0, 220, 72 -STYLE DS_SHELLFONT | DS_CENTER | WS_BORDER | WS_CAPTION | WS_POPUP | WS_SYSMENU | WS_VISIBLE +IDD_DOWNLOAD_DIALOG DIALOGEX 0, 0, 220, 220 +STYLE DS_SHELLFONT | DS_CENTER | WS_POPUPWINDOW | WS_CAPTION | WS_VISIBLE CAPTION "Shkarko %ls…" FONT 8, "MS Shell Dlg" BEGIN diff --git a/base/applications/rapps/lang/sv-SE.rc b/base/applications/rapps/lang/sv-SE.rc index 46c7a7df733..7d0442e0b23 100644 --- a/base/applications/rapps/lang/sv-SE.rc +++ b/base/applications/rapps/lang/sv-SE.rc @@ -1,8 +1,8 @@ /* - * PROJECT: ReactOS RAPPS - * FILE: base/applications/rapps/lang/sv-SE.rc + * PROJECT: ReactOS Applications Manager + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) * PURPOSE: Swedish resource file - * Translation: Jaix Bly + * TRANSLATOR: Copyright 2011 Jan Blomqvist Kinander (Jaix Bly) <jaixbly(a)spray.se> */ LANGUAGE LANG_SWEDISH, SUBLANG_NEUTRAL @@ -82,7 +82,7 @@ BEGIN CONTROL "Direct (No proxy)", IDC_NO_PROXY, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 15, 195, 210, 10 CONTROL "Proxy", IDC_USE_PROXY, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 15, 210, 74, 10 EDITTEXT IDC_PROXY_SERVER, 90, 210, 147, 12, ES_AUTOHSCROLL | WS_DISABLED - LTEXT "No proxy for", -1, 27, 225, 64, 10 + LTEXT "No proxy for", -1, 26, 226, 64, 10 EDITTEXT IDC_NO_PROXY_FOR, 90, 225, 147, 12, ES_AUTOHSCROLL | WS_DISABLED PUSHBUTTON "Standard", IDC_DEFAULT_SETTINGS, 8, 245, 60, 14 DEFPUSHBUTTON "OK", IDOK, 116, 245, 60, 14 @@ -101,8 +101,8 @@ BEGIN PUSHBUTTON "Avbryt", IDCANCEL, 150, 78, 60, 14 END -IDD_DOWNLOAD_DIALOG DIALOGEX 0, 0, 220, 72 -STYLE DS_SHELLFONT | DS_CENTER | WS_BORDER | WS_CAPTION | WS_POPUP | WS_SYSMENU | WS_VISIBLE +IDD_DOWNLOAD_DIALOG DIALOGEX 0, 0, 220, 220 +STYLE DS_SHELLFONT | DS_CENTER | WS_POPUPWINDOW | WS_CAPTION | WS_VISIBLE CAPTION "Ladda ner %ls…" FONT 8, "MS Shell Dlg" BEGIN diff --git a/base/applications/rapps/lang/tr-TR.rc b/base/applications/rapps/lang/tr-TR.rc index a03094e8896..cdb9ad4a9ff 100644 --- a/base/applications/rapps/lang/tr-TR.rc +++ b/base/applications/rapps/lang/tr-TR.rc @@ -1,4 +1,11 @@ -/* TRANSLATORS: 2013-2016 Erdem Ersoy (eersoy93) (erdemersoy [at] erdemersoy [dot] net), 2018 Ercan Ersoy (ercanersoy) (ercanersoy [at] ercanersoy [dot] net) */ +/* + * PROJECT: ReactOS Applications Manager + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: Turkish resource file + * TRANSLATORS: Copyright 2013-2016 Erdem Ersoy (eersoy93) <erdemersoy(a)erdemersoy.net> + * Copyright 2018 Ercan Ersoy (ercanersoy) <ercanersoy(a)ercanersoy.net> + * Copyright 2021 Süleyman Poyraz <zaryob.dev(a)gmail.com> + */ LANGUAGE LANG_TURKISH, SUBLANG_DEFAULT @@ -77,7 +84,7 @@ BEGIN CONTROL "Doğrudan (Vekil sunucu yok.)", IDC_NO_PROXY, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 15, 195, 210, 10 CONTROL "Vekil Sunucu", IDC_USE_PROXY, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 15, 210, 74, 10 EDITTEXT IDC_PROXY_SERVER, 90, 210, 147, 12, ES_AUTOHSCROLL | WS_DISABLED - LTEXT "Şunun i̇çin vekil sunucu yok", -1, 27, 225, 64, 10 + LTEXT "Şunun i̇çin vekil sunucu yok", -1, 26, 226, 64, 10 EDITTEXT IDC_NO_PROXY_FOR, 90, 225, 147, 12, ES_AUTOHSCROLL | WS_DISABLED PUSHBUTTON "Varsayılanlar", IDC_DEFAULT_SETTINGS, 8, 245, 60, 14 DEFPUSHBUTTON "Tamam", IDOK, 116, 245, 60, 14 @@ -96,8 +103,8 @@ BEGIN PUSHBUTTON "İptal", IDCANCEL, 150, 78, 60, 14 END -IDD_DOWNLOAD_DIALOG DIALOGEX 0, 0, 220, 72 -STYLE DS_SHELLFONT | DS_CENTER | WS_BORDER | WS_CAPTION | WS_POPUP | WS_SYSMENU | WS_VISIBLE +IDD_DOWNLOAD_DIALOG DIALOGEX 0, 0, 220, 220 +STYLE DS_SHELLFONT | DS_CENTER | WS_POPUPWINDOW | WS_CAPTION | WS_VISIBLE CAPTION "İndiriliyor %ls…" FONT 8, "MS Shell Dlg" BEGIN diff --git a/base/applications/rapps/lang/uk-UA.rc b/base/applications/rapps/lang/uk-UA.rc index c618712d4a4..d552eb111bc 100644 --- a/base/applications/rapps/lang/uk-UA.rc +++ b/base/applications/rapps/lang/uk-UA.rc @@ -1,9 +1,10 @@ /* - * PROJECT: ReactOS ReactOS Applications Manager - * LICENSE: GPL - See COPYING in the top level directory - * FILE: base/applications/rapps/lang/uk-UA.rc - * PURPOSE: Ukraianian Language File for ReactOS ReactOS Applications Manager - * TRANSLATOR: Sakara Yevhen, Igor Paliychuk, Yaroslav Kibysh + * PROJECT: ReactOS Applications Manager + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: Ukraianian resource file + * TRANSLATORS: Copyright 2010 Sakara Yevhen <eresid(a)gmail.com> + * Copyright 2010 Igor Paliychuk <igor-hkr(a)mail.ru> + * Copyright 2021 Yaroslav Kibysh <yanet.prod(a)gmail.com> */ LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT @@ -83,7 +84,7 @@ BEGIN CONTROL "Пряме з'єднання (без проксі)", IDC_NO_PROXY, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 15, 195, 210, 10 CONTROL "Проксі", IDC_USE_PROXY, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 15, 210, 74, 10 EDITTEXT IDC_PROXY_SERVER, 90, 210, 147, 12, ES_AUTOHSCROLL | WS_DISABLED - LTEXT "Виключення", -1, 27, 225, 64, 10 + LTEXT "Виключення", -1, 26, 226, 64, 10 EDITTEXT IDC_NO_PROXY_FOR, 90, 225, 147, 12, ES_AUTOHSCROLL | WS_DISABLED PUSHBUTTON "За замовчуванням", IDC_DEFAULT_SETTINGS, 8, 245, 60, 14 DEFPUSHBUTTON "OK", IDOK, 116, 245, 60, 14 @@ -103,7 +104,7 @@ BEGIN END IDD_DOWNLOAD_DIALOG DIALOGEX 0, 0, 220, 220 -STYLE DS_SHELLFONT | DS_CENTER | WS_POPUPWINDOW | WS_SYSMENU | WS_VISIBLE +STYLE DS_SHELLFONT | DS_CENTER | WS_POPUPWINDOW | WS_CAPTION | WS_VISIBLE CAPTION "Завантаження %ls…" FONT 8, "MS Shell Dlg" BEGIN diff --git a/base/applications/rapps/lang/zh-CN.rc b/base/applications/rapps/lang/zh-CN.rc index 9da4c5a43a2..40e243b3545 100644 --- a/base/applications/rapps/lang/zh-CN.rc +++ b/base/applications/rapps/lang/zh-CN.rc @@ -86,7 +86,7 @@ BEGIN CONTROL "直连（无代理）", IDC_NO_PROXY, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 15, 195, 210, 10 CONTROL "代理服务器", IDC_USE_PROXY, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 15, 210, 74, 10 EDITTEXT IDC_PROXY_SERVER, 97, 210, 140, 12, ES_AUTOHSCROLL | WS_DISABLED - LTEXT "不使用代理的地址", -1, 27, 225, 64, 10 + LTEXT "不使用代理的地址", -1, 26, 226, 64, 10 EDITTEXT IDC_NO_PROXY_FOR, 97, 225, 140, 12, ES_AUTOHSCROLL | WS_DISABLED PUSHBUTTON "默认", IDC_DEFAULT_SETTINGS, 8, 245, 60, 14 DEFPUSHBUTTON "确定", IDOK, 116, 245, 60, 14 @@ -106,7 +106,7 @@ BEGIN END IDD_DOWNLOAD_DIALOG DIALOGEX 0, 0, 220, 220 -STYLE DS_SHELLFONT | DS_CENTER | WS_BORDER | WS_CAPTION | WS_POPUP | WS_SYSMENU | WS_VISIBLE +STYLE DS_SHELLFONT | DS_CENTER | WS_POPUPWINDOW | WS_CAPTION | WS_VISIBLE CAPTION "正在下载 %ls…" FONT 9, "宋体" BEGIN diff --git a/base/applications/rapps/lang/zh-HK.rc b/base/applications/rapps/lang/zh-HK.rc index 42d29ebe827..ebfee0dadd7 100644 --- a/base/applications/rapps/lang/zh-HK.rc +++ b/base/applications/rapps/lang/zh-HK.rc @@ -82,9 +82,9 @@ BEGIN CONTROL "使用系統代理設定", IDC_PROXY_DEFAULT, "Button", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 15, 180, 210, 10 CONTROL "直接（無代理）", IDC_NO_PROXY, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 15, 195, 210, 10 CONTROL "代理伺服器", IDC_USE_PROXY, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 15, 210, 71, 10 - EDITTEXT IDC_PROXY_SERVER, 90, 210, 147, 12, ES_AUTOHSCROLL | WS_DISABLED - LTEXT "不使用代理的情況", -1, 25, 226, 64, 10 - EDITTEXT IDC_NO_PROXY_FOR, 90, 225, 147, 12, ES_AUTOHSCROLL | WS_DISABLED + EDITTEXT IDC_PROXY_SERVER, 97, 210, 140, 12, ES_AUTOHSCROLL | WS_DISABLED + LTEXT "不使用代理的情況", -1, 26, 226, 64, 10 + EDITTEXT IDC_NO_PROXY_FOR, 97, 225, 140, 12, ES_AUTOHSCROLL | WS_DISABLED PUSHBUTTON "預設", IDC_DEFAULT_SETTINGS, 8, 245, 60, 14 DEFPUSHBUTTON "確定", IDOK, 116, 245, 60, 14 PUSHBUTTON "取消", IDCANCEL, 181, 245, 60, 14 @@ -102,8 +102,8 @@ BEGIN PUSHBUTTON "取消", IDCANCEL, 150, 78, 60, 14 END -IDD_DOWNLOAD_DIALOG DIALOGEX 0, 0, 220, 72 -STYLE DS_SHELLFONT | DS_CENTER | WS_BORDER | WS_CAPTION | WS_POPUP | WS_SYSMENU | WS_VISIBLE +IDD_DOWNLOAD_DIALOG DIALOGEX 0, 0, 220, 220 +STYLE DS_SHELLFONT | DS_CENTER | WS_POPUPWINDOW | WS_CAPTION | WS_VISIBLE CAPTION "正在下載 %ls…" FONT 9, "新細明體" BEGIN diff --git a/base/applications/rapps/lang/zh-TW.rc b/base/applications/rapps/lang/zh-TW.rc index 1f681ab1a92..472c49f8149 100644 --- a/base/applications/rapps/lang/zh-TW.rc +++ b/base/applications/rapps/lang/zh-TW.rc @@ -82,9 +82,9 @@ BEGIN CONTROL "使用系統代理設定", IDC_PROXY_DEFAULT, "Button", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 15, 180, 210, 10 CONTROL "直接（無代理）", IDC_NO_PROXY, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 15, 195, 210, 10 CONTROL "代理伺服器", IDC_USE_PROXY, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 15, 210, 71, 10 - EDITTEXT IDC_PROXY_SERVER, 90, 210, 147, 12, ES_AUTOHSCROLL | WS_DISABLED - LTEXT "不使用代理的情況", -1, 25, 226, 64, 10 - EDITTEXT IDC_NO_PROXY_FOR, 90, 225, 147, 12, ES_AUTOHSCROLL | WS_DISABLED + EDITTEXT IDC_PROXY_SERVER, 97, 210, 140, 12, ES_AUTOHSCROLL | WS_DISABLED + LTEXT "不使用代理的情況", -1, 26, 226, 64, 10 + EDITTEXT IDC_NO_PROXY_FOR, 97, 225, 140, 12, ES_AUTOHSCROLL | WS_DISABLED PUSHBUTTON "預設", IDC_DEFAULT_SETTINGS, 8, 245, 60, 14 DEFPUSHBUTTON "確定", IDOK, 116, 245, 60, 14 PUSHBUTTON "取消", IDCANCEL, 181, 245, 60, 14 @@ -102,8 +102,8 @@ BEGIN PUSHBUTTON "取消", IDCANCEL, 150, 78, 60, 14 END -IDD_DOWNLOAD_DIALOG DIALOGEX 0, 0, 220, 72 -STYLE DS_SHELLFONT | DS_CENTER | WS_BORDER | WS_CAPTION | WS_POPUP | WS_SYSMENU | WS_VISIBLE +IDD_DOWNLOAD_DIALOG DIALOGEX 0, 0, 220, 220 +STYLE DS_SHELLFONT | DS_CENTER | WS_POPUPWINDOW | WS_CAPTION | WS_VISIBLE CAPTION "正在下載 %ls…" FONT 9, "新細明體" BEGIN

2 years, 2 months

[reactos] 01/01: [IMM32] Follow-up of deb4f4e; Add comments

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=72dbd87b1abf2d7810345… commit 72dbd87b1abf2d7810345183e51e9f3868846f54 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Tue Oct 11 12:06:51 2022 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Tue Oct 11 12:06:51 2022 +0900 [IMM32] Follow-up of deb4f4e; Add comments CORE-11700 --- dll/win32/imm32/keymsg.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/dll/win32/imm32/keymsg.c b/dll/win32/imm32/keymsg.c index a30f9b06f55..baea59d0ec8 100644 --- a/dll/win32/imm32/keymsg.c +++ b/dll/win32/imm32/keymsg.c @@ -759,7 +759,7 @@ ImmProcessKey(HWND hWnd, HKL hKL, UINT vKey, LPARAM lParam, DWORD dwHotKeyID) ImmUnlockImeDpi(pImeDpi); } - if (dwHotKeyID != INVALID_HOTKEY_ID) + if (dwHotKeyID != INVALID_HOTKEY_ID) /* Valid Hot-key */ { if (Imm32ProcessHotKey(hWnd, hIMC, hKL, dwHotKeyID)) { @@ -770,10 +770,12 @@ ImmProcessKey(HWND hWnd, HKL hKL, UINT vKey, LPARAM lParam, DWORD dwHotKeyID) if ((ret & IPHK_PROCESSBYIME) && (ImmGetAppCompatFlags(hIMC) & 0x10000)) { + /* The key has been processed by IME's ImeProcessKey */ LANGID wLangID = LANGIDFROMLCID(GetSystemDefaultLCID()); - if (PRIMARYLANGID(wLangID) != LANG_KOREAN || - (vKey != VK_PROCESSKEY && !(ret & IPHK_HOTKEY))) + if (PRIMARYLANGID(wLangID) != LANG_KOREAN || /* Korean doesn't wanna this code */ + (vKey != VK_PROCESSKEY && !(ret & IPHK_HOTKEY))) /* Is the key to be processed? */ { + /* Add WM_KEYDOWN:VK_PROCESSKEY message */ ImmTranslateMessage(hWnd, WM_KEYDOWN, VK_PROCESSKEY, lParam); ret &= ~IPHK_PROCESSBYIME; ret |= IPHK_SKIPTHISKEY;

2 years, 2 months

[reactos] 01/01: [NTOSKRNL] Revert 53ac8da and use UNIMPLEMENTED_DBGBREAK()

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=00bd373e884c2d2db74b9… commit 00bd373e884c2d2db74b9b5242b561e69ddb72ca Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Tue Oct 11 07:39:40 2022 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Tue Oct 11 07:39:40 2022 +0900 [NTOSKRNL] Revert 53ac8da and use UNIMPLEMENTED_DBGBREAK() --- ntoskrnl/io/iomgr/driver.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/ntoskrnl/io/iomgr/driver.c b/ntoskrnl/io/iomgr/driver.c index 495cc83a892..38589441ad4 100644 --- a/ntoskrnl/io/iomgr/driver.c +++ b/ntoskrnl/io/iomgr/driver.c @@ -1022,13 +1022,19 @@ IopInitializeBootDrivers(VOID) /* Get highest group order index */ IopGroupIndex = PpInitGetGroupOrderIndex(NULL); - ASSERT(IopGroupIndex != 0xFFFF); + if (IopGroupIndex == 0xFFFF) + { + UNIMPLEMENTED_DBGBREAK(); + } /* Allocate the group table */ IopGroupTable = ExAllocatePoolWithTag(PagedPool, IopGroupIndex * sizeof(LIST_ENTRY), TAG_IO); - ASSERT(IopGroupTable != NULL); + if (IopGroupTable == NULL) + { + UNIMPLEMENTED_DBGBREAK(); + } /* Initialize the group table lists */ for (i = 0; i < IopGroupIndex; i++) InitializeListHead(&IopGroupTable[i]);

2 years, 2 months

[reactos] 01/01: [BROWSEUI] Update Russian (ru-RU) translation

by Stanislav Motylkov

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=e63be36c687b144319a36… commit e63be36c687b144319a362dc9d35cd67ad697293 Author: Stanislav Motylkov <x86corez(a)gmail.com> AuthorDate: Tue Oct 11 00:46:14 2022 +0300 Commit: Stanislav Motylkov <x86corez(a)gmail.com> CommitDate: Tue Oct 11 00:48:31 2022 +0300 [BROWSEUI] Update Russian (ru-RU) translation Addendum to 2e67c18d. CORE-18394 --- dll/win32/browseui/lang/ru-RU.rc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dll/win32/browseui/lang/ru-RU.rc b/dll/win32/browseui/lang/ru-RU.rc index 8f7e9fea772..312e72f1bf5 100644 --- a/dll/win32/browseui/lang/ru-RU.rc +++ b/dll/win32/browseui/lang/ru-RU.rc @@ -2,9 +2,9 @@ * PROJECT: ReactOS Explorer * LICENSE: LGPL-2.1-or-later (https://spdx.org/licenses/LGPL-2.1-or-later) * PURPOSE: Russian resource file - * COPYRIGHT: Copyright 2014-2015 Petr Akhlamov (petr-akhlamov(a)yandex.ru) - * Copyright 2017-2020 Stanislav Motylkov (binarymaster(a)mail.ru) - * Copyright 2019 Abdulganiev Rafael (abdulganiev.rafael[at]gmail.com) + * COPYRIGHT: Copyright 2014-2015 Petr Akhlamov <petr-akhlamov(a)yandex.ru> + * Copyright 2017-2022 Stanislav Motylkov <binarymaster(a)mail.ru> + * Copyright 2019 Abdulganiev Rafael <abdulganiev.rafael(a)gmail.com> */ LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT @@ -307,7 +307,7 @@ END STRINGTABLE BEGIN - IDS_ADDRESSMENUTEXT "&Address" + IDS_ADDRESSMENUTEXT "&Адрес" IDS_HISTORYTEXT "&История\tCtrl+H" END

2 years, 2 months

[reactos] 01/01: [BROWSEUI][INCLUDE] Localize 'Address' on CBandSiteMenu (#4767)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=2e67c18d2ba89282ae2f5… commit 2e67c18d2ba89282ae2f5c2404ee51ddaacbb764 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Tue Oct 11 06:15:28 2022 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Tue Oct 11 06:15:28 2022 +0900 [BROWSEUI][INCLUDE] Localize 'Address' on CBandSiteMenu (#4767) - Add IDS_ADDRESSMENUTEXT resource string (whose ID matchs the string of addressband.rgs). - Add SHLoadRegUIStringA/W function prototype to <shlwapi_undoc.h>. - Use SHLoadRegUIStringW to load MenuTextPUI. CORE-18394 --- dll/win32/browseui/lang/bg-BG.rc | 1 + dll/win32/browseui/lang/de-DE.rc | 1 + dll/win32/browseui/lang/en-US.rc | 1 + dll/win32/browseui/lang/es-ES.rc | 1 + dll/win32/browseui/lang/et-EE.rc | 1 + dll/win32/browseui/lang/eu-ES.rc | 1 + dll/win32/browseui/lang/fr-FR.rc | 1 + dll/win32/browseui/lang/he-IL.rc | 1 + dll/win32/browseui/lang/hi-IN.rc | 1 + dll/win32/browseui/lang/hu-HU.rc | 1 + dll/win32/browseui/lang/id-ID.rc | 1 + dll/win32/browseui/lang/it-IT.rc | 1 + dll/win32/browseui/lang/ja-JP.rc | 1 + dll/win32/browseui/lang/pl-PL.rc | 1 + dll/win32/browseui/lang/pt-BR.rc | 1 + dll/win32/browseui/lang/pt-PT.rc | 1 + dll/win32/browseui/lang/ro-RO.rc | 1 + dll/win32/browseui/lang/ru-RU.rc | 1 + dll/win32/browseui/lang/sq-AL.rc | 1 + dll/win32/browseui/lang/tr-TR.rc | 1 + dll/win32/browseui/lang/uk-UA.rc | 1 + dll/win32/browseui/lang/zh-CN.rc | 1 + dll/win32/browseui/lang/zh-TW.rc | 1 + dll/win32/browseui/resource.h | 1 + dll/win32/browseui/shellbars/CBandSiteMenu.cpp | 22 ++++++++++++++++++---- sdk/include/reactos/shlwapi_undoc.h | 4 ++++ 26 files changed, 46 insertions(+), 4 deletions(-) diff --git a/dll/win32/browseui/lang/bg-BG.rc b/dll/win32/browseui/lang/bg-BG.rc index 4cae3bb1a47..f051e257427 100644 --- a/dll/win32/browseui/lang/bg-BG.rc +++ b/dll/win32/browseui/lang/bg-BG.rc @@ -298,6 +298,7 @@ END STRINGTABLE BEGIN + IDS_ADDRESSMENUTEXT "&Address" IDS_HISTORYTEXT "&Дневник\tCtrl+H" END diff --git a/dll/win32/browseui/lang/de-DE.rc b/dll/win32/browseui/lang/de-DE.rc index 69a479897bc..eabd07d55b1 100644 --- a/dll/win32/browseui/lang/de-DE.rc +++ b/dll/win32/browseui/lang/de-DE.rc @@ -316,6 +316,7 @@ END STRINGTABLE BEGIN + IDS_ADDRESSMENUTEXT "&Address" IDS_HISTORYTEXT "&Verlauf\tCtrl+H" END diff --git a/dll/win32/browseui/lang/en-US.rc b/dll/win32/browseui/lang/en-US.rc index 781d52b0289..8ba65eb7e85 100644 --- a/dll/win32/browseui/lang/en-US.rc +++ b/dll/win32/browseui/lang/en-US.rc @@ -316,6 +316,7 @@ END STRINGTABLE BEGIN + IDS_ADDRESSMENUTEXT "&Address" IDS_HISTORYTEXT "&History\tCtrl+H" END diff --git a/dll/win32/browseui/lang/es-ES.rc b/dll/win32/browseui/lang/es-ES.rc index db7cc47da74..6ada459824c 100644 --- a/dll/win32/browseui/lang/es-ES.rc +++ b/dll/win32/browseui/lang/es-ES.rc @@ -307,6 +307,7 @@ END STRINGTABLE BEGIN + IDS_ADDRESSMENUTEXT "&Address" IDS_HISTORYTEXT "&Historial\tCtrl+H" END diff --git a/dll/win32/browseui/lang/et-EE.rc b/dll/win32/browseui/lang/et-EE.rc index 66ba71e8269..b3804492ec2 100644 --- a/dll/win32/browseui/lang/et-EE.rc +++ b/dll/win32/browseui/lang/et-EE.rc @@ -305,6 +305,7 @@ END STRINGTABLE BEGIN + IDS_ADDRESSMENUTEXT "&Address" IDS_HISTORYTEXT "&Ajalugu\tCtrl+H" END diff --git a/dll/win32/browseui/lang/eu-ES.rc b/dll/win32/browseui/lang/eu-ES.rc index 4c3fa81ca06..22facab3084 100644 --- a/dll/win32/browseui/lang/eu-ES.rc +++ b/dll/win32/browseui/lang/eu-ES.rc @@ -305,6 +305,7 @@ END STRINGTABLE BEGIN + IDS_ADDRESSMENUTEXT "&Address" IDS_HISTORYTEXT "&Historial\tCtrl+H" END diff --git a/dll/win32/browseui/lang/fr-FR.rc b/dll/win32/browseui/lang/fr-FR.rc index 250b4b7effc..2764d23f32a 100644 --- a/dll/win32/browseui/lang/fr-FR.rc +++ b/dll/win32/browseui/lang/fr-FR.rc @@ -316,6 +316,7 @@ END STRINGTABLE BEGIN + IDS_ADDRESSMENUTEXT "&Address" IDS_HISTORYTEXT "&Historique\tCtrl+H" END diff --git a/dll/win32/browseui/lang/he-IL.rc b/dll/win32/browseui/lang/he-IL.rc index 82dde6dca06..5cbc355debb 100644 --- a/dll/win32/browseui/lang/he-IL.rc +++ b/dll/win32/browseui/lang/he-IL.rc @@ -300,6 +300,7 @@ END STRINGTABLE BEGIN + IDS_ADDRESSMENUTEXT "&Address" IDS_HISTORYTEXT "היסטוריה\tCtrl+H" END diff --git a/dll/win32/browseui/lang/hi-IN.rc b/dll/win32/browseui/lang/hi-IN.rc index 49489cba8f0..aefe0f9a268 100644 --- a/dll/win32/browseui/lang/hi-IN.rc +++ b/dll/win32/browseui/lang/hi-IN.rc @@ -298,6 +298,7 @@ END STRINGTABLE BEGIN + IDS_ADDRESSMENUTEXT "&Address" IDS_HISTORYTEXT "&हिस्टरी\tCtrl+H" END diff --git a/dll/win32/browseui/lang/hu-HU.rc b/dll/win32/browseui/lang/hu-HU.rc index e5ae625ae5b..cf7a915449f 100644 --- a/dll/win32/browseui/lang/hu-HU.rc +++ b/dll/win32/browseui/lang/hu-HU.rc @@ -316,6 +316,7 @@ END STRINGTABLE BEGIN + IDS_ADDRESSMENUTEXT "&Address" IDS_HISTORYTEXT "&Előzmények\tCtrl+H" END diff --git a/dll/win32/browseui/lang/id-ID.rc b/dll/win32/browseui/lang/id-ID.rc index d9c0628c634..3f6d1e24103 100644 --- a/dll/win32/browseui/lang/id-ID.rc +++ b/dll/win32/browseui/lang/id-ID.rc @@ -317,6 +317,7 @@ END STRINGTABLE BEGIN + IDS_ADDRESSMENUTEXT "&Address" IDS_HISTORYTEXT "&Riwayat\tCtrl+H" END diff --git a/dll/win32/browseui/lang/it-IT.rc b/dll/win32/browseui/lang/it-IT.rc index 8175ccaab85..5e7cfaaa80c 100644 --- a/dll/win32/browseui/lang/it-IT.rc +++ b/dll/win32/browseui/lang/it-IT.rc @@ -298,6 +298,7 @@ END STRINGTABLE BEGIN + IDS_ADDRESSMENUTEXT "&Address" IDS_HISTORYTEXT "&Recenti\tCtrl+H" END diff --git a/dll/win32/browseui/lang/ja-JP.rc b/dll/win32/browseui/lang/ja-JP.rc index 2c631e1b17a..b364f788821 100644 --- a/dll/win32/browseui/lang/ja-JP.rc +++ b/dll/win32/browseui/lang/ja-JP.rc @@ -316,6 +316,7 @@ END STRINGTABLE BEGIN + IDS_ADDRESSMENUTEXT "アドレス(&A)" IDS_HISTORYTEXT "履歴(&H)\tCtrl+H" END diff --git a/dll/win32/browseui/lang/pl-PL.rc b/dll/win32/browseui/lang/pl-PL.rc index 864d712f918..152154bcf87 100644 --- a/dll/win32/browseui/lang/pl-PL.rc +++ b/dll/win32/browseui/lang/pl-PL.rc @@ -307,6 +307,7 @@ END STRINGTABLE BEGIN + IDS_ADDRESSMENUTEXT "&Address" IDS_HISTORYTEXT "&Historia\tCtrl+H" END diff --git a/dll/win32/browseui/lang/pt-BR.rc b/dll/win32/browseui/lang/pt-BR.rc index 569e93dfa07..16c96a9c561 100644 --- a/dll/win32/browseui/lang/pt-BR.rc +++ b/dll/win32/browseui/lang/pt-BR.rc @@ -300,6 +300,7 @@ END STRINGTABLE BEGIN + IDS_ADDRESSMENUTEXT "&Address" IDS_HISTORYTEXT "&Histórico\tCtrl+H" END diff --git a/dll/win32/browseui/lang/pt-PT.rc b/dll/win32/browseui/lang/pt-PT.rc index 1995124629f..fb08d194705 100644 --- a/dll/win32/browseui/lang/pt-PT.rc +++ b/dll/win32/browseui/lang/pt-PT.rc @@ -300,6 +300,7 @@ END STRINGTABLE BEGIN + IDS_ADDRESSMENUTEXT "&Address" IDS_HISTORYTEXT "&Histórico\tCtrl+H" END diff --git a/dll/win32/browseui/lang/ro-RO.rc b/dll/win32/browseui/lang/ro-RO.rc index 2caf148ef72..bd3b8ddd4d8 100644 --- a/dll/win32/browseui/lang/ro-RO.rc +++ b/dll/win32/browseui/lang/ro-RO.rc @@ -300,6 +300,7 @@ END STRINGTABLE BEGIN + IDS_ADDRESSMENUTEXT "&Address" IDS_HISTORYTEXT "Ist&oric\tCtrl+H" END diff --git a/dll/win32/browseui/lang/ru-RU.rc b/dll/win32/browseui/lang/ru-RU.rc index 68d71cb7d1c..8f7e9fea772 100644 --- a/dll/win32/browseui/lang/ru-RU.rc +++ b/dll/win32/browseui/lang/ru-RU.rc @@ -307,6 +307,7 @@ END STRINGTABLE BEGIN + IDS_ADDRESSMENUTEXT "&Address" IDS_HISTORYTEXT "&История\tCtrl+H" END diff --git a/dll/win32/browseui/lang/sq-AL.rc b/dll/win32/browseui/lang/sq-AL.rc index 241defc0c4d..3565f3610ac 100644 --- a/dll/win32/browseui/lang/sq-AL.rc +++ b/dll/win32/browseui/lang/sq-AL.rc @@ -317,6 +317,7 @@ END STRINGTABLE BEGIN + IDS_ADDRESSMENUTEXT "&Address" IDS_HISTORYTEXT "&Histori\tCtrl+H" END diff --git a/dll/win32/browseui/lang/tr-TR.rc b/dll/win32/browseui/lang/tr-TR.rc index 2e5b5db790e..5efd7ecf59f 100644 --- a/dll/win32/browseui/lang/tr-TR.rc +++ b/dll/win32/browseui/lang/tr-TR.rc @@ -300,6 +300,7 @@ END STRINGTABLE BEGIN + IDS_ADDRESSMENUTEXT "&Address" IDS_HISTORYTEXT "&Geçmiş\tCtrl+H" END diff --git a/dll/win32/browseui/lang/uk-UA.rc b/dll/win32/browseui/lang/uk-UA.rc index 55c5f04ebc3..ed8a6557c67 100644 --- a/dll/win32/browseui/lang/uk-UA.rc +++ b/dll/win32/browseui/lang/uk-UA.rc @@ -306,6 +306,7 @@ END STRINGTABLE BEGIN + IDS_ADDRESSMENUTEXT "&Address" IDS_HISTORYTEXT "&Історія\tCtrl+H" END diff --git a/dll/win32/browseui/lang/zh-CN.rc b/dll/win32/browseui/lang/zh-CN.rc index f82db6990cf..c6ceb6c4214 100644 --- a/dll/win32/browseui/lang/zh-CN.rc +++ b/dll/win32/browseui/lang/zh-CN.rc @@ -320,6 +320,7 @@ END STRINGTABLE BEGIN + IDS_ADDRESSMENUTEXT "&Address" IDS_HISTORYTEXT "历史(&H)\tCtrl+H" END diff --git a/dll/win32/browseui/lang/zh-TW.rc b/dll/win32/browseui/lang/zh-TW.rc index 15c244dbfdd..b8adf2df828 100644 --- a/dll/win32/browseui/lang/zh-TW.rc +++ b/dll/win32/browseui/lang/zh-TW.rc @@ -322,6 +322,7 @@ END STRINGTABLE BEGIN + IDS_ADDRESSMENUTEXT "&Address" IDS_HISTORYTEXT "歷程記錄(&H)\tCtrl+H" END diff --git a/dll/win32/browseui/resource.h b/dll/win32/browseui/resource.h index 4bbe766b964..8b4318ffcb4 100644 --- a/dll/win32/browseui/resource.h +++ b/dll/win32/browseui/resource.h @@ -125,6 +125,7 @@ #define IDS_STANDARD_TOOLBAR 12624 #define IDS_ADDRESSBANDLABEL 12902 #define IDS_FOLDERSLABEL 12919 +#define IDS_ADDRESSMENUTEXT 13137 #define IDS_HISTORYTEXT 13169 #define IDS_UP 58434 #define IDS_BACK 58689 diff --git a/dll/win32/browseui/shellbars/CBandSiteMenu.cpp b/dll/win32/browseui/shellbars/CBandSiteMenu.cpp index dd7c8f03174..1ea45a47d68 100644 --- a/dll/win32/browseui/shellbars/CBandSiteMenu.cpp +++ b/dll/win32/browseui/shellbars/CBandSiteMenu.cpp @@ -22,6 +22,7 @@ #include "shellbars.h" #include <browseui_undoc.h> +#include <shlwapi_undoc.h> /* The menu consists of 3 parts. The first is loaded from the resources, the second is populated with the classes of the CATID_DeskBand comcat @@ -58,10 +59,9 @@ HRESULT CBandSiteMenu::_CreateMenuPart() WCHAR wszBandGUID[MAX_PATH]; WCHAR wRegKey[MAX_PATH]; UINT cBands; - DWORD dwDataSize; CATID category = CATID_DeskBand; HMENU hmenuToolbars; - DWORD dwRead; + DWORD dwRead, dwDataSize; CComPtr<IEnumGUID> pEnumGUID; HRESULT hr; @@ -97,8 +97,22 @@ HRESULT CBandSiteMenu::_CreateMenuPart() /* Get the band name */ StringCchPrintfW(wRegKey, MAX_PATH, L"CLSID\\%s", wszBandGUID); - dwDataSize = MAX_PATH; - SHGetValue(HKEY_CLASSES_ROOT, wRegKey, NULL, NULL, wszBandName, &dwDataSize); + HKEY hKey; + if (RegOpenKeyExW(HKEY_CLASSES_ROOT, wRegKey, 0, KEY_READ, &hKey) == ERROR_SUCCESS) + { + hr = SHLoadRegUIStringW(hKey, L"MenuTextPUI", wszBandName, _countof(wszBandName)); + if (FAILED_UNEXPECTEDLY(hr)) + { + hr = SHLoadRegUIStringW(hKey, NULL, wszBandName, _countof(wszBandName)); + FAILED_UNEXPECTEDLY(hr); + } + RegCloseKey(hKey); + } + else + { + dwDataSize = sizeof(wszBandName); + SHGetValueW(HKEY_CLASSES_ROOT, wRegKey, NULL, NULL, wszBandName, &dwDataSize); + } /* Insert it */ InsertMenu(hmenuToolbars, cBands, MF_BYPOSITION, m_ComCatGuids.GetSize() + FIRST_COMCAT_MENU_ID, wszBandName); diff --git a/sdk/include/reactos/shlwapi_undoc.h b/sdk/include/reactos/shlwapi_undoc.h index b94577f8638..d62b4ec65c4 100644 --- a/sdk/include/reactos/shlwapi_undoc.h +++ b/sdk/include/reactos/shlwapi_undoc.h @@ -134,10 +134,14 @@ DWORD WINAPI SHGetValueGoodBootA(HKEY hkey, LPCSTR pSubKey, LPCSTR pValue, LPDWORD pwType, LPVOID pvData, LPDWORD pbData); DWORD WINAPI SHGetValueGoodBootW(HKEY hkey, LPCWSTR pSubKey, LPCWSTR pValue, LPDWORD pwType, LPVOID pvData, LPDWORD pbData); +HRESULT WINAPI SHLoadRegUIStringA(HKEY hkey, LPCSTR value, LPSTR buf, DWORD size); +HRESULT WINAPI SHLoadRegUIStringW(HKEY hkey, LPCWSTR value, LPWSTR buf, DWORD size); #ifdef UNICODE #define SHGetValueGoodBoot SHGetValueGoodBootW +#define SHLoadRegUIString SHLoadRegUIStringW #else #define SHGetValueGoodBoot SHGetValueGoodBootA +#define SHLoadRegUIString SHLoadRegUIStringA #endif int

2 years, 2 months

[reactos] 02/02: [DESK] Implement dialog to manipulate desktop icons (#4766)

by Stanislav Motylkov

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=bb43363416d81aeef0996… commit bb43363416d81aeef0996adec84237a01c9f1e3d Author: Stanislav Motylkov <x86corez(a)gmail.com> AuthorDate: Sun Apr 15 02:04:48 2018 +0300 Commit: Stanislav Motylkov <x86corez(a)gmail.com> CommitDate: Mon Oct 10 18:30:25 2022 +0300 [DESK] Implement dialog to manipulate desktop icons (#4766) For now only add ability to show or hide desktop icons. CORE-8427 --- dll/cpl/desk/CMakeLists.txt | 1 + dll/cpl/desk/background.c | 47 ++++++++ dll/cpl/desk/desk.h | 32 +++++ dll/cpl/desk/desktop.c | 277 ++++++++++++++++++++++++++++++++++++++++++++ dll/cpl/desk/lang/bg-BG.rc | 27 +++++ dll/cpl/desk/lang/cs-CZ.rc | 27 +++++ dll/cpl/desk/lang/de-DE.rc | 27 +++++ dll/cpl/desk/lang/el-GR.rc | 27 +++++ dll/cpl/desk/lang/en-GB.rc | 27 +++++ dll/cpl/desk/lang/en-US.rc | 27 +++++ dll/cpl/desk/lang/es-ES.rc | 27 +++++ dll/cpl/desk/lang/et-EE.rc | 27 +++++ dll/cpl/desk/lang/fr-FR.rc | 27 +++++ dll/cpl/desk/lang/he-IL.rc | 27 +++++ dll/cpl/desk/lang/hu-HU.rc | 27 +++++ dll/cpl/desk/lang/id-ID.rc | 27 +++++ dll/cpl/desk/lang/it-IT.rc | 27 +++++ dll/cpl/desk/lang/ja-JP.rc | 27 +++++ dll/cpl/desk/lang/nl-NL.rc | 27 +++++ dll/cpl/desk/lang/no-NO.rc | 27 +++++ dll/cpl/desk/lang/pl-PL.rc | 27 +++++ dll/cpl/desk/lang/pt-BR.rc | 27 +++++ dll/cpl/desk/lang/pt-PT.rc | 27 +++++ dll/cpl/desk/lang/ro-RO.rc | 27 +++++ dll/cpl/desk/lang/ru-RU.rc | 27 +++++ dll/cpl/desk/lang/sk-SK.rc | 27 +++++ dll/cpl/desk/lang/sq-AL.rc | 27 +++++ dll/cpl/desk/lang/sv-SE.rc | 27 +++++ dll/cpl/desk/lang/tr-TR.rc | 27 +++++ dll/cpl/desk/lang/uk-UA.rc | 27 +++++ dll/cpl/desk/lang/zh-CN.rc | 27 +++++ dll/cpl/desk/lang/zh-HK.rc | 27 +++++ dll/cpl/desk/lang/zh-TW.rc | 27 +++++ dll/cpl/desk/resource.h | 12 ++ 34 files changed, 1152 insertions(+) diff --git a/dll/cpl/desk/CMakeLists.txt b/dll/cpl/desk/CMakeLists.txt index b67c167873d..3531b4ec024 100644 --- a/dll/cpl/desk/CMakeLists.txt +++ b/dll/cpl/desk/CMakeLists.txt @@ -8,6 +8,7 @@ list(APPEND SOURCE background.c classinst.c desk.c + desktop.c devsett.c dibitmap.c misc.c diff --git a/dll/cpl/desk/background.c b/dll/cpl/desk/background.c index 36deadb5e45..ccf30377d18 100644 --- a/dll/cpl/desk/background.c +++ b/dll/cpl/desk/background.c @@ -63,6 +63,8 @@ typedef struct _BACKGROUND_DATA int listViewItemCount; ULONG_PTR gdipToken; + + DESKTOP_DATA desktopData; } BACKGROUND_DATA, *PBACKGROUND_DATA; GLOBAL_DATA g_GlobalData; @@ -1140,6 +1142,43 @@ SetDesktopBackColor(HWND hwndDlg, PBACKGROUND_DATA pData) RegCloseKey(hKey); } +static VOID +OnCustomButton(HWND hwndDlg, PBACKGROUND_DATA pData) +{ + HPROPSHEETPAGE hpsp[1] = {0}; + PROPSHEETHEADER psh; + PROPSHEETPAGE psp; + + ZeroMemory(&psh, sizeof(psh)); + psh.dwSize = sizeof(psh); + psh.dwFlags = PSH_NOAPPLYNOW; + psh.hwndParent = GetParent(hwndDlg); + psh.hInstance = hApplet; + psh.pszCaption = MAKEINTRESOURCE(IDS_DESKTOP_ITEMS); + psh.phpage = hpsp; + + ZeroMemory(&psp, sizeof(psp)); + psp.dwSize = sizeof(psp); + psp.dwFlags = PSP_DEFAULT; + psp.hInstance = hApplet; + psp.pszTemplate = MAKEINTRESOURCE(IDD_DESKTOP_GENERAL); + psp.pfnDlgProc = DesktopPageProc; + psp.lParam = (LPARAM)&pData->desktopData; + + hpsp[0] = CreatePropertySheetPage(&psp); + if (!hpsp[0]) + return; + + psh.nPages++; + + if (PropertySheet(&psh) > 0) + { + if (SaveDesktopSettings(&pData->desktopData)) + PropSheet_Changed(GetParent(hwndDlg), hwndDlg); + } +} + + INT_PTR CALLBACK BackgroundPageProc(HWND hwndDlg, UINT uMsg, @@ -1162,6 +1201,7 @@ BackgroundPageProc(HWND hwndDlg, gdipStartup.SuppressExternalCodecs = FALSE; GdiplusStartup(&pData->gdipToken, &gdipStartup, NULL); InitBackgroundDialog(hwndDlg, pData); + InitDesktopSettings(&pData->desktopData); break; case WM_COMMAND: @@ -1191,6 +1231,11 @@ BackgroundPageProc(HWND hwndDlg, PropSheet_Changed(GetParent(hwndDlg), hwndDlg); } break; + + case IDC_DESKTOP_CUSTOM: + if (command == BN_CLICKED) + OnCustomButton(hwndDlg, pData); + break; } } break; @@ -1218,6 +1263,8 @@ BackgroundPageProc(HWND hwndDlg, SetWallpaper(pData); if (pData->bClrBackgroundChanged) SetDesktopBackColor(hwndDlg, pData); + if (pData->desktopData.bSettingsChanged) + SetDesktopSettings(&pData->desktopData); SendMessage(HWND_BROADCAST, WM_SETTINGCHANGE, 0, (LPARAM)_T("")); return TRUE; diff --git a/dll/cpl/desk/desk.h b/dll/cpl/desk/desk.h index efc21306281..d8a2355f31b 100644 --- a/dll/cpl/desk/desk.h +++ b/dll/cpl/desk/desk.h @@ -81,6 +81,26 @@ ULONG __cdecl DbgPrint(PCCH Format,...); #define MAX_DESK_PAGES 32 #define NUM_SPECTRUM_BITMAPS 3 +/* This number must match DesktopIcons array size */ +#define NUM_DESKTOP_ICONS 4 + +typedef struct +{ + BOOL bHideClassic; /* Hide icon in Classic mode */ + BOOL bHideNewStart; /* Hide icon in Modern Start menu mode */ +} HIDE_ICON; + +typedef struct _DESKTOP_DATA +{ + BOOL bSettingsChanged; + HIDE_ICON optIcons[NUM_DESKTOP_ICONS]; + BOOL bHideChanged[NUM_DESKTOP_ICONS]; + + BOOL bLocalSettingsChanged; + BOOL bLocalHideIcon[NUM_DESKTOP_ICONS]; + BOOL bLocalHideChanged[NUM_DESKTOP_ICONS]; +} DESKTOP_DATA, *PDESKTOP_DATA; + /* As slider control can't contain user data, we have to keep an * array of RESOLUTION_INFO to have our own associated data. */ @@ -143,6 +163,18 @@ AdvGeneralPageProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam); BOOL SwitchDisplayMode(HWND hwndDlg, PWSTR DeviceName, PSETTINGS_ENTRY seInit, PSETTINGS_ENTRY seNew, OUT PLONG rc); +INT_PTR CALLBACK +DesktopPageProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam); + +VOID +InitDesktopSettings(PDESKTOP_DATA pData); + +BOOL +SaveDesktopSettings(PDESKTOP_DATA pData); + +VOID +SetDesktopSettings(PDESKTOP_DATA pData); + LONG RegLoadMUIStringW(IN HKEY hKey, IN LPCWSTR pszValue OPTIONAL, diff --git a/dll/cpl/desk/desktop.c b/dll/cpl/desk/desktop.c new file mode 100644 index 00000000000..46c3ec25ec2 --- /dev/null +++ b/dll/cpl/desk/desktop.c @@ -0,0 +1,277 @@ +/* + * PROJECT: ReactOS Display Control Panel + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: Desktop customization property page + * COPYRIGHT: Copyright 2018-2022 Stanislav Motylkov <x86corez(a)gmail.com> + */ + +#include "desk.h" + +#define FCIDM_DESKBROWSER_REFRESH 0xA220 /* From shresdef.h */ + +static const TCHAR szHideDesktopIcons[] = TEXT("Software\\Microsoft\\Windows\\CurrentVersion\\Explorer\\HideDesktopIcons"); +static const TCHAR szClassicStartMenu[] = TEXT("ClassicStartMenu"); +static const TCHAR szNewStartPanel[] = TEXT("NewStartPanel"); + +struct +{ + LPCTSTR CLSID; + UINT Checkbox; +} DesktopIcons[NUM_DESKTOP_ICONS] = { + {TEXT("{450D8FBA-AD25-11D0-98A8-0800361B1103}"), IDC_ICONS_MYDOCS}, /* My Documents */ + {TEXT("{208D2C60-3AEA-1069-A2D7-08002B30309D}"), IDC_ICONS_MYNET}, /* My Network Places */ + {TEXT("{20D04FE0-3AEA-1069-A2D8-08002B30309D}"), IDC_ICONS_MYCOMP}, /* My Computer */ + {TEXT("{871C5380-42A0-1069-A2EA-08002B30309D}"), IDC_ICONS_INTERNET}, /* Internet Browser */ +}; + +VOID +InitDesktopSettings(PDESKTOP_DATA pData) +{ + HKEY regKey, iconKey1, iconKey2; + UINT i; + + /* Default values */ + for (i = 0; i < _countof(pData->optIcons); i++) + { + // pData->optIcons[i].bHideClassic is FALSE by default + pData->optIcons[i].bHideNewStart = TRUE; + } + + /* Load desktop icon settings from the registry */ + if (RegOpenKeyEx(HKEY_CURRENT_USER, szHideDesktopIcons, + 0, KEY_QUERY_VALUE, &regKey) != ERROR_SUCCESS) + { + return; + } + + if (RegOpenKeyEx(regKey, szClassicStartMenu, 0, KEY_QUERY_VALUE, &iconKey1) != ERROR_SUCCESS) + iconKey1 = NULL; + + if (RegOpenKeyEx(regKey, szNewStartPanel, 0, KEY_QUERY_VALUE, &iconKey2) != ERROR_SUCCESS) + iconKey2 = NULL; + + for (i = 0; i < _countof(pData->optIcons); i++) + { + LSTATUS res; + DWORD dwType, dwData, cbData; + + if (iconKey1) + { + cbData = sizeof(dwData); + res = RegQueryValueEx(iconKey1, DesktopIcons[i].CLSID, NULL, &dwType, (LPBYTE)&dwData, &cbData); + + if (res == ERROR_SUCCESS && dwType == REG_DWORD && cbData == sizeof(dwData)) + pData->optIcons[i].bHideClassic = !!dwData; + } + + if (iconKey2) + { + cbData = sizeof(dwData); + res = RegQueryValueEx(iconKey2, DesktopIcons[i].CLSID, NULL, &dwType, (LPBYTE)&dwData, &cbData); + + if (res == ERROR_SUCCESS && dwType == REG_DWORD && cbData == sizeof(dwData)) + pData->optIcons[i].bHideNewStart = !!dwData; + } + } + + if (iconKey1) + RegCloseKey(iconKey1); + + if (iconKey2) + RegCloseKey(iconKey2); + + RegCloseKey(regKey); +} + +BOOL +SaveDesktopSettings(PDESKTOP_DATA pData) +{ + UINT i; + + if (!pData->bLocalSettingsChanged) + return FALSE; + + for (i = 0; i < _countof(DesktopIcons); i++) + { + if (pData->bLocalHideChanged[i]) + pData->bHideChanged[i] = TRUE; + else + continue; + + pData->optIcons[i].bHideClassic = + pData->optIcons[i].bHideNewStart = pData->bLocalHideIcon[i]; + } + + pData->bSettingsChanged = TRUE; + return TRUE; +} + +static BOOL +GetCurrentValue(UINT i, BOOL bNewStart) +{ + HKEY regKey, iconKey; + LSTATUS res; + DWORD dwType, cbData; + BOOL bRet; + + /* Set default value */ + bRet = bNewStart; + + if (RegOpenKeyEx(HKEY_CURRENT_USER, szHideDesktopIcons, + 0, KEY_QUERY_VALUE, &regKey) != ERROR_SUCCESS) + { + return bRet; + } + + if (RegOpenKeyEx(regKey, (bNewStart ? szNewStartPanel : szClassicStartMenu), + 0, KEY_QUERY_VALUE, &iconKey) != ERROR_SUCCESS) + { + RegCloseKey(regKey); + return bRet; + } + + cbData = sizeof(bRet); + res = RegQueryValueEx(iconKey, DesktopIcons[i].CLSID, NULL, &dwType, (LPBYTE)&bRet, &cbData); + + if (res != ERROR_SUCCESS || dwType != REG_DWORD || cbData != sizeof(bRet)) + bRet = bNewStart; + + RegCloseKey(iconKey); + RegCloseKey(regKey); + + return bRet; +} + +static VOID +SetCurrentValue(UINT i, BOOL bNewStart, BOOL bValue) +{ + HKEY regKey, iconKey; + + if (RegCreateKeyEx(HKEY_CURRENT_USER, szHideDesktopIcons, + 0, NULL, REG_OPTION_NON_VOLATILE, KEY_SET_VALUE, + NULL, &regKey, NULL) != ERROR_SUCCESS) + { + return; + } + + if (RegCreateKeyEx(regKey, (bNewStart ? szNewStartPanel : szClassicStartMenu), + 0, NULL, REG_OPTION_NON_VOLATILE, KEY_SET_VALUE, + NULL, &iconKey, NULL) != ERROR_SUCCESS) + { + RegCloseKey(regKey); + return; + } + + RegSetValueEx(iconKey, DesktopIcons[i].CLSID, 0, REG_DWORD, (LPBYTE)&bValue, sizeof(bValue)); + + RegCloseKey(iconKey); + RegCloseKey(regKey); +} + +VOID +SetDesktopSettings(PDESKTOP_DATA pData) +{ + UINT i; + + for (i = 0; i < _countof(DesktopIcons); i++) + { + if (!pData->bHideChanged[i]) + continue; + + if (GetCurrentValue(i, FALSE) != pData->optIcons[i].bHideClassic) + SetCurrentValue(i, FALSE, pData->optIcons[i].bHideClassic); + + if (GetCurrentValue(i, TRUE) != pData->optIcons[i].bHideNewStart) + SetCurrentValue(i, TRUE, pData->optIcons[i].bHideNewStart); + + pData->bHideChanged[i] = FALSE; + } + + pData->bSettingsChanged = FALSE; + + /* Refresh the desktop */ + PostMessage(GetShellWindow(), WM_COMMAND, FCIDM_DESKBROWSER_REFRESH, 0); +} + +static VOID +DesktopOnInitDialog(IN HWND hwndDlg, IN PDESKTOP_DATA pData) +{ + UINT i; + SHELLSTATE ss = {0}; + + SHGetSetSettings(&ss, SSF_STARTPANELON, FALSE); + + /* Disable unimplemented features */ + EnableWindow(GetDlgItem(hwndDlg, IDC_ICONS_CHANGEICON), FALSE); + EnableWindow(GetDlgItem(hwndDlg, IDC_ICONS_SETDEFAULT), FALSE); + + for (i = 0; i < _countof(pData->optIcons); i++) + { + BOOL bHide; + + if (ss.fStartPanelOn) + bHide = pData->optIcons[i].bHideNewStart; + else + bHide = pData->optIcons[i].bHideClassic; + + CheckDlgButton(hwndDlg, + DesktopIcons[i].Checkbox, + bHide ? BST_UNCHECKED : BST_CHECKED); + + pData->bLocalHideIcon[i] = bHide; + pData->bLocalHideChanged[i] = FALSE; + } + + pData->bLocalSettingsChanged = FALSE; +} + +/* Property page dialog callback */ +INT_PTR CALLBACK +DesktopPageProc(IN HWND hwndDlg, IN UINT uMsg, IN WPARAM wParam, IN LPARAM lParam) +{ + PDESKTOP_DATA pData; + + pData = (PDESKTOP_DATA)GetWindowLongPtr(hwndDlg, DWLP_USER); + + switch (uMsg) + { + case WM_INITDIALOG: + { + LPPROPSHEETPAGE ppsp = (LPPROPSHEETPAGE)lParam; + pData = (PDESKTOP_DATA)ppsp->lParam; + + SetWindowLongPtr(hwndDlg, DWLP_USER, (LONG_PTR)pData); + DesktopOnInitDialog(hwndDlg, pData); + break; + } + + case WM_COMMAND: + { + DWORD controlId = LOWORD(wParam); + DWORD command = HIWORD(wParam); + + if (command == BN_CLICKED) + { + UINT i; + + for (i = 0; i < _countof(DesktopIcons); i++) + { + if (DesktopIcons[i].Checkbox == controlId) + { + pData->bLocalHideIcon[i] = + (IsDlgButtonChecked(hwndDlg, DesktopIcons[i].Checkbox) == BST_UNCHECKED); + + pData->bLocalSettingsChanged = + pData->bLocalHideChanged[i] = TRUE; + + PropSheet_Changed(GetParent(hwndDlg), hwndDlg); + break; + } + } + } + break; + } + } + + return FALSE; +} diff --git a/dll/cpl/desk/lang/bg-BG.rc b/dll/cpl/desk/lang/bg-BG.rc index 4dae3f7b9ae..b7414665474 100644 --- a/dll/cpl/desk/lang/bg-BG.rc +++ b/dll/cpl/desk/lang/bg-BG.rc @@ -26,6 +26,7 @@ BEGIN PUSHBUTTON "&Цвят...", IDC_COLOR_BUTTON, 188, 167, 55, 15 LTEXT "Разположение", IDC_STATIC, 188, 128, 55, 9 COMBOBOX IDC_PLACEMENT_COMBO, 188, 139, 55, 54, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + PUSHBUTTON "Customize &Desktop...", IDC_DESKTOP_CUSTOM, 8, 194, 90, 15 END IDD_SCREENSAVER DIALOGEX 0, 0, 246, 202 @@ -151,6 +152,27 @@ BEGIN PUSHBUTTON "Раз&ширени...", IDC_SETTINGS_ADVANCED, 170, 174, 70, 15 END +IDD_DESKTOP_GENERAL DIALOGEX 0, 0, 224, 202 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "General" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "Desktop icons", IDC_STATIC, 6, 4, 212, 40 + CONTROL "My &Documents", IDC_ICONS_MYDOCS, "button", + BS_AUTOCHECKBOX | WS_TABSTOP, 14, 14, 100, 12 + CONTROL "My &Network Places", IDC_ICONS_MYNET, "button", + BS_AUTOCHECKBOX | WS_TABSTOP, 116, 14, 100, 12 + CONTROL "&My Computer", IDC_ICONS_MYCOMP, "button", + BS_AUTOCHECKBOX | WS_TABSTOP, 14, 28, 100, 12 + CONTROL "&Internet Browser", IDC_ICONS_INTERNET, "button", + BS_AUTOCHECKBOX | WS_TABSTOP, 116, 28, 100, 12 + CONTROL "", IDC_ICONS_LISTVIEW, "SysListView32", + LVS_ICON | LVS_ALIGNLEFT | LVS_AUTOARRANGE | LVS_SINGLESEL | WS_BORDER | WS_TABSTOP | WS_HSCROLL, + 6, 60, 212, 54 + PUSHBUTTON "C&hange Icon...", IDC_ICONS_CHANGEICON, 86, 120, 64, 15 + PUSHBUTTON "Re&store Default", IDC_ICONS_SETDEFAULT, 154, 120, 64, 15 +END + IDD_ADVANCED_GENERAL DIALOGEX 0, 0, 253, 204 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Общи" @@ -209,6 +231,11 @@ BEGIN IDS_CLEARTYPEEFFECT "FreeType Antialiased" END +STRINGTABLE +BEGIN + IDS_DESKTOP_ITEMS "Desktop Items" +END + STRINGTABLE BEGIN IDS_MULTIPLEMONITORS "(Много монитори)" diff --git a/dll/cpl/desk/lang/cs-CZ.rc b/dll/cpl/desk/lang/cs-CZ.rc index 9d083f1936e..b034dec698e 100644 --- a/dll/cpl/desk/lang/cs-CZ.rc +++ b/dll/cpl/desk/lang/cs-CZ.rc @@ -32,6 +32,7 @@ BEGIN PUSHBUTTON "&Barva...", IDC_COLOR_BUTTON, 188, 167, 55, 15 LTEXT "Umístění", IDC_STATIC, 188, 128, 55, 9 COMBOBOX IDC_PLACEMENT_COMBO, 188, 139, 55, 54, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + PUSHBUTTON "Customize &Desktop...", IDC_DESKTOP_CUSTOM, 8, 194, 90, 15 END IDD_SCREENSAVER DIALOGEX 0, 0, 246, 202 @@ -157,6 +158,27 @@ BEGIN PUSHBUTTON "&Upřesnit", IDC_SETTINGS_ADVANCED, 170, 174, 70, 15 END +IDD_DESKTOP_GENERAL DIALOGEX 0, 0, 224, 202 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "General" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "Desktop icons", IDC_STATIC, 6, 4, 212, 40 + CONTROL "My &Documents", IDC_ICONS_MYDOCS, "button", + BS_AUTOCHECKBOX | WS_TABSTOP, 14, 14, 100, 12 + CONTROL "My &Network Places", IDC_ICONS_MYNET, "button", + BS_AUTOCHECKBOX | WS_TABSTOP, 116, 14, 100, 12 + CONTROL "&My Computer", IDC_ICONS_MYCOMP, "button", + BS_AUTOCHECKBOX | WS_TABSTOP, 14, 28, 100, 12 + CONTROL "&Internet Browser", IDC_ICONS_INTERNET, "button", + BS_AUTOCHECKBOX | WS_TABSTOP, 116, 28, 100, 12 + CONTROL "", IDC_ICONS_LISTVIEW, "SysListView32", + LVS_ICON | LVS_ALIGNLEFT | LVS_AUTOARRANGE | LVS_SINGLESEL | WS_BORDER | WS_TABSTOP | WS_HSCROLL, + 6, 60, 212, 54 + PUSHBUTTON "C&hange Icon...", IDC_ICONS_CHANGEICON, 86, 120, 64, 15 + PUSHBUTTON "Re&store Default", IDC_ICONS_SETDEFAULT, 154, 120, 64, 15 +END + IDD_ADVANCED_GENERAL DIALOGEX 0, 0, 253, 204 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Obecné" @@ -215,6 +237,11 @@ BEGIN IDS_CLEARTYPEEFFECT "FreeType Antialiased" END +STRINGTABLE +BEGIN + IDS_DESKTOP_ITEMS "Desktop Items" +END + STRINGTABLE BEGIN IDS_MULTIPLEMONITORS "(Více monitorů)" diff --git a/dll/cpl/desk/lang/de-DE.rc b/dll/cpl/desk/lang/de-DE.rc index ddf5cb6ed79..e85d8b33b45 100644 --- a/dll/cpl/desk/lang/de-DE.rc +++ b/dll/cpl/desk/lang/de-DE.rc @@ -26,6 +26,7 @@ BEGIN PUSHBUTTON "&Farbe...", IDC_COLOR_BUTTON, 188, 167, 55, 15 LTEXT "&Ausrichtung", IDC_STATIC, 188, 128, 55, 9 COMBOBOX IDC_PLACEMENT_COMBO, 188, 139, 55, 54, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + PUSHBUTTON "Customize &Desktop...", IDC_DESKTOP_CUSTOM, 8, 194, 90, 15 END IDD_SCREENSAVER DIALOGEX 0, 0, 246, 202 @@ -151,6 +152,27 @@ BEGIN PUSHBUTTON "&Erweitert", IDC_SETTINGS_ADVANCED, 170, 174, 70, 15 END +IDD_DESKTOP_GENERAL DIALOGEX 0, 0, 224, 202 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "General" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "Desktop icons", IDC_STATIC, 6, 4, 212, 40 + CONTROL "My &Documents", IDC_ICONS_MYDOCS, "button", + BS_AUTOCHECKBOX | WS_TABSTOP, 14, 14, 100, 12 + CONTROL "My &Network Places", IDC_ICONS_MYNET, "button", + BS_AUTOCHECKBOX | WS_TABSTOP, 116, 14, 100, 12 + CONTROL "&My Computer", IDC_ICONS_MYCOMP, "button", + BS_AUTOCHECKBOX | WS_TABSTOP, 14, 28, 100, 12 + CONTROL "&Internet Browser", IDC_ICONS_INTERNET, "button", + BS_AUTOCHECKBOX | WS_TABSTOP, 116, 28, 100, 12 + CONTROL "", IDC_ICONS_LISTVIEW, "SysListView32", + LVS_ICON | LVS_ALIGNLEFT | LVS_AUTOARRANGE | LVS_SINGLESEL | WS_BORDER | WS_TABSTOP | WS_HSCROLL, + 6, 60, 212, 54 + PUSHBUTTON "C&hange Icon...", IDC_ICONS_CHANGEICON, 86, 120, 64, 15 + PUSHBUTTON "Re&store Default", IDC_ICONS_SETDEFAULT, 154, 120, 64, 15 +END + IDD_ADVANCED_GENERAL DIALOGEX 0, 0, 253, 204 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Allgemein" @@ -209,6 +231,11 @@ BEGIN IDS_CLEARTYPEEFFECT "FreeType Antialiased" END +STRINGTABLE +BEGIN + IDS_DESKTOP_ITEMS "Desktop Items" +END + STRINGTABLE BEGIN IDS_MULTIPLEMONITORS "(Mehrere Monitore)" diff --git a/dll/cpl/desk/lang/el-GR.rc b/dll/cpl/desk/lang/el-GR.rc index 6678325805b..534a7faa403 100644 --- a/dll/cpl/desk/lang/el-GR.rc +++ b/dll/cpl/desk/lang/el-GR.rc @@ -26,6 +26,7 @@ BEGIN PUSHBUTTON "&Χρώμα...", IDC_COLOR_BUTTON, 188, 167, 55, 15 LTEXT "Θέση", IDC_STATIC, 188, 128, 55, 9 COMBOBOX IDC_PLACEMENT_COMBO, 188, 139, 55, 54, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + PUSHBUTTON "Customize &Desktop...", IDC_DESKTOP_CUSTOM, 8, 194, 90, 15 END IDD_SCREENSAVER DIALOGEX 0, 0, 246, 202 @@ -151,6 +152,27 @@ BEGIN PUSHBUTTON "Για &προχωρημένους...", IDC_SETTINGS_ADVANCED, 170, 174, 70, 15 END +IDD_DESKTOP_GENERAL DIALOGEX 0, 0, 224, 202 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "General" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "Desktop icons", IDC_STATIC, 6, 4, 212, 40 + CONTROL "My &Documents", IDC_ICONS_MYDOCS, "button", + BS_AUTOCHECKBOX | WS_TABSTOP, 14, 14, 100, 12 + CONTROL "My &Network Places", IDC_ICONS_MYNET, "button", + BS_AUTOCHECKBOX | WS_TABSTOP, 116, 14, 100, 12 + CONTROL "&My Computer", IDC_ICONS_MYCOMP, "button", + BS_AUTOCHECKBOX | WS_TABSTOP, 14, 28, 100, 12 + CONTROL "&Internet Browser", IDC_ICONS_INTERNET, "button", + BS_AUTOCHECKBOX | WS_TABSTOP, 116, 28, 100, 12 + CONTROL "", IDC_ICONS_LISTVIEW, "SysListView32", + LVS_ICON | LVS_ALIGNLEFT | LVS_AUTOARRANGE | LVS_SINGLESEL | WS_BORDER | WS_TABSTOP | WS_HSCROLL, + 6, 60, 212, 54 + PUSHBUTTON "C&hange Icon...", IDC_ICONS_CHANGEICON, 86, 120, 64, 15 + PUSHBUTTON "Re&store Default", IDC_ICONS_SETDEFAULT, 154, 120, 64, 15 +END + IDD_ADVANCED_GENERAL DIALOGEX 0, 0, 253, 204 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "General" @@ -209,6 +231,11 @@ BEGIN IDS_CLEARTYPEEFFECT "FreeType Antialiased" END +STRINGTABLE +BEGIN + IDS_DESKTOP_ITEMS "Desktop Items" +END + STRINGTABLE BEGIN IDS_MULTIPLEMONITORS "(Πολλαπλές οθόνες)" diff --git a/dll/cpl/desk/lang/en-GB.rc b/dll/cpl/desk/lang/en-GB.rc index 11609378370..3592d7f56fa 100644 --- a/dll/cpl/desk/lang/en-GB.rc +++ b/dll/cpl/desk/lang/en-GB.rc @@ -26,6 +26,7 @@ BEGIN PUSHBUTTON "&Colour...", IDC_COLOR_BUTTON, 188, 167, 55, 15 LTEXT "&Placement", IDC_STATIC, 188, 128, 55, 9 COMBOBOX IDC_PLACEMENT_COMBO, 188, 139, 55, 54, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + PUSHBUTTON "Customize &Desktop...", IDC_DESKTOP_CUSTOM, 8, 194, 90, 15 END IDD_SCREENSAVER DIALOGEX 0, 0, 246, 202 @@ -151,6 +152,27 @@ BEGIN PUSHBUTTON "Ad&vanced...", IDC_SETTINGS_ADVANCED, 170, 174, 70, 15 END +IDD_DESKTOP_GENERAL DIALOGEX 0, 0, 224, 202 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "General" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "Desktop icons", IDC_STATIC, 6, 4, 212, 40 + CONTROL "My &Documents", IDC_ICONS_MYDOCS, "button", + BS_AUTOCHECKBOX | WS_TABSTOP, 14, 14, 100, 12 + CONTROL "My &Network Places", IDC_ICONS_MYNET, "button", + BS_AUTOCHECKBOX | WS_TABSTOP, 116, 14, 100, 12 + CONTROL "&My Computer", IDC_ICONS_MYCOMP, "button", + BS_AUTOCHECKBOX | WS_TABSTOP, 14, 28, 100, 12 + CONTROL "&Internet Browser", IDC_ICONS_INTERNET, "button", + BS_AUTOCHECKBOX | WS_TABSTOP, 116, 28, 100, 12 + CONTROL "", IDC_ICONS_LISTVIEW, "SysListView32", + LVS_ICON | LVS_ALIGNLEFT | LVS_AUTOARRANGE | LVS_SINGLESEL | WS_BORDER | WS_TABSTOP | WS_HSCROLL, + 6, 60, 212, 54 + PUSHBUTTON "C&hange Icon...", IDC_ICONS_CHANGEICON, 86, 120, 64, 15 + PUSHBUTTON "Re&store Default", IDC_ICONS_SETDEFAULT, 154, 120, 64, 15 +END + IDD_ADVANCED_GENERAL DIALOGEX 0, 0, 253, 204 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "General" @@ -209,6 +231,11 @@ BEGIN IDS_CLEARTYPEEFFECT "FreeType Antialiased" END +STRINGTABLE +BEGIN + IDS_DESKTOP_ITEMS "Desktop Items" +END + STRINGTABLE BEGIN IDS_MULTIPLEMONITORS "(Multiple Monitors)" diff --git a/dll/cpl/desk/lang/en-US.rc b/dll/cpl/desk/lang/en-US.rc index 2de5355fc14..ae565338b8c 100644 --- a/dll/cpl/desk/lang/en-US.rc +++ b/dll/cpl/desk/lang/en-US.rc @@ -26,6 +26,7 @@ BEGIN PUSHBUTTON "&Color...", IDC_COLOR_BUTTON, 188, 167, 55, 15 LTEXT "&Placement", IDC_STATIC, 188, 128, 55, 9 COMBOBOX IDC_PLACEMENT_COMBO, 188, 139, 55, 54, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + PUSHBUTTON "Customize &Desktop...", IDC_DESKTOP_CUSTOM, 8, 194, 90, 15 END IDD_SCREENSAVER DIALOGEX 0, 0, 246, 202 @@ -151,6 +152,27 @@ BEGIN PUSHBUTTON "Ad&vanced...", IDC_SETTINGS_ADVANCED, 170, 174, 70, 15 END +IDD_DESKTOP_GENERAL DIALOGEX 0, 0, 224, 202 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "General" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "Desktop icons", IDC_STATIC, 6, 4, 212, 40 + CONTROL "My &Documents", IDC_ICONS_MYDOCS, "button", + BS_AUTOCHECKBOX | WS_TABSTOP, 14, 14, 100, 12 + CONTROL "My &Network Places", IDC_ICONS_MYNET, "button", + BS_AUTOCHECKBOX | WS_TABSTOP, 116, 14, 100, 12 + CONTROL "&My Computer", IDC_ICONS_MYCOMP, "button", + BS_AUTOCHECKBOX | WS_TABSTOP, 14, 28, 100, 12 + CONTROL "&Internet Browser", IDC_ICONS_INTERNET, "button", + BS_AUTOCHECKBOX | WS_TABSTOP, 116, 28, 100, 12 + CONTROL "", IDC_ICONS_LISTVIEW, "SysListView32", + LVS_ICON | LVS_ALIGNLEFT | LVS_AUTOARRANGE | LVS_SINGLESEL | WS_BORDER | WS_TABSTOP | WS_HSCROLL, + 6, 60, 212, 54 + PUSHBUTTON "C&hange Icon...", IDC_ICONS_CHANGEICON, 86, 120, 64, 15 + PUSHBUTTON "Re&store Default", IDC_ICONS_SETDEFAULT, 154, 120, 64, 15 +END + IDD_ADVANCED_GENERAL DIALOGEX 0, 0, 253, 204 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "General" @@ -209,6 +231,11 @@ BEGIN IDS_CLEARTYPEEFFECT "FreeType Antialiased" END +STRINGTABLE +BEGIN + IDS_DESKTOP_ITEMS "Desktop Items" +END + STRINGTABLE BEGIN IDS_MULTIPLEMONITORS "(Multiple Monitors)" diff --git a/dll/cpl/desk/lang/es-ES.rc b/dll/cpl/desk/lang/es-ES.rc index 244ec1931f4..37aaf72c7a1 100644 --- a/dll/cpl/desk/lang/es-ES.rc +++ b/dll/cpl/desk/lang/es-ES.rc @@ -36,6 +36,7 @@ BEGIN PUSHBUTTON "C&olor...", IDC_COLOR_BUTTON, 188, 167, 55, 15 LTEXT "Po&sición", IDC_STATIC, 188, 128, 55, 9 COMBOBOX IDC_PLACEMENT_COMBO, 188, 139, 55, 54, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + PUSHBUTTON "Customize &Desktop...", IDC_DESKTOP_CUSTOM, 8, 194, 90, 15 END IDD_SCREENSAVER DIALOGEX 0, 0, 246, 202 @@ -161,6 +162,27 @@ BEGIN PUSHBUTTON "Opciones &avanzadas", IDC_SETTINGS_ADVANCED, 170, 174, 70, 15 END +IDD_DESKTOP_GENERAL DIALOGEX 0, 0, 224, 202 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "General" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "Desktop icons", IDC_STATIC, 6, 4, 212, 40 + CONTROL "My &Documents", IDC_ICONS_MYDOCS, "button", + BS_AUTOCHECKBOX | WS_TABSTOP, 14, 14, 100, 12 + CONTROL "My &Network Places", IDC_ICONS_MYNET, "button", + BS_AUTOCHECKBOX | WS_TABSTOP, 116, 14, 100, 12 + CONTROL "&My Computer", IDC_ICONS_MYCOMP, "button", + BS_AUTOCHECKBOX | WS_TABSTOP, 14, 28, 100, 12 + CONTROL "&Internet Browser", IDC_ICONS_INTERNET, "button", + BS_AUTOCHECKBOX | WS_TABSTOP, 116, 28, 100, 12 + CONTROL "", IDC_ICONS_LISTVIEW, "SysListView32", + LVS_ICON | LVS_ALIGNLEFT | LVS_AUTOARRANGE | LVS_SINGLESEL | WS_BORDER | WS_TABSTOP | WS_HSCROLL, + 6, 60, 212, 54 + PUSHBUTTON "C&hange Icon...", IDC_ICONS_CHANGEICON, 86, 120, 64, 15 + PUSHBUTTON "Re&store Default", IDC_ICONS_SETDEFAULT, 154, 120, 64, 15 +END + IDD_ADVANCED_GENERAL DIALOGEX 0, 0, 253, 204 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "General" @@ -219,6 +241,11 @@ BEGIN IDS_CLEARTYPEEFFECT "Suavizado de FreeType" END +STRINGTABLE +BEGIN + IDS_DESKTOP_ITEMS "Desktop Items" +END + STRINGTABLE BEGIN IDS_MULTIPLEMONITORS "(Múltiples monitores)" diff --git a/dll/cpl/desk/lang/et-EE.rc b/dll/cpl/desk/lang/et-EE.rc index 74b1198e85b..8ea2a628df7 100644 --- a/dll/cpl/desk/lang/et-EE.rc +++ b/dll/cpl/desk/lang/et-EE.rc @@ -33,6 +33,7 @@ BEGIN PUSHBUTTON "&Värv...", IDC_COLOR_BUTTON, 188, 167, 55, 15 LTEXT "&Paigutus", IDC_STATIC, 188, 128, 55, 9 COMBOBOX IDC_PLACEMENT_COMBO, 188, 139, 55, 54, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + PUSHBUTTON "Customize &Desktop...", IDC_DESKTOP_CUSTOM, 8, 194, 90, 15 END IDD_SCREENSAVER DIALOGEX 0, 0, 246, 202 @@ -158,6 +159,27 @@ BEGIN PUSHBUTTON "&Täpsemalt...", IDC_SETTINGS_ADVANCED, 170, 174, 70, 15 END +IDD_DESKTOP_GENERAL DIALOGEX 0, 0, 224, 202 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "General" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "Desktop icons", IDC_STATIC, 6, 4, 212, 40 + CONTROL "My &Documents", IDC_ICONS_MYDOCS, "button", + BS_AUTOCHECKBOX | WS_TABSTOP, 14, 14, 100, 12 + CONTROL "My &Network Places", IDC_ICONS_MYNET, "button", + BS_AUTOCHECKBOX | WS_TABSTOP, 116, 14, 100, 12 + CONTROL "&My Computer", IDC_ICONS_MYCOMP, "button", + BS_AUTOCHECKBOX | WS_TABSTOP, 14, 28, 100, 12 + CONTROL "&Internet Browser", IDC_ICONS_INTERNET, "button", + BS_AUTOCHECKBOX | WS_TABSTOP, 116, 28, 100, 12 + CONTROL "", IDC_ICONS_LISTVIEW, "SysListView32", + LVS_ICON | LVS_ALIGNLEFT | LVS_AUTOARRANGE | LVS_SINGLESEL | WS_BORDER | WS_TABSTOP | WS_HSCROLL, + 6, 60, 212, 54 + PUSHBUTTON "C&hange Icon...", IDC_ICONS_CHANGEICON, 86, 120, 64, 15 + PUSHBUTTON "Re&store Default", IDC_ICONS_SETDEFAULT, 154, 120, 64, 15 +END + IDD_ADVANCED_GENERAL DIALOGEX 0, 0, 253, 204 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Üldist" @@ -216,6 +238,11 @@ BEGIN IDS_CLEARTYPEEFFECT "FreeType Antialiaseeritud" END +STRINGTABLE +BEGIN + IDS_DESKTOP_ITEMS "Desktop Items" +END + STRINGTABLE BEGIN IDS_MULTIPLEMONITORS "(Mitu monitori)" diff --git a/dll/cpl/desk/lang/fr-FR.rc b/dll/cpl/desk/lang/fr-FR.rc index 1cf8f9868c1..68cb9b3ada0 100644 --- a/dll/cpl/desk/lang/fr-FR.rc +++ b/dll/cpl/desk/lang/fr-FR.rc @@ -28,6 +28,7 @@ BEGIN PUSHBUTTON "&Couleur...", IDC_COLOR_BUTTON, 188, 167, 55, 15 LTEXT "Position :", IDC_STATIC, 188, 128, 55, 9 COMBOBOX IDC_PLACEMENT_COMBO, 188, 139, 55, 54, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + PUSHBUTTON "Customize &Desktop...", IDC_DESKTOP_CUSTOM, 8, 194, 90, 15 END IDD_SCREENSAVER DIALOGEX 0, 0, 246, 202 @@ -153,6 +154,27 @@ BEGIN PUSHBUTTON "A&vancé...", IDC_SETTINGS_ADVANCED, 170, 174, 70, 15 END +IDD_DESKTOP_GENERAL DIALOGEX 0, 0, 224, 202 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "General" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "Desktop icons", IDC_STATIC, 6, 4, 212, 40 + CONTROL "My &Documents", IDC_ICONS_MYDOCS, "button", + BS_AUTOCHECKBOX | WS_TABSTOP, 14, 14, 100, 12 + CONTROL "My &Network Places", IDC_ICONS_MYNET, "button", + BS_AUTOCHECKBOX | WS_TABSTOP, 116, 14, 100, 12 + CONTROL "&My Computer", IDC_ICONS_MYCOMP, "button", + BS_AUTOCHECKBOX | WS_TABSTOP, 14, 28, 100, 12 + CONTROL "&Internet Browser", IDC_ICONS_INTERNET, "button", + BS_AUTOCHECKBOX | WS_TABSTOP, 116, 28, 100, 12 + CONTROL "", IDC_ICONS_LISTVIEW, "SysListView32", + LVS_ICON | LVS_ALIGNLEFT | LVS_AUTOARRANGE | LVS_SINGLESEL | WS_BORDER | WS_TABSTOP | WS_HSCROLL, + 6, 60, 212, 54 + PUSHBUTTON "C&hange Icon...", IDC_ICONS_CHANGEICON, 86, 120, 64, 15 + PUSHBUTTON "Re&store Default", IDC_ICONS_SETDEFAULT, 154, 120, 64, 15 +END + IDD_ADVANCED_GENERAL DIALOGEX 0, 0, 299, 204 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Général" @@ -211,6 +233,11 @@ BEGIN IDS_CLEARTYPEEFFECT "FreeType" END +STRINGTABLE +BEGIN + IDS_DESKTOP_ITEMS "Desktop Items" +END + STRINGTABLE BEGIN IDS_MULTIPLEMONITORS "(Moniteurs multiples)" diff --git a/dll/cpl/desk/lang/he-IL.rc b/dll/cpl/desk/lang/he-IL.rc index 60e1156616d..96ac34a5908 100644 --- a/dll/cpl/desk/lang/he-IL.rc +++ b/dll/cpl/desk/lang/he-IL.rc @@ -26,6 +26,7 @@ BEGIN PUSHBUTTON "צבע...", IDC_COLOR_BUTTON, 188, 167, 55, 15 LTEXT "מיקום", IDC_STATIC, 188, 128, 55, 9 COMBOBOX IDC_PLACEMENT_COMBO, 188, 139, 55, 54, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + PUSHBUTTON "Customize &Desktop...", IDC_DESKTOP_CUSTOM, 8, 194, 90, 15 END IDD_SCREENSAVER DIALOGEX 0, 0, 246, 202 @@ -151,6 +152,27 @@ BEGIN PUSHBUTTON "מתקדם...", IDC_SETTINGS_ADVANCED, 170, 174, 70, 15 END +IDD_DESKTOP_GENERAL DIALOGEX 0, 0, 224, 202 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "General" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "Desktop icons", IDC_STATIC, 6, 4, 212, 40 + CONTROL "My &Documents", IDC_ICONS_MYDOCS, "button", + BS_AUTOCHECKBOX | WS_TABSTOP, 14, 14, 100, 12 + CONTROL "My &Network Places", IDC_ICONS_MYNET, "button", + BS_AUTOCHECKBOX | WS_TABSTOP, 116, 14, 100, 12 + CONTROL "&My Computer", IDC_ICONS_MYCOMP, "button", + BS_AUTOCHECKBOX | WS_TABSTOP, 14, 28, 100, 12 + CONTROL "&Internet Browser", IDC_ICONS_INTERNET, "button", + BS_AUTOCHECKBOX | WS_TABSTOP, 116, 28, 100, 12 + CONTROL "", IDC_ICONS_LISTVIEW, "SysListView32", + LVS_ICON | LVS_ALIGNLEFT | LVS_AUTOARRANGE | LVS_SINGLESEL | WS_BORDER | WS_TABSTOP | WS_HSCROLL, + 6, 60, 212, 54 + PUSHBUTTON "C&hange Icon...", IDC_ICONS_CHANGEICON, 86, 120, 64, 15 + PUSHBUTTON "Re&store Default", IDC_ICONS_SETDEFAULT, 154, 120, 64, 15 +END + IDD_ADVANCED_GENERAL DIALOGEX 0, 0, 253, 204 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "כללי" @@ -209,6 +231,11 @@ BEGIN IDS_CLEARTYPEEFFECT "FreeType Antialiased" END +STRINGTABLE +BEGIN + IDS_DESKTOP_ITEMS "Desktop Items" +END + STRINGTABLE BEGIN IDS_MULTIPLEMONITORS "(צגים מרובים)" diff --git a/dll/cpl/desk/lang/hu-HU.rc b/dll/cpl/desk/lang/hu-HU.rc index 1f3d1b70309..b41198cf5b6 100644 --- a/dll/cpl/desk/lang/hu-HU.rc +++ b/dll/cpl/desk/lang/hu-HU.rc @@ -28,6 +28,7 @@ BEGIN PUSHBUTTON "&Színek...", IDC_COLOR_BUTTON, 188, 167, 55, 15 LTEXT "Elrendezés", IDC_STATIC, 188, 128, 55, 9 COMBOBOX IDC_PLACEMENT_COMBO, 188, 139, 55, 54, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + PUSHBUTTON "Customize &Desktop...", IDC_DESKTOP_CUSTOM, 8, 194, 90, 15 END IDD_SCREENSAVER DIALOGEX 0, 0, 246, 202 @@ -153,6 +154,27 @@ BEGIN PUSHBUTTON "&Haladóknak...", IDC_SETTINGS_ADVANCED, 170, 174, 70, 15 END +IDD_DESKTOP_GENERAL DIALOGEX 0, 0, 224, 202 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "General" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "Desktop icons", IDC_STATIC, 6, 4, 212, 40 + CONTROL "My &Documents", IDC_ICONS_MYDOCS, "button", + BS_AUTOCHECKBOX | WS_TABSTOP, 14, 14, 100, 12 + CONTROL "My &Network Places", IDC_ICONS_MYNET, "button", + BS_AUTOCHECKBOX | WS_TABSTOP, 116, 14, 100, 12 + CONTROL "&My Computer", IDC_ICONS_MYCOMP, "button", + BS_AUTOCHECKBOX | WS_TABSTOP, 14, 28, 100, 12 + CONTROL "&Internet Browser", IDC_ICONS_INTERNET, "button", + BS_AUTOCHECKBOX | WS_TABSTOP, 116, 28, 100, 12 + CONTROL "", IDC_ICONS_LISTVIEW, "SysListView32", + LVS_ICON | LVS_ALIGNLEFT | LVS_AUTOARRANGE | LVS_SINGLESEL | WS_BORDER | WS_TABSTOP | WS_HSCROLL, + 6, 60, 212, 54 + PUSHBUTTON "C&hange Icon...", IDC_ICONS_CHANGEICON, 86, 120, 64, 15 + PUSHBUTTON "Re&store Default", IDC_ICONS_SETDEFAULT, 154, 120, 64, 15 +END + IDD_ADVANCED_GENERAL DIALOGEX 0, 0, 253, 204 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Általános" @@ -211,6 +233,11 @@ BEGIN IDS_CLEARTYPEEFFECT "FreeType élsimított" END +STRINGTABLE +BEGIN + IDS_DESKTOP_ITEMS "Desktop Items" +END + STRINGTABLE BEGIN IDS_MULTIPLEMONITORS "(Több képernyő)" diff --git a/dll/cpl/desk/lang/id-ID.rc b/dll/cpl/desk/lang/id-ID.rc index 5e85b95bbca..b8f7562efe7 100644 --- a/dll/cpl/desk/lang/id-ID.rc +++ b/dll/cpl/desk/lang/id-ID.rc @@ -26,6 +26,7 @@ BEGIN PUSHBUTTON "&Warna...", IDC_COLOR_BUTTON, 188, 167, 55, 15 LTEXT "Penempatan", IDC_STATIC, 188, 128, 55, 9 COMBOBOX IDC_PLACEMENT_COMBO, 188, 139, 55, 54, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + PUSHBUTTON "Customize &Desktop...", IDC_DESKTOP_CUSTOM, 8, 194, 90, 15 END IDD_SCREENSAVER DIALOGEX 0, 0, 246, 202 @@ -151,6 +152,27 @@ BEGIN PUSHBUTTON "&Lanjutan...", IDC_SETTINGS_ADVANCED, 170, 174, 70, 15 END +IDD_DESKTOP_GENERAL DIALOGEX 0, 0, 224, 202 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "General" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "Desktop icons", IDC_STATIC, 6, 4, 212, 40 + CONTROL "My &Documents", IDC_ICONS_MYDOCS, "button", + BS_AUTOCHECKBOX | WS_TABSTOP, 14, 14, 100, 12 + CONTROL "My &Network Places", IDC_ICONS_MYNET, "button", + BS_AUTOCHECKBOX | WS_TABSTOP, 116, 14, 100, 12 + CONTROL "&My Computer", IDC_ICONS_MYCOMP, "button", + BS_AUTOCHECKBOX | WS_TABSTOP, 14, 28, 100, 12 + CONTROL "&Internet Browser", IDC_ICONS_INTERNET, "button", + BS_AUTOCHECKBOX | WS_TABSTOP, 116, 28, 100, 12 + CONTROL "", IDC_ICONS_LISTVIEW, "SysListView32", + LVS_ICON | LVS_ALIGNLEFT | LVS_AUTOARRANGE | LVS_SINGLESEL | WS_BORDER | WS_TABSTOP | WS_HSCROLL, + 6, 60, 212, 54 + PUSHBUTTON "C&hange Icon...", IDC_ICONS_CHANGEICON, 86, 120, 64, 15 + PUSHBUTTON "Re&store Default", IDC_ICONS_SETDEFAULT, 154, 120, 64, 15 +END + IDD_ADVANCED_GENERAL DIALOGEX 0, 0, 253, 204 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Umum" @@ -209,6 +231,11 @@ BEGIN IDS_CLEARTYPEEFFECT "Antialias FreeType" END +STRINGTABLE +BEGIN + IDS_DESKTOP_ITEMS "Desktop Items" +END + STRINGTABLE BEGIN IDS_MULTIPLEMONITORS "(Monitor Banyak)" diff --git a/dll/cpl/desk/lang/it-IT.rc b/dll/cpl/desk/lang/it-IT.rc index e96ec2d79d6..085b7532c37 100644 --- a/dll/cpl/desk/lang/it-IT.rc +++ b/dll/cpl/desk/lang/it-IT.rc @@ -26,6 +26,7 @@ BEGIN PUSHBUTTON "&Colore...", IDC_COLOR_BUTTON, 188, 167, 55, 15 LTEXT "Posizione", IDC_STATIC, 188, 128, 55, 9 COMBOBOX IDC_PLACEMENT_COMBO, 188, 139, 55, 54, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + PUSHBUTTON "Customize &Desktop...", IDC_DESKTOP_CUSTOM, 8, 194, 90, 15 END IDD_SCREENSAVER DIALOGEX 0, 0, 246, 202 @@ -151,6 +152,27 @@ BEGIN PUSHBUTTON "A&vanzate...", IDC_SETTINGS_ADVANCED, 170, 174, 70, 15 END +IDD_DESKTOP_GENERAL DIALOGEX 0, 0, 224, 202 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "General" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "Desktop icons", IDC_STATIC, 6, 4, 212, 40 + CONTROL "My &Documents", IDC_ICONS_MYDOCS, "button", + BS_AUTOCHECKBOX | WS_TABSTOP, 14, 14, 100, 12 + CONTROL "My &Network Places", IDC_ICONS_MYNET, "button", + BS_AUTOCHECKBOX | WS_TABSTOP, 116, 14, 100, 12 + CONTROL "&My Computer", IDC_ICONS_MYCOMP, "button", + BS_AUTOCHECKBOX | WS_TABSTOP, 14, 28, 100, 12 + CONTROL "&Internet Browser", IDC_ICONS_INTERNET, "button", + BS_AUTOCHECKBOX | WS_TABSTOP, 116, 28, 100, 12 + CONTROL "", IDC_ICONS_LISTVIEW, "SysListView32", + LVS_ICON | LVS_ALIGNLEFT | LVS_AUTOARRANGE | LVS_SINGLESEL | WS_BORDER | WS_TABSTOP | WS_HSCROLL, + 6, 60, 212, 54 + PUSHBUTTON "C&hange Icon...", IDC_ICONS_CHANGEICON, 86, 120, 64, 15 + PUSHBUTTON "Re&store Default", IDC_ICONS_SETDEFAULT, 154, 120, 64, 15 +END + IDD_ADVANCED_GENERAL DIALOGEX 0, 0, 253, 204 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Generale" @@ -209,6 +231,11 @@ BEGIN IDS_CLEARTYPEEFFECT "FreeType Antialiased" END +STRINGTABLE +BEGIN + IDS_DESKTOP_ITEMS "Desktop Items" +END + STRINGTABLE BEGIN IDS_MULTIPLEMONITORS "(Monitor Multipli)" diff --git a/dll/cpl/desk/lang/ja-JP.rc b/dll/cpl/desk/lang/ja-JP.rc index e98ce8bca89..95f0f905186 100644 --- a/dll/cpl/desk/lang/ja-JP.rc +++ b/dll/cpl/desk/lang/ja-JP.rc @@ -26,6 +26,7 @@ BEGIN PUSHBUTTON "色(&C)...", IDC_COLOR_BUTTON, 188, 167, 55, 15 LTEXT "表示位置:", IDC_STATIC, 188, 128, 55, 9 COMBOBOX IDC_PLACEMENT_COMBO, 188, 139, 55, 54, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + PUSHBUTTON "Customize &Desktop...", IDC_DESKTOP_CUSTOM, 8, 194, 90, 15 END IDD_SCREENSAVER DIALOGEX 0, 0, 246, 202 @@ -151,6 +152,27 @@ BEGIN PUSHBUTTON "詳細設定(&V)...", IDC_SETTINGS_ADVANCED, 170, 174, 70, 15 END +IDD_DESKTOP_GENERAL DIALOGEX 0, 0, 224, 202 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "General" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "Desktop icons", IDC_STATIC, 6, 4, 212, 40 + CONTROL "My &Documents", IDC_ICONS_MYDOCS, "button", + BS_AUTOCHECKBOX | WS_TABSTOP, 14, 14, 100, 12 + CONTROL "My &Network Places", IDC_ICONS_MYNET, "button", + BS_AUTOCHECKBOX | WS_TABSTOP, 116, 14, 100, 12 + CONTROL "&My Computer", IDC_ICONS_MYCOMP, "button", + BS_AUTOCHECKBOX | WS_TABSTOP, 14, 28, 100, 12 + CONTROL "&Internet Browser", IDC_ICONS_INTERNET, "button", + BS_AUTOCHECKBOX | WS_TABSTOP, 116, 28, 100, 12 + CONTROL "", IDC_ICONS_LISTVIEW, "SysListView32", + LVS_ICON | LVS_ALIGNLEFT | LVS_AUTOARRANGE | LVS_SINGLESEL | WS_BORDER | WS_TABSTOP | WS_HSCROLL, + 6, 60, 212, 54 + PUSHBUTTON "C&hange Icon...", IDC_ICONS_CHANGEICON, 86, 120, 64, 15 + PUSHBUTTON "Re&store Default", IDC_ICONS_SETDEFAULT, 154, 120, 64, 15 +END + IDD_ADVANCED_GENERAL DIALOGEX 0, 0, 253, 204 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "全般" @@ -209,6 +231,11 @@ BEGIN IDS_CLEARTYPEEFFECT "FreeType Antialiased" END +STRINGTABLE +BEGIN + IDS_DESKTOP_ITEMS "Desktop Items" +END + STRINGTABLE BEGIN IDS_MULTIPLEMONITORS "(マルチモニタ)" diff --git a/dll/cpl/desk/lang/nl-NL.rc b/dll/cpl/desk/lang/nl-NL.rc index 6487d1ee77e..20087cbef2b 100644 --- a/dll/cpl/desk/lang/nl-NL.rc +++ b/dll/cpl/desk/lang/nl-NL.rc @@ -26,6 +26,7 @@ BEGIN PUSHBUTTON "&Kleur...", IDC_COLOR_BUTTON, 188, 167, 55, 15 LTEXT "&Weergave", IDC_STATIC, 188, 128, 55, 9 COMBOBOX IDC_PLACEMENT_COMBO, 188, 139, 55, 54, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + PUSHBUTTON "Customize &Desktop...", IDC_DESKTOP_CUSTOM, 8, 194, 90, 15 END IDD_SCREENSAVER DIALOGEX 0, 0, 246, 202 @@ -151,6 +152,27 @@ BEGIN PUSHBUTTON "&Geavanceerd...", IDC_SETTINGS_ADVANCED, 170, 174, 70, 15 END +IDD_DESKTOP_GENERAL DIALOGEX 0, 0, 224, 202 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "General" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "Desktop icons", IDC_STATIC, 6, 4, 212, 40 + CONTROL "My &Documents", IDC_ICONS_MYDOCS, "button", + BS_AUTOCHECKBOX | WS_TABSTOP, 14, 14, 100, 12 + CONTROL "My &Network Places", IDC_ICONS_MYNET, "button", + BS_AUTOCHECKBOX | WS_TABSTOP, 116, 14, 100, 12 + CONTROL "&My Computer", IDC_ICONS_MYCOMP, "button", + BS_AUTOCHECKBOX | WS_TABSTOP, 14, 28, 100, 12 + CONTROL "&Internet Browser", IDC_ICONS_INTERNET, "button", + BS_AUTOCHECKBOX | WS_TABSTOP, 116, 28, 100, 12 + CONTROL "", IDC_ICONS_LISTVIEW, "SysListView32", + LVS_ICON | LVS_ALIGNLEFT | LVS_AUTOARRANGE | LVS_SINGLESEL | WS_BORDER | WS_TABSTOP | WS_HSCROLL, + 6, 60, 212, 54 + PUSHBUTTON "C&hange Icon...", IDC_ICONS_CHANGEICON, 86, 120, 64, 15 + PUSHBUTTON "Re&store Default", IDC_ICONS_SETDEFAULT, 154, 120, 64, 15 +END + IDD_ADVANCED_GENERAL DIALOGEX 0, 0, 253, 204 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "General" @@ -209,6 +231,11 @@ BEGIN IDS_CLEARTYPEEFFECT "FreeType Antialiased" END +STRINGTABLE +BEGIN + IDS_DESKTOP_ITEMS "Desktop Items" +END + STRINGTABLE BEGIN IDS_MULTIPLEMONITORS "(Multiple Monitors)" diff --git a/dll/cpl/desk/lang/no-NO.rc b/dll/cpl/desk/lang/no-NO.rc index 9fa117f234e..2a1d579457f 100644 --- a/dll/cpl/desk/lang/no-NO.rc +++ b/dll/cpl/desk/lang/no-NO.rc @@ -26,6 +26,7 @@ BEGIN PUSHBUTTON "&Farger...", IDC_COLOR_BUTTON, 188, 167, 55, 15 LTEXT "Plassering", IDC_STATIC, 188, 128, 55, 9 COMBOBOX IDC_PLACEMENT_COMBO, 188, 139, 55, 54, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + PUSHBUTTON "Customize &Desktop...", IDC_DESKTOP_CUSTOM, 8, 194, 90, 15 END IDD_SCREENSAVER DIALOGEX 0, 0, 246, 202 @@ -151,6 +152,27 @@ BEGIN PUSHBUTTON "A&vansert...", IDC_SETTINGS_ADVANCED, 170, 174, 70, 15 END +IDD_DESKTOP_GENERAL DIALOGEX 0, 0, 224, 202 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "General" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "Desktop icons", IDC_STATIC, 6, 4, 212, 40 + CONTROL "My &Documents", IDC_ICONS_MYDOCS, "button", + BS_AUTOCHECKBOX | WS_TABSTOP, 14, 14, 100, 12 + CONTROL "My &Network Places", IDC_ICONS_MYNET, "button", + BS_AUTOCHECKBOX | WS_TABSTOP, 116, 14, 100, 12 + CONTROL "&My Computer", IDC_ICONS_MYCOMP, "button", + BS_AUTOCHECKBOX | WS_TABSTOP, 14, 28, 100, 12 + CONTROL "&Internet Browser", IDC_ICONS_INTERNET, "button", + BS_AUTOCHECKBOX | WS_TABSTOP, 116, 28, 100, 12 + CONTROL "", IDC_ICONS_LISTVIEW, "SysListView32", + LVS_ICON | LVS_ALIGNLEFT | LVS_AUTOARRANGE | LVS_SINGLESEL | WS_BORDER | WS_TABSTOP | WS_HSCROLL, + 6, 60, 212, 54 + PUSHBUTTON "C&hange Icon...", IDC_ICONS_CHANGEICON, 86, 120, 64, 15 + PUSHBUTTON "Re&store Default", IDC_ICONS_SETDEFAULT, 154, 120, 64, 15 +END + IDD_ADVANCED_GENERAL DIALOGEX 0, 0, 253, 204 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Generielt" @@ -209,6 +231,11 @@ BEGIN IDS_CLEARTYPEEFFECT "FreeType Antialiased" END +STRINGTABLE +BEGIN + IDS_DESKTOP_ITEMS "Desktop Items" +END + STRINGTABLE BEGIN IDS_MULTIPLEMONITORS "(Sammensatt skjermer)" diff --git a/dll/cpl/desk/lang/pl-PL.rc b/dll/cpl/desk/lang/pl-PL.rc index 8409da7729a..88a16461c11 100644 --- a/dll/cpl/desk/lang/pl-PL.rc +++ b/dll/cpl/desk/lang/pl-PL.rc @@ -36,6 +36,7 @@ BEGIN PUSHBUTTON "&Kolor...", IDC_COLOR_BUTTON, 188, 167, 55, 15 LTEXT "Położenie", IDC_STATIC, 188, 128, 55, 9 COMBOBOX IDC_PLACEMENT_COMBO, 188, 139, 55, 54, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + PUSHBUTTON "Customize &Desktop...", IDC_DESKTOP_CUSTOM, 8, 194, 90, 15 END IDD_SCREENSAVER DIALOGEX 0, 0, 246, 202 @@ -161,6 +162,27 @@ BEGIN PUSHBUTTON "Zaawa&nsowane...", IDC_SETTINGS_ADVANCED, 171, 174, 70, 15 END +IDD_DESKTOP_GENERAL DIALOGEX 0, 0, 224, 202 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "General" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "Desktop icons", IDC_STATIC, 6, 4, 212, 40 + CONTROL "My &Documents", IDC_ICONS_MYDOCS, "button", + BS_AUTOCHECKBOX | WS_TABSTOP, 14, 14, 100, 12 + CONTROL "My &Network Places", IDC_ICONS_MYNET, "button", + BS_AUTOCHECKBOX | WS_TABSTOP, 116, 14, 100, 12 + CONTROL "&My Computer", IDC_ICONS_MYCOMP, "button", + BS_AUTOCHECKBOX | WS_TABSTOP, 14, 28, 100, 12 + CONTROL "&Internet Browser", IDC_ICONS_INTERNET, "button", + BS_AUTOCHECKBOX | WS_TABSTOP, 116, 28, 100, 12 + CONTROL "", IDC_ICONS_LISTVIEW, "SysListView32", + LVS_ICON | LVS_ALIGNLEFT | LVS_AUTOARRANGE | LVS_SINGLESEL | WS_BORDER | WS_TABSTOP | WS_HSCROLL, + 6, 60, 212, 54 + PUSHBUTTON "C&hange Icon...", IDC_ICONS_CHANGEICON, 86, 120, 64, 15 + PUSHBUTTON "Re&store Default", IDC_ICONS_SETDEFAULT, 154, 120, 64, 15 +END + IDD_ADVANCED_GENERAL DIALOGEX 0, 0, 253, 204 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Ogólne" @@ -219,6 +241,11 @@ BEGIN IDS_CLEARTYPEEFFECT "FreeType Antialiased" END +STRINGTABLE +BEGIN + IDS_DESKTOP_ITEMS "Desktop Items" +END + STRINGTABLE BEGIN IDS_MULTIPLEMONITORS "(Kilka Monitorów)" diff --git a/dll/cpl/desk/lang/pt-BR.rc b/dll/cpl/desk/lang/pt-BR.rc index ea7bbfcc074..285b03f6a44 100644 --- a/dll/cpl/desk/lang/pt-BR.rc +++ b/dll/cpl/desk/lang/pt-BR.rc @@ -26,6 +26,7 @@ BEGIN PUSHBUTTON "&Cor...", IDC_COLOR_BUTTON, 188, 167, 55, 15 LTEXT "Po&sição:", IDC_STATIC, 188, 128, 55, 9 COMBOBOX IDC_PLACEMENT_COMBO, 188, 139, 55, 54, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + PUSHBUTTON "Customize &Desktop...", IDC_DESKTOP_CUSTOM, 8, 194, 90, 15 END IDD_SCREENSAVER DIALOGEX 0, 0, 246, 202 @@ -151,6 +152,27 @@ BEGIN PUSHBUTTON "Ava&nçadas...", IDC_SETTINGS_ADVANCED, 170, 174, 70, 15 END +IDD_DESKTOP_GENERAL DIALOGEX 0, 0, 224, 202 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "General" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "Desktop icons", IDC_STATIC, 6, 4, 212, 40 + CONTROL "My &Documents", IDC_ICONS_MYDOCS, "button", + BS_AUTOCHECKBOX | WS_TABSTOP, 14, 14, 100, 12 + CONTROL "My &Network Places", IDC_ICONS_MYNET, "button", + BS_AUTOCHECKBOX | WS_TABSTOP, 116, 14, 100, 12 + CONTROL "&My Computer", IDC_ICONS_MYCOMP, "button", + BS_AUTOCHECKBOX | WS_TABSTOP, 14, 28, 100, 12 + CONTROL "&Internet Browser", IDC_ICONS_INTERNET, "button", + BS_AUTOCHECKBOX | WS_TABSTOP, 116, 28, 100, 12 + CONTROL "", IDC_ICONS_LISTVIEW, "SysListView32", + LVS_ICON | LVS_ALIGNLEFT | LVS_AUTOARRANGE | LVS_SINGLESEL | WS_BORDER | WS_TABSTOP | WS_HSCROLL, + 6, 60, 212, 54 + PUSHBUTTON "C&hange Icon...", IDC_ICONS_CHANGEICON, 86, 120, 64, 15 + PUSHBUTTON "Re&store Default", IDC_ICONS_SETDEFAULT, 154, 120, 64, 15 +END + IDD_ADVANCED_GENERAL DIALOGEX 0, 0, 253, 204 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Geral" @@ -209,6 +231,11 @@ BEGIN IDS_CLEARTYPEEFFECT "FreeType Antialiased" END +STRINGTABLE +BEGIN + IDS_DESKTOP_ITEMS "Desktop Items" +END + STRINGTABLE BEGIN IDS_MULTIPLEMONITORS "(Multiplos monitores)" diff --git a/dll/cpl/desk/lang/pt-PT.rc b/dll/cpl/desk/lang/pt-PT.rc index 5275419926f..1cb57ff5ec5 100644 --- a/dll/cpl/desk/lang/pt-PT.rc +++ b/dll/cpl/desk/lang/pt-PT.rc @@ -31,6 +31,7 @@ BEGIN PUSHBUTTON "&Cor...", IDC_COLOR_BUTTON, 188, 167, 55, 15 LTEXT "Po&sição:", IDC_STATIC, 188, 128, 55, 9 COMBOBOX IDC_PLACEMENT_COMBO, 188, 139, 55, 54, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + PUSHBUTTON "Customize &Desktop...", IDC_DESKTOP_CUSTOM, 8, 194, 90, 15 END IDD_SCREENSAVER DIALOGEX 0, 0, 246, 216 @@ -156,6 +157,27 @@ BEGIN PUSHBUTTON "&Avançadas...", IDC_SETTINGS_ADVANCED, 170, 199, 70, 15 END +IDD_DESKTOP_GENERAL DIALOGEX 0, 0, 224, 202 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "General" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "Desktop icons", IDC_STATIC, 6, 4, 212, 40 + CONTROL "My &Documents", IDC_ICONS_MYDOCS, "button", + BS_AUTOCHECKBOX | WS_TABSTOP, 14, 14, 100, 12 + CONTROL "My &Network Places", IDC_ICONS_MYNET, "button", + BS_AUTOCHECKBOX | WS_TABSTOP, 116, 14, 100, 12 + CONTROL "&My Computer", IDC_ICONS_MYCOMP, "button", + BS_AUTOCHECKBOX | WS_TABSTOP, 14, 28, 100, 12 + CONTROL "&Internet Browser", IDC_ICONS_INTERNET, "button", + BS_AUTOCHECKBOX | WS_TABSTOP, 116, 28, 100, 12 + CONTROL "", IDC_ICONS_LISTVIEW, "SysListView32", + LVS_ICON | LVS_ALIGNLEFT | LVS_AUTOARRANGE | LVS_SINGLESEL | WS_BORDER | WS_TABSTOP | WS_HSCROLL, + 6, 60, 212, 54 + PUSHBUTTON "C&hange Icon...", IDC_ICONS_CHANGEICON, 86, 120, 64, 15 + PUSHBUTTON "Re&store Default", IDC_ICONS_SETDEFAULT, 154, 120, 64, 15 +END + IDD_ADVANCED_GENERAL DIALOGEX 0, 0, 253, 204 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Geral" @@ -215,6 +237,11 @@ BEGIN IDS_CLEARTYPEEFFECT "FreeType Antialiased" END +STRINGTABLE +BEGIN + IDS_DESKTOP_ITEMS "Desktop Items" +END + STRINGTABLE BEGIN IDS_MULTIPLEMONITORS "(Multiplos monitores)" diff --git a/dll/cpl/desk/lang/ro-RO.rc b/dll/cpl/desk/lang/ro-RO.rc index 6e760eea95a..1ea25523657 100644 --- a/dll/cpl/desk/lang/ro-RO.rc +++ b/dll/cpl/desk/lang/ro-RO.rc @@ -35,6 +35,7 @@ BEGIN PUSHBUTTON "C&uloare…", IDC_COLOR_BUTTON, 188, 167, 55, 15 LTEXT "Amplasament", IDC_STATIC, 188, 128, 55, 9 COMBOBOX IDC_PLACEMENT_COMBO, 188, 139, 55, 54, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + PUSHBUTTON "Customize &Desktop...", IDC_DESKTOP_CUSTOM, 8, 194, 90, 15 END IDD_SCREENSAVER DIALOGEX 0, 0, 246, 202 @@ -160,6 +161,27 @@ BEGIN PUSHBUTTON "A&vansate…", IDC_SETTINGS_ADVANCED, 170, 174, 70, 15 END +IDD_DESKTOP_GENERAL DIALOGEX 0, 0, 224, 202 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "General" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "Desktop icons", IDC_STATIC, 6, 4, 212, 40 + CONTROL "My &Documents", IDC_ICONS_MYDOCS, "button", + BS_AUTOCHECKBOX | WS_TABSTOP, 14, 14, 100, 12 + CONTROL "My &Network Places", IDC_ICONS_MYNET, "button", + BS_AUTOCHECKBOX | WS_TABSTOP, 116, 14, 100, 12 + CONTROL "&My Computer", IDC_ICONS_MYCOMP, "button", + BS_AUTOCHECKBOX | WS_TABSTOP, 14, 28, 100, 12 + CONTROL "&Internet Browser", IDC_ICONS_INTERNET, "button", + BS_AUTOCHECKBOX | WS_TABSTOP, 116, 28, 100, 12 + CONTROL "", IDC_ICONS_LISTVIEW, "SysListView32", + LVS_ICON | LVS_ALIGNLEFT | LVS_AUTOARRANGE | LVS_SINGLESEL | WS_BORDER | WS_TABSTOP | WS_HSCROLL, + 6, 60, 212, 54 + PUSHBUTTON "C&hange Icon...", IDC_ICONS_CHANGEICON, 86, 120, 64, 15 + PUSHBUTTON "Re&store Default", IDC_ICONS_SETDEFAULT, 154, 120, 64, 15 +END + IDD_ADVANCED_GENERAL DIALOGEX 0, 0, 253, 204 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Generale" @@ -218,6 +240,11 @@ BEGIN IDS_CLEARTYPEEFFECT "FreeType Antialiased" END +STRINGTABLE +BEGIN + IDS_DESKTOP_ITEMS "Desktop Items" +END + STRINGTABLE BEGIN IDS_MULTIPLEMONITORS "(ecrane multiple)" diff --git a/dll/cpl/desk/lang/ru-RU.rc b/dll/cpl/desk/lang/ru-RU.rc index afe0555ac7f..297c7af6968 100644 --- a/dll/cpl/desk/lang/ru-RU.rc +++ b/dll/cpl/desk/lang/ru-RU.rc @@ -26,6 +26,7 @@ BEGIN PUSHBUTTON "&Цвет...", IDC_COLOR_BUTTON, 188, 167, 55, 15 LTEXT "Расположение", IDC_STATIC, 188, 128, 55, 9 COMBOBOX IDC_PLACEMENT_COMBO, 188, 139, 55, 54, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + PUSHBUTTON "&Настройка рабочего стола...", IDC_DESKTOP_CUSTOM, 8, 194, 116, 15 END IDD_SCREENSAVER DIALOGEX 0, 0, 246, 202 @@ -151,6 +152,27 @@ BEGIN PUSHBUTTON "До&полнительно", IDC_SETTINGS_ADVANCED, 170, 174, 70, 15 END +IDD_DESKTOP_GENERAL DIALOGEX 0, 0, 224, 202 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Общие" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "Значки рабочего стола", IDC_STATIC, 6, 4, 212, 40 + CONTROL "Мои &документы", IDC_ICONS_MYDOCS, "button", + BS_AUTOCHECKBOX | WS_TABSTOP, 14, 14, 100, 12 + CONTROL "&Сетевое окружение", IDC_ICONS_MYNET, "button", + BS_AUTOCHECKBOX | WS_TABSTOP, 116, 14, 100, 12 + CONTROL "Мой &компьютер", IDC_ICONS_MYCOMP, "button", + BS_AUTOCHECKBOX | WS_TABSTOP, 14, 28, 100, 12 + CONTROL "&Интернет браузер", IDC_ICONS_INTERNET, "button", + BS_AUTOCHECKBOX | WS_TABSTOP, 116, 28, 100, 12 + CONTROL "", IDC_ICONS_LISTVIEW, "SysListView32", + LVS_ICON | LVS_ALIGNLEFT | LVS_AUTOARRANGE | LVS_SINGLESEL | WS_BORDER | WS_TABSTOP | WS_HSCROLL, + 6, 60, 212, 54 + PUSHBUTTON "С&менить значок...", IDC_ICONS_CHANGEICON, 74, 120, 70, 15 + PUSHBUTTON "&Обычный значок", IDC_ICONS_SETDEFAULT, 148, 120, 70, 15 +END + IDD_ADVANCED_GENERAL DIALOGEX 0, 0, 253, 204 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Общие" @@ -209,6 +231,11 @@ BEGIN IDS_CLEARTYPEEFFECT "FreeType Сглаживание" END +STRINGTABLE +BEGIN + IDS_DESKTOP_ITEMS "Элементы рабочего стола" +END + STRINGTABLE BEGIN IDS_MULTIPLEMONITORS "(несколько экранов)" diff --git a/dll/cpl/desk/lang/sk-SK.rc b/dll/cpl/desk/lang/sk-SK.rc index ce7e673f425..c2690e1fd71 100644 --- a/dll/cpl/desk/lang/sk-SK.rc +++ b/dll/cpl/desk/lang/sk-SK.rc @@ -28,6 +28,7 @@ BEGIN PUSHBUTTON "&Farba...", IDC_COLOR_BUTTON, 188, 167, 55, 15 LTEXT "&Umiestnenie", IDC_STATIC, 188, 128, 55, 9 COMBOBOX IDC_PLACEMENT_COMBO, 188, 139, 55, 54, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + PUSHBUTTON "Customize &Desktop...", IDC_DESKTOP_CUSTOM, 8, 194, 90, 15 END IDD_SCREENSAVER DIALOGEX 0, 0, 246, 202 @@ -153,6 +154,27 @@ BEGIN PUSHBUTTON "&Spresniť...", IDC_SETTINGS_ADVANCED, 170, 174, 70, 15 END +IDD_DESKTOP_GENERAL DIALOGEX 0, 0, 224, 202 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "General" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "Desktop icons", IDC_STATIC, 6, 4, 212, 40 + CONTROL "My &Documents", IDC_ICONS_MYDOCS, "button", + BS_AUTOCHECKBOX | WS_TABSTOP, 14, 14, 100, 12 + CONTROL "My &Network Places", IDC_ICONS_MYNET, "button", + BS_AUTOCHECKBOX | WS_TABSTOP, 116, 14, 100, 12 + CONTROL "&My Computer", IDC_ICONS_MYCOMP, "button", + BS_AUTOCHECKBOX | WS_TABSTOP, 14, 28, 100, 12 + CONTROL "&Internet Browser", IDC_ICONS_INTERNET, "button", + BS_AUTOCHECKBOX | WS_TABSTOP, 116, 28, 100, 12 + CONTROL "", IDC_ICONS_LISTVIEW, "SysListView32", + LVS_ICON | LVS_ALIGNLEFT | LVS_AUTOARRANGE | LVS_SINGLESEL | WS_BORDER | WS_TABSTOP | WS_HSCROLL, + 6, 60, 212, 54 + PUSHBUTTON "C&hange Icon...", IDC_ICONS_CHANGEICON, 86, 120, 64, 15 + PUSHBUTTON "Re&store Default", IDC_ICONS_SETDEFAULT, 154, 120, 64, 15 +END + IDD_ADVANCED_GENERAL DIALOGEX 0, 0, 253, 204 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Všeobecné" @@ -211,6 +233,11 @@ BEGIN IDS_CLEARTYPEEFFECT "FreeType Antialiased" END +STRINGTABLE +BEGIN + IDS_DESKTOP_ITEMS "Desktop Items" +END + STRINGTABLE BEGIN IDS_MULTIPLEMONITORS "(Viacero monitorov)" diff --git a/dll/cpl/desk/lang/sq-AL.rc b/dll/cpl/desk/lang/sq-AL.rc index 5722554caab..5fb89c884c7 100644 --- a/dll/cpl/desk/lang/sq-AL.rc +++ b/dll/cpl/desk/lang/sq-AL.rc @@ -30,6 +30,7 @@ BEGIN PUSHBUTTON "&Ngjyra...", IDC_COLOR_BUTTON, 188, 167, 55, 15 LTEXT "Vendosje", IDC_STATIC, 188, 128, 55, 9 COMBOBOX IDC_PLACEMENT_COMBO, 188, 139, 55, 54, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + PUSHBUTTON "Customize &Desktop...", IDC_DESKTOP_CUSTOM, 8, 194, 90, 15 END IDD_SCREENSAVER DIALOGEX 0, 0, 246, 202 @@ -155,6 +156,27 @@ BEGIN PUSHBUTTON "Përparuar...", IDC_SETTINGS_ADVANCED, 170, 174, 70, 15 END +IDD_DESKTOP_GENERAL DIALOGEX 0, 0, 224, 202 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "General" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "Desktop icons", IDC_STATIC, 6, 4, 212, 40 + CONTROL "My &Documents", IDC_ICONS_MYDOCS, "button", + BS_AUTOCHECKBOX | WS_TABSTOP, 14, 14, 100, 12 + CONTROL "My &Network Places", IDC_ICONS_MYNET, "button", + BS_AUTOCHECKBOX | WS_TABSTOP, 116, 14, 100, 12 + CONTROL "&My Computer", IDC_ICONS_MYCOMP, "button", + BS_AUTOCHECKBOX | WS_TABSTOP, 14, 28, 100, 12 + CONTROL "&Internet Browser", IDC_ICONS_INTERNET, "button", + BS_AUTOCHECKBOX | WS_TABSTOP, 116, 28, 100, 12 + CONTROL "", IDC_ICONS_LISTVIEW, "SysListView32", + LVS_ICON | LVS_ALIGNLEFT | LVS_AUTOARRANGE | LVS_SINGLESEL | WS_BORDER | WS_TABSTOP | WS_HSCROLL, + 6, 60, 212, 54 + PUSHBUTTON "C&hange Icon...", IDC_ICONS_CHANGEICON, 86, 120, 64, 15 + PUSHBUTTON "Re&store Default", IDC_ICONS_SETDEFAULT, 154, 120, 64, 15 +END + IDD_ADVANCED_GENERAL DIALOGEX 0, 0, 253, 204 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Përgjithshëm" @@ -213,6 +235,11 @@ BEGIN IDS_CLEARTYPEEFFECT "FreeType Antialiased" END +STRINGTABLE +BEGIN + IDS_DESKTOP_ITEMS "Desktop Items" +END + STRINGTABLE BEGIN IDS_MULTIPLEMONITORS "(Multiple Monitors)" diff --git a/dll/cpl/desk/lang/sv-SE.rc b/dll/cpl/desk/lang/sv-SE.rc index 2533296827e..04162a6bf3d 100644 --- a/dll/cpl/desk/lang/sv-SE.rc +++ b/dll/cpl/desk/lang/sv-SE.rc @@ -28,6 +28,7 @@ BEGIN PUSHBUTTON "&Färg...", IDC_COLOR_BUTTON, 188, 167, 55, 15 LTEXT "Placering", IDC_STATIC, 188, 128, 55, 9 COMBOBOX IDC_PLACEMENT_COMBO, 188, 139, 55, 54, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + PUSHBUTTON "Customize &Desktop...", IDC_DESKTOP_CUSTOM, 8, 194, 90, 15 END IDD_SCREENSAVER DIALOGEX 0, 0, 246, 202 @@ -153,6 +154,27 @@ BEGIN PUSHBUTTON "&Avancerat...", IDC_SETTINGS_ADVANCED, 170, 174, 70, 15 END +IDD_DESKTOP_GENERAL DIALOGEX 0, 0, 224, 202 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "General" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "Desktop icons", IDC_STATIC, 6, 4, 212, 40 + CONTROL "My &Documents", IDC_ICONS_MYDOCS, "button", + BS_AUTOCHECKBOX | WS_TABSTOP, 14, 14, 100, 12 + CONTROL "My &Network Places", IDC_ICONS_MYNET, "button", + BS_AUTOCHECKBOX | WS_TABSTOP, 116, 14, 100, 12 + CONTROL "&My Computer", IDC_ICONS_MYCOMP, "button", + BS_AUTOCHECKBOX | WS_TABSTOP, 14, 28, 100, 12 + CONTROL "&Internet Browser", IDC_ICONS_INTERNET, "button", + BS_AUTOCHECKBOX | WS_TABSTOP, 116, 28, 100, 12 + CONTROL "", IDC_ICONS_LISTVIEW, "SysListView32", + LVS_ICON | LVS_ALIGNLEFT | LVS_AUTOARRANGE | LVS_SINGLESEL | WS_BORDER | WS_TABSTOP | WS_HSCROLL, + 6, 60, 212, 54 + PUSHBUTTON "C&hange Icon...", IDC_ICONS_CHANGEICON, 86, 120, 64, 15 + PUSHBUTTON "Re&store Default", IDC_ICONS_SETDEFAULT, 154, 120, 64, 15 +END + IDD_ADVANCED_GENERAL DIALOGEX 0, 0, 253, 204 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "General" @@ -211,6 +233,11 @@ BEGIN IDS_CLEARTYPEEFFECT "FreeType Antialiased" END +STRINGTABLE +BEGIN + IDS_DESKTOP_ITEMS "Desktop Items" +END + STRINGTABLE BEGIN IDS_MULTIPLEMONITORS "(Multiple Monitors)" diff --git a/dll/cpl/desk/lang/tr-TR.rc b/dll/cpl/desk/lang/tr-TR.rc index 759472c8f13..fae981f4e41 100644 --- a/dll/cpl/desk/lang/tr-TR.rc +++ b/dll/cpl/desk/lang/tr-TR.rc @@ -28,6 +28,7 @@ BEGIN PUSHBUTTON "&Renk...", IDC_COLOR_BUTTON, 188, 167, 55, 15 LTEXT "&Yerleşim:", IDC_STATIC, 188, 128, 55, 9 COMBOBOX IDC_PLACEMENT_COMBO, 188, 139, 55, 54, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + PUSHBUTTON "Customize &Desktop...", IDC_DESKTOP_CUSTOM, 8, 194, 90, 15 END IDD_SCREENSAVER DIALOGEX 0, 0, 246, 202 @@ -153,6 +154,27 @@ BEGIN PUSHBUTTON "&Gelişmiş...", IDC_SETTINGS_ADVANCED, 170, 174, 70, 15 END +IDD_DESKTOP_GENERAL DIALOGEX 0, 0, 224, 202 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "General" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "Desktop icons", IDC_STATIC, 6, 4, 212, 40 + CONTROL "My &Documents", IDC_ICONS_MYDOCS, "button", + BS_AUTOCHECKBOX | WS_TABSTOP, 14, 14, 100, 12 + CONTROL "My &Network Places", IDC_ICONS_MYNET, "button", + BS_AUTOCHECKBOX | WS_TABSTOP, 116, 14, 100, 12 + CONTROL "&My Computer", IDC_ICONS_MYCOMP, "button", + BS_AUTOCHECKBOX | WS_TABSTOP, 14, 28, 100, 12 + CONTROL "&Internet Browser", IDC_ICONS_INTERNET, "button", + BS_AUTOCHECKBOX | WS_TABSTOP, 116, 28, 100, 12 + CONTROL "", IDC_ICONS_LISTVIEW, "SysListView32", + LVS_ICON | LVS_ALIGNLEFT | LVS_AUTOARRANGE | LVS_SINGLESEL | WS_BORDER | WS_TABSTOP | WS_HSCROLL, + 6, 60, 212, 54 + PUSHBUTTON "C&hange Icon...", IDC_ICONS_CHANGEICON, 86, 120, 64, 15 + PUSHBUTTON "Re&store Default", IDC_ICONS_SETDEFAULT, 154, 120, 64, 15 +END + IDD_ADVANCED_GENERAL DIALOGEX 0, 0, 253, 204 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Genel" @@ -211,6 +233,11 @@ BEGIN IDS_CLEARTYPEEFFECT "FreeType Örtüşme Önlemesi" END +STRINGTABLE +BEGIN + IDS_DESKTOP_ITEMS "Desktop Items" +END + STRINGTABLE BEGIN IDS_MULTIPLEMONITORS "(Çoklu Monitör)" diff --git a/dll/cpl/desk/lang/uk-UA.rc b/dll/cpl/desk/lang/uk-UA.rc index 4343a9ad45d..f06aaf57b14 100644 --- a/dll/cpl/desk/lang/uk-UA.rc +++ b/dll/cpl/desk/lang/uk-UA.rc @@ -34,6 +34,7 @@ BEGIN PUSHBUTTON "&Колір...", IDC_COLOR_BUTTON, 188, 167, 55, 15 LTEXT "Розташування", IDC_STATIC, 188, 128, 55, 9 COMBOBOX IDC_PLACEMENT_COMBO, 188, 139, 55, 54, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + PUSHBUTTON "Customize &Desktop...", IDC_DESKTOP_CUSTOM, 8, 194, 90, 15 END IDD_SCREENSAVER DIALOGEX 0, 0, 246, 202 @@ -159,6 +160,27 @@ BEGIN PUSHBUTTON "Дод&атково...", IDC_SETTINGS_ADVANCED, 170, 174, 70, 15 END +IDD_DESKTOP_GENERAL DIALOGEX 0, 0, 224, 202 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "General" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "Desktop icons", IDC_STATIC, 6, 4, 212, 40 + CONTROL "My &Documents", IDC_ICONS_MYDOCS, "button", + BS_AUTOCHECKBOX | WS_TABSTOP, 14, 14, 100, 12 + CONTROL "My &Network Places", IDC_ICONS_MYNET, "button", + BS_AUTOCHECKBOX | WS_TABSTOP, 116, 14, 100, 12 + CONTROL "&My Computer", IDC_ICONS_MYCOMP, "button", + BS_AUTOCHECKBOX | WS_TABSTOP, 14, 28, 100, 12 + CONTROL "&Internet Browser", IDC_ICONS_INTERNET, "button", + BS_AUTOCHECKBOX | WS_TABSTOP, 116, 28, 100, 12 + CONTROL "", IDC_ICONS_LISTVIEW, "SysListView32", + LVS_ICON | LVS_ALIGNLEFT | LVS_AUTOARRANGE | LVS_SINGLESEL | WS_BORDER | WS_TABSTOP | WS_HSCROLL, + 6, 60, 212, 54 + PUSHBUTTON "C&hange Icon...", IDC_ICONS_CHANGEICON, 86, 120, 64, 15 + PUSHBUTTON "Re&store Default", IDC_ICONS_SETDEFAULT, 154, 120, 64, 15 +END + IDD_ADVANCED_GENERAL DIALOGEX 0, 0, 253, 204 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Загальні" @@ -217,6 +239,11 @@ BEGIN IDS_CLEARTYPEEFFECT "FreeType Antialiased" END +STRINGTABLE +BEGIN + IDS_DESKTOP_ITEMS "Desktop Items" +END + STRINGTABLE BEGIN IDS_MULTIPLEMONITORS "(Декілька моніторів)" diff --git a/dll/cpl/desk/lang/zh-CN.rc b/dll/cpl/desk/lang/zh-CN.rc index df8d1e8ab74..7263f939c24 100644 --- a/dll/cpl/desk/lang/zh-CN.rc +++ b/dll/cpl/desk/lang/zh-CN.rc @@ -36,6 +36,7 @@ BEGIN PUSHBUTTON "颜色(&C)...", IDC_COLOR_BUTTON, 188, 167, 55, 15 LTEXT "位置：", IDC_STATIC, 188, 128, 55, 9 COMBOBOX IDC_PLACEMENT_COMBO, 188, 139, 55, 54, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + PUSHBUTTON "Customize &Desktop...", IDC_DESKTOP_CUSTOM, 8, 194, 90, 15 END IDD_SCREENSAVER DIALOGEX 0, 0, 246, 202 @@ -161,6 +162,27 @@ BEGIN PUSHBUTTON "高级(&V)...", IDC_SETTINGS_ADVANCED, 170, 174, 70, 15 END +IDD_DESKTOP_GENERAL DIALOGEX 0, 0, 224, 202 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "General" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "Desktop icons", IDC_STATIC, 6, 4, 212, 40 + CONTROL "My &Documents", IDC_ICONS_MYDOCS, "button", + BS_AUTOCHECKBOX | WS_TABSTOP, 14, 14, 100, 12 + CONTROL "My &Network Places", IDC_ICONS_MYNET, "button", + BS_AUTOCHECKBOX | WS_TABSTOP, 116, 14, 100, 12 + CONTROL "&My Computer", IDC_ICONS_MYCOMP, "button", + BS_AUTOCHECKBOX | WS_TABSTOP, 14, 28, 100, 12 + CONTROL "&Internet Browser", IDC_ICONS_INTERNET, "button", + BS_AUTOCHECKBOX | WS_TABSTOP, 116, 28, 100, 12 + CONTROL "", IDC_ICONS_LISTVIEW, "SysListView32", + LVS_ICON | LVS_ALIGNLEFT | LVS_AUTOARRANGE | LVS_SINGLESEL | WS_BORDER | WS_TABSTOP | WS_HSCROLL, + 6, 60, 212, 54 + PUSHBUTTON "C&hange Icon...", IDC_ICONS_CHANGEICON, 86, 120, 64, 15 + PUSHBUTTON "Re&store Default", IDC_ICONS_SETDEFAULT, 154, 120, 64, 15 +END + IDD_ADVANCED_GENERAL DIALOGEX 0, 0, 253, 204 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "常规" @@ -219,6 +241,11 @@ BEGIN IDS_CLEARTYPEEFFECT "FreeType 反锯齿" END +STRINGTABLE +BEGIN + IDS_DESKTOP_ITEMS "Desktop Items" +END + STRINGTABLE BEGIN IDS_MULTIPLEMONITORS "（多监视器）" diff --git a/dll/cpl/desk/lang/zh-HK.rc b/dll/cpl/desk/lang/zh-HK.rc index 62fa240f8c1..2b303b993a7 100644 --- a/dll/cpl/desk/lang/zh-HK.rc +++ b/dll/cpl/desk/lang/zh-HK.rc @@ -34,6 +34,7 @@ BEGIN PUSHBUTTON "顏色(&C)...", IDC_COLOR_BUTTON, 188, 167, 55, 15 LTEXT "位置：", IDC_STATIC, 188, 128, 55, 9 COMBOBOX IDC_PLACEMENT_COMBO, 188, 139, 55, 54, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + PUSHBUTTON "Customize &Desktop...", IDC_DESKTOP_CUSTOM, 8, 194, 90, 15 END IDD_SCREENSAVER DIALOGEX 0, 0, 246, 202 @@ -159,6 +160,27 @@ BEGIN PUSHBUTTON "進階(&V)...", IDC_SETTINGS_ADVANCED, 170, 174, 70, 15 END +IDD_DESKTOP_GENERAL DIALOGEX 0, 0, 224, 202 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "General" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "Desktop icons", IDC_STATIC, 6, 4, 212, 40 + CONTROL "My &Documents", IDC_ICONS_MYDOCS, "button", + BS_AUTOCHECKBOX | WS_TABSTOP, 14, 14, 100, 12 + CONTROL "My &Network Places", IDC_ICONS_MYNET, "button", + BS_AUTOCHECKBOX | WS_TABSTOP, 116, 14, 100, 12 + CONTROL "&My Computer", IDC_ICONS_MYCOMP, "button", + BS_AUTOCHECKBOX | WS_TABSTOP, 14, 28, 100, 12 + CONTROL "&Internet Browser", IDC_ICONS_INTERNET, "button", + BS_AUTOCHECKBOX | WS_TABSTOP, 116, 28, 100, 12 + CONTROL "", IDC_ICONS_LISTVIEW, "SysListView32", + LVS_ICON | LVS_ALIGNLEFT | LVS_AUTOARRANGE | LVS_SINGLESEL | WS_BORDER | WS_TABSTOP | WS_HSCROLL, + 6, 60, 212, 54 + PUSHBUTTON "C&hange Icon...", IDC_ICONS_CHANGEICON, 86, 120, 64, 15 + PUSHBUTTON "Re&store Default", IDC_ICONS_SETDEFAULT, 154, 120, 64, 15 +END + IDD_ADVANCED_GENERAL DIALOGEX 0, 0, 253, 204 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "一般" @@ -217,6 +239,11 @@ BEGIN IDS_CLEARTYPEEFFECT "FreeType 消除鋸齒" END +STRINGTABLE +BEGIN + IDS_DESKTOP_ITEMS "Desktop Items" +END + STRINGTABLE BEGIN IDS_MULTIPLEMONITORS "（多顯示器）" diff --git a/dll/cpl/desk/lang/zh-TW.rc b/dll/cpl/desk/lang/zh-TW.rc index 8f08fefd871..eeab9320238 100644 --- a/dll/cpl/desk/lang/zh-TW.rc +++ b/dll/cpl/desk/lang/zh-TW.rc @@ -35,6 +35,7 @@ BEGIN PUSHBUTTON "顏色(&C)...", IDC_COLOR_BUTTON, 188, 167, 55, 15 LTEXT "位置：", IDC_STATIC, 188, 128, 55, 9 COMBOBOX IDC_PLACEMENT_COMBO, 188, 139, 55, 54, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + PUSHBUTTON "Customize &Desktop...", IDC_DESKTOP_CUSTOM, 8, 194, 90, 15 END IDD_SCREENSAVER DIALOGEX 0, 0, 246, 202 @@ -160,6 +161,27 @@ BEGIN PUSHBUTTON "進階(&V)...", IDC_SETTINGS_ADVANCED, 170, 174, 70, 15 END +IDD_DESKTOP_GENERAL DIALOGEX 0, 0, 224, 202 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "General" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "Desktop icons", IDC_STATIC, 6, 4, 212, 40 + CONTROL "My &Documents", IDC_ICONS_MYDOCS, "button", + BS_AUTOCHECKBOX | WS_TABSTOP, 14, 14, 100, 12 + CONTROL "My &Network Places", IDC_ICONS_MYNET, "button", + BS_AUTOCHECKBOX | WS_TABSTOP, 116, 14, 100, 12 + CONTROL "&My Computer", IDC_ICONS_MYCOMP, "button", + BS_AUTOCHECKBOX | WS_TABSTOP, 14, 28, 100, 12 + CONTROL "&Internet Browser", IDC_ICONS_INTERNET, "button", + BS_AUTOCHECKBOX | WS_TABSTOP, 116, 28, 100, 12 + CONTROL "", IDC_ICONS_LISTVIEW, "SysListView32", + LVS_ICON | LVS_ALIGNLEFT | LVS_AUTOARRANGE | LVS_SINGLESEL | WS_BORDER | WS_TABSTOP | WS_HSCROLL, + 6, 60, 212, 54 + PUSHBUTTON "C&hange Icon...", IDC_ICONS_CHANGEICON, 86, 120, 64, 15 + PUSHBUTTON "Re&store Default", IDC_ICONS_SETDEFAULT, 154, 120, 64, 15 +END + IDD_ADVANCED_GENERAL DIALOGEX 0, 0, 253, 204 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "一般" @@ -218,6 +240,11 @@ BEGIN IDS_CLEARTYPEEFFECT "FreeType 消除鋸齒" END +STRINGTABLE +BEGIN + IDS_DESKTOP_ITEMS "Desktop Items" +END + STRINGTABLE BEGIN IDS_MULTIPLEMONITORS "（多顯示器）" diff --git a/dll/cpl/desk/resource.h b/dll/cpl/desk/resource.h index 7d9ed465b76..503077fe8e1 100644 --- a/dll/cpl/desk/resource.h +++ b/dll/cpl/desk/resource.h @@ -14,6 +14,7 @@ #define IDD_ADVAPPEARANCE 104 #define IDD_EFFAPPEARANCE 105 #define IDD_THEMES 106 +#define IDD_DESKTOP_GENERAL 107 #define IDD_ADVANCED_GENERAL 200 #define IDD_CONFIRMSETTINGS 201 @@ -32,6 +33,7 @@ #define IDC_PLACEMENT_COMBO 1005 #define IDS_BACKGROUND_COMDLG_FILTER 1006 #define IDC_RESOLUTION_PREVIEW 1007 +#define IDC_DESKTOP_CUSTOM 1008 /* Screensaver Page */ #define IDC_SCREENS_PREVIEW 1010 @@ -178,6 +180,16 @@ #define IDS_STANDARDEFFECT 3711 #define IDS_CLEARTYPEEFFECT 3712 +/* Desktop Items Dialog */ +#define IDS_DESKTOP_ITEMS 3900 +#define IDC_ICONS_MYDOCS 3901 +#define IDC_ICONS_MYNET 3902 +#define IDC_ICONS_MYCOMP 3903 +#define IDC_ICONS_INTERNET 3904 +#define IDC_ICONS_LISTVIEW 3905 +#define IDC_ICONS_CHANGEICON 3906 +#define IDC_ICONS_SETDEFAULT 3907 + /* Advanced General Dialog */ #define IDC_FONTSIZE_COMBO 5000 #define IDC_FONTSIZE_CUSTOM 5001

2 years, 2 months

[reactos] 01/02: [PSDK] Add some missing Shell State Flags to shlobj.h

by Stanislav Motylkov

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=3188f93fd46858a356f35… commit 3188f93fd46858a356f357f97913d388db53ed9f Author: Stanislav Motylkov <x86corez(a)gmail.com> AuthorDate: Fri Oct 7 04:18:28 2022 +0300 Commit: Stanislav Motylkov <x86corez(a)gmail.com> CommitDate: Mon Oct 10 18:30:24 2022 +0300 [PSDK] Add some missing Shell State Flags to shlobj.h See https://docs.microsoft.com/en-us/windows/win32/shell/ssf-constants CORE-8427 --- sdk/include/psdk/shlobj.h | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/sdk/include/psdk/shlobj.h b/sdk/include/psdk/shlobj.h index 2fe6cf1d047..26745ce3390 100644 --- a/sdk/include/psdk/shlobj.h +++ b/sdk/include/psdk/shlobj.h @@ -1539,6 +1539,19 @@ VOID WINAPI SHGetSettings(_Out_ LPSHELLFLAGSTATE lpsfs, DWORD dwMask); #define SSF_HIDEICONS 0x4000 #define SSF_SHOWSUPERHIDDEN 0x00040000 #define SSF_SEPPROCESS 0x00080000 +#if (NTDDI_VERSION >= NTDDI_WINXP) +#define SSF_NONETCRAWLING 0x00100000 +#define SSF_STARTPANELON 0x00200000 +#define SSF_SHOWSTARTPAGE 0x00400000 +#endif +#if (NTDDI_VERSION >= NTDDI_VISTA) +#define SSF_AUTOCHECKSELECT 0x00800000 +#define SSF_ICONSONLY 0x01000000 +#define SSF_SHOWTYPEOVERLAY 0x02000000 +#endif +#if (NTDDI_VERSION >= NTDDI_WIN8) +#define SSF_SHOWSTATUSBAR 0x04000000 +#endif /**************************************************************************** * SHRestricted API

2 years, 2 months

[reactos] 02/02: [ZLIB] Restore 'uncrypt' functionality in minizip (using #ifdef REACTOS)

by Peter Meerwald-Stadler

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=6bf909d66a102b2d96951… commit 6bf909d66a102b2d969511b507da928d5876b9c1 Author: Peter Meerwald-Stadler <pmeerw(a)pmeerw.net> AuthorDate: Wed Oct 5 13:38:54 2022 +0200 Commit: Thomas Faber <thomas.faber(a)reactos.org> CommitDate: Mon Oct 10 11:03:55 2022 -0400 [ZLIB] Restore 'uncrypt' functionality in minizip (using #ifdef REACTOS) CORE-18339 --- sdk/lib/3rdparty/zlib/contrib/minizip/unzip.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sdk/lib/3rdparty/zlib/contrib/minizip/unzip.c b/sdk/lib/3rdparty/zlib/contrib/minizip/unzip.c index c8159a2fb0c..8434ac91893 100644 --- a/sdk/lib/3rdparty/zlib/contrib/minizip/unzip.c +++ b/sdk/lib/3rdparty/zlib/contrib/minizip/unzip.c @@ -68,9 +68,11 @@ #include <stdlib.h> #include <string.h> +#ifndef __REACTOS__ #ifndef NOUNCRYPT #define NOUNCRYPT #endif +#endif #include "zlib.h" #include "unzip.h"

2 years, 2 months

← Newer
1
...
9
10
11
12
13
14
15
16
17
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 October 2022