From c48c7cff18d5b76f82cb72afdeb774b56f74b84c Mon Sep 17 00:00:00 2001 From: Johannes Anderwald Date: Sun, 26 Aug 2007 23:41:04 +0000 Subject: [PATCH] - add restart button by Vytis Girdzijauskas, "CMan", cman[at]cman[dot]us - the icon is taken from the tango project (see view-refresh.svg) See issue #2599 for more details. svn path=/trunk/; revision=28587 --- reactos/base/shell/explorer/explorer-bg.rc | 2 ++ reactos/base/shell/explorer/explorer-bn.rc | 2 ++ reactos/base/shell/explorer/explorer-cn.rc | 1 + reactos/base/shell/explorer/explorer-cz.rc | 2 ++ reactos/base/shell/explorer/explorer-de.rc | 2 ++ reactos/base/shell/explorer/explorer-en.rc | 2 ++ reactos/base/shell/explorer/explorer-es.rc | 2 ++ reactos/base/shell/explorer/explorer-fr.rc | 2 ++ reactos/base/shell/explorer/explorer-gr.rc | 2 ++ reactos/base/shell/explorer/explorer-hu.rc | 2 ++ reactos/base/shell/explorer/explorer-id.rc | 2 ++ reactos/base/shell/explorer/explorer-it.rc | 2 ++ reactos/base/shell/explorer/explorer-jp.rc | 2 ++ reactos/base/shell/explorer/explorer-nl.rc | 2 ++ reactos/base/shell/explorer/explorer-no.rc | 2 ++ reactos/base/shell/explorer/explorer-pl.rc | 2 ++ reactos/base/shell/explorer/explorer-pt.rc | 2 ++ reactos/base/shell/explorer/explorer-ro.rc | 2 ++ reactos/base/shell/explorer/explorer-ru.rc | 2 ++ reactos/base/shell/explorer/explorer-sk.rc | 2 ++ reactos/base/shell/explorer/explorer-sv.rc | 2 ++ reactos/base/shell/explorer/explorer-uk.rc | 2 ++ reactos/base/shell/explorer/explorer.cpp | 1 + .../base/shell/explorer/explorer_intres.rc | 2 ++ reactos/base/shell/explorer/globals.h | 1 + reactos/base/shell/explorer/res/restart.ico | Bin 0 -> 29926 bytes reactos/base/shell/explorer/resource.h | 2 ++ .../base/shell/explorer/taskbar/desktopbar.h | 1 + .../base/shell/explorer/taskbar/startmenu.cpp | 25 +++++++++++++++--- .../base/shell/explorer/taskbar/startmenu.h | 1 + 30 files changed, 72 insertions(+), 4 deletions(-) create mode 100644 reactos/base/shell/explorer/res/restart.ico diff --git a/reactos/base/shell/explorer/explorer-bg.rc b/reactos/base/shell/explorer/explorer-bg.rc index c08b490f83c..81714f1298f 100644 --- a/reactos/base/shell/explorer/explorer-bg.rc +++ b/reactos/base/shell/explorer/explorer-bg.rc @@ -330,6 +330,7 @@ BEGIN IDS_START "" IDS_LOGOFF "..." IDS_SHUTDOWN "..." + IDS_RESTART "Restart..." IDS_LAUNCH "..." IDS_START_HELP "" IDS_SEARCH_FILES "" @@ -397,3 +398,4 @@ END ///////////////////////////////////////////////////////////////////////////// #endif // not APSTUDIO_INVOKED + diff --git a/reactos/base/shell/explorer/explorer-bn.rc b/reactos/base/shell/explorer/explorer-bn.rc index eea7c3c9965..2d9b11ec97c 100644 --- a/reactos/base/shell/explorer/explorer-bn.rc +++ b/reactos/base/shell/explorer/explorer-bn.rc @@ -327,6 +327,7 @@ BEGIN IDS_START "KvhKvix ZvwjKv" IDS_LOGOFF "Log Off..." IDS_SHUTDOWN "e Kiv..." + IDS_RESTART "Restart..." IDS_LAUNCH "cwiPvjbv..." IDS_START_HELP "mvnvh" IDS_SEARCH_FILES "Abymvb..." @@ -394,3 +395,4 @@ END ///////////////////////////////////////////////////////////////////////////// #endif // not APSTUDIO_INVOKED + diff --git a/reactos/base/shell/explorer/explorer-cn.rc b/reactos/base/shell/explorer/explorer-cn.rc index 46254052847..94e7b1f31b9 100644 --- a/reactos/base/shell/explorer/explorer-cn.rc +++ b/reactos/base/shell/explorer/explorer-cn.rc @@ -330,6 +330,7 @@ BEGIN IDS_START "ʼ" IDS_LOGOFF "ע..." IDS_SHUTDOWN "ر..." + IDS_RESTART "Restart..." IDS_LAUNCH "..." IDS_START_HELP "" IDS_SEARCH_FILES "..." diff --git a/reactos/base/shell/explorer/explorer-cz.rc b/reactos/base/shell/explorer/explorer-cz.rc index d9bbb3b4e1c..238687c421c 100644 --- a/reactos/base/shell/explorer/explorer-cz.rc +++ b/reactos/base/shell/explorer/explorer-cz.rc @@ -330,6 +330,7 @@ BEGIN IDS_START "Start" IDS_LOGOFF "Odhlsit se..." IDS_SHUTDOWN "Vypnout..." + IDS_RESTART "Restart..." IDS_LAUNCH "Spustit..." IDS_START_HELP "Pomoc" IDS_SEARCH_FILES "Hledat" @@ -398,3 +399,4 @@ END #endif // not APSTUDIO_INVOKED + diff --git a/reactos/base/shell/explorer/explorer-de.rc b/reactos/base/shell/explorer/explorer-de.rc index f748a93795e..97e4066f02e 100644 --- a/reactos/base/shell/explorer/explorer-de.rc +++ b/reactos/base/shell/explorer/explorer-de.rc @@ -336,6 +336,7 @@ BEGIN IDS_START "Start" IDS_LOGOFF "Abmelden..." IDS_SHUTDOWN "Herunterfahren..." + IDS_RESTART "Restart..." IDS_LAUNCH "Ausfhren..." IDS_START_HELP "Hilfe" IDS_SEARCH_FILES "Suche Dateien..." @@ -403,3 +404,4 @@ END ///////////////////////////////////////////////////////////////////////////// #endif // not APSTUDIO_INVOKED + diff --git a/reactos/base/shell/explorer/explorer-en.rc b/reactos/base/shell/explorer/explorer-en.rc index 27d40c9e4a4..d2b345d6542 100644 --- a/reactos/base/shell/explorer/explorer-en.rc +++ b/reactos/base/shell/explorer/explorer-en.rc @@ -330,6 +330,7 @@ BEGIN IDS_START "Start" IDS_LOGOFF "Log Off..." IDS_SHUTDOWN "Turn Off..." + IDS_RESTART "Restart..." IDS_LAUNCH "Run..." IDS_START_HELP "Help" IDS_SEARCH_FILES "Search..." @@ -398,3 +399,4 @@ END #endif // not APSTUDIO_INVOKED + diff --git a/reactos/base/shell/explorer/explorer-es.rc b/reactos/base/shell/explorer/explorer-es.rc index 07220b93768..bb388ed3055 100644 --- a/reactos/base/shell/explorer/explorer-es.rc +++ b/reactos/base/shell/explorer/explorer-es.rc @@ -315,6 +315,7 @@ BEGIN IDS_START "Iniciar" IDS_LOGOFF "Salir..." IDS_SHUTDOWN "Apagar..." + IDS_RESTART "Restart..." IDS_LAUNCH "Ejecutar..." IDS_START_HELP "Ayuda" IDS_SEARCH_FILES "Buscar..." @@ -382,3 +383,4 @@ END ///////////////////////////////////////////////////////////////////////////// #endif // not APSTUDIO_INVOKED + diff --git a/reactos/base/shell/explorer/explorer-fr.rc b/reactos/base/shell/explorer/explorer-fr.rc index 44ea0d3821c..2e0b4cd01de 100644 --- a/reactos/base/shell/explorer/explorer-fr.rc +++ b/reactos/base/shell/explorer/explorer-fr.rc @@ -329,6 +329,7 @@ BEGIN IDS_START "Dmarrer" IDS_LOGOFF "Se dconnecter..." IDS_SHUTDOWN "Arrter..." + IDS_RESTART "Restart..." IDS_LAUNCH "Excuter..." IDS_START_HELP "Aide" IDS_SEARCH_FILES "Rechercher..." @@ -396,3 +397,4 @@ END ///////////////////////////////////////////////////////////////////////////// #endif // not APSTUDIO_INVOKED + diff --git a/reactos/base/shell/explorer/explorer-gr.rc b/reactos/base/shell/explorer/explorer-gr.rc index 7f2fc3ccd9b..3836c9bd9a5 100644 --- a/reactos/base/shell/explorer/explorer-gr.rc +++ b/reactos/base/shell/explorer/explorer-gr.rc @@ -332,6 +332,7 @@ BEGIN IDS_START "" IDS_LOGOFF "..." IDS_SHUTDOWN "..." + IDS_RESTART "Restart..." IDS_LAUNCH "..." IDS_START_HELP "" IDS_SEARCH_FILES "..." @@ -399,3 +400,4 @@ END ///////////////////////////////////////////////////////////////////////////// #endif // not APSTUDIO_INVOKED + diff --git a/reactos/base/shell/explorer/explorer-hu.rc b/reactos/base/shell/explorer/explorer-hu.rc index 29e7cae8a58..1f1bf7f1e17 100644 --- a/reactos/base/shell/explorer/explorer-hu.rc +++ b/reactos/base/shell/explorer/explorer-hu.rc @@ -330,6 +330,7 @@ BEGIN IDS_START "Start" IDS_LOGOFF "Kijelentkezs..." IDS_SHUTDOWN "Kikapcsols..." + IDS_RESTART "Restart..." IDS_LAUNCH "Futtats..." IDS_START_HELP "Sg" IDS_SEARCH_FILES "Keress..." @@ -397,3 +398,4 @@ END ///////////////////////////////////////////////////////////////////////////// #endif // not APSTUDIO_INVOKED + diff --git a/reactos/base/shell/explorer/explorer-id.rc b/reactos/base/shell/explorer/explorer-id.rc index f736acf4c74..90a74f8a6db 100644 --- a/reactos/base/shell/explorer/explorer-id.rc +++ b/reactos/base/shell/explorer/explorer-id.rc @@ -330,6 +330,7 @@ BEGIN IDS_START "Mulai" IDS_LOGOFF "Keluar..." IDS_SHUTDOWN "Matikan..." + IDS_RESTART "Restart..." IDS_LAUNCH "Jalankan..." IDS_START_HELP "Bantuan" IDS_SEARCH_FILES "Cari..." @@ -397,3 +398,4 @@ END ///////////////////////////////////////////////////////////////////////////// #endif // not APSTUDIO_INVOKED + diff --git a/reactos/base/shell/explorer/explorer-it.rc b/reactos/base/shell/explorer/explorer-it.rc index 02913d99d10..317fe929e29 100644 --- a/reactos/base/shell/explorer/explorer-it.rc +++ b/reactos/base/shell/explorer/explorer-it.rc @@ -294,6 +294,7 @@ BEGIN IDS_START "Start" IDS_LOGOFF "Disconnetti..." IDS_SHUTDOWN "Chiudi sessione..." + IDS_RESTART "Restart..." IDS_LAUNCH "Esegui..." IDS_START_HELP "Guida" IDS_SEARCH_FILES "Cerca..." @@ -361,3 +362,4 @@ END ///////////////////////////////////////////////////////////////////////////// #endif // not APSTUDIO_INVOKED + diff --git a/reactos/base/shell/explorer/explorer-jp.rc b/reactos/base/shell/explorer/explorer-jp.rc index 37a728dbac1..1f3a07888c1 100644 --- a/reactos/base/shell/explorer/explorer-jp.rc +++ b/reactos/base/shell/explorer/explorer-jp.rc @@ -330,6 +330,7 @@ BEGIN IDS_START "" IDS_LOGOFF "OIt..." IDS_SHUTDOWN "Vbg_E..." + IDS_RESTART "Restart..." IDS_LAUNCH "t@Cw肵Ďs..." IDS_START_HELP "wv" IDS_SEARCH_FILES "t@CtH_..." @@ -397,3 +398,4 @@ END ///////////////////////////////////////////////////////////////////////////// #endif // not APSTUDIO_INVOKED + diff --git a/reactos/base/shell/explorer/explorer-nl.rc b/reactos/base/shell/explorer/explorer-nl.rc index 36fd9804c0e..cac718637c3 100644 --- a/reactos/base/shell/explorer/explorer-nl.rc +++ b/reactos/base/shell/explorer/explorer-nl.rc @@ -330,6 +330,7 @@ BEGIN IDS_START "Start" IDS_LOGOFF "Afmelden..." IDS_SHUTDOWN "Uitschakelen..." + IDS_RESTART "Restart..." IDS_LAUNCH "Uitvoeren..." IDS_START_HELP "Help" IDS_SEARCH_FILES "Zoeken..." @@ -397,3 +398,4 @@ END ///////////////////////////////////////////////////////////////////////////// #endif // not APSTUDIO_INVOKED + diff --git a/reactos/base/shell/explorer/explorer-no.rc b/reactos/base/shell/explorer/explorer-no.rc index 2401e787986..4f179711937 100644 --- a/reactos/base/shell/explorer/explorer-no.rc +++ b/reactos/base/shell/explorer/explorer-no.rc @@ -330,6 +330,7 @@ BEGIN IDS_START "Start" IDS_LOGOFF "Logg av..." IDS_SHUTDOWN "Sl av..." + IDS_RESTART "Restart..." IDS_LAUNCH "Kjr..." IDS_START_HELP "Hjelp" IDS_SEARCH_FILES "Sk..." @@ -398,3 +399,4 @@ END #endif // not APSTUDIO_INVOKED + diff --git a/reactos/base/shell/explorer/explorer-pl.rc b/reactos/base/shell/explorer/explorer-pl.rc index 06207712bd0..b79b3604d2b 100644 --- a/reactos/base/shell/explorer/explorer-pl.rc +++ b/reactos/base/shell/explorer/explorer-pl.rc @@ -330,6 +330,7 @@ BEGIN IDS_START "Start" IDS_LOGOFF "Wyloguj..." IDS_SHUTDOWN "Zamknij system..." + IDS_RESTART "Restart..." IDS_LAUNCH "Uruchom..." IDS_START_HELP "Pomoc" IDS_SEARCH_FILES "Szukaj..." @@ -398,3 +399,4 @@ END #endif // not APSTUDIO_INVOKED + diff --git a/reactos/base/shell/explorer/explorer-pt.rc b/reactos/base/shell/explorer/explorer-pt.rc index 07e74b9b3e2..1b760a0719a 100644 --- a/reactos/base/shell/explorer/explorer-pt.rc +++ b/reactos/base/shell/explorer/explorer-pt.rc @@ -98,6 +98,7 @@ BEGIN IDS_START "Iniciar" IDS_LOGOFF "Terminar sesso..." IDS_SHUTDOWN "Desligar..." + IDS_RESTART "Restart..." IDS_LAUNCH "Executar..." IDS_START_HELP "Ajuda" IDS_SEARCH_FILES "Procurar..." @@ -165,3 +166,4 @@ END ///////////////////////////////////////////////////////////////////////////// #endif // not APSTUDIO_INVOKED + diff --git a/reactos/base/shell/explorer/explorer-ro.rc b/reactos/base/shell/explorer/explorer-ro.rc index 7247fc082b9..e65f2e833e3 100644 --- a/reactos/base/shell/explorer/explorer-ro.rc +++ b/reactos/base/shell/explorer/explorer-ro.rc @@ -134,6 +134,7 @@ BEGIN IDS_START "ncepe" IDS_LOGOFF "nchide sesiunea ..." IDS_SHUTDOWN "Oprire calculator ..." + IDS_RESTART "Restart..." IDS_LAUNCH "Pornire ..." IDS_START_HELP "Ajutor" IDS_SEARCH_FILES "Cutare Files..." @@ -243,3 +244,4 @@ END #endif // not APSTUDIO_INVOKED + diff --git a/reactos/base/shell/explorer/explorer-ru.rc b/reactos/base/shell/explorer/explorer-ru.rc index c363fe531d5..2453f89f405 100644 --- a/reactos/base/shell/explorer/explorer-ru.rc +++ b/reactos/base/shell/explorer/explorer-ru.rc @@ -330,6 +330,7 @@ BEGIN IDS_START "" IDS_LOGOFF " ..." IDS_SHUTDOWN "..." + IDS_RESTART "Restart..." IDS_LAUNCH "..." IDS_START_HELP "" IDS_SEARCH_FILES "..." @@ -398,3 +399,4 @@ END #endif // not APSTUDIO_INVOKED + diff --git a/reactos/base/shell/explorer/explorer-sk.rc b/reactos/base/shell/explorer/explorer-sk.rc index 6a3f7aabcf9..fda3884e777 100644 --- a/reactos/base/shell/explorer/explorer-sk.rc +++ b/reactos/base/shell/explorer/explorer-sk.rc @@ -340,6 +340,7 @@ BEGIN IDS_START "tart" IDS_LOGOFF "Odhlsi..." IDS_SHUTDOWN "Vypn..." + IDS_RESTART "Restart..." IDS_LAUNCH "Spusti..." IDS_START_HELP "Pomocnk" IDS_SEARCH_FILES "Hada..." @@ -407,3 +408,4 @@ END ///////////////////////////////////////////////////////////////////////////// #endif // not APSTUDIO_INVOKED + diff --git a/reactos/base/shell/explorer/explorer-sv.rc b/reactos/base/shell/explorer/explorer-sv.rc index fb83dd67314..0200675178c 100644 --- a/reactos/base/shell/explorer/explorer-sv.rc +++ b/reactos/base/shell/explorer/explorer-sv.rc @@ -325,6 +325,7 @@ BEGIN IDS_START "Start" IDS_LOGOFF "Logga ut..." IDS_SHUTDOWN "Stng av..." + IDS_RESTART "Restart..." IDS_LAUNCH "Kr..." IDS_START_HELP "Hjlp" IDS_SEARCH_FILES "Sk..." @@ -392,3 +393,4 @@ END ///////////////////////////////////////////////////////////////////////////// #endif // not APSTUDIO_INVOKED + diff --git a/reactos/base/shell/explorer/explorer-uk.rc b/reactos/base/shell/explorer/explorer-uk.rc index b63c904705b..921ed61cc94 100644 --- a/reactos/base/shell/explorer/explorer-uk.rc +++ b/reactos/base/shell/explorer/explorer-uk.rc @@ -330,6 +330,7 @@ BEGIN IDS_START "" IDS_LOGOFF " ..." IDS_SHUTDOWN "..." + IDS_RESTART "Restart..." IDS_LAUNCH "..." IDS_START_HELP "" IDS_SEARCH_FILES "..." @@ -397,3 +398,4 @@ END ///////////////////////////////////////////////////////////////////////////// #endif // not APSTUDIO_INVOKED + diff --git a/reactos/base/shell/explorer/explorer.cpp b/reactos/base/shell/explorer/explorer.cpp index a37104ce9a2..4de57f68858 100644 --- a/reactos/base/shell/explorer/explorer.cpp +++ b/reactos/base/shell/explorer/explorer.cpp @@ -402,6 +402,7 @@ void IconCache::init() _icons[ICID_COMPUTER] = Icon(ICID_COMPUTER, IDI_COMPUTER, icon_size); _icons[ICID_LOGOFF] = Icon(ICID_LOGOFF, IDI_LOGOFF, icon_size); _icons[ICID_SHUTDOWN] = Icon(ICID_SHUTDOWN, IDI_SHUTDOWN, icon_size); + _icons[ICID_RESTART] = Icon(ICID_RESTART, IDI_RESTART, icon_size); _icons[ICID_BOOKMARK] = Icon(ICID_BOOKMARK, IDI_DOT_TRANS, icon_size); _icons[ICID_MINIMIZE] = Icon(ICID_MINIMIZE, IDI_MINIMIZE, icon_size); _icons[ICID_CONTROLPAN] = Icon(ICID_CONTROLPAN, IDI_CONTROLPAN, icon_size); diff --git a/reactos/base/shell/explorer/explorer_intres.rc b/reactos/base/shell/explorer/explorer_intres.rc index 71b34e513c4..050e128c70b 100644 --- a/reactos/base/shell/explorer/explorer_intres.rc +++ b/reactos/base/shell/explorer/explorer_intres.rc @@ -152,6 +152,7 @@ IDI_EXPLORER ICON DISCARDABLE "res/explorer.ico" IDI_STARTMENU ICON DISCARDABLE "res/startmenu.ico" IDI_LOGOFF ICON DISCARDABLE "res/logoff.ico" IDI_SHUTDOWN ICON DISCARDABLE "res/shutdown.ico" +IDI_RESTART ICON DISCARDABLE "res/restart.ico" IDI_ARROW ICON DISCARDABLE "res/arrow.ico" IDI_ARROW_SELECTED ICON DISCARDABLE "res/arrowsel.ico" IDI_APPICON ICON DISCARDABLE "res/appicon.ico" @@ -244,3 +245,4 @@ CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST DISCARDABLE PURE "explorer.exe.ma ///////////////////////////////////////////////////////////////////////////// #endif // not APSTUDIO_INVOKED + diff --git a/reactos/base/shell/explorer/globals.h b/reactos/base/shell/explorer/globals.h index 899ca7cf87f..1848771c139 100644 --- a/reactos/base/shell/explorer/globals.h +++ b/reactos/base/shell/explorer/globals.h @@ -81,6 +81,7 @@ enum ICON_ID { ICID_COMPUTER, ICID_LOGOFF, ICID_SHUTDOWN, + ICID_RESTART, ICID_BOOKMARK, ICID_MINIMIZE, ICID_CONTROLPAN, diff --git a/reactos/base/shell/explorer/res/restart.ico b/reactos/base/shell/explorer/res/restart.ico new file mode 100644 index 0000000000000000000000000000000000000000..31c1b5cd29906e70b08eb0f8bbde594956f42d0f GIT binary patch literal 29926 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 YJL^~QyAW@hrpv=vg0Ket`S(NqAF1Vf(*OVf literal 0 HcmV?d00001 diff --git a/reactos/base/shell/explorer/resource.h b/reactos/base/shell/explorer/resource.h index 60872988f9f..678c106e50a 100644 --- a/reactos/base/shell/explorer/resource.h +++ b/reactos/base/shell/explorer/resource.h @@ -48,6 +48,7 @@ #define IDS_SHOW_HIDDEN_ICONS 43 #define IDS_HIDE_ICONS 44 #define IDS_TERMINATE 45 +#define IDS_RESTART 46 #define IDI_REACTOS 100 #define IDI_EXPLORER 101 #define IDI_STARTMENU 102 @@ -123,6 +124,7 @@ #define IDI_NETCONNS 175 #define IDI_ADMIN 176 #define IDI_RECENT 178 +#define IDI_RESTART 179 #define ID_VIEW_NAME 401 #define ID_VIEW_ALL_ATTRIBUTES 402 #define ID_VIEW_SELECTED_ATTRIBUTES 403 diff --git a/reactos/base/shell/explorer/taskbar/desktopbar.h b/reactos/base/shell/explorer/taskbar/desktopbar.h index 288142210a2..fd17c16a759 100644 --- a/reactos/base/shell/explorer/taskbar/desktopbar.h +++ b/reactos/base/shell/explorer/taskbar/desktopbar.h @@ -59,6 +59,7 @@ #define IDC_SEARCH_PROGRAM 0x1016 #define IDC_SEARCH 0x1017 #define IDC_TERMINATE 0x1018 +#define IDC_RESTART 0x1019 #define IDC_FIRST_MENU 0x3000 diff --git a/reactos/base/shell/explorer/taskbar/startmenu.cpp b/reactos/base/shell/explorer/taskbar/startmenu.cpp index d44db044dd5..7ba98ad51d5 100644 --- a/reactos/base/shell/explorer/taskbar/startmenu.cpp +++ b/reactos/base/shell/explorer/taskbar/startmenu.cpp @@ -1752,21 +1752,23 @@ LRESULT StartMenuRoot::Init(LPCREATESTRUCT pcs) #ifndef __MINGW32__ // SHRestricted() missing in MinGW (as of 29.10.2003) - if (!g_Globals._SHRestricted || !SHRestricted(REST_NOCLOSE)) + if (!g_Globals._SHRestricted || SHRestricted(REST_STARTMENULOGOFF) != 1) #else if (IS_VALUE_NOT_ZERO(hkeyAdv, _T("StartMenuLogoff"))) #endif AddButton(ResString(IDS_LOGOFF), ICID_LOGOFF, false, IDC_LOGOFF); +#ifdef _ROS_ + AddButton(ResString(IDS_RESTART), ICID_RESTART, false, IDC_RESTART); +#endif #ifndef __MINGW32__ // SHRestricted() missing in MinGW (as of 29.10.2003) - if (!g_Globals._SHRestricted || SHRestricted(REST_STARTMENULOGOFF) != 1) + if (!g_Globals._SHRestricted || !SHRestricted(REST_NOCLOSE)) #else if (IS_VALUE_ZERO(hkey, _T("NoClose"))) #endif AddButton(ResString(IDS_SHUTDOWN), ICID_SHUTDOWN, false, IDC_SHUTDOWN); - #ifndef _ROS_ AddButton(ResString(IDS_TERMINATE), ICID_LOGOFF, false, IDC_TERMINATE); #endif @@ -1940,9 +1942,15 @@ int StartMenuHandler::Command(int id, int code) case IDC_SHUTDOWN: CloseStartMenu(id); - ShowExitWindowsDialog(g_Globals._hwndDesktopBar); + ShowExitWindowsDialog(g_Globals._hwndDesktop); break; + case IDC_RESTART: + CloseStartMenu(id); + ShowRestartDialog(g_Globals._hwndDesktop, EWX_REBOOT); + /* An alternative way to do restart without shell32 help */ + //launch_file(_hwnd, TEXT("shutdown.exe"), SW_HIDE, TEXT("-r")); + break; // settings menu @@ -2149,6 +2157,15 @@ void ShowExitWindowsDialog(HWND hwndOwner) MessageBox(hwndOwner, TEXT("ExitWindowsDialog() not yet implemented in SHELL32"), ResString(IDS_TITLE), MB_OK); } +void StartMenuHandler::ShowRestartDialog(HWND hwndOwner, UINT flags) +{ + static DynamicFct RestartDlg(TEXT("SHELL32"), 59); + + if (RestartDlg) + (*RestartDlg)(hwndOwner, (LPWSTR)L"You selected restart.\n\n", flags); + else + MessageBox(hwndOwner, TEXT("RestartDlg() not yet implemented in SHELL32"), ResString(IDS_TITLE), MB_OK); +} void SettingsMenu::AddEntries() { diff --git a/reactos/base/shell/explorer/taskbar/startmenu.h b/reactos/base/shell/explorer/taskbar/startmenu.h index db9cc63902d..53bb6592e9f 100644 --- a/reactos/base/shell/explorer/taskbar/startmenu.h +++ b/reactos/base/shell/explorer/taskbar/startmenu.h @@ -348,6 +348,7 @@ protected: static void ShowLaunchDialog(HWND hwndOwner); static void ShowLogoffDialog(HWND hwndOwner); + static void ShowRestartDialog(HWND hwndOwner, UINT flags); static void ShowSearchDialog(); static void ShowSearchComputer(); };