[janderwald] 28587: - 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.
26 Aug
2007
26 Aug
'07
11:41 p.m.
Author: janderwald
Date: Mon Aug 27 03:41:04 2007
New Revision: 28587
URL: http://svn.reactos.org/svn/reactos?rev=28587&view=rev
Log:
- 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.
Added:
trunk/reactos/base/shell/explorer/res/restart.ico (with props)
Modified:
trunk/reactos/base/shell/explorer/explorer-bg.rc
trunk/reactos/base/shell/explorer/explorer-bn.rc
trunk/reactos/base/shell/explorer/explorer-cn.rc
trunk/reactos/base/shell/explorer/explorer-cz.rc
trunk/reactos/base/shell/explorer/explorer-de.rc
trunk/reactos/base/shell/explorer/explorer-en.rc
trunk/reactos/base/shell/explorer/explorer-es.rc
trunk/reactos/base/shell/explorer/explorer-fr.rc
trunk/reactos/base/shell/explorer/explorer-gr.rc
trunk/reactos/base/shell/explorer/explorer-hu.rc
trunk/reactos/base/shell/explorer/explorer-id.rc
trunk/reactos/base/shell/explorer/explorer-it.rc
trunk/reactos/base/shell/explorer/explorer-jp.rc
trunk/reactos/base/shell/explorer/explorer-nl.rc
trunk/reactos/base/shell/explorer/explorer-no.rc
trunk/reactos/base/shell/explorer/explorer-pl.rc
trunk/reactos/base/shell/explorer/explorer-pt.rc
trunk/reactos/base/shell/explorer/explorer-ro.rc
trunk/reactos/base/shell/explorer/explorer-ru.rc
trunk/reactos/base/shell/explorer/explorer-sk.rc
trunk/reactos/base/shell/explorer/explorer-sv.rc
trunk/reactos/base/shell/explorer/explorer-uk.rc
trunk/reactos/base/shell/explorer/explorer.cpp
trunk/reactos/base/shell/explorer/explorer_intres.rc
trunk/reactos/base/shell/explorer/globals.h
trunk/reactos/base/shell/explorer/resource.h
trunk/reactos/base/shell/explorer/taskbar/desktopbar.h
trunk/reactos/base/shell/explorer/taskbar/startmenu.cpp
trunk/reactos/base/shell/explorer/taskbar/startmenu.h
Modified: trunk/reactos/base/shell/explorer/explorer-bg.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/explor…
==============================================================================
--- trunk/reactos/base/shell/explorer/explorer-bg.rc (original)
+++ trunk/reactos/base/shell/explorer/explorer-bg.rc Mon Aug 27 03:41:04 2007
@@ -330,6 +330,7 @@
IDS_START "Ïóñê"
IDS_LOGOFF "Èçõîä..."
IDS_SHUTDOWN "Èçêëþ÷âàíå..."
+ IDS_RESTART "Restart..."
IDS_LAUNCH "Èçïúëíÿâàíå..."
IDS_START_HELP "Ïîìîù"
IDS_SEARCH_FILES "Òúðñåíå"
@@ -397,3 +398,4 @@
/////////////////////////////////////////////////////////////////////////////
#endif // not APSTUDIO_INVOKED
+
Modified: trunk/reactos/base/shell/explorer/explorer-bn.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/explor…
==============================================================================
--- trunk/reactos/base/shell/explorer/explorer-bn.rc (original)
+++ trunk/reactos/base/shell/explorer/explorer-bn.rc Mon Aug 27 03:41:04 2007
@@ -327,6 +327,7 @@
IDS_START "Kvh©Kvix ZvwjKv"
IDS_LOGOFF "Log Off..."
IDS_SHUTDOWN "eÜ Kiv..."
+ IDS_RESTART "Restart..."
IDS_LAUNCH "cwiPvjbv..."
IDS_START_HELP "mvnvh¨"
IDS_SEARCH_FILES "AbymÜvb..."
@@ -394,3 +395,4 @@
/////////////////////////////////////////////////////////////////////////////
#endif // not APSTUDIO_INVOKED
+
Modified: trunk/reactos/base/shell/explorer/explorer-cn.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/explor…
==============================================================================
--- trunk/reactos/base/shell/explorer/explorer-cn.rc (original)
+++ trunk/reactos/base/shell/explorer/explorer-cn.rc Mon Aug 27 03:41:04 2007
@@ -330,6 +330,7 @@
IDS_START "¿ªÊ¼"
IDS_LOGOFF "×¢Ïú..."
IDS_SHUTDOWN "¹Ø±Õ..."
+ IDS_RESTART "Restart..."
IDS_LAUNCH "ÔËÐÐ..."
IDS_START_HELP "°ïÖú"
IDS_SEARCH_FILES "ËÑË÷..."
Modified: trunk/reactos/base/shell/explorer/explorer-cz.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/explor…
==============================================================================
--- trunk/reactos/base/shell/explorer/explorer-cz.rc (original)
+++ trunk/reactos/base/shell/explorer/explorer-cz.rc Mon Aug 27 03:41:04 2007
@@ -330,6 +330,7 @@
IDS_START "Start"
IDS_LOGOFF "Odhlásit se..."
IDS_SHUTDOWN "Vypnout..."
+ IDS_RESTART "Restart..."
IDS_LAUNCH "Spustit..."
IDS_START_HELP "Pomoc"
IDS_SEARCH_FILES "Hledat"
@@ -398,3 +399,4 @@
#endif // not APSTUDIO_INVOKED
+
Modified: trunk/reactos/base/shell/explorer/explorer-de.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/explor…
==============================================================================
--- trunk/reactos/base/shell/explorer/explorer-de.rc (original)
+++ trunk/reactos/base/shell/explorer/explorer-de.rc Mon Aug 27 03:41:04 2007
@@ -336,6 +336,7 @@
IDS_START "Start"
IDS_LOGOFF "Abmelden..."
IDS_SHUTDOWN "Herunterfahren..."
+ IDS_RESTART "Restart..."
IDS_LAUNCH "Ausführen..."
IDS_START_HELP "Hilfe"
IDS_SEARCH_FILES "Suche Dateien..."
@@ -403,3 +404,4 @@
/////////////////////////////////////////////////////////////////////////////
#endif // not APSTUDIO_INVOKED
+
Modified: trunk/reactos/base/shell/explorer/explorer-en.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/explor…
==============================================================================
--- trunk/reactos/base/shell/explorer/explorer-en.rc (original)
+++ trunk/reactos/base/shell/explorer/explorer-en.rc Mon Aug 27 03:41:04 2007
@@ -330,6 +330,7 @@
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 @@
#endif // not APSTUDIO_INVOKED
+
Modified: trunk/reactos/base/shell/explorer/explorer-es.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/explor…
==============================================================================
--- trunk/reactos/base/shell/explorer/explorer-es.rc (original)
+++ trunk/reactos/base/shell/explorer/explorer-es.rc Mon Aug 27 03:41:04 2007
@@ -315,6 +315,7 @@
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 @@
/////////////////////////////////////////////////////////////////////////////
#endif // not APSTUDIO_INVOKED
+
Modified: trunk/reactos/base/shell/explorer/explorer-fr.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/explor…
==============================================================================
--- trunk/reactos/base/shell/explorer/explorer-fr.rc (original)
+++ trunk/reactos/base/shell/explorer/explorer-fr.rc Mon Aug 27 03:41:04 2007
@@ -329,6 +329,7 @@
IDS_START "Démarrer"
IDS_LOGOFF "Se déconnecter..."
IDS_SHUTDOWN "Arrêter..."
+ IDS_RESTART "Restart..."
IDS_LAUNCH "Exécuter..."
IDS_START_HELP "Aide"
IDS_SEARCH_FILES "Rechercher..."
@@ -396,3 +397,4 @@
/////////////////////////////////////////////////////////////////////////////
#endif // not APSTUDIO_INVOKED
+
Modified: trunk/reactos/base/shell/explorer/explorer-gr.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/explor…
==============================================================================
--- trunk/reactos/base/shell/explorer/explorer-gr.rc (original)
+++ trunk/reactos/base/shell/explorer/explorer-gr.rc Mon Aug 27 03:41:04 2007
@@ -332,6 +332,7 @@
IDS_START "Ýíáñîç"
IDS_LOGOFF "Áðïóýíäåóç..."
IDS_SHUTDOWN "Ôåñìáôéóìüò..."
+ IDS_RESTART "Restart..."
IDS_LAUNCH "ÅêôÝëåóç..."
IDS_START_HELP "ÂïÞèåéá"
IDS_SEARCH_FILES "ÁíáæÞôçóç..."
@@ -399,3 +400,4 @@
/////////////////////////////////////////////////////////////////////////////
#endif // not APSTUDIO_INVOKED
+
Modified: trunk/reactos/base/shell/explorer/explorer-hu.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/explor…
==============================================================================
--- trunk/reactos/base/shell/explorer/explorer-hu.rc (original)
+++ trunk/reactos/base/shell/explorer/explorer-hu.rc Mon Aug 27 03:41:04 2007
@@ -330,6 +330,7 @@
IDS_START "Start"
IDS_LOGOFF "Kijelentkezés..."
IDS_SHUTDOWN "Kikapcsolás..."
+ IDS_RESTART "Restart..."
IDS_LAUNCH "Futtatás..."
IDS_START_HELP "Súgó"
IDS_SEARCH_FILES "Keresés..."
@@ -397,3 +398,4 @@
/////////////////////////////////////////////////////////////////////////////
#endif // not APSTUDIO_INVOKED
+
Modified: trunk/reactos/base/shell/explorer/explorer-id.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/explor…
==============================================================================
--- trunk/reactos/base/shell/explorer/explorer-id.rc (original)
+++ trunk/reactos/base/shell/explorer/explorer-id.rc Mon Aug 27 03:41:04 2007
@@ -330,6 +330,7 @@
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 @@
/////////////////////////////////////////////////////////////////////////////
#endif // not APSTUDIO_INVOKED
+
Modified: trunk/reactos/base/shell/explorer/explorer-it.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/explor…
==============================================================================
--- trunk/reactos/base/shell/explorer/explorer-it.rc (original)
+++ trunk/reactos/base/shell/explorer/explorer-it.rc Mon Aug 27 03:41:04 2007
@@ -294,6 +294,7 @@
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 @@
/////////////////////////////////////////////////////////////////////////////
#endif // not APSTUDIO_INVOKED
+
Modified: trunk/reactos/base/shell/explorer/explorer-jp.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/explor…
==============================================================================
--- trunk/reactos/base/shell/explorer/explorer-jp.rc (original)
+++ trunk/reactos/base/shell/explorer/explorer-jp.rc Mon Aug 27 03:41:04 2007
@@ -330,6 +330,7 @@
IDS_START "½À°Ä"
IDS_LOGOFF "OIt..."
IDS_SHUTDOWN "Vbg_E..."
+ IDS_RESTART "Restart..."
IDS_LAUNCH "t@C¼ðwèµÄÀs..."
IDS_START_HELP "wv"
IDS_SEARCH_FILES "t@CâtH_..."
@@ -397,3 +398,4 @@
/////////////////////////////////////////////////////////////////////////////
#endif // not APSTUDIO_INVOKED
+
Modified: trunk/reactos/base/shell/explorer/explorer-nl.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/explor…
==============================================================================
--- trunk/reactos/base/shell/explorer/explorer-nl.rc (original)
+++ trunk/reactos/base/shell/explorer/explorer-nl.rc Mon Aug 27 03:41:04 2007
@@ -330,6 +330,7 @@
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 @@
/////////////////////////////////////////////////////////////////////////////
#endif // not APSTUDIO_INVOKED
+
Modified: trunk/reactos/base/shell/explorer/explorer-no.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/explor…
==============================================================================
--- trunk/reactos/base/shell/explorer/explorer-no.rc (original)
+++ trunk/reactos/base/shell/explorer/explorer-no.rc Mon Aug 27 03:41:04 2007
@@ -330,6 +330,7 @@
IDS_START "Start"
IDS_LOGOFF "Logg av..."
IDS_SHUTDOWN "Slå av..."
+ IDS_RESTART "Restart..."
IDS_LAUNCH "Kjør..."
IDS_START_HELP "Hjelp"
IDS_SEARCH_FILES "Søk..."
@@ -398,3 +399,4 @@
#endif // not APSTUDIO_INVOKED
+
Modified: trunk/reactos/base/shell/explorer/explorer-pl.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/explor…
==============================================================================
--- trunk/reactos/base/shell/explorer/explorer-pl.rc (original)
+++ trunk/reactos/base/shell/explorer/explorer-pl.rc Mon Aug 27 03:41:04 2007
@@ -330,6 +330,7 @@
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 @@
#endif // not APSTUDIO_INVOKED
+
Modified: trunk/reactos/base/shell/explorer/explorer-pt.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/explor…
==============================================================================
--- trunk/reactos/base/shell/explorer/explorer-pt.rc (original)
+++ trunk/reactos/base/shell/explorer/explorer-pt.rc Mon Aug 27 03:41:04 2007
@@ -98,6 +98,7 @@
IDS_START "Iniciar"
IDS_LOGOFF "Terminar sessão..."
IDS_SHUTDOWN "Desligar..."
+ IDS_RESTART "Restart..."
IDS_LAUNCH "Executar..."
IDS_START_HELP "Ajuda"
IDS_SEARCH_FILES "Procurar..."
@@ -165,3 +166,4 @@
/////////////////////////////////////////////////////////////////////////////
#endif // not APSTUDIO_INVOKED
+
Modified: trunk/reactos/base/shell/explorer/explorer-ro.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/explor…
==============================================================================
--- trunk/reactos/base/shell/explorer/explorer-ro.rc (original)
+++ trunk/reactos/base/shell/explorer/explorer-ro.rc Mon Aug 27 03:41:04 2007
@@ -134,6 +134,7 @@
IDS_START "Începe"
IDS_LOGOFF "Închide sesiunea ..."
IDS_SHUTDOWN "Oprire calculator ..."
+ IDS_RESTART "Restart..."
IDS_LAUNCH "Pornire ..."
IDS_START_HELP "Ajutor"
IDS_SEARCH_FILES "Cãutare Files..."
@@ -243,3 +244,4 @@
#endif // not APSTUDIO_INVOKED
+
Modified: trunk/reactos/base/shell/explorer/explorer-ru.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/explor…
==============================================================================
--- trunk/reactos/base/shell/explorer/explorer-ru.rc (original)
+++ trunk/reactos/base/shell/explorer/explorer-ru.rc Mon Aug 27 03:41:04 2007
@@ -330,6 +330,7 @@
IDS_START "Ïóñê"
IDS_LOGOFF "Âûõîä èç ñèñòåìû..."
IDS_SHUTDOWN "Âûêëþ÷åíèå..."
+ IDS_RESTART "Restart..."
IDS_LAUNCH "Âûïîëíèòü..."
IDS_START_HELP "Ñïðàâêà"
IDS_SEARCH_FILES "Ïîèñê..."
@@ -398,3 +399,4 @@
#endif // not APSTUDIO_INVOKED
+
Modified: trunk/reactos/base/shell/explorer/explorer-sk.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/explor…
==============================================================================
--- trunk/reactos/base/shell/explorer/explorer-sk.rc (original)
+++ trunk/reactos/base/shell/explorer/explorer-sk.rc Mon Aug 27 03:41:04 2007
@@ -340,6 +340,7 @@
IDS_START "tart"
IDS_LOGOFF "Odhlási..."
IDS_SHUTDOWN "Vypnú..."
+ IDS_RESTART "Restart..."
IDS_LAUNCH "Spusti..."
IDS_START_HELP "Pomocník"
IDS_SEARCH_FILES "H¾ada..."
@@ -407,3 +408,4 @@
/////////////////////////////////////////////////////////////////////////////
#endif // not APSTUDIO_INVOKED
+
Modified: trunk/reactos/base/shell/explorer/explorer-sv.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/explor…
==============================================================================
--- trunk/reactos/base/shell/explorer/explorer-sv.rc (original)
+++ trunk/reactos/base/shell/explorer/explorer-sv.rc Mon Aug 27 03:41:04 2007
@@ -325,6 +325,7 @@
IDS_START "Start"
IDS_LOGOFF "Logga ut..."
IDS_SHUTDOWN "Stäng av..."
+ IDS_RESTART "Restart..."
IDS_LAUNCH "Kör..."
IDS_START_HELP "Hjälp"
IDS_SEARCH_FILES "Sök..."
@@ -392,3 +393,4 @@
/////////////////////////////////////////////////////////////////////////////
#endif // not APSTUDIO_INVOKED
+
Modified: trunk/reactos/base/shell/explorer/explorer-uk.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/explor…
==============================================================================
--- trunk/reactos/base/shell/explorer/explorer-uk.rc (original)
+++ trunk/reactos/base/shell/explorer/explorer-uk.rc Mon Aug 27 03:41:04 2007
@@ -330,6 +330,7 @@
IDS_START "Ïóñê"
IDS_LOGOFF "Âèõ³ä ³ç ñèñòåìè..."
IDS_SHUTDOWN "Âèìêíåííÿ..."
+ IDS_RESTART "Restart..."
IDS_LAUNCH "Âèêîíàòè..."
IDS_START_HELP "Äîâ³äêà"
IDS_SEARCH_FILES "Ïîøóê..."
@@ -397,3 +398,4 @@
/////////////////////////////////////////////////////////////////////////////
#endif // not APSTUDIO_INVOKED
+
Modified: trunk/reactos/base/shell/explorer/explorer.cpp
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/explor…
==============================================================================
--- trunk/reactos/base/shell/explorer/explorer.cpp (original)
+++ trunk/reactos/base/shell/explorer/explorer.cpp Mon Aug 27 03:41:04 2007
@@ -402,6 +402,7 @@
_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);
Modified: trunk/reactos/base/shell/explorer/explorer_intres.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/explor…
==============================================================================
--- trunk/reactos/base/shell/explorer/explorer_intres.rc (original)
+++ trunk/reactos/base/shell/explorer/explorer_intres.rc Mon Aug 27 03:41:04 2007
@@ -152,6 +152,7 @@
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 @@
/////////////////////////////////////////////////////////////////////////////
#endif // not APSTUDIO_INVOKED
+
Modified: trunk/reactos/base/shell/explorer/globals.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/global…
==============================================================================
--- trunk/reactos/base/shell/explorer/globals.h (original)
+++ trunk/reactos/base/shell/explorer/globals.h Mon Aug 27 03:41:04 2007
@@ -81,6 +81,7 @@
ICID_COMPUTER,
ICID_LOGOFF,
ICID_SHUTDOWN,
+ ICID_RESTART,
ICID_BOOKMARK,
ICID_MINIMIZE,
ICID_CONTROLPAN,
Added: trunk/reactos/base/shell/explorer/res/restart.ico
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/res/re…
==============================================================================
Binary file - no diff available.
Propchange: trunk/reactos/base/shell/explorer/res/restart.ico
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Modified: trunk/reactos/base/shell/explorer/resource.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/resour…
==============================================================================
--- trunk/reactos/base/shell/explorer/resource.h (original)
+++ trunk/reactos/base/shell/explorer/resource.h Mon Aug 27 03:41:04 2007
@@ -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
Modified: trunk/reactos/base/shell/explorer/taskbar/desktopbar.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/taskba…
==============================================================================
--- trunk/reactos/base/shell/explorer/taskbar/desktopbar.h (original)
+++ trunk/reactos/base/shell/explorer/taskbar/desktopbar.h Mon Aug 27 03:41:04 2007
@@ -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
Modified: trunk/reactos/base/shell/explorer/taskbar/startmenu.cpp
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/taskba…
==============================================================================
--- trunk/reactos/base/shell/explorer/taskbar/startmenu.cpp (original)
+++ trunk/reactos/base/shell/explorer/taskbar/startmenu.cpp Mon Aug 27 03:41:04 2007
@@ -1752,20 +1752,22 @@
#ifndef __MINGW32__ // SHRestricted() missing in MinGW (as of 29.10.2003)
+ 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_NOCLOSE))
#else
- if (IS_VALUE_NOT_ZERO(hkeyAdv, _T("StartMenuLogoff")))
-#endif
- AddButton(ResString(IDS_LOGOFF), ICID_LOGOFF, false, IDC_LOGOFF);
-
-
-#ifndef __MINGW32__ // SHRestricted() missing in MinGW (as of 29.10.2003)
- if (!g_Globals._SHRestricted || SHRestricted(REST_STARTMENULOGOFF) != 1)
-#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);
@@ -1940,9 +1942,15 @@
case IDC_SHUTDOWN:
CloseStartMenu(id);
- ShowExitWindowsDialog(g_Globals._hwndDesktopBar);
- break;
-
+ 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 @@
MessageBox(hwndOwner, TEXT("ExitWindowsDialog() not yet implemented in
SHELL32"), ResString(IDS_TITLE), MB_OK);
}
+void StartMenuHandler::ShowRestartDialog(HWND hwndOwner, UINT flags)
+{
+ static DynamicFct<RESTARTWINDOWSDLG> 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()
{
Modified: trunk/reactos/base/shell/explorer/taskbar/startmenu.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/taskba…
==============================================================================
--- trunk/reactos/base/shell/explorer/taskbar/startmenu.h (original)
+++ trunk/reactos/base/shell/explorer/taskbar/startmenu.h Mon Aug 27 03:41:04 2007
@@ -348,6 +348,7 @@
static void ShowLaunchDialog(HWND hwndOwner);
static void ShowLogoffDialog(HWND hwndOwner);
+ static void ShowRestartDialog(HWND hwndOwner, UINT flags);
static void ShowSearchDialog();
static void ShowSearchComputer();
};
6333
days inactive
6333
days old
0 comments
1 participants
participants (1)
-
janderwald＠svn.reactos.org