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

Removed choice of separator style - there is only one to rule them all, now.

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@19606 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Axel Dörfler 2006-12-22 11:17:16 +00:00
parent 5a93dff747
commit 206df9cd04
2 changed files with 8 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
src/preferences/menu/MenuBar.cpp
View File

@ -60,34 +60,20 @@ MenuBar::_BuildMenu()
BMenuItem* colorSchemeItem = new BMenuItem("Color Scheme...",
new BMessage(COLOR_SCHEME_OPEN_MSG), 0, 0);
// create the separator menu
BMenu* separatorStyleMenu = new BMenu("Separator Style", B_ITEMS_IN_COLUMN);
separatorStyleMenu->SetRadioMode(true);
BMessage *msg = new BMessage(MENU_SEP_TYPE);
msg->AddInt32("sep", 0);
separatorStyleZero = new BitmapMenuItem("", msg, BTranslationUtils::GetBitmap(B_RAW_TYPE, "SEP0"));
msg = new BMessage(MENU_SEP_TYPE);
msg->AddInt32("sep", 1);
separatorStyleOne = new BitmapMenuItem("", msg, BTranslationUtils::GetBitmap(B_RAW_TYPE, "SEP1"));
msg = new BMessage(MENU_SEP_TYPE);
msg->AddInt32("sep", 2);
separatorStyleTwo = new BitmapMenuItem("", msg, BTranslationUtils::GetBitmap(B_RAW_TYPE, "SEP2"));
separatorStyleMenu->AddItem(separatorStyleZero);
separatorStyleMenu->AddItem(separatorStyleOne);
separatorStyleMenu->AddItem(separatorStyleTwo);
separatorStyleMenu->SetRadioMode(true);
separatorStyleMenu->SetTargetForItems(Window());
// Add items to menubar
AddItem(fontMenu, 0);
AddItem(fontSizeMenu, 1);
AddSeparatorItem();
AddItem(fAlwaysShowTriggersItem);
AddSeparatorItem();
AddItem(colorSchemeItem);
AddItem(separatorStyleMenu);
AddSeparatorItem();
AddItem(fAlwaysShowTriggersItem);
AddSeparatorItem();
AddItem(fControlAsShortcutItem);
AddItem(fAltAsShortcutItem);
}
@ -113,13 +99,6 @@ MenuBar::UpdateMenu()
fAltAsShortcutItem->SetMarked(altAsShortcut);
fControlAsShortcutItem->SetMarked(!altAsShortcut);
if (info.separator == 0)
separatorStyleZero->SetMarked(true);
else if (info.separator == 1)
separatorStyleOne->SetMarked(true);
else if (info.separator == 2)
separatorStyleTwo->SetMarked(true);
}

4
src/preferences/menu/MenuBar.h
View File

@ -27,10 +27,6 @@ class MenuBar : public BMenuBar {
private:
void _BuildMenu();
BMenuItem* separatorStyleZero;
BMenuItem* separatorStyleOne;
BMenuItem* separatorStyleTwo;
BMenuItem* fAlwaysShowTriggersItem;
BMenuItem* fControlAsShortcutItem;
BMenuItem* fAltAsShortcutItem;