Skip to content

V
vlc-gpu
Commit 9a23c6cd authored by Felix Paul Kühne's avatar Felix Paul Kühne
Browse files
Options

macosx: added an option to disable the native fullscreen mode on Lion

parent b6c66535
Expand all Show whitespace changes
Inline Side-by-side
Showing with 124 additions and 107 deletions
extras/package/macosx/vlc.xcodeproj/project.pbxproj
View file @ 9a23c6cd
...@@ -434,7 +434,6 @@ ...@@ -434,7 +434,6 @@
CC448A6313B68A0B009F72E0 /* MainWindow.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; name = MainWindow.m; path = ../../../modules/gui/macosx/MainWindow.m; sourceTree = "<group>"; }; CC448A6313B68A0B009F72E0 /* MainWindow.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; name = MainWindow.m; path = ../../../modules/gui/macosx/MainWindow.m; sourceTree = "<group>"; };
CC4A33210F8CB017000FC4A7 /* coredialogs.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = coredialogs.m; path = ../../../modules/gui/macosx/coredialogs.m; sourceTree = SOURCE_ROOT; }; CC4A33210F8CB017000FC4A7 /* coredialogs.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = coredialogs.m; path = ../../../modules/gui/macosx/coredialogs.m; sourceTree = SOURCE_ROOT; };
CC4A33220F8CB017000FC4A7 /* coredialogs.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = coredialogs.h; path = ../../../modules/gui/macosx/coredialogs.h; sourceTree = SOURCE_ROOT; }; CC4A33220F8CB017000FC4A7 /* coredialogs.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = coredialogs.h; path = ../../../modules/gui/macosx/coredialogs.h; sourceTree = SOURCE_ROOT; };
CC4D67F51348F587003FCC5B /* quartztext.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = quartztext.c; path = ../../../modules/misc/text_renderer/quartztext.c; sourceTree = "<group>"; };
CC4D67F71348F601003FCC5B /* darwin_specific.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = darwin_specific.c; path = ../../../src/posix/darwin_specific.c; sourceTree = "<group>"; }; CC4D67F71348F601003FCC5B /* darwin_specific.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = darwin_specific.c; path = ../../../src/posix/darwin_specific.c; sourceTree = "<group>"; };
CC4ED9AD0ABE07C800CA4CC5 /* add_embedded.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = add_embedded.png; path = Resources/add_embedded.png; sourceTree = "<group>"; }; CC4ED9AD0ABE07C800CA4CC5 /* add_embedded.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = add_embedded.png; path = Resources/add_embedded.png; sourceTree = "<group>"; };
CC4ED9AF0ABE07C800CA4CC5 /* repeat_embedded.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = repeat_embedded.png; path = Resources/repeat_embedded.png; sourceTree = "<group>"; }; CC4ED9AF0ABE07C800CA4CC5 /* repeat_embedded.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = repeat_embedded.png; path = Resources/repeat_embedded.png; sourceTree = "<group>"; };
...@@ -464,6 +463,8 @@ ...@@ -464,6 +463,8 @@
CC772DAC10E621C100675C9B /* VLCProgressPanel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = VLCProgressPanel.h; path = ../../../modules/gui/macosx_dialog_provider/VLCProgressPanel.h; sourceTree = SOURCE_ROOT; }; CC772DAC10E621C100675C9B /* VLCProgressPanel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = VLCProgressPanel.h; path = ../../../modules/gui/macosx_dialog_provider/VLCProgressPanel.h; sourceTree = SOURCE_ROOT; };
CC772DAD10E621C100675C9B /* VLCProgressPanel.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = VLCProgressPanel.m; path = ../../../modules/gui/macosx_dialog_provider/VLCProgressPanel.m; sourceTree = SOURCE_ROOT; }; CC772DAD10E621C100675C9B /* VLCProgressPanel.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = VLCProgressPanel.m; path = ../../../modules/gui/macosx_dialog_provider/VLCProgressPanel.m; sourceTree = SOURCE_ROOT; };
CC78DA4313DE056700E9603C /* topbar_background.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = topbar_background.png; path = Resources/mainwindow/topbar_background.png; sourceTree = "<group>"; }; CC78DA4313DE056700E9603C /* topbar_background.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = topbar_background.png; path = Resources/mainwindow/topbar_background.png; sourceTree = "<group>"; };
CC79F66614014FC30015D89E /* opengl.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = opengl.h; path = ../../../modules/video_output/opengl.h; sourceTree = "<group>"; };
CC79F66714014FDC0015D89E /* quartztext.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = quartztext.c; path = ../../../modules/text_renderer/quartztext.c; sourceTree = "<group>"; };
CC8062631021F8790021EB9A /* dsa_pub.pem */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = dsa_pub.pem; path = Resources/dsa_pub.pem; sourceTree = "<group>"; }; CC8062631021F8790021EB9A /* dsa_pub.pem */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = dsa_pub.pem; path = Resources/dsa_pub.pem; sourceTree = "<group>"; };
CC84FB2C130083BB00816D38 /* BGHUDAppKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = BGHUDAppKit.framework; path = ../../contrib/BGHUDAppKit/BGHUDAppKit.framework; sourceTree = SOURCE_ROOT; }; CC84FB2C130083BB00816D38 /* BGHUDAppKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = BGHUDAppKit.framework; path = ../../contrib/BGHUDAppKit/BGHUDAppKit.framework; sourceTree = SOURCE_ROOT; };
CC962E2C0CC7992800A56695 /* WebKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = WebKit.framework; path = /System/Library/Frameworks/WebKit.framework; sourceTree = "<absolute>"; }; CC962E2C0CC7992800A56695 /* WebKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = WebKit.framework; path = /System/Library/Frameworks/WebKit.framework; sourceTree = "<absolute>"; };
...@@ -911,7 +912,8 @@ ...@@ -911,7 +912,8 @@
CCC8957F0D9A8A61005AE59C /* OSX-specific source files */ = { CCC8957F0D9A8A61005AE59C /* OSX-specific source files */ = {
isa = PBXGroup; isa = PBXGroup;
children = ( children = (
CC4D67F51348F587003FCC5B /* quartztext.c */, CC79F66714014FDC0015D89E /* quartztext.c */,
CC79F66614014FC30015D89E /* opengl.h */,
CC6C01BB0DDF3F0700C7D754 /* opengl.c */, CC6C01BB0DDF3F0700C7D754 /* opengl.c */,
CC4D67F71348F601003FCC5B /* darwin_specific.c */, CC4D67F71348F601003FCC5B /* darwin_specific.c */,
CC6C01BA0DDF3EEC00C7D754 /* auhal.c */, CC6C01BA0DDF3EEC00C7D754 /* auhal.c */,
......
modules/gui/macosx/AppleRemote.m
View file @ 9a23c6cd
...@@ -102,7 +102,7 @@ static AppleRemote *_o_sharedInstance = nil; ...@@ -102,7 +102,7 @@ static AppleRemote *_o_sharedInstance = nil;
} }
else if( OSX_LION ) else if( OSX_LION )
{ {
/* omg, keys from the future */ /* Lion cookies */
msg_Dbg( VLCIntf, "using future AR cookies" ); msg_Dbg( VLCIntf, "using future AR cookies" );
[cookieToButtonMapping setObject:[NSNumber numberWithInt:kRemoteButtonVolume_Plus] forKey:@"33_31_30_21_20_2_"]; [cookieToButtonMapping setObject:[NSNumber numberWithInt:kRemoteButtonVolume_Plus] forKey:@"33_31_30_21_20_2_"];
[cookieToButtonMapping setObject:[NSNumber numberWithInt:kRemoteButtonVolume_Minus] forKey:@"33_32_30_21_20_2_"]; [cookieToButtonMapping setObject:[NSNumber numberWithInt:kRemoteButtonVolume_Minus] forKey:@"33_32_30_21_20_2_"];
...@@ -120,7 +120,7 @@ static AppleRemote *_o_sharedInstance = nil; ...@@ -120,7 +120,7 @@ static AppleRemote *_o_sharedInstance = nil;
} }
else else
{ {
/* current Snow Leopard cookies */ /* 10.6.2+ Snow Leopard cookies */
msg_Dbg( VLCIntf, "using Snow Leopard AR cookies" ); msg_Dbg( VLCIntf, "using Snow Leopard AR cookies" );
[cookieToButtonMapping setObject:[NSNumber numberWithInt:kRemoteButtonVolume_Plus] forKey:@"33_31_30_21_20_2_"]; [cookieToButtonMapping setObject:[NSNumber numberWithInt:kRemoteButtonVolume_Plus] forKey:@"33_31_30_21_20_2_"];
[cookieToButtonMapping setObject:[NSNumber numberWithInt:kRemoteButtonVolume_Minus] forKey:@"33_32_30_21_20_2_"]; [cookieToButtonMapping setObject:[NSNumber numberWithInt:kRemoteButtonVolume_Minus] forKey:@"33_32_30_21_20_2_"];
......
modules/gui/macosx/MainWindow.h
View file @ 9a23c6cd
...@@ -70,6 +70,7 @@ ...@@ -70,6 +70,7 @@
IBOutlet VLCFSPanel *o_fspanel; IBOutlet VLCFSPanel *o_fspanel;
BOOL b_dark_interface; BOOL b_dark_interface;
BOOL b_nativeFullscreenMode;
BOOL b_video_playback_enabled; BOOL b_video_playback_enabled;
int i_lastShownVolume; int i_lastShownVolume;
BOOL b_mute; BOOL b_mute;
......
modules/gui/macosx/MainWindow.m
View file @ 9a23c6cd
...@@ -107,6 +107,7 @@ static VLCMainWindow *_o_sharedInstance = nil; ...@@ -107,6 +107,7 @@ static VLCMainWindow *_o_sharedInstance = nil;
{ {
/* setup the styled interface */ /* setup the styled interface */
b_dark_interface = config_GetInt( VLCIntf, "macosx-interfacestyle" ); b_dark_interface = config_GetInt( VLCIntf, "macosx-interfacestyle" );
b_nativeFullscreenMode = config_GetInt( VLCIntf, "macosx-nativefullscreenmode" );
i_lastShownVolume = -1; i_lastShownVolume = -1;
[o_play_btn setToolTip: _NS("Play/Pause")]; [o_play_btn setToolTip: _NS("Play/Pause")];
...@@ -156,7 +157,7 @@ static VLCMainWindow *_o_sharedInstance = nil; ...@@ -156,7 +157,7 @@ static VLCMainWindow *_o_sharedInstance = nil;
[o_volume_down_btn setImage: [NSImage imageNamed:@"volume-low"]]; [o_volume_down_btn setImage: [NSImage imageNamed:@"volume-low"]];
[o_volume_track_view setImage: [NSImage imageNamed:@"volume-slider-track"]]; [o_volume_track_view setImage: [NSImage imageNamed:@"volume-slider-track"]];
[o_volume_up_btn setImage: [NSImage imageNamed:@"volume-high"]]; [o_volume_up_btn setImage: [NSImage imageNamed:@"volume-high"]];
if (OSX_LION) if (OSX_LION && b_nativeFullscreenMode)
{ {
[o_effects_btn setImage: [NSImage imageNamed:@"effects-one-button"]]; [o_effects_btn setImage: [NSImage imageNamed:@"effects-one-button"]];
[o_effects_btn setAlternateImage: [NSImage imageNamed:@"effects-one-button-blue"]]; [o_effects_btn setAlternateImage: [NSImage imageNamed:@"effects-one-button-blue"]];
...@@ -203,7 +204,7 @@ static VLCMainWindow *_o_sharedInstance = nil; ...@@ -203,7 +204,7 @@ static VLCMainWindow *_o_sharedInstance = nil;
[o_volume_down_btn setImage: [NSImage imageNamed:@"volume-low_dark"]]; [o_volume_down_btn setImage: [NSImage imageNamed:@"volume-low_dark"]];
[o_volume_track_view setImage: [NSImage imageNamed:@"volume-slider-track_dark"]]; [o_volume_track_view setImage: [NSImage imageNamed:@"volume-slider-track_dark"]];
[o_volume_up_btn setImage: [NSImage imageNamed:@"volume-high_dark"]]; [o_volume_up_btn setImage: [NSImage imageNamed:@"volume-high_dark"]];
if (OSX_LION) if (OSX_LION && b_nativeFullscreenMode)
{ {
[o_effects_btn setImage: [NSImage imageNamed:@"effects-one-button_dark"]]; [o_effects_btn setImage: [NSImage imageNamed:@"effects-one-button_dark"]];
[o_effects_btn setAlternateImage: [NSImage imageNamed:@"effects-one-button-blue_dark"]]; [o_effects_btn setAlternateImage: [NSImage imageNamed:@"effects-one-button-blue_dark"]];
...@@ -236,7 +237,7 @@ static VLCMainWindow *_o_sharedInstance = nil; ...@@ -236,7 +237,7 @@ static VLCMainWindow *_o_sharedInstance = nil;
[o_temp_view setAutoresizingMask:NSViewHeightSizable | NSViewWidthSizable]; [o_temp_view setAutoresizingMask:NSViewHeightSizable | NSViewWidthSizable];
[o_dropzone_view setFrame: [o_playlist_table frame]]; [o_dropzone_view setFrame: [o_playlist_table frame]];
[o_left_split_view setFrame: [o_sidebar_view frame]]; [o_left_split_view setFrame: [o_sidebar_view frame]];
if (OSX_LION) if (OSX_LION && b_nativeFullscreenMode)
{ {
[self setCollectionBehavior: NSWindowCollectionBehaviorFullScreenPrimary]; [self setCollectionBehavior: NSWindowCollectionBehaviorFullScreenPrimary];
NSRect frame; NSRect frame;
...@@ -908,7 +909,7 @@ static VLCMainWindow *_o_sharedInstance = nil; ...@@ -908,7 +909,7 @@ static VLCMainWindow *_o_sharedInstance = nil;
- (void)resizeWindow - (void)resizeWindow
{ {
if ( !b_fullscreen && !(OSX_LION && [NSApp currentSystemPresentationOptions] == NSApplicationPresentationFullScreen) ) if ( !b_fullscreen && !(OSX_LION && [NSApp currentSystemPresentationOptions] == NSApplicationPresentationFullScreen && b_nativeFullscreenMode) )
{ {
NSPoint topleftbase; NSPoint topleftbase;
NSPoint topleftscreen; NSPoint topleftscreen;
......
modules/gui/macosx/intf.h
View file @ 9a23c6cd
...@@ -109,6 +109,7 @@ struct intf_sys_t ...@@ -109,6 +109,7 @@ struct intf_sys_t
BOOL nib_coredialogs_loaded; /* CoreDialogs nibfile */ BOOL nib_coredialogs_loaded; /* CoreDialogs nibfile */
BOOL nib_bookmarks_loaded; /* Bookmarks nibfile */ BOOL nib_bookmarks_loaded; /* Bookmarks nibfile */
BOOL b_active_videoplayback; BOOL b_active_videoplayback;
BOOL b_nativeFullscreenMode;
VLCMainWindow *o_mainwindow; /* VLCMainWindow */ VLCMainWindow *o_mainwindow; /* VLCMainWindow */
......
modules/gui/macosx/intf.m
View file @ 9a23c6cd
...@@ -305,6 +305,8 @@ static int InputEvent( vlc_object_t *p_this, const char *psz_var, ...@@ -305,6 +305,8 @@ static int InputEvent( vlc_object_t *p_this, const char *psz_var,
break; break;
case INPUT_EVENT_ABORT: case INPUT_EVENT_ABORT:
[[VLCMain sharedInstance] updateName];
[[VLCMain sharedInstance] updatePlaybackPosition];
break; break;
default: default:
...@@ -597,6 +599,7 @@ static VLCMain *_o_sharedMainInstance = nil; ...@@ -597,6 +599,7 @@ static VLCMain *_o_sharedMainInstance = nil;
[o_remote setDelegate: _o_sharedMainInstance]; [o_remote setDelegate: _o_sharedMainInstance];
/* yeah, we are done */ /* yeah, we are done */
b_nativeFullscreenMode = config_GetInt( p_intf, "macosx-nativefullscreenmode" );
nib_main_loaded = TRUE; nib_main_loaded = TRUE;
} }
...@@ -1242,7 +1245,7 @@ unsigned int CocoaKeyToVLC( unichar i_key ) ...@@ -1242,7 +1245,7 @@ unsigned int CocoaKeyToVLC( unichar i_key )
playlist_t * p_playlist = pl_Get( VLCIntf ); playlist_t * p_playlist = pl_Get( VLCIntf );
BOOL b_fullscreen = var_GetBool( p_playlist, "fullscreen" ); BOOL b_fullscreen = var_GetBool( p_playlist, "fullscreen" );
if (OSX_LION) if (OSX_LION && b_nativeFullscreenMode)
{ {
[o_mainwindow toggleFullScreen: self]; [o_mainwindow toggleFullScreen: self];
if(b_fullscreen) if(b_fullscreen)
...@@ -1334,6 +1337,7 @@ unsigned int CocoaKeyToVLC( unichar i_key ) ...@@ -1334,6 +1337,7 @@ unsigned int CocoaKeyToVLC( unichar i_key )
[self playbackStatusUpdated]; [self playbackStatusUpdated];
[o_playlist playlistUpdated]; [o_playlist playlistUpdated];
[o_mainwindow updateWindow]; [o_mainwindow updateWindow];
[o_mainwindow updateName];
} }
- (void)updateRecordState: (BOOL)b_value - (void)updateRecordState: (BOOL)b_value
......
modules/gui/macosx/macosx.m
View file @ 9a23c6cd
...@@ -91,6 +91,9 @@ void WindowClose ( vout_window_t * ); ...@@ -91,6 +91,9 @@ void WindowClose ( vout_window_t * );
#define INTERFACE_STYLE_TEXT N_("Run VLC with dark or bright interface style") #define INTERFACE_STYLE_TEXT N_("Run VLC with dark or bright interface style")
#define INTERFACE_STYLE_LONGTEXT N_("By default, VLC will use the dark interface style.") #define INTERFACE_STYLE_LONGTEXT N_("By default, VLC will use the dark interface style.")
#define NATIVE_FULLSCREEN_MODE_ON_LION_TEXT N_("Use the native fullscreen mode on OS X Lion")
#define NATIVE_FULLSCREEN_MODE_ON_LION_LONGTEXT N_("By default, VLC uses the native fullscreen mode on Mac OS X 10.7 and later. It can also use the custom mode known from previous Mac OS X releases.")
vlc_module_begin () vlc_module_begin ()
set_description( N_("Mac OS X interface") ) set_description( N_("Mac OS X interface") )
set_capability( "interface", 200 ) set_capability( "interface", 200 )
...@@ -112,6 +115,7 @@ vlc_module_begin () ...@@ -112,6 +115,7 @@ vlc_module_begin ()
false ) false )
add_bool( "macosx-interfacestyle", true, INTERFACE_STYLE_TEXT, INTERFACE_STYLE_LONGTEXT, add_bool( "macosx-interfacestyle", true, INTERFACE_STYLE_TEXT, INTERFACE_STYLE_LONGTEXT,
false ) false )
add_bool( "macosx-nativefullscreenmode", true, NATIVE_FULLSCREEN_MODE_ON_LION_TEXT, NATIVE_FULLSCREEN_MODE_ON_LION_LONGTEXT, false )
add_obsolete_bool( "macosx-stretch" ) /* since 1.2.0 */ add_obsolete_bool( "macosx-stretch" ) /* since 1.2.0 */
add_obsolete_bool( "macosx-background" ) /* since 1.2.0 */ add_obsolete_bool( "macosx-background" ) /* since 1.2.0 */
......
modules/gui/macosx/simple_prefs.h
View file @ 9a23c6cd
...@@ -98,6 +98,7 @@ ...@@ -98,6 +98,7 @@
IBOutlet id o_intf_update_ckb; IBOutlet id o_intf_update_ckb;
IBOutlet id o_intf_last_update_lbl; IBOutlet id o_intf_last_update_lbl;
IBOutlet id o_intf_enableGrowl_ckb; IBOutlet id o_intf_enableGrowl_ckb;
IBOutlet id o_intf_nativefullscreen_ckb;
IBOutlet id o_osd_encoding_pop; IBOutlet id o_osd_encoding_pop;
IBOutlet id o_osd_encoding_txt; IBOutlet id o_osd_encoding_txt;
......
modules/gui/macosx/simple_prefs.m
View file @ 9a23c6cd
...@@ -107,6 +107,8 @@ static VLCSimplePrefs *_o_sharedInstance = nil; ...@@ -107,6 +107,8 @@ static VLCSimplePrefs *_o_sharedInstance = nil;
if (OSX_LION) if (OSX_LION)
[o_sprefs_win setCollectionBehavior: NSWindowCollectionBehaviorFullScreenAuxiliary]; [o_sprefs_win setCollectionBehavior: NSWindowCollectionBehaviorFullScreenAuxiliary];
else
[o_intf_nativefullscreen_ckb setEnabled:NO];
/* setup useful stuff */ /* setup useful stuff */
o_hotkeysNonUseableKeys = [[NSArray arrayWithObjects: @"Command-c", @"Command-x", @"Command-v", @"Command-a", @"Command-," , @"Command-h", @"Command-Alt-h", @"Command-Shift-o", @"Command-o", @"Command-d", @"Command-n", @"Command-s", @"Command-z", @"Command-l", @"Command-r", @"Command-3", @"Command-m", @"Command-w", @"Command-Shift-w", @"Command-Shift-c", @"Command-Shift-p", @"Command-i", @"Command-e", @"Command-Shift-e", @"Command-b", @"Command-Shift-m", @"Command-Ctrl-m", @"Command-?", @"Command-Alt-?", nil] retain]; o_hotkeysNonUseableKeys = [[NSArray arrayWithObjects: @"Command-c", @"Command-x", @"Command-v", @"Command-a", @"Command-," , @"Command-h", @"Command-Alt-h", @"Command-Shift-o", @"Command-o", @"Command-d", @"Command-n", @"Command-s", @"Command-z", @"Command-l", @"Command-r", @"Command-3", @"Command-m", @"Command-w", @"Command-Shift-w", @"Command-Shift-c", @"Command-Shift-p", @"Command-i", @"Command-e", @"Command-Shift-e", @"Command-b", @"Command-Shift-m", @"Command-Ctrl-m", @"Command-?", @"Command-Alt-?", nil] retain];
...@@ -233,6 +235,7 @@ create_toolbar_item( NSString * o_itemIdent, NSString * o_name, NSString * o_des ...@@ -233,6 +235,7 @@ create_toolbar_item( NSString * o_itemIdent, NSString * o_name, NSString * o_des
[o_intf_style_bright_bcell setTitle: _NS("Bright")]; [o_intf_style_bright_bcell setTitle: _NS("Bright")];
[o_intf_art_txt setStringValue: _NS("Album art download policy")]; [o_intf_art_txt setStringValue: _NS("Album art download policy")];
[o_intf_embedded_ckb setTitle: _NS("Show video within the main window")]; [o_intf_embedded_ckb setTitle: _NS("Show video within the main window")];
[o_intf_nativefullscreen_ckb setTitle: _NS("Use the native fullscreen mode on OS X Lion")];
[o_intf_fspanel_ckb setTitle: _NS("Show Fullscreen Controller")]; [o_intf_fspanel_ckb setTitle: _NS("Show Fullscreen Controller")];
[o_intf_lang_txt setStringValue: _NS("Language")]; [o_intf_lang_txt setStringValue: _NS("Language")];
[o_intf_network_box setTitle: _NS("Privacy / Network Interaction")]; [o_intf_network_box setTitle: _NS("Privacy / Network Interaction")];
...@@ -428,6 +431,7 @@ static inline char * __config_GetLabel( vlc_object_t *p_this, const char *psz_na ...@@ -428,6 +431,7 @@ static inline char * __config_GetLabel( vlc_object_t *p_this, const char *psz_na
[self setupButton: o_intf_art_pop forIntList: "album-art"]; [self setupButton: o_intf_art_pop forIntList: "album-art"];
[self setupButton: o_intf_fspanel_ckb forBoolValue: "macosx-fspanel"]; [self setupButton: o_intf_fspanel_ckb forBoolValue: "macosx-fspanel"];
[self setupButton: o_intf_nativefullscreen_ckb forBoolValue: "macosx-nativefullscreenmode"];
[self setupButton: o_intf_embedded_ckb forBoolValue: "embedded-video"]; [self setupButton: o_intf_embedded_ckb forBoolValue: "embedded-video"];
[self setupButton: o_intf_appleremote_ckb forBoolValue: "macosx-appleremote"]; [self setupButton: o_intf_appleremote_ckb forBoolValue: "macosx-appleremote"];
[self setupButton: o_intf_mediakeys_ckb forBoolValue: "macosx-mediakeys"]; [self setupButton: o_intf_mediakeys_ckb forBoolValue: "macosx-mediakeys"];
...@@ -778,6 +782,7 @@ static inline void save_module_list( intf_thread_t * p_intf, id object, const ch ...@@ -778,6 +782,7 @@ static inline void save_module_list( intf_thread_t * p_intf, id object, const ch
config_PutInt( p_intf, "macosx-appleremote", [o_intf_appleremote_ckb state] ); config_PutInt( p_intf, "macosx-appleremote", [o_intf_appleremote_ckb state] );
config_PutInt( p_intf, "macosx-mediakeys", [o_intf_mediakeys_ckb state] ); config_PutInt( p_intf, "macosx-mediakeys", [o_intf_mediakeys_ckb state] );
config_PutInt( p_intf, "macosx-interfacestyle", [o_intf_style_dark_bcell state] ); config_PutInt( p_intf, "macosx-interfacestyle", [o_intf_style_dark_bcell state] );
config_PutInt( p_intf, "macosx-nativefullscreenmode", [o_intf_nativefullscreen_ckb state] );
if( [o_intf_enableGrowl_ckb state] == NSOnState ) if( [o_intf_enableGrowl_ckb state] == NSOnState )
{ {
tmpString = getString( "control" ); tmpString = getString( "control" );
......
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