Author: cfinck Date: Tue Jun 10 14:19:59 2008 New Revision: 33919
URL: http://svn.reactos.org/svn/reactos?rev=33919&view=rev Log: Matthias Kupfer (matthias DOT kupfer AT informatik DOT tu-chemnitz DOT de) - Give the Run Dialog resources a default title (only done in German and English resources so far, others still need to be done) - Add support for passing no title to RunFileDlg, so that it uses the default title - Pass no hardcoded english title in Explorer and Task-Manager. I slightly modified the patch to also remove the other hardcoded text passed in Explorer.
See issue #3340 for more details.
Modified: trunk/reactos/base/applications/taskmgr/run.c trunk/reactos/base/shell/explorer/taskbar/startmenu.cpp trunk/reactos/dll/win32/shell32/dialogs.c trunk/reactos/dll/win32/shell32/lang/de-DE.rc trunk/reactos/dll/win32/shell32/lang/en-GB.rc trunk/reactos/dll/win32/shell32/lang/en-US.rc
Modified: trunk/reactos/base/applications/taskmgr/run.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/r... ============================================================================== --- trunk/reactos/base/applications/taskmgr/run.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/taskmgr/run.c [iso-8859-1] Tue Jun 10 14:19:59 2008 @@ -43,7 +43,7 @@ { /* NOTE - don't check whether running on win 9x or NT, let's just assume that a unicode build only runs on NT */ - RunFileDlg(hMainWnd, 0, NULL, szTitle, szText, RFF_CALCDIRECTORY); + RunFileDlg(hMainWnd, 0, NULL, NULL, szText, RFF_CALCDIRECTORY); }
FreeLibrary(hShell32);
Modified: trunk/reactos/base/shell/explorer/taskbar/startmenu.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/taskbar... ============================================================================== --- trunk/reactos/base/shell/explorer/taskbar/startmenu.cpp [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer/taskbar/startmenu.cpp [iso-8859-1] Tue Jun 10 14:19:59 2008 @@ -2113,26 +2113,11 @@
void StartMenuHandler::ShowLaunchDialog(HWND hwndOwner) { - ///@todo All text phrases should be put into the resources. - static LPCSTR szTitle = "Run"; - static LPCSTR szText = "Type the name of a program, folder, document, or Internet resource, and Explorer will open it for you."; - static DynamicFct<RUNFILEDLG> RunFileDlg(TEXT("SHELL32"), 61);
// Show "Run..." dialog if (RunFileDlg) { -#ifndef _ROS_ /* FIXME: our shell32 always expects Ansi strings */ - if ((HIWORD(GetVersion())>>14) == W_VER_NT) { - WCHAR wTitle[40], wText[256]; - - MultiByteToWideChar(CP_ACP, 0, szTitle, -1, wTitle, 40); - MultiByteToWideChar(CP_ACP, 0, szText, -1, wText, 256); - - (*RunFileDlg)(hwndOwner, 0, NULL, (LPCSTR)wTitle, (LPCSTR)wText, RFF_CALCDIRECTORY); - } - else -#endif - (*RunFileDlg)(hwndOwner, 0, NULL, szTitle, szText, RFF_CALCDIRECTORY); + (*RunFileDlg)(hwndOwner, 0, NULL, NULL, NULL, RFF_CALCDIRECTORY); } }
Modified: trunk/reactos/dll/win32/shell32/dialogs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/dialogs.c... ============================================================================== --- trunk/reactos/dll/win32/shell32/dialogs.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/dialogs.c [iso-8859-1] Tue Jun 10 14:19:59 2008 @@ -330,7 +330,10 @@ { case WM_INITDIALOG : prfdp = (RUNFILEDLGPARAMS *)lParam ; - SetWindowTextA (hwnd, prfdp->lpstrTitle) ; + + if (prfdp->lpstrTitle) + SetWindowTextA (hwnd, prfdp->lpstrTitle) ; + SetClassLongPtrW (hwnd, GCLP_HICON, (LPARAM)prfdp->hIcon) ; SendMessageW (GetDlgItem (hwnd, 12297), STM_SETICON, (WPARAM)LoadIconW (NULL, (LPCWSTR)IDI_WINLOGO), 0);
Modified: trunk/reactos/dll/win32/shell32/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/de-D... ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/de-DE.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/de-DE.rc [iso-8859-1] Tue Jun 10 14:19:59 2008 @@ -151,7 +151,7 @@
SHELL_RUN_DLG DIALOGEX LOADONCALL MOVEABLE DISCARDABLE 0, 0, 227, 95 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "" +CAPTION "Ausführen" FONT 8, "MS Shell Dlg" BEGIN ICON "", 12297, 7, 11, 18, 20, WS_VISIBLE
Modified: trunk/reactos/dll/win32/shell32/lang/en-GB.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/en-G... ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/en-GB.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/en-GB.rc [iso-8859-1] Tue Jun 10 14:19:59 2008 @@ -149,7 +149,7 @@
SHELL_RUN_DLG DIALOGEX LOADONCALL MOVEABLE DISCARDABLE 0, 0, 227, 95 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "" +CAPTION "Run" FONT 8, "MS Shell Dlg" BEGIN ICON "", 12297, 7, 11, 18, 20, WS_VISIBLE
Modified: trunk/reactos/dll/win32/shell32/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/en-U... ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/en-US.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/en-US.rc [iso-8859-1] Tue Jun 10 14:19:59 2008 @@ -149,7 +149,7 @@
SHELL_RUN_DLG DIALOGEX LOADONCALL MOVEABLE DISCARDABLE 0, 0, 227, 95 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "" +CAPTION "Run" FONT 8, "MS Shell Dlg" BEGIN ICON "", 12297, 7, 11, 18, 20, WS_VISIBLE