Revision: 28712
http://sourceforge.net/p/bibdesk/svn/28712
Author: hofman
Date: 2024-02-08 23:07:53 +0000 (Thu, 08 Feb 2024)
Log Message:
-----------
remove implementation of deprecated accessibility methods
Modified Paths:
--------------
trunk/bibdesk/BDSKAddressTextField.m
trunk/bibdesk/BDSKColorCell.m
trunk/bibdesk/BDSKColorLabelWell.m
trunk/bibdesk/BDSKEdgeView.m
trunk/bibdesk/BDSKEmbeddedButton.m
trunk/bibdesk/BDSKFontWell.m
trunk/bibdesk/BDSKRatingButtonCell.m
trunk/bibdesk/BDSKResizeView.m
trunk/bibdesk/BDSKStatusBar.m
trunk/bibdesk/BDSKTextViewCompletionController.m
Modified: trunk/bibdesk/BDSKAddressTextField.m
===================================================================
--- trunk/bibdesk/BDSKAddressTextField.m 2024-02-08 19:39:07 UTC (rev
28711)
+++ trunk/bibdesk/BDSKAddressTextField.m 2024-02-08 23:07:53 UTC (rev
28712)
@@ -194,10 +194,4 @@
return NSAccessibilityUnignoredAncestor([(NSControl *)[self superview]
cell]);
}
-- (id)accessibilityAttributeValue:(NSString *)attribute {
- if ([attribute isEqualToString:NSAccessibilityParentAttribute])
- return NSAccessibilityUnignoredAncestor([(NSControl *)[self superview]
cell]);
- return [super accessibilityAttributeValue:attribute];
-}
-
@end
Modified: trunk/bibdesk/BDSKColorCell.m
===================================================================
--- trunk/bibdesk/BDSKColorCell.m 2024-02-08 19:39:07 UTC (rev 28711)
+++ trunk/bibdesk/BDSKColorCell.m 2024-02-08 23:07:53 UTC (rev 28712)
@@ -85,40 +85,4 @@
return NO;
}
-- (BOOL)accessibilityIsIgnored {
- return NO;
-}
-
-- (NSArray *)accessibilityAttributeNames {
- static NSArray *attributes = nil;
- if (attributes == nil) {
- attributes = [[NSArray alloc] initWithObjects:
- NSAccessibilityRoleAttribute,
- NSAccessibilityRoleDescriptionAttribute,
- NSAccessibilityValueAttribute,
- NSAccessibilityParentAttribute,
- NSAccessibilityWindowAttribute,
- NSAccessibilityTopLevelUIElementAttribute,
- NSAccessibilityPositionAttribute,
- NSAccessibilitySizeAttribute,
- NSAccessibilityEnabledAttribute,
- nil];
- }
- return attributes;
-}
-
-- (id)accessibilityAttributeValue:(NSString *)attribute {
- if ([attribute isEqualToString:NSAccessibilityRoleAttribute]) {
- return NSAccessibilityColorWellRole;
- } else if ([attribute
isEqualToString:NSAccessibilityRoleDescriptionAttribute]) {
- return NSAccessibilityRoleDescription(NSAccessibilityColorWellRole,
nil);
- } else if ([attribute isEqualToString:NSAccessibilityValueAttribute]) {
- return [self accessibilityValue];
- } else if ([attribute isEqualToString:NSAccessibilityEnabledAttribute]) {
- return @NO;
- } else {
- return [super accessibilityAttributeValue:attribute];
- }
-}
-
@end
Modified: trunk/bibdesk/BDSKColorLabelWell.m
===================================================================
--- trunk/bibdesk/BDSKColorLabelWell.m 2024-02-08 19:39:07 UTC (rev 28711)
+++ trunk/bibdesk/BDSKColorLabelWell.m 2024-02-08 23:07:53 UTC (rev 28712)
@@ -386,10 +386,6 @@
[labelCell setStringValue:@""];
}
-- (BOOL)accessibilityIsIgnored {
- return YES;
-}
-
- (BOOL)isAccessibilityElement {
return NO;
}
@@ -521,12 +517,4 @@
return nil;
}
-- (id)accessibilityAttributeValue:(NSString *)attribute {
- if ([attribute isEqualToString:NSAccessibilityTitleAttribute]) {
- return [self accessibilityLabel];
- } else {
- return [super accessibilityAttributeValue:attribute];
- }
-}
-
@end
Modified: trunk/bibdesk/BDSKEdgeView.m
===================================================================
--- trunk/bibdesk/BDSKEdgeView.m 2024-02-08 19:39:07 UTC (rev 28711)
+++ trunk/bibdesk/BDSKEdgeView.m 2024-02-08 23:07:53 UTC (rev 28712)
@@ -291,22 +291,6 @@
return NSAccessibilityUnignoredChildren([contentView subviews]);
}
-- (BOOL)accessibilityIsIgnored {
- return backgroundView == nil && backgroundColors == nil;
-}
-
-- (NSArray *)accessibilityAttributeNames {
- return [super accessibilityAttributeNames];
-}
-
-- (id)accessibilityAttributeValue:(NSString *)attribute {
- if ([attribute isEqualToString:NSAccessibilityRoleAttribute])
- return NSAccessibilityGroupRole;
- else if ([attribute
isEqualToString:NSAccessibilityRoleDescriptionAttribute])
- return NSAccessibilityRoleDescription(NSAccessibilityGroupRole, nil);
- return [super accessibilityAttributeValue:attribute];
-}
-
@end
#pragma mark -
Modified: trunk/bibdesk/BDSKEmbeddedButton.m
===================================================================
--- trunk/bibdesk/BDSKEmbeddedButton.m 2024-02-08 19:39:07 UTC (rev 28711)
+++ trunk/bibdesk/BDSKEmbeddedButton.m 2024-02-08 23:07:53 UTC (rev 28712)
@@ -44,10 +44,4 @@
return NSAccessibilityUnignoredAncestor([(NSControl *)[self superview]
cell]);
}
-- (id)accessibilityAttributeValue:(NSString *)attribute {
- if ([attribute isEqualToString:NSAccessibilityParentAttribute])
- return NSAccessibilityUnignoredAncestor([(NSControl *)[self superview]
cell]);
- return [super accessibilityAttributeValue:attribute];
-}
-
@end
Modified: trunk/bibdesk/BDSKFontWell.m
===================================================================
--- trunk/bibdesk/BDSKFontWell.m 2024-02-08 19:39:07 UTC (rev 28711)
+++ trunk/bibdesk/BDSKFontWell.m 2024-02-08 23:07:53 UTC (rev 28712)
@@ -358,17 +358,6 @@
NSRectFill(cellFrame);
}
-- (id)accessibilityAttributeValue:(NSString *)attribute {
- if ([attribute isEqualToString:NSAccessibilitySubroleAttribute])
- return @"AXFontWell";
- else if ([attribute isEqualToString:NSAccessibilityValueAttribute])
- return [self title];
- else if ([attribute isEqualToString:NSAccessibilityTitleAttribute])
- return nil;
- else
- return [super accessibilityAttributeValue:attribute];
-}
-
- (NSString *)accessibilitySubrole {
return @"AXFontWell";
}
Modified: trunk/bibdesk/BDSKRatingButtonCell.m
===================================================================
--- trunk/bibdesk/BDSKRatingButtonCell.m 2024-02-08 19:39:07 UTC (rev
28711)
+++ trunk/bibdesk/BDSKRatingButtonCell.m 2024-02-08 23:07:53 UTC (rev
28712)
@@ -396,71 +396,6 @@
#pragma mark Accessibility
-- (NSArray *)accessibilityAttributeNames {
- static NSArray *attributes = nil;
- if (attributes == nil) {
- attributes = [[NSArray alloc] initWithObjects:
- NSAccessibilityRoleAttribute,
- NSAccessibilitySubroleAttribute,
- NSAccessibilityRoleDescriptionAttribute,
- NSAccessibilityValueAttribute,
- NSAccessibilityMinValueAttribute,
- NSAccessibilityMaxValueAttribute,
- NSAccessibilityAllowedValuesAttribute,
- NSAccessibilityParentAttribute,
- NSAccessibilityChildrenAttribute,
- NSAccessibilityWindowAttribute,
- NSAccessibilityTopLevelUIElementAttribute,
- NSAccessibilityFocusedAttribute,
- NSAccessibilityPositionAttribute,
- NSAccessibilitySizeAttribute,
- nil];
- }
- return attributes;
-}
-
-- (id)accessibilityAttributeValue:(NSString *)attribute {
- if ([attribute isEqualToString:NSAccessibilityRoleAttribute]) {
- return NSAccessibilitySliderRole;
- } else if ([attribute isEqualToString:NSAccessibilitySubroleAttribute]) {
- return NSAccessibilityRatingIndicatorSubrole;
- } else if ([attribute
isEqualToString:NSAccessibilityRoleDescriptionAttribute]) {
- return NSAccessibilityRoleDescription(NSAccessibilitySliderRole,
NSAccessibilityRatingIndicatorSubrole);
- } else if ([attribute isEqualToString:NSAccessibilityValueAttribute]) {
- return [NSNumber numberWithUnsignedInteger:rating];
- } else if ([attribute isEqualToString:NSAccessibilityMinValueAttribute]) {
- return [NSNumber numberWithUnsignedInteger:0];
- } else if ([attribute isEqualToString:NSAccessibilityMaxValueAttribute]) {
- return [NSNumber numberWithUnsignedInteger:maxRating];
- } else if ([attribute
isEqualToString:NSAccessibilityAllowedValuesAttribute]) {
- NSMutableArray *values = [NSMutableArray array];
- NSUInteger i;
- for (i = 0; i <= maxRating; i++)
- [values addObject:[NSNumber numberWithUnsignedInteger:i]];
- return values;
- } else if ([attribute isEqualToString:NSAccessibilityChildrenAttribute]) {
- return @[];
- } else {
- return [super accessibilityAttributeValue:attribute];
- }
-}
-
-- (BOOL)accessibilityIsAttributeSettable:(NSString *)attribute {
- if ([attribute isEqualToString:NSAccessibilityValueAttribute])
- return YES;
- else
- return [super accessibilityIsAttributeSettable:attribute];
-}
-
-- (void)accessibilitySetValue:(id)value forAttribute:(NSString *)attribute {
- if ([attribute isEqualToString:NSAccessibilityValueAttribute]) {
- [self setRating:MIN([value unsignedIntegerValue], maxRating)];
- [(NSControl *)[self controlView] updateCellInside:self];
- [(NSControl *)[self controlView] sendAction:[self action] to:[self
target]];
- } else
- [super accessibilitySetValue:value forAttribute:attribute];
-}
-
- (NSString *)accessibilityRole {
return NSAccessibilitySliderRole;
}
@@ -503,29 +438,6 @@
return values;
}
-- (NSArray *)accessibilityActionNames {
- static NSArray *actions = nil;
- if (actions == nil) {
- actions = [[NSArray alloc] initWithObjects:
- NSAccessibilityIncrementAction,
- NSAccessibilityDecrementAction,
- nil];
- }
- return actions;
-}
-
-- (void)accessibilityPerformAction:(NSString *)anAction {
- if ([anAction isEqualToString:NSAccessibilityIncrementAction] && rating <
maxRating) {
- [self setRating:rating + 1];
- [(NSControl *)[self controlView] updateCellInside:self];
- [(NSControl *)[self controlView] sendAction:[self action] to:[self
target]];
- } else if ([anAction isEqualToString:NSAccessibilityDecrementAction] &&
rating > 0) {
- [self setRating:rating - 1];
- [(NSControl *)[self controlView] updateCellInside:self];
- [(NSControl *)[self controlView] sendAction:[self action] to:[self
target]];
- }
-}
-
- (BOOL)accessibilityPerformIncrement {
if (rating < maxRating) {
[self setRating:rating + 1];
Modified: trunk/bibdesk/BDSKResizeView.m
===================================================================
--- trunk/bibdesk/BDSKResizeView.m 2024-02-08 19:39:07 UTC (rev 28711)
+++ trunk/bibdesk/BDSKResizeView.m 2024-02-08 23:07:53 UTC (rev 28712)
@@ -111,49 +111,6 @@
}
}
-- (NSArray *)accessibilityAttributeNames {
- static NSArray *attributes = nil;
- if (attributes == nil) {
- NSMutableArray *array = [[super accessibilityAttributeNames]
mutableCopy];
- [array removeObjectsInArray:@[NSAccessibilitySplittersAttribute]];
- [array addObjectsFromArray:@[NSAccessibilityOrientationAttribute,
NSAccessibilityValueAttribute, NSAccessibilityMinValueAttribute,
NSAccessibilityMaxValueAttribute]];
- attributes = [array copy];
- }
- return attributes;
-}
-
-- (id)accessibilityAttributeValue:(NSString *)attribute {
- if ([attribute isEqualToString:NSAccessibilityRoleAttribute]) {
- return NSAccessibilitySplitterRole;
- } else if ([attribute
isEqualToString:NSAccessibilityRoleDescriptionAttribute]) {
- return NSAccessibilityRoleDescription(NSAccessibilitySplitterRole,
nil);
- } else if ([attribute
isEqualToString:NSAccessibilityOrientationAttribute]) {
- return [self isVertical] ? NSAccessibilityVerticalOrientationValue :
NSAccessibilityHorizontalOrientationValue;
- } else if ([attribute isEqualToString:NSAccessibilityValueAttribute]) {
- return [NSNumber numberWithDouble:[constraint constant]];
- } else if ([attribute isEqualToString:NSAccessibilityMinValueAttribute]) {
- return [NSNumber numberWithDouble:minValue];
- } else if ([attribute isEqualToString:NSAccessibilityMaxValueAttribute]) {
- return [NSNumber numberWithDouble:maxValue];
- } else {
- return [super accessibilityAttributeValue:attribute];
- }
-}
-
-- (BOOL)accessibilityIsAttributeSettable:(NSString *)attribute {
- if ([attribute isEqualToString:NSAccessibilityValueAttribute])
- return YES;
- else
- return [super accessibilityIsAttributeSettable:attribute];
-}
-
-- (void)accessibilitySetValue:(id)value forAttribute:(NSString *)attribute {
- if ([attribute isEqualToString:NSAccessibilityValueAttribute]) {
- [constraint setConstant:fmin(maxValue, fmax(minValue, [value
doubleValue]))];
- } else
- [super accessibilitySetValue:value forAttribute:attribute];
-}
-
- (NSString *)accessibilityRole {
return NSAccessibilitySplitterRole;
}
Modified: trunk/bibdesk/BDSKStatusBar.m
===================================================================
--- trunk/bibdesk/BDSKStatusBar.m 2024-02-08 19:39:07 UTC (rev 28711)
+++ trunk/bibdesk/BDSKStatusBar.m 2024-02-08 23:07:53 UTC (rev 28712)
@@ -444,26 +444,6 @@
#pragma mark Accessibility
-- (NSArray *)accessibilityAttributeNames {
- return [[super accessibilityAttributeNames]
arrayByAddingObject:NSAccessibilityTitleAttribute];
-}
-
-- (id)accessibilityAttributeValue:(NSString *)attribute {
- if ([attribute isEqualToString:NSAccessibilityRoleAttribute])
- return NSAccessibilityGroupRole;
- else if ([attribute
isEqualToString:NSAccessibilityRoleDescriptionAttribute])
- return NSAccessibilityRoleDescription(NSAccessibilityGroupRole, nil);
- else if ([attribute isEqualToString:NSAccessibilityChildrenAttribute])
- return NSAccessibilityUnignoredChildren([[self subviews]
arrayByAddingObjectsFromArray:icons]);
- else if ([attribute isEqualToString:NSAccessibilityTitleAttribute])
- return NSLocalizedString(@"status bar", @"Accessibility description");
- return [super accessibilityAttributeValue:attribute];
-}
-
-- (BOOL)accessibilityIsIgnored {
- return NO;
-}
-
- (BOOL)isAccessibilityElement {
return YES;
}
@@ -545,50 +525,6 @@
#pragma mark Accessibility
-- (NSArray *)accessibilityAttributeNames {
- static NSArray *attributes = nil;
- if (attributes == nil) {
- attributes = [[NSArray alloc] initWithObjects:
- NSAccessibilityRoleAttribute,
- NSAccessibilityRoleDescriptionAttribute,
- NSAccessibilityParentAttribute,
- NSAccessibilityWindowAttribute,
- NSAccessibilityTopLevelUIElementAttribute,
- NSAccessibilityPositionAttribute,
- NSAccessibilitySizeAttribute,
- NSAccessibilityTitleAttribute,
- NSAccessibilityHelpAttribute,
- nil];
- }
- return attributes;
-}
-
-- (id)accessibilityAttributeValue:(NSString *)attribute {
- if ([attribute isEqualToString:NSAccessibilityRoleAttribute])
- return NSAccessibilityImageRole;
- else if ([attribute
isEqualToString:NSAccessibilityRoleDescriptionAttribute])
- return NSAccessibilityRoleDescription(NSAccessibilityImageRole, nil);
- else if ([attribute isEqualToString:NSAccessibilityParentAttribute])
- return NSAccessibilityUnignoredAncestor(parent);
- else if ([attribute isEqualToString:NSAccessibilityWindowAttribute])
- return [NSAccessibilityUnignoredAncestor(parent)
accessibilityAttributeValue:NSAccessibilityWindowAttribute];
- else if ([attribute
isEqualToString:NSAccessibilityTopLevelUIElementAttribute])
- return [NSAccessibilityUnignoredAncestor(parent)
accessibilityAttributeValue:NSAccessibilityTopLevelUIElementAttribute];
- else if ([attribute isEqualToString:NSAccessibilityPositionAttribute])
- [NSValue valueWithPoint:[parent screenRectForIcon:self].origin];
- else if ([attribute isEqualToString:NSAccessibilitySizeAttribute])
- [NSValue valueWithSize:[parent screenRectForIcon:self].size];
- else if ([attribute isEqualToString:NSAccessibilityTitleAttribute])
- return [self toolTip];
- else if ([attribute isEqualToString:NSAccessibilityHelpAttribute])
- return [parent toolTipForIcon:self];
- return [super accessibilityAttributeValue:attribute];
-}
-
-- (BOOL)accessibilityIsIgnored {
- return NO;
-}
-
- (BOOL)isAccessibilityElement {
return YES;
}
Modified: trunk/bibdesk/BDSKTextViewCompletionController.m
===================================================================
--- trunk/bibdesk/BDSKTextViewCompletionController.m 2024-02-08 19:39:07 UTC
(rev 28711)
+++ trunk/bibdesk/BDSKTextViewCompletionController.m 2024-02-08 23:07:53 UTC
(rev 28712)
@@ -459,8 +459,6 @@
- (BOOL)canBecomeKeyWindow { return NO; }
- (BOOL)canBecomeMainWindow { return NO; }
-- (BOOL)accessibilityIsIgnored { return YES; }
-
- (BOOL)isAccessibilityElement { return NO; }
@end
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
_______________________________________________
Bibdesk-commit mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/bibdesk-commit
