i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

* When activating the "Shutdown" menu (instead of one of its items), we now

Browse Source 
get the old shutdown dialog back, but with the additional option to reboot
  instead.


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@30731 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Axel Dörfler
2009-05-12 21:19:02 +00:00
parent d48fe2445b
commit 277ddffee4
2 changed files with 44 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/apps/deskbar/BarApp.cpp
+6 -2
View File
@@ -488,11 +488,15 @@ TBarApp::MessageReceived(BMessage *message)
break; break;
case CMD_REBOOT_SYSTEM: case CMD_REBOOT_SYSTEM:
case CMD_SHUTDOWN_SYSTEM: { case CMD_SHUTDOWN_SYSTEM:
{
bool reboot = (message->what == CMD_REBOOT_SYSTEM); bool reboot = (message->what == CMD_REBOOT_SYSTEM);
bool confirm;
message->FindBool("confirm", &confirm);
BRoster roster; BRoster roster;
BRoster::Private rosterPrivate(roster); BRoster::Private rosterPrivate(roster);
status_t error = rosterPrivate.ShutDown(reboot, false, false); status_t error = rosterPrivate.ShutDown(reboot, confirm, false);
if (error != B_OK) if (error != B_OK)
fprintf(stderr, "Shutdown failed: %s\n", strerror(error)); fprintf(stderr, "Shutdown failed: %s\n", strerror(error));
src/apps/deskbar/BeMenu.cpp
+4 -1
View File
@@ -386,10 +386,13 @@ TBeMenu::AddStandardBeMenuItems()
#ifdef __HAIKU__ #ifdef __HAIKU__
shutdownMenu->SetTargetForItems(be_app); shutdownMenu->SetTargetForItems(be_app);
BMessage* message = new BMessage(CMD_SHUTDOWN_SYSTEM);
message->AddBool("confirm", true);
AddItem(new BMenuItem(shutdownMenu, message));
#else #else
shutdownMenu->SetTargetForItems(BMessenger(ROSTER_SIG)); shutdownMenu->SetTargetForItems(BMessenger(ROSTER_SIG));
#endif
AddItem(shutdownMenu); AddItem(shutdownMenu);
#endif
fAddState = kAddingRecents; fAddState = kAddingRecents;