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

Tweak the "install done" message. If Deskbar is running, chances are quitting

Browse Source 
the Installer won't restart the computer.


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@30613 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Stephan Aßmus
2009-05-03 17:53:37 +00:00
parent 2e6fb5f2b9
commit 8323a7cd49
1 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/apps/installer/InstallerWindow.cpp
+9 -9
View File
@@ -415,13 +415,6 @@ InstallerWindow::MessageReceived(BMessage *msg)
case kInstalling: case kInstalling:
{ {
_QuitCopyEngine(true); _QuitCopyEngine(true);
// if (fWorkerThread->Cancel()) {
// fInstallStatus = kCancelled;
// _SetStatusMessage("Installation cancelled.");
// fProgressLayoutItem->SetVisible(false);
// fPkgSwitchLayoutItem->SetVisible(true);
// _ShowOptionalPackages();
// }
break; break;
} }
case kFinished: case kFinished:
@@ -494,11 +487,18 @@ InstallerWindow::MessageReceived(BMessage *msg)
PartitionMenuItem* dstItem PartitionMenuItem* dstItem
= (PartitionMenuItem*)fDestMenu->FindMarked(); = (PartitionMenuItem*)fDestMenu->FindMarked();
const char* quitString;
if (be_roster->IsRunning(kDeskbarSignature))
quitString = "leave the Installer";
else
quitString = "restart the computer";
char status[1024]; char status[1024];
snprintf(status, sizeof(status), "Installation completed. " snprintf(status, sizeof(status), "Installation completed. "
"Boot sector has been written to '%s'. Press Quit to reboot " "Boot sector has been written to '%s'. Press Quit to %s "
"or chose a new target volume to perform another " "or chose a new target volume to perform another "
"installation.", dstItem ? dstItem->Name() : "???"); "installation.", dstItem ? dstItem->Name() : "???", quitString);
_SetStatusMessage(status); _SetStatusMessage(status);
fInstallStatus = kFinished; fInstallStatus = kFinished;
_DisableInterface(false); _DisableInterface(false);