Author: ekohl Date: Thu Feb 20 22:00:30 2014 New Revision: 62274
URL: http://svn.reactos.org/svn/reactos?rev=62274&view=rev Log: [MSGINA] CORE-7559 Implement the shutdown dialog. Based on a patch by Lee Schroeder. Thank you very much!
Added: trunk/reactos/dll/win32/msgina/resources/shutdown.ico (with props) Modified: trunk/reactos/dll/win32/msgina/gui.c trunk/reactos/dll/win32/msgina/lang/bg-BG.rc trunk/reactos/dll/win32/msgina/lang/cs-CZ.rc trunk/reactos/dll/win32/msgina/lang/de-DE.rc trunk/reactos/dll/win32/msgina/lang/en-US.rc trunk/reactos/dll/win32/msgina/lang/es-ES.rc trunk/reactos/dll/win32/msgina/lang/fr-FR.rc trunk/reactos/dll/win32/msgina/lang/he-IL.rc trunk/reactos/dll/win32/msgina/lang/id-ID.rc trunk/reactos/dll/win32/msgina/lang/it-IT.rc trunk/reactos/dll/win32/msgina/lang/ja-JP.rc trunk/reactos/dll/win32/msgina/lang/no-NO.rc trunk/reactos/dll/win32/msgina/lang/pl-PL.rc trunk/reactos/dll/win32/msgina/lang/ro-RO.rc trunk/reactos/dll/win32/msgina/lang/ru-RU.rc trunk/reactos/dll/win32/msgina/lang/sk-SK.rc trunk/reactos/dll/win32/msgina/lang/sq-AL.rc trunk/reactos/dll/win32/msgina/lang/tr-TR.rc trunk/reactos/dll/win32/msgina/lang/uk-UA.rc trunk/reactos/dll/win32/msgina/msgina.c trunk/reactos/dll/win32/msgina/msgina.h trunk/reactos/dll/win32/msgina/msgina.rc trunk/reactos/dll/win32/msgina/resource.h
Modified: trunk/reactos/dll/win32/msgina/gui.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/gui.c?rev=... ============================================================================== --- trunk/reactos/dll/win32/msgina/gui.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msgina/gui.c [iso-8859-1] Thu Feb 20 22:00:30 2014 @@ -592,6 +592,219 @@ }
+static +VOID +UpdateShutdownDesc( + IN HWND hwnd) +{ + WCHAR szBuffer[256]; + UINT shutdownDescId = 0; + int shutdownCode = 0; + + shutdownCode = SendDlgItemMessageW(hwnd, IDC_SHUTDOWN_LIST, CB_GETCURSEL, 0, 0); + + switch (shutdownCode) + { + case 0: /* Log off */ + shutdownDescId = IDS_SHUTDOWN_LOGOFF_DESC; + break; + + case 1: /* Shut down */ + shutdownDescId = IDS_SHUTDOWN_SHUTDOWN_DESC; + break; + + case 2: /* Restart */ + shutdownDescId = IDS_SHUTDOWN_RESTART_DESC; + break; + + case 3: /* Sleep */ + shutdownDescId = IDS_SHUTDOWN_SLEEP_DESC; + break; + + case 4: /* Hibernate */ + shutdownDescId = IDS_SHUTDOWN_HIBERNATE_DESC; + break; + + default: + break; + } + + LoadStringW(hDllInstance, shutdownDescId, szBuffer, sizeof(szBuffer)); + SetDlgItemTextW(hwnd, IDC_SHUTDOWN_DESCRIPTION, szBuffer); +} + + +static +VOID +ShutDownOnInit( + IN HWND hwndDlg, + IN PGINA_CONTEXT pgContext) +{ + WCHAR szBuffer[256]; + HWND hwndList; + INT idx, count, i; + + hwndList = GetDlgItem(hwndDlg, IDC_SHUTDOWN_LIST); + + /* Clears the content before it's used */ + SendMessageW(hwndList, CB_RESETCONTENT, 0, 0); + + /* Log off */ + LoadStringW(hDllInstance, IDS_SHUTDOWN_LOGOFF, szBuffer, sizeof(szBuffer) / sizeof(WCHAR)); + idx = SendMessageW(hwndList, CB_ADDSTRING, 0, (LPARAM)szBuffer); + if (idx != CB_ERR) + SendMessageW(hwndList, CB_SETITEMDATA, idx, WLX_SAS_ACTION_LOGOFF); + + /* Shut down */ + LoadStringW(hDllInstance, IDS_SHUTDOWN_SHUTDOWN, szBuffer, sizeof(szBuffer) / sizeof(WCHAR)); + idx = SendMessageW(hwndList, CB_ADDSTRING, 0, (LPARAM)szBuffer); + if (idx != CB_ERR) + SendMessageW(hwndList, CB_SETITEMDATA, idx, WLX_SAS_ACTION_SHUTDOWN_POWER_OFF); + + /* Restart */ + LoadStringW(hDllInstance, IDS_SHUTDOWN_RESTART, szBuffer, sizeof(szBuffer) / sizeof(WCHAR)); + idx = SendMessageW(hwndList, CB_ADDSTRING, 0, (LPARAM)szBuffer); + if (idx != CB_ERR) + SendMessageW(hwndList, CB_SETITEMDATA, idx, WLX_SAS_ACTION_SHUTDOWN_REBOOT); + + /* Sleep */ +#if 0 + LoadStringW(hDllInstance, IDS_SHUTDOWN_SLEEP, szBuffer, sizeof(szBuffer) / sizeof(WCHAR)); + idx = SendMessageW(hwndList, CB_ADDSTRING, 0, (LPARAM)szBuffer); + if (idx != CB_ERR) + SendMessageW(hwndList, CB_SETITEMDATA, idx, WLX_SAS_ACTION_SHUTDOWN_SLEEP); +#endif + + /* Hibernate */ +#if 0 + LoadStringW(hDllInstance, IDS_SHUTDOWN_HIBERNATE, szBuffer, sizeof(szBuffer) / sizeof(WCHAR)); + idx = SendMessageW(hwndList, CB_ADDSTRING, 0, (LPARAM)szBuffer); + if (idx != CB_ERR) + SendMessageW(hwndList, CB_SETITEMDATA, idx, WLX_SAS_ACTION_SHUTDOWN_HIBERNATE); +#endif + + /* Sets the default shut down selection */ + count = SendMessageW(hwndList, CB_GETCOUNT, 0, 0); + for (i = 0; i < count; i++) + { + if (pgContext->nShutdownAction == SendMessageW(hwndList, CB_GETITEMDATA, i, 0)) + { + SendMessageW(hwndList, CB_SETCURSEL, i, 0); + break; + } + } + + /* Updates the choice description based on the current selection */ + UpdateShutdownDesc(hwndDlg); +} + + +static +VOID +ShutDownOnOk( + IN HWND hwndDlg, + IN PGINA_CONTEXT pgContext) +{ + INT idx; + + idx = SendDlgItemMessageW(hwndDlg, + IDC_SHUTDOWN_LIST, + CB_GETCURSEL, + 0, + 0); + if (idx != CB_ERR) + { + pgContext->nShutdownAction = SendDlgItemMessageW(hwndDlg, + IDC_SHUTDOWN_LIST, + CB_GETITEMDATA, + idx, + 0); + } +} + + +BOOL +CALLBACK +ShutDownDialogProc( + HWND hwnd, + UINT Message, + WPARAM wParam, + LPARAM lParam) +{ + PGINA_CONTEXT pgContext; + + pgContext = (PGINA_CONTEXT)GetWindowLongPtr(hwnd, GWL_USERDATA); + + switch (Message) + { + case WM_INITDIALOG: + pgContext = (PGINA_CONTEXT)lParam; + SetWindowLongPtr(hwnd, GWL_USERDATA, (INT_PTR)pgContext); + + ShutDownOnInit(hwnd, pgContext); + + /* Draw the logo graphic */ + pgContext->hBitmap = LoadImage(hDllInstance, MAKEINTRESOURCE(IDI_ROSLOGO), IMAGE_BITMAP, 0, 0, LR_DEFAULTCOLOR); + return TRUE; + + case WM_PAINT: + { + PAINTSTRUCT ps; + HDC hdc; + if (pgContext->hBitmap) + { + hdc = BeginPaint(hwnd, &ps); + DrawStateW(hdc, NULL, NULL, (LPARAM)pgContext->hBitmap, (WPARAM)0, 0, 0, 0, 0, DST_BITMAP); + EndPaint(hwnd, &ps); + } + return TRUE; + } + + case WM_DESTROY: + DeleteObject(pgContext->hBitmap); + return TRUE; + + case WM_COMMAND: + switch(LOWORD(wParam)) + { + case IDOK: + ShutDownOnOk(hwnd, pgContext); + EndDialog(hwnd, IDOK); + break; + + case IDCANCEL: + EndDialog(hwnd, IDCANCEL); + break; + + case IDC_SHUTDOWN_LIST: + UpdateShutdownDesc(hwnd); + break; + } + break; + + default: + return FALSE; + } + return TRUE; +} + + +static +INT +OnShutDown( + IN HWND hwndDlg, + IN PGINA_CONTEXT pgContext) +{ + return pgContext->pWlxFuncs->WlxDialogBoxParam( + pgContext->hWlx, + pgContext->hDllInstance, + MAKEINTRESOURCEW(IDD_SHUTDOWN_DLG), + hwndDlg, + ShutDownDialogProc, + (LPARAM)pgContext); +} + + static INT_PTR CALLBACK LoggedOnWindowProc( IN HWND hwndDlg, @@ -627,7 +840,8 @@ EndDialog(hwndDlg, WLX_SAS_ACTION_LOGOFF); return TRUE; case IDC_SHUTDOWN: - EndDialog(hwndDlg, WLX_SAS_ACTION_SHUTDOWN_POWER_OFF); + if (OnShutDown(hwndDlg, pgContext) == IDOK) + EndDialog(hwndDlg, pgContext->nShutdownAction); return TRUE; case IDC_CHANGEPWD: if (OnChangePassword(hwndDlg, pgContext))
Modified: trunk/reactos/dll/win32/msgina/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/lang/bg-BG... ============================================================================== --- trunk/reactos/dll/win32/msgina/lang/bg-BG.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msgina/lang/bg-BG.rc [iso-8859-1] Thu Feb 20 22:00:30 2014 @@ -114,6 +114,20 @@ PUSHBUTTON "No", IDNO, 95, 39, 50, 14 END
+IDD_SHUTDOWN_DLG DIALOGEX 0, 0, 275, 146 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUPWINDOW | WS_CAPTION +CAPTION "ÐзклÑÑване на РеакÑÐС" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54 + ICON IDI_SHELL_SHUTDOWN, IDI_SHELL_SHUTDOWN, 9, 57, 21, 20, WS_GROUP + LTEXT "&Ðакво иÑкаÑе да напÑави компÑÑÑÑа?", IDC_STATIC, 39, 57, 167, 10 + COMBOBOX IDC_SHUTDOWN_LIST, 39, 70, 165, 210, CBS_DROPDOWNLIST | WS_VSCROLL + LTEXT "", IDC_SHUTDOWN_DESCRIPTION, 39, 93, 187, 27 + DEFPUSHBUTTON "ÐобÑе", IDOK, 143, 122, 55, 14, WS_GROUP + PUSHBUTTON "ÐÑказ", IDCANCEL, 204, 122, 55, 14 +END + STRINGTABLE BEGIN IDS_LOGGEDOUTSAS "ÐдÑавейÑе!" @@ -132,3 +146,19 @@ IDS_NONMATCHINGPASSWORDS "The passwords you typed do not match. Type the same password in both text boxes." IDS_PASSWORDCHANGED "Your password has been changed." END + +/* Shutdown Dialog Strings */ +STRINGTABLE +BEGIN + IDS_SHUTDOWN_SHUTDOWN "Shut down" + IDS_SHUTDOWN_LOGOFF "Log off" + IDS_SHUTDOWN_RESTART "Restart" + IDS_SHUTDOWN_SLEEP "Sleep" + IDS_SHUTDOWN_HIBERNATE "Hibernate" + /* Shut down descriptions */ + IDS_SHUTDOWN_SHUTDOWN_DESC "Ends your current session and shuts down the system so you can safely shut down the power." + IDS_SHUTDOWN_LOGOFF_DESC "Ends your current session and allows other users to log on to the system." + IDS_SHUTDOWN_RESTART_DESC "Ends your current session and reboots the system." + IDS_SHUTDOWN_SLEEP_DESC "Puts the system in sleep mode." + IDS_SHUTDOWN_HIBERNATE_DESC "Saves the current session and shuts down the computer." +END
Modified: trunk/reactos/dll/win32/msgina/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/lang/cs-CZ... ============================================================================== --- trunk/reactos/dll/win32/msgina/lang/cs-CZ.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msgina/lang/cs-CZ.rc [iso-8859-1] Thu Feb 20 22:00:30 2014 @@ -119,6 +119,20 @@ PUSHBUTTON "No", IDNO, 95, 39, 50, 14 END
+IDD_SHUTDOWN_DLG DIALOGEX 0, 0, 275, 146 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUPWINDOW | WS_CAPTION +CAPTION "Vypnout ReactOS" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54 + ICON IDI_SHELL_SHUTDOWN, IDI_SHELL_SHUTDOWN, 9, 57, 21, 20, WS_GROUP + LTEXT "&Co má poÄÃtaÄ provést?", IDC_STATIC, 39, 57, 167, 10 + COMBOBOX IDC_SHUTDOWN_LIST, 39, 70, 165, 210, CBS_DROPDOWNLIST | WS_VSCROLL + LTEXT "", IDC_SHUTDOWN_DESCRIPTION, 39, 93, 187, 27 + DEFPUSHBUTTON "OK", IDOK, 143, 122, 55, 14, WS_GROUP + PUSHBUTTON "Storno", IDCANCEL, 204, 122, 55, 14 +END + STRINGTABLE BEGIN IDS_LOGGEDOUTSAS "VÃtejte!" @@ -137,3 +151,19 @@ IDS_NONMATCHINGPASSWORDS "The passwords you typed do not match. Type the same password in both text boxes." IDS_PASSWORDCHANGED "Your password has been changed." END + +/* Shutdown Dialog Strings */ +STRINGTABLE +BEGIN + IDS_SHUTDOWN_SHUTDOWN "Shut down" + IDS_SHUTDOWN_LOGOFF "Log off" + IDS_SHUTDOWN_RESTART "Restart" + IDS_SHUTDOWN_SLEEP "Sleep" + IDS_SHUTDOWN_HIBERNATE "Hibernate" + /* Shut down descriptions */ + IDS_SHUTDOWN_SHUTDOWN_DESC "Ends your current session and shuts down the system so you can safely shut down the power." + IDS_SHUTDOWN_LOGOFF_DESC "Ends your current session and allows other users to log on to the system." + IDS_SHUTDOWN_RESTART_DESC "Ends your current session and reboots the system." + IDS_SHUTDOWN_SLEEP_DESC "Puts the system in sleep mode." + IDS_SHUTDOWN_HIBERNATE_DESC "Saves the current session and shuts down the computer." +END
Modified: trunk/reactos/dll/win32/msgina/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/lang/de-DE... ============================================================================== --- trunk/reactos/dll/win32/msgina/lang/de-DE.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msgina/lang/de-DE.rc [iso-8859-1] Thu Feb 20 22:00:30 2014 @@ -114,6 +114,20 @@ PUSHBUTTON "Nein", IDNO, 95, 39, 50, 14 END
+IDD_SHUTDOWN_DLG DIALOGEX 0, 0, 275, 146 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUPWINDOW | WS_CAPTION +CAPTION "ReactOS herunterfahren" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54 + ICON IDI_SHELL_SHUTDOWN, IDI_SHELL_SHUTDOWN, 9, 57, 21, 20, WS_GROUP + LTEXT "&Welcher Vorgang soll durchgeführt werden?", IDC_STATIC, 39, 57, 167, 10 + COMBOBOX IDC_SHUTDOWN_LIST, 39, 70, 165, 210, CBS_DROPDOWNLIST | WS_VSCROLL + LTEXT "", IDC_SHUTDOWN_DESCRIPTION, 39, 93, 187, 27 + DEFPUSHBUTTON "OK", IDOK, 143, 122, 55, 14, WS_GROUP + PUSHBUTTON "Abbrechen", IDCANCEL, 204, 122, 55, 14 +END + STRINGTABLE BEGIN IDS_LOGGEDOUTSAS "Willkommen!" @@ -132,3 +146,19 @@ IDS_NONMATCHINGPASSWORDS "Die eingegebenen Passworte stimmen nicht überein. Geben Sie das neue Passwort in beide Textfelder ein." IDS_PASSWORDCHANGED "Ihr Passwort wurde geändert." END + +/* Shutdown Dialog Strings */ +STRINGTABLE +BEGIN + IDS_SHUTDOWN_SHUTDOWN "Shut down" + IDS_SHUTDOWN_LOGOFF "Log off" + IDS_SHUTDOWN_RESTART "Restart" + IDS_SHUTDOWN_SLEEP "Sleep" + IDS_SHUTDOWN_HIBERNATE "Hibernate" + /* Shut down descriptions */ + IDS_SHUTDOWN_SHUTDOWN_DESC "Ends your current session and shuts down the system so you can safely shut down the power." + IDS_SHUTDOWN_LOGOFF_DESC "Ends your current session and allows other users to log on to the system." + IDS_SHUTDOWN_RESTART_DESC "Ends your current session and reboots the system." + IDS_SHUTDOWN_SLEEP_DESC "Puts the system in sleep mode." + IDS_SHUTDOWN_HIBERNATE_DESC "Saves the current session and shuts down the computer." +END
Modified: trunk/reactos/dll/win32/msgina/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/lang/en-US... ============================================================================== --- trunk/reactos/dll/win32/msgina/lang/en-US.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msgina/lang/en-US.rc [iso-8859-1] Thu Feb 20 22:00:30 2014 @@ -114,6 +114,20 @@ PUSHBUTTON "No", IDNO, 95, 39, 50, 14 END
+IDD_SHUTDOWN_DLG DIALOGEX 0, 0, 275, 146 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUPWINDOW | WS_CAPTION +CAPTION "Shut Down ReactOS" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54 + ICON IDI_SHELL_SHUTDOWN, IDI_SHELL_SHUTDOWN, 9, 57, 21, 20, WS_GROUP + LTEXT "&What do you want the computer to do?", IDC_STATIC, 39, 57, 167, 10 + COMBOBOX IDC_SHUTDOWN_LIST, 39, 70, 165, 210, CBS_DROPDOWNLIST | WS_VSCROLL + LTEXT "", IDC_SHUTDOWN_DESCRIPTION, 39, 93, 187, 27 + DEFPUSHBUTTON "OK", IDOK, 143, 122, 55, 14, WS_GROUP + PUSHBUTTON "Cancel", IDCANCEL, 204, 122, 55, 14 +END + STRINGTABLE BEGIN IDS_LOGGEDOUTSAS "Welcome!" @@ -132,3 +146,20 @@ IDS_NONMATCHINGPASSWORDS "The passwords you typed do not match. Type the same password in both text boxes." IDS_PASSWORDCHANGED "Your password has been changed." END + +/* Shutdown Dialog Strings */ +STRINGTABLE +BEGIN + IDS_SHUTDOWN_SHUTDOWN "Shut down" + IDS_SHUTDOWN_LOGOFF "Log off" + IDS_SHUTDOWN_RESTART "Restart" + IDS_SHUTDOWN_SLEEP "Sleep" + IDS_SHUTDOWN_HIBERNATE "Hibernate" + /* Shut down descriptions */ + + IDS_SHUTDOWN_SHUTDOWN_DESC "Ends your current session and shuts down the system so you can safely shut down the power." + IDS_SHUTDOWN_LOGOFF_DESC "Ends your current session and allows other users to log on to the system." + IDS_SHUTDOWN_RESTART_DESC "Ends your current session and reboots the system." + IDS_SHUTDOWN_SLEEP_DESC "Puts the system in sleep mode." + IDS_SHUTDOWN_HIBERNATE_DESC "Saves the current session and shuts down the computer." +END
Modified: trunk/reactos/dll/win32/msgina/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/lang/es-ES... ============================================================================== --- trunk/reactos/dll/win32/msgina/lang/es-ES.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msgina/lang/es-ES.rc [iso-8859-1] Thu Feb 20 22:00:30 2014 @@ -116,6 +116,20 @@ PUSHBUTTON "No", IDNO, 95, 39, 50, 14 END
+IDD_SHUTDOWN_DLG DIALOGEX 0, 0, 275, 146 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUPWINDOW | WS_CAPTION +CAPTION "Apagar ReactOS" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54 + ICON IDI_SHELL_SHUTDOWN, IDI_SHELL_SHUTDOWN, 9, 57, 21, 20, WS_GROUP + LTEXT "¿&Que quieres que haga el equipo?", IDC_STATIC, 39, 57, 167, 10 + COMBOBOX IDC_SHUTDOWN_LIST, 39, 70, 165, 210, CBS_DROPDOWNLIST | WS_VSCROLL + LTEXT "", IDC_SHUTDOWN_DESCRIPTION, 39, 93, 187, 27 + DEFPUSHBUTTON "Aceptar", IDOK, 143, 122, 55, 14, WS_GROUP + PUSHBUTTON "Cancelar", IDCANCEL, 204, 122, 55, 14 +END + STRINGTABLE BEGIN IDS_LOGGEDOUTSAS "¡Bienvenido!" @@ -134,3 +148,19 @@ IDS_NONMATCHINGPASSWORDS "The passwords you typed do not match. Type the same password in both text boxes." IDS_PASSWORDCHANGED "Your password has been changed." END + +/* Shutdown Dialog Strings */ +STRINGTABLE +BEGIN + IDS_SHUTDOWN_SHUTDOWN "Shut down" + IDS_SHUTDOWN_LOGOFF "Log off" + IDS_SHUTDOWN_RESTART "Restart" + IDS_SHUTDOWN_SLEEP "Sleep" + IDS_SHUTDOWN_HIBERNATE "Hibernate" + /* Shut down descriptions */ + IDS_SHUTDOWN_SHUTDOWN_DESC "Ends your current session and shuts down the system so you can safely shut down the power." + IDS_SHUTDOWN_LOGOFF_DESC "Ends your current session and allows other users to log on to the system." + IDS_SHUTDOWN_RESTART_DESC "Ends your current session and reboots the system." + IDS_SHUTDOWN_SLEEP_DESC "Puts the system in sleep mode." + IDS_SHUTDOWN_HIBERNATE_DESC "Saves the current session and shuts down the computer." +END
Modified: trunk/reactos/dll/win32/msgina/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/lang/fr-FR... ============================================================================== --- trunk/reactos/dll/win32/msgina/lang/fr-FR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msgina/lang/fr-FR.rc [iso-8859-1] Thu Feb 20 22:00:30 2014 @@ -114,6 +114,20 @@ PUSHBUTTON "No", IDNO, 95, 39, 50, 14 END
+IDD_SHUTDOWN_DLG DIALOGEX 0, 0, 275, 146 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUPWINDOW | WS_CAPTION +CAPTION "Fermer ReactOS" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54 + ICON IDI_SHELL_SHUTDOWN, IDI_SHELL_SHUTDOWN, 9, 57, 21, 20, WS_GROUP + LTEXT "&Que voulez-vous que l'ordinateur fasse ?", IDC_STATIC, 39, 57, 167, 10 + COMBOBOX IDC_SHUTDOWN_LIST, 39, 70, 165, 210, CBS_DROPDOWNLIST | WS_VSCROLL + LTEXT "", IDC_SHUTDOWN_DESCRIPTION, 39, 93, 187, 27 + DEFPUSHBUTTON "OK", IDOK, 143, 122, 55, 14, WS_GROUP + PUSHBUTTON "Annuler", IDCANCEL, 204, 122, 55, 14 +END + STRINGTABLE BEGIN IDS_LOGGEDOUTSAS "Bienvenue!" @@ -132,3 +146,19 @@ IDS_NONMATCHINGPASSWORDS "The passwords you typed do not match. Type the same password in both text boxes." IDS_PASSWORDCHANGED "Your password has been changed." END + +/* Shutdown Dialog Strings */ +STRINGTABLE +BEGIN + IDS_SHUTDOWN_SHUTDOWN "Shut down" + IDS_SHUTDOWN_LOGOFF "Log off" + IDS_SHUTDOWN_RESTART "Restart" + IDS_SHUTDOWN_SLEEP "Sleep" + IDS_SHUTDOWN_HIBERNATE "Hibernate" + /* Shut down descriptions */ + IDS_SHUTDOWN_SHUTDOWN_DESC "Ends your current session and shuts down the system so you can safely shut down the power." + IDS_SHUTDOWN_LOGOFF_DESC "Ends your current session and allows other users to log on to the system." + IDS_SHUTDOWN_RESTART_DESC "Ends your current session and reboots the system." + IDS_SHUTDOWN_SLEEP_DESC "Puts the system in sleep mode." + IDS_SHUTDOWN_HIBERNATE_DESC "Saves the current session and shuts down the computer." +END
Modified: trunk/reactos/dll/win32/msgina/lang/he-IL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/lang/he-IL... ============================================================================== --- trunk/reactos/dll/win32/msgina/lang/he-IL.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msgina/lang/he-IL.rc [iso-8859-1] Thu Feb 20 22:00:30 2014 @@ -114,6 +114,20 @@ PUSHBUTTON "No", IDNO, 95, 39, 50, 14 END
+IDD_SHUTDOWN_DLG DIALOGEX 0, 0, 275, 146 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUPWINDOW | WS_CAPTION +CAPTION "Shut Down ReactOS" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54 + ICON IDI_SHELL_SHUTDOWN, IDI_SHELL_SHUTDOWN, 9, 57, 21, 20, WS_GROUP + LTEXT "&What do you want the computer to do?", IDC_STATIC, 39, 57, 167, 10 + COMBOBOX IDC_SHUTDOWN_LIST, 39, 70, 165, 210, CBS_DROPDOWNLIST | WS_VSCROLL + LTEXT "", IDC_SHUTDOWN_DESCRIPTION, 39, 93, 187, 27 + DEFPUSHBUTTON "OK", IDOK, 143, 122, 55, 14, WS_GROUP + PUSHBUTTON "Cancel", IDCANCEL, 204, 122, 55, 14 +END + STRINGTABLE BEGIN IDS_LOGGEDOUTSAS "×ר×××× ×××××!" @@ -132,3 +146,19 @@ IDS_NONMATCHINGPASSWORDS "The passwords you typed do not match. Type the same password in both text boxes." IDS_PASSWORDCHANGED "Your password has been changed." END + +/* Shutdown Dialog Strings */ +STRINGTABLE +BEGIN + IDS_SHUTDOWN_SHUTDOWN "Shut down" + IDS_SHUTDOWN_LOGOFF "Log off" + IDS_SHUTDOWN_RESTART "Restart" + IDS_SHUTDOWN_SLEEP "Sleep" + IDS_SHUTDOWN_HIBERNATE "Hibernate" + /* Shut down descriptions */ + IDS_SHUTDOWN_SHUTDOWN_DESC "Ends your current session and shuts down the system so you can safely shut down the power." + IDS_SHUTDOWN_LOGOFF_DESC "Ends your current session and allows other users to log on to the system." + IDS_SHUTDOWN_RESTART_DESC "Ends your current session and reboots the system." + IDS_SHUTDOWN_SLEEP_DESC "Puts the system in sleep mode." + IDS_SHUTDOWN_HIBERNATE_DESC "Saves the current session and shuts down the computer." +END
Modified: trunk/reactos/dll/win32/msgina/lang/id-ID.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/lang/id-ID... ============================================================================== --- trunk/reactos/dll/win32/msgina/lang/id-ID.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msgina/lang/id-ID.rc [iso-8859-1] Thu Feb 20 22:00:30 2014 @@ -114,6 +114,20 @@ PUSHBUTTON "No", IDNO, 95, 39, 50, 14 END
+IDD_SHUTDOWN_DLG DIALOGEX 0, 0, 275, 146 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUPWINDOW | WS_CAPTION +CAPTION "Shut Down ReactOS" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54 + ICON IDI_SHELL_SHUTDOWN, IDI_SHELL_SHUTDOWN, 9, 57, 21, 20, WS_GROUP + LTEXT "&What do you want the computer to do?", IDC_STATIC, 39, 57, 167, 10 + COMBOBOX IDC_SHUTDOWN_LIST, 39, 70, 165, 210, CBS_DROPDOWNLIST | WS_VSCROLL + LTEXT "", IDC_SHUTDOWN_DESCRIPTION, 39, 93, 187, 27 + DEFPUSHBUTTON "OK", IDOK, 143, 122, 55, 14, WS_GROUP + PUSHBUTTON "Cancel", IDCANCEL, 204, 122, 55, 14 +END + STRINGTABLE BEGIN IDS_LOGGEDOUTSAS "Selamat datang!" @@ -131,3 +145,19 @@ IDS_NONMATCHINGPASSWORDS "The passwords you typed do not match. Type the same password in both text boxes." IDS_PASSWORDCHANGED "Your password has been changed." END + +/* Shutdown Dialog Strings */ +STRINGTABLE +BEGIN + IDS_SHUTDOWN_SHUTDOWN "Shut down" + IDS_SHUTDOWN_LOGOFF "Log off" + IDS_SHUTDOWN_RESTART "Restart" + IDS_SHUTDOWN_SLEEP "Sleep" + IDS_SHUTDOWN_HIBERNATE "Hibernate" + /* Shut down descriptions */ + IDS_SHUTDOWN_SHUTDOWN_DESC "Ends your current session and shuts down the system so you can safely shut down the power." + IDS_SHUTDOWN_LOGOFF_DESC "Ends your current session and allows other users to log on to the system." + IDS_SHUTDOWN_RESTART_DESC "Ends your current session and reboots the system." + IDS_SHUTDOWN_SLEEP_DESC "Puts the system in sleep mode." + IDS_SHUTDOWN_HIBERNATE_DESC "Saves the current session and shuts down the computer." +END
Modified: trunk/reactos/dll/win32/msgina/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/lang/it-IT... ============================================================================== --- trunk/reactos/dll/win32/msgina/lang/it-IT.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msgina/lang/it-IT.rc [iso-8859-1] Thu Feb 20 22:00:30 2014 @@ -122,6 +122,20 @@ PUSHBUTTON "No", IDNO, 95, 39, 50, 14 END
+IDD_SHUTDOWN_DLG DIALOGEX 0, 0, 275, 146 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUPWINDOW | WS_CAPTION +CAPTION "Spegnimento di ReactOS" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54 + ICON IDI_SHELL_SHUTDOWN, IDI_SHELL_SHUTDOWN, 9, 57, 21, 20, WS_GROUP + LTEXT "&Cosa volete che faccia ReactOS?", IDC_STATIC, 39, 57, 167, 10 + COMBOBOX IDC_SHUTDOWN_LIST, 39, 70, 165, 210, CBS_DROPDOWNLIST | WS_VSCROLL + LTEXT "", IDC_SHUTDOWN_DESCRIPTION, 39, 93, 187, 27 + DEFPUSHBUTTON "OK", IDOK, 143, 122, 55, 14, WS_GROUP + PUSHBUTTON "Annulla", IDCANCEL, 204, 122, 55, 14 +END + STRINGTABLE BEGIN IDS_LOGGEDOUTSAS "Benvenuti!" @@ -140,3 +154,19 @@ IDS_NONMATCHINGPASSWORDS "The passwords you typed do not match. Type the same password in both text boxes." IDS_PASSWORDCHANGED "Your password has been changed." END + +/* Shutdown Dialog Strings */ +STRINGTABLE +BEGIN + IDS_SHUTDOWN_SHUTDOWN "Shut down" + IDS_SHUTDOWN_LOGOFF "Log off" + IDS_SHUTDOWN_RESTART "Restart" + IDS_SHUTDOWN_SLEEP "Sleep" + IDS_SHUTDOWN_HIBERNATE "Hibernate" + /* Shut down descriptions */ + IDS_SHUTDOWN_SHUTDOWN_DESC "Ends your current session and shuts down the system so you can safely shut down the power." + IDS_SHUTDOWN_LOGOFF_DESC "Ends your current session and allows other users to log on to the system." + IDS_SHUTDOWN_RESTART_DESC "Ends your current session and reboots the system." + IDS_SHUTDOWN_SLEEP_DESC "Puts the system in sleep mode." + IDS_SHUTDOWN_HIBERNATE_DESC "Saves the current session and shuts down the computer." +END
Modified: trunk/reactos/dll/win32/msgina/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/lang/ja-JP... ============================================================================== --- trunk/reactos/dll/win32/msgina/lang/ja-JP.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msgina/lang/ja-JP.rc [iso-8859-1] Thu Feb 20 22:00:30 2014 @@ -86,7 +86,7 @@ IDD_CHANGE_PASSWORD DIALOGEX 0, 0, 275, 166 STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP CAPTION "Change Password" -FONT 8, "MS Shell Dlg", 400, 0, 1 +FONT 9,"MS UI Gothic", 400, 0, 1 BEGIN CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54 LTEXT "User name:", IDC_STATIC, 7, 61, 78, 8 @@ -106,12 +106,26 @@ IDD_LOGOFF_DLG DIALOGEX 0, 0, 188, 60 STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_SYSMENU | WS_POPUP CAPTION "Log Off ReactOS" -FONT 8, "MS Shell Dlg", 400, 0, 1 +FONT 9,"MS UI Gothic", 400, 0, 1 BEGIN ICON IDI_LOCKICON, -1, 7, 7, 20, 20 LTEXT "Are you sure you want to log off?", IDC_STATIC, 35, 16, 146, 8 PUSHBUTTON "Yes", IDYES, 41, 39, 50, 14, BS_DEFPUSHBUTTON PUSHBUTTON "No", IDNO, 95, 39, 50, 14 +END + +IDD_SHUTDOWN_DLG DIALOGEX 0, 0, 275, 146 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUPWINDOW | WS_CAPTION +CAPTION "ReactOSã®ã·ã£ãããã¦ã³" +FONT 9,"MS UI Gothic", 400, 0, 1 +BEGIN + CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54 + ICON IDI_SHELL_SHUTDOWN, IDI_SHELL_SHUTDOWN, 9, 57, 21, 20, WS_GROUP + LTEXT "&ã³ã³ãã¥ã¼ã¿ã®åä½ã鏿ãã¦ãã ãã", IDC_STATIC, 39, 57, 167, 10 + COMBOBOX IDC_SHUTDOWN_LIST, 39, 70, 165, 210, CBS_DROPDOWNLIST | WS_VSCROLL + LTEXT "", IDC_SHUTDOWN_DESCRIPTION, 39, 93, 187, 27 + DEFPUSHBUTTON "OK", IDOK, 143, 122, 55, 14, WS_GROUP + PUSHBUTTON "ãã£ã³ã»ã«", IDCANCEL, 204, 122, 55, 14 END
STRINGTABLE @@ -132,3 +146,19 @@ IDS_NONMATCHINGPASSWORDS "The passwords you typed do not match. Type the same password in both text boxes." IDS_PASSWORDCHANGED "Your password has been changed." END + +/* Shutdown Dialog Strings */ +STRINGTABLE +BEGIN + IDS_SHUTDOWN_SHUTDOWN "Shut down" + IDS_SHUTDOWN_LOGOFF "Log off" + IDS_SHUTDOWN_RESTART "Restart" + IDS_SHUTDOWN_SLEEP "Sleep" + IDS_SHUTDOWN_HIBERNATE "Hibernate" + /* Shut down descriptions */ + IDS_SHUTDOWN_SHUTDOWN_DESC "Ends your current session and shuts down the system so you can safely shut down the power." + IDS_SHUTDOWN_LOGOFF_DESC "Ends your current session and allows other users to log on to the system." + IDS_SHUTDOWN_RESTART_DESC "Ends your current session and reboots the system." + IDS_SHUTDOWN_SLEEP_DESC "Puts the system in sleep mode." + IDS_SHUTDOWN_HIBERNATE_DESC "Saves the current session and shuts down the computer." +END
Modified: trunk/reactos/dll/win32/msgina/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/lang/no-NO... ============================================================================== --- trunk/reactos/dll/win32/msgina/lang/no-NO.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msgina/lang/no-NO.rc [iso-8859-1] Thu Feb 20 22:00:30 2014 @@ -114,6 +114,20 @@ PUSHBUTTON "No", IDNO, 95, 39, 50, 14 END
+IDD_SHUTDOWN_DLG DIALOGEX 0, 0, 275, 146 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUPWINDOW | WS_CAPTION +CAPTION "Slå av ReactOS" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54 + ICON IDI_SHELL_SHUTDOWN, IDI_SHELL_SHUTDOWN, 9, 57, 21, 20, WS_GROUP + LTEXT "&Hva vil du at datamaskinen skal gjøre?", IDC_STATIC, 39, 57, 167, 10 + COMBOBOX IDC_SHUTDOWN_LIST, 39, 70, 165, 210, CBS_DROPDOWNLIST | WS_VSCROLL + LTEXT "", IDC_SHUTDOWN_DESCRIPTION, 39, 93, 187, 27 + DEFPUSHBUTTON "OK", IDOK, 143, 122, 55, 14, WS_GROUP + PUSHBUTTON "Avbryt", IDCANCEL, 204, 122, 55, 14 +END + STRINGTABLE BEGIN IDS_LOGGEDOUTSAS "Velkommen!" @@ -132,3 +146,19 @@ IDS_NONMATCHINGPASSWORDS "The passwords you typed do not match. Type the same password in both text boxes." IDS_PASSWORDCHANGED "Your password has been changed." END + +/* Shutdown Dialog Strings */ +STRINGTABLE +BEGIN + IDS_SHUTDOWN_SHUTDOWN "Shut down" + IDS_SHUTDOWN_LOGOFF "Log off" + IDS_SHUTDOWN_RESTART "Restart" + IDS_SHUTDOWN_SLEEP "Sleep" + IDS_SHUTDOWN_HIBERNATE "Hibernate" + /* Shut down descriptions */ + IDS_SHUTDOWN_SHUTDOWN_DESC "Ends your current session and shuts down the system so you can safely shut down the power." + IDS_SHUTDOWN_LOGOFF_DESC "Ends your current session and allows other users to log on to the system." + IDS_SHUTDOWN_RESTART_DESC "Ends your current session and reboots the system." + IDS_SHUTDOWN_SLEEP_DESC "Puts the system in sleep mode." + IDS_SHUTDOWN_HIBERNATE_DESC "Saves the current session and shuts down the computer." +END
Modified: trunk/reactos/dll/win32/msgina/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/lang/pl-PL... ============================================================================== --- trunk/reactos/dll/win32/msgina/lang/pl-PL.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msgina/lang/pl-PL.rc [iso-8859-1] Thu Feb 20 22:00:30 2014 @@ -123,6 +123,20 @@ PUSHBUTTON "No", IDNO, 95, 39, 50, 14 END
+IDD_SHUTDOWN_DLG DIALOGEX 0, 0, 275, 146 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUPWINDOW | WS_CAPTION +CAPTION "Zamknij ReactOS" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54 + ICON IDI_SHELL_SHUTDOWN, IDI_SHELL_SHUTDOWN, 9, 57, 21, 20, WS_GROUP + LTEXT "&Co chcesz, aby zrobiÅ komputer?", IDC_STATIC, 39, 57, 167, 10 + COMBOBOX IDC_SHUTDOWN_LIST, 39, 70, 165, 210, CBS_DROPDOWNLIST | WS_VSCROLL + LTEXT "", IDC_SHUTDOWN_DESCRIPTION, 39, 93, 187, 27 + DEFPUSHBUTTON "OK", IDOK, 143, 122, 55, 14, WS_GROUP + PUSHBUTTON "Anuluj", IDCANCEL, 204, 122, 55, 14 +END + STRINGTABLE BEGIN IDS_LOGGEDOUTSAS "Witaj!" @@ -141,3 +155,19 @@ IDS_NONMATCHINGPASSWORDS "The passwords you typed do not match. Type the same password in both text boxes." IDS_PASSWORDCHANGED "Your password has been changed." END + +/* Shutdown Dialog Strings */ +STRINGTABLE +BEGIN + IDS_SHUTDOWN_SHUTDOWN "Shut down" + IDS_SHUTDOWN_LOGOFF "Log off" + IDS_SHUTDOWN_RESTART "Restart" + IDS_SHUTDOWN_SLEEP "Sleep" + IDS_SHUTDOWN_HIBERNATE "Hibernate" + /* Shut down descriptions */ + IDS_SHUTDOWN_SHUTDOWN_DESC "Ends your current session and shuts down the system so you can safely shut down the power." + IDS_SHUTDOWN_LOGOFF_DESC "Ends your current session and allows other users to log on to the system." + IDS_SHUTDOWN_RESTART_DESC "Ends your current session and reboots the system." + IDS_SHUTDOWN_SLEEP_DESC "Puts the system in sleep mode." + IDS_SHUTDOWN_HIBERNATE_DESC "Saves the current session and shuts down the computer." +END
Modified: trunk/reactos/dll/win32/msgina/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/lang/ro-RO... ============================================================================== --- trunk/reactos/dll/win32/msgina/lang/ro-RO.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msgina/lang/ro-RO.rc [iso-8859-1] Thu Feb 20 22:00:30 2014 @@ -116,6 +116,20 @@ PUSHBUTTON "N&u", IDNO, 95, 39, 50, 14 END
+IDD_SHUTDOWN_DLG DIALOGEX 0, 0, 275, 146 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUPWINDOW | WS_CAPTION +CAPTION "Ãnchidere ReactOS" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54 + ICON IDI_SHELL_SHUTDOWN, IDI_SHELL_SHUTDOWN, 9, 57, 21, 20, WS_GROUP + LTEXT "&Ce doriÈi sÄ se întâmple?", IDC_STATIC, 39, 57, 167, 10 + COMBOBOX IDC_SHUTDOWN_LIST, 39, 70, 165, 210, CBS_DROPDOWNLIST | WS_VSCROLL + LTEXT "", IDC_SHUTDOWN_DESCRIPTION, 39, 93, 187, 27 + DEFPUSHBUTTON "Con&firmÄ", IDOK, 143, 122, 55, 14, WS_GROUP + PUSHBUTTON "A&nuleazÄ", IDCANCEL, 204, 122, 55, 14 +END + STRINGTABLE BEGIN IDS_LOGGEDOUTSAS "Bun venit!" @@ -134,3 +148,19 @@ IDS_NONMATCHINGPASSWORDS "The passwords you typed do not match. Type the same password in both text boxes." IDS_PASSWORDCHANGED "Your password has been changed." END + +/* Shutdown Dialog Strings */ +STRINGTABLE +BEGIN + IDS_SHUTDOWN_SHUTDOWN "Shut down" + IDS_SHUTDOWN_LOGOFF "Log off" + IDS_SHUTDOWN_RESTART "Restart" + IDS_SHUTDOWN_SLEEP "Sleep" + IDS_SHUTDOWN_HIBERNATE "Hibernate" + /* Shut down descriptions */ + IDS_SHUTDOWN_SHUTDOWN_DESC "Ends your current session and shuts down the system so you can safely shut down the power." + IDS_SHUTDOWN_LOGOFF_DESC "Ends your current session and allows other users to log on to the system." + IDS_SHUTDOWN_RESTART_DESC "Ends your current session and reboots the system." + IDS_SHUTDOWN_SLEEP_DESC "Puts the system in sleep mode." + IDS_SHUTDOWN_HIBERNATE_DESC "Saves the current session and shuts down the computer." +END
Modified: trunk/reactos/dll/win32/msgina/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/lang/ru-RU... ============================================================================== --- trunk/reactos/dll/win32/msgina/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msgina/lang/ru-RU.rc [iso-8859-1] Thu Feb 20 22:00:30 2014 @@ -116,6 +116,20 @@ PUSHBUTTON "No", IDNO, 95, 39, 50, 14 END
+IDD_SHUTDOWN_DLG DIALOGEX 0, 0, 275, 146 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUPWINDOW | WS_CAPTION +CAPTION "ÐавеÑÑение ÑабоÑÑ ReactOS" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54 + ICON IDI_SHELL_SHUTDOWN, IDI_SHELL_SHUTDOWN, 9, 57, 21, 20, WS_GROUP + LTEXT "&ÐÑбеÑиÑе желаемое дейÑÑвие.", IDC_STATIC, 39, 57, 167, 10 + COMBOBOX IDC_SHUTDOWN_LIST, 39, 70, 165, 210, CBS_DROPDOWNLIST | WS_VSCROLL + LTEXT "", IDC_SHUTDOWN_DESCRIPTION, 39, 93, 187, 27 + DEFPUSHBUTTON "OK", IDOK, 143, 122, 55, 14, WS_GROUP + PUSHBUTTON "ÐÑмена", IDCANCEL, 204, 122, 55, 14 +END + STRINGTABLE BEGIN IDS_LOGGEDOUTSAS "ÐобÑо пожаловаÑÑ!" @@ -134,3 +148,19 @@ IDS_NONMATCHINGPASSWORDS "The passwords you typed do not match. Type the same password in both text boxes." IDS_PASSWORDCHANGED "Your password has been changed." END + +/* Shutdown Dialog Strings */ +STRINGTABLE +BEGIN + IDS_SHUTDOWN_SHUTDOWN "Shut down" + IDS_SHUTDOWN_LOGOFF "Log off" + IDS_SHUTDOWN_RESTART "Restart" + IDS_SHUTDOWN_SLEEP "Sleep" + IDS_SHUTDOWN_HIBERNATE "Hibernate" + /* Shut down descriptions */ + IDS_SHUTDOWN_SHUTDOWN_DESC "Ends your current session and shuts down the system so you can safely shut down the power." + IDS_SHUTDOWN_LOGOFF_DESC "Ends your current session and allows other users to log on to the system." + IDS_SHUTDOWN_RESTART_DESC "Ends your current session and reboots the system." + IDS_SHUTDOWN_SLEEP_DESC "Puts the system in sleep mode." + IDS_SHUTDOWN_HIBERNATE_DESC "Saves the current session and shuts down the computer." +END
Modified: trunk/reactos/dll/win32/msgina/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/lang/sk-SK... ============================================================================== --- trunk/reactos/dll/win32/msgina/lang/sk-SK.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msgina/lang/sk-SK.rc [iso-8859-1] Thu Feb 20 22:00:30 2014 @@ -119,6 +119,20 @@ PUSHBUTTON "No", IDNO, 95, 39, 50, 14 END
+IDD_SHUTDOWN_DLG DIALOGEX 0, 0, 275, 146 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUPWINDOW | WS_CAPTION +CAPTION "Vypnutie systému ReactOS" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54 + ICON IDI_SHELL_SHUTDOWN, IDI_SHELL_SHUTDOWN, 9, 57, 21, 20, WS_GROUP + LTEXT "&Äo chcete aby poÄÃtaÄ urobil?", IDC_STATIC, 39, 57, 167, 10 + COMBOBOX IDC_SHUTDOWN_LIST, 39, 70, 165, 210, CBS_DROPDOWNLIST | WS_VSCROLL + LTEXT "", IDC_SHUTDOWN_DESCRIPTION, 39, 93, 187, 27 + DEFPUSHBUTTON "OK", IDOK, 143, 122, 55, 14, WS_GROUP + PUSHBUTTON "ZruÅ¡iÅ¥", IDCANCEL, 204, 122, 55, 14 +END + STRINGTABLE BEGIN IDS_LOGGEDOUTSAS "Vitajte!" @@ -137,3 +151,19 @@ IDS_NONMATCHINGPASSWORDS "The passwords you typed do not match. Type the same password in both text boxes." IDS_PASSWORDCHANGED "Your password has been changed." END + +/* Shutdown Dialog Strings */ +STRINGTABLE +BEGIN + IDS_SHUTDOWN_SHUTDOWN "Shut down" + IDS_SHUTDOWN_LOGOFF "Log off" + IDS_SHUTDOWN_RESTART "Restart" + IDS_SHUTDOWN_SLEEP "Sleep" + IDS_SHUTDOWN_HIBERNATE "Hibernate" + /* Shut down descriptions */ + IDS_SHUTDOWN_SHUTDOWN_DESC "Ends your current session and shuts down the system so you can safely shut down the power." + IDS_SHUTDOWN_LOGOFF_DESC "Ends your current session and allows other users to log on to the system." + IDS_SHUTDOWN_RESTART_DESC "Ends your current session and reboots the system." + IDS_SHUTDOWN_SLEEP_DESC "Puts the system in sleep mode." + IDS_SHUTDOWN_HIBERNATE_DESC "Saves the current session and shuts down the computer." +END
Modified: trunk/reactos/dll/win32/msgina/lang/sq-AL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/lang/sq-AL... ============================================================================== --- trunk/reactos/dll/win32/msgina/lang/sq-AL.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msgina/lang/sq-AL.rc [iso-8859-1] Thu Feb 20 22:00:30 2014 @@ -117,6 +117,20 @@ PUSHBUTTON "Jo", IDNO, 95, 39, 50, 14 END
+IDD_SHUTDOWN_DLG DIALOGEX 0, 0, 275, 146 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUPWINDOW | WS_CAPTION +CAPTION "Shut Down ReactOS" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54 + ICON IDI_SHELL_SHUTDOWN, IDI_SHELL_SHUTDOWN, 9, 57, 21, 20, WS_GROUP + LTEXT "&What do you want the computer to do?", IDC_STATIC, 39, 57, 167, 10 + COMBOBOX IDC_SHUTDOWN_LIST, 39, 70, 165, 210, CBS_DROPDOWNLIST | WS_VSCROLL + LTEXT "", IDC_SHUTDOWN_DESCRIPTION, 39, 93, 187, 27 + DEFPUSHBUTTON "OK", IDOK, 143, 122, 55, 14, WS_GROUP + PUSHBUTTON "Cancel", IDCANCEL, 204, 122, 55, 14 +END + STRINGTABLE BEGIN IDS_LOGGEDOUTSAS "Mirëseerdhët!" @@ -132,3 +146,19 @@ IDS_LOCKEDWRONGPASSWORD "Fjalëkalimi është gabim. Ju lutem shkruani fjalëkalimin tuaj përsëri. Gërmat në fjalëkalim duhet të shkruhen duke përdorur rastin e duhur." IDS_LOCKEDWRONGUSER "Ky kompjuter është i bllokuar. Vetëm %s\%s ose një Administrator mund të zhbllokoj këtë kompjuter." END + +/* Shutdown Dialog Strings */ +STRINGTABLE +BEGIN + IDS_SHUTDOWN_SHUTDOWN "Shut down" + IDS_SHUTDOWN_LOGOFF "Log off" + IDS_SHUTDOWN_RESTART "Restart" + IDS_SHUTDOWN_SLEEP "Sleep" + IDS_SHUTDOWN_HIBERNATE "Hibernate" + /* Shut down descriptions */ + IDS_SHUTDOWN_SHUTDOWN_DESC "Ends your current session and shuts down the system so you can safely shut down the power." + IDS_SHUTDOWN_LOGOFF_DESC "Ends your current session and allows other users to log on to the system." + IDS_SHUTDOWN_RESTART_DESC "Ends your current session and reboots the system." + IDS_SHUTDOWN_SLEEP_DESC "Puts the system in sleep mode." + IDS_SHUTDOWN_HIBERNATE_DESC "Saves the current session and shuts down the computer." +END
Modified: trunk/reactos/dll/win32/msgina/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/lang/tr-TR... ============================================================================== --- trunk/reactos/dll/win32/msgina/lang/tr-TR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msgina/lang/tr-TR.rc [iso-8859-1] Thu Feb 20 22:00:30 2014 @@ -116,6 +116,20 @@ PUSHBUTTON "Hayır", IDNO, 95, 39, 50, 14 END
+IDD_SHUTDOWN_DLG DIALOGEX 0, 0, 275, 146 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUPWINDOW | WS_CAPTION +CAPTION "Oturumu Kapat" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54 + ICON IDI_SHELL_SHUTDOWN, IDI_SHELL_SHUTDOWN, 9, 57, 21, 20, WS_GROUP + LTEXT "&Bilgisayarınızın ne yapmasını istiyorsunuz?", IDC_STATIC, 39, 57, 167, 10 + COMBOBOX IDC_SHUTDOWN_LIST, 39, 70, 165, 210, CBS_DROPDOWNLIST | WS_VSCROLL + LTEXT "", IDC_SHUTDOWN_DESCRIPTION, 39, 93, 187, 27 + DEFPUSHBUTTON "Tamam", IDOK, 143, 122, 55, 14, WS_GROUP + PUSHBUTTON "İptal", IDCANCEL, 204, 122, 55, 14 +END + STRINGTABLE BEGIN IDS_LOGGEDOUTSAS "HoÅgeldiniz!" @@ -134,3 +148,19 @@ IDS_NONMATCHINGPASSWORDS "YazıdıÄınız bu Åifreler birbiriyle uyuÅmuyor. Her iki metin kutusuna da aynı Åifreyi yazınız." IDS_PASSWORDCHANGED "Åifreniz deÄiÅtirildi." END + +/* Shutdown Dialog Strings */ +STRINGTABLE +BEGIN + IDS_SHUTDOWN_SHUTDOWN "Shut down" + IDS_SHUTDOWN_LOGOFF "Log off" + IDS_SHUTDOWN_RESTART "Restart" + IDS_SHUTDOWN_SLEEP "Sleep" + IDS_SHUTDOWN_HIBERNATE "Hibernate" + /* Shut down descriptions */ + IDS_SHUTDOWN_SHUTDOWN_DESC "Ends your current session and shuts down the system so you can safely shut down the power." + IDS_SHUTDOWN_LOGOFF_DESC "Ends your current session and allows other users to log on to the system." + IDS_SHUTDOWN_RESTART_DESC "Ends your current session and reboots the system." + IDS_SHUTDOWN_SLEEP_DESC "Puts the system in sleep mode." + IDS_SHUTDOWN_HIBERNATE_DESC "Saves the current session and shuts down the computer." +END
Modified: trunk/reactos/dll/win32/msgina/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/lang/uk-UA... ============================================================================== --- trunk/reactos/dll/win32/msgina/lang/uk-UA.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msgina/lang/uk-UA.rc [iso-8859-1] Thu Feb 20 22:00:30 2014 @@ -122,6 +122,20 @@ PUSHBUTTON "No", IDNO, 95, 39, 50, 14 END
+IDD_SHUTDOWN_DLG DIALOGEX 0, 0, 275, 146 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUPWINDOW | WS_CAPTION +CAPTION "ÐавеÑÑÐµÐ½Ð½Ñ ÑобоÑи ReactOS" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54 + ICON IDI_SHELL_SHUTDOWN, IDI_SHELL_SHUTDOWN, 9, 57, 21, 20, WS_GROUP + LTEXT "&ÐибеÑÑÑÑ Ð¾Ð´Ð½Ñ Ð· ÑÐ°ÐºÐ¸Ñ Ð¼Ð¾Ð¶Ð»Ð¸Ð²Ð¾ÑÑей?", IDC_STATIC, 39, 57, 167, 10 + COMBOBOX IDC_SHUTDOWN_LIST, 39, 70, 165, 210, CBS_DROPDOWNLIST | WS_VSCROLL + LTEXT "", IDC_SHUTDOWN_DESCRIPTION, 39, 93, 187, 27 + DEFPUSHBUTTON "OK", IDOK, 143, 122, 55, 14, WS_GROUP + PUSHBUTTON "СкаÑÑваÑи", IDCANCEL, 204, 122, 55, 14 +END + STRINGTABLE BEGIN IDS_LOGGEDOUTSAS "ÐаÑкаво пÑоÑимо!" @@ -140,3 +154,19 @@ IDS_NONMATCHINGPASSWORDS "The passwords you typed do not match. Type the same password in both text boxes." IDS_PASSWORDCHANGED "Your password has been changed." END + +/* Shutdown Dialog Strings */ +STRINGTABLE +BEGIN + IDS_SHUTDOWN_SHUTDOWN "Shut down" + IDS_SHUTDOWN_LOGOFF "Log off" + IDS_SHUTDOWN_RESTART "Restart" + IDS_SHUTDOWN_SLEEP "Sleep" + IDS_SHUTDOWN_HIBERNATE "Hibernate" + /* Shut down descriptions */ + IDS_SHUTDOWN_SHUTDOWN_DESC "Ends your current session and shuts down the system so you can safely shut down the power." + IDS_SHUTDOWN_LOGOFF_DESC "Ends your current session and allows other users to log on to the system." + IDS_SHUTDOWN_RESTART_DESC "Ends your current session and reboots the system." + IDS_SHUTDOWN_SLEEP_DESC "Puts the system in sleep mode." + IDS_SHUTDOWN_HIBERNATE_DESC "Saves the current session and shuts down the computer." +END
Modified: trunk/reactos/dll/win32/msgina/msgina.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/msgina.c?r... ============================================================================== --- trunk/reactos/dll/win32/msgina/msgina.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msgina/msgina.c [iso-8859-1] Thu Feb 20 22:00:30 2014 @@ -312,6 +312,8 @@
/* Check autologon settings the first time */ pgContext->AutoLogonState = AUTOLOGON_CHECK_REGISTRY; + + pgContext->nShutdownAction = WLX_SAS_ACTION_SHUTDOWN_POWER_OFF;
ChooseGinaUI(); return pGinaUI->Initialize(pgContext);
Modified: trunk/reactos/dll/win32/msgina/msgina.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/msgina.h?r... ============================================================================== --- trunk/reactos/dll/win32/msgina/msgina.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msgina/msgina.h [iso-8859-1] Thu Feb 20 22:00:30 2014 @@ -38,6 +38,8 @@ BOOL bAutoAdminLogon; BOOL bDontDisplayLastUserName; BOOL bShutdownWithoutLogon; + + INT nShutdownAction;
/* Information to be filled during logon */ WCHAR UserName[256];
Modified: trunk/reactos/dll/win32/msgina/msgina.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/msgina.rc?... ============================================================================== --- trunk/reactos/dll/win32/msgina/msgina.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msgina/msgina.rc [iso-8859-1] Thu Feb 20 22:00:30 2014 @@ -11,6 +11,7 @@
IDI_ROSLOGO BITMAP "resources/reactos.bmp" IDI_LOCKICON ICON "resources/21.ico" +IDI_SHELL_SHUTDOWN ICON "resources/shutdown.ico"
/* UTF-8 */ #pragma code_page(65001)
Modified: trunk/reactos/dll/win32/msgina/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/resource.h... ============================================================================== --- trunk/reactos/dll/win32/msgina/resource.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msgina/resource.h [iso-8859-1] Thu Feb 20 22:00:30 2014 @@ -7,20 +7,23 @@ #define IDD_LOGGEDOUT_DLG 103 #define IDD_LOCKED_DLG 104 #define IDD_UNLOCK_DLG 105 +#define IDD_SHUTDOWN_DLG 108
-#define IDC_LOGOFF 1001 -#define IDC_USERNAME 1002 -#define IDC_PASSWORD 1003 -#define IDC_SHUTDOWN 1004 -#define IDC_STATUSLABEL 1005 -#define IDC_LOCK 1006 -#define IDC_ROSLOGO 1007 -#define IDC_TASKMGR 1008 -#define IDC_LOCKMSG 1009 -#define IDC_LOGONMSG 1010 -#define IDC_LOGONDATE 1011 -#define IDC_CHANGEPWD 1012 -#define IDC_LOGON_TO 1013 +#define IDC_LOGOFF 1001 +#define IDC_USERNAME 1002 +#define IDC_PASSWORD 1003 +#define IDC_SHUTDOWN 1004 +#define IDC_STATUSLABEL 1005 +#define IDC_LOCK 1006 +#define IDC_ROSLOGO 1007 +#define IDC_TASKMGR 1008 +#define IDC_LOCKMSG 1009 +#define IDC_LOGONMSG 1010 +#define IDC_LOGONDATE 1011 +#define IDC_CHANGEPWD 1012 +#define IDC_LOGON_TO 1013 +#define IDC_SHUTDOWN_LIST 1014 +#define IDC_SHUTDOWN_DESCRIPTION 1015
#define IDD_CHANGE_PASSWORD 106 #define IDC_CHANGEPWD_USERNAME 1013 @@ -31,7 +34,8 @@
#define IDD_LOGOFF_DLG 107
-#define IDI_ROSLOGO 20000 +#define IDI_ROSLOGO 20000 +#define IDI_SHELL_SHUTDOWN 20001
#define IDI_LOCKICON 21
@@ -50,3 +54,15 @@ #define IDS_CHANGEPWDTITLE 40012 #define IDS_NONMATCHINGPASSWORDS 40013 #define IDS_PASSWORDCHANGED 40014 + +#define IDS_SHUTDOWN_SHUTDOWN 50000 +#define IDS_SHUTDOWN_LOGOFF 50001 +#define IDS_SHUTDOWN_RESTART 50002 +#define IDS_SHUTDOWN_SLEEP 50003 +#define IDS_SHUTDOWN_HIBERNATE 50004 +/* Shut down descriptions */ +#define IDS_SHUTDOWN_SHUTDOWN_DESC 50005 +#define IDS_SHUTDOWN_LOGOFF_DESC 50006 +#define IDS_SHUTDOWN_RESTART_DESC 50007 +#define IDS_SHUTDOWN_SLEEP_DESC 50008 +#define IDS_SHUTDOWN_HIBERNATE_DESC 50009
Added: trunk/reactos/dll/win32/msgina/resources/shutdown.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/resources/... ============================================================================== Binary file - no diff available.
Propchange: trunk/reactos/dll/win32/msgina/resources/shutdown.ico ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream