[Skim-app-commit] SF.net SVN: skim-app:[12998] trunk

[hofman--- via Skim-app-commit]

Revision: 12998
          http://sourceforge.net/p/skim-app/code/12998
Author:   hofman
Date:     2022-07-07 17:47:11 +0000 (Thu, 07 Jul 2022)
Log Message:
-----------
set accessibility description of image rather than overriding label in image 
view

Modified Paths:
--------------
    trunk/NSImage_SKExtensions.m
    trunk/SKAnnotationTypeImageCell.m

Modified: trunk/NSImage_SKExtensions.m
===================================================================
--- trunk/NSImage_SKExtensions.m        2022-07-07 15:06:35 UTC (rev 12997)
+++ trunk/NSImage_SKExtensions.m        2022-07-07 17:47:11 UTC (rev 12998)
@@ -40,6 +40,8 @@
 #import "NSBitmapImageRep_SKExtensions.h"
 #import "NSShadow_SKExtensions.h"
 #import "NSBezierPath_SKExtensions.h"
+#import "NSString_SKExtensions.h"
+#import <SkimNotes/SkimNotes.h>
 
 
 NSString *SKImageNameTextNote = @"TextNote";
@@ -1369,6 +1371,15 @@
     
     APPLY_NOTE_TYPES(MAKE_NOTE_IMAGE);
     
+    [[self imageNamed:SKImageNameTextNote] 
setAccessibilityDescription:[SKNFreeTextString typeName]];
+    [[self imageNamed:SKImageNameAnchoredNote] 
setAccessibilityDescription:[SKNNoteString typeName]];
+    [[self imageNamed:SKImageNameCircleNote] 
setAccessibilityDescription:[SKNCircleString typeName]];
+    [[self imageNamed:SKImageNameSquareNote] 
setAccessibilityDescription:[SKNSquareString typeName]];
+    [[self imageNamed:SKImageNameHighlightNote] 
setAccessibilityDescription:[SKNHighlightString typeName]];
+    [[self imageNamed:SKImageNameUnderlineNote] 
setAccessibilityDescription:[SKNUnderlineString typeName]];
+    [[self imageNamed:SKImageNameStrikeOutNote] 
setAccessibilityDescription:[SKNStrikeOutString typeName]];
+    [[self imageNamed:SKImageNameLineNote] 
setAccessibilityDescription:[SKNLineString typeName]];
+    [[self imageNamed:SKImageNameInkNote] 
setAccessibilityDescription:[SKNInkString typeName]];
 }
 
 + (void)makeAdornImages {

Modified: trunk/SKAnnotationTypeImageCell.m
===================================================================
--- trunk/SKAnnotationTypeImageCell.m   2022-07-07 15:06:35 UTC (rev 12997)
+++ trunk/SKAnnotationTypeImageCell.m   2022-07-07 17:47:11 UTC (rev 12998)
@@ -98,28 +98,4 @@
     }
 }
 
-- (NSString *)accessibilityLabel {
-    NSString *name = [[self image] name];
-    if ([name isEqualToString:SKImageNameTextNote])
-        return [SKNFreeTextString typeName];
-    else if ([name isEqualToString:SKImageNameAnchoredNote])
-        return [SKNNoteString typeName];
-    else if ([name isEqualToString:SKImageNameCircleNote])
-        return [SKNCircleString typeName];
-    else if ([name isEqualToString:SKImageNameSquareNote])
-        return [SKNSquareString typeName];
-    else if ([name isEqualToString:SKImageNameHighlightNote])
-        return [SKNHighlightString typeName];
-    else if ([name isEqualToString:SKImageNameUnderlineNote])
-        return [SKNUnderlineString typeName];
-    else if ([name isEqualToString:SKImageNameStrikeOutNote])
-        return [SKNStrikeOutString typeName];
-    else if ([name isEqualToString:SKImageNameLineNote])
-        return [SKNLineString typeName];
-    else if ([name isEqualToString:SKImageNameInkNote])
-        return [SKNInkString typeName];
-    else
-        return nil;
-}
-
 @end

This was sent by the SourceForge.net collaborative development platform, the 
world's largest Open Source development site.



_______________________________________________
Skim-app-commit mailing list
Skim-app-commit@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/skim-app-commit