Aren
/
haiku
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Move Deskbar Restart and Shutdown options into a submenu and ask Registrar not to question the user's intent. 

git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@30512 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Jonas Sundström 2009-04-30 15:31:50 +00:00
parent 88cfea9fc2
commit bb048d75be
2 changed files with 15 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/apps/deskbar/BarApp.cpp
View File

@ -492,7 +492,7 @@ TBarApp::MessageReceived(BMessage *message)
bool reboot = (message->what == CMD_REBOOT_SYSTEM);
BRoster roster;
BRoster::Private rosterPrivate(roster);
status_t error = rosterPrivate.ShutDown(reboot, true, false);
status_t error = rosterPrivate.ShutDown(reboot, false, false);
if (error != B_OK)
fprintf(stderr, "Shutdown failed: %s\n", strerror(error));

29
src/apps/deskbar/BeMenu.cpp
View File

@ -366,31 +366,30 @@ TBeMenu::AddStandardBeMenuItems()
AddSeparatorItem();
#ifdef __HAIKU__
item = new BMenuItem("Restart" B_UTF8_ELLIPSIS,
new BMessage(CMD_REBOOT_SYSTEM));
#else
item = new BMenuItem("Restart", new BMessage(CMD_REBOOT_SYSTEM));
#endif
BMenu *shutdownMenu = new BMenu("Shutdown");
item = new BMenuItem("Restart System", new BMessage(CMD_REBOOT_SYSTEM));
item->SetEnabled(!dragging);
AddItem(item);
shutdownMenu->AddItem(item);
#ifdef APM_SUPPORT
if (_kapm_control_(APM_CHECK_ENABLED) == B_OK) {
item = new BMenuItem("Suspend", new BMessage(CMD_SUSPEND_SYSTEM));
item->SetEnabled(!dragging);
AddItem(item);
shutdownMenu->AddItem(item);
}
#endif
#ifdef __HAIKU__
item = new BMenuItem("Shut Down" B_UTF8_ELLIPSIS,
new BMessage(CMD_SHUTDOWN_SYSTEM));
#else
item = new BMenuItem("Shut Down", new BMessage(CMD_SHUTDOWN_SYSTEM));
#endif
item = new BMenuItem("Power Off", new BMessage(CMD_SHUTDOWN_SYSTEM));
item->SetEnabled(!dragging);
AddItem(item);
shutdownMenu->AddItem(item);
#ifdef __HAIKU__
shutdownMenu->SetTargetForItems(be_app);
#else
shutdownMenu->SetTargetForItems(BMessenger(ROSTER_SIG));
#endif
AddItem(shutdownMenu);
fAddState = kAddingRecents;