diff --git a/MPlayerX/CocoaAppendix.m b/MPlayerX/CocoaAppendix.m
index 2a97d22..5fdd07a 100644
--- a/MPlayerX/CocoaAppendix.m
+++ b/MPlayerX/CocoaAppendix.m
@@ -693,7 +693,7 @@ +(NSString*) UserPath:(NSSearchPathDirectory)dir WithSuffix:(NSString*)suffix
@implementation NSObject (MPXAdditional)
-(void) showAlertPanelModal:(NSString*) str
{
- id alertPanel = NSGetAlertPanel(kMPXStringError, str, kMPXStringOK, nil, nil);
+ id alertPanel = NSGetAlertPanel(kMPXStringError, @"%@", kMPXStringOK, nil, nil, str);
[NSApp runModalForWindow:alertPanel];
NSReleaseAlertPanel(alertPanel);
}
diff --git a/MPlayerX/ControlUIView.m b/MPlayerX/ControlUIView.m
index a024a94..880bd0f 100644
--- a/MPlayerX/ControlUIView.m
+++ b/MPlayerX/ControlUIView.m
@@ -419,6 +419,21 @@ - (void)awakeFromNib
selfFrame.origin.y = MIN(MAX(1, superFrame.size.height * yRatio - selfFrame.size.height / 2), superFrame.size.height - selfFrame.size.height-1);
[self setFrameOrigin:selfFrame.origin];
}
+
+ // Accessibility
+ [volumeButton.cell accessibilitySetOverrideValue:NSLocalizedString(@"Mute", nil) forAttribute:NSAccessibilityDescriptionAttribute];
+ [volumeSlider.cell accessibilitySetOverrideValue:NSLocalizedString(@"Volume", nil) forAttribute:NSAccessibilityDescriptionAttribute];
+ [prevEPButton.cell accessibilitySetOverrideValue:NSLocalizedString(@"Play Previous Episode", nil) forAttribute:NSAccessibilityDescriptionAttribute];
+ [nextEPButton.cell accessibilitySetOverrideValue:NSLocalizedString(@"Play Next Episode", nil) forAttribute:NSAccessibilityDescriptionAttribute];
+ [playPauseButton.cell accessibilitySetOverrideValue:NSLocalizedString(@"Play", nil) forAttribute:NSAccessibilityDescriptionAttribute];
+ [fillScreenButton.cell accessibilitySetOverrideValue:NSLocalizedString(@"Fill Screen", nil) forAttribute:NSAccessibilityDescriptionAttribute];
+ [fullScreenButton.cell accessibilitySetOverrideValue:NSLocalizedString(@"Full Screen", nil) forAttribute:NSAccessibilityDescriptionAttribute];
+ [toggleAcceButton.cell accessibilitySetOverrideValue:NSLocalizedString(@"Show Auxiliary Controls", nil) forAttribute:NSAccessibilityDescriptionAttribute];
+ [timeDispSwitch.cell accessibilitySetOverrideValue:NSLocalizedString(@"Show total time instead of remaining time", nil) forAttribute:NSAccessibilityDescriptionAttribute];
+ [timeSlider.cell accessibilitySetOverrideValue:NSLocalizedString(@"Timeline", nil) forAttribute:NSAccessibilityDescriptionAttribute];
+ // these two don't work with VoiceOver (yet?)
+ [timeText.cell accessibilitySetOverrideValue:NSLocalizedString(@"Elapsed Time", nil) forAttribute:NSAccessibilityDescriptionAttribute];
+ [timeTextAlt.cell accessibilitySetOverrideValue:NSLocalizedString(@"Remaining or Total Time", nil) forAttribute:NSAccessibilityDescriptionAttribute];
}
-(void) dealloc
diff --git a/MPlayerX/English.lproj/Localizable.strings b/MPlayerX/English.lproj/Localizable.strings
index 52b6f95..40ccb53 100644
Binary files a/MPlayerX/English.lproj/Localizable.strings and b/MPlayerX/English.lproj/Localizable.strings differ
diff --git a/MPlayerX/English.lproj/MainMenu.xib b/MPlayerX/English.lproj/MainMenu.xib
index 4a8169a..fec14e3 100644
--- a/MPlayerX/English.lproj/MainMenu.xib
+++ b/MPlayerX/English.lproj/MainMenu.xib
@@ -1,8715 +1,1230 @@
-
-
-
- 1070
- 12B19
- 2549
- 1187
- 624.00
-
-
-
-
-
-
-
- 0
- IBCocoaFramework
-
-
- YES
- 3
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/MPlayerX/MPXWindowButton.m b/MPlayerX/MPXWindowButton.m
index 8952c18..4b7dccf 100644
--- a/MPlayerX/MPXWindowButton.m
+++ b/MPlayerX/MPXWindowButton.m
@@ -20,10 +20,6 @@
#import "MPXWindowButton.h"
-NSString * const kMPXAccessibilityCloseButtonDesc = @"closeButton";
-NSString * const kMPXAccessibilityMinimizeButtonDesc = @"minimizeButton";
-NSString * const kMPXAccessibilityZoomButtonDesc = @"zoomButton";
-
@implementation MPXWindowButton
@synthesize windowButtonType;
@@ -102,25 +98,17 @@ -(id) accessibilityAttributeValue: (NSString*)attr
case kMPXWindowZoomButtonType:
ret = NSAccessibilityZoomButtonSubrole;
break;
+#if defined(MAC_OS_X_VERSION_10_7) && MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_7
+ case kMPXWindowFullscreenButtonType:
+ if (&NSAccessibilityFullScreenButtonAttribute != nil) {
+ ret = NSAccessibilityFullScreenButtonSubrole;
+ break;
+ }
+#endif
default:
ret = NSAccessibilityUnknownSubrole;
break;
}
- } else if ([attr isEqualToString:NSAccessibilityDescriptionAttribute]) {
- switch (type) {
- case kMPXWindowCloseButtonType:
- ret = kMPXAccessibilityCloseButtonDesc;
- break;
- case kMPXWindowMinimizeButtonType:
- ret = kMPXAccessibilityMinimizeButtonDesc;
- break;
- case kMPXWindowZoomButtonType:
- ret = kMPXAccessibilityZoomButtonDesc;
- break;
- default:
- ret = @"";
- break;
- }
} else if ([attr isEqualToString:NSAccessibilityEditedAttribute]) {
ret = [NSNumber numberWithBool:NO];
diff --git a/MPlayerX/PlayerWindow.m b/MPlayerX/PlayerWindow.m
index db7b6c9..13a88f4 100644
--- a/MPlayerX/PlayerWindow.m
+++ b/MPlayerX/PlayerWindow.m
@@ -23,7 +23,6 @@
#import "CocoaAppendix.h"
#import "KeyCode.h"
-NSString * const kMPXAccessibilityPlayerWindowDesc = @"PlayerWindow";
NSString * const kMPXAccessibilityWindowFrameAttribute = @"AXMPXWindowFrame";
@implementation PlayerWindow
@@ -138,17 +137,19 @@ -(id) accessibilityAttributeValue:(NSString*)attr
id ret;
if ([attr isEqualToString:NSAccessibilityCloseButtonAttribute]) {
- ret = [titlebar closeButton];
+ ret = [[titlebar closeButton] cell];
} else if ([attr isEqualToString:NSAccessibilityMinimizeButtonAttribute]) {
- ret = [titlebar miniButton];
+ ret = [[titlebar miniButton] cell];
} else if ([attr isEqualToString:NSAccessibilityZoomButtonAttribute]) {
- ret = [titlebar zoomButton];
-
- } else if ([attr isEqualToString:NSAccessibilityDescriptionAttribute]) {
- ret = kMPXAccessibilityPlayerWindowDesc;
-
+ ret = [[titlebar zoomButton] cell];
+
+#if defined(MAC_OS_X_VERSION_10_7) && MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_7
+ } else if (&NSAccessibilityFullScreenButtonAttribute != nil && [attr isEqualToString:NSAccessibilityFullScreenButtonAttribute]) {
+ ret = [[titlebar fsButton] cell];
+#endif
+
} else if ([attr isEqualToString:NSAccessibilitySubroleAttribute]) {
ret = NSAccessibilityStandardWindowSubrole;
diff --git a/MPlayerX/TitleView.h b/MPlayerX/TitleView.h
index 14f4695..c969ea6 100644
--- a/MPlayerX/TitleView.h
+++ b/MPlayerX/TitleView.h
@@ -59,6 +59,8 @@
@property(readonly) NSButton *closeButton;
@property(readonly) NSButton *miniButton;
@property(readonly) NSButton *zoomButton;
+@property(readonly) NSButton *fsButton;
+
-(void) resetPosition;
@end
diff --git a/MPlayerX/TitleView.m b/MPlayerX/TitleView.m
index 86fe510..f49273e 100644
--- a/MPlayerX/TitleView.m
+++ b/MPlayerX/TitleView.m
@@ -36,6 +36,7 @@ @implementation TitleView
@synthesize closeButton;
@synthesize miniButton;
@synthesize zoomButton;
+@synthesize fsButton;
+(void) initialize
{