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

FirstBootPrompt: sort keymaps

Browse Source
This commit is contained in:
Stefano Ceccherini
2013-10-18 15:50:37 +02:00
parent 959a0ca10d
commit c8cc2f3e5d
1 changed files with 15 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/apps/firstbootprompt/BootPromptWindow.cpp
+15 -2
View File
@@ -131,6 +131,17 @@ compare_void_list_items(const void* _a, const void* _b)
} }
static int
compare_void_menu_items(const void* _a, const void* _b)
{
static BCollator collator;
BMenuItem* a = *(BMenuItem**)_a;
BMenuItem* b = *(BMenuItem**)_b;
return collator.Compare(a->Label(), b->Label());
}
// #pragma mark - // #pragma mark -
@@ -397,18 +408,20 @@ BootPromptWindow::_PopulateKeymaps()
BDirectory directory; BDirectory directory;
if (directory.SetTo(path.Path()) == B_OK) { if (directory.SetTo(path.Path()) == B_OK) {
entry_ref ref; entry_ref ref;
BList itemsList;
while (directory.GetNextRef(&ref) == B_OK) { while (directory.GetNextRef(&ref) == B_OK) {
BMessage* message = new BMessage(MSG_KEYMAP_SELECTED); BMessage* message = new BMessage(MSG_KEYMAP_SELECTED);
message->AddRef("ref", &ref); message->AddRef("ref", &ref);
BMenuItem* item = new BMenuItem(ref.name, message); BMenuItem* item = new BMenuItem(ref.name, message);
fKeymapsMenuField->Menu()->AddItem(item); itemsList.AddItem(item);
if (currentName == ref.name) if (currentName == ref.name)
item->SetMarked(true); item->SetMarked(true);
if (usInternational == ref.name) if (usInternational == ref.name)
fDefaultKeymapItem = item; fDefaultKeymapItem = item;
} }
itemsList.SortItems(compare_void_menu_items);
fKeymapsMenuField->Menu()->AddList(&itemsList, 0);
} }
} }