[vlc-devel] [vlc-commits] macosx: Make toolTips on Full Screen consistent

[David Fuhrmann]

Hi J-b,

This probably should not be back ported as is, as new strings are introduced ("Enter fullscreen“).

BR. David

> Am 16.05.2018 um 18:56 schrieb Daksh Shah <git at videolan.org>:
> 
> vlc/vlc-3.0 | branch: master | Daksh Shah <daksh17336 at iiitd.ac.in> | Sun May  6 19:31:41 2018 +0530| [104715d6ea334819a9d0641c9793070ee53b1821] | committer: Jean-Baptiste Kempf
> 
> macosx: Make toolTips on Full Screen consistent
> 
> Now the tooltips which are shown in the Normal View are same
> as the ones which are shown in Full-Screen View. Adapted the shorter version.
> And also, changed the Normal View toolTip of "Fullscreen" to "Enter fullscreen"
> fixes #19993
> 
> Signed-off-by: David Fuhrmann <dfuhrmann at videolan.org>
> (cherry picked from commit c7e23f14795f98bc88475e8eab7c2620212449e9)
> Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>
> 
>> http://git.videolan.org/gitweb.cgi/vlc/vlc-3.0.git/?a=commit;h=104715d6ea334819a9d0641c9793070ee53b1821
> ---
> 
> modules/gui/macosx/VLCControlsBarCommon.m | 2 +-
> modules/gui/macosx/VLCFSPanelController.m | 9 ++++++---
> 2 files changed, 7 insertions(+), 4 deletions(-)
> 
> diff --git a/modules/gui/macosx/VLCControlsBarCommon.m b/modules/gui/macosx/VLCControlsBarCommon.m
> index 04a0105792..86e91db39e 100644
> --- a/modules/gui/macosx/VLCControlsBarCommon.m
> +++ b/modules/gui/macosx/VLCControlsBarCommon.m
> @@ -78,7 +78,7 @@
>     if (_darkInterface)
>         [self.timeSlider setSliderStyleDark];
> 
> -    [self.fullscreenButton setToolTip: _NS("Fullscreen")];
> +    [self.fullscreenButton setToolTip: _NS("Enter fullscreen")];
>     [[self.fullscreenButton cell] accessibilitySetOverrideValue:[self.fullscreenButton toolTip] forAttribute:NSAccessibilityDescriptionAttribute];
> 
>     if (!_darkInterface) {
> diff --git a/modules/gui/macosx/VLCFSPanelController.m b/modules/gui/macosx/VLCFSPanelController.m
> index dd3e9ce578..325c505e7f 100644
> --- a/modules/gui/macosx/VLCFSPanelController.m
> +++ b/modules/gui/macosx/VLCFSPanelController.m
> @@ -100,7 +100,7 @@ static NSString *kAssociatedFullscreenRect = @"VLCFullscreenAssociatedWindowRect
>                              forAttribute:NSAccessibilityTitleAttribute];             \
>     [target accessibilitySetOverrideValue:desc                                        \
>                              forAttribute:NSAccessibilityDescriptionAttribute];       \
> -    [target setToolTip:desc];
> +    [target setToolTip:title];
> 
> - (void)setupControls
> {
> @@ -121,8 +121,8 @@ static NSString *kAssociatedFullscreenRect = @"VLCFullscreenAssociatedWindowRect
>                 _NS("Backward"),
>                 _NS("Seek backward"));
>     setupButton(_fullscreenButton,
> -                _NS("Toggle Fullscreen mode"),
> -                _NS("Leave fullscreen mode"));
> +                _NS("Leave fullscreen"),
> +                _NS("Leave fullscreen"));
>     setupButton(_volumeSlider,
>                 _NS("Volume"),
>                 _NS("Adjust the volume"));
> @@ -229,11 +229,13 @@ static NSString *kAssociatedFullscreenRect = @"VLCFullscreenAssociatedWindowRect
> - (void)setPlay
> {
>     [_playPauseButton setState:NSOffState];
> +    [_playPauseButton setToolTip: _NS("Play")];
> }
> 
> - (void)setPause
> {
>     [_playPauseButton setState:NSOnState];
> +    [_playPauseButton setToolTip: _NS("Pause")];
> }
> 
> - (void)setStreamTitle:(NSString *)title
> @@ -300,6 +302,7 @@ static NSString *kAssociatedFullscreenRect = @"VLCFullscreenAssociatedWindowRect
> - (void)setVolumeLevel:(int)value
> {
>     [_volumeSlider setIntValue:value];
> +    [_volumeSlider setToolTip: [NSString stringWithFormat:_NS("Volume: %i %%"), (value*200)/AOUT_VOLUME_MAX]];
> }
> 
> #pragma mark -
> 
> _______________________________________________
> vlc-commits mailing list
> vlc-commits at videolan.org
> https://mailman.videolan.org/listinfo/vlc-commits