github/textmate
1
1
Fork 0
mirror of https://github.com/textmate/textmate.git synced 2026-04-28 03:00:34 -04:00
Code Issues Packages Projects Releases Wiki Activity

Use menu validation in OakShowMenuForBundleItems

Browse Source
This commit is contained in:
Allan Odgaard
2013-03-16 17:49:48 +01:00
parent 04e8eb44a2
commit 5caca35fc7
2 changed files with 15 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
Frameworks/BundleMenu/src/BundleMenu.mm
View File

@@ -11,15 +11,10 @@
@end
@implementation BundlePopupMenuTarget
- (BOOL)validateMenuItem:(NSMenuItem*)menuItem
{
return [menuItem action] == @selector(takeItemUUIDFrom:);
}
- (void)takeItemUUIDFrom:(id)sender
- (void)performBundleItemWithUUIDStringFrom:(NSMenuItem*)sender
{
ASSERT([sender isKindOfClass:[NSMenuItem class]]);
self.selectedItemUUID = [(NSMenuItem*)sender representedObject];
self.selectedItemUUID = [sender representedObject];
}
@end
@@ -48,7 +43,7 @@ static std::vector<bundles::item_ptr> filtered_menu (bundles::item_ptr menuItem,
return res;
}
void OakAddBundlesToMenu (std::vector<bundles::item_ptr> const& items, bool hasSelection, bool setKeys, NSMenu* menu, SEL menuAction, id menuTarget)
void OakAddBundlesToMenu (std::vector<bundles::item_ptr> const& items, bool hasSelection, bool setKeys, NSMenu* menu, SEL menuAction)
{
bool onlyGrammars = true;
iterate(item, items)
@@ -63,7 +58,6 @@ void OakAddBundlesToMenu (std::vector<bundles::item_ptr> const& items, bool hasS
iterate(pair, ordering)
{
NSMenuItem* menuItem = [menu addItemWithTitle:[NSString stringWithCxxString:pair->first] action:menuAction keyEquivalent:@""];
[menuItem setTarget:menuTarget];
[menuItem setRepresentedObject:[NSString stringWithCxxString:pair->second->uuid()]];
if(setKeys)
@@ -120,7 +114,6 @@ void OakAddBundlesToMenu (std::vector<bundles::item_ptr> const& items, bool hasS
pendingSeparator = false;
NSMenuItem* menuItem = [menu addItemWithTitle:[NSString stringWithCxxString:name_with_selection(*item, hasSelection)] action:menuAction keyEquivalent:@""];
[menuItem setTarget:menuTarget];
[menuItem setRepresentedObject:[NSString stringWithCxxString:(*item)->uuid()]];
if(setKeys)
@@ -146,20 +139,23 @@ bundles::item_ptr OakShowMenuForBundleItems (std::vector<bundles::item_ptr> cons
else if(items.size() == 1)
return items.front();
BundlePopupMenuTarget* menuTarget = [BundlePopupMenuTarget new];
NSMenu* menu = [NSMenu new];
[menu setFont:[NSFont menuFontOfSize:[NSFont smallSystemFontSize]]];
OakAddBundlesToMenu(items, hasSelection, false, menu, @selector(takeItemUUIDFrom:), menuTarget);
OakAddBundlesToMenu(items, hasSelection, false, menu, @selector(performBundleItemWithUUIDStringFrom:));
[menu update];
int key = 1;
char key = 0;
BundlePopupMenuTarget* menuTarget = [BundlePopupMenuTarget new];
for(NSMenuItem* menuItem in [menu itemArray])
{
if(menuItem.action)
if(menuItem.action == @selector(performBundleItemWithUUIDStringFrom:))
{
[menuItem setKeyEquivalent:[NSString stringWithFormat:@"%d", key % 10]];
[menuItem setKeyEquivalentModifierMask:0];
if(++key == 10)
break;
menuItem.target = menuTarget;
if(key < 10)
{
[menuItem setKeyEquivalent:[NSString stringWithFormat:@"%c", '0' + (++key % 10)]];
[menuItem setKeyEquivalentModifierMask:0];
}
}
}

2
Frameworks/BundleMenu/src/Private.h
View File

@@ -4,6 +4,6 @@
#import "BundleMenu.h"
#import <oak/misc.h>
void OakAddBundlesToMenu (std::vector<bundles::item_ptr> const& items, bool hasSelection, bool setKeys, NSMenu* aMenu, SEL menuAction, id menuTarget = nil);
void OakAddBundlesToMenu (std::vector<bundles::item_ptr> const& items, bool hasSelection, bool setKeys, NSMenu* aMenu, SEL menuAction);
#endif /* end of include guard: BUNDLES_MENU_H_7ZK5UHKQ */