github/textmate
1
1
Fork 0
mirror of https://github.com/textmate/textmate.git synced 2026-01-22 13:17:55 -05:00
Code Issues Packages Projects Releases Wiki Activity

Improve VO for folder pop-up button

Browse Source
This commit is contained in:
Allan Odgaard
2013-03-03 15:31:25 +01:00
parent 2c6504b82f
commit 2f05d5aec5
2 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
Frameworks/OakFileBrowser/src/OakFileBrowser.mm
View File

@@ -302,21 +302,23 @@ static NSMutableSet* SymmetricDifference (NSMutableSet* aSet, NSMutableSet* anot
_url = aURL;
_outlineViewDelegate.dataSource = DataSourceForURL(_url, _dataSourceOptions);
NSMenuItem* menuItem = [[NSMenuItem alloc] initWithTitle:_outlineViewDelegate.dataSource.rootItem.name action:@selector(takeURLFrom:) keyEquivalent:@""];
NSMenu* folderPopUpMenu = _headerView.folderPopUpButton.menu;
[folderPopUpMenu removeAllItems];
NSMenuItem* menuItem = [folderPopUpMenu addItemWithTitle:_outlineViewDelegate.dataSource.rootItem.name action:@selector(takeURLFrom:) keyEquivalent:@""];
menuItem.image = _outlineViewDelegate.dataSource.rootItem.icon;
menuItem.image.size = NSMakeSize(16, 16);
menuItem.target = self;
menuItem.representedObject = _url;
[[_headerView.folderPopUpButton cell] setMenuItem:menuItem];
[_headerView.folderPopUpButton selectItem:menuItem];
}
- (void)folderPopUpButtonWillPopUp:(NSNotification*)aNotification
{
NSMenu* menu = _headerView.folderPopUpButton.menu;
NSMenuItem* firstItem = [[_headerView.folderPopUpButton cell] menuItem];
[menu removeAllItems];
[menu addItem:firstItem];
while([menu numberOfItems] > 1)
[menu removeItemAtIndex:[menu numberOfItems]-1];
for(NSURL* currentURL = ParentForURL(_url); currentURL; currentURL = ParentForURL(currentURL))
{
@@ -328,8 +330,6 @@ static NSMutableSet* SymmetricDifference (NSMutableSet* aSet, NSMutableSet* anot
[menu addItem:[NSMenuItem separatorItem]];
[[menu addItemWithTitle:@"Other…" action:@selector(orderFrontGoToFolder:) keyEquivalent:@""] setTarget:self];
[_headerView.folderPopUpButton selectItem:firstItem];
}
- (void)goToURL:(NSURL*)aURL

1
Frameworks/OakFileBrowser/src/ui/OFBHeaderView.mm
View File

@@ -42,6 +42,7 @@ static NSPopUpButton* OakCreatePopUpButton ()
self.goForwardButton = OakCreateImageButton(NSImageNameGoRightTemplate);
self.goForwardButton.toolTip = @"Go Forward";
[self.folderPopUpButton.cell accessibilitySetOverrideValue:@"Folder" forAttribute:NSAccessibilityDescriptionAttribute];
[self.goBackButton.cell accessibilitySetOverrideValue:self.goBackButton.toolTip forAttribute:NSAccessibilityDescriptionAttribute];
[self.goForwardButton.cell accessibilitySetOverrideValue:self.goForwardButton.toolTip forAttribute:NSAccessibilityDescriptionAttribute];