accessibilityDescription pokes.

MaddTheSane · Jan 16, 2024 · 2ea75a5 · 2ea75a5
1 parent 9f35fd7
commit 2ea75a5
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 26 deletions.
diff --git a/Boxer/BXBezelController.m b/Boxer/BXBezelController.m
@@ -53,7 +53,7 @@ + (NSImage *) bezelIconForDrive: (BXDrive *)drive
     {
         case BXDriveCDROM:
             if (@available(macOS 13.0, *)) {
-                icon = [NSImage imageWithSystemSymbolName: @"opticaldisc.fill" accessibilityDescription: nil];
+                icon = [NSImage imageWithSystemSymbolName: @"opticaldisc.fill" accessibilityDescription: @"CD-ROM"];
             } else {
                 icon = [NSImage imageNamed: @"CDROMTemplate"];
             }
@@ -63,7 +63,7 @@ + (NSImage *) bezelIconForDrive: (BXDrive *)drive
             break;
         default:
             if (@available(macOS 11.0, *)) {
-                icon = [NSImage imageWithSystemSymbolName: @"internaldrive.fill" accessibilityDescription: nil];
+                icon = [NSImage imageWithSystemSymbolName: @"internaldrive.fill" accessibilityDescription: @"Hard Drive"];
             } else {
                 icon = [NSImage imageNamed: @"HardDiskTemplate"];
             }

diff --git a/Boxer/DOS window/BXLaunchPanelController.m b/Boxer/DOS window/BXLaunchPanelController.m
@@ -465,7 +465,7 @@ + (NSImage *) _headingIconForDriveType: (BXDriveType)type
     {
         case BXDriveCDROM:
             if (@available(macOS 13.0, *)) {
-                icon = [NSImage imageWithSystemSymbolName: @"opticaldisc.fill" accessibilityDescription: nil];
+                icon = [NSImage imageWithSystemSymbolName: @"opticaldisc.fill" accessibilityDescription: @"CD-ROM"];
             } else {
                 icon = [NSImage imageNamed: @"CDROMTemplate"];
             }
@@ -475,7 +475,7 @@ + (NSImage *) _headingIconForDriveType: (BXDriveType)type
             break;
         default:
             if (@available(macOS 11.0, *)) {
-                icon = [NSImage imageWithSystemSymbolName: @"internaldrive.fill" accessibilityDescription: nil];
+                icon = [NSImage imageWithSystemSymbolName: @"internaldrive.fill" accessibilityDescription: @"Hard Drive"];
             } else {
                 icon = [NSImage imageNamed: @"HardDiskTemplate"];
             }

diff --git a/Boxer/Inspector Panel/BXDriveItem.m b/Boxer/Inspector Panel/BXDriveItem.m
@@ -141,7 +141,7 @@ - (NSImage *) driveImage
     {
         case BXDriveCDROM:
             if (@available(macOS 13.0, *)) {
-                icon = [NSImage imageWithSystemSymbolName: @"opticaldisc.fill" accessibilityDescription: nil];
+                icon = [NSImage imageWithSystemSymbolName: @"opticaldisc.fill" accessibilityDescription: @"CD-ROM"];
             } else {
                 icon = [NSImage imageNamed: @"CDROMTemplate"];
             }
@@ -151,7 +151,7 @@ - (NSImage *) driveImage
             break;
         default:
             if (@available(macOS 11.0, *)) {
-                icon = [NSImage imageWithSystemSymbolName: @"internaldrive.fill" accessibilityDescription: nil];
+                icon = [NSImage imageWithSystemSymbolName: @"internaldrive.fill" accessibilityDescription: @"Hard Drive"];
             } else {
                 icon = [NSImage imageNamed: @"HardDiskTemplate"];
             }

diff --git a/Other Sources/ADBToolkit/ADBFileHandle.h b/Other Sources/ADBToolkit/ADBFileHandle.h
@@ -367,22 +367,4 @@ typedef NS_ENUM(int, ADBHandleSeekLocation) {
 
 @end
 
-static const ADBHandleOptions ADBOpenForReading NS_DEPRECATED_WITH_REPLACEMENT_MAC("ADBHandleOpenForReading", 10.5, 10.14) = ADBHandleOpenForReading;
-static const ADBHandleOptions ADBOpenForWriting NS_DEPRECATED_WITH_REPLACEMENT_MAC("ADBHandleOpenForWriting", 10.5, 10.14) = ADBHandleOpenForWriting;
-static const ADBHandleOptions ADBCreateIfMissing NS_DEPRECATED_WITH_REPLACEMENT_MAC("ADBHandleCreateIfMissing", 10.5, 10.14) = ADBHandleCreateIfMissing;
-static const ADBHandleOptions ADBCreateAlways NS_DEPRECATED_WITH_REPLACEMENT_MAC("ADBHandleCreateAlways", 10.5, 10.14) = ADBHandleCreateAlways;
-static const ADBHandleOptions ADBTruncate NS_DEPRECATED_WITH_REPLACEMENT_MAC("ADBHandleTruncate", 10.5, 10.14) = ADBHandleTruncate;
-static const ADBHandleOptions ADBAppend NS_DEPRECATED_WITH_REPLACEMENT_MAC("ADBHandleAppend", 10.5, 10.14) = ADBHandleAppend;
-static const ADBHandleOptions ADBPOSIXModeR NS_DEPRECATED_WITH_REPLACEMENT_MAC("ADBHandlePOSIXModeR", 10.5, 10.14) = ADBHandlePOSIXModeR;
-static const ADBHandleOptions ADBPOSIXModeRPlus NS_DEPRECATED_WITH_REPLACEMENT_MAC("ADBHandlePOSIXModeRPlus", 10.5, 10.14) = ADBHandlePOSIXModeRPlus;
-static const ADBHandleOptions ADBPOSIXModeW NS_DEPRECATED_WITH_REPLACEMENT_MAC("ADBHandlePOSIXModeW", 10.5, 10.14) = ADBHandlePOSIXModeW;
-static const ADBHandleOptions ADBPOSIXModeWPlus NS_DEPRECATED_WITH_REPLACEMENT_MAC("ADBHandlePOSIXModeWPlus", 10.5, 10.14) = ADBHandlePOSIXModeWPlus;
-static const ADBHandleOptions ADBPOSIXModeA NS_DEPRECATED_WITH_REPLACEMENT_MAC("ADBHandlePOSIXModeA", 10.5, 10.14) = ADBHandlePOSIXModeA;
-static const ADBHandleOptions ADBPOSIXModeAPlus NS_DEPRECATED_WITH_REPLACEMENT_MAC("ADBHandlePOSIXModeAPlus", 10.5, 10.14) = ADBHandlePOSIXModeAPlus;
-static const ADBHandleOptions ADBPOSIXModeWX NS_DEPRECATED_WITH_REPLACEMENT_MAC("ADBHandlePOSIXModeWX", 10.5, 10.14) = ADBHandlePOSIXModeWX;
-static const ADBHandleOptions ADBPOSIXModeWPlusX NS_DEPRECATED_WITH_REPLACEMENT_MAC("ADBHandlePOSIXModeWPlusX", 10.5, 10.14) = ADBHandlePOSIXModeWPlusX;
-static const ADBHandleOptions ADBPOSIXModeAX NS_DEPRECATED_WITH_REPLACEMENT_MAC("ADBHandlePOSIXModeAX", 10.5, 10.14) = ADBHandlePOSIXModeAX;
-static const ADBHandleOptions ADBPOSIXModeAPlusX NS_DEPRECATED_WITH_REPLACEMENT_MAC("ADBHandlePOSIXModeAPlusX", 10.5, 10.14) = ADBHandlePOSIXModeAPlusX;
-
-
 NS_ASSUME_NONNULL_END
diff --git a/Other Sources/ADBToolkit/ADBSwiftHelpers.swift b/Other Sources/ADBToolkit/ADBSwiftHelpers.swift
@@ -56,8 +56,7 @@ extension BXFileTypes {
         let handle: ADBReadable & ADBSeekable
         do {
             //Should work, but just in case.
-            let preHandle = try filesystem.fileHandle(atPath: path, options: .openForReading)
-            guard let prehandle1 = preHandle as? (ADBReadable & ADBSeekable) else {
+            guard let prehandle1 = try filesystem.fileHandle(atPath: path, options: .openForReading) as? (ADBReadable & ADBSeekable) else {
                 throw CocoaError(.fileReadUnsupportedScheme)
             }
             handle = prehandle1