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

Add accessibility labels to Find dialog

Browse Source
This commit is contained in:
Boris Dušek
2014-03-31 22:12:20 +02:00
committed by Allan Odgaard
parent 896ad73ee8
commit f48216a0f1
1 changed files with 19 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
Frameworks/Find/src/FindWindowController.mm
View File

@@ -38,25 +38,28 @@ NSString* const kUserDefaultsFindResultsHeightKey = @"findResultsHeight";
}
@end
static OakAutoSizingTextField* OakCreateTextField (id <NSTextFieldDelegate> delegate)
static OakAutoSizingTextField* OakCreateTextField (id <NSTextFieldDelegate> delegate, NSObject* accessibilityLabel = nil)
{
OakAutoSizingTextField* res = [[OakAutoSizingTextField alloc] initWithFrame:NSZeroRect];
res.font = OakControlFont();
[[res cell] setWraps:YES];
OakSetAccessibilityLabel(res, accessibilityLabel);
res.delegate = delegate;
return res;
}
static NSButton* OakCreateHistoryButton ()
static NSButton* OakCreateHistoryButton (NSString* toolTip)
{
NSButton* res = [[NSButton alloc] initWithFrame:NSZeroRect];
res.bezelStyle = NSRoundedDisclosureBezelStyle;
res.buttonType = NSMomentaryLightButton;
res.title = @"";
res.toolTip = toolTip;
OakSetAccessibilityLabel(res, toolTip);
return res;
}
static NSOutlineView* OakCreateOutlineView (NSScrollView** scrollViewOut)
static NSOutlineView* OakCreateOutlineView (NSScrollView** scrollViewOut, NSObject* accessibilityLabel)
{
NSOutlineView* res = [[NSOutlineView alloc] initWithFrame:NSZeroRect];
res.focusRingType = NSFocusRingTypeNone;
@@ -64,6 +67,7 @@ static NSOutlineView* OakCreateOutlineView (NSScrollView** scrollViewOut)
res.autoresizesOutlineColumn = NO;
res.usesAlternatingRowBackgroundColors = YES;
res.headerView = nil;
OakSetAccessibilityLabel(res, accessibilityLabel);
NSTableColumn* tableColumn = [[NSTableColumn alloc] initWithIdentifier:@"checkbox"];
NSButtonCell* dataCell = [NSButtonCell new];
@@ -107,7 +111,7 @@ static NSProgressIndicator* OakCreateProgressIndicator ()
static NSButton* OakCreateStopSearchButton ()
{
NSButton* res = [[NSButton alloc] initWithFrame:NSZeroRect];
NSButton* res = [[NSButton alloc] initWithFrame:NSZeroRect];
res.buttonType = NSMomentaryChangeButton;
res.bordered = NO;
res.image = [NSImage imageNamed:NSImageNameStopProgressFreestandingTemplate];
@@ -116,6 +120,7 @@ static NSButton* OakCreateStopSearchButton ()
res.keyEquivalent = @".";
res.keyEquivalentModifierMask = NSCommandKeyMask;
[res.cell setImageScaling:NSImageScaleProportionallyDown];
OakSetAccessibilityLabel(res, res.toolTip);
return res;
}
@@ -190,13 +195,16 @@ static NSButton* OakCreateStopSearchButton ()
self.window.restorable = NO;
self.findLabel = OakCreateLabel(@"Find:");
self.findTextField = OakCreateTextField(self);
self.findHistoryButton = OakCreateHistoryButton();
self.findTextField = OakCreateTextField(self, self.findLabel);
self.findHistoryButton = OakCreateHistoryButton(@"Show Find History");
self.countButton = OakCreateButton(@"Σ", NSSmallSquareBezelStyle);
self.countButton.toolTip = @"Show Results Count";
OakSetAccessibilityLabel(self.countButton, self.countButton.toolTip);
self.replaceLabel = OakCreateLabel(@"Replace:");
self.replaceTextField = OakCreateTextField(self);
self.replaceHistoryButton = OakCreateHistoryButton();
self.replaceTextField = OakCreateTextField(self, self.replaceLabel);
self.replaceHistoryButton = OakCreateHistoryButton(@"Show Replace History");
self.optionsLabel = OakCreateLabel(@"Options:");
@@ -206,14 +214,14 @@ static NSButton* OakCreateStopSearchButton ()
self.wrapAroundCheckBox = OakCreateCheckBox(@"Wrap Around");
self.whereLabel = OakCreateLabel(@"In:");
self.wherePopUpButton = OakCreatePopUpButton();
self.wherePopUpButton = OakCreatePopUpButton(NO, nil, self.whereLabel);
self.matchingLabel = OakCreateLabel(@"matching");
self.globTextField = OakCreateComboBox();
self.globTextField = OakCreateComboBox(self.matchingLabel);
self.actionsPopUpButton = OakCreateActionPopUpButton(YES /* bordered */);
NSScrollView* resultsScrollView = nil;
self.resultsTopDivider = OakCreateHorizontalLine([NSColor colorWithCalibratedWhite:0.500 alpha:1]);
self.resultsOutlineView = OakCreateOutlineView(&resultsScrollView);
self.resultsOutlineView = OakCreateOutlineView(&resultsScrollView, @"Results");
self.resultsScrollView = resultsScrollView;
self.resultsBottomDivider = OakCreateHorizontalLine([NSColor colorWithCalibratedWhite:0.500 alpha:1]);