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

The new fSuperItem menu field is now maintained, ie. Menu::Superitem() and

Browse Source 
Menu::Supermenu() now work.
Added function to find an item by label.
The boot volume menu now actually lets you choose a different boot volume.


git-svn-id: file:///srv/svn/repos/haiku/trunk/current@9525 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Axel Dörfler 2004-10-27 00:59:56 +00:00
parent e76877adae
commit 628e5a0374
1 changed files with 49 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
src/kernel/boot/loader/menu.cpp
View File

@ -33,11 +33,16 @@ MenuItem::MenuItem(const char *label, Menu *subMenu)
fData(NULL),
fHelpText(NULL)
{
if (subMenu != NULL)
subMenu->fSuperItem = this;
}
MenuItem::~MenuItem()
{
if (fSubMenu != NULL)
fSubMenu->fSuperItem = NULL;
free(const_cast<char *>(fLabel));
}
@ -139,7 +144,8 @@ Menu::Menu(menu_type type, const char *title)
fTitle(title),
fCount(0),
fIsHidden(true),
fType(type)
fType(type),
fSuperItem(NULL)
{
}
@ -198,6 +204,21 @@ Menu::CountItems() const
}
MenuItem *
Menu::FindItem(const char *label)
{
MenuItemIterator iterator = ItemIterator();
MenuItem *item;
while ((item = iterator.Next()) != NULL) {
if (item->Label() != NULL && !strcmp(item->Label(), label))
return item;
}
return NULL;
}
MenuItem *
Menu::FindMarked()
{
@ -304,6 +325,24 @@ Menu::Run()
// #pragma mark -
static bool
user_menu_boot_volume(Menu *menu, MenuItem *item)
{
Menu *super = menu->Supermenu();
if (super == NULL) {
// huh?
return true;
}
MenuItem *bootItem = super->ItemAt(super->CountItems() - 1);
bootItem->SetEnabled(true);
bootItem->Select(true);
bootItem->SetData(item->Data());
return true;
}
static Menu *
add_boot_volume_menu(Directory *bootVolume)
{
@ -322,6 +361,9 @@ add_boot_volume_menu(Directory *bootVolume)
char name[B_FILE_NAME_LENGTH];
if (volume->GetName(name, sizeof(name)) == B_OK) {
menu->AddItem(item = new MenuItem(name));
item->SetTarget(user_menu_boot_volume);
item->SetData(volume);
if (volume == bootVolume) {
item->SetMarked(true);
item->Select(true);
@ -343,7 +385,7 @@ add_boot_volume_menu(Directory *bootVolume)
menu->AddSeparatorItem();
menu->AddItem(item = new MenuItem("Rescan volumes"));
item->SetHelpText("Please insert a Haiku CD-ROM or attach a USB disk - depending on your BIOS, you can then boot from them.");
item->SetHelpText("Please insert a Haiku CD-ROM or attach a USB disk - depending on your system, you can then boot from them.");
item->SetType(MENU_ITEM_NO_CHOICE);
item->Select(true);
@ -408,6 +450,11 @@ user_menu(Directory **_bootVolume)
}
menu->Run();
// See if a new boot device has been selected, and propagate that back
if (item->Data() != NULL)
*_bootVolume = (Directory *)item->Data();
return B_OK;
}