Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-07-02 02:34:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

- add restart button by Vytis Girdzijauskas, "CMan", cman[at]cman[dot]us

Browse source 
- the icon is taken from the tango project (see view-refresh.svg)

See issue #2599 for more details.

svn path=/trunk/; revision=28587
This commit is contained in:
Johannes Anderwald 2007-08-26 23:41:04 +00:00
parent 40ae71f23d
commit c48c7cff18
30 changed files with 72 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
reactos/base/shell/explorer/explorer-bg.rc
View file

@ -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

2
reactos/base/shell/explorer/explorer-bn.rc
View file

@ -327,6 +327,7 @@ BEGIN
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 @@ END
/////////////////////////////////////////////////////////////////////////////
#endif // not APSTUDIO_INVOKED

1
reactos/base/shell/explorer/explorer-cn.rc
View file

@ -330,6 +330,7 @@ BEGIN
IDS_START "开始"
IDS_LOGOFF "注销..."
IDS_SHUTDOWN "关闭..."
IDS_RESTART "Restart..."
IDS_LAUNCH "运行..."
IDS_START_HELP "帮助"
IDS_SEARCH_FILES "搜索..."

2
reactos/base/shell/explorer/explorer-cz.rc
View file

@ -330,6 +330,7 @@ BEGIN
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 @@ END
#endif // not APSTUDIO_INVOKED

2
reactos/base/shell/explorer/explorer-de.rc
View file

@ -336,6 +336,7 @@ BEGIN
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 @@ END
/////////////////////////////////////////////////////////////////////////////
#endif // not APSTUDIO_INVOKED

2
reactos/base/shell/explorer/explorer-en.rc
View file

@ -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

2
reactos/base/shell/explorer/explorer-es.rc
View file

@ -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

2
reactos/base/shell/explorer/explorer-fr.rc
View file

@ -329,6 +329,7 @@ BEGIN
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 @@ END
/////////////////////////////////////////////////////////////////////////////
#endif // not APSTUDIO_INVOKED

2
reactos/base/shell/explorer/explorer-gr.rc
View file

@ -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

2
reactos/base/shell/explorer/explorer-hu.rc
View file

@ -330,6 +330,7 @@ BEGIN
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 @@ END
/////////////////////////////////////////////////////////////////////////////
#endif // not APSTUDIO_INVOKED

2
reactos/base/shell/explorer/explorer-id.rc
View file

@ -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

2
reactos/base/shell/explorer/explorer-it.rc
View file

@ -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

2
reactos/base/shell/explorer/explorer-jp.rc
View file

@ -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

2
reactos/base/shell/explorer/explorer-nl.rc
View file

@ -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

2
reactos/base/shell/explorer/explorer-no.rc
View file

@ -330,6 +330,7 @@ BEGIN
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 @@ END
#endif // not APSTUDIO_INVOKED

2
reactos/base/shell/explorer/explorer-pl.rc
View file

@ -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

2
reactos/base/shell/explorer/explorer-pt.rc
View file

@ -98,6 +98,7 @@ BEGIN
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 @@ END
/////////////////////////////////////////////////////////////////////////////
#endif // not APSTUDIO_INVOKED

2
reactos/base/shell/explorer/explorer-ro.rc
View file

@ -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 "Cãutare Files..."
@ -243,3 +244,4 @@ END
#endif // not APSTUDIO_INVOKED

2
reactos/base/shell/explorer/explorer-ru.rc
View file

@ -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

2
reactos/base/shell/explorer/explorer-sk.rc
View file

@ -340,6 +340,7 @@ BEGIN
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 @@ END
/////////////////////////////////////////////////////////////////////////////
#endif // not APSTUDIO_INVOKED

2
reactos/base/shell/explorer/explorer-sv.rc
View file

@ -325,6 +325,7 @@ BEGIN
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 @@ END
/////////////////////////////////////////////////////////////////////////////
#endif // not APSTUDIO_INVOKED

2
reactos/base/shell/explorer/explorer-uk.rc
View file

@ -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

1
reactos/base/shell/explorer/explorer.cpp
View file

@ -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);

2
reactos/base/shell/explorer/explorer_intres.rc
View file

@ -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

1
reactos/base/shell/explorer/globals.h
View file

@ -81,6 +81,7 @@ enum ICON_ID {
ICID_COMPUTER,
ICID_LOGOFF,
ICID_SHUTDOWN,
ICID_RESTART,
ICID_BOOKMARK,
ICID_MINIMIZE,
ICID_CONTROLPAN,

BIN
reactos/base/shell/explorer/res/restart.ico Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 29 KiB

2
reactos/base/shell/explorer/resource.h
View file

@ -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

1
reactos/base/shell/explorer/taskbar/desktopbar.h
View file

@ -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

25
reactos/base/shell/explorer/taskbar/startmenu.cpp
View file

@ -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<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()
{

1
reactos/base/shell/explorer/taskbar/startmenu.h
View file

@ -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();
};