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

click_to_open now is always true, and cannot be disabled

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@17175 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Stefano Ceccherini
2006-04-19 20:19:51 +00:00
parent b03deb09db
commit f274fa345d
3 changed files with 1 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/preferences/menu/MenuBar.cpp
+1 -5
View File
@@ -37,7 +37,6 @@ MenuBar::build_menu()
fontSizeMenu = new FontSizeMenu(); fontSizeMenu = new FontSizeMenu();
// create the menu items // create the menu items
clickToOpenItem = new BMenuItem("Click To Open", new BMessage(CLICK_OPEN_MSG), 0, 0);
alwaysShowTriggersItem = new BMenuItem("Always Show Triggers", new BMessage(ALLWAYS_TRIGGERS_MSG), 0, 0); alwaysShowTriggersItem = new BMenuItem("Always Show Triggers", new BMessage(ALLWAYS_TRIGGERS_MSG), 0, 0);
separatorStyleItem = new BMenuItem("Separator Style", new BMessage(DEFAULT_MSG), 0, 0); separatorStyleItem = new BMenuItem("Separator Style", new BMessage(DEFAULT_MSG), 0, 0);
ctlAsShortcutItem = new BitmapMenuItem("as Shortcut Key", ctlAsShortcutItem = new BitmapMenuItem("as Shortcut Key",
@@ -73,7 +72,6 @@ MenuBar::build_menu()
AddItem(fontMenu, 0); AddItem(fontMenu, 0);
AddItem(fontSizeMenu, 1); AddItem(fontSizeMenu, 1);
AddSeparatorItem(); AddSeparatorItem();
AddItem(clickToOpenItem);
AddItem(alwaysShowTriggersItem); AddItem(alwaysShowTriggersItem);
AddSeparatorItem(); AddSeparatorItem();
AddItem(colorSchemeItem); AddItem(colorSchemeItem);
@@ -94,9 +92,7 @@ MenuBar::set_menu()
get_menu_info(&info); get_menu_info(&info);
alwaysShowTriggersItem->SetMarked(info.triggers_always_shown); alwaysShowTriggersItem->SetMarked(info.triggers_always_shown);
clickToOpenItem->SetMarked(info.click_to_open);
alwaysShowTriggersItem->SetEnabled(info.click_to_open);
get_key_map(&keys, &chars); get_key_map(&keys, &chars);
altAsShortcut = (keys->left_command_key == 0x5d) && (keys->right_command_key == 0x5f); altAsShortcut = (keys->left_command_key == 0x5d) && (keys->right_command_key == 0x5f);
src/preferences/menu/MenuBar.h
-1
View File
@@ -28,7 +28,6 @@ private:
//others //others
FontMenu *fontMenu; FontMenu *fontMenu;
FontSizeMenu *fontSizeMenu; FontSizeMenu *fontSizeMenu;
BMenuItem *clickToOpenItem;
BMenuItem *alwaysShowTriggersItem; BMenuItem *alwaysShowTriggersItem;
BMenuItem *colorSchemeItem; BMenuItem *colorSchemeItem;
BMenuItem *separatorStyleItem; BMenuItem *separatorStyleItem;
src/preferences/menu/MenuWindow.cpp
-11
View File
@@ -101,17 +101,6 @@ MenuWindow::MessageReceived(BMessage *msg)
Update(); Update();
break; break;
case CLICK_OPEN_MSG:
revert = true;
if (info.click_to_open != true)
info.click_to_open = true;
else
info.click_to_open = false;
set_menu_info(&info);
menuBar->set_menu();
Update();
break;
case ALLWAYS_TRIGGERS_MSG: case ALLWAYS_TRIGGERS_MSG:
revert = true; revert = true;
if (info.triggers_always_shown != true) if (info.triggers_always_shown != true)