RepoMirrors/mpv
1
0
Fork 0
mirror of https://github.com/mpv-player/mpv synced 2025-03-31 07:51:55 +00:00
Code Issues Releases Wiki Activity

osx: update the menu and remove conflicting item

Browse Source 
Remove 'Quit mpv & remember playback position'
from the menu because it conflicts with the global
logout shortcut. add separator between 'Hide' and
'Quit' for consistency with other Apps.
also rename the 'Movie' menu to 'Video'. it's a
bit more generic.

Fixes #3865
This commit is contained in:
Akemi 2016-12-11 23:35:48 +01:00 committed by wm4
parent 4399be5b62
commit ed7e650d3a
1 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
osdep/macosx_application.m
View File

@ -50,7 +50,7 @@ static pthread_t playback_thread_id;
child:(NSMenu *)child;
- (void)registerMenuItem:(NSMenuItem*)menuItem forKey:(MPMenuKey)key;
- (NSMenu *)appleMenuWithMainMenu:(NSMenu *)mainMenu;
- (NSMenu *)movieMenu;
- (NSMenu *)videoMenu;
- (NSMenu *)windowMenu;
@end
@ -117,17 +117,15 @@ static void terminate_cocoa_application(void)
[self mainMenuItemWithParent:mainMenu child:menu];
[self menuItemWithParent:menu title:@"Hide mpv"
action:@selector(hide:) keyEquivalent: @"h"];
[menu addItem:[NSMenuItem separatorItem]];
[self menuItemWithParent:menu title:@"Quit mpv"
action:@selector(stopPlayback) keyEquivalent: @"q"];
[self menuItemWithParent:menu title:@"Quit mpv & remember position"
action:@selector(stopPlaybackAndRememberPosition)
keyEquivalent: @"Q"];
return [menu autorelease];
}
- (NSMenu *)movieMenu
- (NSMenu *)videoMenu
{
NSMenu *menu = [[NSMenu alloc] initWithTitle:@"Movie"];
NSMenu *menu = [[NSMenu alloc] initWithTitle:@"Video"];
_R(menu, @"Half Size", @"0", MPM_H_SIZE)
_R(menu, @"Normal Size", @"1", MPM_N_SIZE)
_R(menu, @"Double Size", @"2", MPM_D_SIZE)
@ -148,7 +146,7 @@ static void terminate_cocoa_application(void)
[NSApp setMainMenu:main_menu];
[NSApp setAppleMenu:[self appleMenuWithMainMenu:main_menu]];
[NSApp mainMenuItemWithParent:main_menu child:[self movieMenu]];
[NSApp mainMenuItemWithParent:main_menu child:[self videoMenu]];
[NSApp mainMenuItemWithParent:main_menu child:[self windowMenu]];
}