Ticket #4425: Installer.diff

InstallerWindow.cpp

@@ -213 +213 @@
         TR("Write boot sector"), new BMessage(MSG_WRITE_BOOT_SECTOR));
     fMakeBootableButton->SetEnabled(false);
 
+    fBootmanButton = new BButton("bootman_button",
+        TR("Setup Boot Menu"), new BMessage(MSG_WRITE_BOOTMAN));
+    fBootmanButton->SetEnabled(false);
+
     SetLayout(new BGroupLayout(B_HORIZONTAL));
     AddChild(BGroupLayoutBuilder(B_VERTICAL)
         .Add(BGroupLayoutBuilder(B_HORIZONTAL)
@@ -238 +242 @@
             .Add(BGroupLayoutBuilder(B_HORIZONTAL, 10)
                 .Add(fSetupButton)
                 .Add(fMakeBootableButton)
+                .Add(fBootmanButton)
                 .AddGlue()
                 .Add(fBeginButton)
             )
@@ -268 +273 @@
         "the installation, but you can manually make a\n"
         "partition bootable in case you do not need to\n"
         "perform an installation."));
-
+    fBootmanButton->SetToolTip(
+        TR("Install/Uninstall our Boot Menu, which allow you to choose\n"
+        "operating system to boot when computer starts up\n"
+        "If you have another Boot manager such as LILO or GRUB\n"
+        "You do not need to perform this one\n"));
     // finish creating window
     if (!be_roster->IsRunning(kDeskbarSignature))
         SetFlags(Flags() | B_NOT_MINIMIZABLE);
@@ -485 +494 @@
             fWorkerThread->WriteBootSector(fDestMenu);
             break;
 
+        case MSG_WRITE_BOOTMAN:
+        {
+            BPath bootPath;
+            find_directory(B_BEOS_BOOT_DIRECTORY, &bootPath);
+            BString command("/bin/bootman ");
+            command += bootPath.Path();
+            system(command.String());
+        }
+            break;
         default:
             BWindow::MessageReceived(msg);
             break;
@@ -562 +580 @@
 {
     fSetupButton->SetEnabled(!disable);
     fMakeBootableButton->SetEnabled(!disable);
+    fBootmanButton->SetEnabled(!disable);
     fSrcMenuField->SetEnabled(!disable);
     fDestMenuField->SetEnabled(!disable);
 }
@@ -651 +670 @@
     fBeginButton->SetLabel(TR("Begin"));
     fBeginButton->SetEnabled(srcItem && dstItem);
 
-    // adjust "Write Boot Sector" button
+    // adjust "Write Boot Sector and Setup Boot Menu" button
     if (dstItem) {
         char buffer[256];
         snprintf(buffer, sizeof(buffer), TR("Write boot sector to '%s'"),
@@ -661 +680 @@
         label = TR("Write boot sector");
     fMakeBootableButton->SetEnabled(dstItem);
     fMakeBootableButton->SetLabel(label.String());
-
+    fBootmanButton->SetEnabled(dstItem);
+    
     if (!fEncouragedToSetupPartitions && !foundOneSuitableTarget) {
         // Focus the users attention on the DriveSetup button
         fEncouragedToSetupPartitions = true;

InstallerWindow.h

@@ -35 +35 @@
 const uint32 MSG_INSTALL_FINISHED = 'iIFN';
 const uint32 MSG_RESET = 'iRSI';
 const uint32 MSG_WRITE_BOOT_SECTOR = 'iWBS';
+const uint32 MSG_WRITE_BOOTMAN = 'iWBM';
 
 const char PACKAGES_DIRECTORY[] = "_packages_";
 const char VAR_DIRECTORY[] = "var";
@@ -86 +87 @@
             BButton*            fBeginButton;
             BButton*            fSetupButton;
             BButton*            fMakeBootableButton;
-
+            BButton*            fBootmanButton;
             bool                fEncouragedToSetupPartitions;
 
             bool                fDriveSetupLaunched;