Commit fd14f77e authored by Marvin Scholz's avatar Marvin Scholz

macosx: Improve and correct accessibility strings

parent 6a14d10b
......@@ -61,27 +61,25 @@
[self.dropView setDrawBorder: NO];
[self.playButton setToolTip: _NS("Play/Pause")];
[[self.playButton cell] accessibilitySetOverrideValue:_NS("Click to play or pause the current media.") forAttribute:NSAccessibilityDescriptionAttribute];
[[self.playButton cell] accessibilitySetOverrideValue:[self.playButton toolTip] forAttribute:NSAccessibilityTitleAttribute];
[self.playButton setToolTip: _NS("Play")];
[[self.playButton cell] accessibilitySetOverrideValue:[self.playButton toolTip] forAttribute:NSAccessibilityDescriptionAttribute];
[self.backwardButton setToolTip: _NS("Backward")];
[[self.backwardButton cell] accessibilitySetOverrideValue:_NS("Click to go to the previous playlist item. Hold to skip backward through the current media.") forAttribute:NSAccessibilityDescriptionAttribute];
[[self.backwardButton cell] accessibilitySetOverrideValue:_NS("Seek backward") forAttribute:NSAccessibilityDescriptionAttribute];
[[self.backwardButton cell] accessibilitySetOverrideValue:[self.backwardButton toolTip] forAttribute:NSAccessibilityTitleAttribute];
[self.forwardButton setToolTip: _NS("Forward")];
[[self.forwardButton cell] accessibilitySetOverrideValue:_NS("Click to go to the next playlist item. Hold to skip forward through the current media.") forAttribute:NSAccessibilityDescriptionAttribute];
[[self.forwardButton cell] accessibilitySetOverrideValue:_NS("Seek forward") forAttribute:NSAccessibilityDescriptionAttribute];
[[self.forwardButton cell] accessibilitySetOverrideValue:[self.forwardButton toolTip] forAttribute:NSAccessibilityTitleAttribute];
[self.timeSlider setToolTip: _NS("Position")];
[[self.timeSlider cell] accessibilitySetOverrideValue:_NS("Click and move the mouse while keeping the button pressed to use this slider to change current playback position.") forAttribute:NSAccessibilityDescriptionAttribute];
[[self.timeSlider cell] accessibilitySetOverrideValue:_NS("Playback position") forAttribute:NSAccessibilityDescriptionAttribute];
[[self.timeSlider cell] accessibilitySetOverrideValue:[self.timeSlider toolTip] forAttribute:NSAccessibilityTitleAttribute];
if (_darkInterface)
[self.timeSlider setSliderStyleDark];
[self.fullscreenButton setToolTip: _NS("Toggle Fullscreen mode")];
[[self.fullscreenButton cell] accessibilitySetOverrideValue:_NS("Click to enable fullscreen video playback.") forAttribute:NSAccessibilityDescriptionAttribute];
[[self.fullscreenButton cell] accessibilitySetOverrideValue:[self.fullscreenButton toolTip] forAttribute:NSAccessibilityTitleAttribute];
[self.fullscreenButton setToolTip: _NS("Fullscreen")];
[[self.fullscreenButton cell] accessibilitySetOverrideValue:[self.fullscreenButton toolTip] forAttribute:NSAccessibilityDescriptionAttribute];
if (!_darkInterface) {
[self.bottomBarView setDark:NO];
......@@ -126,6 +124,8 @@
[self.timeField setAlignment: NSCenterTextAlignment];
[self.timeField setNeedsDisplay:YES];
[self.timeField setRemainingIdentifier:@"DisplayTimeAsTimeRemaining"];
[[self.timeField cell] accessibilitySetOverrideValue:_NS("Playback time")
forAttribute:NSAccessibilityDescriptionAttribute];
// remove fullscreen button for lion fullscreen
if (_nativeFullscreenMode) {
......@@ -146,16 +146,22 @@
{
if (b_alt == YES) {
/* change the accessibility help for the backward/forward buttons accordingly */
[[self.backwardButton cell] accessibilitySetOverrideValue:_NS("Click and hold to skip backward through the current media.") forAttribute:NSAccessibilityDescriptionAttribute];
[[self.forwardButton cell] accessibilitySetOverrideValue:_NS("Click and hold to skip forward through the current media.") forAttribute:NSAccessibilityDescriptionAttribute];
[[self.backwardButton cell] accessibilitySetOverrideValue:_NS("Backward") forAttribute:NSAccessibilityTitleAttribute];
[[self.backwardButton cell] accessibilitySetOverrideValue:_NS("Seek backward") forAttribute:NSAccessibilityDescriptionAttribute];
[[self.forwardButton cell] accessibilitySetOverrideValue:_NS("Forward") forAttribute:NSAccessibilityTitleAttribute];
[[self.forwardButton cell] accessibilitySetOverrideValue:_NS("Seek forward") forAttribute:NSAccessibilityDescriptionAttribute];
[self.forwardButton setAction:@selector(alternateForward:)];
[self.backwardButton setAction:@selector(alternateBackward:)];
} else {
/* change the accessibility help for the backward/forward buttons accordingly */
[[self.backwardButton cell] accessibilitySetOverrideValue:_NS("Click to go to the previous playlist item. Hold to skip backward through the current media.") forAttribute:NSAccessibilityDescriptionAttribute];
[[self.forwardButton cell] accessibilitySetOverrideValue:_NS("Click to go to the next playlist item. Hold to skip forward through the current media.") forAttribute:NSAccessibilityDescriptionAttribute];
[[self.backwardButton cell] accessibilitySetOverrideValue:_NS("Previous") forAttribute:NSAccessibilityTitleAttribute];
[[self.backwardButton cell] accessibilitySetOverrideValue:_NS("Go to previous item") forAttribute:NSAccessibilityDescriptionAttribute];
[[self.backwardButton cell] accessibilitySetOverrideValue:_NS("Next") forAttribute:NSAccessibilityTitleAttribute];
[[self.forwardButton cell] accessibilitySetOverrideValue:_NS("Go to next item") forAttribute:NSAccessibilityDescriptionAttribute];
[self.forwardButton setAction:@selector(fwd:)];
[self.backwardButton setAction:@selector(bwd:)];
......@@ -378,6 +384,7 @@
[self.playButton setImage: _pauseImage];
[self.playButton setAlternateImage: _pressedPauseImage];
[self.playButton setToolTip: _NS("Pause")];
[[self.playButton cell] accessibilitySetOverrideValue:[self.playButton toolTip] forAttribute:NSAccessibilityTitleAttribute];
}
- (void)setPlay
......@@ -385,6 +392,7 @@
[self.playButton setImage: _playImage];
[self.playButton setAlternateImage: _pressedPlayImage];
[self.playButton setToolTip: _NS("Play")];
[[self.playButton cell] accessibilitySetOverrideValue:[self.playButton toolTip] forAttribute:NSAccessibilityTitleAttribute];
}
- (void)setFullscreenState:(BOOL)b_fullscreen
......
......@@ -107,28 +107,28 @@ static NSString *kAssociatedFullscreenRect = @"VLCFullscreenAssociatedWindowRect
/* Setup translations for buttons */
setupButton(_playPauseButton,
_NS("Play/Pause"),
_NS("Click to play or pause the current media."));
_NS("Play/Pause the current media"));
setupButton(_nextButton,
_NS("Next"),
_NS("Click to go to the next playlist item."));
_NS("Go to next item"));
setupButton(_previousButton,
_NS("Previous"),
_NS("Click to go to the previous playlist item."));
_NS("Go to the previous item"));
setupButton(_forwardButton,
_NS("Forward"),
_NS("Click and hold to skip forward through the current media."));
_NS("Seek forward"));
setupButton(_backwardButton,
_NS("Backward"),
_NS("Click and hold to skip backward through the current media."));
_NS("Seek backward"));
setupButton(_fullscreenButton,
_NS("Toggle Fullscreen mode"),
_NS("Click to exit fullscreen playback."));
_NS("Leave fullscreen mode"));
setupButton(_volumeSlider,
_NS("Volume"),
_NS("Drag to adjust the volume."));
_NS("Adjust the volume"));
setupButton(_timeSlider,
_NS("Position"),
_NS("Drag to adjust the current playback position."));
_NS("Adjust the current playback position"));
/* Setup other controls */
[_volumeSlider setMaxValue:[[VLCCoreInteraction sharedInstance] maxVolume]];
......
......@@ -102,16 +102,16 @@ static void MsgCallback(void *data, int type, const vlc_log_t *item, const char
setupButton(_saveButton,
_NS("Save log"),
_NS("Click to save the debug log to a file."));
_NS("Save the debug log to a file"));
setupButton(_refreshButton,
_NS("Refresh log"),
_NS("Click to frefresh the log output."));
_NS("Refresh the log output"));
setupButton(_clearButton,
_NS("Clear log"),
_NS("Click to clear the log output."));
_NS("Clear the log output"));
setupButton(_toggleDetailsButton,
_NS("Toggle details"),
_NS("Click to show/hide details about a log message."));
_NS("Show/hide details about a log message"));
#undef setupButton
}
......
......@@ -184,14 +184,14 @@ static const float f_min_window_height = 307.;
// Search Field
[_searchField setToolTip:_NS("Search in Playlist")];
[_searchField.cell setPlaceholderString:_NS("Search")];
[_searchField.cell accessibilitySetOverrideValue:_NS("Enter a term to search the playlist. Results will be selected in the table.")
[_searchField.cell accessibilitySetOverrideValue:_NS("Search the playlist. Results will be selected in the table.")
forAttribute:NSAccessibilityDescriptionAttribute];
// Dropzone
[_dropzoneLabel setStringValue:_NS("Drop media here")];
[_dropzoneImageView setImage:imageFromRes(@"dropzone")];
[_dropzoneButton setTitle:_NS("Open media...")];
[_dropzoneButton.cell accessibilitySetOverrideValue:_NS("Click to open an advanced dialog to select the media to play. You can also drop files here to play.")
[_dropzoneButton.cell accessibilitySetOverrideValue:_NS("Open a dialog to select the media to play")
forAttribute:NSAccessibilityDescriptionAttribute];
// Podcast view
......
......@@ -59,43 +59,32 @@
[super awakeFromNib];
[self.stopButton setToolTip: _NS("Stop")];
[[self.stopButton cell] accessibilitySetOverrideValue:_NS("Click to stop playback.") forAttribute:NSAccessibilityDescriptionAttribute];
[[self.stopButton cell] accessibilitySetOverrideValue:[self.stopButton toolTip] forAttribute:NSAccessibilityTitleAttribute];
[[self.stopButton cell] accessibilitySetOverrideValue:[self.stopButton toolTip] forAttribute:NSAccessibilityDescriptionAttribute];
[self.playlistButton setToolTip: _NS("Show/Hide Playlist")];
[[self.playlistButton cell] accessibilitySetOverrideValue:_NS("Click to switch between video output and playlist. If no video is shown in the main window, this allows you to hide the playlist.") forAttribute:NSAccessibilityDescriptionAttribute];
[[self.playlistButton cell] accessibilitySetOverrideValue:[self.playlistButton toolTip] forAttribute:NSAccessibilityTitleAttribute];
[[self.playlistButton cell] accessibilitySetOverrideValue:[self.playlistButton toolTip] forAttribute:NSAccessibilityDescriptionAttribute];
[self.repeatButton setToolTip: _NS("Repeat")];
[[self.repeatButton cell] accessibilitySetOverrideValue:_NS("Click to change repeat mode. There are 3 states: repeat one, repeat all and off.") forAttribute:NSAccessibilityDescriptionAttribute];
[[self.repeatButton cell] accessibilitySetOverrideValue:_NS("Change repeat mode. Modes: repeat one, repeat all and no repeat.") forAttribute:NSAccessibilityDescriptionAttribute];
[[self.repeatButton cell] accessibilitySetOverrideValue:[self.repeatButton toolTip] forAttribute:NSAccessibilityTitleAttribute];
[self.shuffleButton setToolTip: _NS("Shuffle")];
[[self.shuffleButton cell] accessibilitySetOverrideValue:[self.shuffleButton toolTip] forAttribute:NSAccessibilityTitleAttribute];
[[self.shuffleButton cell] accessibilitySetOverrideValue:_NS("Click to enable or disable random playback.") forAttribute:NSAccessibilityDescriptionAttribute];
[[self.shuffleButton cell] accessibilitySetOverrideValue:[self.shuffleButton toolTip] forAttribute:NSAccessibilityDescriptionAttribute];
NSString *volumeTooltip = [NSString stringWithFormat:_NS("Volume: %i %%"), 100];
[self.volumeSlider setToolTip: volumeTooltip];
[[self.volumeSlider cell] accessibilitySetOverrideValue:_NS("Click and move the mouse while keeping the button pressed to use this slider to change the volume.") forAttribute:NSAccessibilityDescriptionAttribute];
[[self.volumeSlider cell] accessibilitySetOverrideValue:[self.volumeSlider toolTip] forAttribute:NSAccessibilityTitleAttribute];
[[self.volumeSlider cell] accessibilitySetOverrideValue:_NS("Volume") forAttribute:NSAccessibilityDescriptionAttribute];
[self.volumeDownButton setToolTip: _NS("Mute")];
[[self.volumeDownButton cell] accessibilitySetOverrideValue:_NS("Click to mute or unmute the audio.") forAttribute:NSAccessibilityDescriptionAttribute];
[[self.volumeDownButton cell] accessibilitySetOverrideValue:[self.volumeDownButton toolTip] forAttribute:NSAccessibilityTitleAttribute];
[[self.volumeDownButton cell] accessibilitySetOverrideValue:[self.volumeDownButton toolTip] forAttribute:NSAccessibilityDescriptionAttribute];
[self.volumeUpButton setToolTip: _NS("Full Volume")];
[[self.volumeUpButton cell] accessibilitySetOverrideValue:_NS("Click to play the audio at maximum volume.") forAttribute:NSAccessibilityDescriptionAttribute];
[[self.volumeUpButton cell] accessibilitySetOverrideValue:[self.volumeUpButton toolTip] forAttribute:NSAccessibilityTitleAttribute];
[[self.volumeUpButton cell] accessibilitySetOverrideValue:[self.volumeUpButton toolTip] forAttribute:NSAccessibilityDescriptionAttribute];
[self.effectsButton setToolTip: _NS("Audio Effects")];
[[self.effectsButton cell] accessibilitySetOverrideValue:_NS("Click to show an Audio Effects panel featuring an equalizer and further filters.") forAttribute:NSAccessibilityDescriptionAttribute];
[[self.effectsButton cell] accessibilitySetOverrideValue:_NS("Open Audio Effects window") forAttribute:NSAccessibilityDescriptionAttribute];
[[self.effectsButton cell] accessibilitySetOverrideValue:[self.effectsButton toolTip] forAttribute:NSAccessibilityTitleAttribute];
[self.prevButton setToolTip: _NS("Previous")];
[[self.prevButton cell] accessibilitySetOverrideValue:_NS("Click to go to the previous playlist item.") forAttribute:NSAccessibilityDescriptionAttribute];
[[self.prevButton cell] accessibilitySetOverrideValue:[self.prevButton toolTip] forAttribute:NSAccessibilityTitleAttribute];
[self.nextButton setToolTip: _NS("Next")];
[[self.nextButton cell] accessibilitySetOverrideValue:_NS("Click to go to the next playlist item.") forAttribute:NSAccessibilityDescriptionAttribute];
[[self.nextButton cell] accessibilitySetOverrideValue:[self.nextButton toolTip] forAttribute:NSAccessibilityTitleAttribute];
if (!self.darkInterface) {
[self.stopButton setImage: imageFromRes(@"stop")];
[self.stopButton setAlternateImage: imageFromRes(@"stop-pressed")];
......
......@@ -136,8 +136,8 @@ static NSString *kCaptureTabViewId = @"capture";
[_outputCheckbox setTitle:_NS("Stream output:")];
[_outputSettingsButton setTitle:_NS("Settings...")];
[_tabView accessibilitySetOverrideValue:_NS("Choose media input type") forAttribute:NSAccessibilityDescriptionAttribute];
[[_tabView tabViewItemAtIndex: 0] setLabel: _NS("File")];
[_tabView accessibilitySetOverrideValue:_NS("4 Tabs to choose between media input. Select 'File' for files, 'Disc' for optical media such as DVDs, Audio CDs or BRs, 'Network' for network streams or 'Capture' for Input Devices such as microphones or cameras.") forAttribute:NSAccessibilityDescriptionAttribute];
[[_tabView tabViewItemAtIndex: 1] setLabel: _NS("Disc")];
[[_tabView tabViewItemAtIndex: 2] setLabel: _NS("Network")];
[[_tabView tabViewItemAtIndex: 3] setLabel: _NS("Capture")];
......@@ -145,12 +145,12 @@ static NSString *kCaptureTabViewId = @"capture";
[_fileNameStubLabel setStringValue: _NS("Choose a file")];
[_fileIconWell setImage: [NSImage imageNamed:@"generic"]];
[_fileBrowseButton setTitle: _NS("Browse...")];
[[_fileBrowseButton cell] accessibilitySetOverrideValue:_NS("Click to select a file for playback") forAttribute:NSAccessibilityDescriptionAttribute];
[[_fileBrowseButton cell] accessibilitySetOverrideValue:_NS("Select a file for playback") forAttribute:NSAccessibilityDescriptionAttribute];
[_fileTreatAsPipeButton setTitle: _NS("Treat as a pipe rather than as a file")];
[_fileTreatAsPipeButton setHidden: NO];
[_fileSlaveCheckbox setTitle: _NS("Play another media synchronously")];
[_fileSelectSlaveButton setTitle: _NS("Choose...")];
[[_fileBrowseButton cell] accessibilitySetOverrideValue:_NS("Click to select a another file to play it in sync with the previously selected file.") forAttribute:NSAccessibilityDescriptionAttribute];
[[_fileBrowseButton cell] accessibilitySetOverrideValue:_NS("Select another file to play in sync with the previously selected file") forAttribute:NSAccessibilityDescriptionAttribute];
[_fileSlaveFilenameLabel setStringValue: @""];
[_fileSlaveIconWell setImage: NULL];
[_fileSubtitlesFilenameLabel setStringValue: @""];
......@@ -188,7 +188,7 @@ static NSString *kCaptureTabViewId = @"capture";
[_netHTTPURLLabel setStringValue: _NS("URL")];
[_netHelpLabel setStringValue: _NS("To Open a usual network stream (HTTP, RTSP, RTMP, MMS, FTP, etc.), just enter the URL in the field above. If you want to open a RTP or UDP stream, press the button below.")];
[_netHelpUDPLabel setStringValue: _NS("If you want to open a multicast stream, enter the respective IP address given by the stream provider. In unicast mode, VLC will use your machine's IP automatically.\n\nTo open a stream using a different protocol, just press Cancel to close this sheet.")];
[_netHTTPURLTextField accessibilitySetOverrideValue:_NS("Enter a URL here to open the network stream. To open RTP or UDP streams, click on the respective button below.") forAttribute:NSAccessibilityDescriptionAttribute];
[_netHTTPURLTextField accessibilitySetOverrideValue:_NS("Enter a stream URL here. To open RTP or UDP streams, use the respective button below.") forAttribute:NSAccessibilityDescriptionAttribute];
[_netUDPCancelButton setTitle: _NS("Cancel")];
[_netUDPOKButton setTitle: _NS("Open")];
[_netOpenUDPButton setTitle: _NS("Open RTP/UDP Stream")];
......@@ -345,9 +345,10 @@ static NSString *kCaptureTabViewId = @"capture";
[_fileSubPathLabel setHidden: NO];
[_fileSubPathTextField setStringValue: @""];
[_fileSubSettingsButton setTitle: _NS("Choose...")];
[[_fileBrowseButton cell] accessibilitySetOverrideValue:_NS("Click to setup subtitle playback in full detail.") forAttribute:NSAccessibilityDescriptionAttribute];
[[_fileSubSettingsButton cell] accessibilitySetOverrideValue:_NS("Setup subtitle playback details") forAttribute:NSAccessibilityDescriptionAttribute];
[[_fileBrowseButton cell] accessibilitySetOverrideValue:_NS("Select a file for playback") forAttribute:NSAccessibilityDescriptionAttribute];
[_fileSubBrowseButton setTitle: _NS("Browse...")];
[[_fileSubBrowseButton cell] accessibilitySetOverrideValue:_NS("Click to select a subtitle file.") forAttribute:NSAccessibilityDescriptionAttribute];
[[_fileSubBrowseButton cell] accessibilitySetOverrideValue:_NS("Select a subtitle file") forAttribute:NSAccessibilityDescriptionAttribute];
[_fileSubOverrideCheckbox setTitle: _NS("Override parameters")];
[_fileSubDelayLabel setStringValue: _NS("Delay")];
[_fileSubDelayStepper setEnabled: NO];
......@@ -360,7 +361,7 @@ static NSString *kCaptureTabViewId = @"capture";
[_fileSubAlignLabel setStringValue: _NS("Subtitle alignment")];
[_fileSubAlignPopup removeAllItems];
[_fileSubOKButton setStringValue: _NS("OK")];
[[_fileSubOKButton cell] accessibilitySetOverrideValue:_NS("Click to dismiss the subtitle setup dialog.") forAttribute:NSAccessibilityDescriptionAttribute];
[[_fileSubOKButton cell] accessibilitySetOverrideValue:_NS("Dismiss the subtitle setup dialog") forAttribute:NSAccessibilityDescriptionAttribute];
[_fileSubFontBox setTitle: _NS("Font Properties")];
[_fileSubFileBox setTitle: _NS("Subtitle File")];
......
......@@ -93,13 +93,13 @@
[self configurationChanged:nil];
// Set Accessibility Attributes for Image Buttons
[backwardsButton.cell accessibilitySetOverrideValue:_NS("Go to previous track")
[backwardsButton.cell accessibilitySetOverrideValue:_NS("Go to previous item")
forAttribute:NSAccessibilityDescriptionAttribute];
[playPauseButton.cell accessibilitySetOverrideValue:_NS("Play or pause current media")
[playPauseButton.cell accessibilitySetOverrideValue:_NS("Toggle Play/Pause")
forAttribute:NSAccessibilityDescriptionAttribute];
[forwardButton.cell accessibilitySetOverrideValue:_NS("Go to next track")
[forwardButton.cell accessibilitySetOverrideValue:_NS("Go to next item")
forAttribute:NSAccessibilityDescriptionAttribute];
[randButton.cell accessibilitySetOverrideValue:_NS("Toggle random order playback")
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment