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

* Renamed occurrences of "Reboot" to "Restart".

Browse Source 
* Added TODO regarding the mismatch of shutdown phase names, comments,
  and the actually executed actions. The phase names and comments say that
  the background apps are terminated before the non-application processes,
  while in reality things are done the other way around. I suppose the
  latter order is correct though.  


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@16890 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Stephan Aßmus 2006-03-27 12:05:40 +00:00
parent c918a987a0
commit cc7c040b56
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/servers/registrar/ShutdownProcess.cpp
View File

@ -298,7 +298,7 @@ public:
// reboot system button // reboot system button
fRebootSystemButton = new(nothrow) BButton(BRect(0, 0, 10, 10), fRebootSystemButton = new(nothrow) BButton(BRect(0, 0, 10, 10),
"reboot", "Reboot System", NULL, B_FOLLOW_NONE); "reboot", "Restart System", NULL, B_FOLLOW_NONE);
if (!fRebootSystemButton) if (!fRebootSystemButton)
return B_NO_MEMORY; return B_NO_MEMORY;
fRebootSystemButton->Hide(); fRebootSystemButton->Hide();
@ -1243,11 +1243,11 @@ ShutdownProcess::_WorkerDoShutdown()
// ask the user to confirm the shutdown, if desired // ask the user to confirm the shutdown, if desired
bool askUser; bool askUser;
if (fHasGUI && fRequest->FindBool("confirm", &askUser) == B_OK && askUser) { if (fHasGUI && fRequest->FindBool("confirm", &askUser) == B_OK && askUser) {
const char *title = (fReboot ? "Reboot?" : "Shut Down?"); const char *title = (fReboot ? "Restart?" : "Shut Down?");
const char *text = (fReboot const char *text = (fReboot
? "Do you really want to reboot the system?" ? "Do you really want to restart the system?"
: "Do you really want to shut down the system?"); : "Do you really want to shut down the system?");
const char *buttonText = (fReboot ? "Reboot" : "Shut Down"); const char *buttonText = (fReboot ? "Restart" : "Shut Down");
BAlert *alert = new BAlert(title, text, "Cancel", buttonText, NULL, BAlert *alert = new BAlert(title, text, "Cancel", buttonText, NULL,
B_WIDTH_AS_USUAL, B_WARNING_ALERT); B_WIDTH_AS_USUAL, B_WARNING_ALERT);
int32 result = alert->Go(); int32 result = alert->Go();
@ -1277,6 +1277,8 @@ ShutdownProcess::_WorkerDoShutdown()
// phase 3: terminate the background apps // phase 3: terminate the background apps
_SetPhase(BACKGROUND_APP_TERMINATION_PHASE); _SetPhase(BACKGROUND_APP_TERMINATION_PHASE);
// TODO: _QuitNonApps() and _QuitBackgroundApps() are called in reverse?
// and don't match the phase
_QuitNonApps(); _QuitNonApps();
// phase 4: terminate the other processes // phase 4: terminate the other processes